aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/ibmasm/remote.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/ibmasm/remote.h')
-rw-r--r--drivers/misc/ibmasm/remote.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/ibmasm/remote.h b/drivers/misc/ibmasm/remote.h
index b7076a8442d2..72acf5af7a2a 100644
--- a/drivers/misc/ibmasm/remote.h
+++ b/drivers/misc/ibmasm/remote.h
@@ -18,7 +18,7 @@
18 * 18 *
19 * Copyright (C) IBM Corporation, 2004 19 * Copyright (C) IBM Corporation, 2004
20 * 20 *
21 * Author: Max Asböck <amax@us.ibm.com> 21 * Author: Max Asböck <amax@us.ibm.com>
22 * 22 *
23 * Orignally written by Pete Reynolds 23 * Orignally written by Pete Reynolds
24 */ 24 */
@@ -73,7 +73,7 @@ struct keyboard_input {
73 73
74 74
75 75
76struct remote_input { 76struct remote_input {
77 union { 77 union {
78 struct mouse_input mouse; 78 struct mouse_input mouse;
79 struct keyboard_input keyboard; 79 struct keyboard_input keyboard;
@@ -85,7 +85,7 @@ struct remote_input {
85 unsigned char pad3; 85 unsigned char pad3;
86}; 86};
87 87
88#define mouse_addr(sp) (sp->base_address + CONDOR_MOUSE_DATA) 88#define mouse_addr(sp) (sp->base_address + CONDOR_MOUSE_DATA)
89#define display_width(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESX) 89#define display_width(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESX)
90#define display_height(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESY) 90#define display_height(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_RESY)
91#define display_depth(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_BITS) 91#define display_depth(sp) (mouse_addr(sp) + CONDOR_INPUT_DISPLAY_BITS)
@@ -93,7 +93,7 @@ struct remote_input {
93#define vnc_status(sp) (mouse_addr(sp) + CONDOR_OUTPUT_VNC_STATUS) 93#define vnc_status(sp) (mouse_addr(sp) + CONDOR_OUTPUT_VNC_STATUS)
94#define isr_control(sp) (mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL) 94#define isr_control(sp) (mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL)
95 95
96#define mouse_interrupt_pending(sp) readl(mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS) 96#define mouse_interrupt_pending(sp) readl(mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS)
97#define clear_mouse_interrupt(sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS) 97#define clear_mouse_interrupt(sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_STATUS)
98#define enable_mouse_interrupts(sp) writel(1, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL) 98#define enable_mouse_interrupts(sp) writel(1, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL)
99#define disable_mouse_interrupts(sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL) 99#define disable_mouse_interrupts(sp) writel(0, mouse_addr(sp) + CONDOR_MOUSE_ISR_CONTROL)