direct-io.hg
changeset 1534:793f5eb5d149
bitkeeper revision 1.996 (40d7f3c2ByN1WWCHbNtt1l_a8at-GQ)
Merge http://xen.bkbits.net:8080/xeno-unstable.bk
into gandalf.hpl.hp.com:/var/bk/xeno-unstable.bk
Merge http://xen.bkbits.net:8080/xeno-unstable.bk
into gandalf.hpl.hp.com:/var/bk/xeno-unstable.bk
author | xenbk@gandalf.hpl.hp.com |
---|---|
date | Tue Jun 22 08:54:26 2004 +0000 (2004-06-22) |
parents | 396e842f2f14 1cfa6e590f83 |
children | cbee10dcdd93 b26fa300bcc8 |
files | .rootkeys linux-2.4.26-xen-sparse/arch/xen/config.in linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU 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 15:58:22 2004 +0000 1.2 +++ b/.rootkeys Tue Jun 22 08:54:26 2004 +0000 1.3 @@ -102,6 +102,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 @@ -116,6 +117,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 --- a/linux-2.4.26-xen-sparse/arch/xen/config.in Mon Jun 21 15:58:22 2004 +0000 2.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/config.in Tue Jun 22 08:54:26 2004 +0000 2.3 @@ -20,6 +20,10 @@ endmenu 2.4 # The IBM S/390 patch needs this. 2.5 define_bool CONFIG_NO_IDLE_HZ y 2.6 2.7 +if [ "$CONFIG_XEN_PHYSDEV_ACCESS" != "y" ]; then 2.8 + define_bool CONFIG_VT n 2.9 +fi 2.10 + 2.11 mainmenu_option next_comment 2.12 comment 'Code maturity level options' 2.13 bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
3.1 --- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU Mon Jun 21 15:58:22 2004 +0000 3.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU Tue Jun 22 08:54:26 2004 +0000 3.3 @@ -266,8 +266,7 @@ CONFIG_BLK_DEV_INITRD=y 3.4 # 3.5 # Character devices 3.6 # 3.7 -CONFIG_VT=y 3.8 -CONFIG_VT_CONSOLE=y 3.9 +# CONFIG_VT is not set 3.10 # CONFIG_SERIAL is not set 3.11 # CONFIG_SERIAL_EXTENDED is not set 3.12 # CONFIG_SERIAL_NONSTANDARD is not set
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/linux-2.4.26-xen-sparse/drivers/char/Makefile Tue Jun 22 08:54:26 2004 +0000 4.3 @@ -0,0 +1,361 @@ 4.4 +# 4.5 +# Makefile for the kernel character device drivers. 4.6 +# 4.7 +# Note! Dependencies are done automagically by 'make dep', which also 4.8 +# removes any old dependencies. DON'T put your own dependencies here 4.9 +# unless it's something special (ie not a .c file). 4.10 +# 4.11 +# Note 2! The CFLAGS definitions are now inherited from the 4.12 +# parent makes.. 4.13 +# 4.14 + 4.15 +# 4.16 +# This file contains the font map for the default (hardware) font 4.17 +# 4.18 +FONTMAPFILE = cp437.uni 4.19 + 4.20 +O_TARGET := char.o 4.21 + 4.22 +obj-y += mem.o tty_io.o n_tty.o tty_ioctl.o raw.o pty.o misc.o random.o 4.23 + 4.24 +# All of the (potential) objects that export symbols. 4.25 +# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. 4.26 + 4.27 +export-objs := busmouse.o console.o keyboard.o sysrq.o \ 4.28 + misc.o pty.o random.o selection.o serial.o \ 4.29 + sonypi.o tty_io.o tty_ioctl.o generic_serial.o \ 4.30 + au1000_gpio.o vac-serial.o hp_psaux.o nvram.o \ 4.31 + scx200.o fetchop.o 4.32 + 4.33 +mod-subdirs := joystick ftape drm drm-4.0 pcmcia 4.34 + 4.35 +list-multi := 4.36 + 4.37 +KEYMAP =defkeymap.o 4.38 +KEYBD =pc_keyb.o 4.39 +CONSOLE =console.o 4.40 +SERIAL =serial.o 4.41 + 4.42 +ifeq ($(ARCH),xen) 4.43 + ifneq ($(CONFIG_XEN_PHYSDEV_ACCESS),y) 4.44 + KEYBD = 4.45 + endif 4.46 +endif 4.47 + 4.48 +ifeq ($(ARCH),s390) 4.49 + KEYMAP = 4.50 + KEYBD = 4.51 + CONSOLE = 4.52 + SERIAL = 4.53 +endif 4.54 + 4.55 +ifeq ($(ARCH),mips) 4.56 + ifneq ($(CONFIG_PC_KEYB),y) 4.57 + KEYBD = 4.58 + endif 4.59 + ifeq ($(CONFIG_VR41XX_KIU),y) 4.60 + KEYMAP = 4.61 + KEYBD = vr41xx_keyb.o 4.62 + endif 4.63 +endif 4.64 + 4.65 +ifeq ($(ARCH),s390x) 4.66 + KEYMAP = 4.67 + KEYBD = 4.68 + CONSOLE = 4.69 + SERIAL = 4.70 +endif 4.71 + 4.72 +ifeq ($(ARCH),m68k) 4.73 + ifdef CONFIG_AMIGA 4.74 + KEYBD = amikeyb.o 4.75 + else 4.76 + ifndef CONFIG_MAC 4.77 + KEYBD = 4.78 + endif 4.79 + endif 4.80 + SERIAL = 4.81 +endif 4.82 + 4.83 +ifeq ($(ARCH),parisc) 4.84 + ifdef CONFIG_GSC_PS2 4.85 + KEYBD = hp_psaux.o hp_keyb.o 4.86 + else 4.87 + KEYBD = 4.88 + endif 4.89 + ifdef CONFIG_SERIAL_MUX 4.90 + CONSOLE += mux.o 4.91 + endif 4.92 + ifdef CONFIG_PDC_CONSOLE 4.93 + CONSOLE += pdc_console.o 4.94 + endif 4.95 +endif 4.96 + 4.97 +ifdef CONFIG_Q40 4.98 + KEYBD += q40_keyb.o 4.99 + SERIAL = serial.o 4.100 +endif 4.101 + 4.102 +ifdef CONFIG_APOLLO 4.103 + KEYBD += dn_keyb.o 4.104 +endif 4.105 + 4.106 +ifeq ($(ARCH),parisc) 4.107 + ifdef CONFIG_GSC_PS2 4.108 + KEYBD = hp_psaux.o hp_keyb.o 4.109 + else 4.110 + KEYBD = 4.111 + endif 4.112 + ifdef CONFIG_PDC_CONSOLE 4.113 + CONSOLE += pdc_console.o 4.114 + endif 4.115 +endif 4.116 + 4.117 +ifeq ($(ARCH),arm) 4.118 + ifneq ($(CONFIG_PC_KEYMAP),y) 4.119 + KEYMAP = 4.120 + endif 4.121 + ifneq ($(CONFIG_PC_KEYB),y) 4.122 + KEYBD = 4.123 + endif 4.124 +endif 4.125 + 4.126 +ifeq ($(ARCH),sh) 4.127 + KEYMAP = 4.128 + KEYBD = 4.129 + CONSOLE = 4.130 + ifeq ($(CONFIG_SH_HP600),y) 4.131 + KEYMAP = defkeymap.o 4.132 + KEYBD = scan_keyb.o hp600_keyb.o 4.133 + CONSOLE = console.o 4.134 + endif 4.135 + ifeq ($(CONFIG_SH_DMIDA),y) 4.136 + # DMIDA does not connect the HD64465 PS/2 keyboard port 4.137 + # but we allow for USB keyboards to be plugged in. 4.138 + KEYMAP = defkeymap.o 4.139 + KEYBD = # hd64465_keyb.o pc_keyb.o 4.140 + CONSOLE = console.o 4.141 + endif 4.142 + ifeq ($(CONFIG_SH_EC3104),y) 4.143 + KEYMAP = defkeymap.o 4.144 + KEYBD = ec3104_keyb.o 4.145 + CONSOLE = console.o 4.146 + endif 4.147 + ifeq ($(CONFIG_SH_DREAMCAST),y) 4.148 + KEYMAP = defkeymap.o 4.149 + KEYBD = 4.150 + CONSOLE = console.o 4.151 + endif 4.152 +endif 4.153 + 4.154 +ifeq ($(CONFIG_DECSTATION),y) 4.155 + KEYMAP = 4.156 + KEYBD = 4.157 +endif 4.158 + 4.159 +ifeq ($(CONFIG_BAGET_MIPS),y) 4.160 + KEYBD = 4.161 + SERIAL = vac-serial.o 4.162 +endif 4.163 + 4.164 +ifeq ($(CONFIG_NINO),y) 4.165 + SERIAL = 4.166 +endif 4.167 + 4.168 +ifneq ($(CONFIG_SUN_SERIAL),) 4.169 + SERIAL = 4.170 +endif 4.171 + 4.172 +ifeq ($(CONFIG_QTRONIX_KEYBOARD),y) 4.173 + KEYBD = qtronix.o 4.174 + KEYMAP = qtronixmap.o 4.175 +endif 4.176 + 4.177 +ifeq ($(CONFIG_DUMMY_KEYB),y) 4.178 + KEYBD = dummy_keyb.o 4.179 +endif 4.180 + 4.181 +obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o 4.182 +obj-$(CONFIG_SERIAL) += $(SERIAL) 4.183 +obj-$(CONFIG_SERIAL_HCDP) += hcdp_serial.o 4.184 +obj-$(CONFIG_SERIAL_21285) += serial_21285.o 4.185 +obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o 4.186 +obj-$(CONFIG_SERIAL_AMBA) += serial_amba.o 4.187 +obj-$(CONFIG_TS_AU1X00_ADS7846) += au1000_ts.o 4.188 +obj-$(CONFIG_SERIAL_DEC) += decserial.o 4.189 + 4.190 +ifndef CONFIG_SUN_KEYBOARD 4.191 + obj-$(CONFIG_VT) += keyboard.o $(KEYMAP) $(KEYBD) 4.192 +else 4.193 + obj-$(CONFIG_PCI) += keyboard.o $(KEYMAP) 4.194 +endif 4.195 + 4.196 +obj-$(CONFIG_HIL) += hp_keyb.o 4.197 +obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o 4.198 +obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o 4.199 +obj-$(CONFIG_ROCKETPORT) += rocket.o 4.200 +obj-$(CONFIG_MOXA_SMARTIO) += mxser.o 4.201 +obj-$(CONFIG_MOXA_INTELLIO) += moxa.o 4.202 +obj-$(CONFIG_DIGI) += pcxx.o 4.203 +obj-$(CONFIG_DIGIEPCA) += epca.o 4.204 +obj-$(CONFIG_CYCLADES) += cyclades.o 4.205 +obj-$(CONFIG_STALLION) += stallion.o 4.206 +obj-$(CONFIG_ISTALLION) += istallion.o 4.207 +obj-$(CONFIG_SIBYTE_SB1250_DUART) += sb1250_duart.o 4.208 +obj-$(CONFIG_COMPUTONE) += ip2.o ip2main.o 4.209 +obj-$(CONFIG_RISCOM8) += riscom8.o 4.210 +obj-$(CONFIG_ISI) += isicom.o 4.211 +obj-$(CONFIG_ESPSERIAL) += esp.o 4.212 +obj-$(CONFIG_SYNCLINK) += synclink.o 4.213 +obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o 4.214 +obj-$(CONFIG_N_HDLC) += n_hdlc.o 4.215 +obj-$(CONFIG_SPECIALIX) += specialix.o 4.216 +obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o 4.217 +obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o 4.218 +obj-$(CONFIG_SX) += sx.o generic_serial.o 4.219 +obj-$(CONFIG_RIO) += rio/rio.o generic_serial.o 4.220 +obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o 4.221 +obj-$(CONFIG_SERIAL167) += serial167.o 4.222 +obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o 4.223 +obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o 4.224 +obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o 4.225 +obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o 4.226 +obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o 4.227 +obj-$(CONFIG_TXX927_SERIAL) += serial_txx927.o 4.228 +obj-$(CONFIG_SERIAL_TXX9) += generic_serial.o serial_txx9.o 4.229 +obj-$(CONFIG_IP22_SERIAL) += sgiserial.o 4.230 +obj-$(CONFIG_AU1X00_UART) += au1x00-serial.o 4.231 +obj-$(CONFIG_SGI_L1_SERIAL) += sn_serial.o 4.232 + 4.233 +subdir-$(CONFIG_RIO) += rio 4.234 +subdir-$(CONFIG_INPUT) += joystick 4.235 + 4.236 +obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o 4.237 +obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o 4.238 +obj-$(CONFIG_PRINTER) += lp.o 4.239 +obj-$(CONFIG_TIPAR) += tipar.o 4.240 +obj-$(CONFIG_OBMOUSE) += obmouse.o 4.241 + 4.242 +ifeq ($(CONFIG_INPUT),y) 4.243 +obj-y += joystick/js.o 4.244 +endif 4.245 + 4.246 +obj-$(CONFIG_FETCHOP) += fetchop.o 4.247 +obj-$(CONFIG_BUSMOUSE) += busmouse.o 4.248 +obj-$(CONFIG_DTLK) += dtlk.o 4.249 +obj-$(CONFIG_R3964) += n_r3964.o 4.250 +obj-$(CONFIG_APPLICOM) += applicom.o 4.251 +obj-$(CONFIG_SONYPI) += sonypi.o 4.252 +obj-$(CONFIG_MS_BUSMOUSE) += msbusmouse.o 4.253 +obj-$(CONFIG_82C710_MOUSE) += qpmouse.o 4.254 +obj-$(CONFIG_AMIGAMOUSE) += amigamouse.o 4.255 +obj-$(CONFIG_ATARIMOUSE) += atarimouse.o 4.256 +obj-$(CONFIG_ADBMOUSE) += adbmouse.o 4.257 +obj-$(CONFIG_PC110_PAD) += pc110pad.o 4.258 +obj-$(CONFIG_MK712_MOUSE) += mk712.o 4.259 +obj-$(CONFIG_RTC) += rtc.o 4.260 +obj-$(CONFIG_GEN_RTC) += genrtc.o 4.261 +obj-$(CONFIG_EFI_RTC) += efirtc.o 4.262 +obj-$(CONFIG_SGI_DS1286) += ds1286.o 4.263 +obj-$(CONFIG_MIPS_RTC) += mips_rtc.o 4.264 +obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o 4.265 +ifeq ($(CONFIG_PPC),) 4.266 + obj-$(CONFIG_NVRAM) += nvram.o 4.267 +endif 4.268 +obj-$(CONFIG_TOSHIBA) += toshiba.o 4.269 +obj-$(CONFIG_I8K) += i8k.o 4.270 +obj-$(CONFIG_DS1620) += ds1620.o 4.271 +obj-$(CONFIG_DS1742) += ds1742.o 4.272 +obj-$(CONFIG_INTEL_RNG) += i810_rng.o 4.273 +obj-$(CONFIG_AMD_RNG) += amd768_rng.o 4.274 +obj-$(CONFIG_HW_RANDOM) += hw_random.o 4.275 +obj-$(CONFIG_AMD_PM768) += amd76x_pm.o 4.276 +obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o 4.277 + 4.278 +obj-$(CONFIG_ITE_GPIO) += ite_gpio.o 4.279 +obj-$(CONFIG_AU1X00_GPIO) += au1000_gpio.o 4.280 +obj-$(CONFIG_AU1X00_USB_TTY) += au1000_usbtty.o 4.281 +obj-$(CONFIG_AU1X00_USB_RAW) += au1000_usbraw.o 4.282 +obj-$(CONFIG_COBALT_LCD) += lcd.o 4.283 + 4.284 +obj-$(CONFIG_QIC02_TAPE) += tpqic02.o 4.285 + 4.286 +subdir-$(CONFIG_FTAPE) += ftape 4.287 +subdir-$(CONFIG_DRM_OLD) += drm-4.0 4.288 +subdir-$(CONFIG_DRM_NEW) += drm 4.289 +subdir-$(CONFIG_PCMCIA) += pcmcia 4.290 +subdir-$(CONFIG_AGP) += agp 4.291 + 4.292 +ifeq ($(CONFIG_FTAPE),y) 4.293 +obj-y += ftape/ftape.o 4.294 +endif 4.295 + 4.296 +obj-$(CONFIG_H8) += h8.o 4.297 +obj-$(CONFIG_PPDEV) += ppdev.o 4.298 +obj-$(CONFIG_DZ) += dz.o 4.299 +obj-$(CONFIG_NWBUTTON) += nwbutton.o 4.300 +obj-$(CONFIG_NWFLASH) += nwflash.o 4.301 +obj-$(CONFIG_SCx200) += scx200.o 4.302 +obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o 4.303 + 4.304 +# Only one watchdog can succeed. We probe the hardware watchdog 4.305 +# drivers first, then the softdog driver. This means if your hardware 4.306 +# watchdog dies or is 'borrowed' for some reason the software watchdog 4.307 +# still gives you some cover. 4.308 + 4.309 +obj-$(CONFIG_PCWATCHDOG) += pcwd.o 4.310 +obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o 4.311 +obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o 4.312 +obj-$(CONFIG_IB700_WDT) += ib700wdt.o 4.313 +obj-$(CONFIG_MIXCOMWD) += mixcomwd.o 4.314 +obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o 4.315 +obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o 4.316 +obj-$(CONFIG_SC520_WDT) += sc520_wdt.o 4.317 +obj-$(CONFIG_WDT) += wdt.o 4.318 +obj-$(CONFIG_WDTPCI) += wdt_pci.o 4.319 +obj-$(CONFIG_21285_WATCHDOG) += wdt285.o 4.320 +obj-$(CONFIG_977_WATCHDOG) += wdt977.o 4.321 +obj-$(CONFIG_I810_TCO) += i810-tco.o 4.322 +obj-$(CONFIG_MACHZ_WDT) += machzwd.o 4.323 +obj-$(CONFIG_SH_WDT) += shwdt.o 4.324 +obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o 4.325 +obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o 4.326 +obj-$(CONFIG_ALIM1535_WDT) += alim1535d_wdt.o 4.327 +obj-$(CONFIG_INDYDOG) += indydog.o 4.328 +obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o 4.329 +obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o 4.330 +obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o 4.331 +obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o 4.332 +obj-$(CONFIG_AMD7XX_TCO) += amd7xx_tco.o 4.333 +obj-$(CONFIG_INDYDOG) += indydog.o 4.334 +obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o 4.335 + 4.336 +subdir-$(CONFIG_MWAVE) += mwave 4.337 +ifeq ($(CONFIG_MWAVE),y) 4.338 + obj-y += mwave/mwave.o 4.339 +endif 4.340 + 4.341 +subdir-$(CONFIG_IPMI_HANDLER) += ipmi 4.342 +ifeq ($(CONFIG_IPMI_HANDLER),y) 4.343 + obj-y += ipmi/ipmi.o 4.344 +endif 4.345 + 4.346 +include $(TOPDIR)/Rules.make 4.347 + 4.348 +fastdep: 4.349 + 4.350 +conmakehash: conmakehash.c 4.351 + $(HOSTCC) $(HOSTCFLAGS) -o conmakehash conmakehash.c 4.352 + 4.353 +consolemap_deftbl.c: $(FONTMAPFILE) conmakehash 4.354 + ./conmakehash $(FONTMAPFILE) > consolemap_deftbl.c 4.355 + 4.356 +consolemap_deftbl.o: consolemap_deftbl.c $(TOPDIR)/include/linux/types.h 4.357 + 4.358 +.DELETE_ON_ERROR: 4.359 + 4.360 +defkeymap.c: defkeymap.map 4.361 + set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@ 4.362 + 4.363 +qtronixmap.c: qtronixmap.map 4.364 + set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/linux-2.4.26-xen-sparse/include/asm-xen/keyboard.h Tue Jun 22 08:54:26 2004 +0000 5.3 @@ -0,0 +1,74 @@ 5.4 +/* 5.5 + * linux/include/asm-i386/keyboard.h 5.6 + * 5.7 + * Created 3 Nov 1996 by Geert Uytterhoeven 5.8 + */ 5.9 + 5.10 +/* 5.11 + * This file contains the i386 architecture specific keyboard definitions 5.12 + */ 5.13 + 5.14 +#ifndef _I386_KEYBOARD_H 5.15 +#define _I386_KEYBOARD_H 5.16 + 5.17 +#ifdef __KERNEL__ 5.18 + 5.19 +#include <linux/kernel.h> 5.20 +#include <linux/ioport.h> 5.21 +#include <linux/kd.h> 5.22 +#include <linux/pm.h> 5.23 +#include <asm/io.h> 5.24 + 5.25 +#define KEYBOARD_IRQ 1 5.26 +#define DISABLE_KBD_DURING_INTERRUPTS 0 5.27 + 5.28 +extern int pckbd_setkeycode(unsigned int scancode, unsigned int keycode); 5.29 +extern int pckbd_getkeycode(unsigned int scancode); 5.30 +extern int pckbd_translate(unsigned char scancode, unsigned char *keycode, 5.31 + char raw_mode); 5.32 +extern char pckbd_unexpected_up(unsigned char keycode); 5.33 +extern void pckbd_leds(unsigned char leds); 5.34 +extern void pckbd_init_hw(void); 5.35 +extern int pckbd_pm_resume(struct pm_dev *, pm_request_t, void *); 5.36 +extern pm_callback pm_kbd_request_override; 5.37 +extern unsigned char pckbd_sysrq_xlate[128]; 5.38 + 5.39 +#define kbd_setkeycode pckbd_setkeycode 5.40 +#define kbd_getkeycode pckbd_getkeycode 5.41 +#define kbd_translate pckbd_translate 5.42 +#define kbd_unexpected_up pckbd_unexpected_up 5.43 +#define kbd_leds pckbd_leds 5.44 +#define kbd_init_hw pckbd_init_hw 5.45 +#define kbd_sysrq_xlate pckbd_sysrq_xlate 5.46 + 5.47 +#define SYSRQ_KEY 0x54 5.48 + 5.49 +#define kbd_controller_present() (start_info.flags & SIF_INITDOMAIN) 5.50 + 5.51 +/* resource allocation */ 5.52 +#define kbd_request_region() 5.53 +#define kbd_request_irq(handler) request_irq(KEYBOARD_IRQ, handler, 0, \ 5.54 + "keyboard", NULL) 5.55 + 5.56 +/* How to access the keyboard macros on this platform. */ 5.57 +#define kbd_read_input() inb(KBD_DATA_REG) 5.58 +#define kbd_read_status() inb(KBD_STATUS_REG) 5.59 +#define kbd_write_output(val) outb(val, KBD_DATA_REG) 5.60 +#define kbd_write_command(val) outb(val, KBD_CNTL_REG) 5.61 + 5.62 +/* Some stoneage hardware needs delays after some operations. */ 5.63 +#define kbd_pause() do { } while(0) 5.64 + 5.65 +/* 5.66 + * Machine specific bits for the PS/2 driver 5.67 + */ 5.68 + 5.69 +#define AUX_IRQ 12 5.70 + 5.71 +#define aux_request_irq(hand, dev_id) \ 5.72 + request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS/2 Mouse", dev_id) 5.73 + 5.74 +#define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id) 5.75 + 5.76 +#endif /* __KERNEL__ */ 5.77 +#endif /* _I386_KEYBOARD_H */
6.1 --- a/linux-2.4.26-xen-sparse/mkbuildtree Mon Jun 21 15:58:22 2004 +0000 6.2 +++ b/linux-2.4.26-xen-sparse/mkbuildtree Tue Jun 22 08:54:26 2004 +0000 6.3 @@ -145,8 +145,7 @@ ln -sf ../asm-i386/io_apic.h 6.4 ln -sf ../asm-i386/ioctl.h 6.5 ln -sf ../asm-i386/ioctls.h 6.6 ln -sf ../asm-i386/ipcbuf.h 6.7 -ln -sf ../asm-i386/ipc.h 6.8 -ln -sf ../asm-i386/keyboard.h 6.9 +ln -sf ../asm-i386/ipc.h 6.10 ln -sf ../asm-i386/kmap_types.h 6.11 ln -sf ../asm-i386/ldt.h 6.12 ln -sf ../asm-i386/linux_logo.h