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

Coding style fixes and white space clean up. No functional change.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34473 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Colin Günther
2009-12-03 19:23:33 +00:00
parent 5b7a3b4173
commit b69928b291
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/wlan/iprowifi2100/glue.c
+2 -1
View File
@@ -3,6 +3,7 @@
* All Rights Reserved. Distributed under the terms of the MIT License. * All Rights Reserved. Distributed under the terms of the MIT License.
*/ */
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@@ -29,7 +30,7 @@ HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
struct ipw_softc* sc = (struct ipw_softc*)device_get_softc(dev); struct ipw_softc* sc = (struct ipw_softc*)device_get_softc(dev);
uint32 r; uint32 r;
HAIKU_INTR_REGISTER_STATE; HAIKU_INTR_REGISTER_STATE;
HAIKU_INTR_REGISTER_ENTER(); HAIKU_INTR_REGISTER_ENTER();
if ((r = CSR_READ_4(sc, IPW_CSR_INTR)) == 0 || r == 0xffffffff) { if ((r = CSR_READ_4(sc, IPW_CSR_INTR)) == 0 || r == 0xffffffff) {
HAIKU_INTR_REGISTER_LEAVE(); HAIKU_INTR_REGISTER_LEAVE();
src/add-ons/kernel/drivers/network/wlan/iprowifi2200/glue.c
+2 -1
View File
@@ -3,6 +3,7 @@
* All Rights Reserved. Distributed under the terms of the MIT License. * All Rights Reserved. Distributed under the terms of the MIT License.
*/ */
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@@ -29,7 +30,7 @@ HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
struct iwi_softc* sc = (struct iwi_softc*)device_get_softc(dev); struct iwi_softc* sc = (struct iwi_softc*)device_get_softc(dev);
uint32 r; uint32 r;
HAIKU_INTR_REGISTER_STATE; HAIKU_INTR_REGISTER_STATE;
HAIKU_INTR_REGISTER_ENTER(); HAIKU_INTR_REGISTER_ENTER();
if ((r = CSR_READ_4(sc, IWI_CSR_INTR)) == 0 || r == 0xffffffff) { if ((r = CSR_READ_4(sc, IWI_CSR_INTR)) == 0 || r == 0xffffffff) {
HAIKU_INTR_REGISTER_LEAVE(); HAIKU_INTR_REGISTER_LEAVE();
src/add-ons/kernel/drivers/network/wlan/iprowifi3945/glue.c
+3 -2
View File
@@ -3,6 +3,7 @@
* All Rights Reserved. Distributed under the terms of the MIT License. * All Rights Reserved. Distributed under the terms of the MIT License.
*/ */
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@@ -29,7 +30,7 @@ HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
struct wpi_softc* sc = (struct wpi_softc*)device_get_softc(dev); struct wpi_softc* sc = (struct wpi_softc*)device_get_softc(dev);
uint32 r; uint32 r;
HAIKU_INTR_REGISTER_STATE; HAIKU_INTR_REGISTER_STATE;
HAIKU_INTR_REGISTER_ENTER(); HAIKU_INTR_REGISTER_ENTER();
if ((r = WPI_READ(sc, WPI_INTR)) == 0 || r == 0xffffffff) { if ((r = WPI_READ(sc, WPI_INTR)) == 0 || r == 0xffffffff) {
HAIKU_INTR_REGISTER_LEAVE(); HAIKU_INTR_REGISTER_LEAVE();
@@ -38,7 +39,7 @@ HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
/* disable interrupts */ /* disable interrupts */
WPI_WRITE(sc, WPI_MASK, 0); WPI_WRITE(sc, WPI_MASK, 0);
HAIKU_INTR_REGISTER_LEAVE(); HAIKU_INTR_REGISTER_LEAVE();
return 1; return 1;
src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c
+5 -4
View File
@@ -3,6 +3,7 @@
* All Rights Reserved. Distributed under the terms of the MIT License. * All Rights Reserved. Distributed under the terms of the MIT License.
*/ */
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@@ -30,27 +31,27 @@ HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
struct iwn_softc* sc = (struct iwn_softc*)device_get_softc(dev); struct iwn_softc* sc = (struct iwn_softc*)device_get_softc(dev);
uint32 r1, r2; uint32 r1, r2;
HAIKU_INTR_REGISTER_STATE; HAIKU_INTR_REGISTER_STATE;
HAIKU_INTR_REGISTER_ENTER(); HAIKU_INTR_REGISTER_ENTER();
r1 = IWN_READ(sc, IWN_INTR); r1 = IWN_READ(sc, IWN_INTR);
r2 = IWN_READ(sc, IWN_INTR_STATUS); r2 = IWN_READ(sc, IWN_INTR_STATUS);
if (r1 == 0 && r2 == 0) { if (r1 == 0 && r2 == 0) {
/* not for us */ /* not for us */
IWN_WRITE(sc, IWN_MASK, IWN_INTR_MASK); IWN_WRITE(sc, IWN_MASK, IWN_INTR_MASK);
HAIKU_INTR_REGISTER_LEAVE(); HAIKU_INTR_REGISTER_LEAVE();
return 0; return 0;
} }
if (r1 == 0xffffffff) { if (r1 == 0xffffffff) {
/* hardware gone */ /* hardware gone */
HAIKU_INTR_REGISTER_LEAVE(); HAIKU_INTR_REGISTER_LEAVE();
return 0; return 0;
} }
/* disable interrupts */ /* disable interrupts */
IWN_WRITE(sc, IWN_MASK, 0); IWN_WRITE(sc, IWN_MASK, 0);
HAIKU_INTR_REGISTER_LEAVE(); HAIKU_INTR_REGISTER_LEAVE();
return 1; return 1;