direct-io.hg

changeset 1531:a7a278aaf261

bitkeeper revision 1.993.1.1 (40d70c25jWsHeOIytKZNauKNeUXkSQ)

Fix keyboard handling in non-priv domains.
author kaf24@scramble.cl.cam.ac.uk
date Mon Jun 21 16:26:13 2004 +0000 (2004-06-21)
parents 9b9720f48ab1
children 913348f3a206
files .rootkeys linux-2.4.26-xen-sparse/drivers/char/Makefile linux-2.4.26-xen-sparse/include/asm-xen/keyboard.h linux-2.4.26-xen-sparse/mkbuildtree
line diff
     1.1 --- a/.rootkeys	Mon Jun 21 09:26:53 2004 +0000
     1.2 +++ b/.rootkeys	Mon Jun 21 16:26:13 2004 +0000
     1.3 @@ -101,6 +101,7 @@ 3e5a4e661gLzzff25pJooKIIWe7IWg linux-2.4
     1.4  3f0bed43UUdQichXAiVNrjV-y2Kzcg linux-2.4.26-xen-sparse/arch/xen/mm/ioremap.c
     1.5  3e5a4e66qRlSTcjafidMB6ulECADvg linux-2.4.26-xen-sparse/arch/xen/vmlinux.lds
     1.6  3e5a4e66mrtlmV75L1tjKDg8RaM5gA linux-2.4.26-xen-sparse/drivers/block/ll_rw_blk.c
     1.7 +40d70c24-Dy2HUMrwSZagfXvAPnI4w linux-2.4.26-xen-sparse/drivers/char/Makefile
     1.8  3f108aeaLcGDgQdFAANLTUEid0a05w linux-2.4.26-xen-sparse/drivers/char/mem.c
     1.9  3e5a4e66rw65CxyolW9PKz4GG42RcA linux-2.4.26-xen-sparse/drivers/char/tty_io.c
    1.10  40c9c0c1pPwYE3-4i-oI3ubUu7UgvQ linux-2.4.26-xen-sparse/drivers/scsi/aic7xxx/Makefile
    1.11 @@ -115,6 +116,7 @@ 3e5a4e67YtcyDLQsShhCfQwPSELfvA linux-2.4
    1.12  3e5a4e677VBavzM1UZIEcH1B-RlXMA linux-2.4.26-xen-sparse/include/asm-xen/hypervisor.h
    1.13  4060044fVx7-tokvNLKBf_6qBB4lqQ linux-2.4.26-xen-sparse/include/asm-xen/io.h
    1.14  3e5a4e673p7PEOyHFm3nHkYX6HQYBg linux-2.4.26-xen-sparse/include/asm-xen/irq.h
    1.15 +40d70c240tW7TWArl1VUgIFH2nVO1A linux-2.4.26-xen-sparse/include/asm-xen/keyboard.h
    1.16  3e5a4e678ddsQOpbSiRdy1GRcDc9WA linux-2.4.26-xen-sparse/include/asm-xen/mmu_context.h
    1.17  40d06e5b2YWInUX1Xv9amVANwd_2Xg linux-2.4.26-xen-sparse/include/asm-xen/module.h
    1.18  3f8707e7ZmZ6TxyX0ZUEfvhA2Pb_xQ linux-2.4.26-xen-sparse/include/asm-xen/msr.h
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/linux-2.4.26-xen-sparse/drivers/char/Makefile	Mon Jun 21 16:26:13 2004 +0000
     2.3 @@ -0,0 +1,361 @@
     2.4 +#
     2.5 +# Makefile for the kernel character device drivers.
     2.6 +#
     2.7 +# Note! Dependencies are done automagically by 'make dep', which also
     2.8 +# removes any old dependencies. DON'T put your own dependencies here
     2.9 +# unless it's something special (ie not a .c file).
    2.10 +#
    2.11 +# Note 2! The CFLAGS definitions are now inherited from the
    2.12 +# parent makes..
    2.13 +#
    2.14 +
    2.15 +#
    2.16 +# This file contains the font map for the default (hardware) font
    2.17 +#
    2.18 +FONTMAPFILE = cp437.uni
    2.19 +
    2.20 +O_TARGET := char.o
    2.21 +
    2.22 +obj-y	 += mem.o tty_io.o n_tty.o tty_ioctl.o raw.o pty.o misc.o random.o
    2.23 +
    2.24 +# All of the (potential) objects that export symbols.
    2.25 +# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
    2.26 +
    2.27 +export-objs     :=	busmouse.o console.o keyboard.o sysrq.o \
    2.28 +			misc.o pty.o random.o selection.o serial.o \
    2.29 +			sonypi.o tty_io.o tty_ioctl.o generic_serial.o \
    2.30 +			au1000_gpio.o vac-serial.o hp_psaux.o nvram.o \
    2.31 +			scx200.o fetchop.o
    2.32 +
    2.33 +mod-subdirs	:=	joystick ftape drm drm-4.0 pcmcia
    2.34 +
    2.35 +list-multi	:=	
    2.36 +
    2.37 +KEYMAP   =defkeymap.o
    2.38 +KEYBD    =pc_keyb.o
    2.39 +CONSOLE  =console.o
    2.40 +SERIAL   =serial.o
    2.41 +
    2.42 +ifeq ($(ARCH),xen)
    2.43 +  ifneq ($(CONFIG_XEN_PHYSDEV_ACCESS),y)
    2.44 +    KEYBD  =
    2.45 +  endif
    2.46 +endif
    2.47 +
    2.48 +ifeq ($(ARCH),s390)
    2.49 +  KEYMAP   =
    2.50 +  KEYBD    =
    2.51 +  CONSOLE  =
    2.52 +  SERIAL   =
    2.53 +endif
    2.54 +
    2.55 +ifeq ($(ARCH),mips)
    2.56 +  ifneq ($(CONFIG_PC_KEYB),y)
    2.57 +    KEYBD    =
    2.58 +  endif
    2.59 +  ifeq ($(CONFIG_VR41XX_KIU),y)
    2.60 +    KEYMAP   =
    2.61 +    KEYBD    = vr41xx_keyb.o
    2.62 +  endif
    2.63 +endif
    2.64 +
    2.65 +ifeq ($(ARCH),s390x)
    2.66 +  KEYMAP   =
    2.67 +  KEYBD    =
    2.68 +  CONSOLE  =
    2.69 +  SERIAL   =
    2.70 +endif
    2.71 +
    2.72 +ifeq ($(ARCH),m68k)
    2.73 +   ifdef CONFIG_AMIGA
    2.74 +      KEYBD = amikeyb.o
    2.75 +   else
    2.76 +      ifndef CONFIG_MAC
    2.77 +	 KEYBD =
    2.78 +      endif
    2.79 +   endif
    2.80 +   SERIAL   =
    2.81 +endif
    2.82 +
    2.83 +ifeq ($(ARCH),parisc)
    2.84 +   ifdef CONFIG_GSC_PS2
    2.85 +      KEYBD   = hp_psaux.o hp_keyb.o
    2.86 +   else
    2.87 +      KEYBD   =
    2.88 +   endif
    2.89 +   ifdef CONFIG_SERIAL_MUX
    2.90 +      CONSOLE += mux.o
    2.91 +   endif
    2.92 +   ifdef CONFIG_PDC_CONSOLE
    2.93 +      CONSOLE += pdc_console.o
    2.94 +   endif
    2.95 +endif
    2.96 +
    2.97 +ifdef CONFIG_Q40
    2.98 +  KEYBD += q40_keyb.o
    2.99 +  SERIAL = serial.o
   2.100 +endif
   2.101 +
   2.102 +ifdef CONFIG_APOLLO
   2.103 +  KEYBD += dn_keyb.o
   2.104 +endif
   2.105 +
   2.106 +ifeq ($(ARCH),parisc)
   2.107 +   ifdef CONFIG_GSC_PS2
   2.108 +      KEYBD   = hp_psaux.o hp_keyb.o
   2.109 +   else
   2.110 +      KEYBD   =
   2.111 +   endif
   2.112 +   ifdef CONFIG_PDC_CONSOLE
   2.113 +      CONSOLE += pdc_console.o
   2.114 +   endif
   2.115 +endif
   2.116 +
   2.117 +ifeq ($(ARCH),arm)
   2.118 +  ifneq ($(CONFIG_PC_KEYMAP),y)
   2.119 +    KEYMAP   =
   2.120 +  endif
   2.121 +  ifneq ($(CONFIG_PC_KEYB),y)
   2.122 +    KEYBD    =
   2.123 +  endif
   2.124 +endif
   2.125 +
   2.126 +ifeq ($(ARCH),sh)
   2.127 +  KEYMAP   =
   2.128 +  KEYBD    =
   2.129 +  CONSOLE  =
   2.130 +  ifeq ($(CONFIG_SH_HP600),y)
   2.131 +  KEYMAP   = defkeymap.o
   2.132 +  KEYBD    = scan_keyb.o hp600_keyb.o
   2.133 +  CONSOLE  = console.o
   2.134 +  endif
   2.135 +  ifeq ($(CONFIG_SH_DMIDA),y)
   2.136 +  # DMIDA does not connect the HD64465 PS/2 keyboard port
   2.137 +  # but we allow for USB keyboards to be plugged in.
   2.138 +  KEYMAP   = defkeymap.o
   2.139 +  KEYBD    = # hd64465_keyb.o pc_keyb.o
   2.140 +  CONSOLE  = console.o
   2.141 +  endif
   2.142 +  ifeq ($(CONFIG_SH_EC3104),y)
   2.143 +  KEYMAP   = defkeymap.o
   2.144 +  KEYBD    = ec3104_keyb.o
   2.145 +  CONSOLE  = console.o
   2.146 +  endif
   2.147 +  ifeq ($(CONFIG_SH_DREAMCAST),y)
   2.148 +  KEYMAP   = defkeymap.o
   2.149 +  KEYBD    =
   2.150 +  CONSOLE  = console.o
   2.151 +  endif
   2.152 +endif
   2.153 +
   2.154 +ifeq ($(CONFIG_DECSTATION),y)
   2.155 +  KEYMAP   =
   2.156 +  KEYBD    =
   2.157 +endif
   2.158 +
   2.159 +ifeq ($(CONFIG_BAGET_MIPS),y)
   2.160 +  KEYBD    =
   2.161 +  SERIAL   = vac-serial.o
   2.162 +endif
   2.163 +
   2.164 +ifeq ($(CONFIG_NINO),y)
   2.165 +  SERIAL   =
   2.166 +endif
   2.167 +
   2.168 +ifneq ($(CONFIG_SUN_SERIAL),)
   2.169 +  SERIAL   =
   2.170 +endif
   2.171 +
   2.172 +ifeq ($(CONFIG_QTRONIX_KEYBOARD),y)
   2.173 +  KEYBD    = qtronix.o
   2.174 +  KEYMAP   = qtronixmap.o
   2.175 +endif
   2.176 +
   2.177 +ifeq ($(CONFIG_DUMMY_KEYB),y)
   2.178 +  KEYBD = dummy_keyb.o
   2.179 +endif
   2.180 +
   2.181 +obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o
   2.182 +obj-$(CONFIG_SERIAL) += $(SERIAL)
   2.183 +obj-$(CONFIG_SERIAL_HCDP) += hcdp_serial.o
   2.184 +obj-$(CONFIG_SERIAL_21285) += serial_21285.o
   2.185 +obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o
   2.186 +obj-$(CONFIG_SERIAL_AMBA) += serial_amba.o
   2.187 +obj-$(CONFIG_TS_AU1X00_ADS7846) += au1000_ts.o
   2.188 +obj-$(CONFIG_SERIAL_DEC) += decserial.o
   2.189 +
   2.190 +ifndef CONFIG_SUN_KEYBOARD
   2.191 +  obj-$(CONFIG_VT) += keyboard.o $(KEYMAP) $(KEYBD)
   2.192 +else
   2.193 +  obj-$(CONFIG_PCI) += keyboard.o $(KEYMAP)
   2.194 +endif
   2.195 +
   2.196 +obj-$(CONFIG_HIL) += hp_keyb.o
   2.197 +obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
   2.198 +obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
   2.199 +obj-$(CONFIG_ROCKETPORT) += rocket.o
   2.200 +obj-$(CONFIG_MOXA_SMARTIO) += mxser.o
   2.201 +obj-$(CONFIG_MOXA_INTELLIO) += moxa.o
   2.202 +obj-$(CONFIG_DIGI) += pcxx.o
   2.203 +obj-$(CONFIG_DIGIEPCA) += epca.o
   2.204 +obj-$(CONFIG_CYCLADES) += cyclades.o
   2.205 +obj-$(CONFIG_STALLION) += stallion.o
   2.206 +obj-$(CONFIG_ISTALLION) += istallion.o
   2.207 +obj-$(CONFIG_SIBYTE_SB1250_DUART) += sb1250_duart.o
   2.208 +obj-$(CONFIG_COMPUTONE) += ip2.o ip2main.o
   2.209 +obj-$(CONFIG_RISCOM8) += riscom8.o
   2.210 +obj-$(CONFIG_ISI) += isicom.o
   2.211 +obj-$(CONFIG_ESPSERIAL) += esp.o
   2.212 +obj-$(CONFIG_SYNCLINK) += synclink.o
   2.213 +obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o
   2.214 +obj-$(CONFIG_N_HDLC) += n_hdlc.o
   2.215 +obj-$(CONFIG_SPECIALIX) += specialix.o
   2.216 +obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
   2.217 +obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
   2.218 +obj-$(CONFIG_SX) += sx.o generic_serial.o
   2.219 +obj-$(CONFIG_RIO) += rio/rio.o generic_serial.o
   2.220 +obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o
   2.221 +obj-$(CONFIG_SERIAL167) += serial167.o
   2.222 +obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
   2.223 +obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
   2.224 +obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
   2.225 +obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o
   2.226 +obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o
   2.227 +obj-$(CONFIG_TXX927_SERIAL) += serial_txx927.o
   2.228 +obj-$(CONFIG_SERIAL_TXX9) += generic_serial.o serial_txx9.o
   2.229 +obj-$(CONFIG_IP22_SERIAL) += sgiserial.o
   2.230 +obj-$(CONFIG_AU1X00_UART) += au1x00-serial.o
   2.231 +obj-$(CONFIG_SGI_L1_SERIAL) += sn_serial.o
   2.232 +
   2.233 +subdir-$(CONFIG_RIO) += rio
   2.234 +subdir-$(CONFIG_INPUT) += joystick
   2.235 +
   2.236 +obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
   2.237 +obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
   2.238 +obj-$(CONFIG_PRINTER) += lp.o
   2.239 +obj-$(CONFIG_TIPAR) += tipar.o
   2.240 +obj-$(CONFIG_OBMOUSE) += obmouse.o
   2.241 +
   2.242 +ifeq ($(CONFIG_INPUT),y)
   2.243 +obj-y += joystick/js.o
   2.244 +endif
   2.245 +
   2.246 +obj-$(CONFIG_FETCHOP) += fetchop.o
   2.247 +obj-$(CONFIG_BUSMOUSE) += busmouse.o
   2.248 +obj-$(CONFIG_DTLK) += dtlk.o
   2.249 +obj-$(CONFIG_R3964) += n_r3964.o
   2.250 +obj-$(CONFIG_APPLICOM) += applicom.o
   2.251 +obj-$(CONFIG_SONYPI) += sonypi.o
   2.252 +obj-$(CONFIG_MS_BUSMOUSE) += msbusmouse.o
   2.253 +obj-$(CONFIG_82C710_MOUSE) += qpmouse.o
   2.254 +obj-$(CONFIG_AMIGAMOUSE) += amigamouse.o
   2.255 +obj-$(CONFIG_ATARIMOUSE) += atarimouse.o
   2.256 +obj-$(CONFIG_ADBMOUSE) += adbmouse.o
   2.257 +obj-$(CONFIG_PC110_PAD) += pc110pad.o
   2.258 +obj-$(CONFIG_MK712_MOUSE) += mk712.o
   2.259 +obj-$(CONFIG_RTC) += rtc.o
   2.260 +obj-$(CONFIG_GEN_RTC) += genrtc.o
   2.261 +obj-$(CONFIG_EFI_RTC) += efirtc.o
   2.262 +obj-$(CONFIG_SGI_DS1286) += ds1286.o
   2.263 +obj-$(CONFIG_MIPS_RTC) += mips_rtc.o
   2.264 +obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o
   2.265 +ifeq ($(CONFIG_PPC),)
   2.266 +  obj-$(CONFIG_NVRAM) += nvram.o
   2.267 +endif
   2.268 +obj-$(CONFIG_TOSHIBA) += toshiba.o
   2.269 +obj-$(CONFIG_I8K) += i8k.o
   2.270 +obj-$(CONFIG_DS1620) += ds1620.o
   2.271 +obj-$(CONFIG_DS1742) += ds1742.o
   2.272 +obj-$(CONFIG_INTEL_RNG) += i810_rng.o
   2.273 +obj-$(CONFIG_AMD_RNG) += amd768_rng.o
   2.274 +obj-$(CONFIG_HW_RANDOM) += hw_random.o
   2.275 +obj-$(CONFIG_AMD_PM768) += amd76x_pm.o
   2.276 +obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o
   2.277 +
   2.278 +obj-$(CONFIG_ITE_GPIO) += ite_gpio.o
   2.279 +obj-$(CONFIG_AU1X00_GPIO) += au1000_gpio.o
   2.280 +obj-$(CONFIG_AU1X00_USB_TTY) += au1000_usbtty.o
   2.281 +obj-$(CONFIG_AU1X00_USB_RAW) += au1000_usbraw.o
   2.282 +obj-$(CONFIG_COBALT_LCD) += lcd.o
   2.283 +
   2.284 +obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
   2.285 +
   2.286 +subdir-$(CONFIG_FTAPE) += ftape
   2.287 +subdir-$(CONFIG_DRM_OLD) += drm-4.0
   2.288 +subdir-$(CONFIG_DRM_NEW) += drm
   2.289 +subdir-$(CONFIG_PCMCIA) += pcmcia
   2.290 +subdir-$(CONFIG_AGP) += agp
   2.291 +
   2.292 +ifeq ($(CONFIG_FTAPE),y)
   2.293 +obj-y       += ftape/ftape.o
   2.294 +endif
   2.295 +
   2.296 +obj-$(CONFIG_H8) += h8.o
   2.297 +obj-$(CONFIG_PPDEV) += ppdev.o
   2.298 +obj-$(CONFIG_DZ) += dz.o
   2.299 +obj-$(CONFIG_NWBUTTON) += nwbutton.o
   2.300 +obj-$(CONFIG_NWFLASH) += nwflash.o
   2.301 +obj-$(CONFIG_SCx200) += scx200.o
   2.302 +obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
   2.303 +
   2.304 +# Only one watchdog can succeed. We probe the hardware watchdog
   2.305 +# drivers first, then the softdog driver.  This means if your hardware
   2.306 +# watchdog dies or is 'borrowed' for some reason the software watchdog
   2.307 +# still gives you some cover.
   2.308 +
   2.309 +obj-$(CONFIG_PCWATCHDOG) += pcwd.o
   2.310 +obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
   2.311 +obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
   2.312 +obj-$(CONFIG_IB700_WDT) += ib700wdt.o
   2.313 +obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
   2.314 +obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
   2.315 +obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
   2.316 +obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
   2.317 +obj-$(CONFIG_WDT) += wdt.o
   2.318 +obj-$(CONFIG_WDTPCI) += wdt_pci.o
   2.319 +obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
   2.320 +obj-$(CONFIG_977_WATCHDOG) += wdt977.o
   2.321 +obj-$(CONFIG_I810_TCO) += i810-tco.o
   2.322 +obj-$(CONFIG_MACHZ_WDT) += machzwd.o
   2.323 +obj-$(CONFIG_SH_WDT) += shwdt.o
   2.324 +obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
   2.325 +obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
   2.326 +obj-$(CONFIG_ALIM1535_WDT) += alim1535d_wdt.o
   2.327 +obj-$(CONFIG_INDYDOG) += indydog.o
   2.328 +obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
   2.329 +obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
   2.330 +obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
   2.331 +obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
   2.332 +obj-$(CONFIG_AMD7XX_TCO) += amd7xx_tco.o
   2.333 +obj-$(CONFIG_INDYDOG) += indydog.o
   2.334 +obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
   2.335 +
   2.336 +subdir-$(CONFIG_MWAVE) += mwave
   2.337 +ifeq ($(CONFIG_MWAVE),y)
   2.338 +  obj-y += mwave/mwave.o
   2.339 +endif
   2.340 +
   2.341 +subdir-$(CONFIG_IPMI_HANDLER) += ipmi
   2.342 +ifeq ($(CONFIG_IPMI_HANDLER),y)
   2.343 +  obj-y += ipmi/ipmi.o
   2.344 +endif
   2.345 +
   2.346 +include $(TOPDIR)/Rules.make
   2.347 +
   2.348 +fastdep:
   2.349 +
   2.350 +conmakehash: conmakehash.c
   2.351 +	$(HOSTCC) $(HOSTCFLAGS) -o conmakehash conmakehash.c
   2.352 +
   2.353 +consolemap_deftbl.c: $(FONTMAPFILE) conmakehash
   2.354 +	./conmakehash $(FONTMAPFILE) > consolemap_deftbl.c
   2.355 +
   2.356 +consolemap_deftbl.o: consolemap_deftbl.c $(TOPDIR)/include/linux/types.h
   2.357 +
   2.358 +.DELETE_ON_ERROR:
   2.359 +
   2.360 +defkeymap.c: defkeymap.map
   2.361 +	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
   2.362 +
   2.363 +qtronixmap.c: qtronixmap.map
   2.364 +	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/linux-2.4.26-xen-sparse/include/asm-xen/keyboard.h	Mon Jun 21 16:26:13 2004 +0000
     3.3 @@ -0,0 +1,74 @@
     3.4 +/*
     3.5 + *  linux/include/asm-i386/keyboard.h
     3.6 + *
     3.7 + *  Created 3 Nov 1996 by Geert Uytterhoeven
     3.8 + */
     3.9 +
    3.10 +/*
    3.11 + *  This file contains the i386 architecture specific keyboard definitions
    3.12 + */
    3.13 +
    3.14 +#ifndef _I386_KEYBOARD_H
    3.15 +#define _I386_KEYBOARD_H
    3.16 +
    3.17 +#ifdef __KERNEL__
    3.18 +
    3.19 +#include <linux/kernel.h>
    3.20 +#include <linux/ioport.h>
    3.21 +#include <linux/kd.h>
    3.22 +#include <linux/pm.h>
    3.23 +#include <asm/io.h>
    3.24 +
    3.25 +#define KEYBOARD_IRQ			1
    3.26 +#define DISABLE_KBD_DURING_INTERRUPTS	0
    3.27 +
    3.28 +extern int pckbd_setkeycode(unsigned int scancode, unsigned int keycode);
    3.29 +extern int pckbd_getkeycode(unsigned int scancode);
    3.30 +extern int pckbd_translate(unsigned char scancode, unsigned char *keycode,
    3.31 +			   char raw_mode);
    3.32 +extern char pckbd_unexpected_up(unsigned char keycode);
    3.33 +extern void pckbd_leds(unsigned char leds);
    3.34 +extern void pckbd_init_hw(void);
    3.35 +extern int pckbd_pm_resume(struct pm_dev *, pm_request_t, void *);
    3.36 +extern pm_callback pm_kbd_request_override;
    3.37 +extern unsigned char pckbd_sysrq_xlate[128];
    3.38 +
    3.39 +#define kbd_setkeycode		pckbd_setkeycode
    3.40 +#define kbd_getkeycode		pckbd_getkeycode
    3.41 +#define kbd_translate		pckbd_translate
    3.42 +#define kbd_unexpected_up	pckbd_unexpected_up
    3.43 +#define kbd_leds		pckbd_leds
    3.44 +#define kbd_init_hw		pckbd_init_hw
    3.45 +#define kbd_sysrq_xlate		pckbd_sysrq_xlate
    3.46 +
    3.47 +#define SYSRQ_KEY 0x54
    3.48 +
    3.49 +#define kbd_controller_present() (start_info.flags & SIF_INITDOMAIN)
    3.50 +
    3.51 +/* resource allocation */
    3.52 +#define kbd_request_region()
    3.53 +#define kbd_request_irq(handler) request_irq(KEYBOARD_IRQ, handler, 0, \
    3.54 +                                             "keyboard", NULL)
    3.55 +
    3.56 +/* How to access the keyboard macros on this platform.  */
    3.57 +#define kbd_read_input() inb(KBD_DATA_REG)
    3.58 +#define kbd_read_status() inb(KBD_STATUS_REG)
    3.59 +#define kbd_write_output(val) outb(val, KBD_DATA_REG)
    3.60 +#define kbd_write_command(val) outb(val, KBD_CNTL_REG)
    3.61 +
    3.62 +/* Some stoneage hardware needs delays after some operations.  */
    3.63 +#define kbd_pause() do { } while(0)
    3.64 +
    3.65 +/*
    3.66 + * Machine specific bits for the PS/2 driver
    3.67 + */
    3.68 +
    3.69 +#define AUX_IRQ 12
    3.70 +
    3.71 +#define aux_request_irq(hand, dev_id)					\
    3.72 +	request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS/2 Mouse", dev_id)
    3.73 +
    3.74 +#define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)
    3.75 +
    3.76 +#endif /* __KERNEL__ */
    3.77 +#endif /* _I386_KEYBOARD_H */
     4.1 --- a/linux-2.4.26-xen-sparse/mkbuildtree	Mon Jun 21 09:26:53 2004 +0000
     4.2 +++ b/linux-2.4.26-xen-sparse/mkbuildtree	Mon Jun 21 16:26:13 2004 +0000
     4.3 @@ -145,8 +145,7 @@ ln -sf ../asm-i386/io_apic.h
     4.4  ln -sf ../asm-i386/ioctl.h
     4.5  ln -sf ../asm-i386/ioctls.h
     4.6  ln -sf ../asm-i386/ipcbuf.h
     4.7 -ln -sf ../asm-i386/ipc.h 
     4.8 -ln -sf ../asm-i386/keyboard.h
     4.9 +ln -sf ../asm-i386/ipc.h
    4.10  ln -sf ../asm-i386/kmap_types.h
    4.11  ln -sf ../asm-i386/ldt.h 
    4.12  ln -sf ../asm-i386/linux_logo.h