Changeset b9eb93f in mainline


Ignore:
Timestamp:
2010-12-12T08:52:09Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1eb272d, 5174c62
Parents:
d08b1603
Message:

Fixes to enable compiling & running under amd64

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    rd08b1603 rb9eb93f  
    113113        rootvirt \
    114114        test1 \
    115         test2 \
    116         vhc
     115        test2
    117116
    118117RD_DRV_CFG =

  • boot/arch/amd64/Makefile.inc

    rd08b1603 rb9eb93f  
    4343        uhci \
    4444        usbhub \
    45         usbkbd
     45        usbkbd \
     46        vhc
    4647       
    4748RD_DRV_CFG += \

  • uspace/Makefile

    rd08b1603 rb9eb93f  
    9090        drv/rootvirt \
    9191        drv/test1 \
    92         drv/test2 \
    93         drv/vhc
     92        drv/test2
    9493
    9594## Networking
    … …  
    118117        DIRS += drv/isa
    119118        DIRS += drv/ns8250
     119        DIRS += drv/uhci
     120        DIRS += drv/usbhub
     121        DIRS += drv/usbkbd
     122        DIRS += drv/vhc
    120123endif
    121124
    … …  
    128131        DIRS += drv/usbhub
    129132        DIRS += drv/usbkbd
     133        DIRS += drv/vhc
    130134endif
    131135

  • uspace/drv/uhci/transfers.c

    rd08b1603 rb9eb93f  
    3636    usbhc_iface_transfer_out_callback_t callback, void *arg)
    3737{
    38         printf(NAME ": transfer OUT [%d.%d (%s); %u]\n",
     38        printf(NAME ": transfer OUT [%d.%d (%s); %zu]\n",
    3939            target.address, target.endpoint,
    4040            usb_str_transfer_type(transfer_type),
    … …  
    4949    usbhc_iface_transfer_out_callback_t callback, void *arg)
    5050{
    51         printf(NAME ": transfer SETUP [%d.%d (%s); %u]\n",
     51        printf(NAME ": transfer SETUP [%d.%d (%s); %zu]\n",
    5252            target.address, target.endpoint,
    5353            usb_str_transfer_type(transfer_type),
    … …  
    6262    usbhc_iface_transfer_in_callback_t callback, void *arg)
    6363{
    64         printf(NAME ": transfer IN [%d.%d (%s); %u]\n",
     64        printf(NAME ": transfer IN [%d.%d (%s); %zu]\n",
    6565            target.address, target.endpoint,
    6666            usb_str_transfer_type(transfer_type),
Note: See TracChangeset for help on using the changeset viewer.