Changeset 1e94e09 in mainline
- Timestamp:
- 2014-05-16T23:34:14Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- b5674b2
- Parents:
- 7d68e5c7
- Location:
- uspace
- Files:
-
- 7 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbhid/Makefile
r7d68e5c7 r1e94e09 50 50 mouse/mousedev.c \ 51 51 multimedia/multimedia.c \ 52 multimedia/keymap.c 52 multimedia/keymap.c \ 53 blink1/blink1.c 53 54 54 55 SOURCES = \ -
uspace/drv/bus/usb/usbhid/subdrivers.c
r7d68e5c7 r1e94e09 37 37 #include <usb/hid/usages/core.h> 38 38 #include <usb/hid/hidpath.h> 39 39 #include "kbd/kbddev.h" 40 #include "mouse/mousedev.h" 40 41 #include "multimedia/multimedia.h" 41 #include " mouse/mousedev.h"42 #include "blink1/blink1.h" 42 43 #include "generic/hiddev.h" 43 44 44 45 static const usb_hid_subdriver_usage_t path_kbd[] = { 45 {USB_HIDUT_PAGE_GENERIC_DESKTOP, 46 USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD}, 46 { 47 USB_HIDUT_PAGE_GENERIC_DESKTOP, 48 USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD 49 }, 47 50 {0, 0} 48 51 }; 49 52 50 53 static const usb_hid_subdriver_usage_t path_mouse[] = { 51 {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE}, 54 { 55 USB_HIDUT_PAGE_GENERIC_DESKTOP, 56 USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE 57 }, 52 58 {0, 0} 53 59 }; 54 60 55 static const usb_hid_subdriver_usage_t multim_key_path[] = { 56 {USB_HIDUT_PAGE_CONSUMER, USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL}, 61 static const usb_hid_subdriver_usage_t path_multim_key[] = { 62 { 63 USB_HIDUT_PAGE_CONSUMER, 64 USB_HIDUT_USAGE_CONSUMER_CONSUMER_CONTROL 65 }, 57 66 {0, 0} 58 67 }; … … 73 82 }, 74 83 { 75 multim_key_path,84 path_multim_key, 76 85 1, 77 86 USB_HID_PATH_COMPARE_BEGIN, … … 98 107 } 99 108 }, 109 { 110 NULL, 111 0, 112 USB_HID_PATH_COMPARE_BEGIN, 113 0x27b8, 114 0x01ed, 115 { 116 .init = usb_blink1_init, 117 .deinit = usb_blink1_deinit, 118 .poll = NULL, 119 .poll_end = NULL 120 } 121 } 100 122 }; 101 123 -
uspace/lib/c/Makefile
r7d68e5c7 r1e94e09 65 65 generic/device/pio_window.c \ 66 66 generic/device/clock_dev.c \ 67 generic/device/led_dev.c \ 67 68 generic/dhcp.c \ 68 69 generic/dnsr.c \ -
uspace/lib/c/include/ipc/dev_iface.h
r7d68e5c7 r1e94e09 65 65 CLOCK_DEV_IFACE, 66 66 67 /** Interface provided by LED devices */ 68 LED_DEV_IFACE, 69 67 70 /** Interface provided by battery powered devices */ 68 71 BATTERY_DEV_IFACE, -
uspace/lib/drv/Makefile
r7d68e5c7 r1e94e09 54 54 generic/remote_usbhid.c \ 55 55 generic/remote_clock_dev.c \ 56 generic/remote_led_dev.c \ 56 57 generic/remote_battery_dev.c \ 57 58 generic/remote_ahci.c -
uspace/lib/drv/generic/dev_iface.c
r7d68e5c7 r1e94e09 43 43 #include "remote_char_dev.h" 44 44 #include "remote_clock_dev.h" 45 #include "remote_led_dev.h" 45 46 #include "remote_battery_dev.h" 46 47 #include "remote_graph_dev.h" … … 68 69 [USBHID_DEV_IFACE] = &remote_usbhid_iface, 69 70 [CLOCK_DEV_IFACE] = &remote_clock_dev_iface, 71 [LED_DEV_IFACE] = &remote_led_dev_iface, 70 72 [BATTERY_DEV_IFACE] = &remote_battery_dev_iface, 71 73 [AHCI_DEV_IFACE] = &remote_ahci_iface, -
uspace/srv/locsrv/locsrv.c
r7d68e5c7 r1e94e09 1332 1332 categ_dir_add_cat(&cdir, cat); 1333 1333 1334 cat = category_new("led"); 1335 categ_dir_add_cat(&cdir, cat); 1336 1334 1337 cat = category_new("serial"); 1335 1338 categ_dir_add_cat(&cdir, cat);
Note:
See TracChangeset
for help on using the changeset viewer.