Changeset 3746bfe in mainline for uspace/drv/usbhid/kbddev.c


Ignore:
Timestamp:
2011-03-18T17:19:29Z (13 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
103cf26, 59e01689, eedac04
Parents:
411d9fa (diff), 00b13408 (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:

Fixed #140 (properly destroying KBD structure when polling ends)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/usbhid/kbddev.c

    r411d9fa r3746bfe  
    9494        .flags = 0
    9595};
     96
     97typedef enum usbhid_kbd_flags {
     98        USBHID_KBD_STATUS_UNINITIALIZED = 0,
     99        USBHID_KBD_STATUS_INITIALIZED = 1,
     100        USBHID_KBD_STATUS_TO_DESTROY = -1
     101} usbhid_kbd_flags;
    96102
    97103/*----------------------------------------------------------------------------*/
     
    232238       
    233239        assert(kbd_dev->hid_dev != NULL);
    234         assert(kbd_dev->hid_dev->initialized);
     240        assert(kbd_dev->hid_dev->initialized == USBHID_KBD_STATUS_INITIALIZED);
    235241        usbhid_req_set_report(kbd_dev->hid_dev, USB_HID_REPORT_TYPE_OUTPUT,
    236242            buffer, BOOTP_BUFFER_OUT_SIZE);
     
    565571                                    uint8_t *buffer, size_t actual_size)
    566572{
    567         assert(kbd_dev->initialized);
     573        assert(kbd_dev->initialized == USBHID_KBD_STATUS_INITIALIZED);
    568574        assert(kbd_dev->hid_dev->parser != NULL);
    569575       
     
    619625       
    620626        kbd_dev->console_phone = -1;
    621         kbd_dev->initialized = 0;
     627        kbd_dev->initialized = USBHID_KBD_STATUS_UNINITIALIZED;
    622628       
    623629        return kbd_dev;
     
    625631
    626632/*----------------------------------------------------------------------------*/
    627 /**
    628  * Properly destroys the USB/HID keyboard structure.
    629  *
    630  * @param kbd_dev Pointer to the structure to be destroyed.
    631  */
    632 static void usbhid_kbd_free(usbhid_kbd_t **kbd_dev)
    633 {
    634         if (kbd_dev == NULL || *kbd_dev == NULL) {
    635                 return;
    636         }
    637        
    638         // hangup phone to the console
    639         async_hangup((*kbd_dev)->console_phone);
    640        
    641         if ((*kbd_dev)->hid_dev != NULL) {
    642                 usbhid_dev_free(&(*kbd_dev)->hid_dev);
    643                 assert((*kbd_dev)->hid_dev == NULL);
    644         }
    645        
    646         if ((*kbd_dev)->repeat_mtx != NULL) {
    647                 /* TODO: replace by some check and wait */
    648                 assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
    649                 free((*kbd_dev)->repeat_mtx);
    650         }
    651 
    652         free(*kbd_dev);
    653         *kbd_dev = NULL;
     633
     634static void usbhid_kbd_mark_unusable(usbhid_kbd_t *kbd_dev)
     635{
     636        kbd_dev->initialized = USBHID_KBD_STATUS_TO_DESTROY;
    654637}
    655638
     
    693676        }
    694677       
    695         if (kbd_dev->initialized) {
     678        if (kbd_dev->initialized == USBHID_KBD_STATUS_INITIALIZED) {
    696679                usb_log_warning("Keyboard structure already initialized.\n");
    697680                return EINVAL;
     
    706689        }
    707690       
    708         assert(kbd_dev->hid_dev->initialized);
     691        assert(kbd_dev->hid_dev->initialized == USBHID_KBD_STATUS_INITIALIZED);
    709692       
    710693        // save the size of the report (boot protocol report by default)
     
    758741        usbhid_req_set_idle(kbd_dev->hid_dev, IDLE_RATE);
    759742       
    760         kbd_dev->initialized = 1;
     743        kbd_dev->initialized = USBHID_KBD_STATUS_INITIALIZED;
    761744        usb_log_info("HID/KBD device structure initialized.\n");
    762745       
     
    872855        usbhid_kbd_poll(kbd_dev);
    873856       
     857        // as there is another fibril using this device, so we must leave the
     858        // structure to it, but mark it for destroying.
     859        usbhid_kbd_mark_unusable(kbd_dev);
    874860        // at the end, properly destroy the KBD structure
    875         usbhid_kbd_free(&kbd_dev);
    876         assert(kbd_dev == NULL);
     861//      usbhid_kbd_free(&kbd_dev);
     862//      assert(kbd_dev == NULL);
    877863
    878864        return EOK;
     
    996982}
    997983
     984/*----------------------------------------------------------------------------*/
     985
     986int usbhid_kbd_is_usable(const usbhid_kbd_t *kbd_dev)
     987{
     988        return (kbd_dev->initialized == USBHID_KBD_STATUS_INITIALIZED);
     989}
     990
     991/*----------------------------------------------------------------------------*/
     992/**
     993 * Properly destroys the USB/HID keyboard structure.
     994 *
     995 * @param kbd_dev Pointer to the structure to be destroyed.
     996 */
     997void usbhid_kbd_free(usbhid_kbd_t **kbd_dev)
     998{
     999        if (kbd_dev == NULL || *kbd_dev == NULL) {
     1000                return;
     1001        }
     1002       
     1003        // hangup phone to the console
     1004        async_hangup((*kbd_dev)->console_phone);
     1005       
     1006        if ((*kbd_dev)->hid_dev != NULL) {
     1007                usbhid_dev_free(&(*kbd_dev)->hid_dev);
     1008                assert((*kbd_dev)->hid_dev == NULL);
     1009        }
     1010       
     1011        if ((*kbd_dev)->repeat_mtx != NULL) {
     1012                /* TODO: replace by some check and wait */
     1013                assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
     1014                free((*kbd_dev)->repeat_mtx);
     1015        }
     1016
     1017        free(*kbd_dev);
     1018        *kbd_dev = NULL;
     1019}
     1020
    9981021/**
    9991022 * @}
Note: See TracChangeset for help on using the changeset viewer.