Reduce unnecessary indentation to improve readability.

Author: forderud

src/HID/HID.cpp

@@ -34,47 +34,44 @@ int HID_::getInterface(uint8_t* interfaceCount)
         D_INTERFACE(pluggedInterface, 2, USB_DEVICE_CLASS_HUMAN_INTERFACE, HID_SUBCLASS_NONE, HID_PROTOCOL_NONE),
         D_HIDREPORT(descriptorSize),
         D_ENDPOINT(USB_ENDPOINT_IN(HID_TX), USB_ENDPOINT_TYPE_INTERRUPT, USB_EP_SIZE, 0x14),
-                D_ENDPOINT(USB_ENDPOINT_OUT(HID_RX), USB_ENDPOINT_TYPE_INTERRUPT, USB_EP_SIZE, 0x0A)
+        D_ENDPOINT(USB_ENDPOINT_OUT(HID_RX), USB_ENDPOINT_TYPE_INTERRUPT, USB_EP_SIZE, 0x0A)
     };
     return USB_SendControl(0, &hidInterface, sizeof(hidInterface));
 }
 
 // Since this function is not exposed in USBCore API, had to replicate here.
 static bool USB_SendStringDescriptor(const char* string_P, u8 string_len, uint8_t flags) {
+    u8 c[2] = {(u8)(2 + string_len * 2), 3};
 
-        u8 c[2] = {(u8)(2 + string_len * 2), 3};
+    USB_SendControl(0,&c,2);
 
-        USB_SendControl(0,&c,2);
-
-        bool pgm = flags & TRANSFER_PGM;
-        for(u8 i = 0; i < string_len; i++) {
-                c[0] = pgm ? pgm_read_byte(&string_P[i]) : string_P[i];
-                c[1] = 0;
-                int r = USB_SendControl(0,&c,2);
-                if(!r) {
-                        return false;
-                }
-        }
-        return true;
+    bool pgm = flags & TRANSFER_PGM;
+    for(u8 i = 0; i < string_len; i++) {
+            c[0] = pgm ? pgm_read_byte(&string_P[i]) : string_P[i];
+            c[1] = 0;
+            int r = USB_SendControl(0,&c,2);
+            if(!r) {
+                return false;
+            }
+    }
+    return true;
 }
 
 int HID_::getDescriptor(USBSetup& setup)
 {
-
-        u8 t = setup.wValueH;
-
-        // HID-specific strings
-        if(USB_STRING_DESCRIPTOR_TYPE == t) {
-
-            // we place all strings in the 0xFF00-0xFFFE range
-            HIDReport* rep = GetFeature(0xFF00 | setup.wValueL );
-            if(rep) {
-                return USB_SendStringDescriptor((char*)rep->data, strlen_P((char*)rep->data), TRANSFER_PGM);
-            }
-            else {
-                return 0;
-            }
+    u8 t = setup.wValueH;
+
+    // HID-specific strings
+    if(USB_STRING_DESCRIPTOR_TYPE == t) {
+        // we place all strings in the 0xFF00-0xFFFE range
+        HIDReport* rep = GetFeature(0xFF00 | setup.wValueL );
+        if(rep) {
+            return USB_SendStringDescriptor((char*)rep->data, strlen_P((char*)rep->data), TRANSFER_PGM);
         }
+        else {
+            return 0;
+        }
+    }
 
     // Check if this is a HID Class Descriptor request
     if (setup.bmRequestType != REQUEST_DEVICETOHOST_STANDARD_INTERFACE) { return 0; }
@@ -108,15 +105,13 @@ uint8_t HID_::getShortName(char *name)
         return strlen_P(serial);
     }
     else {
-
         // default serial number
-
-    name[0] = 'H';
-    name[1] = 'I';
-    name[2] = 'D';
-    name[3] = 'A' + (descriptorSize & 0x0F);
-    name[4] = 'A' + ((descriptorSize >> 4) & 0x0F);
-    return 5;
+        name[0] = 'H';
+        name[1] = 'I';
+        name[2] = 'D';
+        name[3] = 'A' + (descriptorSize & 0x0F);
+        name[4] = 'A' + ((descriptorSize >> 4) & 0x0F);
+        return 5;
     }
 }
 
@@ -151,7 +146,6 @@ int HID_::SetFeature(uint16_t id, const void* data, int len)
                 break;
             }
         }
-
     }
 
     reportCount++;
@@ -205,20 +199,17 @@ bool HID_::setup(USBSetup& setup)
     if (requestType == REQUEST_DEVICETOHOST_CLASS_INTERFACE)
     {
         if (request == HID_GET_REPORT) {
+            if(setup.wValueH == HID_REPORT_TYPE_FEATURE)
+            {
+                HIDReport* current = GetFeature(setup.wValueL);
+                if(current){
+                    if(USB_SendControl(0, &(current->id), 1)>0 &&
+                       USB_SendControl(0, current->data, current->length)>0)
+                        return true;
+                }
 
-                        if(setup.wValueH == HID_REPORT_TYPE_FEATURE)
-                        {
-
-                            HIDReport* current = GetFeature(setup.wValueL);
-                            if(current){
-                                if(USB_SendControl(0, &(current->id), 1)>0 &&
-                                   USB_SendControl(0, current->data, current->length)>0)
-                                    return true;
-                            }
-
-                            return false;
-
-                        }
+                return false;
+            }
             return true;
         }
         if (request == HID_GET_PROTOCOL) {
@@ -244,21 +235,19 @@ bool HID_::setup(USBSetup& setup)
         }
         if (request == HID_SET_REPORT)
         {
-                        if(setup.wValueH == HID_REPORT_TYPE_FEATURE)
-                        {
-
-                            HIDReport* current = GetFeature(setup.wValueL);
-                            if(!current) return false;
-                            if(setup.wLength != current->length + 1) return false;
-                            uint8_t* data = new uint8_t[setup.wLength];
-                            USB_RecvControl(data, setup.wLength);
-                            if(*data != current->id) return false;
-                            memcpy((uint8_t*)current->data, data+1, current->length);
-                            delete[] data;
-                            return true;
-
-                        }
-
+            if(setup.wValueH == HID_REPORT_TYPE_FEATURE)
+            {
+
+                HIDReport* current = GetFeature(setup.wValueL);
+                if(!current) return false;
+                if(setup.wLength != current->length + 1) return false;
+                uint8_t* data = new uint8_t[setup.wLength];
+                USB_RecvControl(data, setup.wLength);
+                if(*data != current->id) return false;
+                memcpy((uint8_t*)current->data, data+1, current->length);
+                delete[] data;
+                return true;
+            }
         }
     }