Ticket #1049: madwifi-0.9.3-reg.3.diff

madwifi/ath_hal/ah_os.c

@@ -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;
+    preempt_disable();
+    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);
+    preempt_enable_no_resched();
-}
-EXPORT_SYMBOL(ath_hal_reg_write);
-
@@ -340 +345 @@
-ath_hal_reg_read(struct ath_hal *ah, u_int reg)
-{
-        u_int32_t val;
-
+
+
+
-        val = _OS_REG_READ(ah, reg);
+    local_irq_restore(flags);
+    preempt_enable_no_resched();
-#ifdef AH_DEBUG
-        if (ath_hal_debug > 1)
-                ath_hal_printf(ah, "READ 0x%x => 0x%x\n", reg, val);