svn commit: r194295 - head/sys/i386/include

John Baldwin jhb at FreeBSD.org
Tue Jun 16 15:13:20 UTC 2009


Author: jhb
Date: Tue Jun 16 15:13:18 2009
New Revision: 194295
URL: http://svn.freebsd.org/changeset/base/194295

Log:
  Move (read|write)_cyrix_reg() inlines from specialreg.h to cpufunc.h.
  specialreg.h now consists solely of register-related macros.

Modified:
  head/sys/i386/include/cpufunc.h
  head/sys/i386/include/specialreg.h

Modified: head/sys/i386/include/cpufunc.h
==============================================================================
--- head/sys/i386/include/cpufunc.h	Tue Jun 16 15:09:17 2009	(r194294)
+++ head/sys/i386/include/cpufunc.h	Tue Jun 16 15:13:18 2009	(r194295)
@@ -620,6 +620,20 @@ load_dr7(u_int dr7)
 	__asm __volatile("movl %0,%%dr7" : : "r" (dr7));
 }
 
+static __inline u_char
+read_cyrix_reg(u_char reg)
+{
+	outb(0x22, reg);
+	return inb(0x23);
+}
+
+static __inline void
+write_cyrix_reg(u_char reg, u_char data)
+{
+	outb(0x22, reg);
+	outb(0x23, data);
+}
+
 static __inline register_t
 intr_disable(void)
 {
@@ -702,6 +716,7 @@ u_int	rdr5(void);
 u_int	rdr6(void);
 u_int	rdr7(void);
 uint64_t rdtsc(void);
+u_char	read_cyrix_reg(u_char reg);
 u_int	read_eflags(void);
 u_int	rfs(void);
 uint64_t rgdt(void);
@@ -710,6 +725,7 @@ uint64_t ridt(void);
 u_short	rldt(void);
 u_short	rtr(void);
 void	wbinvd(void);
+void	write_cyrix_reg(u_char reg, u_char data);
 void	write_eflags(u_int ef);
 void	wrmsr(u_int msr, uint64_t newval);
 

Modified: head/sys/i386/include/specialreg.h
==============================================================================
--- head/sys/i386/include/specialreg.h	Tue Jun 16 15:09:17 2009	(r194294)
+++ head/sys/i386/include/specialreg.h	Tue Jun 16 15:13:18 2009	(r194295)
@@ -575,20 +575,4 @@
 #define	VIA_CRYPT_CWLO_KEY192		0x0000040c	/* 192bit, 12 rds */
 #define	VIA_CRYPT_CWLO_KEY256		0x0000080e	/* 256bit, 15 rds */
 
-#ifndef LOCORE
-static __inline u_char
-read_cyrix_reg(u_char reg)
-{
-	outb(0x22, reg);
-	return inb(0x23);
-}
-
-static __inline void
-write_cyrix_reg(u_char reg, u_char data)
-{
-	outb(0x22, reg);
-	outb(0x23, data);
-}
-#endif
-
 #endif /* !_MACHINE_SPECIALREG_H_ */


More information about the svn-src-all mailing list