Changeset 80cd7cd in mainline for uspace/srv/hw


Ignore:
Timestamp:
2011-01-13T20:58:24Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
87e373b
Parents:
eaef141 (diff), a613fea1 (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.
Message:

Merge mainline changes.

Location:
uspace/srv/hw
Files:
7 added
5 deleted
3 edited
9 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/hw/bus/cuda_adb/cuda_adb.c

    reaef141 r80cd7cd  
    162162        rc = devmap_device_register("adb/kbd", &devmap_handle);
    163163        if (rc != EOK) {
    164                 devmap_hangup_phone(DEVMAP_DRIVER);
    165164                printf(NAME ": Unable to register device %s.\n", "adb/kdb");
    166165                return rc;
    … …  
    172171        rc = devmap_device_register("adb/mouse", &devmap_handle);
    173172        if (rc != EOK) {
    174                 devmap_hangup_phone(DEVMAP_DRIVER);
    175173                printf(NAME ": Unable to register device %s.\n", "adb/mouse");
    176174                return rc;

  • uspace/srv/hw/char/i8042/i8042.c

    reaef141 r80cd7cd  
    148148                rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
    149149                if (rc != EOK) {
    150                         devmap_hangup_phone(DEVMAP_DRIVER);
    151150                        printf(NAME ": Unable to register device %s.\n", name);
    152151                        return rc;

  • uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

    reaef141 r80cd7cd  
    9595        rc = devmap_device_register(NAMESPACE "/" NAME, &uart->devmap_handle);
    9696        if (rc != EOK) {
    97                 devmap_hangup_phone(DEVMAP_DRIVER);
    9897                printf(NAME ": Unable to register device %s.\n",
    9998                    NAMESPACE "/" NAME);

  • uspace/srv/hw/irc/fhc/fhc.c

    reaef141 r80cd7cd  
    3838#include <ipc/ipc.h>
    3939#include <ipc/services.h>
    40 #include <ipc/bus.h>
     40#include <ipc/irc.h>
    4141#include <ipc/ns.h>
    4242#include <sysinfo.h>
    … …  
    8383                callid = async_get_call(&call);
    8484                switch (IPC_GET_IMETHOD(call)) {
    85                 case BUS_CLEAR_INTERRUPT:
     85                case IRC_ENABLE_INTERRUPT:
     86                        /* Noop */
     87                        ipc_answer_0(callid, EOK);
     88                        break;
     89                case IRC_CLEAR_INTERRUPT:
    8690                        inr = IPC_GET_ARG1(call);
    8791                        switch (inr) {

  • uspace/srv/hw/irc/obio/obio.c

    reaef141 r80cd7cd  
    4444#include <ipc/ipc.h>
    4545#include <ipc/services.h>
    46 #include <ipc/bus.h>
     46#include <ipc/irc.h>
    4747#include <ipc/ns.h>
    4848#include <sysinfo.h>
    … …  
    9393                callid = async_get_call(&call);
    9494                switch (IPC_GET_IMETHOD(call)) {
    95                 case BUS_CLEAR_INTERRUPT:
     95                case IRC_ENABLE_INTERRUPT:
     96                        /* Noop */
     97                        ipc_answer_0(callid, EOK);
     98                        break;
     99                case IRC_CLEAR_INTERRUPT:
    96100                        inr = IPC_GET_ARG1(call);
    97101                        base_virt[OBIO_CIR(inr & INO_MASK)] = 0;

  • uspace/srv/hw/netif/ne2000/Makefile

    reaef141 r80cd7cd  
    3939-include $(CONFIG_MAKEFILE)
    4040
    41 BINARY = dp8390
     41BINARY = ne2000
    4242
    4343SOURCES = \
    4444        dp8390.c \
    45         dp8390_module.c \
    4645        ne2000.c
    4746
Note: See TracChangeset for help on using the changeset viewer.