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

Changeset 3cc6a52 in mainline


Ignore:
Timestamp:
2009-04-10T19:51:16Z (13 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master
Children:
a1d89ad
Parents:
6eb2e96
Message:

fix serengeti console

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • HelenOS.config

    r6eb2e96 r3cc6a52  
    389389
    390390% Support for Serengeti console
    391 ! [(CONFIG_HID_IN=generic|CONFIG_HID_OUT=generic)&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN (y/n)
     391! [CONFIG_HID_OUT=generic&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN_PRN (y/n)
     392
     393% Support for Serengeti keyboard
     394! [CONFIG_HID_IN=generic&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN_KBD (y/n)
    392395
    393396% i8042 controller support
     
    404407
    405408% Serial line input module
    406 ! [CONFIG_DSRLNIN=y|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)] CONFIG_SRLN (y)
     409! [CONFIG_DSRLNIN=y|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&MACHINE=serengeti&CONFIG_SGCN_KBD=y)] CONFIG_SRLN (y)
    407410
    408411% EGA support
  • kernel/arch/sparc64/src/console.c

    r6eb2e96 r3cc6a52  
    9696        kbrdin = sgcnin_init();
    9797        if (kbrdin)
    98                 srlnin_init(kbrdin);
     98                srln_init(kbrdin);
    9999#endif
    100100#ifdef CONFIG_SGCN_PRN
     
    135135        scr_redraw();
    136136#endif
     137       
    137138        switch (kbd_type) {
    138 #ifdef CONFIG_SGCN
     139#ifdef CONFIG_SGCN_KBD
    139140        case KBD_SGCN:
    140141                sgcn_grab();
     
    152153{
    153154        switch (kbd_type) {
    154 #ifdef CONFIG_SGCN
     155#ifdef CONFIG_SGCN_KBD
    155156        case KBD_SGCN:
    156157                sgcn_release();
Note: See TracChangeset for help on using the changeset viewer.