Changeset fb8dcb4 in mainline for uspace/drv
- Timestamp:
- 2012-04-05T05:31:04Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 2096871
- Parents:
- 063ae706 (diff), e882e3a (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:
-
- 8 edited
-
bus/isa/isa.c (modified) (1 diff)
-
bus/usb/uhcirh/port.c (modified) (1 diff)
-
bus/usb/usbhub/port.c (modified) (1 diff)
-
char/ps2mouse/main.c (modified) (1 diff)
-
char/xtkbd/main.c (modified) (1 diff)
-
infrastructure/root/root.c (modified) (1 diff)
-
infrastructure/rootpc/rootpc.c (modified) (1 diff)
-
nic/e1k/e1k.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/isa/isa.c
r063ae706 rfb8dcb4 66 66 #include <ops/hw_res.h> 67 67 68 #include <devman.h>69 #include <ipc/devman.h>70 68 #include <device/hw_res.h> 71 69 -
uspace/drv/bus/usb/uhcirh/port.c
r063ae706 rfb8dcb4 37 37 #include <str_error.h> 38 38 #include <async.h> 39 #include <devman.h>40 39 41 40 #include <usb/usb.h> /* usb_address_t */ -
uspace/drv/bus/usb/usbhub/port.c
r063ae706 rfb8dcb4 35 35 36 36 #include <bool.h> 37 #include <devman.h>38 37 #include <errno.h> 39 38 #include <str_error.h> -
uspace/drv/char/ps2mouse/main.c
r063ae706 rfb8dcb4 35 35 #include <libarch/inttypes.h> 36 36 #include <ddf/driver.h> 37 #include <devman.h>38 37 #include <device/hw_res_parsed.h> 39 38 #include <errno.h> -
uspace/drv/char/xtkbd/main.c
r063ae706 rfb8dcb4 35 35 #include <libarch/inttypes.h> 36 36 #include <ddf/driver.h> 37 #include <devman.h>38 37 #include <device/hw_res_parsed.h> 39 38 #include <errno.h> -
uspace/drv/infrastructure/root/root.c
r063ae706 rfb8dcb4 53 53 #include <ddf/driver.h> 54 54 #include <ddf/log.h> 55 #include <devman.h>56 #include <ipc/devman.h>57 55 58 56 #define NAME "root" -
uspace/drv/infrastructure/rootpc/rootpc.c
r063ae706 rfb8dcb4 48 48 #include <ddf/driver.h> 49 49 #include <ddf/log.h> 50 #include <devman.h>51 #include <ipc/devman.h>52 50 #include <ipc/dev_iface.h> 53 51 #include <ops/hw_res.h> -
uspace/drv/nic/e1k/e1k.c
r063ae706 rfb8dcb4 46 46 #include <ddf/log.h> 47 47 #include <ddf/interrupt.h> 48 #include <devman.h>49 48 #include <device/hw_res_parsed.h> 50 49 #include <device/pci.h>
Note:
See TracChangeset
for help on using the changeset viewer.
