Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3618 → Rev 4073

/branches/sparc/uspace/srv/kbd/arch/sparc64/src/kbd.c
36,6 → 36,7
 
#include <arch/kbd.h>
#include <arch/sgcn.h>
#include <arch/niagara.h>
#include <ipc/ipc.h>
#include <sysinfo.h>
#include <kbd.h>
77,9 → 78,25
ns16550_cmds
};
 
/** Top-half pseudocode for Niagara keyboard driver. */
irq_cmd_t niagara_cmds[] = {
{
CMD_NIAGARA_GETCHAR,
0, /**< Address. Not used. */
0, /**< Value. Not used. */
1 /**< Arg 1 will contain the result. */
}
};
irq_code_t niagara_kbd = {
1,
niagara_cmds
};
 
#define KBD_Z8530 1
#define KBD_NS16550 2
#define KBD_SGCN 3
#define KBD_SUN4V 4
 
int kbd_arch_init(void)
{
96,9 → 113,13
case KBD_SGCN:
sgcn_init();
break;
case KBD_SUN4V:
ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &niagara_kbd);
break;
default:
break;
}
 
return 0;
}
 
108,6 → 129,10
if (sysinfo_value("kbd.type") == KBD_SGCN) {
sgcn_key_pressed();
return 1;
} else if (sysinfo_value("kbd.type") == KBD_SUN4V) {
char c = IPC_GET_ARG1(*call);
niagara_key_pressed(c);
return 1;
}
int scan_code = IPC_GET_ARG1(*call);
/branches/sparc/uspace/srv/kbd/arch/sparc64/src/niagara.c
0,0 → 1,63
/*
* Copyright (c) 2008 Pavel Rimsky
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* - The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup kbdsparc64 sparc64
* @brief Serengeti-specific parts of uspace keyboard handler.
* @ingroup kbd
* @{
*/
/** @file
*/
 
#include <arch/niagara.h>
#include <as.h>
#include <ddi.h>
#include <ipc/ipc.h>
#include <kbd.h>
#include <genarch/nofb.h>
#include <genarch/kbd.h>
#include <sysinfo.h>
#include <stdio.h>
#include <futex.h>
 
extern keybuffer_t keybuffer;
 
/**
* Handler of the "key pressed" event.
*/
void niagara_key_pressed(char c)
{
if (c == '\r') {
c = '\n';
}
 
kbd_process_no_fb(&keybuffer, c);
}
 
/** @}
*/