ia64/xen-unstable

changeset 633:d2aad5afa33c

bitkeeper revision 1.352 (3f134f85YWnJ4PLqQ7YFm2Ydbnzh9Q)

Only attempt to access keyboard if SIF_CONSOLE set on domain
+typo fix
author iap10@labyrinth.cl.cam.ac.uk
date Tue Jul 15 00:49:09 2003 +0000 (2003-07-15)
parents 63da63184f59
children 2e36bfa1978c 8463f8865ddc
files xen/drivers/block/xen_block.c xenolinux-2.4.21-sparse/include/asm-xeno/keyboard.h
line diff
     1.1 --- a/xen/drivers/block/xen_block.c	Tue Jul 15 00:02:34 2003 +0000
     1.2 +++ b/xen/drivers/block/xen_block.c	Tue Jul 15 00:49:09 2003 +0000
     1.3 @@ -711,7 +711,7 @@ static void dispatch_rw_block_io(struct 
     1.4  	    phys_seg[nr_psegs].dev           = xendev_to_physdev(req->device);
     1.5              if ( phys_seg[nr_psegs].dev == 0 ) 
     1.6  	    {
     1.7 -	        DPRINTK("bad device: %04x\n", req_device);
     1.8 +	        DPRINTK("bad device: %04x\n", req->device);
     1.9  	        goto bad_descriptor;
    1.10  	    }
    1.11              new_segs = 1;
     2.1 --- a/xenolinux-2.4.21-sparse/include/asm-xeno/keyboard.h	Tue Jul 15 00:02:34 2003 +0000
     2.2 +++ b/xenolinux-2.4.21-sparse/include/asm-xeno/keyboard.h	Tue Jul 15 00:49:09 2003 +0000
     2.3 @@ -52,6 +52,19 @@ extern unsigned char pckbd_sysrq_xlate[1
     2.4  #include <asm/hypervisor-ifs/kbd.h>
     2.5  #include <asm/hypervisor-ifs/hypervisor-if.h>
     2.6  
     2.7 +#define kbd_controller_present xen_kbd_controller_present
     2.8 +
     2.9 +static inline int xen_kbd_controller_present ()
    2.10 +{
    2.11 +	if( start_info.flags & SIF_CONSOLE )
    2.12 +		{
    2.13 +		printk("Enable keyboard\n");
    2.14 +		return 1;
    2.15 +		}
    2.16 +	else
    2.17 +		return 0;
    2.18 +}
    2.19 +
    2.20  /* resource allocation */
    2.21  #define kbd_request_region() do { } while (0)
    2.22  #define kbd_request_irq(handler) request_irq(_EVENT_KBD, handler, 0, "PS/2 kbd", NULL)
    2.23 @@ -68,7 +81,7 @@ static unsigned char kbd_current_scancod
    2.24  
    2.25  static unsigned char kbd_read_input(void) 
    2.26  {
    2.27 -  //printk("kbd_read_input: returning scancode 0x%2x\n", kbd_current_scancode);
    2.28 +  //xprintk("kbd_read_input: returning scancode 0x%2x\n", kbd_current_scancode);
    2.29    return kbd_current_scancode;
    2.30  }
    2.31