Ticket #1049: madwifi-0.9.3-reg.diff

madwifi/ath_hal/ah_os.c

@@ -250 +250 @@
-void __ahdecl
-ath_hal_reg_write(struct ath_hal *ah, u_int32_t reg, u_int32_t val)
-{
-        if (ath_hal_alq) {
-                unsigned long flags;
+        local_irq_save(flags);
+        if (ath_hal_alq) {
-                struct ale *ale;
-
-                local_irq_save(flags);
-                ale = ath_hal_alq_get(ah);
-                if (ale) {
-                        struct athregrec *r = (struct athregrec *) ale->ae_data;
@@ -263 +263 @@
-                        r->val = val;
-                        alq_post(ath_hal_alq, ale);
-                }
-                local_irq_restore(flags);
-        }
-        _OS_REG_WRITE(ah, reg, val);
+        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(ath_hal_reg_write);
-
-u_int32_t __ahdecl
-ath_hal_reg_read(struct ath_hal *ah, u_int32_t reg)
-{
+        unsigned long flags;
+        local_irq_save(flags);
-        u_int32_t val;
-
-        val = _OS_REG_READ(ah, reg);
-        if (ath_hal_alq) {
-                unsigned long flags;
-                struct ale *ale;
-
-                local_irq_save(flags);
-                ale = ath_hal_alq_get(ah);
-                if (ale) {
-                        struct athregrec *r = (struct athregrec *) ale->ae_data;
@@ -288 +288 @@
-                        r->val = val;
-                        alq_post(ath_hal_alq, ale);
-                }
-                local_irq_restore(flags);
-        }
+        local_irq_restore(flags);
-        return val;
-}
-EXPORT_SYMBOL(ath_hal_reg_read);
@@ -314 +314 @@
-        }
-}
-EXPORT_SYMBOL(OS_MARK);
-
+ || (AH_BYTE_ORDER == AH_BIG_ENDIAN)
-/*
- * Memory-mapped device register read/write.  These are here
- * as routines when debugging support is enabled and/or when
@@ -328 +328 @@
-void __ahdecl
-ath_hal_reg_write(struct ath_hal *ah, u_int reg, u_int32_t val)
-{
+        unsigned long flags;
+        local_irq_save(flags);
-#ifdef AH_DEBUG
-        if (ath_hal_debug > 1)
-                ath_hal_printf(ah, "WRITE 0x%x <= 0x%x\n", reg, val);
-#endif
+        
-        _OS_REG_WRITE(ah, reg, val);
+        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(ath_hal_reg_write);
-
-u_int32_t __ahdecl
-ath_hal_reg_read(struct ath_hal *ah, u_int reg)
-{
+        unsigned long flags;
-        u_int32_t val;
+        local_irq_save(flags);
-
-        val = _OS_REG_READ(ah, reg);
+        local_irq_restore(flags);
-#ifdef AH_DEBUG
-        if (ath_hal_debug > 1)
-                ath_hal_printf(ah, "READ 0x%x => 0x%x\n", reg, val);