Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Ensuring that interrupts are disabled only once per interrupt.

Browse Source 
* Coding style cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34818 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Colin Günther 2009-12-29 23:00:42 +00:00
parent f8762ee71c
commit 75b892d51f
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c
View File

@ -1387,6 +1387,7 @@ rt2560_intr(void *arg)
RAL_LOCK(sc);
#if !defined(__HAIKU__)
/* disable interrupts */
RAL_WRITE(sc, RT2560_CSR8, 0xffffffff);
@ -1395,6 +1396,7 @@ rt2560_intr(void *arg)
RAL_UNLOCK(sc);
return;
}
#endif
r = RAL_READ(sc, RT2560_CSR7);
RAL_WRITE(sc, RT2560_CSR7, r);

2
src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c
View File

@ -1186,6 +1186,7 @@ rt2661_intr(void *arg)
RAL_LOCK(sc);
#if !defined(__HAIKU__)
/* disable MAC and MCU interrupts */
RAL_WRITE(sc, RT2661_INT_MASK_CSR, 0xffffff7f);
RAL_WRITE(sc, RT2661_MCU_INT_MASK_CSR, 0xffffffff);
@ -1195,6 +1196,7 @@ rt2661_intr(void *arg)
RAL_UNLOCK(sc);
return;
}
#endif
r1 = RAL_READ(sc, RT2661_INT_SOURCE_CSR);
RAL_WRITE(sc, RT2661_INT_SOURCE_CSR, r1);

3
src/add-ons/kernel/drivers/network/wlan/ralinkwifi/glue.c
View File

@ -48,9 +48,10 @@ HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
RAL_WRITE(sc, RT2661_MCU_INT_MASK_CSR, 0xffffffff);
}
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
// don't re-enable interrupts if we're shutting down
return 0;
}
return 1;
}