svn commit: r214584 - in head/sys/pc98: include pc98

[Takahashi Yoshihiro]

Author: nyan
Date: Sun Oct 31 03:03:20 2010
New Revision: 214584
URL: http://svn.freebsd.org/changeset/base/214584

Log:
  Rename BUS_SPACE_IO and BUS_SPACE_MEM defines to BUS_SPACE_TAG_IO and
  BUS_SPACE_TAG_MEM respectively to avoid conflict with nexus.c.

Modified:
  head/sys/pc98/include/bus.h
  head/sys/pc98/pc98/busiosubr.c

Modified: head/sys/pc98/include/bus.h
==============================================================================
--- head/sys/pc98/include/bus.h	Sun Oct 31 02:36:05 2010	(r214583)
+++ head/sys/pc98/include/bus.h	Sun Oct 31 03:03:20 2010	(r214584)
@@ -158,8 +158,8 @@ struct bus_space_access_methods {
  * Access methods for bus resources and address space.
  */
 struct bus_space_tag {
-#define	BUS_SPACE_IO	0
-#define	BUS_SPACE_MEM	1
+#define	BUS_SPACE_TAG_IO	0
+#define	BUS_SPACE_TAG_MEM	1
 	u_int	bs_tag;			/* bus space flags */
 
 	struct bus_space_access_methods bs_da;	/* direct access */

Modified: head/sys/pc98/pc98/busiosubr.c
==============================================================================
--- head/sys/pc98/pc98/busiosubr.c	Sun Oct 31 02:36:05 2010	(r214583)
+++ head/sys/pc98/pc98/busiosubr.c	Sun Oct 31 03:03:20 2010	(r214584)
@@ -63,7 +63,7 @@ _BUS_SPACE_CALL_FUNCS_PROTO(SBUS_RA_mem,
 _BUS_SPACE_CALL_FUNCS_PROTO(SBUS_RA_mem,u_int32_t,4)
 
 struct bus_space_tag SBUS_io_space_tag = {
-	BUS_SPACE_IO,
+	BUS_SPACE_TAG_IO,
 
 	/* direct bus access methods */
 	{
@@ -81,7 +81,7 @@ struct bus_space_tag SBUS_io_space_tag =
 };
 
 struct bus_space_tag SBUS_mem_space_tag = {
-	BUS_SPACE_MEM,
+	BUS_SPACE_TAG_MEM,
 
 	/* direct bus access methods */
 	{
@@ -109,7 +109,7 @@ _BUS_SPACE_CALL_FUNCS_PROTO(NEPC_RA_io,u
 _BUS_SPACE_CALL_FUNCS_PROTO(NEPC_RA_io,u_int32_t,4)
 
 struct bus_space_tag NEPC_io_space_tag = {
-	BUS_SPACE_IO,
+	BUS_SPACE_TAG_IO,
 
 	/* direct bus access methods */
 	{
@@ -127,7 +127,7 @@ struct bus_space_tag NEPC_io_space_tag =
 };
 
 struct bus_space_tag NEPC_mem_space_tag = {
-	BUS_SPACE_MEM,
+	BUS_SPACE_TAG_MEM,
 
 	/* direct bus access methods */
 	{
@@ -256,7 +256,7 @@ i386_memio_subregion(bus_space_tag_t t, 
 
 	pbase = pbsh->bsh_base + offset;
 	switch (t->bs_tag) {
-	case BUS_SPACE_IO:
+	case BUS_SPACE_TAG_IO:
 		if (pbsh->bsh_iatsz > 0) {
 			if (offset >= pbsh->bsh_iatsz || 
 			    offset + size > pbsh->bsh_iatsz)
@@ -265,7 +265,7 @@ i386_memio_subregion(bus_space_tag_t t, 
 		}
 		break;
 
-	case BUS_SPACE_MEM:
+	case BUS_SPACE_TAG_MEM:
 		if (pbsh->bsh_iatsz > 0)
 			return EINVAL;
 		if (offset > pbsh->bsh_sz || offset + size > pbsh->bsh_sz)
@@ -282,7 +282,7 @@ i386_memio_subregion(bus_space_tag_t t, 
 		return error;
 
 	switch (t->bs_tag) {
-	case BUS_SPACE_IO:
+	case BUS_SPACE_TAG_IO:
 		if (pbsh->bsh_iatsz > 0) {
 			for (i = 0; i < size; i ++)
 				bsh->bsh_iat[i] = pbsh->bsh_iat[i + offset];
@@ -295,7 +295,7 @@ i386_memio_subregion(bus_space_tag_t t, 
 		}
 		break;
 
-	case BUS_SPACE_MEM:
+	case BUS_SPACE_TAG_MEM:
 		break;
 	}