gwj / at91sam9263 · Commits

Commit 4ed59aa51880914f49d1995d924835d9d0767b1f

Authored by ths
1 parent f0c596cb

Replace tabs by 8 spaces. No code change, by Herve Poussineau. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3148 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 52 additions and 52 deletions
hw/vmmouse.c
  View file @4ed59aa
... ... @@ -77,21 +77,21 @@ static void vmmouse_mouse_event(void *opaque, int x, int y, int dz, int buttons_
77 77 int buttons = 0;
78 78  
79 79 if (s->nb_queue > (VMMOUSE_QUEUE_SIZE - 4))
80   - return;
  80 + return;
81 81  
82 82 DPRINTF("vmmouse_mouse_event(%d, %d, %d, %d)\n",
83   - x, y, dz, buttons_state);
  83 + x, y, dz, buttons_state);
84 84  
85 85 if ((buttons_state & MOUSE_EVENT_LBUTTON))
86   - buttons |= 0x20;
  86 + buttons |= 0x20;
87 87 if ((buttons_state & MOUSE_EVENT_RBUTTON))
88   - buttons |= 0x10;
  88 + buttons |= 0x10;
89 89 if ((buttons_state & MOUSE_EVENT_MBUTTON))
90   - buttons |= 0x08;
  90 + buttons |= 0x08;
91 91  
92 92 if (s->absolute) {
93   - x <<= 1;
94   - y <<= 1;
  93 + x <<= 1;
  94 + y <<= 1;
95 95 }
96 96  
97 97 s->queue[s->nb_queue++] = buttons;
... ... @@ -107,13 +107,13 @@ static void vmmouse_mouse_event(void *opaque, int x, int y, int dz, int buttons_
107 107 static void vmmouse_update_handler(VMMouseState *s)
108 108 {
109 109 if (s->entry) {
110   - qemu_remove_mouse_event_handler(s->entry);
111   - s->entry = NULL;
  110 + qemu_remove_mouse_event_handler(s->entry);
  111 + s->entry = NULL;
112 112 }
113 113 if (s->status == 0)
114   - s->entry = qemu_add_mouse_event_handler(vmmouse_mouse_event,
115   - s, s->absolute,
116   - "vmmouse");
  114 + s->entry = qemu_add_mouse_event_handler(vmmouse_mouse_event,
  115 + s, s->absolute,
  116 + "vmmouse");
117 117 }
118 118  
119 119 static void vmmouse_read_id(VMMouseState *s)
... ... @@ -121,7 +121,7 @@ static void vmmouse_read_id(VMMouseState *s)
121 121 DPRINTF("vmmouse_read_id()\n");
122 122  
123 123 if (s->nb_queue == VMMOUSE_QUEUE_SIZE)
124   - return;
  124 + return;
125 125  
126 126 s->queue[s->nb_queue++] = VMMOUSE_VERSION;
127 127 s->status = 0;
... ... @@ -156,18 +156,18 @@ static void vmmouse_data(VMMouseState *s, uint32_t *data, uint32_t size)
156 156 DPRINTF("vmmouse_data(%d)\n", size);
157 157  
158 158 if (size == 0 || size > 6 || size > s->nb_queue) {
159   - printf("vmmouse: driver requested too much data %d\n", size);
160   - s->status = 0xffff;
161   - vmmouse_update_handler(s);
162   - return;
  159 + printf("vmmouse: driver requested too much data %d\n", size);
  160 + s->status = 0xffff;
  161 + vmmouse_update_handler(s);
  162 + return;
163 163 }
164 164  
165 165 for (i = 0; i < size; i++)
166   - data[i] = s->queue[i];
  166 + data[i] = s->queue[i];
167 167  
168 168 s->nb_queue -= size;
169 169 if (s->nb_queue)
170   - memmove(s->queue, &s->queue[size], sizeof(s->queue[0]) * s->nb_queue);
  170 + memmove(s->queue, &s->queue[size], sizeof(s->queue[0]) * s->nb_queue);
171 171 }
172 172  
173 173 static void vmmouse_get_data(uint32_t *data)
... ... @@ -179,7 +179,7 @@ static void vmmouse_get_data(uint32_t *data)
179 179 data[4] = env->regs[R_ESI]; data[5] = env->regs[R_EDI];
180 180  
181 181 DPRINTF("get_data = {%x, %x, %x, %x, %x, %x}\n",
182   - data[0], data[1], data[2], data[3], data[4], data[5]);
  182 + data[0], data[1], data[2], data[3], data[4], data[5]);
