Changeset 63455 in vbox for trunk/src

Timestamp:

Aug 15, 2016 12:54:45 AM (8 years ago)

Author:

vboxsync

Message:

VBoxGuest-netbsd.c: fix indentation and brace placement.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c (modified) (14 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-netbsd.c

@@ -149 +149 @@
 
 static const struct fileops vboxguest_fileops = {
-        .fo_read = fbadop_read,
-        .fo_write = fbadop_write,
-        .fo_ioctl = VBoxGuestNetBSDIOCtl,
-        .fo_fcntl = fnullop_fcntl,
-        .fo_poll = VBoxGuestNetBSDPoll,
-        .fo_stat = fbadop_stat,
-        .fo_close = VBoxGuestNetBSDClose,
-        .fo_kqfilter = fnullop_kqfilter,
-        .fo_restart = fnullop_restart
+    .fo_read = fbadop_read,
+    .fo_write = fbadop_write,
+    .fo_ioctl = VBoxGuestNetBSDIOCtl,
+    .fo_fcntl = fnullop_fcntl,
+    .fo_poll = VBoxGuestNetBSDPoll,
+    .fo_stat = fbadop_stat,
+    .fo_close = VBoxGuestNetBSDClose,
+    .fo_kqfilter = fnullop_kqfilter,
+    .fo_restart = fnullop_restart
 };
 
@@ -184 +184 @@
     LogFlow((DEVICE_NAME ": %s\n", __func__));
 
-    if ((vboxguest = device_lookup_private(&vboxguest_cd, minor(device))) == NULL) {
+    if ((vboxguest = device_lookup_private(&vboxguest_cd, minor(device))) == NULL)
+    {
         printf("device_lookup_private failed\n");
         return (ENXIO);
     }
-    if ((vboxguest->vboxguest_state & VBOXGUEST_STATE_INITOK) == 0) {
+
+    if ((vboxguest->vboxguest_state & VBOXGUEST_STATE_INITOK) == 0)
+    {
         aprint_error_dev(vboxguest->sc_dev, "device not configured\n");
         return (ENXIO);
@@ -194 +197 @@
 
     session = kmem_alloc(sizeof(*session), KM_SLEEP);
-    if (session == NULL) {
+    if (session == NULL)
+    {
         return (ENOMEM);
     }
@@ -200 +204 @@
     session->sc = vboxguest;
 
-    if ((error = fd_allocfile(&fp, &fd)) != 0) {
+    if ((error = fd_allocfile(&fp, &fd)) != 0)
+    {
         kmem_free(session, sizeof(*session));
         return error;
@@ -257 +262 @@
      * Validate the request wrapper.
      */
-    if (IOCPARM_LEN(command) != sizeof(VBGLBIGREQ)) {
+    if (IOCPARM_LEN(command) != sizeof(VBGLBIGREQ))
+    {
         Log((DEVICE_NAME ": %s: bad request %#lx size=%lu expected=%zu\n",
              __func__, command, IOCPARM_LEN(command), sizeof(VBGLBIGREQ)));
@@ -312 +318 @@
     size_t cbDataReturned;
     rc = VGDrvCommonIoCtl(command, &g_DevExt, session->session, pvBuf, ReqWrap->cbData, &cbDataReturned);
-    if (RT_SUCCESS(rc)) {
+    if (RT_SUCCESS(rc))
+    {
         rc = 0;
         if (RT_UNLIKELY(cbDataReturned > ReqWrap->cbData))
@@ -351 +358 @@
 
     u32CurSeq = ASMAtomicUoReadU32(&g_DevExt.u32MousePosChangedSeq);
-    if (session->session->u32MousePosChangedSeq != u32CurSeq) {
+    if (session->session->u32MousePosChangedSeq != u32CurSeq)
+    {
         events_processed = events & (POLLIN | POLLRDNORM);
         session->session->u32MousePosChangedSeq = u32CurSeq;
-    } else {
+    }
+    else
+    {
         events_processed = 0;
 
@@ -373 +383 @@
         return EBUSY;
 
-    if ((vboxguest->vboxguest_state & VBOXGUEST_STATE_INITOK) == 0) {
+    if ((vboxguest->vboxguest_state & VBOXGUEST_STATE_INITOK) == 0)
         return 0;
-    }
 
     /*
@@ -436 +445 @@
     LogFlow((DEVICE_NAME ": %s\n", __func__));
 
-    if (pci_intr_map(pa, &vboxguest->ih)) {
+    if (pci_intr_map(pa, &vboxguest->ih))
+    {
         aprint_error_dev(vboxguest->sc_dev, "couldn't map interrupt.\n");
         return VERR_DEV_IO_ERROR;
     }
+
     intrstr = pci_intr_string(vboxguest->pc, vboxguest->ih
 #if __NetBSD_Prereq__(6, 99, 39)
@@ -446 +457 @@
                               );
     aprint_normal_dev(vboxguest->sc_dev, "interrupting at %s\n", intrstr);
+
     vboxguest->pfnIrqHandler = pci_intr_establish(vboxguest->pc, vboxguest->ih, IPL_BIO, VBoxGuestNetBSDISR, vboxguest);
-    if (vboxguest->pfnIrqHandler == NULL) {
+    if (vboxguest->pfnIrqHandler == NULL)
+    {
         aprint_error_dev(vboxguest->sc_dev, "couldn't establish interrupt\n");
         return VERR_DEV_IO_ERROR;
@@ -496 +509 @@
         LogFunc(("RTR0Init failed.\n"));
         aprint_error_dev(vboxguest->sc_dev, "RTR0Init failed\n");
-        return ;
+        return;
     }
 
@@ -537 +550 @@
                 {
                     vboxguest->vboxguest_state |= VBOXGUEST_STATE_INITOK;
-                    return ;
+                    return;
                 }
                 VGDrvCommonDeleteDevExt(&g_DevExt);
-            } else {
+            }
+            else
+            {
                 aprint_error_dev(vboxguest->sc_dev, "init failed\n");
             }
             bus_space_unmap(vboxguest->iVMMDevMemResId, vboxguest->VMMDevMemHandle, vboxguest->VMMDevMemSize);
-        } else {
+        }
+        else
+        {
             aprint_error_dev(vboxguest->sc_dev, "MMIO mapping failed\n");
         }
         bus_space_unmap(vboxguest->io_tag, vboxguest->io_handle, vboxguest->io_regsize);
-    } else {
+    }
+    else
+    {
         aprint_error_dev(vboxguest->sc_dev, "IO mapping failed\n");
     }
 
     RTR0Term();
-    return ;
+    return;
 }
 
@@ -581 +600 @@
 
 static const struct cfparent pspec = {
-        "pci", "pci", DVUNIT_ANY
+    "pci", "pci", DVUNIT_ANY
 };
 
 static struct cfdata vboxguest_cfdata[] = {
-        {
-                .cf_name = "vboxguest",
-                .cf_atname = "vboxguest",
-                .cf_unit = 0,           /* Only unit 0 is ever used  */
-                .cf_fstate = FSTATE_STAR,
-                .cf_loc = loc,
-                .cf_flags = 0,
-                .cf_pspec = &pspec,
-        },
-        { NULL, NULL, 0, 0, NULL, 0, NULL }
+    {
+        .cf_name = "vboxguest",
+        .cf_atname = "vboxguest",
+        .cf_unit = 0,           /* Only unit 0 is ever used  */
+        .cf_fstate = FSTATE_STAR,
+        .cf_loc = loc,
+        .cf_flags = 0,
+        .cf_pspec = &pspec,
+    },
+    { NULL, NULL, 0, 0, NULL, 0, NULL }
 };
 
@@ -607 +626 @@
 
     bmajor = cmajor = NODEVMAJOR;
-    switch (cmd) {
+    switch (cmd)
+    {
         case MODULE_CMD_INIT:
-                error = config_cfdriver_attach(&vboxguest_cd);
-                if (error) {
-                    printf("config_cfdriver_attach failed: %d", error);
-                    break;
-                }
-                error = config_cfattach_attach(vboxguest_cd.cd_name, &vboxguest_ca);
-                if (error) {
-                    config_cfdriver_detach(&vboxguest_cd);
-                    printf("%s: unable to register cfattach\n", vboxguest_cd.cd_name);
-                    break;
-                }
-
-                error = config_cfdata_attach(vboxguest_cfdata, 1);
-                if (error) {
-                        printf("%s: unable to attach cfdata\n", vboxguest_cd.cd_name);
-                        config_cfattach_detach(vboxguest_cd.cd_name, &vboxguest_ca);
-                        config_cfdriver_detach(&vboxguest_cd);
-                        break;
-                }
-
-                error = devsw_attach("vboxguest", NULL, &bmajor, &g_VBoxGuestNetBSDChrDevSW, &cmajor);
+            error = config_cfdriver_attach(&vboxguest_cd);
+            if (error)
+            {
+                printf("config_cfdriver_attach failed: %d", error);
+                break;
+            }
+            error = config_cfattach_attach(vboxguest_cd.cd_name, &vboxguest_ca);
+            if (error)
+            {
+                config_cfdriver_detach(&vboxguest_cd);
+                printf("%s: unable to register cfattach\n", vboxguest_cd.cd_name);
+                break;
+            }
+            error = config_cfdata_attach(vboxguest_cfdata, 1);
+            if (error)
+            {
+                printf("%s: unable to attach cfdata\n", vboxguest_cd.cd_name);
+                config_cfattach_detach(vboxguest_cd.cd_name, &vboxguest_ca);
+                config_cfdriver_detach(&vboxguest_cd);
+                break;
+            }
+
+            error = devsw_attach("vboxguest", NULL, &bmajor, &g_VBoxGuestNetBSDChrDevSW, &cmajor);
                 
-                if (error == EEXIST)
-                        error = 0; /* maybe built-in ... improve eventually */
-                if (error)
-                        break;
-
-                error = do_sys_mknod(curlwp, "/dev/vboxguest", 0666|S_IFCHR, makedev(cmajor, 0), &retval, UIO_SYSSPACE);
-                if (error == EEXIST)
-                        error = 0;
+            if (error == EEXIST)
+                error = 0; /* maybe built-in ... improve eventually */
+
+            if (error)
                 break;
+
+            error = do_sys_mknod(curlwp, "/dev/vboxguest", 0666|S_IFCHR, makedev(cmajor, 0), &retval, UIO_SYSSPACE);
+            if (error == EEXIST)
+                error = 0;
+            break;
+
         case MODULE_CMD_FINI:
-                error = config_cfdata_detach(vboxguest_cfdata);
-                if (error)
-                    break;
-                error = config_cfattach_detach(vboxguest_cd.cd_name, &vboxguest_ca);
-                if (error)
-                    break;
-                config_cfdriver_detach(&vboxguest_cd);
-                error = devsw_detach(NULL, &g_VBoxGuestNetBSDChrDevSW);
+            error = config_cfdata_detach(vboxguest_cfdata);
+            if (error)
                 break;
+            error = config_cfattach_detach(vboxguest_cd.cd_name, &vboxguest_ca);
+            if (error)
+                break;
+            config_cfdriver_detach(&vboxguest_cd);
+            error = devsw_detach(NULL, &g_VBoxGuestNetBSDChrDevSW);
+            break;
+
         default:
-                return ENOTTY;
+            return ENOTTY;
     }
     return error;