Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 6d15572 in mainline


Ignore:
Timestamp:
2017-11-08T08:04:08Z (3 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
Children:
f5b6fb5
Parents:
cecba66e
Message:

Move receiving side of ski console support to a separate driver, ski-con. Add ski platform driver.

Files:
8 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/ia64/Makefile.inc

    rcecba66e r6d15572  
    6666endif
    6767
     68ifeq ($(MACHINE),i460GX)
    6869RD_DRVS_ESSENTIAL += \
    6970        platform/pc \
     
    8889RD_DRV_CFG += \
    8990        bus/isa
     91endif
     92
     93ifeq ($(MACHINE),ski)
     94RD_DRVS_ESSENTIAL += \
     95        char/ski-con \
     96        platform/ski
     97endif
    9098
    9199PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)
  • uspace/Makefile

    rcecba66e r6d15572  
    155155        drv/bus/usb/usbmid \
    156156        drv/bus/usb/vhc \
     157        drv/char/atkbd \
    157158        drv/char/i8042 \
    158159        drv/char/ns8250 \
    159160        drv/char/pl050 \
    160161        drv/char/ps2mouse \
    161         drv/char/atkbd \
     162        drv/char/ski-con \
    162163        drv/char/xtkbd \
    163164        drv/test/test1 \
     
    181182        drv/platform/msim \
    182183        drv/platform/pc \
     184        drv/platform/ski \
    183185        drv/time/cmos-rtc
    184186
  • uspace/srv/hid/input/Makefile

    rcecba66e r6d15572  
    4242        port/msim.c \
    4343        port/niagara.c \
    44         port/ski.c \
    4544        proto/adb.c \
    4645        proto/mousedev.c \
  • uspace/srv/hid/input/input.c

    rcecba66e r6d15572  
    637637        kbd_add_dev(&chardev_port, &stty_ctl);
    638638#endif
    639 #if defined(MACHINE_ski)
    640         kbd_add_dev(&ski_port, &stty_ctl);
     639#if defined(UARCH_ia64) && defined(MACHINE_ski)
     640        kbd_add_dev(&chardev_port, &stty_ctl);
    641641#endif
    642642#if defined(MACHINE_msim)
  • uspace/srv/hid/input/kbd_port.h

    rcecba66e r6d15572  
    5252extern kbd_port_ops_t niagara_port;
    5353extern kbd_port_ops_t ns16550_port;
    54 extern kbd_port_ops_t ski_port;
    5554
    5655#endif
  • uspace/srv/hid/input/port/chardev.c

    rcecba66e r6d15572  
    5959/** List of devices to try connecting to. */
    6060static const char *in_devs[] = {
    61         "char/s3c24xx_uart"
     61        /** S3C24xx UART - Openmoko debug console */
     62        "char/s3c24xx_uart",
     63        /** Ski console */
     64        "devices/\\hw\\console\\a"
    6265};
    6366
     
    7477       
    7578        for (i = 0; i < num_devs; i++) {
     79                printf("%s: Probe service '%s'\n", NAME, in_devs[i]);
    7680                rc = loc_service_get_id(in_devs[i], &service_id, 0);
    77                 if (rc == EOK)
     81                if (rc == EOK) {
     82                        printf("%s: success \n", NAME);
    7883                        break;
     84                }
    7985        }
    8086       
     
    109115                return -1;
    110116        }
     117        printf("%s: Connected input device\n", NAME);
    111118       
    112119        return 0;
Note: See TracChangeset for help on using the changeset viewer.