upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-15 14:29:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename BUS_SPACE_IO and BUS_SPACE_MEM defines to BUS_SPACE_TAG_IO and

Browse source 
BUS_SPACE_TAG_MEM respectively to avoid conflict with nexus.c.
This commit is contained in:
Yoshihiro Takahashi 2010-10-31 03:03:20 +00:00
parent 6f8b6f9469
commit f8a94ecc2c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/pc98/include/bus.h
View file

@ -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 */

16
sys/pc98/pc98/busiosubr.c
View file

@ -63,7 +63,7 @@ _BUS_SPACE_CALL_FUNCS_PROTO(SBUS_RA_mem,u_int16_t,2)
_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_int16_t,2)
_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, bus_space_handle_t pbsh,
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, bus_space_handle_t pbsh,
}
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, bus_space_handle_t pbsh,
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, bus_space_handle_t pbsh,
}
break;
case BUS_SPACE_MEM:
case BUS_SPACE_TAG_MEM:
break;
}