Changeset 151293d in mainline


Ignore:
Timestamp:
2011-05-27T16:10:41Z (13 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4166fb1, 6bbbcabe
Parents:
49ce810 (diff), 567a3e2 (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:

merge with development

Location:
uspace
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/mkbd/main.c

    r49ce810 r151293d  
    212212        }
    213213       
    214         //char *devpath = argv[1];
    215         const char *devpath = "/hw/pci0/00:06.0/ohci-rh/usb00_a2/HID1/hid";
     214        char *devpath = argv[1];
     215        //const char *devpath = "/hw/pci0/00:06.0/ohci-rh/usb00_a2/HID1/hid";
    216216       
    217217        int rc;
     
    297297                }
    298298               
    299                 async_usleep(100000);
     299                async_usleep(10000);
    300300        }
    301301       
  • uspace/drv/ohci/hc.c

    r49ce810 r151293d  
    343343{
    344344        assert(instance);
    345         usb_log_debug("OHCI(%p) interrupt: %x.\n", instance, status);
    346345        if ((status & ~I_SF) == 0) /* ignore sof status */
    347346                return;
     347        usb_log_debug2("OHCI(%p) interrupt: %x.\n", instance, status);
    348348        if (status & I_RHSC)
    349349                rh_interrupt(&instance->rh);
  • uspace/drv/uhci-hcd/uhci.c

    r49ce810 r151293d  
    6161} uhci_t;
    6262
    63 static inline uhci_t * dev_to_uhci(ddf_dev_t *dev)
     63static inline uhci_t * dev_to_uhci(const ddf_dev_t *dev)
    6464{
    6565        assert(dev);
     
    7777{
    7878        assert(dev);
    79         uhci_t *uhci = dev->driver_data;
    80         assert(uhci);
     79        uhci_t *uhci = dev_to_uhci(dev);
    8180        hc_t *hc = &uhci->hc;
    82         uint16_t status = IPC_GET_ARG1(*call);
     81        const uint16_t status = IPC_GET_ARG1(*call);
    8382        assert(hc);
    8483        hc_interrupt(hc, status);
    8584}
     85/*----------------------------------------------------------------------------*/
     86/** Operations supported by the HC driver */
     87static ddf_dev_ops_t hc_ops = {
     88        .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
     89};
    8690/*----------------------------------------------------------------------------*/
    8791/** Get address of the device identified by handle.
     
    115119 * @return Error code.
    116120 */
    117 static int usb_iface_get_hc_handle(
    118     ddf_fun_t *fun, devman_handle_t *handle)
     121static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
    119122{
    120123        assert(fun);
     
    131134        .get_hc_handle = usb_iface_get_hc_handle,
    132135        .get_address = usb_iface_get_address
    133 };
    134 /*----------------------------------------------------------------------------*/
    135 /** Operations supported by the HC driver */
    136 static ddf_dev_ops_t hc_ops = {
    137         .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */
    138136};
    139137/*----------------------------------------------------------------------------*/
  • uspace/drv/usbhid/mouse/mousedev.c

    r49ce810 r151293d  
    234234       
    235235        if (mouse_dev->mouse_phone < 0) {
    236                 usb_log_error(NAME " No console phone.\n");
    237                 return false;   // ??
     236                usb_log_warning(NAME " No console phone.\n");
     237                return true;
    238238        }
    239239
  • uspace/lib/drv/include/remote_pci.h

    r49ce810 r151293d  
    3636#define LIBDRV_REMOTE_PCI_H_
    3737
    38 remote_iface_t remote_pci_iface;
     38extern remote_iface_t remote_pci_iface;
    3939
    4040#endif
  • uspace/lib/drv/include/remote_usb.h

    r49ce810 r151293d  
    3636#define LIBDRV_REMOTE_USB_H_
    3737
    38 remote_iface_t remote_usb_iface;
     38extern remote_iface_t remote_usb_iface;
    3939
    4040#endif
  • uspace/lib/drv/include/remote_usbhc.h

    r49ce810 r151293d  
    3636#define LIBDRV_REMOTE_USBHC_H_
    3737
    38 remote_iface_t remote_usbhc_iface;
     38extern remote_iface_t remote_usbhc_iface;
    3939
    4040#endif
Note: See TracChangeset for help on using the changeset viewer.