summaryrefslogtreecommitdiff
path: root/sys/dev/ic/rtwvar.h
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2005-10-24 02:53:33 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2005-10-24 02:53:33 +0000
commit40090a5854f768816777fb93a6b4dea614b79705 (patch)
tree9ab1cfd355a680111cf5284544f104bfb5de1be0 /sys/dev/ic/rtwvar.h
parentb2e0b4b7b64c8492674da9a8ec2e23e20776d20b (diff)
change read/write callbacks to use a void * instead of struct rtw_regs.
why? rtw uses the smc93cx6 EEPROM and a separate diff will allow accessing it without depending on the bus_space_* functions. this is required for the RTL8187L. discussed with jsg@
Diffstat (limited to 'sys/dev/ic/rtwvar.h')
-rw-r--r--sys/dev/ic/rtwvar.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ic/rtwvar.h b/sys/dev/ic/rtwvar.h
index 4a9390c2468..3d4d67332d5 100644
--- a/sys/dev/ic/rtwvar.h
+++ b/sys/dev/ic/rtwvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtwvar.h,v 1.18 2005/10/24 02:46:08 reyk Exp $ */
+/* $OpenBSD: rtwvar.h,v 1.19 2005/10/24 02:53:32 reyk Exp $ */
/* $NetBSD: rtwvar.h,v 1.10 2004/12/26 22:37:57 mycroft Exp $ */
/*-
@@ -126,13 +126,13 @@ struct rtw_regs {
void *r_priv;
/* bus independent I/O callbacks */
- u_int8_t (*r_read8)(struct rtw_regs *, u_int32_t);
- u_int16_t (*r_read16)(struct rtw_regs *, u_int32_t);
- u_int32_t (*r_read32)(struct rtw_regs *, u_int32_t);
- void (*r_write8)(struct rtw_regs *, u_int32_t, u_int8_t);
- void (*r_write16)(struct rtw_regs *, u_int32_t, u_int16_t);
- void (*r_write32)(struct rtw_regs *, u_int32_t, u_int32_t);
- void (*r_barrier)(struct rtw_regs *, u_int32_t, u_int32_t, int);
+ u_int8_t (*r_read8)(void *, u_int32_t);
+ u_int16_t (*r_read16)(void *, u_int32_t);
+ u_int32_t (*r_read32)(void *, u_int32_t);
+ void (*r_write8)(void *, u_int32_t, u_int8_t);
+ void (*r_write16)(void *, u_int32_t, u_int16_t);
+ void (*r_write32)(void *, u_int32_t, u_int32_t);
+ void (*r_barrier)(void *, u_int32_t, u_int32_t, int);
};
#define RTW_SR_GET(sr, ofs) \