summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_ipwvar.h
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2004-11-18 21:02:43 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2004-11-18 21:02:43 +0000
commit5202f3110eef90c0443d32c4807f9295dd358661 (patch)
tree9e89fb5e546fe566b6960663afe8c06bec9e2402 /sys/dev/pci/if_ipwvar.h
parent7d254a13bfe6b946843ade9d4283f4a7072db0d5 (diff)
use the filesystem based firmware loader; deraadt ok
Diffstat (limited to 'sys/dev/pci/if_ipwvar.h')
-rw-r--r--sys/dev/pci/if_ipwvar.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/sys/dev/pci/if_ipwvar.h b/sys/dev/pci/if_ipwvar.h
index c4ca8296ea1..f389a31bf05 100644
--- a/sys/dev/pci/if_ipwvar.h
+++ b/sys/dev/pci/if_ipwvar.h
@@ -1,4 +1,4 @@
-/* $Id: if_ipwvar.h,v 1.3 2004/10/27 21:21:16 damien Exp $ */
+/* $Id: if_ipwvar.h,v 1.4 2004/11/18 21:02:42 damien Exp $ */
/*-
* Copyright (c) 2004
@@ -28,10 +28,11 @@
*/
struct ipw_firmware {
- void *main;
- int main_size;
- void *ucode;
- int ucode_size;
+ u_char *data;
+ u_char *main;
+ size_t main_size;
+ u_char *ucode;
+ size_t ucode_size;
};
struct ipw_soft_bd {
@@ -88,10 +89,8 @@ struct ipw_softc {
int (*sc_newstate)(struct ieee80211com *,
enum ieee80211_state, int);
- struct ipw_firmware fw;
u_int32_t flags;
-#define IPW_FLAG_FW_CACHED (1 << 0)
-#define IPW_FLAG_FW_INITED (1 << 1)
+#define IPW_FLAG_FW_INITED (1 << 0)
struct resource *irq;
struct resource *mem;
@@ -157,7 +156,5 @@ struct ipw_softc {
#endif
};
-#define SIOCSLOADFW _IOW('i', 137, struct ifreq)
-#define SIOCSKILLFW _IOW('i', 138, struct ifreq)
#define SIOCGRADIO _IOWR('i', 139, struct ifreq)
#define SIOCGTABLE1 _IOWR('i', 140, struct ifreq)