[haiku-commits] r42664 - in haiku/trunk/src/add-ons/kernel/drivers/network/dec21xxx/dev: dc de

  • From: zharik@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 21 Aug 2011 18:56:16 +0200 (CEST)

Author: siarzhuk
Date: 2011-08-21 18:56:16 +0200 (Sun, 21 Aug 2011)
New Revision: 42664
Changeset: https://dev.haiku-os.org/changeset/42664

Modified:
   haiku/trunk/src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/glue.c
   haiku/trunk/src/add-ons/kernel/drivers/network/dec21xxx/dev/de/glue.c
Log:
No functional changes. Code style violations fixes. Thanks to Axel for pointing 
out.

Modified: haiku/trunk/src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/glue.c       
2011-08-21 16:24:19 UTC (rev 42663)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/dec21xxx/dev/dc/glue.c       
2011-08-21 16:56:16 UTC (rev 42664)
@@ -16,16 +16,26 @@
 
 #include "if_dcreg.h"
 
+
+int check_disable_interrupts_dc(device_t dev);
+void reenable_interrupts_dc(device_t dev);
+
+extern int check_disable_interrupts_de(device_t dev);
+extern void reenable_interrupts_de(device_t dev);
+
+
 HAIKU_FBSD_DRIVERS_GLUE(dec21xxx);
 
 HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE | 
FBSD_SWI_TASKQUEUE);
 
+
 extern driver_t *DRIVER_MODULE_NAME(dc, pci);
 extern driver_t *DRIVER_MODULE_NAME(de, pci);
 
-status_t __haiku_handle_fbsd_drivers_list(status_t (*handler)(driver_t *[]))
+status_t
+__haiku_handle_fbsd_drivers_list(status_t (*handler)(driver_t *[]))
 {
-       driver_t *drivers[] = { 
+       driver_t *drivers[] = {
                DRIVER_MODULE_NAME(dc, pci),
                DRIVER_MODULE_NAME(de, pci),
                NULL
@@ -33,6 +43,7 @@
        return (*handler)(drivers);
 }
 
+
 extern driver_t *DRIVER_MODULE_NAME(acphy, miibus);
 extern driver_t *DRIVER_MODULE_NAME(amphy, miibus);
 extern driver_t *DRIVER_MODULE_NAME(dcphy, miibus);
@@ -55,18 +66,11 @@
 }
 
 
-int check_disable_interrupts_dc(device_t dev);
-void reenable_interrupts_dc(device_t dev);
-
-extern int check_disable_interrupts_de(device_t dev);
-extern void reenable_interrupts_de(device_t dev);
-
-
 int
 HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
 {
        uint16 name = *(uint16*)dev->device_name;
-       switch(name) {
+       switch (name) {
                case 'cd':
                        return check_disable_interrupts_dc(dev);
                case 'ed':
@@ -84,7 +88,7 @@
 HAIKU_REENABLE_INTERRUPTS(device_t dev)
 {
        uint16 name = *(uint16*)dev->device_name;
-       switch(name) {
+       switch (name) {
                case 'cd':
                        reenable_interrupts_dc(dev);
                        break;
@@ -98,7 +102,8 @@
 }
 
 
-int check_disable_interrupts_dc(device_t dev)
+int
+check_disable_interrupts_dc(device_t dev)
 {
        struct dc_softc *sc = device_get_softc(dev);
        uint16_t status;
@@ -126,12 +131,13 @@
        CSR_WRITE_4(sc, DC_IMR, 0);
 
        HAIKU_INTR_REGISTER_LEAVE();
-       
+
        return 1;
 }
 
 
-void reenable_interrupts_dc(device_t dev)
+void
+reenable_interrupts_dc(device_t dev)
 {
        struct dc_softc *sc = device_get_softc(dev);
        DC_LOCK(sc);

Modified: haiku/trunk/src/add-ons/kernel/drivers/network/dec21xxx/dev/de/glue.c
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/network/dec21xxx/dev/de/glue.c       
2011-08-21 16:24:19 UTC (rev 42663)
+++ haiku/trunk/src/add-ons/kernel/drivers/network/dec21xxx/dev/de/glue.c       
2011-08-21 16:56:16 UTC (rev 42664)
@@ -51,7 +51,7 @@
        TULIP_CSR_WRITE(sc, csr_intr, 0);
 
        HAIKU_INTR_REGISTER_LEAVE();
-       
+
        return 1;
 }
 
@@ -64,3 +64,4 @@
        TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask);
        TULIP_UNLOCK(sc);
 }
+


Other related posts:

  • » [haiku-commits] r42664 - in haiku/trunk/src/add-ons/kernel/drivers/network/dec21xxx/dev: dc de - zharik