Changeset 7787dd81 in mainline

Timestamp:

2011-04-01T13:57:12Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e4153ea

Parents:

85fa1e1 (diff), 70a71e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged fix to output report creation (+ change in reseting LED array).

Location:

uspace

Files:

• drv/usbkbd/kbddev.c (modified) (1 diff)
• lib/usb/src/hidparser.c (modified) (7 diffs)

uspace/drv/usbkbd/kbddev.c

@@ -272 +272 @@
         unsigned i = 0;
         
+        /* Reset the LED data. */
+        memset(kbd_dev->led_data, 0, kbd_dev->led_output_size * sizeof(int32_t));
+        
         if ((kbd_dev->mods & KM_NUM_LOCK) && (i < kbd_dev->led_output_size)) {
                 kbd_dev->led_data[i++] = USB_HID_LED_NUM_LOCK;

uspace/lib/usb/src/hidparser.c

@@ -1200 +1200 @@
         }
 
+        usb_log_debug("OUTPUT BUFFER: %s\n", usb_debug_str_buffer(buffer,size, 0));
+        usb_log_debug("OUTPUT DATA[0]: %d, DATA[1]: %d, DATA[2]: %d\n", data[0], data[1], data[2]);
+
         item = parser->output.next;     
         while(item != &parser->output) {
@@ -1208 +1211 @@
                         if(idx >= data_size) {
                                 break;
-                        }
-
-                        // translate data
-                        if(USB_HID_ITEM_FLAG_CONSTANT(report_item->item_flags)) {
-                                value = report_item->logical_minimum;
-                        }
-                        else {
-                                //variable item
-                                value = usb_hid_translate_data_reverse(report_item, data[idx]);
-                                idx++;
                         }
 
@@ -1224 +1217 @@
                                         
 //                              // variable item
+                                value = usb_hid_translate_data_reverse(report_item, data[idx++]);
                                 offset = report_item->offset + (i * report_item->size);
                                 length = report_item->size;
@@ -1229 +1223 @@
                         else {
                                 //bitmap
+                                value += usb_hid_translate_data_reverse(report_item, data[idx++]);
                                 offset = report_item->offset;
                                 length = report_item->size * report_item->count;
@@ -1239 +1234 @@
                                 }
 
-                                size_t shift=0;
-                                if(((offset+length)%8) > 0) {
-                                        shift = (8- ((offset+length)%8));
-                                }
+                                size_t shift = offset%8;
 
                                 value = value << shift;                                                 
                                 value = value & (((1 << length)-1) << shift);
-                                buffer[offset/8] = buffer[offset/8] | value;
+                                
+                                uint8_t mask = 0;
+                                mask = 0xff - (((1 << length) - 1) << shift);
+                                buffer[offset/8] = (buffer[offset/8] & mask) | value;
                         }
                         else {
                                 // je to ve dvou!! FIXME: melo by to umet delsi jak 2
 
-                                // konec prvniho
+                                // konec prvniho -- dolni x bitu
                                 tmp_value = value;
-                                tmp_value = tmp_value >> (8 - (offset%8) - 1);
                                 tmp_value = tmp_value & ((1 << (8-(offset%8)))-1);                              
-
-                                buffer[offset/8] = buffer[offset/8] | tmp_value;
-
-                                // a ted druhej
-                                value = value & ((1 << (length - (8 - (offset%8))))-1);
-                                value = value << (8 - (length - (8 - (offset%8))));
+                                tmp_value = tmp_value << (offset%8);
+
+                                uint8_t mask = 0;
+                                mask = ~(((1 << (8-(offset%8)))-1) << (offset%8));
+                                buffer[offset/8] = (buffer[offset/8] & mask) | tmp_value;
+
+                                // a ted druhej -- hornich length-x bitu
+                                value = value >> (8 - (offset % 8));
+                                value = value & ((1 << (length - (8 - (offset % 8)))) - 1);
                                 
-                                buffer[(offset+length-1)/8] = buffer[(offset+length-1)/8] | value;
+                                mask = ((1 << (length - (8 - (offset % 8)))) - 1);
+                                buffer[(offset+length-1)/8] = (buffer[(offset+length-1)/8] & mask) | value;
                         }
 
@@ -1270 +1268 @@
         }
 
+        usb_log_debug("OUTPUT BUFFER: %s\n", usb_debug_str_buffer(buffer,size, 0));
 
         return EOK;
@@ -1284 +1283 @@
         int ret=0;
         int resolution;
+
+        if(USB_HID_ITEM_FLAG_CONSTANT(item->item_flags)) {
+                ret = item->logical_minimum;
+        }
 
         if((USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0)) {