Changeset 476f62c in mainline
- Timestamp:
- 2014-01-17T17:26:48Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 5828554, cf982ff
- Parents:
- 61b5b73d (diff), 66be0288 (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
- Files:
-
- 10 deleted
- 57 edited
- 18 moved
-
app/mkbd/Makefile (modified) (view diffs)
-
app/mkbd/main.c (modified) (view diffs)
-
app/sportdmp/Makefile (modified) (view diffs)
-
app/sportdmp/sportdmp.c (modified) (view diffs)
-
app/tester/Makefile (modified) (view diffs)
-
app/tester/hw/misc/virtchar1.c (modified) (view diffs)
-
app/tester/hw/serial/serial1.c (modified) (view diffs)
-
drv/block/ahci/ahci.c (modified) (view diffs)
-
drv/bus/pci/pciintel/pci.c (modified) (view diffs)
-
drv/bus/usb/ehci/res.c (modified) (view diffs)
-
drv/bus/usb/uhci/res.c (modified) (view diffs)
-
drv/infrastructure/rootmalta/rootmalta.c (modified) (view diffs)
-
drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
-
drv/nic/e1k/e1k.c (modified) (view diffs)
-
drv/nic/rtl8139/driver.c (modified) (view diffs)
-
lib/c/Makefile (modified) (view diffs)
-
lib/c/generic/ddi.c (modified) (view diffs)
-
lib/c/generic/device/ahci.c (deleted)
-
lib/c/generic/device/battery_dev.c (deleted)
-
lib/c/generic/device/char_dev.c (deleted)
-
lib/c/generic/device/graph_dev.c (deleted)
-
lib/c/generic/device/nic.c (deleted)
-
lib/c/generic/device/pci.c (deleted)
-
lib/c/include/ddi.h (modified) (view diffs)
-
lib/c/include/device/ahci.h (deleted)
-
lib/c/include/device/pci.h (deleted)
-
lib/drv/Makefile (modified) (view diffs)
-
lib/drv/generic/dev_iface.c (modified) (view diffs)
-
lib/drv/generic/driver.c (modified) (view diffs)
-
lib/drv/generic/interrupt.c (modified) (view diffs)
-
lib/drv/generic/private/remote_ahci.h (moved) (moved from uspace/lib/drv/include/remote_ahci.h ) (view diffs)
-
lib/drv/generic/private/remote_audio_mixer.h (moved) (moved from uspace/lib/drv/include/remote_audio_mixer.h ) (view diffs)
-
lib/drv/generic/private/remote_audio_pcm.h (moved) (moved from uspace/lib/drv/include/remote_audio_pcm.h ) (view diffs)
-
lib/drv/generic/private/remote_battery_dev.h (moved) (moved from uspace/lib/drv/include/remote_battery_dev.h ) (view diffs)
-
lib/drv/generic/private/remote_char_dev.h (moved) (moved from uspace/lib/drv/include/remote_char_dev.h ) (view diffs)
-
lib/drv/generic/private/remote_clock_dev.h (moved) (moved from uspace/lib/drv/include/remote_clock_dev.h ) (view diffs)
-
lib/drv/generic/private/remote_graph_dev.h (moved) (moved from uspace/lib/drv/include/remote_graph_dev.h ) (view diffs)
-
lib/drv/generic/private/remote_hw_res.h (moved) (moved from uspace/lib/drv/include/remote_hw_res.h ) (view diffs)
-
lib/drv/generic/private/remote_nic.h (moved) (moved from uspace/lib/drv/include/remote_nic.h ) (view diffs)
-
lib/drv/generic/private/remote_pci.h (moved) (moved from uspace/lib/drv/include/remote_pci.h ) (view diffs)
-
lib/drv/generic/private/remote_pio_window.h (moved) (moved from uspace/lib/drv/include/remote_pio_window.h ) (view diffs)
-
lib/drv/generic/private/remote_usb.h (moved) (moved from uspace/lib/drv/include/remote_usb.h ) (view diffs)
-
lib/drv/generic/private/remote_usbhc.h (moved) (moved from uspace/lib/drv/include/remote_usbhc.h ) (view diffs)
-
lib/drv/generic/private/remote_usbhid.h (moved) (moved from uspace/lib/drv/include/remote_usbhid.h ) (view diffs)
-
lib/drv/generic/remote_ahci.c (modified) (view diffs)
-
lib/drv/generic/remote_audio_mixer.c (modified) (view diffs)
-
lib/drv/generic/remote_audio_pcm.c (modified) (view diffs)
-
lib/drv/generic/remote_battery_dev.c (modified) (view diffs)
-
lib/drv/generic/remote_char_dev.c (modified) (view diffs)
-
lib/drv/generic/remote_clock_dev.c (modified) (view diffs)
-
lib/drv/generic/remote_graph_dev.c (modified) (view diffs)
-
lib/drv/generic/remote_hw_res.c (modified) (view diffs)
-
lib/drv/generic/remote_nic.c (modified) (view diffs)
-
lib/drv/generic/remote_pci.c (modified) (view diffs)
-
lib/drv/generic/remote_pio_window.c (modified) (view diffs)
-
lib/drv/generic/remote_usb.c (modified) (view diffs)
-
lib/drv/generic/remote_usbhc.c (modified) (view diffs)
-
lib/drv/generic/remote_usbhid.c (modified) (view diffs)
-
lib/drv/include/ahci_iface.h (modified) (view diffs)
-
lib/drv/include/battery_iface.h (moved) (moved from uspace/lib/c/include/device/battery_dev.h ) (view diffs)
-
lib/drv/include/char_dev_iface.h (moved) (moved from uspace/lib/c/include/device/char_dev.h ) (view diffs)
-
lib/drv/include/ddf/driver.h (modified) (view diffs)
-
lib/drv/include/ddf/interrupt.h (modified) (view diffs)
-
lib/drv/include/dev_iface.h (modified) (view diffs)
-
lib/drv/include/graph_iface.h (moved) (moved from uspace/lib/c/include/device/graph_dev.h ) (view diffs)
-
lib/drv/include/nic_iface.h (moved) (moved from uspace/lib/c/include/device/nic.h ) (view diffs)
-
lib/drv/include/ops/battery_dev.h (modified) (view diffs)
-
lib/drv/include/pci_dev_iface.h (modified) (view diffs)
-
lib/drv/include/usbhid_iface.h (modified) (view diffs)
-
lib/nic/Makefile (modified) (view diffs)
-
lib/nic/src/nic_ev.c (modified) (view diffs)
-
lib/usbhid/Makefile (modified) (view diffs)
-
lib/usbhid/include/usb/hid/iface.h (deleted)
-
lib/usbhid/src/hidiface.c (deleted)
-
srv/bd/sata_bd/Makefile (modified) (view diffs)
-
srv/bd/sata_bd/sata_bd.c (modified) (view diffs)
-
srv/hid/compositor/Makefile (modified) (view diffs)
-
srv/hid/compositor/compositor.c (modified) (view diffs)
-
srv/hid/isdv4_tablet/Makefile (modified) (view diffs)
-
srv/hid/isdv4_tablet/isdv4.c (modified) (view diffs)
-
srv/hid/isdv4_tablet/main.c (modified) (view diffs)
-
srv/net/ethip/Makefile (modified) (view diffs)
-
srv/net/ethip/ethip_nic.c (modified) (view diffs)
-
srv/net/slip/Makefile (modified) (view diffs)
-
srv/net/slip/slip.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
