Changeset ab4bace in mainline for uspace


Ignore:
Timestamp:
2010-01-31T13:56:23Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2e07f62c
Parents:
89ee7ff (diff), b73c26d (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 ADB drivers. Brings userspace keyboard and mouse for qemu-system-ppc -M g3beige. (buggy in PearPC)

Location:
uspace
Files:
11 added
3 edited
7 moved

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r89ee7ff rab4bace  
    5959        srv/fs/tmpfs \
    6060        srv/fs/devfs \
     61        srv/hid/adb_mouse \
    6162        srv/hid/console \
    62         srv/hid/c_mouse \
     63        srv/hid/char_mouse \
    6364        srv/hid/fb \
    6465        srv/hid/kbd \
    … …  
    7172ifeq ($(UARCH),ia32)
    7273        DIRS += srv/hw/bus/pci
     74endif
     75
     76ifeq ($(UARCH),ppc32)
     77        DIRS += srv/hw/bus/cuda_adb
    7378endif
    7479

  • uspace/app/init/init.c

    r89ee7ff rab4bace  
    287287        spawn("/srv/fhc");
    288288        spawn("/srv/obio");
     289        srv_start("/srv/cuda_adb");
    289290        srv_start("/srv/i8042");
    290         srv_start("/srv/c_mouse");
     291        srv_start("/srv/adb_ms");
     292        srv_start("/srv/char_ms");
    291293
    292294        spawn("/srv/fb");
    … …  
    320322        getterm("term/vc5", "/app/bdsh");
    321323        getterm("term/vc6", "/app/klog");
    322        
     324
    323325        return 0;
    324326}

  • uspace/srv/hid/char_mouse/Makefile

    r89ee7ff rab4bace  
    3232EXTRA_CFLAGS = -Iinclude
    3333
    34 OUTPUT = c_mouse
     34OUTPUT = char_ms
    3535
    3636SOURCES = \
    3737        proto/ps2.c \
    38         c_mouse.c \
     38        char_mouse.c \
    3939        chardev.c
    4040

  • uspace/srv/hid/char_mouse/char_mouse.c

    r89ee7ff rab4bace  
    4747#include <devmap.h>
    4848
    49 #include <c_mouse.h>
     49#include <char_mouse.h>
    5050#include <mouse_port.h>
    5151#include <mouse_proto.h>

  • uspace/srv/hid/char_mouse/chardev.c

    r89ee7ff rab4bace  
    4141#include <errno.h>
    4242
    43 #include <c_mouse.h>
     43#include <char_mouse.h>
    4444#include <mouse_port.h>
    4545

  • uspace/srv/hid/char_mouse/include/char_mouse.h

    r89ee7ff rab4bace  
    3434 */
    3535
    36 #ifndef C_MOUSE_H_
    37 #define C_MOUSE_H_
     36#ifndef CHAR_MOUSE_H_
     37#define CHAR_MOUSE_H_
    3838
    3939extern void mouse_handle_byte(int);

  • uspace/srv/hid/char_mouse/proto/ps2.c

    r89ee7ff rab4bace  
    3737#include <stdio.h>
    3838#include <mouse_proto.h>
    39 #include <c_mouse.h>
     39#include <char_mouse.h>
    4040
    4141#define BUFSIZE 3

  • uspace/srv/hid/kbd/Makefile.build

    r89ee7ff rab4bace  
    125125ifeq ($(UARCH),ppc32)
    126126        SOURCES += \
    127                 port/dummy.c \
    128                 ctl/stty.c
     127                port/adb.c \
     128                ctl/apple.c
    129129endif
    130130
Note: See TracChangeset for help on using the changeset viewer.