svn commit: r201369 - in head/sys: amd64/include i386/include
David E. O'Brien
obrien at FreeBSD.org
Fri Jan 1 20:55:12 UTC 2010
Author: obrien
Date: Fri Jan 1 20:55:11 2010
New Revision: 201369
URL: http://svn.freebsd.org/changeset/base/201369
Log:
Quiet variable "shadows" warning:
sys/vmmeter.h: warning: shadowed declaration is here
machine/cpufunc.h: In function 'insw':
machine/cpufunc.h: warning: declaration of 'cnt' shadows a global declaration
..snip..
Modified:
head/sys/amd64/include/cpufunc.h
head/sys/i386/include/cpufunc.h
Modified: head/sys/amd64/include/cpufunc.h
==============================================================================
--- head/sys/amd64/include/cpufunc.h Fri Jan 1 19:09:40 2010 (r201368)
+++ head/sys/amd64/include/cpufunc.h Fri Jan 1 20:55:11 2010 (r201369)
@@ -190,28 +190,28 @@ inl(u_int port)
}
static __inline void
-insb(u_int port, void *addr, size_t cnt)
+insb(u_int port, void *addr, size_t count)
{
__asm __volatile("cld; rep; insb"
- : "+D" (addr), "+c" (cnt)
+ : "+D" (addr), "+c" (count)
: "d" (port)
: "memory");
}
static __inline void
-insw(u_int port, void *addr, size_t cnt)
+insw(u_int port, void *addr, size_t count)
{
__asm __volatile("cld; rep; insw"
- : "+D" (addr), "+c" (cnt)
+ : "+D" (addr), "+c" (count)
: "d" (port)
: "memory");
}
static __inline void
-insl(u_int port, void *addr, size_t cnt)
+insl(u_int port, void *addr, size_t count)
{
__asm __volatile("cld; rep; insl"
- : "+D" (addr), "+c" (cnt)
+ : "+D" (addr), "+c" (count)
: "d" (port)
: "memory");
}
@@ -244,26 +244,26 @@ outl(u_int port, u_int data)
}
static __inline void
-outsb(u_int port, const void *addr, size_t cnt)
+outsb(u_int port, const void *addr, size_t count)
{
__asm __volatile("cld; rep; outsb"
- : "+S" (addr), "+c" (cnt)
+ : "+S" (addr), "+c" (count)
: "d" (port));
}
static __inline void
-outsw(u_int port, const void *addr, size_t cnt)
+outsw(u_int port, const void *addr, size_t count)
{
__asm __volatile("cld; rep; outsw"
- : "+S" (addr), "+c" (cnt)
+ : "+S" (addr), "+c" (count)
: "d" (port));
}
static __inline void
-outsl(u_int port, const void *addr, size_t cnt)
+outsl(u_int port, const void *addr, size_t count)
{
__asm __volatile("cld; rep; outsl"
- : "+S" (addr), "+c" (cnt)
+ : "+S" (addr), "+c" (count)
: "d" (port));
}
@@ -670,9 +670,9 @@ void halt(void);
void ia32_pause(void);
u_char inb(u_int port);
u_int inl(u_int port);
-void insb(u_int port, void *addr, size_t cnt);
-void insl(u_int port, void *addr, size_t cnt);
-void insw(u_int port, void *addr, size_t cnt);
+void insb(u_int port, void *addr, size_t count);
+void insl(u_int port, void *addr, size_t count);
+void insw(u_int port, void *addr, size_t count);
register_t intr_disable(void);
void intr_restore(register_t rf);
void invd(void);
@@ -697,9 +697,9 @@ void load_gs(u_int sel);
void ltr(u_short sel);
void outb(u_int port, u_char data);
void outl(u_int port, u_int data);
-void outsb(u_int port, const void *addr, size_t cnt);
-void outsl(u_int port, const void *addr, size_t cnt);
-void outsw(u_int port, const void *addr, size_t cnt);
+void outsb(u_int port, const void *addr, size_t count);
+void outsl(u_int port, const void *addr, size_t count);
+void outsw(u_int port, const void *addr, size_t count);
void outw(u_int port, u_short data);
u_long rcr0(void);
u_long rcr2(void);
Modified: head/sys/i386/include/cpufunc.h
==============================================================================
--- head/sys/i386/include/cpufunc.h Fri Jan 1 19:09:40 2010 (r201368)
+++ head/sys/i386/include/cpufunc.h Fri Jan 1 20:55:11 2010 (r201369)
@@ -203,28 +203,28 @@ inl(u_int port)
}
static __inline void
-insb(u_int port, void *addr, size_t cnt)
+insb(u_int port, void *addr, size_t count)
{
__asm __volatile("cld; rep; insb"
- : "+D" (addr), "+c" (cnt)
+ : "+D" (addr), "+c" (count)
: "d" (port)
: "memory");
}
static __inline void
-insw(u_int port, void *addr, size_t cnt)
+insw(u_int port, void *addr, size_t count)
{
__asm __volatile("cld; rep; insw"
- : "+D" (addr), "+c" (cnt)
+ : "+D" (addr), "+c" (count)
: "d" (port)
: "memory");
}
static __inline void
-insl(u_int port, void *addr, size_t cnt)
+insl(u_int port, void *addr, size_t count)
{
__asm __volatile("cld; rep; insl"
- : "+D" (addr), "+c" (cnt)
+ : "+D" (addr), "+c" (count)
: "d" (port)
: "memory");
}
@@ -257,26 +257,26 @@ outl(u_int port, u_int data)
}
static __inline void
-outsb(u_int port, const void *addr, size_t cnt)
+outsb(u_int port, const void *addr, size_t count)
{
__asm __volatile("cld; rep; outsb"
- : "+S" (addr), "+c" (cnt)
+ : "+S" (addr), "+c" (count)
: "d" (port));
}
static __inline void
-outsw(u_int port, const void *addr, size_t cnt)
+outsw(u_int port, const void *addr, size_t count)
{
__asm __volatile("cld; rep; outsw"
- : "+S" (addr), "+c" (cnt)
+ : "+S" (addr), "+c" (count)
: "d" (port));
}
static __inline void
-outsl(u_int port, const void *addr, size_t cnt)
+outsl(u_int port, const void *addr, size_t count)
{
__asm __volatile("cld; rep; outsl"
- : "+S" (addr), "+c" (cnt)
+ : "+S" (addr), "+c" (count)
: "d" (port));
}
@@ -684,9 +684,9 @@ void halt(void);
void ia32_pause(void);
u_char inb(u_int port);
u_int inl(u_int port);
-void insb(u_int port, void *addr, size_t cnt);
-void insl(u_int port, void *addr, size_t cnt);
-void insw(u_int port, void *addr, size_t cnt);
+void insb(u_int port, void *addr, size_t count);
+void insl(u_int port, void *addr, size_t count);
+void insw(u_int port, void *addr, size_t count);
register_t intr_disable(void);
void intr_restore(register_t ef);
void invd(void);
@@ -711,9 +711,9 @@ void load_gs(u_int sel);
void ltr(u_short sel);
void outb(u_int port, u_char data);
void outl(u_int port, u_int data);
-void outsb(u_int port, const void *addr, size_t cnt);
-void outsl(u_int port, const void *addr, size_t cnt);
-void outsw(u_int port, const void *addr, size_t cnt);
+void outsb(u_int port, const void *addr, size_t count);
+void outsl(u_int port, const void *addr, size_t count);
+void outsw(u_int port, const void *addr, size_t count);
void outw(u_int port, u_short data);
u_int rcr0(void);
u_int rcr2(void);
More information about the svn-src-head
mailing list