PERFORCE change 152852 for review

[Oleksandr Tymoshenko]

http://perforce.freebsd.org/chv.cgi?CH=152852

Change 152852 by gonzo at gonzo_jeeves on 2008/11/12 06:09:04

	- C99ify file
	- Add badaddr declaration to cpu.h for dev/siba

Affected files ...

.. //depot/projects/mips2/src/sys/mips/include/cpu.h#9 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/include/cpu.h#9 (text+ko) ====

@@ -351,17 +351,17 @@
 	int cpuprid;
 	struct {
 #if BYTE_ORDER == BIG_ENDIAN
-		u_int pad1:8;	/* reserved */
-		u_int cp_vendor:8;	/* company identifier */
-		u_int cp_imp:8;	/* implementation identifier */
-		u_int cp_majrev:4;	/* major revision identifier */
-		u_int cp_minrev:4;	/* minor revision identifier */
+		unsigned int pad1:8;	i	/* reserved */
+		unsigned int cp_vendor:8;	/* company identifier */
+		unsigned int cp_imp:8;		/* implementation identifier */
+		unsigned int cp_majrev:4;	/* major revision identifier */
+		unsigned int cp_minrev:4;	/* minor revision identifier */
 #else
-		u_int cp_minrev:4;	/* minor revision identifier */
-		u_int cp_majrev:4;	/* major revision identifier */
-		u_int cp_imp:8;	/* implementation identifier */
-		u_int cp_vendor:8;	/* company identifier */
-		u_int pad1:8;	/* reserved */
+		unsigned int cp_minrev:4;	/* minor revision identifier */
+		unsigned int cp_majrev:4;	/* major revision identifier */
+		unsigned int cp_imp:8;		/* implementation identifier */
+		unsigned int cp_vendor:8;	/* company identifier */
+		unsigned int pad1:8;		/* reserved */
 #endif
 	}      cpu;
 };
@@ -448,13 +448,13 @@
 struct tlb;
 struct user;
 
-u_int32_t mips_cp0_config1_read(void);
+uint32_t mips_cp0_config1_read(void);
 int Mips_ConfigCache(void);
 void Mips_SetWIRED(int);
 void Mips_SetPID(int);
-u_int Mips_GetCOUNT(void);
-void Mips_SetCOMPARE(u_int);
-u_int Mips_GetCOMPARE(void);
+unsigned int Mips_GetCOUNT(void);
+void Mips_SetCOMPARE(unsigned int);
+unsigned int Mips_GetCOMPARE(void);
 
 void Mips_SyncCache(void);
 void Mips_SyncDCache(vm_offset_t, int);
@@ -473,8 +473,8 @@
 void mips_TBIAP(int);
 void wbflush(void);
 
-extern u_int32_t cpu_counter_interval;	/* Number of counter ticks/tick */
-extern u_int32_t cpu_counter_last;	/* Last compare value loaded    */
+extern uint32_t cpu_counter_interval;	/* Number of counter ticks/tick */
+extern uint32_t cpu_counter_last;	/* Last compare value loaded    */
 extern int num_tlbentries;
 extern char btext[];
 extern char etext[];
@@ -541,10 +541,9 @@
 void setsoftintr1(void);
 void clearsoftintr1(void);
 
+uint32_t mips_cp0_status_read(void);
+void mips_cp0_status_write(uint32_t);
 
-u_int32_t mips_cp0_status_read(void);
-void mips_cp0_status_write(u_int32_t);
-
 int disableintr(void);
 void restoreintr(int);
 int enableintr(void);
@@ -554,9 +553,11 @@
 void cpu_halt(void);
 void cpu_reset(void);
 
-u_int32_t set_intr_mask(u_int32_t);
-u_int32_t get_intr_mask(void);
-u_int32_t get_cyclecount(void);
+uint32_t set_intr_mask(u_int32_t);
+uint32_t get_intr_mask(void);
+uint32_t get_cyclecount(void);
+
+int badaddr(void *, size_t);
 
 #define	cpu_spinwait()		/* nothing */