Changes in / [eb87adb:f1a9e87] in mainline


Ignore:
Location:
uspace
Files:
7 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/vuhid/Makefile

    reb87adb rf1a9e87  
    4747
    4848SOURCES_INTERFACES = \
    49         hids/bootkbd.c \
    50         hids/logitech_wireless.c
     49        hids/bootkbd.c
    5150
    5251SOURCES = \
    … …  
    5453        device.c \
    5554        ifaces.c \
    56         life.c \
    5755        stdreq.c \
    5856        $(SOURCES_INTERFACES)

  • uspace/app/vuhid/hids/bootkbd.c

    reb87adb rf1a9e87  
    9393             0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
    9494};
    95 static vuhid_interface_life_t boot_life = {
    96         .data_in = in_data,
    97         .data_in_count = sizeof(in_data)/INPUT_SIZE,
    98         .data_in_pos_change_delay = 500,
    99         .msg_born = "Boot keyboard comes to life...",
    100         .msg_die = "Boot keyboard died."
    101 };
     95static size_t in_data_count = sizeof(in_data)/INPUT_SIZE;
     96// FIXME - locking
     97static size_t in_data_position = 0;
     98
     99static int on_data_in(vuhid_interface_t *iface,
     100    void *buffer, size_t buffer_size, size_t *act_buffer_size)
     101{
     102        static size_t last_pos = (size_t) -1;
     103        size_t pos = in_data_position;
     104        if (pos >= in_data_count) {
     105                return EBADCHECKSUM;
     106        }
     107
     108        if (last_pos == pos) {
     109                return ENAK;
     110        }
     111
     112        if (buffer_size > INPUT_SIZE) {
     113                buffer_size = INPUT_SIZE;
     114        }
     115
     116        if (act_buffer_size != NULL) {
     117                *act_buffer_size = buffer_size;
     118        }
     119
     120        memcpy(buffer, in_data + pos * INPUT_SIZE, buffer_size);
     121        last_pos = pos;
     122
     123        return EOK;
     124}
    102125
    103126static int on_data_out(vuhid_interface_t *iface,
    … …  
    118141}
    119142
     143
     144static void live(vuhid_interface_t *iface)
     145{
     146        async_usleep(1000 * 1000 * 5);
     147        usb_log_debug("Boot keyboard comes to life...\n");
     148        while (in_data_position < in_data_count) {
     149                async_usleep(1000 * 500);
     150                in_data_position++;
     151        }
     152        usb_log_debug("Boot keyboard died.\n");
     153}
     154
     155
    120156vuhid_interface_t vuhid_interface_bootkbd = {
    121157        .id = "boot",
    … …  
    128164
    129165        .in_data_size = INPUT_SIZE,
    130         .on_data_in = interface_live_on_data_in,
     166        .on_data_in = on_data_in,
    131167
    132168        .out_data_size = 1,
    133169        .on_data_out = on_data_out,
    134170
    135         .live = interface_life_live,
     171        .live = live,
    136172
    137         .interface_data = &boot_life,
    138173        .vuhid_data = NULL
    139174};

  • uspace/app/vuhid/ifaces.c

    reb87adb rf1a9e87  
    3838
    3939extern vuhid_interface_t vuhid_interface_bootkbd;
    40 extern vuhid_interface_t vuhid_interface_logitech_wireless_1;
    4140
    4241vuhid_interface_t *available_hid_interfaces[] = {
    4342        &vuhid_interface_bootkbd,
    44         &vuhid_interface_logitech_wireless_1,
    4543        NULL
    4644};

  • uspace/app/vuhid/virthid.h

    reb87adb rf1a9e87  
    8282
    8383typedef struct {
    84         /** Buffer with data from device to the host. */
    85         uint8_t *data_in;
    86         /** Number of items in @c data_in.
    87          * The total size of @c data_in buffer shall be
    88          * <code>data_in_count * vuhid_interface_t.in_data_size</code>.
    89          */
    90         size_t data_in_count;
    91 
    92         /** Current position in the data buffer. */
    93         size_t data_in_pos;
    94         /** Previous position. */
    95         size_t data_in_last_pos;
    96 
    97         /** Delay between transition to "next" input buffer (in ms). */
    98         size_t data_in_pos_change_delay;
    99 
    100         /** Message to print when interface becomes alive. */
    101         const char *msg_born;
    102         /** Message to print when interface dies. */
    103         const char *msg_die;
    104 } vuhid_interface_life_t;
    105 
    106 typedef struct {
    10784        uint8_t length;
    10885        uint8_t type;
    … …  
    11794void wait_for_interfaces_death(usbvirt_device_t *);
    11895
    119 void interface_life_live(vuhid_interface_t *);
    120 int interface_live_on_data_in(vuhid_interface_t *, void *, size_t, size_t *);
    121 
    122 
    12396#endif
    12497/**

  • uspace/drv/bus/usb/usbhid/mouse/mousedev.c

    reb87adb rf1a9e87  
    7575/** Default idle rate for mouses. */
    7676static const uint8_t IDLE_RATE = 0;
     77static const size_t USB_MOUSE_BUTTON_COUNT = 3;
    7778
    7879/*----------------------------------------------------------------------------*/
    … …  
    396397/*----------------------------------------------------------------------------*/
    397398
    398 /** Get highest index of a button mentioned in given report.
    399  *
    400  * @param report HID report.
    401  * @param report_id Report id we are interested in.
    402  * @return Highest button mentioned in the report.
    403  * @retval 1 No button was mentioned.
    404  *
    405  */
    406 static size_t usb_mouse_get_highest_button(usb_hid_report_t *report, uint8_t report_id)
    407 {
    408         size_t highest_button = 0;
    409 
    410         usb_hid_report_path_t *path = usb_hid_report_path();
    411         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
    412         usb_hid_report_path_set_report_id(path, report_id);
    413 
    414         usb_hid_report_field_t *field = NULL;
    415 
    416         /* Break from within. */
    417         while (1) {
    418                 field = usb_hid_report_get_sibling(
    419                     report, field, path,
    420                     USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
    421                     USB_HID_REPORT_TYPE_INPUT);
    422                 /* No more buttons? */
    423                 if (field == NULL) {
    424                         break;
    425                 }
    426 
    427                 size_t current_button = field->usage - field->usage_minimum;
    428                 if (current_button > highest_button) {
    429                         highest_button = current_button;
    430                 }
    431         }
    432 
    433         usb_hid_report_path_free(path);
    434 
    435         return highest_button;
    436 }
    437 
    438 /*----------------------------------------------------------------------------*/
    439 
    440399int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
    441400{
    … …  
    455414        }
    456415       
    457         // FIXME: This may not be optimal since stupid hardware vendor may
    458         // use buttons 1, 2, 3 and 6000 and we would allocate array of
    459         // 6001*4B and use only 4 items in it.
    460         // Since I doubt that hardware producers would do that, I think
    461         // that the current solution is good enough.
    462         /* Adding 1 because we will be accessing buttons[highest]. */
    463         mouse_dev->buttons_count = usb_mouse_get_highest_button(hid_dev->report,
    464             hid_dev->report_id) + 1;
    465         mouse_dev->buttons = calloc(mouse_dev->buttons_count, sizeof(int32_t));
     416        mouse_dev->buttons = (int32_t *)calloc(USB_MOUSE_BUTTON_COUNT,
     417            sizeof(int32_t));
    466418       
    467419        if (mouse_dev->buttons == NULL) {
    468                 usb_log_error(NAME ": out of memory, giving up on device!\n");
     420                usb_log_fatal("No memory!\n");
    469421                free(mouse_dev);
    470422                return ENOMEM;
    471423        }
    472 
    473 
     424       
    474425        // save the Mouse device structure into the HID device structure
    475426        *data = mouse_dev;

  • uspace/drv/bus/usb/usbhid/mouse/mousedev.h

    reb87adb rf1a9e87  
    5050        async_sess_t *wheel_sess;
    5151       
    52         /* Mouse buttons statuses. */
    5352        int32_t *buttons;
    54         size_t buttons_count;
    5553       
    5654        ddf_dev_ops_t ops;

  • uspace/drv/bus/usb/vhc/connhost.c

    reb87adb rf1a9e87  
    440440        int rc = vhc_virtdev_add_transfer(vhc, transfer);
    441441        if (rc != EOK) {
    442                 if (transfer->setup_buffer != NULL) {
    443                         free(transfer->setup_buffer);
    444                 }
     442                free(transfer->setup_buffer);
    445443                free(transfer);
    446444                return rc;

  • uspace/lib/usbhid/src/hidpath.c

    reb87adb rf1a9e87  
    7676                                    int32_t usage_page, int32_t usage)
    7777{       
    78         usb_hid_report_usage_path_t *item
    79                 = malloc(sizeof(usb_hid_report_usage_path_t));
    80 
    81         if (item == NULL) {
     78        usb_hid_report_usage_path_t *item;
     79
     80        if(!(item=malloc(sizeof(usb_hid_report_usage_path_t)))) {
    8281                return ENOMEM;
    8382        }
Note: See TracChangeset for help on using the changeset viewer.