Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use ukbd_cnattach()

Browse Source
This commit is contained in:
hkenken 2014-01-23 12:23:20 +00:00
parent 4bb25a32b9
commit 2ce1224c19
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/evbarm/conf/NETWALKER
View File

@ -1,4 +1,4 @@
# $NetBSD: NETWALKER,v 1.21 2013/06/30 21:38:56 rmind Exp $
# $NetBSD: NETWALKER,v 1.22 2014/01/23 12:23:20 hkenken Exp $
#
# NETWALKER -- http://www.sharp.co.jp/netwalker/
#
@ -172,7 +172,7 @@ tzic0 at axi? addr 0xe0000000 size 0x4000 irqbase 0
imxuart0 at axi? addr 0x73fbc000 irq 31 # UART1
#imxuart1 at axi? addr 0x73fc0000 irq 32
#imxuart2 at axi? addr 0x7000c000 irq 33
options IMXUARTCONSOLE
#options IMXUARTCONSOLE
# Clock Control
imxccm0 at axi? addr 0x73fd4000

16
sys/arch/evbarm/netwalker/netwalker_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netwalker_machdep.c,v 1.11 2013/08/18 15:58:21 matt Exp $ */
/* $NetBSD: netwalker_machdep.c,v 1.12 2014/01/23 12:23:20 hkenken Exp $ */
/*
* Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation.
@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.11 2013/08/18 15:58:21 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.12 2014/01/23 12:23:20 hkenken Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -113,6 +113,8 @@ __KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.11 2013/08/18 15:58:21 matt
#include "imxuart.h"
#include "opt_imxuart.h"
#include "opt_imx.h"
#include "opt_imx51_ipuv3.h"
#include "wsdisplay.h"
#include <sys/param.h>
#include <sys/device.h>
@ -156,6 +158,11 @@ __KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.11 2013/08/18 15:58:21 matt
#include <arm/imx/imx51_iomuxreg.h>
#include <evbarm/netwalker/netwalker_reg.h>
#include "ukbd.h"
#if (NUKBD > 0)
#include <dev/usb/ukbdvar.h>
#endif
/* Kernel text starts 1MB in from the bottom of the kernel address space. */
#define KERNEL_TEXT_BASE (KERNEL_BASE + 0x00100000)
#define KERNEL_VM_BASE (KERNEL_BASE + 0x01000000)
@ -1233,7 +1240,10 @@ consinit(void)
#endif
#if (NWSDISPLAY > 0) && defined(IMXLCDCONSOLE)
#if (NWSDISPLAY > 0) && defined(IMXIPUCONSOLE)
#if NUKBD > 0
ukbd_cnattach();
#endif
{
extern void netwalker_cnattach(void);
netwalker_cnattach();