KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* fixe up ifxmips patch for eeprom emulation to work with lantiq target

Browse source 
SVN-Revision: 25369
This commit is contained in:
John Crispin 2011-02-05 15:08:18 +00:00
parent b33ce3109d
commit 4a0572a8d0
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
package/madwifi/patches/354-ifxmips_eeprom.patch
View file

@ -1,13 +1,12 @@
--- a/ath_hal/ah_os.c --- a/ath_hal/ah_os.c
+++ b/ath_hal/ah_os.c +++ b/ath_hal/ah_os.c
@@ -343,6 +343,46 @@ EXPORT_SYMBOL(ath_hal_func); @@ -343,6 +343,45 @@
* NB: see the comments in ah_osdep.h about byte-swapping register * NB: see the comments in ah_osdep.h about byte-swapping register
* reads and writes to understand what's going on below. * reads and writes to understand what's going on below.
*/ */
+ +
+#ifdef CONFIG_IFXMIPS +#ifdef CONFIG_LANTIQ
+extern int ifxmips_has_brn_block(void); +extern int lantiq_emulate_madwifi_eep;
+static int ifxmips_emulate = 0;
+#define EEPROM_EMULATION 1 +#define EEPROM_EMULATION 1
+#endif +#endif
+ +
@ -47,13 +46,13 @@
void __ahdecl void __ahdecl
ath_hal_reg_write(struct ath_hal *ah, u_int reg, u_int32_t val) ath_hal_reg_write(struct ath_hal *ah, u_int reg, u_int32_t val)
{ {
@@ -351,20 +391,33 @@ ath_hal_reg_write(struct ath_hal *ah, u_ @@ -351,20 +390,33 @@
ath_hal_printf(ah, "%s: WRITE 0x%x <= 0x%x\n", ath_hal_printf(ah, "%s: WRITE 0x%x <= 0x%x\n",
(ath_hal_func ?: "unknown"), reg, val); (ath_hal_func ?: "unknown"), reg, val);
#endif #endif
- _OS_REG_WRITE(ah, reg, val); - _OS_REG_WRITE(ah, reg, val);
+#ifdef EEPROM_EMULATION +#ifdef EEPROM_EMULATION
+ if((reg >= 0x6000) && (reg <= 0x6010) && ifxmips_emulate) + if((reg >= 0x6000) && (reg <= 0x6010) && lantiq_emulate_madwifi_eep)
+ { + {
+ val = ath_hal_eeprom(ah, reg, val, 1); + val = ath_hal_eeprom(ah, reg, val, 1);
+ } else + } else
@ -70,7 +69,7 @@
- u_int32_t val; - u_int32_t val;
+ u_int32_t val; + u_int32_t val;
+#ifdef EEPROM_EMULATION +#ifdef EEPROM_EMULATION
+ if((reg >= 0x6000) && (reg <= 0x6010) && ifxmips_emulate) + if((reg >= 0x6000) && (reg <= 0x6010) && lantiq_emulate_madwifi_eep)
+ { + {
+ val = ath_hal_eeprom(ah, reg, 0, 0); + val = ath_hal_eeprom(ah, reg, 0, 0);
+ } else + } else
@ -85,14 +84,11 @@
(ath_hal_func ?: "unknown"), reg, val); (ath_hal_func ?: "unknown"), reg, val);
#endif #endif
return val; return val;
@@ -581,7 +634,9 @@ init_ath_hal(void) @@ -581,7 +633,6 @@
{ {
const char *sep; const char *sep;
int i; int i;
- -
+#ifdef CONFIG_IFXMIPS
+ ifxmips_emulate = ifxmips_has_brn_block();
+#endif
printk(KERN_INFO "%s: %s (", dev_info, ath_hal_version); printk(KERN_INFO "%s: %s (", dev_info, ath_hal_version);
sep = ""; sep = "";
for (i = 0; ath_hal_buildopts[i] != NULL; i++) { for (i = 0; ath_hal_buildopts[i] != NULL; i++) {