Changeset 336d2f52 in mainline for uspace


Ignore:
Timestamp:
2011-07-02T21:16:24Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e944e4c
Parents:
d2fac08c
Message:

Remove support for Sun hardware for which we have no test plan.

This includes the removal of the following functionality only available
via the Simics simulator, for which we have been unable to secure a
license:

  • FHC bus and interrupt controller
  • Zilog 8530 serial controller attached to Sun keyboard
  • Serengeti and SGCN support
Location:
uspace
Files:
6 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    rd2fac08c r336d2f52  
    153153ifeq ($(UARCH),sparc64)
    154154        DIRS += \
    155                 srv/hw/irc/fhc \
    156155                srv/hw/irc/obio
    157156endif

  • uspace/app/init/init.c

    rd2fac08c r336d2f52  
    270270        spawn("/srv/apic");
    271271        spawn("/srv/i8259");
    272         spawn("/srv/fhc");
    273272        spawn("/srv/obio");
    274273        srv_start("/srv/cuda_adb");

  • uspace/srv/hid/fb/Makefile

    rd2fac08c r336d2f52  
    8484                EXTRA_CFLAGS += -DNIAGARA_ENABLED
    8585        endif
    86        
    87         ifeq ($(MACHINE),serengeti)
    88                 SOURCES += \
    89                         sgcn.c \
    90                         serial_console.c
    91                 EXTRA_CFLAGS += -DSGCN_ENABLED
    92         endif
    9386endif
    9487

  • uspace/srv/hid/fb/main.c

    rd2fac08c r336d2f52  
    4040#include "msim.h"
    4141#include "ski.h"
    42 #include "sgcn.h"
    4342#include "niagara.h"
    4443#include "main.h"
    … …  
    9291        }
    9392#endif
    94 #ifdef SGCN_ENABLED
    95         if ((!initialized) && (fb_kind == 4)) {
    96                 if (sgcn_init() == 0)
    97                         initialized = true;
    98         }
    99 #endif
    10093#ifdef NIAGARA_ENABLED
    10194        if ((!initialized) && (fb_kind == 5)) {

  • uspace/srv/hid/fb/niagara.c

    rd2fac08c r336d2f52  
    2929 */
    3030
    31 /** @defgroup niagarafb SGCN
     31/** @defgroup niagarafb
    3232 * @brief       userland driver of the Niagara console output
    3333 * @{

  • uspace/srv/hid/fb/niagara.h

    rd2fac08c r336d2f52  
    2727 */
    2828
    29 /** @defgroup sgcnfb SGCN
    30  * @brief       userland driver of the Serengeti console output
     29/** @defgroup niagarafb
     30 * @brief       userland driver of the Niagara console output
    3131 * @{
    3232 */

  • uspace/srv/hid/input/Makefile

    rd2fac08c r336d2f52  
    4949        port/ns16550.c \
    5050        port/pl050.c \
    51         port/sgcn.c \
    5251        port/ski.c \
    53         port/z8530.c \
    5452        proto/adb.c \
    5553        proto/mousedev.c \

  • uspace/srv/hid/input/generic/input.c

    rd2fac08c r336d2f52  
    424424        kbd_add_dev(&niagara_port, &stty_ctl);
    425425#endif
    426 #if defined(UARCH_sparc64) && defined(MACHINE_serengeti)
    427         kbd_add_dev(&sgcn_port, &stty_ctl);
    428 #endif
    429426#if defined(UARCH_sparc64) && defined(MACHINE_generic)
    430         kbd_add_dev(&z8530_port, &sun_ctl);
    431427        kbd_add_dev(&ns16550_port, &sun_ctl);
    432428#endif
    … …  
    556552        printf("%s: HelenOS input service\n", NAME);
    557553       
    558         sysarg_t fhc;
    559554        sysarg_t obio;
    560555       
    … …  
    562557        list_initialize(&mouse_devs);
    563558       
    564         if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
    565             || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)))
     559        if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
    566560                irc_service = true;
    567561       

  • uspace/srv/hid/input/include/kbd_port.h

    rd2fac08c r336d2f52  
    5656extern kbd_port_ops_t ns16550_port;
    5757extern kbd_port_ops_t pl050_port;
    58 extern kbd_port_ops_t sgcn_port;
    5958extern kbd_port_ops_t ski_port;
    60 extern kbd_port_ops_t z8530_port;
    6159
    6260#endif

  • uspace/srv/hid/input/port/niagara.c

    rd2fac08c r336d2f52  
    154154
    155155/**
    156  * Thread to poll SGCN for keypresses.
     156 * Thread to poll Niagara console for keypresses.
    157157 */
    158158static void niagara_thread_impl(void *arg)
Note: See TracChangeset for help on using the changeset viewer.