diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-07-17 02:30:08 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-07-17 02:30:08 +0000 |
commit | 613e530afeab2eb78d7b4100420fd305662beab1 (patch) | |
tree | 547d05d8319b3931a4fa1e5b1a5cbd543af52361 /package/madwifi/patches-r3776/318-ifxmips_eeprom.patch | |
parent | 0e9ca337996b5b4ef392bc92cde7f4bc9699b3ea (diff) |
huge madwifi update (work in progress, disabled by default, compiles but breaks at run time)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11851 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/patches-r3776/318-ifxmips_eeprom.patch')
-rw-r--r-- | package/madwifi/patches-r3776/318-ifxmips_eeprom.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/package/madwifi/patches-r3776/318-ifxmips_eeprom.patch b/package/madwifi/patches-r3776/318-ifxmips_eeprom.patch new file mode 100644 index 000000000..4fcc5926f --- /dev/null +++ b/package/madwifi/patches-r3776/318-ifxmips_eeprom.patch @@ -0,0 +1,87 @@ +Index: madwifi-trunk-r3776/ath_hal/ah_os.c +=================================================================== +--- madwifi-trunk-r3776.orig/ath_hal/ah_os.c 2008-07-17 00:21:30.000000000 +0200 ++++ madwifi-trunk-r3776/ath_hal/ah_os.c 2008-07-17 04:00:18.000000000 +0200 +@@ -917,9 +917,56 @@ + * NB: see the comments in ah_osdep.h about byte-swapping register + * reads and writes to understand what's going on below. + */ ++ ++#ifdef CONFIG_IFXMIPS ++extern int ifxmips_has_brn_block(void); ++static int ifxmips_emulate = 0; ++#define EEPROM_EMULATION 1 ++#endif ++ ++#ifdef EEPROM_EMULATION ++static int ath_hal_eeprom(struct ath_hal *ah, unsigned long addr, int val, int write) ++{ ++ static int addrsel = 0; ++ static int rc = 0; ++ ++ if (write) { ++ if(addr == 0x6000) { ++ addrsel = val * 2; ++ rc = 0; ++ } ++ } else { ++ switch(addr) ++ { ++ case 0x600c: ++ if(rc++ < 2) ++ val = 0x00000000; ++ else ++ val = 0x00000002; ++ break; ++ case 0x6004: ++ val = cpu_to_le16(__raw_readw((u16 *) KSEG1ADDR(0xb07f0400 + addrsel))); ++ /* this forces the regdomain to 0x00 (worldwide), as the original setting ++ * causes issues with the HAL */ ++ if (addrsel == 0x17e) ++ val = 0; ++ break; ++ } ++ } ++ return val; ++} ++#endif ++ + void __ahdecl + ath_hal_reg_write(struct ath_hal *ah, u_int address, u_int32_t value) + { ++#ifdef EEPROM_EMULATION ++ if((address >= 0x6000) && (address <= 0x6010) && ifxmips_emulate) { ++ ath_hal_eeprom(ah, address, value, 1); ++ return; ++ } ++#endif ++ + _trace_regop(ah, REGOP_WRITE, address, value); + _OS_REG_WRITE(ah, address, value); + } +@@ -929,7 +976,14 @@ + u_int32_t __ahdecl + ath_hal_reg_read(struct ath_hal *ah, u_int address) + { +- u_int32_t val = _OS_REG_READ(ah, address); ++ u_int32_t val; ++ ++#ifdef EEPROM_EMULATION ++ if((address >= 0x6000) && (address <= 0x6010) && ifxmips_emulate) ++ val = ath_hal_eeprom(ah, address, 0, 0); ++ else ++#endif ++ val = _OS_REG_READ(ah, address); + _trace_regop(ah, REGOP_READ, address, val); + return val; + } +@@ -1123,6 +1177,9 @@ + #ifdef MMIOTRACE + kmmio_logmsg = _kmmio_logmsg; + #endif ++#ifdef CONFIG_IFXMIPS ++ ifxmips_emulate = ifxmips_has_brn_block(); ++#endif + + sep = ""; + for (i = 0; ath_hal_buildopts[i] != NULL; i++) { |