X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmisc%2Fibmasm%2Fremote.h;h=00dbf1d4373a935c5d0378f1028bc4b14f13a98c;hb=8b9686ff4ddfdf45662024edd567920e6db87beb;hp=b7076a8442d2be8cb4a0967d0a645f14626c4f00;hpb=278d72ae8803ffcd16070c95fe1d53f4466dc741;p=pandora-kernel.git diff --git a/drivers/misc/ibmasm/remote.h b/drivers/misc/ibmasm/remote.h index b7076a8442d2..00dbf1d4373a 100644 --- a/drivers/misc/ibmasm/remote.h +++ b/drivers/misc/ibmasm/remote.h @@ -18,9 +18,9 @@ * * Copyright (C) IBM Corporation, 2004 * - * Author: Max Asböck + * Author: Max Asböck * - * Orignally written by Pete Reynolds + * Originally written by Pete Reynolds */ #ifndef _IBMASM_REMOTE_H_ @@ -73,7 +73,7 @@ struct keyboard_input { -struct remote_input { +struct remote_input { union { struct mouse_input mouse; struct keyboard_input keyboard; @@ -85,7 +85,7 @@ struct remote_input { unsigned char pad3; }; -#define mouse_addr(sp) (sp->base_address + CONDOR_MOUSE_DATA) +#define mouse_addr(sp) (sp->base_address + CONDOR_MOUSE_DATA) #define display_width(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESX) #define display_height(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESY) #define display_depth(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_BITS) @@ -93,7 +93,7 @@ struct remote_input { #define vnc_status(sp) (mouse_addr(sp) + CONDOR_OUTPUT_VNC_STATUS) #define isr_control(sp) (mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL) -#define mouse_interrupt_pending(sp) readl(mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS) +#define mouse_interrupt_pending(sp) readl(mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS) #define clear_mouse_interrupt(sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS) #define enable_mouse_interrupts(sp) writel(1, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL) #define disable_mouse_interrupts(sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL)