summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_wpireg.h
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2006-05-20 11:47:30 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2006-05-20 11:47:30 +0000
commita7e75802006b95ac91285962228e1407da74cb2b (patch)
treeb72909d7ad29a437d5eff79b30816ef142b8fb8c /sys/dev/pci/if_wpireg.h
parentf9586043a3f01b73eb7fab31e7cad2119222cfee (diff)
- fix short slot time and short preamble settings
- fix basic rates setting - fix check for WEP encryption (authreq frames might require encryption in shared mode) - cleanup a few things while i'm here
Diffstat (limited to 'sys/dev/pci/if_wpireg.h')
-rw-r--r--sys/dev/pci/if_wpireg.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/if_wpireg.h b/sys/dev/pci/if_wpireg.h
index 34fbafbb1a5..fa341c0d6db 100644
--- a/sys/dev/pci/if_wpireg.h
+++ b/sys/dev/pci/if_wpireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wpireg.h,v 1.1 2006/05/14 19:00:48 damien Exp $ */
+/* $OpenBSD: if_wpireg.h,v 1.2 2006/05/20 11:47:29 damien Exp $ */
/*-
@@ -452,9 +452,9 @@ struct wpi_bluetooth {
/* structure for command WPI_CMD_TXPOWER */
struct wpi_txpower {
uint32_t reserved1;
- uint16_t calib1[14];
+ uint16_t pwr1[14];
uint32_t reserved2[2];
- uint16_t calib2[14];
+ uint16_t pwr2[14];
uint32_t reserved3[2];
} __packed;
@@ -495,8 +495,8 @@ struct wpi_start_scan {
#define WPI_EEPROM_REVISION 0x035
#define WPI_EEPROM_CAPABILITIES 0x045
#define WPI_EEPROM_TYPE 0x04a
-#define WPI_EEPROM_CALIB1 0x1ae
-#define WPI_EEPROM_CALIB2 0x1bc
+#define WPI_EEPROM_PWR1 0x1ae
+#define WPI_EEPROM_PWR2 0x1bc
#define WPI_READ(sc, reg) \
bus_space_read_4((sc)->sc_st, (sc)->sc_sh, (reg))