summaryrefslogtreecommitdiff
path: root/sys/dev/ic/ar5xxx.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2005-05-27 04:10:07 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2005-05-27 04:10:07 +0000
commit0ad0d3638f6ef0319b6d344ba9b7cceaf67e351d (patch)
treea0e021a4927ac466a1c07112801ef594a60947d7 /sys/dev/ic/ar5xxx.c
parent78d1e449e770d8abfe489fa57c3b9c6f2993cc20 (diff)
- disable the gpio user interface for now, it's just an unimportant
button which is not yet available on non-i386 platforms - fix endianess and attachement on big endian platforms (tested on macppc - ath attaches correctly, receives frames but assoc still fails)
Diffstat (limited to 'sys/dev/ic/ar5xxx.c')
-rw-r--r--sys/dev/ic/ar5xxx.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/ic/ar5xxx.c b/sys/dev/ic/ar5xxx.c
index b5b32bdbad3..a19ff07a548 100644
--- a/sys/dev/ic/ar5xxx.c
+++ b/sys/dev/ic/ar5xxx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5xxx.c,v 1.23 2005/05/16 04:54:31 reyk Exp $ */
+/* $OpenBSD: ar5xxx.c,v 1.24 2005/05/27 04:10:06 reyk Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net>
@@ -245,7 +245,7 @@ ath_hal_attach(device, sc, st, sh, status)
}
/* Get MAC address */
- if ((*status = ar5k_eeprom_read_mac(hal, mac)) != HAL_OK) {
+ if ((*status = ar5k_eeprom_read_mac(hal, mac)) != 0) {
AR5K_PRINTF("unable to read address from EEPROM: 0x%04x\n",
device);
goto failed;
@@ -878,10 +878,6 @@ ar5k_eeprom_init(hal)
int ret, i;
u_int mode;
- /* Check if EEPROM is busy */
- if (hal->ah_eeprom_is_busy(hal) == AH_TRUE)
- return (EBUSY);
-
/* Initial TX thermal adjustment values */
ee->ee_tx_clip = 4;
ee->ee_pwd_84 = ee->ee_pwd_90 = 1;
@@ -1064,9 +1060,6 @@ ar5k_eeprom_read_mac(hal, mac)
bzero(mac, IEEE80211_ADDR_LEN);
bzero(&mac_d, IEEE80211_ADDR_LEN);
- if (hal->ah_eeprom_is_busy(hal))
- return (EBUSY);
-
if (hal->ah_eeprom_read(hal, 0x20, &data) != 0)
return (EIO);