d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace inb() and outb() with bus_space_read_1() and bus_space_write_1()

Browse Source 
Submitted by:	marius
MFC after:	1 week
This commit is contained in:
emax 2006-07-05 17:18:47 +00:00
parent 95ef2e0daa
commit 261c00b828
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
View File

@ -96,30 +96,30 @@ static void bt3c_download_firmware (bt3c_softc_p, char const *, int);
#define bt3c_set_address(sc, address) \
do { \
outb(rman_get_start((sc)->iobase) + BT3C_ADDR_L, ((address) & 0xff)); \
outb(rman_get_start((sc)->iobase) + BT3C_ADDR_H, (((address) >> 8) & 0xff)); \
bus_space_write_1((sc)->iot, (sc)->ioh, BT3C_ADDR_L, ((address) & 0xff)); \
bus_space_write_1((sc)->iot, (sc)->ioh, BT3C_ADDR_H, (((address) >> 8) & 0xff)); \
} while (0)
#define bt3c_read_data(sc, data) \
do { \
(data) = inb(rman_get_start((sc)->iobase) + BT3C_DATA_L); \
(data) |= ((inb(rman_get_start((sc)->iobase) + BT3C_DATA_H) & 0xff) << 8); \
(data) = bus_space_read_1((sc)->iot, (sc)->ioh, BT3C_DATA_L); \
(data) |= ((bus_space_read_1((sc)->iot, (sc)->ioh, BT3C_DATA_H) & 0xff) << 8); \
} while (0)
#define bt3c_write_data(sc, data) \
do { \
outb(rman_get_start((sc)->iobase) + BT3C_DATA_L, ((data) & 0xff)); \
outb(rman_get_start((sc)->iobase) + BT3C_DATA_H, (((data) >> 8) & 0xff)); \
bus_space_write_1((sc)->iot, (sc)->ioh, BT3C_DATA_L, ((data) & 0xff)); \
bus_space_write_1((sc)->iot, (sc)->ioh, BT3C_DATA_H, (((data) >> 8) & 0xff)); \
} while (0)
#define bt3c_read_control(sc, data) \
do { \
(data) = inb(rman_get_start((sc)->iobase) + BT3C_CONTROL); \
(data) = bus_space_read_1((sc)->iot, (sc)->ioh, BT3C_CONTROL); \
} while (0)
#define bt3c_write_control(sc, data) \
do { \
outb(rman_get_start((sc)->iobase) + BT3C_CONTROL, (data)); \
bus_space_write_1((sc)->iot, (sc)->ioh, BT3C_CONTROL, (data)); \
} while (0)
#define bt3c_read(sc, address, data) \
@ -622,6 +622,8 @@ bt3c_pccard_attach(device_t dev)
device_printf(dev, "Could not allocate I/O ports\n");
goto bad;
}
sc->iot = rman_get_bustag(sc->iobase);
sc->ioh = rman_get_bushandle(sc->iobase);
/* Allocate IRQ */
sc->irq_rid = 0;

2
sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h
View File

@ -63,6 +63,8 @@ struct bt3c_softc {
device_t dev; /* pointer back to device */
int iobase_rid; /* iobase RID */
struct resource *iobase; /* iobase */
bus_space_tag_t iot; /* I/O tag */
bus_space_handle_t ioh; /* I/O handle */
int irq_rid; /* irq RID */
struct resource *irq; /* irq */
void *irq_cookie; /* irq cookie */