Changeset e11f8e3 in rtems-libbsd


Ignore:
Timestamp:
Oct 7, 2016, 5:09:48 AM (4 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
b96abfd647154f10ea8f7fac68e25676636eded5, 26866d2c1f2432b25b5db71995bce2035187c715, 9abf1d3885730c165ae3ef1cdcc281fef82a337e, freebsd-9.3, e649184003d4d61c30f13086421b8d216da0d3e1
Children:
335bb97
Parents:
e3881ee
git-author:
Sebastian Huber <sebastian.huber@…> (10/07/16 05:09:48)
git-committer:
Sebastian Huber <sebastian.huber@…> (10/07/16 05:24:42)
Message:

ohci: Fixes due to USB stack update

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • freebsd/sys/dev/usb/controller/ohci.h

    re3881ee re11f8e3  
    254254
    255255        char    sc_vendor[16];
     256#ifdef __rtems__
     257        int sc_init_done;
     258#ifdef BSP_USB_OTG_TRANSCEIVER_I2C_ADDR
     259        struct usb_otg_transceiver sc_otg_trans;
     260#endif /* BSP_USB_OTG_TRANSCEIVER_I2C_ADDR */
     261#endif /* __rtems__ */
    256262
    257263} ohci_softc_t;
  • rtemsbsd/sys/dev/usb/controller/ohci_lpc.c

    re3881ee re11f8e3  
    3535#include <bsp.h>
    3636
     37#include <errno.h>
     38
    3739#if defined(LIBBSP_ARM_LPC24XX_BSP_H) || defined(LIBBSP_ARM_LPC32XX_BSP_H)
    3840
     
    225227#include <sys/stdint.h>
    226228#include <sys/stddef.h>
    227 #include <sys/param.h>
     229#include <rtems/bsd/sys/param.h>
    228230#include <sys/queue.h>
    229231#include <sys/types.h>
     
    233235#include <sys/linker_set.h>
    234236#include <sys/module.h>
    235 #include <sys/lock.h>
     237#include <rtems/bsd/sys/lock.h>
    236238#include <sys/mutex.h>
    237239#include <sys/condvar.h>
     
    363365static device_attach_t ohci_lpc_attach;
    364366static device_detach_t ohci_lpc_detach;
    365 static device_suspend_t ohci_lpc_suspend;
    366367static device_resume_t ohci_lpc_resume;
    367368
     
    395396
    396397static int
    397 ohci_lpc_suspend(device_t self)
    398 {
    399         ohci_softc_t *e = device_get_softc(self);
    400         int eno = bus_generic_suspend(self);
    401 
    402         if (eno == 0) {
    403                 ohci_suspend(e);
    404         }
    405 
    406         return (eno);
    407 }
    408 
    409 static int
    410398ohci_lpc_resume(device_t self)
    411399{
    412         ohci_softc_t *e = device_get_softc(self);
    413400        int eno = 0;
    414401
     
    443430
    444431        if (eno == 0) {
    445                 ohci_resume(e);
    446 
    447432                eno = bus_generic_resume(self);
    448433        }
     
    473458        e->sc_bus.devices = e->sc_devices;
    474459        e->sc_bus.devices_max = OHCI_MAX_DEVICES;
     460        e->sc_bus.dma_bits = 32;
    475461
    476462        /* Get all DMA memory */
     
    603589        }
    604590
    605         device_delete_all_children(self);
     591        device_delete_children(self);
    606592
    607593        if (e->sc_init_done) {
     
    633619        DEVMETHOD(device_attach, ohci_lpc_attach),
    634620        DEVMETHOD(device_detach, ohci_lpc_detach),
    635         DEVMETHOD(device_suspend, ohci_lpc_suspend),
     621        DEVMETHOD(device_suspend, bus_generic_suspend),
    636622        DEVMETHOD(device_resume, ohci_lpc_resume),
    637623        DEVMETHOD(device_shutdown, bus_generic_shutdown),
Note: See TracChangeset for help on using the changeset viewer.