Ticket #684: madwifi.pci-register.diff

hal/linux/ah_osdep.h

@@ -163 +163 @@
- * platforms we have to byte-swap thoese registers specifically.
- * Most of this code is collapsed at compile time because the
- * register values are constants.
+ *
+ * Presumably when talking about hardware byte-swapping, the above
+ * text is referring to the Atheros chipset, as the registers 
+ * referred to are in the PCI memory address space, and these are
+ * never byte-swapped by PCI chipsets or bridges, but always 
+ * written directly (as in the format defined by the manufacturer).
- */
-#if AH_BYTE_ORDER == AH_BIG_ENDIAN
-
-
-
-
-
-
+
+
+
+
-} while (0)
- 
-(_reg) >= 0x4000 && (_reg) < 0x5000) ? 
-*((volatile u_int32_t *)((_ah)->ah_sh + (_reg)))) : 
-*((volatile u_int32_t *)((_ah)->ah_sh + (_reg)
+                                        
+0x4000 <= (_reg) && (_reg) < 0x5000) ?               
+readl((_ah)->ah_sh + (_reg))) :      
+readl((_ah)->ah_sh + (_reg
-#else /* AH_LITTLE_ENDIAN */
- 
-*((volatile u_int32_t *)((_ah)->ah_sh + (_reg))) = (_val); 
+    
+writel(_val, (_ah)->ah_sh + (_reg));   
-} while (0)
- 
-*((volatile u_int32_t *)((_ah)->ah_sh + (_reg)
+        
+readl((_ah)->ah_sh + (_reg
-#endif /* AH_BYTE_ORDER */
-
-#if defined(AH_DEBUG) || defined(AH_REGOPS_FUNC) || defined(AH_DEBUG_ALQ)

hal/ah.h

@@ -610 +610 @@
-        u_int16_t       ah_subvendorid; /* PCI subvendor ID */
-        HAL_SOFTC       ah_sc;          /* back pointer to driver/os state */
-        HAL_BUS_TAG     ah_st;          /* params for register r+w */
+        /* It's uselss having an opaque type if we have to use it in the OS specific code, right? */
-        HAL_BUS_HANDLE  ah_sh;
-        HAL_CTRY_CODE   ah_countryCode;
-