Changeset f317490 in mainline

Timestamp:

2011-11-09T14:33:03Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2d1ba51

Parents:

07b9cbae

Message:

usbhid: Change index and count to unsigned types.

Location:

uspace/drv/bus/usb/usbhid

Files:

• usbhid.c (modified) (8 diffs)
• usbhid.h (modified) (2 diffs)

uspace/drv/bus/usb/usbhid/usbhid.c

@@ -51 +51 @@
 #include "subdrivers.h"
 
-/*----------------------------------------------------------------------------*/
-
 /* Array of endpoints expected on the device, NULL terminated. */
 const usb_endpoint_description_t *usb_hid_endpoints[] = {
@@ -324 +322 @@
         return EOK;
 }
-
 /*----------------------------------------------------------------------------*/
 /*
@@ -429 +426 @@
          */
         bool ok = false;
-        for (int i = 0; i < hid_dev->subdriver_count; ++i) {
+        for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
                 if (hid_dev->subdrivers[i].init != NULL) {
                         usb_log_debug("Initializing subdriver %d.\n",i);
@@ -494 +491 @@
         bool cont = false;
         /* Continue if at least one of the subdrivers want to continue */
-        for (int i = 0; i < hid_dev->subdriver_count; ++i) {
+        for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
                 if (hid_dev->subdrivers[i].poll != NULL) {
                         cont = cont || hid_dev->subdrivers[i].poll(
@@ -503 +500 @@
         return cont;
 }
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
 void usb_hid_polling_ended_callback(usb_device_t *dev, bool reason, void *arg)
 {
@@ -513 +508 @@
         usb_hid_dev_t *hid_dev = arg;
 
-        for (int i = 0; i < hid_dev->subdriver_count; ++i) {
+        for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
                 if (hid_dev->subdrivers[i].poll_end != NULL) {
                         hid_dev->subdrivers[i].poll_end(
@@ -522 +517 @@
         hid_dev->running = false;
 }
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
 void usb_hid_new_report(usb_hid_dev_t *hid_dev)
 {
         ++hid_dev->report_nr;
 }
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
 int usb_hid_report_number(const usb_hid_dev_t *hid_dev)
 {
         return hid_dev->report_nr;
 }
-
 /*----------------------------------------------------------------------------*/
 void usb_hid_deinit(usb_hid_dev_t *hid_dev)
@@ -547 +537 @@
             hid_dev->subdrivers, hid_dev->subdriver_count);
 
-        for (int i = 0; i < hid_dev->subdriver_count; ++i) {
+        for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
                 if (hid_dev->subdrivers[i].deinit != NULL) {
                         hid_dev->subdrivers[i].deinit(hid_dev,

uspace/drv/bus/usb/usbhid/usbhid.h

@@ -104 +104 @@
 
         /** Index of the polling pipe in usb_hid_endpoints array. */
-        int poll_pipe_index;
+        unsigned poll_pipe_index;
 
         /** Subdrivers. */
@@ -110 +110 @@
 
         /** Number of subdrivers. */
-        int subdriver_count;
+        unsigned subdriver_count;
 
         /** Report descriptor. */