Changeset 827d73f in mainline for uspace/srv/hw


Ignore:
Timestamp:
2010-02-12T14:09:22Z (16 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a70bda4
Parents:
918e9910 (diff), e70edd1 (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:

Merged the actual head

Location:
uspace/srv/hw
Files:
2 added
19 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/hw/bus/cuda_adb/Makefile

    r918e9910 r827d73f  
    11#
    2 # Copyright (c) 2005 Martin Decky
     2# Copyright (c) 2010 Jiri Svoboda
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
     29USPACE_PREFIX = ../../../..
     30LIBS = $(LIBC_PREFIX)/libc.a
    2931
    30 ## Common names
    31 #
     32OUTPUT = cuda_adb
    3233
    33 LIBC_PREFIX = ../libc
    34 DEPEND = Makefile.depend
    35 DEPEND_PREV = $(DEPEND).prev
    36 LIBSOFTFLOAT = libsoftfloat.a
     34SOURCES = \
     35        cuda_adb.c
     36
     37include ../../../Makefile.common
     38

  • uspace/srv/hw/bus/pci/Makefile

    r918e9910 r827d73f  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
     30USPACE_PREFIX = ../../../..
     31LIBS = $(LIBPCI_PREFIX)/libpci.a $(LIBC_PREFIX)/libc.a
     32EXTRA_CFLAGS = -I$(LIBPCI_PREFIX)
    2933
    30 ## Common names
    31 #
     34OUTPUT = pci
    3235
    33 LIBC_PREFIX = ../../lib/libc
    34 SOFTINT_PREFIX = ../../lib/softint
    35 LIBS = $(LIBC_PREFIX)/libc.a
     36SOURCES = \
     37        pci.c
    3638
    37 DEPEND = Makefile.depend
    38 DEPEND_PREV = $(DEPEND).prev
    39 OUTPUT = init
     39include ../../../Makefile.common

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

    r918e9910 r827d73f  
    2121#include <errno.h>
    2222
    23 #include "libpci/pci.h"
     23#include <pci.h>
    2424
    2525#define PCI_CONF1       0xcf8

  • uspace/srv/hw/char/i8042/Makefile

    r918e9910 r827d73f  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 
    30 ## Common names
    31 #
    32 
    33 LIBC_PREFIX = ../../lib/libc
    34 SOFTINT_PREFIX = ../../lib/softint
     30USPACE_PREFIX = ../../../..
    3531LIBS = $(LIBC_PREFIX)/libc.a
    3632
    37 DEPEND = Makefile.depend
    38 DEPEND_PREV = $(DEPEND).prev
    39 OUTPUT = fb
     33OUTPUT = i8042
     34
     35SOURCES = \
     36        i8042.c
     37
     38include ../../../Makefile.common

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

    r918e9910 r827d73f  
    169169        void *vaddr;
    170170
    171         i8042_physical = sysinfo_value("kbd.address.physical");
    172         i8042_kernel = sysinfo_value("kbd.address.kernel");
     171        i8042_physical = sysinfo_value("i8042.address.physical");
     172        i8042_kernel = sysinfo_value("i8042.address.kernel");
    173173        if (pio_enable((void *) i8042_physical, sizeof(i8042_t), &vaddr) != 0)
    174174                return -1;
    … …  
    193193        i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
    194194        i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
    195         ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), 0, &i8042_kbd);
    196         ipc_register_irq(sysinfo_value("mouse.inr"), device_assign_devno(), 0, &i8042_kbd);
     195        ipc_register_irq(sysinfo_value("i8042.inr_a"), device_assign_devno(), 0, &i8042_kbd);
     196        ipc_register_irq(sysinfo_value("i8042.inr_b"), device_assign_devno(), 0, &i8042_kbd);
    197197
    198198        pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB);
    … …  
    208208static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall)
    209209{
    210         void *fs_va = NULL;
    211210        ipc_callid_t callid;
    212211        ipc_call_t call;
    213212        ipcarg_t method;
    214213        dev_handle_t dh;
    215         int flags;
    216214        int retval;
    217         size_t cnt;
    218215        int dev_id, i;
    219216
    … …  
    225222        /* Determine which disk device is the client connecting to. */
    226223        dev_id = -1;
    227         for (i = 0; i < MAX_DEVS; i++)
     224        for (i = 0; i < MAX_DEVS; i++) {
    228225                if (i8042_port[i].dev_handle == dh)
    229226                        dev_id = i;
    230 
    231         if (dev_id < 0/* || disk[dev_id].present == false*/) {
     227        }
     228
     229        if (dev_id < 0) {
    232230                ipc_answer_0(iid, EINVAL);
    233231                return;

  • uspace/srv/hw/cir/fhc/Makefile

    r918e9910 r827d73f  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 
    30 ## Common names
    31 #
    32 
    33 LIBC_PREFIX = ../../lib/libc
    34 SOFTINT_PREFIX = ../../lib/softint
     30USPACE_PREFIX = ../../../..
    3531LIBS = $(LIBC_PREFIX)/libc.a
    3632
    37 DEPEND = Makefile.depend
    38 DEPEND_PREV = $(DEPEND).prev
    39 OUTPUT = ns
     33OUTPUT = fhc
     34
     35SOURCES = \
     36        fhc.c
     37
     38include ../../../Makefile.common

  • uspace/srv/hw/cir/obio/Makefile

    r918e9910 r827d73f  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 
    30 ## Common names
    31 #
    32 
    33 LIBC_PREFIX = ../../lib/libc
    34 SOFTINT_PREFIX = ../../lib/softint
     30USPACE_PREFIX = ../../../..
    3531LIBS = $(LIBC_PREFIX)/libc.a
    3632
    37 DEPEND = Makefile.depend
    38 DEPEND_PREV = $(DEPEND).prev
    39 OUTPUT = kbd
     33OUTPUT = obio
     34
     35SOURCES = \
     36        obio.c
     37
     38include ../../../Makefile.common
Note: See TracChangeset for help on using the changeset viewer.