svn commit: r208930 - user/jmallett/octeon/sys/contrib/octeon-sdk

[Juli Mallett]

Author: jmallett
Date: Wed Jun  9 02:03:26 2010
New Revision: 208930
URL: http://svn.freebsd.org/changeset/base/208930

Log:
  o) Actually spell __typeof in the normal kernel way, rather than the GCC
     extension way. [1]
  o) Fix cvmx-thunder.c build on FreeBSD.
  
  Submitted by:	[1] bde

Modified:
  user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h
  user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-thunder.c

Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h
==============================================================================
--- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h	Wed Jun  9 01:02:08 2010	(r208929)
+++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h	Wed Jun  9 02:03:26 2010	(r208930)
@@ -225,12 +225,12 @@ extern "C" {
       unsigned long _v;							\
       ASM_STMT ("rdhwr\t%0,$31\n"					\
 		"\tsll\t%0,%0,0" : "=d"(_v));				\
-      result = (__typeof__(result))_v;					\
+      result = (__typeof(result))_v;					\
     }									\
   } else {								\
     unsigned long _v;							\
     ASM_STMT ("rdhwr\t%0,$" CVMX_TMP_STR(regstr) : "=d"(_v));		\
-    result = (__typeof__(result))_v;					\
+    result = (__typeof(result))_v;					\
   }})
   
 

Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-thunder.c
==============================================================================
--- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-thunder.c	Wed Jun  9 01:02:08 2010	(r208929)
+++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-thunder.c	Wed Jun  9 02:03:26 2010	(r208930)
@@ -50,7 +50,6 @@
  *
  */
 
-#include "cvmx-config.h"
 #include "cvmx.h"
 #include "cvmx-sysinfo.h"
 #include "cvmx-thunder.h"
@@ -121,7 +120,7 @@ int cvmx_rtc_ds1374_write(uint32_t time)
     return (rc ? -1 : 0);
 }
 
-int cvmx_rtc_ds1374_alarm_config(int WD, int WDSTR, int AIE)
+static int cvmx_rtc_ds1374_alarm_config(int WD, int WDSTR, int AIE)
 {
     int val;
 
@@ -134,7 +133,7 @@ int cvmx_rtc_ds1374_alarm_config(int WD,
     return 0;
 }
 
-int cvmx_rtc_ds1374_alarm_set(int alarm_on)
+static int cvmx_rtc_ds1374_alarm_set(int alarm_on)
 {
     uint8_t val;
 
@@ -152,7 +151,7 @@ int cvmx_rtc_ds1374_alarm_set(int alarm_
 }
 
 
-int cvmx_rtc_ds1374_alarm_counter_set(uint32_t interval)
+static int cvmx_rtc_ds1374_alarm_counter_set(uint32_t interval)
 {
     int i;
     int rc = 0;
@@ -165,7 +164,8 @@ int cvmx_rtc_ds1374_alarm_counter_set(ui
     return rc;
 }
 
-uint32_t cvmx_rtc_ds1374_alarm_counter_get(void)
+#if 0 /* XXX unused */
+static uint32_t cvmx_rtc_ds1374_alarm_counter_get(void)
 {
     int i;
     uint32_t interval = 0;
@@ -176,6 +176,7 @@ uint32_t cvmx_rtc_ds1374_alarm_counter_g
     }
     return interval;
 }
+#endif
 
 
 #ifdef CVMX_RTC_DEBUG