183 183 }
184 184  
185 185 static void vmmouse_set_data(const uint32_t *data)
... ... @@ -187,7 +187,7 @@ static void vmmouse_set_data(const uint32_t *data)
187 187 CPUState *env = cpu_single_env;
188 188  
189 189 DPRINTF("set_data = {%x, %x, %x, %x, %x, %x}\n",
190   - data[0], data[1], data[2], data[3], data[4], data[5]);
  190 + data[0], data[1], data[2], data[3], data[4], data[5]);
191 191  
192 192 env->regs[R_EAX] = data[0]; env->regs[R_EBX] = data[1];
193 193 env->regs[R_ECX] = data[2]; env->regs[R_EDX] = data[3];
... ... @@ -202,42 +202,42 @@ static uint32_t vmmouse_ioport_read(void *opaque, uint32_t addr)
202 202  
203 203 vmmouse_get_data(data);
204 204 if (data[0] != VMMOUSE_MAGIC)
205   - goto error;
  205 + goto error;
206 206  
207 207 command = data[2] & 0xFFFF;
208 208  
209 209 switch (command) {
210 210 case VMMOUSE_GETVERSION:
211   - data[0] = vmmouse_get_version(s, &data[1]);
212   - break;
  211 + data[0] = vmmouse_get_version(s, &data[1]);
  212 + break;
213 213 case VMMOUSE_STATUS:
214   - data[0] = vmmouse_get_status(s);
215   - break;
  214 + data[0] = vmmouse_get_status(s);
  215 + break;
216 216 case VMMOUSE_COMMAND:
217   - switch (data[1]) {
218   - case VMMOUSE_DISABLE:
219   - vmmouse_disable(s);
220   - break;
221   - case VMMOUSE_READ_ID:
222   - vmmouse_read_id(s);
223   - break;
224   - case VMMOUSE_REQUEST_RELATIVE:
225   - vmmouse_request_relative(s);
226   - break;
227   - case VMMOUSE_REQUEST_ABSOLUTE:
228   - vmmouse_request_absolute(s);
229   - break;
230   - default:
231   - printf("vmmouse: unknown command %x\n", data[1]);
232   - break;
233   - }
234   - break;
  217 + switch (data[1]) {
  218 + case VMMOUSE_DISABLE:
  219 + vmmouse_disable(s);
  220 + break;
  221 + case VMMOUSE_READ_ID:
  222 + vmmouse_read_id(s);
  223 + break;
  224 + case VMMOUSE_REQUEST_RELATIVE:
  225 + vmmouse_request_relative(s);
  226 + break;
  227 + case VMMOUSE_REQUEST_ABSOLUTE:
  228 + vmmouse_request_absolute(s);
  229 + break;
  230 + default:
  231 + printf("vmmouse: unknown command %x\n", data[1]);
  232 + break;
  233 + }
  234 + break;
235 235 case VMMOUSE_DATA:
236   - vmmouse_data(s, data, data[1]);
237   - break;
  236 + vmmouse_data(s, data, data[1]);
  237 + break;
238 238 default:
239   - printf("vmmouse: unknown command %x\n", command);
240   - break;
  239 + printf("vmmouse: unknown command %x\n", command);
  240 + break;
241 241 }
242 242  
243 243 error:
... ... @@ -252,7 +252,7 @@ static void vmmouse_save(QEMUFile *f, void *opaque)
252 252  
253 253 qemu_put_be32(f, VMMOUSE_QUEUE_SIZE);
254 254 for (i = 0; i < VMMOUSE_QUEUE_SIZE; i++)
255   - qemu_put_be32s(f, &s->queue[i]);
  255 + qemu_put_be32s(f, &s->queue[i]);
256 256 qemu_put_be16s(f, &s->nb_queue);
257 257 qemu_put_be16s(f, &s->status);
258 258 qemu_put_8s(f, &s->absolute);
... ... @@ -267,9 +267,9 @@ static int vmmouse_load(QEMUFile *f, void *opaque, int version_id)
267 267 return -EINVAL;
268 268  
269 269 if (qemu_get_be32(f) != VMMOUSE_QUEUE_SIZE)
270   - return -EINVAL;
  270 + return -EINVAL;
271 271 for (i = 0; i < VMMOUSE_QUEUE_SIZE; i++)
272   - qemu_get_be32s(f, &s->queue[i]);
  272 + qemu_get_be32s(f, &s->queue[i]);
273 273 qemu_get_be16s(f, &s->nb_queue);
274 274 qemu_get_be16s(f, &s->status);
275 275 qemu_get_8s(f, &s->absolute);
... ... @@ -287,7 +287,7 @@ void *vmmouse_init(void *m)
287 287  
288 288 s = qemu_mallocz(sizeof(VMMouseState));
289 289 if (!s)
290   - return NULL;
  290 + return NULL;
291 291  
292 292 s->status = 0xffff;
293 293 s->ps2_mouse = m;
... ...