i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Disable interrupts only once, to prevent misbehaviour of hardware. Though

Browse Source 
I don't know about such hardware, it is better to be cautious here.
* Code style cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34809 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Colin Günther
2009-12-29 18:12:17 +00:00
parent ed36d5dfa2
commit 6e12370632
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an.c
+3 -1
View File
@@ -897,7 +897,7 @@ an_rxeof(struct an_softc *sc)
*/ */
if (!(sc->an_monitor & AN_MONITOR_INCLUDE_BEACON) && if (!(sc->an_monitor & AN_MONITOR_INCLUDE_BEACON) &&
(rx_frame.an_frame_ctl & (rx_frame.an_frame_ctl &
IEEE80211_FC0_SUBTYPE_BEACON)) { IEEE80211_FC0_SUBTYPE_BEACON)) {
return; return;
} }
@@ -1233,8 +1233,10 @@ an_intr(void *xsc)
ifp = sc->an_ifp; ifp = sc->an_ifp;
#if !defined(__HAIKU__)
/* Disable interrupts. */ /* Disable interrupts. */
CSR_WRITE_2(sc, AN_INT_EN(sc->mpi350), 0); CSR_WRITE_2(sc, AN_INT_EN(sc->mpi350), 0);
#endif
status = CSR_READ_2(sc, AN_EVENT_STAT(sc->mpi350)); status = CSR_READ_2(sc, AN_EVENT_STAT(sc->mpi350));
CSR_WRITE_2(sc, AN_EVENT_ACK(sc->mpi350), ~AN_INTRS(sc->mpi350)); CSR_WRITE_2(sc, AN_EVENT_ACK(sc->mpi350), ~AN_INTRS(sc->mpi350));
src/add-ons/kernel/drivers/network/wlan/aironetwifi/glue.c
+1 -1
View File
@@ -38,8 +38,8 @@ HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
if (sc->an_gone) if (sc->an_gone)
return 0; return 0;
/* Disable interrupts. */
CSR_WRITE_2(sc, AN_INT_EN(sc->mpi350), 0); CSR_WRITE_2(sc, AN_INT_EN(sc->mpi350), 0);
// Disable interrupts.
return 1; return 1;
} }