Changeset fedac2f in mainline for uspace/drv/bus


Ignore:
Timestamp:
2012-09-16T11:27:35Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
289fa65
Parents:
8930624 (diff), 00b4a68 (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 mainline changes

Location:
uspace/drv/bus
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/isa/isa.c

    r8930624 rfedac2f  
    712712static void isa_init()
    713713{
    714         ddf_log_init(NAME, LVL_ERROR);
     714        ddf_log_init(NAME);
    715715        isa_fun_ops.interfaces[HW_RES_DEV_IFACE] = &isa_fun_hw_res_ops;
    716716}
  • uspace/drv/bus/pci/pciintel/pci.c

    r8930624 rfedac2f  
    729729static void pciintel_init(void)
    730730{
    731         ddf_log_init(NAME, LVL_ERROR);
     731        ddf_log_init(NAME);
    732732        pci_fun_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops;
    733733        pci_fun_ops.interfaces[PCI_DEV_IFACE] = &pci_dev_ops;
  • uspace/drv/bus/usb/ehci/main.c

    r8930624 rfedac2f  
    132132int main(int argc, char *argv[])
    133133{
    134         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
     134        log_init(NAME);
    135135        return ddf_driver_main(&ehci_driver);
    136136}
  • uspace/drv/bus/usb/ohci/main.c

    r8930624 rfedac2f  
    8383int main(int argc, char *argv[])
    8484{
    85         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
     85        log_init(NAME);
    8686        return ddf_driver_main(&ohci_driver);
    8787}
  • uspace/drv/bus/usb/uhci/main.c

    r8930624 rfedac2f  
    8787{
    8888        printf(NAME ": HelenOS UHCI driver.\n");
    89         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
     89        log_init(NAME);
    9090
    9191        return ddf_driver_main(&uhci_driver);
  • uspace/drv/bus/usb/uhcirh/main.c

    r8930624 rfedac2f  
    7373{
    7474        printf(NAME ": HelenOS UHCI root hub driver.\n");
    75         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
     75        log_init(NAME);
    7676        return ddf_driver_main(&uhci_rh_driver);
    7777}
  • uspace/drv/bus/usb/usbflbk/main.c

    r8930624 rfedac2f  
    110110int main(int argc, char *argv[])
    111111{
    112         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
     112        log_init(NAME);
    113113
    114114        return usb_driver_main(&usbfallback_driver);
  • uspace/drv/bus/usb/usbhid/main.c

    r8930624 rfedac2f  
    172172        printf(NAME ": HelenOS USB HID driver.\n");
    173173
    174         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
     174        log_init(NAME);
    175175
    176176        return usb_driver_main(&usb_hid_driver);
  • uspace/drv/bus/usb/usbhub/main.c

    r8930624 rfedac2f  
    7979{
    8080        printf(NAME ": HelenOS USB hub driver.\n");
    81         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
     81        log_init(NAME);
    8282
    8383        return usb_driver_main(&usb_hub_driver);
  • uspace/drv/bus/usb/usbmast/main.c

    r8930624 rfedac2f  
    383383int main(int argc, char *argv[])
    384384{
    385         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
     385        log_init(NAME);
    386386
    387387        return usb_driver_main(&usbmast_driver);
  • uspace/drv/bus/usb/usbmid/main.c

    r8930624 rfedac2f  
    180180        printf(NAME ": USB multi interface device driver.\n");
    181181
    182         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
     182        log_init(NAME);
    183183
    184184        return usb_driver_main(&mid_driver);
  • uspace/drv/bus/usb/vhc/Makefile

    r8930624 rfedac2f  
    3232        $(LIBUSBDEV_PREFIX)/libusbdev.a \
    3333        $(LIBUSBHOST_PREFIX)/libusbhost.a \
     34        $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    3435        $(LIBUSB_PREFIX)/libusb.a \
    35         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
    3636        $(LIBDRV_PREFIX)/libdrv.a
    3737
  • uspace/drv/bus/usb/vhc/main.c

    r8930624 rfedac2f  
    138138int main(int argc, char * argv[])
    139139{       
    140         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
     140        log_init(NAME);
    141141
    142142        printf(NAME ": virtual USB host controller driver.\n");
Note: See TracChangeset for help on using the changeset viewer.