Changeset 0ab362c in mainline for uspace/drv
- Timestamp:
- 2012-11-22T14:36:04Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- e32720ff
- Parents:
- 1f7753a (diff), 0f2c80a (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. - Location:
- uspace/drv
- Files:
-
- 15 added
- 15 edited
-
bus/isa/i8237.c (modified) (1 diff)
-
bus/pci/pciintel/pci.c (modified) (1 diff)
-
bus/usb/ehci/ehci.ma (modified) (1 diff)
-
bus/usb/ohci/ohci.ma (modified) (1 diff)
-
bus/usb/ohci/ohci_regs.h (modified) (1 diff)
-
bus/usb/uhci/hc.c (modified) (1 diff)
-
bus/usb/uhci/hc.h (modified) (1 diff)
-
bus/usb/uhcirh/port.c (modified) (1 diff)
-
char/i8042/i8042.c (modified) (1 diff)
-
char/ns8250/ns8250.c (modified) (1 diff)
-
infrastructure/rootamdm37x/Makefile (added)
-
infrastructure/rootamdm37x/amdm37x.c (added)
-
infrastructure/rootamdm37x/amdm37x.h (added)
-
infrastructure/rootamdm37x/cm/clock_control.h (added)
-
infrastructure/rootamdm37x/cm/core.h (added)
-
infrastructure/rootamdm37x/cm/iva2.h (added)
-
infrastructure/rootamdm37x/cm/mpu.h (added)
-
infrastructure/rootamdm37x/cm/usbhost.h (added)
-
infrastructure/rootamdm37x/prm/clock_control.h (added)
-
infrastructure/rootamdm37x/prm/global_reg.h (added)
-
infrastructure/rootamdm37x/prm/usbhost.h (added)
-
infrastructure/rootamdm37x/rootamdm37x.c (added)
-
infrastructure/rootamdm37x/rootamdm37x.ma (added)
-
infrastructure/rootamdm37x/uhh.h (added)
-
infrastructure/rootamdm37x/usbtll.h (added)
-
nic/e1k/e1k.c (modified) (1 diff)
-
nic/ne2k/dp8390.c (modified) (1 diff)
-
nic/rtl8139/defs.h (modified) (1 diff)
-
nic/rtl8139/driver.c (modified) (1 diff)
-
time/cmos-rtc/cmos-rtc.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/isa/i8237.c
r1f7753a r0ab362c 40 40 #include <fibril_synch.h> 41 41 #include <ddi.h> 42 #include <libarch/ddi.h>43 42 #include <ddf/log.h> 44 43 #include "i8237.h" -
uspace/drv/bus/pci/pciintel/pci.c
r1f7753a r0ab362c 58 58 #include <device/hw_res.h> 59 59 #include <ddi.h> 60 #include <libarch/ddi.h>61 60 #include <pci_dev_iface.h> 62 61 -
uspace/drv/bus/usb/ehci/ehci.ma
r1f7753a r0ab362c 1 20 usb/host=ehci 1 2 10 pci/class=0c&subclass=03&progif=20 -
uspace/drv/bus/usb/ohci/ohci.ma
r1f7753a r0ab362c 1 20 usb/host=ohci 1 2 10 pci/class=0c&subclass=03&progif=10 -
uspace/drv/bus/usb/ohci/ohci_regs.h
r1f7753a r0ab362c 245 245 #define RHPS_PRSC_FLAG (1 << 20) /* port reset status change WC */ 246 246 #define RHPS_CHANGE_WC_MASK (0x1f0000) 247 } __attribute__((packed))ohci_regs_t;247 } ohci_regs_t; 248 248 #endif 249 249 /** -
uspace/drv/bus/usb/uhci/hc.c
r1f7753a r0ab362c 35 35 #include <str_error.h> 36 36 #include <adt/list.h> 37 #include < libarch/ddi.h>37 #include <ddi.h> 38 38 39 39 #include <usb/debug.h> -
uspace/drv/bus/usb/uhci/hc.h
r1f7753a r0ab362c 37 37 38 38 #include <fibril.h> 39 #include <ddi.h>40 41 39 #include <usb/host/hcd.h> 42 40 -
uspace/drv/bus/usb/uhcirh/port.c
r1f7753a r0ab362c 32 32 * @brief UHCI root hub port routines 33 33 */ 34 #include < libarch/ddi.h> /* pio_read and pio_write */34 #include <ddi.h> 35 35 #include <fibril_synch.h> /* async_usleep */ 36 36 #include <errno.h> -
uspace/drv/char/i8042/i8042.c
r1f7753a r0ab362c 41 41 #include <device/hw_res.h> 42 42 #include <ddi.h> 43 #include <libarch/ddi.h>44 43 #include <errno.h> 45 44 #include <str_error.h> -
uspace/drv/char/ns8250/ns8250.c
r1f7753a r0ab362c 51 51 #include <sys/stat.h> 52 52 #include <ddi.h> 53 #include <libarch/ddi.h>54 53 55 54 #include <ddf/driver.h> -
uspace/drv/nic/e1k/e1k.c
r1f7753a r0ab362c 45 45 #include <ipc/irc.h> 46 46 #include <ipc/ns.h> 47 #include < libarch/ddi.h>47 #include <ddi.h> 48 48 #include <as.h> 49 49 #include <ddf/log.h> -
uspace/drv/nic/ne2k/dp8390.c
r1f7753a r0ab362c 58 58 #include <errno.h> 59 59 #include <stdio.h> 60 #include < libarch/ddi.h>60 #include <ddi.h> 61 61 #include "dp8390.h" 62 62 -
uspace/drv/nic/rtl8139/defs.h
r1f7753a r0ab362c 37 37 38 38 #include <sys/types.h> 39 #include < libarch/ddi.h>39 #include <ddi.h> 40 40 41 41 /** Size of RTL8139 registers address space */ -
uspace/drv/nic/rtl8139/driver.c
r1f7753a r0ab362c 34 34 #include <align.h> 35 35 #include <byteorder.h> 36 #include <libarch/ddi.h>37 36 #include <libarch/barrier.h> 38 37 -
uspace/drv/time/cmos-rtc/cmos-rtc.c
r1f7753a r0ab362c 40 40 #include <as.h> 41 41 #include <sysinfo.h> 42 #include <libarch/ddi.h>43 42 #include <libarch/barrier.h> 44 43 #include <stdio.h>
Note:
See TracChangeset
for help on using the changeset viewer.
