mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2025-02-21 09:44:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in reverse engineering iwpriv functions now requiring access to sc.

Browse Source 
git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3293 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mtaylor 2008-01-28 21:02:07 +00:00
parent 314dd3b3d8
commit 3f689304d6
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ath/if_ath.c
View File

@ -249,10 +249,10 @@ static unsigned int ath_read_register(struct ieee80211com *ic,
static unsigned int ath_write_register(struct ieee80211com *ic, static unsigned int ath_write_register(struct ieee80211com *ic,
unsigned int address, unsigned int value); unsigned int address, unsigned int value);
static void ath_ar5212_registers_dump(struct ath_softc *sc); static void ath_ar5212_registers_dump(struct ath_softc *sc);
static void ath_print_register(const char* name, u_int32_t address, static void ath_print_register(struct ath_softc *sc, const char* name,
u_int32_t v); u_int32_t address, u_int32_t v);
static void ath_print_register_delta(const char* name, u_int32_t address, static void ath_print_register_delta(struct ath_softc *sc, const char* name,
u_int32_t v_old, u_int32_t v_new); u_int32_t address, u_int32_t v_old, u_int32_t v_new);
#endif /* #ifdef ATH_REVERSE_ENGINEERING */ #endif /* #ifdef ATH_REVERSE_ENGINEERING */
static int ath_set_mac_address(struct net_device *, void *); static int ath_set_mac_address(struct net_device *, void *);
@ -11827,7 +11827,8 @@ ath_rcv_dev_event(struct notifier_block *this, unsigned long event,
* printed with the status in symbolic form. */ * printed with the status in symbolic form. */
#ifdef ATH_REVERSE_ENGINEERING #ifdef ATH_REVERSE_ENGINEERING
static void static void
ath_print_register_details(const char* name, u_int32_t address, u_int32_t v) ath_print_register_details(struct ath_softc *sc, const char* name,
u_int32_t address, u_int32_t v)
{ {
/* constants from openhal ar5212reg.h */ /* constants from openhal ar5212reg.h */
#define AR5K_AR5212_PHY_ERR_FIL 0x810c #define AR5K_AR5212_PHY_ERR_FIL 0x810c
@ -11989,8 +11990,8 @@ ath_print_register_details(const char* name, u_int32_t address, u_int32_t v)
* characters than 1. */ * characters than 1. */
#ifdef ATH_REVERSE_ENGINEERING #ifdef ATH_REVERSE_ENGINEERING
static void static void
ath_print_register_delta(const char* name, u_int32_t address, u_int32_t v_old, ath_print_register_delta(struct ath_softc *sc, const char* name,
u_int32_t v_new) u_int32_t address, u_int32_t v_old, u_int32_t v_new)
{ {
#define BIT_UNCHANGED_ON "1" #define BIT_UNCHANGED_ON "1"
#define BIT_UNCHANGED_OFF "." #define BIT_UNCHANGED_OFF "."
@ -12426,10 +12427,11 @@ ath_lookup_register_name(struct ath_softc *sc, char* buf, int buflen,
/* Print out a single register name/address/value in hex and binary */ /* Print out a single register name/address/value in hex and binary */
#ifdef ATH_REVERSE_ENGINEERING #ifdef ATH_REVERSE_ENGINEERING
static void static void
ath_print_register(const char* name, u_int32_t address, u_int32_t v) ath_print_register(struct ath_softc *sc, const char* name, u_int32_t address,
u_int32_t v)
{ {
ath_print_register_delta(name, address, v, v); ath_print_register_delta(sc, name, address, v, v);
ath_print_register_details(name, address, v); ath_print_register_details(sc, name, address, v);
} }
#endif /* #ifdef ATH_REVERSE_ENGINEERING */ #endif /* #ifdef ATH_REVERSE_ENGINEERING */
@ -12485,7 +12487,7 @@ ath_ar5212_registers_dump(struct ath_softc *sc) {
ath_lookup_register_name(sc, name, ath_lookup_register_name(sc, name,
MAX_REGISTER_NAME_LEN, address); MAX_REGISTER_NAME_LEN, address);
value = ath_reg_read(sc, address); value = ath_reg_read(sc, address);
ath_print_register(name, address, value); ath_print_register(sc, name, address, value);
} while ((address += 4) < MAX_REGISTER_ADDRESS); } while ((address += 4) < MAX_REGISTER_ADDRESS);
} }
#endif /* #ifdef ATH_REVERSE_ENGINEERING */ #endif /* #ifdef ATH_REVERSE_ENGINEERING */
@ -12509,8 +12511,8 @@ ath_ar5212_registers_dump_delta(struct ath_softc *sc)
if (*p_old != value) { if (*p_old != value) {
ath_lookup_register_name(sc, name, ath_lookup_register_name(sc, name,
MAX_REGISTER_NAME_LEN, address); MAX_REGISTER_NAME_LEN, address);
ath_print_register_delta(name, address, *p_old, value); ath_print_register_delta(sc, name, address, *p_old, value);
ath_print_register_details(name, address, value); ath_print_register_details(sc, name, address, value);
} }
} while ((address += 4) < MAX_REGISTER_ADDRESS); } while ((address += 4) < MAX_REGISTER_ADDRESS);
} }