projects / openwrt / staging / dedeckeh.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
add initial support for the crisarchitecture used on foxboards to openwrt
[openwrt/staging/dedeckeh.git] / target / linux / etrax-2.6 / patches / cris / 001-include-cris.patch
1 diff -urN linux-2.6.19.2.old/include/asm-cris/Kbuild linux-2.6.19.2.dev/include/asm-cris/Kbuild
2 --- linux-2.6.19.2.old/include/asm-cris/Kbuild 2007-01-10 20:10:37.000000000 +0100
3 +++ linux-2.6.19.2.dev/include/asm-cris/Kbuild 2007-02-09 16:51:34.000000000 +0100
4 @@ -3,3 +3,6 @@
5 header-y += arch-v10/ arch-v32/
6
7 unifdef-y += rs485.h
8 +unifdef-y += ethernet.h
9 +unifdef-y += etraxgpio.h
10 +unifdef-y += rtc.h
11 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v10/Kbuild linux-2.6.19.2.dev/include/asm-cris/arch-v10/Kbuild
12 --- linux-2.6.19.2.old/include/asm-cris/arch-v10/Kbuild 2007-01-10 20:10:37.000000000 +0100
13 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/Kbuild 2007-02-26 21:03:05.000000000 +0100
14 @@ -1,2 +1,5 @@
15 header-y += ptrace.h
16 header-y += user.h
17 +header-y += svinto.h
18 +header-y += sv_addr_ag.h
19 +header-y += sv_addr.agh
20 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v10/bug.h linux-2.6.19.2.dev/include/asm-cris/arch-v10/bug.h
21 --- linux-2.6.19.2.old/include/asm-cris/arch-v10/bug.h 1970-01-01 01:00:00.000000000 +0100
22 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/bug.h 2006-06-21 10:29:16.000000000 +0200
23 @@ -0,0 +1,66 @@
24 +#ifndef __ASM_CRIS_ARCH_BUG_H
25 +#define __ASM_CRIS_ARCH_BUG_H
26 +
27 +#include <linux/stringify.h>
28 +
29 +#ifdef CONFIG_BUG
30 +#ifdef CONFIG_DEBUG_BUGVERBOSE
31 +/* The BUG() macro is used for marking obviously incorrect code paths.
32 + * It will cause a message with the file name and line number to be printed,
33 + * and then cause an oops. The message is actually printed by handle_BUG()
34 + * in arch/cris/kernel/traps.c, and the reason we use this method of storing
35 + * the file name and line number is that we do not want to affect the registers
36 + * by calling printk() before causing the oops.
37 + */
38 +
39 +#define BUG_PREFIX 0x0D7F
40 +#define BUG_MAGIC 0x00001234
41 +
42 +struct bug_frame {
43 + unsigned short prefix;
44 + unsigned int magic;
45 + unsigned short clear;
46 + unsigned short movu;
47 + unsigned short line;
48 + unsigned short jump;
49 + unsigned char* filename;
50 +};
51 +
52 +#if 0
53 +/* Unfortunately this version of the macro does not work due to a problem
54 + * with the compiler (aka a bug) when compiling with -O2, which sometimes
55 + * erroneously causes the second input to be stored in a register...
56 + */
57 +#define BUG() \
58 + __asm__ __volatile__ ("clear.d [" __stringify(BUG_MAGIC) "]\n\t"\
59 + "movu.w %0,$r0\n\t" \
60 + "jump %1\n\t" \
61 + : : "i" (__LINE__), "i" (__FILE__))
62 +#else
63 +/* This version will have to do for now, until the compiler is fixed.
64 + * The drawbacks of this version are that the file name will appear multiple
65 + * times in the .rodata section, and that __LINE__ and __FILE__ can probably
66 + * not be used like this with newer versions of gcc.
67 + */
68 +#define BUG() \
69 + __asm__ __volatile__ ("clear.d [" __stringify(BUG_MAGIC) "]\n\t"\
70 + "movu.w " __stringify(__LINE__) ",$r0\n\t"\
71 + "jump 0f\n\t" \
72 + ".section .rodata\n" \
73 + "0:\t.string \"" __FILE__ "\"\n\t" \
74 + ".previous")
75 +#endif
76 +
77 +#else
78 +
79 +/* This just causes an oops. */
80 +#define BUG() (*(int *)0 = 0)
81 +
82 +#endif
83 +
84 +#define HAVE_ARCH_BUG
85 +#endif
86 +
87 +#include <asm-generic/bug.h>
88 +
89 +#endif
90 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v10/ide.h linux-2.6.19.2.dev/include/asm-cris/arch-v10/ide.h
91 --- linux-2.6.19.2.old/include/asm-cris/arch-v10/ide.h 2007-01-10 20:10:37.000000000 +0100
92 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/ide.h 2005-08-23 11:44:36.000000000 +0200
93 @@ -32,7 +32,7 @@
94 * together in a hwgroup, and will serialize accesses. this is good, because
95 * we can't access more than one interface at the same time on ETRAX100.
96 */
97 - return 4;
98 + return 4;
99 }
100
101 static inline unsigned long ide_default_io_base(int index)
102 @@ -61,15 +61,15 @@
103 /* fill in ports for ATA addresses 0 to 7 */
104
105 for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
106 - hw->io_ports[i] = data_port |
107 - IO_FIELD(R_ATA_CTRL_DATA, addr, i) |
108 + hw->io_ports[i] = data_port |
109 + IO_FIELD(R_ATA_CTRL_DATA, addr, i) |
110 IO_STATE(R_ATA_CTRL_DATA, cs0, active);
111 }
112
113 /* the IDE control register is at ATA address 6, with CS1 active instead of CS0 */
114
115 hw->io_ports[IDE_CONTROL_OFFSET] = data_port |
116 - IO_FIELD(R_ATA_CTRL_DATA, addr, 6) |
117 + IO_FIELD(R_ATA_CTRL_DATA, addr, 6) |
118 IO_STATE(R_ATA_CTRL_DATA, cs1, active);
119
120 /* whats this for ? */
121 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v10/io.h linux-2.6.19.2.dev/include/asm-cris/arch-v10/io.h
122 --- linux-2.6.19.2.old/include/asm-cris/arch-v10/io.h 2007-01-10 20:10:37.000000000 +0100
123 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/io.h 2007-03-06 12:16:16.000000000 +0100
124 @@ -56,6 +56,9 @@
125 #define LED_RED 0x02
126 #define LED_ORANGE (LED_GREEN | LED_RED)
127
128 +#if defined(CONFIG_ETRAX_NO_LEDS)
129 +#define LED_NETWORK_SET(x)
130 +#else
131 #if CONFIG_ETRAX_LED1G == CONFIG_ETRAX_LED1R
132 #define LED_NETWORK_SET(x) \
133 do { \
134 @@ -80,6 +83,7 @@
135 LED_ACTIVE_SET_R((x) & LED_RED); \
136 } while (0)
137 #endif
138 +#endif
139
140 #ifdef CONFIG_ETRAX_PA_LEDS
141 #define LED_NETWORK_SET_G(x) \
142 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v10/juliette.h linux-2.6.19.2.dev/include/asm-cris/arch-v10/juliette.h
143 --- linux-2.6.19.2.old/include/asm-cris/arch-v10/juliette.h 1970-01-01 01:00:00.000000000 +0100
144 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/juliette.h 2004-06-03 11:28:57.000000000 +0200
145 @@ -0,0 +1,328 @@
146 +#ifndef _ASM_JULIETTE_H
147 +#define _ASM_JULIETTE_H
148 +
149 +#include <asm/arch/svinto.h>
150 +
151 +/* juliette _IOC_TYPE, bits 8 to 15 in ioctl cmd */
152 +
153 +#define JULIOCTYPE 42
154 +
155 +/* supported ioctl _IOC_NR's */
156 +
157 +#define JULSTARTDMA 0x1 /* start a picture asynchronously */
158 +
159 +/* set parameters */
160 +
161 +#define SETDEFAULT 0x2 /* CCD/VIDEO/SS1M */
162 +#define SETPARAMETERS 0x3 /* CCD/VIDEO */
163 +#define SETSIZE 0x4 /* CCD/VIDEO/SS1M */
164 +#define SETCOMPRESSION 0x5 /* CCD/VIDEO/SS1M */
165 +#define SETCOLORLEVEL 0x6 /* CCD/VIDEO */
166 +#define SETBRIGHTNESS 0x7 /* CCD */
167 +#define SETROTATION 0x8 /* CCD */
168 +#define SETTEXT 0x9 /* CCD/VIDEO/SS1M */
169 +#define SETCLOCK 0xa /* CCD/VIDEO/SS1M */
170 +#define SETDATE 0xb /* CCD/VIDEO/SS1M */
171 +#define SETTIMEFORMAT 0xc /* CCD/VIDEO/SS1M */
172 +#define SETDATEFORMAT 0xd /* VIDEO */
173 +#define SETTEXTALIGNMENT 0xe /* VIDEO */
174 +#define SETFPS 0xf /* CCD/VIDEO/SS1M */
175 +#define SETVGA 0xff /* VIDEO */
176 +#define SETCOMMENT 0xfe /* CCD/VIDEO */
177 +
178 +/* get parameters */
179 +
180 +#define GETDRIVERTYPE 0x10 /* CCD/VIDEO/SS1M */
181 +#define GETNBROFCAMERAS 0x11 /* CCD/VIDEO/SS1M */
182 +#define GETPARAMETERS 0x12 /* CCD/VIDEO/SS1M */
183 +#define GETBUFFERSIZE 0x13 /* CCD/VIDEO/SS1M */
184 +#define GETVIDEOTYPE 0x14 /* VIDEO/SS1M */
185 +#define GETVIDEOSIGNAL 0x15 /* VIDEO */
186 +#define GETMODULATION 0x16 /* VIDEO */
187 +#define GETDCYVALUES 0xa0 /* CCD /SS1M */
188 +#define GETDCYWIDTH 0xa1 /* CCD /SS1M */
189 +#define GETDCYHEIGHT 0xa2 /* CCD /SS1M */
190 +#define GETSIZE 0xa3 /* CCD/VIDEO */
191 +#define GETCOMPRESSION 0xa4 /* CCD/VIDEO */
192 +
193 +/* detect and get parameters */
194 +
195 +#define DETECTMODULATION 0x17 /* VIDEO */
196 +#define DETECTVIDEOTYPE 0x18 /* VIDEO */
197 +#define DETECTVIDEOSIGNAL 0x19 /* VIDEO */
198 +
199 +/* configure default parameters */
200 +
201 +#define CONFIGUREDEFAULT 0x20 /* CCD/VIDEO/SS1M */
202 +#define DEFSIZE 0x21 /* CCD/VIDEO/SS1M */
203 +#define DEFCOMPRESSION 0x22 /* CCD/VIDEO/SS1M */
204 +#define DEFCOLORLEVEL 0x23 /* CCD/VIDEO */
205 +#define DEFBRIGHTNESS 0x24 /* CCD */
206 +#define DEFROTATION 0x25 /* CCD */
207 +#define DEFWHITEBALANCE 0x26 /* CCD */
208 +#define DEFEXPOSURE 0x27 /* CCD */
209 +#define DEFAUTOEXPWINDOW 0x28 /* CCD */
210 +#define DEFTEXT 0x29 /* CCD/VIDEO/SS1M */
211 +#define DEFCLOCK 0x2a /* CCD/VIDEO/SS1M */
212 +#define DEFDATE 0x2b /* CCD/VIDEO/SS1M */
213 +#define DEFTIMEFORMAT 0x2c /* CCD/VIDEO/SS1M */
214 +#define DEFDATEFORMAT 0x2d /* VIDEO */
215 +#define DEFTEXTALIGNMENT 0x2e /* VIDEO */
216 +#define DEFFPS 0x2f /* CCD/VIDEO/SS1M */
217 +#define DEFTEXTSTRING 0x30 /* CCD/VIDEO/SS1M */
218 +#define DEFHEADERINFO 0x31 /* CCD/VIDEO/SS1M */
219 +#define DEFWEXAR 0x32 /* CCD */
220 +#define DEFLINEDELAY 0x33 /* CCD */
221 +#define DEFDISABLEDVIDEO 0x34 /* VIDEO */
222 +#define DEFVIDEOTYPE 0x35 /* VIDEO */
223 +#define DEFMODULATION 0x36 /* VIDEO */
224 +#define DEFXOFFSET 0x37 /* VIDEO */
225 +#define DEFYOFFSET 0x38 /* VIDEO */
226 +#define DEFYCMODE 0x39 /* VIDEO */
227 +#define DEFVCRMODE 0x3a /* VIDEO */
228 +#define DEFSTOREDCYVALUES 0x3b /* CCD/VIDEO/SS1M */
229 +#define DEFWCDS 0x3c /* CCD */
230 +#define DEFVGA 0x3d /* VIDEO */
231 +#define DEFCOMMENT 0x3e /* CCD/VIDEO */
232 +#define DEFCOMMENTSIZE 0x3f /* CCD/VIDEO */
233 +#define DEFCOMMENTTEXT 0x50 /* CCD/VIDEO */
234 +#define DEFSTOREDCYTEXT 0x51 /* VIDEO */
235 +
236 +
237 +#define JULABORTDMA 0x70 /* Abort current DMA transfer */
238 +
239 +/* juliette general i/o port */
240 +
241 +#define JIO_READBITS 0x40 /* read and return current port bits */
242 +#define JIO_SETBITS 0x41 /* set bits marked by 1 in the argument */
243 +#define JIO_CLRBITS 0x42 /* clr bits marked by 1 in the argument */
244 +#define JIO_READDIR 0x43 /* read direction, 0=input 1=output */
245 +#define JIO_SETINPUT 0x44 /* set direction, 0=unchanged 1=input
246 + returns current dir */
247 +#define JIO_SETOUTPUT 0x45 /* set direction, 0=unchanged 1=output
248 + returns current dir */
249 +
250 +/**** YumYum internal adresses ****/
251 +
252 +/* Juliette buffer addresses */
253 +
254 +#define BUFFER1_VIDEO 0x1100
255 +#define BUFFER2_VIDEO 0x2800
256 +#define ACDC_BUFF_VIDEO 0x0aaa
257 +#define BUFFER1 0x1700
258 +#define BUFFER2 0x2b01
259 +#define ACDC_BUFFER 0x1200
260 +#define BUFFER1_SS1M 0x1100
261 +#define BUFFER2_SS1M 0x2800
262 +#define ACDC_BUFF_SS1M 0x0900
263 +
264 +/* Juliette parameter memory addresses */
265 +
266 +#define PA_BUFFER_CNT 0x3f09 /* CCD/VIDEO */
267 +#define PA_CCD_BUFFER 0x3f10 /* CCD */
268 +#define PA_VIDEO_BUFFER 0x3f10 /* VIDEO */
269 +#define PA_DCT_BUFFER 0x3f11 /* CCD/VIDEO */
270 +#define PA_TEMP 0x3f12 /* CCD/VIDEO */
271 +#define PA_VIDEOLINE_RD 0x3f13 /* VIDEO */
272 +#define PA_VIDEOLINE_WR 0x3f14 /* VIDEO */
273 +#define PA_VI_HDELAY0 0x3f15 /* VIDEO */
274 +#define PA_VI_VDELAY0 0x3f16 /* VIDEO */
275 +#define PA_VI_HDELAY1 0x3f17 /* VIDEO */
276 +#define PA_VI_VDELAY1 0x3f18 /* VIDEO */
277 +#define PA_VI_HDELAY2 0x3f19 /* VIDEO */
278 +#define PA_VI_VDELAY2 0x3f1a /* VIDEO */
279 +#define PA_VI_HDELAY3 0x3f1b /* VIDEO */
280 +#define PA_VI_VDELAY3 0x3f1c /* VIDEO */
281 +#define PA_VI_CTRL 0x3f20 /* VIDEO */
282 +#define PA_JPEG_CTRL 0x3f22 /* CCD/VIDEO */
283 +#define PA_BUFFER_SIZE 0x3f24 /* CCD/VIDEO */
284 +#define PA_PAL_NTSC 0x3f25 /* VIDEO */
285 +#define PA_MACROBLOCKS 0x3f26 /* CCD/VIDEO */
286 +#define PA_COLOR 0x3f27 /* VIDEO */
287 +#define PA_MEMCH1CNT2 0x3f28 /* CCD/VIDEO */
288 +#define PA_MEMCH1CNT3 0x3f29 /* VIDEO */
289 +#define PA_MEMCH1STR2 0x3f2a /* CCD/VIDEO */
290 +#define PA_MEMCH1STR3 0x3f2b /* VIDEO */
291 +#define PA_BUFFERS 0x3f2c /* CCD/VIDEO */
292 +#define PA_PROGRAM 0x3f2d /* CCD/VIDEO */
293 +#define PA_ROTATION 0x3f2e /* CCD */
294 +#define PA_PC 0x3f30 /* CCD/VIDEO */
295 +#define PA_PC2 0x3f31 /* VIDEO */
296 +#define PA_ODD_LINE 0x3f32 /* VIDEO */
297 +#define PA_EXP_DELAY 0x3f34 /* CCD */
298 +#define PA_MACROBLOCK_CNT 0x3f35 /* CCD/VIDEO */
299 +#define PA_DRAM_PTR1_L 0x3f36 /* CCD/VIDEO */
300 +#define PA_CLPOB_CNT 0x3f37 /* CCD */
301 +#define PA_DRAM_PTR1_H 0x3f38 /* CCD/VIDEO */
302 +#define PA_DRAM_PTR2_L 0x3f3a /* VIDEO */
303 +#define PA_DRAM_PTR2_H 0x3f3c /* VIDEO */
304 +#define PA_CCD_LINE_CNT 0x3f3f /* CCD */
305 +#define PA_VIDEO_LINE_CNT 0x3f3f /* VIDEO */
306 +#define PA_TEXT 0x3f41 /* CCD/VIDEO */
307 +#define PA_CAMERA_CHANGED 0x3f42 /* VIDEO */
308 +#define PA_TEXTALIGNMENT 0x3f43 /* VIDEO */
309 +#define PA_DISABLED 0x3f44 /* VIDEO */
310 +#define PA_MACROBLOCKTEXT 0x3f45 /* VIDEO */
311 +#define PA_VGA 0x3f46 /* VIDEO */
312 +#define PA_ZERO 0x3ffe /* VIDEO */
313 +#define PA_NULL 0x3fff /* CCD/VIDEO */
314 +
315 +typedef enum {
316 + jpeg = 0,
317 + dummy = 1
318 +} request_type;
319 +
320 +typedef enum {
321 + hugesize = 0,
322 + fullsize = 1,
323 + halfsize = 2,
324 + fieldsize = 3
325 +} size_type;
326 +
327 +typedef enum {
328 + min = 0,
329 + low = 1,
330 + medium = 2,
331 + high = 3,
332 + very_high = 4,
333 + very_low = 5,
334 + q1 = 6,
335 + q2 = 7,
336 + q3 = 8,
337 + q4 = 9,
338 + q5 = 10,
339 + q6 = 11
340 +} compr_type;
341 +
342 +typedef enum {
343 + deg_0 = 0,
344 + deg_180 = 1,
345 + deg_90 = 2,
346 + deg_270 = 3
347 +} rotation_type;
348 +
349 +typedef enum {
350 + auto_white = 0,
351 + hold = 1,
352 + fixed_outdoor = 2,
353 + fixed_indoor = 3,
354 + fixed_fluor = 4
355 +} white_balance_type;
356 +
357 +typedef enum {
358 + auto_exp = 0,
359 + fixed_exp = 1
360 +} exposure_type;
361 +
362 +typedef enum {
363 + no_window = 0,
364 + center = 1,
365 + top = 2,
366 + lower = 3,
367 + left = 4,
368 + right = 5,
369 + spot = 6,
370 + cw = 7
371 +} exp_window_type;
372 +
373 +typedef enum {
374 + h_24 = 0,
375 + h_12 = 1,
376 + h_24P = 2
377 +} hour_type;
378 +
379 +typedef enum {
380 + standard = 0,
381 + YYYY_MM_DD = 1,
382 + Www_Mmm_DD_YYYY = 2,
383 + Www_DD_MM_YYYY = 3
384 +} date_type;
385 +
386 +typedef enum {
387 + left_align = 0,
388 + center_align = 1,
389 + right_align = 2
390 +} alignment_type;
391 +
392 +typedef enum {
393 + off = 0,
394 + on = 1,
395 + no = 0,
396 + yes = 1
397 +} enable_type;
398 +
399 +typedef enum {
400 + disabled = 0,
401 + enabled = 1,
402 + extended = 2
403 +} comment_type;
404 +
405 +typedef enum {
406 + pal = 0,
407 + ntsc = 1
408 +} video_type;
409 +
410 +typedef enum {
411 + pal_bghi_ntsc_m = 0,
412 + ntsc_4_43_50hz_pal_4_43_60hz = 1,
413 + pal_n_ntsc_4_43_60hz = 2,
414 + ntsc_n_pal_m = 3,
415 + secam_pal_4_43_60hz = 4
416 +} modulation_type;
417 +
418 +typedef enum {
419 + cam0 = 0,
420 + cam1 = 1,
421 + cam2 = 2,
422 + cam3 = 3,
423 + quad = 32
424 +} camera_type;
425 +
426 +typedef enum {
427 + video_driver = 0,
428 + ccd_driver = 1
429 +} driver_type;
430 +
431 +struct jul_param {
432 + request_type req_type;
433 + size_type size;
434 + compr_type compression;
435 + rotation_type rotation;
436 + int color_level;
437 + int brightness;
438 + white_balance_type white_balance;
439 + exposure_type exposure;
440 + exp_window_type auto_exp_window;
441 + hour_type time_format;
442 + date_type date_format;
443 + alignment_type text_alignment;
444 + enable_type text;
445 + enable_type clock;
446 + enable_type date;
447 + enable_type fps;
448 + enable_type vga;
449 + enable_type comment;
450 +};
451 +
452 +struct video_param {
453 + enable_type disabled;
454 + modulation_type modulation;
455 + video_type video;
456 + enable_type signal;
457 + enable_type vcr;
458 + int xoffset;
459 + int yoffset;
460 +};
461 +
462 +/* The juliette_request structure is used during the JULSTARTDMA asynchronous
463 + * picture-taking ioctl call as an argument to specify a buffer which will get
464 + * the final picture.
465 + */
466 +
467 +struct juliette_request {
468 + char *buf; /* Pointer to the buffer to hold picture data */
469 + unsigned int buflen; /* Length of the above buffer */
470 + unsigned int size; /* Resulting length, 0 if the picture is not ready */
471 +};
472 +
473 +#endif
474 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/Kbuild linux-2.6.19.2.dev/include/asm-cris/arch-v32/Kbuild
475 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/Kbuild 2007-01-10 20:10:37.000000000 +0100
476 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/Kbuild 2007-02-09 16:51:34.000000000 +0100
477 @@ -1,2 +1,3 @@
478 header-y += ptrace.h
479 header-y += user.h
480 +header-y += cryptocop.h
481 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/arbiter.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/arbiter.h
482 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/arbiter.h 2007-01-10 20:10:37.000000000 +0100
483 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/arbiter.h 2006-10-13 14:45:18.000000000 +0200
484 @@ -22,6 +22,7 @@
485
486 int crisv32_arbiter_allocate_bandwidth(int client, int region,
487 unsigned long bandwidth);
488 +void crisv32_arbiter_deallocate_bandwidth(int client, int region);
489 int crisv32_arbiter_watch(unsigned long start, unsigned long size,
490 unsigned long clients, unsigned long accesses,
491 watch_callback* cb);
492 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/bitops.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/bitops.h
493 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/bitops.h 2007-01-10 20:10:37.000000000 +0100
494 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/bitops.h 2005-08-23 11:44:37.000000000 +0200
495 @@ -16,7 +16,7 @@
496 __asm__ __volatile__ ("swapnwbr %0\n\t"
497 "lz %0,%0"
498 : "=r" (res) : "0" (w));
499 -
500 +
501 return res;
502 }
503
504 @@ -28,7 +28,7 @@
505 __asm__ __volatile__ ("swapwbr %0\n\t"
506 "lz %0,%0"
507 : "=r" (res) : "0" (w));
508 -
509 +
510 return res;
511 }
512
513 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/board.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/board.h
514 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/board.h 1970-01-01 01:00:00.000000000 +0100
515 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/board.h 2007-01-29 15:05:01.000000000 +0100
516 @@ -0,0 +1,74 @@
517 +/*
518 + * linux/include/asm-cris/arch-v32/board.h
519 + *
520 + * Types for board-specific data.
521 + *
522 + * Copyright (C) 2007 Axis Communications AB
523 + */
524 +
525 +#ifndef __ARCH_V32_BOARD_H
526 +#define __ARCH_V32_BOARD_H
527 +
528 +/* A tuple for a regi base and an interrupt. */
529 +struct crisv32_regi_n_int {
530 + u32 regi;
531 + u32 irq;
532 +};
533 +
534 +/*
535 + * SPI and SD/MMC types, arranged such that the data for mmc_spi is an
536 + * add-on to SPI; the SPI data does not contain anything about SD/MMC
537 + * and the SPI controller driver can't access it. SPI data is
538 + * arranged to allow sharing common functions between SSER and GPIO.
539 + */
540 +
541 +/* Hardware identification for the bitbanged GPIO SPI controller. */
542 +struct crisv32_spi_gpio_controller_data {
543 + /* Names of the pins. */
544 + const char *cs;
545 + const char *miso;
546 + const char *mosi;
547 + const char *sclk;
548 +};
549 +
550 +/* Similar for the SSER SPI controller. */
551 +struct crisv32_spi_sser_controller_data {
552 + /* How to connect pins and claim the SSER interface and the DMA
553 + channels. */
554 + int (*iface_allocate)(struct crisv32_regi_n_int *sser,
555 + struct crisv32_regi_n_int *dmain,
556 + struct crisv32_regi_n_int *dmaout);
557 + void (*iface_free)(void);
558 +
559 + /* Whether DMA is to be used. */
560 + int using_dma;
561 +};
562 +
563 +struct crisv32_mmc_spi_pinstate;
564 +
565 +/*
566 + * Regardless of SPI controller, these pins are needed in addition to
567 + * the SPI pins when the used as a SD/MMC SPI controller.
568 + */
569 +struct crisv32_mmc_spi_pindata {
570 + /* Names of the pins. */
571 + const char *card_detect;
572 + const char *write_protect;
573 +
574 + /* Related private state to interface to the mmc_spi API. */
575 + struct crisv32_mmc_spi_pinstate *pinstate;
576 +};
577 +
578 +/* When SD/MMC SPI on GPIO, here's all the hardware-identifying data. */
579 +struct crisv32_mmc_spi_gpio_hwdata {
580 + struct crisv32_spi_gpio_controller_data spi;
581 + struct crisv32_mmc_spi_pindata mmc;
582 +};
583 +
584 +/* Similar for SSER. */
585 +struct crisv32_mmc_spi_sser_hwdata {
586 + struct crisv32_spi_sser_controller_data spi;
587 + struct crisv32_mmc_spi_pindata mmc;
588 +};
589 +
590 +#endif /* __ARCH_V32_BOARD_H */
591 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/bug.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/bug.h
592 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/bug.h 1970-01-01 01:00:00.000000000 +0100
593 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/bug.h 2006-06-21 10:29:16.000000000 +0200
594 @@ -0,0 +1,69 @@
595 +#ifndef __ASM_CRIS_ARCH_BUG_H
596 +#define __ASM_CRIS_ARCH_BUG_H
597 +
598 +#include <linux/stringify.h>
599 +
600 +#ifdef CONFIG_BUG
601 +#ifdef CONFIG_DEBUG_BUGVERBOSE
602 +/* The BUG() macro is used for marking obviously incorrect code paths.
603 + * It will cause a message with the file name and line number to be printed,
604 + * and then cause an oops. The message is actually printed by handle_BUG()
605 + * in arch/cris/kernel/traps.c, and the reason we use this method of storing
606 + * the file name and line number is that we do not want to affect the registers
607 + * by calling printk() before causing the oops (this is not entirely true
608 + * for CRISv32 since we need to modify the $acr register).
609 + */
610 +
611 +#define BUG_PREFIX 0xFE6F
612 +#define BUG_MAGIC 0x00001234
613 +
614 +struct bug_frame {
615 + unsigned short prefix;
616 + unsigned int magic;
617 + unsigned short clear;
618 + unsigned short movu;
619 + unsigned short line;
620 + unsigned short jump;
621 + unsigned char* filename;
622 +};
623 +
624 +#if 0
625 +/* Unfortunately this version of the macro does not work due to a problem
626 + * with the compiler (aka a bug) when compiling with -O2, which sometimes
627 + * erroneously causes the second input to be stored in a register...
628 + */
629 +#define BUG() \
630 + __asm__ __volatile__ ("move.d [" __stringify(BUG_MAGIC) "],$acr\n\t"\
631 + "clear.d [$acr]\n\t" \
632 + "movu.w %0,$r0\n\t" \
633 + "jump %1\n\t" \
634 + : : "i" (__LINE__), "i" (__FILE__))
635 +#else
636 +/* This version will have to do for now, until the compiler is fixed.
637 + * The drawbacks of this version are that the file name will appear multiple
638 + * times in the .rodata section, and that __LINE__ and __FILE__ can probably
639 + * not be used like this with newer versions of gcc.
640 + */
641 +#define BUG() \
642 + __asm__ __volatile__ ("move.d " __stringify(BUG_MAGIC) ",$acr\n\t"\
643 + "clear.d [$acr]\n\t" \
644 + "movu.w " __stringify(__LINE__) ",$r0\n\t"\
645 + "jump 0f\n\t" \
646 + ".section .rodata\n" \
647 + "0:\t.string \"" __FILE__ "\"\n\t" \
648 + ".previous")
649 +#endif
650 +
651 +#else
652 +
653 +/* This just causes an oops. */
654 +#define BUG() (*(int *)0 = 0)
655 +
656 +#endif
657 +
658 +#define HAVE_ARCH_BUG
659 +#endif
660 +
661 +#include <asm-generic/bug.h>
662 +
663 +#endif
664 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/cache.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/cache.h
665 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/cache.h 2007-01-10 20:10:37.000000000 +0100
666 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/cache.h 2007-01-05 09:59:53.000000000 +0100
667 @@ -1,8 +1,19 @@
668 #ifndef _ASM_CRIS_ARCH_CACHE_H
669 #define _ASM_CRIS_ARCH_CACHE_H
670
671 +#include <asm/arch/hwregs/dma.h>
672 +
673 /* A cache-line is 32 bytes. */
674 #define L1_CACHE_BYTES 32
675 #define L1_CACHE_SHIFT 5
676
677 +void flush_dma_list(dma_descr_data* descr);
678 +void flush_dma_descr(dma_descr_data* descr, int flush_buf);
679 +
680 +#define flush_dma_context(c) \
681 + flush_dma_list(phys_to_virt((c)->saved_data));
682 +
683 +void cris_flush_cache_range(void* buf, unsigned long len);
684 +void cris_flush_cache(void);
685 +
686 #endif /* _ASM_CRIS_ARCH_CACHE_H */
687 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/cryptocop.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/cryptocop.h
688 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/cryptocop.h 2007-01-10 20:10:37.000000000 +0100
689 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/cryptocop.h 2005-04-20 14:33:25.000000000 +0200
690 @@ -160,7 +160,7 @@
691 cryptocop_source_dma = 0,
692 cryptocop_source_des,
693 cryptocop_source_3des,
694 - cryptocop_source_aes,
695 + cryptocop_source_aes,
696 cryptocop_source_md5,
697 cryptocop_source_sha1,
698 cryptocop_source_csum,
699 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/delay.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/delay.h
700 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/delay.h 2007-01-10 20:10:37.000000000 +0100
701 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/delay.h 2006-10-11 19:46:19.000000000 +0200
702 @@ -1,6 +1,16 @@
703 #ifndef _ASM_CRIS_ARCH_DELAY_H
704 #define _ASM_CRIS_ARCH_DELAY_H
705
706 +extern void cris_delay10ns(u32 n10ns);
707 +#define udelay(u) cris_delay10ns((u)*100)
708 +#define ndelay(n) cris_delay10ns(((n)+9)/10)
709 +
710 +/*
711 + * Not used anymore for udelay or ndelay. Referenced by
712 + * e.g. init/calibrate.c. All other references are likely bugs;
713 + * should be replaced by mdelay, udelay or ndelay.
714 + */
715 +
716 static inline void
717 __delay(int loops)
718 {
719 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/dma.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/dma.h
720 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/dma.h 2007-01-10 20:10:37.000000000 +0100
721 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/dma.h 2005-05-02 12:43:02.000000000 +0200
722 @@ -67,7 +67,7 @@
723 dma_ext3
724 };
725
726 -int crisv32_request_dma(unsigned int dmanr, const char * device_id,
727 +int crisv32_request_dma(unsigned int dmanr, const char * device_id,
728 unsigned options, unsigned bandwidth, enum dma_owner owner);
729 void crisv32_free_dma(unsigned int dmanr);
730
731 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/Makefile linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/Makefile
732 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/Makefile 2007-01-10 20:10:37.000000000 +0100
733 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/Makefile 2004-01-07 22:16:18.000000000 +0100
734 @@ -126,9 +126,9 @@
735
736 # From /n/asic/projects/guinness/design/
737 reg_map.h: $(DESIGNDIR)/top/rtl/global.rmap $(DESIGNDIR)/top/mod/modreg.rmap
738 - $(RDES2C) -base 0xb0000000 $^
739 + $(RDES2C) -base 0xb0000000 $^
740 reg_map_asm.h: $(DESIGNDIR)/top/rtl/global.rmap $(DESIGNDIR)/top/mod/modreg.rmap
741 - $(RDES2C) -base 0xb0000000 -asm -outfile $@ $^
742 + $(RDES2C) -base 0xb0000000 -asm -outfile $@ $^
743
744 reg_rdwr.h: $(DESIGNDIR)/top/sw/include/reg_rdwr.h
745 cat $< | sed -e 's/\$$Id\:/id\:/g' >$@
746 @@ -171,14 +171,14 @@
747 done
748
749 .PHONY: axw
750 -## %.axw - Generate the specified .axw file (doesn't work for all files
751 +## %.axw - Generate the specified .axw file (doesn't work for all files
752 ## due to inconsistent naming ir .r files.
753 %.axw: axw
754 @for RDES in $(REGDESC); do \
755 if echo "$$RDES" | grep $* ; then \
756 $(RDES2TXT) $$RDES; \
757 fi \
758 - done
759 + done
760
761 .PHONY: clean
762 ## clean - Remove .h files and .axw files.
763 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h
764 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
765 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
766 @@ -4,9 +4,9 @@
767 /*
768 * This file is autogenerated from
769 * file: ../../inst/ata/rtl/ata_regs.r
770 - * id: ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp
771 + * id: ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp
772 * last modfied: Mon Apr 11 16:06:25 2005
773 - *
774 + *
775 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/ata_defs_asm.h ../../inst/ata/rtl/ata_regs.r
776 * id: $Id: ata_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
777 * Any changes here will be lost.
778 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h
779 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
780 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
781 @@ -4,9 +4,9 @@
782 /*
783 * This file is autogenerated from
784 * file: ../../inst/bif/rtl/bif_core_regs.r
785 - * id: bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp
786 + * id: bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp
787 * last modfied: Mon Apr 11 16:06:33 2005
788 - *
789 + *
790 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/bif_core_defs_asm.h ../../inst/bif/rtl/bif_core_regs.r
791 * id: $Id: bif_core_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
792 * Any changes here will be lost.
793 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h
794 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
795 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
796 @@ -4,9 +4,9 @@
797 /*
798 * This file is autogenerated from
799 * file: ../../inst/bif/rtl/bif_dma_regs.r
800 - * id: bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp
801 + * id: bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp
802 * last modfied: Mon Apr 11 16:06:33 2005
803 - *
804 + *
805 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/bif_dma_defs_asm.h ../../inst/bif/rtl/bif_dma_regs.r
806 * id: $Id: bif_dma_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
807 * Any changes here will be lost.
808 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h
809 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
810 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
811 @@ -4,9 +4,9 @@
812 /*
813 * This file is autogenerated from
814 * file: ../../inst/bif/rtl/bif_slave_regs.r
815 - * id: bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp
816 + * id: bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp
817 * last modfied: Mon Apr 11 16:06:34 2005
818 - *
819 + *
820 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/bif_slave_defs_asm.h ../../inst/bif/rtl/bif_slave_regs.r
821 * id: $Id: bif_slave_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
822 * Any changes here will be lost.
823 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h
824 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
825 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
826 @@ -4,9 +4,9 @@
827 /*
828 * This file is autogenerated from
829 * file: ../../rtl/config_regs.r
830 - * id: config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp
831 + * id: config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp
832 * last modfied: Thu Mar 4 12:34:39 2004
833 - *
834 + *
835 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/config_defs_asm.h ../../rtl/config_regs.r
836 * id: $Id: config_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
837 * Any changes here will be lost.
838 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h
839 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h 2007-01-10 20:10:37.000000000 +0100
840 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h 2005-04-24 20:31:04.000000000 +0200
841 @@ -3,7 +3,7 @@
842 version . */
843
844 #ifndef _______INST_CRISP_DOC_CPU_VECT_R
845 -#define _______INST_CRISP_DOC_CPU_VECT_R
846 +#define _______INST_CRISP_DOC_CPU_VECT_R
847 #define NMI_INTR_VECT 0x00
848 #define RESERVED_1_INTR_VECT 0x01
849 #define RESERVED_2_INTR_VECT 0x02
850 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h
851 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
852 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
853 @@ -4,9 +4,9 @@
854 /*
855 * This file is autogenerated from
856 * file: ../../inst/crisp/doc/cris.r
857 - * id: cris.r,v 1.6 2004/05/05 07:41:12 perz Exp
858 + * id: cris.r,v 1.6 2004/05/05 07:41:12 perz Exp
859 * last modfied: Mon Apr 11 16:06:39 2005
860 - *
861 + *
862 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/cris_defs_asm.h ../../inst/crisp/doc/cris.r
863 * id: $Id: cris_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
864 * Any changes here will be lost.
865 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h
866 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
867 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
868 @@ -4,9 +4,9 @@
869 /*
870 * This file is autogenerated from
871 * file: ../../inst/dma/inst/dma_common/rtl/dma_regdes.r
872 - * id: dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp
873 + * id: dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp
874 * last modfied: Mon Apr 11 16:06:51 2005
875 - *
876 + *
877 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/dma_defs_asm.h ../../inst/dma/inst/dma_common/rtl/dma_regdes.r
878 * id: $Id: dma_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
879 * Any changes here will be lost.
880 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h
881 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
882 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
883 @@ -4,9 +4,9 @@
884 /*
885 * This file is autogenerated from
886 * file: ../../inst/eth/rtl/eth_regs.r
887 - * id: eth_regs.r,v 1.11 2005/02/09 10:48:38 kriskn Exp
888 + * id: eth_regs.r,v 1.11 2005/02/09 10:48:38 kriskn Exp
889 * last modfied: Mon Apr 11 16:07:03 2005
890 - *
891 + *
892 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/eth_defs_asm.h ../../inst/eth/rtl/eth_regs.r
893 * id: $Id: eth_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
894 * Any changes here will be lost.
895 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h
896 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
897 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
898 @@ -4,9 +4,9 @@
899 /*
900 * This file is autogenerated from
901 * file: ../../inst/gio/rtl/gio_regs.r
902 - * id: gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp
903 + * id: gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp
904 * last modfied: Mon Apr 11 16:07:47 2005
905 - *
906 + *
907 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/gio_defs_asm.h ../../inst/gio/rtl/gio_regs.r
908 * id: $Id: gio_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
909 * Any changes here will be lost.
910 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h
911 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h 2007-01-10 20:10:37.000000000 +0100
912 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h 2005-04-24 20:31:04.000000000 +0200
913 @@ -3,7 +3,7 @@
914 version . */
915
916 #ifndef _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R
917 -#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R
918 +#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R
919 #define MEMARB_INTR_VECT 0x31
920 #define GEN_IO_INTR_VECT 0x32
921 #define IOP0_INTR_VECT 0x33
922 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h
923 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
924 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
925 @@ -4,9 +4,9 @@
926 /*
927 * This file is autogenerated from
928 * file: ../../inst/intr_vect/rtl/guinness/ivmask.config.r
929 - * id: ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp
930 + * id: ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp
931 * last modfied: Mon Apr 11 16:08:03 2005
932 - *
933 + *
934 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/intr_vect_defs_asm.h ../../inst/intr_vect/rtl/guinness/ivmask.config.r
935 * id: $Id: intr_vect_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
936 * Any changes here will be lost.
937 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h
938 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
939 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
940 @@ -6,7 +6,7 @@
941 * file: ../../mod/irq_nmi.r
942 * id: <not found>
943 * last modfied: Thu Jan 22 09:22:43 2004
944 - *
945 + *
946 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/irq_nmi_defs_asm.h ../../mod/irq_nmi.r
947 * id: $Id: irq_nmi_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
948 * Any changes here will be lost.
949 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h
950 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
951 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
952 @@ -6,7 +6,7 @@
953 * file: ../../inst/memarb/rtl/guinness/marb_top.r
954 * id: <not found>
955 * last modfied: Mon Apr 11 16:12:16 2005
956 - *
957 + *
958 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/marb_defs_asm.h ../../inst/memarb/rtl/guinness/marb_top.r
959 * id: $Id: marb_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
960 * Any changes here will be lost.
961 @@ -313,7 +313,7 @@
962 * file: ../../inst/memarb/rtl/guinness/marb_top.r
963 * id: <not found>
964 * last modfied: Mon Apr 11 16:12:16 2005
965 - *
966 + *
967 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/marb_defs_asm.h ../../inst/memarb/rtl/guinness/marb_top.r
968 * id: $Id: marb_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
969 * Any changes here will be lost.
970 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h
971 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
972 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
973 @@ -4,9 +4,9 @@
974 /*
975 * This file is autogenerated from
976 * file: ../../inst/mmu/doc/mmu_regs.r
977 - * id: mmu_regs.r,v 1.12 2004/05/06 13:48:45 mikaeln Exp
978 + * id: mmu_regs.r,v 1.12 2004/05/06 13:48:45 mikaeln Exp
979 * last modfied: Mon Apr 11 17:03:20 2005
980 - *
981 + *
982 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/mmu_defs_asm.h ../../inst/mmu/doc/mmu_regs.r
983 * id: $Id: mmu_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
984 * Any changes here will be lost.
985 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h
986 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
987 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
988 @@ -4,9 +4,9 @@
989 /*
990 * This file is autogenerated from
991 * file: ../../inst/pinmux/rtl/guinness/pinmux_regs.r
992 - * id: pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp
993 + * id: pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp
994 * last modfied: Mon Apr 11 16:09:11 2005
995 - *
996 + *
997 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/pinmux_defs_asm.h ../../inst/pinmux/rtl/guinness/pinmux_regs.r
998 * id: $Id: pinmux_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
999 * Any changes here will be lost.
1000 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h
1001 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h 2007-01-10 20:10:37.000000000 +0100
1002 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h 2005-04-24 20:31:04.000000000 +0200
1003 @@ -4,17 +4,17 @@
1004 /*
1005 * This file is autogenerated from
1006 * file: ../../mod/fakereg.rmap
1007 - * id: fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp
1008 + * id: fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp
1009 * last modified: Wed Feb 11 20:53:25 2004
1010 * file: ../../rtl/global.rmap
1011 - * id: global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp
1012 + * id: global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp
1013 * last modified: Mon Aug 18 17:08:23 2003
1014 * file: ../../mod/modreg.rmap
1015 - * id: modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp
1016 + * id: modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp
1017 * last modified: Fri Feb 20 16:40:04 2004
1018 - *
1019 + *
1020 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/reg_map_asm.h -base 0xb0000000 ../../rtl/global.rmap ../../mod/modreg.rmap ../../inst/memarb/rtl/guinness/marb_top.r ../../mod/fakereg.rmap
1021 - * id: $Id: reg_map_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
1022 + * id: $Id: reg_map_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
1023 * Any changes here will be lost.
1024 *
1025 * -*- buffer-read-only: t -*-
1026 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h
1027 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
1028 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
1029 @@ -4,9 +4,9 @@
1030 /*
1031 * This file is autogenerated from
1032 * file: ../../inst/rt_trace/rtl/rt_regs.r
1033 - * id: rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp
1034 + * id: rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp
1035 * last modfied: Mon Apr 11 16:09:14 2005
1036 - *
1037 + *
1038 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/rt_trace_defs_asm.h ../../inst/rt_trace/rtl/rt_regs.r
1039 * id: $Id: rt_trace_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
1040 * Any changes here will be lost.
1041 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h
1042 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
1043 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
1044 @@ -4,9 +4,9 @@
1045 /*
1046 * This file is autogenerated from
1047 * file: ../../inst/ser/rtl/ser_regs.r
1048 - * id: ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp
1049 + * id: ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp
1050 * last modfied: Mon Apr 11 16:09:21 2005
1051 - *
1052 + *
1053 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/ser_defs_asm.h ../../inst/ser/rtl/ser_regs.r
1054 * id: $Id: ser_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
1055 * Any changes here will be lost.
1056 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h
1057 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
1058 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
1059 @@ -4,9 +4,9 @@
1060 /*
1061 * This file is autogenerated from
1062 * file: ../../inst/syncser/rtl/sser_regs.r
1063 - * id: sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp
1064 + * id: sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp
1065 * last modfied: Mon Apr 11 16:09:48 2005
1066 - *
1067 + *
1068 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/sser_defs_asm.h ../../inst/syncser/rtl/sser_regs.r
1069 * id: $Id: sser_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
1070 * Any changes here will be lost.
1071 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h
1072 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
1073 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
1074 @@ -4,9 +4,9 @@
1075 /*
1076 * This file is autogenerated from
1077 * file: ../../inst/strcop/rtl/strcop_regs.r
1078 - * id: strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp
1079 + * id: strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp
1080 * last modfied: Mon Apr 11 16:09:38 2005
1081 - *
1082 + *
1083 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/strcop_defs_asm.h ../../inst/strcop/rtl/strcop_regs.r
1084 * id: $Id: strcop_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
1085 * Any changes here will be lost.
1086 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h
1087 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
1088 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
1089 @@ -4,9 +4,9 @@
1090 /*
1091 * This file is autogenerated from
1092 * file: ../../inst/strmux/rtl/guinness/strmux_regs.r
1093 - * id: strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp
1094 + * id: strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp
1095 * last modfied: Mon Apr 11 16:09:43 2005
1096 - *
1097 + *
1098 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/strmux_defs_asm.h ../../inst/strmux/rtl/guinness/strmux_regs.r
1099 * id: $Id: strmux_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
1100 * Any changes here will be lost.
1101 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h
1102 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
1103 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h 2005-04-24 20:31:04.000000000 +0200
1104 @@ -4,9 +4,9 @@
1105 /*
1106 * This file is autogenerated from
1107 * file: ../../inst/timer/rtl/timer_regs.r
1108 - * id: timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp
1109 + * id: timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp
1110 * last modfied: Mon Apr 11 16:09:53 2005
1111 - *
1112 + *
1113 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/timer_defs_asm.h ../../inst/timer/rtl/timer_regs.r
1114 * id: $Id: timer_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
1115 * Any changes here will be lost.
1116 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/ata_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/ata_defs.h
1117 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/ata_defs.h 2007-01-10 20:10:37.000000000 +0100
1118 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/ata_defs.h 2005-04-24 20:30:58.000000000 +0200
1119 @@ -4,9 +4,9 @@
1120 /*
1121 * This file is autogenerated from
1122 * file: ../../inst/ata/rtl/ata_regs.r
1123 - * id: ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp
1124 + * id: ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp
1125 * last modfied: Mon Apr 11 16:06:25 2005
1126 - *
1127 + *
1128 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile ata_defs.h ../../inst/ata/rtl/ata_regs.r
1129 * id: $Id: ata_defs.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
1130 * Any changes here will be lost.
1131 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_core_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_core_defs.h
1132 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_core_defs.h 2007-01-10 20:10:37.000000000 +0100
1133 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_core_defs.h 2005-04-24 20:30:58.000000000 +0200
1134 @@ -4,9 +4,9 @@
1135 /*
1136 * This file is autogenerated from
1137 * file: ../../inst/bif/rtl/bif_core_regs.r
1138 - * id: bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp
1139 + * id: bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp
1140 * last modfied: Mon Apr 11 16:06:33 2005
1141 - *
1142 + *
1143 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile bif_core_defs.h ../../inst/bif/rtl/bif_core_regs.r
1144 * id: $Id: bif_core_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $
1145 * Any changes here will be lost.
1146 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h
1147 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h 2007-01-10 20:10:37.000000000 +0100
1148 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h 2005-04-24 20:30:58.000000000 +0200
1149 @@ -4,9 +4,9 @@
1150 /*
1151 * This file is autogenerated from
1152 * file: ../../inst/bif/rtl/bif_dma_regs.r
1153 - * id: bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp
1154 + * id: bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp
1155 * last modfied: Mon Apr 11 16:06:33 2005
1156 - *
1157 + *
1158 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile bif_dma_defs.h ../../inst/bif/rtl/bif_dma_regs.r
1159 * id: $Id: bif_dma_defs.h,v 1.2 2005/04/24 18:30:58 starvik Exp $
1160 * Any changes here will be lost.
1161 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h
1162 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h 2007-01-10 20:10:37.000000000 +0100
1163 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h 2005-04-24 20:30:58.000000000 +0200
1164 @@ -4,9 +4,9 @@
1165 /*
1166 * This file is autogenerated from
1167 * file: ../../inst/bif/rtl/bif_slave_regs.r
1168 - * id: bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp
1169 + * id: bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp
1170 * last modfied: Mon Apr 11 16:06:34 2005
1171 - *
1172 + *
1173 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile bif_slave_defs.h ../../inst/bif/rtl/bif_slave_regs.r
1174 * id: $Id: bif_slave_defs.h,v 1.2 2005/04/24 18:30:58 starvik Exp $
1175 * Any changes here will be lost.
1176 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/config_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/config_defs.h
1177 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/config_defs.h 2007-01-10 20:10:37.000000000 +0100
1178 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/config_defs.h 2005-04-24 20:30:58.000000000 +0200
1179 @@ -4,9 +4,9 @@
1180 /*
1181 * This file is autogenerated from
1182 * file: ../../rtl/config_regs.r
1183 - * id: config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp
1184 + * id: config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp
1185 * last modfied: Thu Mar 4 12:34:39 2004
1186 - *
1187 + *
1188 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile config_defs.h ../../rtl/config_regs.r
1189 * id: $Id: config_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $
1190 * Any changes here will be lost.
1191 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/cpu_vect.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/cpu_vect.h
1192 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/cpu_vect.h 2007-01-10 20:10:37.000000000 +0100
1193 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/cpu_vect.h 2005-04-24 20:30:58.000000000 +0200
1194 @@ -3,7 +3,7 @@
1195 version . */
1196
1197 #ifndef _______INST_CRISP_DOC_CPU_VECT_R
1198 -#define _______INST_CRISP_DOC_CPU_VECT_R
1199 +#define _______INST_CRISP_DOC_CPU_VECT_R
1200 #define NMI_INTR_VECT 0x00
1201 #define RESERVED_1_INTR_VECT 0x01
1202 #define RESERVED_2_INTR_VECT 0x02
1203 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/dma.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/dma.h
1204 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/dma.h 2007-01-10 20:10:37.000000000 +0100
1205 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/dma.h 2006-06-25 17:01:59.000000000 +0200
1206 @@ -1,6 +1,6 @@
1207 -/* $Id: dma.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
1208 +/* $Id: dma.h,v 1.8 2006/06/25 15:01:59 starvik Exp $
1209 *
1210 - * DMA C definitions and help macros
1211 + * DMA C definitions and help macros
1212 *
1213 */
1214
1215 @@ -98,10 +98,10 @@
1216
1217 // give stream command
1218 #define DMA_WR_CMD( inst, cmd_par ) \
1219 - do { reg_dma_rw_stream_cmd r = {0}; \
1220 - do { r = REG_RD( dma, inst, rw_stream_cmd ); } while( r.busy ); \
1221 - r.cmd = (cmd_par); \
1222 - REG_WR( dma, inst, rw_stream_cmd, r ); \
1223 + do { reg_dma_rw_stream_cmd __x = {0}; \
1224 + do { __x = REG_RD( dma, inst, rw_stream_cmd ); } while( __x.busy ); \
1225 + __x.cmd = (cmd_par); \
1226 + REG_WR( dma, inst, rw_stream_cmd, __x ); \
1227 } while( 0 )
1228
1229 // load: g,c,d:burst
1230 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/dma_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/dma_defs.h
1231 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/dma_defs.h 2007-01-10 20:10:37.000000000 +0100
1232 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/dma_defs.h 2005-04-24 20:30:58.000000000 +0200
1233 @@ -4,9 +4,9 @@
1234 /*
1235 * This file is autogenerated from
1236 * file: ../../inst/dma/inst/dma_common/rtl/dma_regdes.r
1237 - * id: dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp
1238 + * id: dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp
1239 * last modfied: Mon Apr 11 16:06:51 2005
1240 - *
1241 + *
1242 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile dma_defs.h ../../inst/dma/inst/dma_common/rtl/dma_regdes.r
1243 * id: $Id: dma_defs.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
1244 * Any changes here will be lost.
1245 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/eth_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/eth_defs.h
1246 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/eth_defs.h 2007-01-10 20:10:37.000000000 +0100
1247 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/eth_defs.h 2006-01-26 14:45:30.000000000 +0100
1248 @@ -3,12 +3,12 @@
1249
1250 /*
1251 * This file is autogenerated from
1252 - * file: ../../inst/eth/rtl/eth_regs.r
1253 - * id: eth_regs.r,v 1.11 2005/02/09 10:48:38 kriskn Exp
1254 - * last modfied: Mon Apr 11 16:07:03 2005
1255 - *
1256 - * by /n/asic/design/tools/rdesc/src/rdes2c --outfile eth_defs.h ../../inst/eth/rtl/eth_regs.r
1257 - * id: $Id: eth_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $
1258 + * file: eth.r
1259 + * id: eth_regs.r,v 1.16 2005/05/20 15:41:22 perz Exp
1260 + * last modfied: Mon Jan 9 06:06:41 2006
1261 + *
1262 + * by /n/asic/design/tools/rdesc/rdes2c eth.r
1263 + * id: $Id: eth_defs.h,v 1.7 2006/01/26 13:45:30 karljope Exp $
1264 * Any changes here will be lost.
1265 *
1266 * -*- buffer-read-only: t -*-
1267 @@ -116,26 +116,28 @@
1268
1269 /* Register rw_ga_lo, scope eth, type rw */
1270 typedef struct {
1271 - unsigned int table : 32;
1272 + unsigned int tbl : 32;
1273 } reg_eth_rw_ga_lo;
1274 #define REG_RD_ADDR_eth_rw_ga_lo 16
1275 #define REG_WR_ADDR_eth_rw_ga_lo 16
1276
1277 /* Register rw_ga_hi, scope eth, type rw */
1278 typedef struct {
1279 - unsigned int table : 32;
1280 + unsigned int tbl : 32;
1281 } reg_eth_rw_ga_hi;
1282 #define REG_RD_ADDR_eth_rw_ga_hi 20
1283 #define REG_WR_ADDR_eth_rw_ga_hi 20
1284
1285 /* Register rw_gen_ctrl, scope eth, type rw */
1286 typedef struct {
1287 - unsigned int en : 1;
1288 - unsigned int phy : 2;
1289 - unsigned int protocol : 1;
1290 - unsigned int loopback : 1;
1291 - unsigned int flow_ctrl_dis : 1;
1292 - unsigned int dummy1 : 26;
1293 + unsigned int en : 1;
1294 + unsigned int phy : 2;
1295 + unsigned int protocol : 1;
1296 + unsigned int loopback : 1;
1297 + unsigned int flow_ctrl : 1;
1298 + unsigned int gtxclk_out : 1;
1299 + unsigned int phyrst_n : 1;
1300 + unsigned int dummy1 : 24;
1301 } reg_eth_rw_gen_ctrl;
1302 #define REG_RD_ADDR_eth_rw_gen_ctrl 24
1303 #define REG_WR_ADDR_eth_rw_gen_ctrl 24
1304 @@ -150,22 +152,23 @@
1305 unsigned int oversize : 1;
1306 unsigned int bad_crc : 1;
1307 unsigned int duplex : 1;
1308 - unsigned int max_size : 1;
1309 - unsigned int dummy1 : 23;
1310 + unsigned int max_size : 16;
1311 + unsigned int dummy1 : 8;
1312 } reg_eth_rw_rec_ctrl;
1313 #define REG_RD_ADDR_eth_rw_rec_ctrl 28
1314 #define REG_WR_ADDR_eth_rw_rec_ctrl 28
1315
1316 /* Register rw_tr_ctrl, scope eth, type rw */
1317 typedef struct {
1318 - unsigned int crc : 1;
1319 - unsigned int pad : 1;
1320 - unsigned int retry : 1;
1321 - unsigned int ignore_col : 1;
1322 - unsigned int cancel : 1;
1323 - unsigned int hsh_delay : 1;
1324 - unsigned int ignore_crs : 1;
1325 - unsigned int dummy1 : 25;
1326 + unsigned int crc : 1;
1327 + unsigned int pad : 1;
1328 + unsigned int retry : 1;
1329 + unsigned int ignore_col : 1;
1330 + unsigned int cancel : 1;
1331 + unsigned int hsh_delay : 1;
1332 + unsigned int ignore_crs : 1;
1333 + unsigned int carrier_ext : 1;
1334 + unsigned int dummy1 : 24;
1335 } reg_eth_rw_tr_ctrl;
1336 #define REG_RD_ADDR_eth_rw_tr_ctrl 32
1337 #define REG_WR_ADDR_eth_rw_tr_ctrl 32
1338 @@ -180,13 +183,10 @@
1339
1340 /* Register rw_mgm_ctrl, scope eth, type rw */
1341 typedef struct {
1342 - unsigned int mdio : 1;
1343 - unsigned int mdoe : 1;
1344 - unsigned int mdc : 1;
1345 - unsigned int phyclk : 1;
1346 - unsigned int txdata : 4;
1347 - unsigned int txen : 1;
1348 - unsigned int dummy1 : 23;
1349 + unsigned int mdio : 1;
1350 + unsigned int mdoe : 1;
1351 + unsigned int mdc : 1;
1352 + unsigned int dummy1 : 29;
1353 } reg_eth_rw_mgm_ctrl;
1354 #define REG_RD_ADDR_eth_rw_mgm_ctrl 40
1355 #define REG_WR_ADDR_eth_rw_mgm_ctrl 40
1356 @@ -196,17 +196,8 @@
1357 unsigned int mdio : 1;
1358 unsigned int exc_col : 1;
1359 unsigned int urun : 1;
1360 - unsigned int phyclk : 1;
1361 - unsigned int txdata : 4;
1362 - unsigned int txen : 1;
1363 - unsigned int col : 1;
1364 - unsigned int crs : 1;
1365 - unsigned int txclk : 1;
1366 - unsigned int rxdata : 4;
1367 - unsigned int rxer : 1;
1368 - unsigned int rxdv : 1;
1369 - unsigned int rxclk : 1;
1370 - unsigned int dummy1 : 13;
1371 + unsigned int clk_125 : 1;
1372 + unsigned int dummy1 : 28;
1373 } reg_eth_r_stat;
1374 #define REG_RD_ADDR_eth_r_stat 44
1375
1376 @@ -274,83 +265,83 @@
1377
1378 /* Register rw_intr_mask, scope eth, type rw */
1379 typedef struct {
1380 - unsigned int crc : 1;
1381 - unsigned int align : 1;
1382 - unsigned int oversize : 1;
1383 - unsigned int congestion : 1;
1384 - unsigned int single_col : 1;
1385 - unsigned int mult_col : 1;
1386 - unsigned int late_col : 1;
1387 - unsigned int deferred : 1;
1388 - unsigned int carrier_loss : 1;
1389 - unsigned int sqe_test_err : 1;
1390 - unsigned int orun : 1;
1391 - unsigned int urun : 1;
1392 - unsigned int excessive_col : 1;
1393 - unsigned int mdio : 1;
1394 - unsigned int dummy1 : 18;
1395 + unsigned int crc : 1;
1396 + unsigned int align : 1;
1397 + unsigned int oversize : 1;
1398 + unsigned int congestion : 1;
1399 + unsigned int single_col : 1;
1400 + unsigned int mult_col : 1;
1401 + unsigned int late_col : 1;
1402 + unsigned int deferred : 1;
1403 + unsigned int carrier_loss : 1;
1404 + unsigned int sqe_test_err : 1;
1405 + unsigned int orun : 1;
1406 + unsigned int urun : 1;
1407 + unsigned int exc_col : 1;
1408 + unsigned int mdio : 1;
1409 + unsigned int dummy1 : 18;
1410 } reg_eth_rw_intr_mask;
1411 #define REG_RD_ADDR_eth_rw_intr_mask 76
1412 #define REG_WR_ADDR_eth_rw_intr_mask 76
1413
1414 /* Register rw_ack_intr, scope eth, type rw */
1415 typedef struct {
1416 - unsigned int crc : 1;
1417 - unsigned int align : 1;
1418 - unsigned int oversize : 1;
1419 - unsigned int congestion : 1;
1420 - unsigned int single_col : 1;
1421 - unsigned int mult_col : 1;
1422 - unsigned int late_col : 1;
1423 - unsigned int deferred : 1;
1424 - unsigned int carrier_loss : 1;
1425 - unsigned int sqe_test_err : 1;
1426 - unsigned int orun : 1;
1427 - unsigned int urun : 1;
1428 - unsigned int excessive_col : 1;
1429 - unsigned int mdio : 1;
1430 - unsigned int dummy1 : 18;
1431 + unsigned int crc : 1;
1432 + unsigned int align : 1;
1433 + unsigned int oversize : 1;
1434 + unsigned int congestion : 1;
1435 + unsigned int single_col : 1;
1436 + unsigned int mult_col : 1;
1437 + unsigned int late_col : 1;
1438 + unsigned int deferred : 1;
1439 + unsigned int carrier_loss : 1;
1440 + unsigned int sqe_test_err : 1;
1441 + unsigned int orun : 1;
1442 + unsigned int urun : 1;
1443 + unsigned int exc_col : 1;
1444 + unsigned int mdio : 1;
1445 + unsigned int dummy1 : 18;
1446 } reg_eth_rw_ack_intr;
1447 #define REG_RD_ADDR_eth_rw_ack_intr 80
1448 #define REG_WR_ADDR_eth_rw_ack_intr 80
1449
1450 /* Register r_intr, scope eth, type r */
1451 typedef struct {
1452 - unsigned int crc : 1;
1453 - unsigned int align : 1;
1454 - unsigned int oversize : 1;
1455 - unsigned int congestion : 1;
1456 - unsigned int single_col : 1;
1457 - unsigned int mult_col : 1;
1458 - unsigned int late_col : 1;
1459 - unsigned int deferred : 1;
1460 - unsigned int carrier_loss : 1;
1461 - unsigned int sqe_test_err : 1;
1462 - unsigned int orun : 1;
1463 - unsigned int urun : 1;
1464 - unsigned int excessive_col : 1;
1465 - unsigned int mdio : 1;
1466 - unsigned int dummy1 : 18;
1467 + unsigned int crc : 1;
1468 + unsigned int align : 1;
1469 + unsigned int oversize : 1;
1470 + unsigned int congestion : 1;
1471 + unsigned int single_col : 1;
1472 + unsigned int mult_col : 1;
1473 + unsigned int late_col : 1;
1474 + unsigned int deferred : 1;
1475 + unsigned int carrier_loss : 1;
1476 + unsigned int sqe_test_err : 1;
1477 + unsigned int orun : 1;
1478 + unsigned int urun : 1;
1479 + unsigned int exc_col : 1;
1480 + unsigned int mdio : 1;
1481 + unsigned int dummy1 : 18;
1482 } reg_eth_r_intr;
1483 #define REG_RD_ADDR_eth_r_intr 84
1484
1485 /* Register r_masked_intr, scope eth, type r */
1486 typedef struct {
1487 - unsigned int crc : 1;
1488 - unsigned int align : 1;
1489 - unsigned int oversize : 1;
1490 - unsigned int congestion : 1;
1491 - unsigned int single_col : 1;
1492 - unsigned int mult_col : 1;
1493 - unsigned int late_col : 1;
1494 - unsigned int deferred : 1;
1495 - unsigned int carrier_loss : 1;
1496 - unsigned int sqe_test_err : 1;
1497 - unsigned int orun : 1;
1498 - unsigned int urun : 1;
1499 - unsigned int excessive_col : 1;
1500 - unsigned int mdio : 1;
1501 - unsigned int dummy1 : 18;
1502 + unsigned int crc : 1;
1503 + unsigned int align : 1;
1504 + unsigned int oversize : 1;
1505 + unsigned int congestion : 1;
1506 + unsigned int single_col : 1;
1507 + unsigned int mult_col : 1;
1508 + unsigned int late_col : 1;
1509 + unsigned int deferred : 1;
1510 + unsigned int carrier_loss : 1;
1511 + unsigned int sqe_test_err : 1;
1512 + unsigned int orun : 1;
1513 + unsigned int urun : 1;
1514 + unsigned int exc_col : 1;
1515 + unsigned int mdio : 1;
1516 + unsigned int dummy1 : 18;
1517 } reg_eth_r_masked_intr;
1518 #define REG_RD_ADDR_eth_r_masked_intr 88
1519
1520 @@ -360,12 +351,15 @@
1521 regk_eth_discard = 0x00000000,
1522 regk_eth_ether = 0x00000000,
1523 regk_eth_full = 0x00000001,
1524 + regk_eth_gmii = 0x00000003,
1525 + regk_eth_gtxclk = 0x00000001,
1526 regk_eth_half = 0x00000000,
1527 regk_eth_hsh = 0x00000001,
1528 regk_eth_mii = 0x00000001,
1529 + regk_eth_mii_arec = 0x00000002,
1530 regk_eth_mii_clk = 0x00000000,
1531 - regk_eth_mii_rec = 0x00000002,
1532 regk_eth_no = 0x00000000,
1533 + regk_eth_phyrst = 0x00000000,
1534 regk_eth_rec = 0x00000001,
1535 regk_eth_rw_ga_hi_default = 0x00000000,
1536 regk_eth_rw_ga_lo_default = 0x00000000,
1537 @@ -377,8 +371,8 @@
1538 regk_eth_rw_ma1_lo_default = 0x00000000,
1539 regk_eth_rw_mgm_ctrl_default = 0x00000000,
1540 regk_eth_rw_test_ctrl_default = 0x00000000,
1541 - regk_eth_size1518 = 0x00000000,
1542 - regk_eth_size1522 = 0x00000001,
1543 + regk_eth_size1518 = 0x000005ee,
1544 + regk_eth_size1522 = 0x000005f2,
1545 regk_eth_yes = 0x00000001
1546 };
1547 #endif /* __eth_defs_h */
1548 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/eth_defs_fs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/eth_defs_fs.h
1549 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/eth_defs_fs.h 1970-01-01 01:00:00.000000000 +0100
1550 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/eth_defs_fs.h 2007-02-07 10:36:10.000000000 +0100
1551 @@ -0,0 +1,384 @@
1552 +#ifndef __eth_defs_h
1553 +#define __eth_defs_h
1554 +
1555 +/*
1556 + * This file is autogenerated from
1557 + * file: eth_regs.r
1558 + * id: eth_regs.r,v 1.17 2006/02/08 16:47:19 perz Exp perz
1559 + * last modfied: Tue Feb 6 13:57:16 2007
1560 + *
1561 + * by /n/asic/design/io/eth/inst/rdesc/rdes2c eth_regs.r
1562 + * id: $Id: eth_defs_fs.h,v 1.1 2007/02/07 09:36:10 karljope Exp $
1563 + * Any changes here will be lost.
1564 + *
1565 + * -*- buffer-read-only: t -*-
1566 + */
1567 +/* Main access macros */
1568 +#ifndef REG_RD
1569 +#define REG_RD( scope, inst, reg ) \
1570 + REG_READ( reg_##scope##_##reg, \
1571 + (inst) + REG_RD_ADDR_##scope##_##reg )
1572 +#endif
1573 +
1574 +#ifndef REG_WR
1575 +#define REG_WR( scope, inst, reg, val ) \
1576 + REG_WRITE( reg_##scope##_##reg, \
1577 + (inst) + REG_WR_ADDR_##scope##_##reg, (val) )
1578 +#endif
1579 +
1580 +#ifndef REG_RD_VECT
1581 +#define REG_RD_VECT( scope, inst, reg, index ) \
1582 + REG_READ( reg_##scope##_##reg, \
1583 + (inst) + REG_RD_ADDR_##scope##_##reg + \
1584 + (index) * STRIDE_##scope##_##reg )
1585 +#endif
1586 +
1587 +#ifndef REG_WR_VECT
1588 +#define REG_WR_VECT( scope, inst, reg, index, val ) \
1589 + REG_WRITE( reg_##scope##_##reg, \
1590 + (inst) + REG_WR_ADDR_##scope##_##reg + \
1591 + (index) * STRIDE_##scope##_##reg, (val) )
1592 +#endif
1593 +
1594 +#ifndef REG_RD_INT
1595 +#define REG_RD_INT( scope, inst, reg ) \
1596 + REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg )
1597 +#endif
1598 +
1599 +#ifndef REG_WR_INT
1600 +#define REG_WR_INT( scope, inst, reg, val ) \
1601 + REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg, (val) )
1602 +#endif
1603 +
1604 +#ifndef REG_RD_INT_VECT
1605 +#define REG_RD_INT_VECT( scope, inst, reg, index ) \
1606 + REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg + \
1607 + (index) * STRIDE_##scope##_##reg )
1608 +#endif
1609 +
1610 +#ifndef REG_WR_INT_VECT
1611 +#define REG_WR_INT_VECT( scope, inst, reg, index, val ) \
1612 + REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg + \
1613 + (index) * STRIDE_##scope##_##reg, (val) )
1614 +#endif
1615 +
1616 +#ifndef REG_TYPE_CONV
1617 +#define REG_TYPE_CONV( type, orgtype, val ) \
1618 + ( { union { orgtype o; type n; } r; r.o = val; r.n; } )
1619 +#endif
1620 +
1621 +#ifndef reg_page_size
1622 +#define reg_page_size 8192
1623 +#endif
1624 +
1625 +#ifndef REG_ADDR
1626 +#define REG_ADDR( scope, inst, reg ) \
1627 + ( (inst) + REG_RD_ADDR_##scope##_##reg )
1628 +#endif
1629 +
1630 +#ifndef REG_ADDR_VECT
1631 +#define REG_ADDR_VECT( scope, inst, reg, index ) \
1632 + ( (inst) + REG_RD_ADDR_##scope##_##reg + \
1633 + (index) * STRIDE_##scope##_##reg )
1634 +#endif
1635 +
1636 +/* C-code for register scope eth */
1637 +
1638 +/* Register rw_ma0_lo, scope eth, type rw */
1639 +typedef struct {
1640 + unsigned int addr : 32;
1641 +} reg_eth_rw_ma0_lo;
1642 +#define REG_RD_ADDR_eth_rw_ma0_lo 0
1643 +#define REG_WR_ADDR_eth_rw_ma0_lo 0
1644 +
1645 +/* Register rw_ma0_hi, scope eth, type rw */
1646 +typedef struct {
1647 + unsigned int addr : 16;
1648 + unsigned int dummy1 : 16;
1649 +} reg_eth_rw_ma0_hi;
1650 +#define REG_RD_ADDR_eth_rw_ma0_hi 4
1651 +#define REG_WR_ADDR_eth_rw_ma0_hi 4
1652 +
1653 +/* Register rw_ma1_lo, scope eth, type rw */
1654 +typedef struct {
1655 + unsigned int addr : 32;
1656 +} reg_eth_rw_ma1_lo;
1657 +#define REG_RD_ADDR_eth_rw_ma1_lo 8
1658 +#define REG_WR_ADDR_eth_rw_ma1_lo 8
1659 +
1660 +/* Register rw_ma1_hi, scope eth, type rw */
1661 +typedef struct {
1662 + unsigned int addr : 16;
1663 + unsigned int dummy1 : 16;
1664 +} reg_eth_rw_ma1_hi;
1665 +#define REG_RD_ADDR_eth_rw_ma1_hi 12
1666 +#define REG_WR_ADDR_eth_rw_ma1_hi 12
1667 +
1668 +/* Register rw_ga_lo, scope eth, type rw */
1669 +typedef struct {
1670 + unsigned int table : 32;
1671 +} reg_eth_rw_ga_lo;
1672 +#define REG_RD_ADDR_eth_rw_ga_lo 16
1673 +#define REG_WR_ADDR_eth_rw_ga_lo 16
1674 +
1675 +/* Register rw_ga_hi, scope eth, type rw */
1676 +typedef struct {
1677 + unsigned int table : 32;
1678 +} reg_eth_rw_ga_hi;
1679 +#define REG_RD_ADDR_eth_rw_ga_hi 20
1680 +#define REG_WR_ADDR_eth_rw_ga_hi 20
1681 +
1682 +/* Register rw_gen_ctrl, scope eth, type rw */
1683 +typedef struct {
1684 + unsigned int en : 1;
1685 + unsigned int phy : 2;
1686 + unsigned int protocol : 1;
1687 + unsigned int loopback : 1;
1688 + unsigned int flow_ctrl : 1;
1689 + unsigned int dummy1 : 26;
1690 +} reg_eth_rw_gen_ctrl;
1691 +#define REG_RD_ADDR_eth_rw_gen_ctrl 24
1692 +#define REG_WR_ADDR_eth_rw_gen_ctrl 24
1693 +
1694 +/* Register rw_rec_ctrl, scope eth, type rw */
1695 +typedef struct {
1696 + unsigned int ma0 : 1;
1697 + unsigned int ma1 : 1;
1698 + unsigned int individual : 1;
1699 + unsigned int broadcast : 1;
1700 + unsigned int undersize : 1;
1701 + unsigned int oversize : 1;
1702 + unsigned int bad_crc : 1;
1703 + unsigned int duplex : 1;
1704 + unsigned int max_size : 1;
1705 + unsigned int dummy1 : 23;
1706 +} reg_eth_rw_rec_ctrl;
1707 +#define REG_RD_ADDR_eth_rw_rec_ctrl 28
1708 +#define REG_WR_ADDR_eth_rw_rec_ctrl 28
1709 +
1710 +/* Register rw_tr_ctrl, scope eth, type rw */
1711 +typedef struct {
1712 + unsigned int crc : 1;
1713 + unsigned int pad : 1;
1714 + unsigned int retry : 1;
1715 + unsigned int ignore_col : 1;
1716 + unsigned int cancel : 1;
1717 + unsigned int hsh_delay : 1;
1718 + unsigned int ignore_crs : 1;
1719 + unsigned int dummy1 : 25;
1720 +} reg_eth_rw_tr_ctrl;
1721 +#define REG_RD_ADDR_eth_rw_tr_ctrl 32
1722 +#define REG_WR_ADDR_eth_rw_tr_ctrl 32
1723 +
1724 +/* Register rw_clr_err, scope eth, type rw */
1725 +typedef struct {
1726 + unsigned int clr : 1;
1727 + unsigned int dummy1 : 31;
1728 +} reg_eth_rw_clr_err;
1729 +#define REG_RD_ADDR_eth_rw_clr_err 36
1730 +#define REG_WR_ADDR_eth_rw_clr_err 36
1731 +
1732 +/* Register rw_mgm_ctrl, scope eth, type rw */
1733 +typedef struct {
1734 + unsigned int mdio : 1;
1735 + unsigned int mdoe : 1;
1736 + unsigned int mdc : 1;
1737 + unsigned int phyclk : 1;
1738 + unsigned int txdata : 4;
1739 + unsigned int txen : 1;
1740 + unsigned int dummy1 : 23;
1741 +} reg_eth_rw_mgm_ctrl;
1742 +#define REG_RD_ADDR_eth_rw_mgm_ctrl 40
1743 +#define REG_WR_ADDR_eth_rw_mgm_ctrl 40
1744 +
1745 +/* Register r_stat, scope eth, type r */
1746 +typedef struct {
1747 + unsigned int mdio : 1;
1748 + unsigned int exc_col : 1;
1749 + unsigned int urun : 1;
1750 + unsigned int phyclk : 1;
1751 + unsigned int txdata : 4;
1752 + unsigned int txen : 1;
1753 + unsigned int col : 1;
1754 + unsigned int crs : 1;
1755 + unsigned int txclk : 1;
1756 + unsigned int rxdata : 4;
1757 + unsigned int rxer : 1;
1758 + unsigned int rxdv : 1;
1759 + unsigned int rxclk : 1;
1760 + unsigned int dummy1 : 13;
1761 +} reg_eth_r_stat;
1762 +#define REG_RD_ADDR_eth_r_stat 44
1763 +
1764 +/* Register rs_rec_cnt, scope eth, type rs */
1765 +typedef struct {
1766 + unsigned int crc_err : 8;
1767 + unsigned int align_err : 8;
1768 + unsigned int oversize : 8;
1769 + unsigned int congestion : 8;
1770 +} reg_eth_rs_rec_cnt;
1771 +#define REG_RD_ADDR_eth_rs_rec_cnt 48
1772 +
1773 +/* Register r_rec_cnt, scope eth, type r */
1774 +typedef struct {
1775 + unsigned int crc_err : 8;
1776 + unsigned int align_err : 8;
1777 + unsigned int oversize : 8;
1778 + unsigned int congestion : 8;
1779 +} reg_eth_r_rec_cnt;
1780 +#define REG_RD_ADDR_eth_r_rec_cnt 52
1781 +
1782 +/* Register rs_tr_cnt, scope eth, type rs */
1783 +typedef struct {
1784 + unsigned int single_col : 8;
1785 + unsigned int mult_col : 8;
1786 + unsigned int late_col : 8;
1787 + unsigned int deferred : 8;
1788 +} reg_eth_rs_tr_cnt;
1789 +#define REG_RD_ADDR_eth_rs_tr_cnt 56
1790 +
1791 +/* Register r_tr_cnt, scope eth, type r */
1792 +typedef struct {
1793 + unsigned int single_col : 8;
1794 + unsigned int mult_col : 8;
1795 + unsigned int late_col : 8;
1796 + unsigned int deferred : 8;
1797 +} reg_eth_r_tr_cnt;
1798 +#define REG_RD_ADDR_eth_r_tr_cnt 60
1799 +
1800 +/* Register rs_phy_cnt, scope eth, type rs */
1801 +typedef struct {
1802 + unsigned int carrier_loss : 8;
1803 + unsigned int sqe_err : 8;
1804 + unsigned int dummy1 : 16;
1805 +} reg_eth_rs_phy_cnt;
1806 +#define REG_RD_ADDR_eth_rs_phy_cnt 64
1807 +
1808 +/* Register r_phy_cnt, scope eth, type r */
1809 +typedef struct {
1810 + unsigned int carrier_loss : 8;
1811 + unsigned int sqe_err : 8;
1812 + unsigned int dummy1 : 16;
1813 +} reg_eth_r_phy_cnt;
1814 +#define REG_RD_ADDR_eth_r_phy_cnt 68
1815 +
1816 +/* Register rw_test_ctrl, scope eth, type rw */
1817 +typedef struct {
1818 + unsigned int snmp_inc : 1;
1819 + unsigned int snmp : 1;
1820 + unsigned int backoff : 1;
1821 + unsigned int dummy1 : 29;
1822 +} reg_eth_rw_test_ctrl;
1823 +#define REG_RD_ADDR_eth_rw_test_ctrl 72
1824 +#define REG_WR_ADDR_eth_rw_test_ctrl 72
1825 +
1826 +/* Register rw_intr_mask, scope eth, type rw */
1827 +typedef struct {
1828 + unsigned int crc : 1;
1829 + unsigned int align : 1;
1830 + unsigned int oversize : 1;
1831 + unsigned int congestion : 1;
1832 + unsigned int single_col : 1;
1833 + unsigned int mult_col : 1;
1834 + unsigned int late_col : 1;
1835 + unsigned int deferred : 1;
1836 + unsigned int carrier_loss : 1;
1837 + unsigned int sqe_test_err : 1;
1838 + unsigned int orun : 1;
1839 + unsigned int urun : 1;
1840 + unsigned int exc_col : 1;
1841 + unsigned int mdio : 1;
1842 + unsigned int dummy1 : 18;
1843 +} reg_eth_rw_intr_mask;
1844 +#define REG_RD_ADDR_eth_rw_intr_mask 76
1845 +#define REG_WR_ADDR_eth_rw_intr_mask 76
1846 +
1847 +/* Register rw_ack_intr, scope eth, type rw */
1848 +typedef struct {
1849 + unsigned int crc : 1;
1850 + unsigned int align : 1;
1851 + unsigned int oversize : 1;
1852 + unsigned int congestion : 1;
1853 + unsigned int single_col : 1;
1854 + unsigned int mult_col : 1;
1855 + unsigned int late_col : 1;
1856 + unsigned int deferred : 1;
1857 + unsigned int carrier_loss : 1;
1858 + unsigned int sqe_test_err : 1;
1859 + unsigned int orun : 1;
1860 + unsigned int urun : 1;
1861 + unsigned int exc_col : 1;
1862 + unsigned int mdio : 1;
1863 + unsigned int dummy1 : 18;
1864 +} reg_eth_rw_ack_intr;
1865 +#define REG_RD_ADDR_eth_rw_ack_intr 80
1866 +#define REG_WR_ADDR_eth_rw_ack_intr 80
1867 +
1868 +/* Register r_intr, scope eth, type r */
1869 +typedef struct {
1870 + unsigned int crc : 1;
1871 + unsigned int align : 1;
1872 + unsigned int oversize : 1;
1873 + unsigned int congestion : 1;
1874 + unsigned int single_col : 1;
1875 + unsigned int mult_col : 1;
1876 + unsigned int late_col : 1;
1877 + unsigned int deferred : 1;
1878 + unsigned int carrier_loss : 1;
1879 + unsigned int sqe_test_err : 1;
1880 + unsigned int orun : 1;
1881 + unsigned int urun : 1;
1882 + unsigned int exc_col : 1;
1883 + unsigned int mdio : 1;
1884 + unsigned int dummy1 : 18;
1885 +} reg_eth_r_intr;
1886 +#define REG_RD_ADDR_eth_r_intr 84
1887 +
1888 +/* Register r_masked_intr, scope eth, type r */
1889 +typedef struct {
1890 + unsigned int crc : 1;
1891 + unsigned int align : 1;
1892 + unsigned int oversize : 1;
1893 + unsigned int congestion : 1;
1894 + unsigned int single_col : 1;
1895 + unsigned int mult_col : 1;
1896 + unsigned int late_col : 1;
1897 + unsigned int deferred : 1;
1898 + unsigned int carrier_loss : 1;
1899 + unsigned int sqe_test_err : 1;
1900 + unsigned int orun : 1;
1901 + unsigned int urun : 1;
1902 + unsigned int exc_col : 1;
1903 + unsigned int mdio : 1;
1904 + unsigned int dummy1 : 18;
1905 +} reg_eth_r_masked_intr;
1906 +#define REG_RD_ADDR_eth_r_masked_intr 88
1907 +
1908 +
1909 +/* Constants */
1910 +enum {
1911 + regk_eth_discard = 0x00000000,
1912 + regk_eth_ether = 0x00000000,
1913 + regk_eth_full = 0x00000001,
1914 + regk_eth_half = 0x00000000,
1915 + regk_eth_hsh = 0x00000001,
1916 + regk_eth_mii = 0x00000001,
1917 + regk_eth_mii_arec = 0x00000002,
1918 + regk_eth_mii_clk = 0x00000000,
1919 + regk_eth_no = 0x00000000,
1920 + regk_eth_rec = 0x00000001,
1921 + regk_eth_rw_ga_hi_default = 0x00000000,
1922 + regk_eth_rw_ga_lo_default = 0x00000000,
1923 + regk_eth_rw_gen_ctrl_default = 0x00000000,
1924 + regk_eth_rw_intr_mask_default = 0x00000000,
1925 + regk_eth_rw_ma0_hi_default = 0x00000000,
1926 + regk_eth_rw_ma0_lo_default = 0x00000000,
1927 + regk_eth_rw_ma1_hi_default = 0x00000000,
1928 + regk_eth_rw_ma1_lo_default = 0x00000000,
1929 + regk_eth_rw_mgm_ctrl_default = 0x00000000,
1930 + regk_eth_rw_test_ctrl_default = 0x00000000,
1931 + regk_eth_size1518 = 0x00000000,
1932 + regk_eth_size1522 = 0x00000001,
1933 + regk_eth_yes = 0x00000001
1934 +};
1935 +#endif /* __eth_defs_h */
1936 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/extmem_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/extmem_defs.h
1937 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/extmem_defs.h 2007-01-10 20:10:37.000000000 +0100
1938 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/extmem_defs.h 2004-06-04 09:15:33.000000000 +0200
1939 @@ -4,9 +4,9 @@
1940 /*
1941 * This file is autogenerated from
1942 * file: ../../inst/ext_mem/mod/extmem_regs.r
1943 - * id: extmem_regs.r,v 1.1 2004/02/16 13:29:30 np Exp
1944 + * id: extmem_regs.r,v 1.1 2004/02/16 13:29:30 np Exp
1945 * last modfied: Tue Mar 30 22:26:21 2004
1946 - *
1947 + *
1948 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile extmem_defs.h ../../inst/ext_mem/mod/extmem_regs.r
1949 * id: $Id: extmem_defs.h,v 1.5 2004/06/04 07:15:33 starvik Exp $
1950 * Any changes here will be lost.
1951 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/gio_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/gio_defs.h
1952 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/gio_defs.h 2007-01-10 20:10:37.000000000 +0100
1953 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/gio_defs.h 2005-04-24 20:30:58.000000000 +0200
1954 @@ -4,9 +4,9 @@
1955 /*
1956 * This file is autogenerated from
1957 * file: ../../inst/gio/rtl/gio_regs.r
1958 - * id: gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp
1959 + * id: gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp
1960 * last modfied: Mon Apr 11 16:07:47 2005
1961 - *
1962 + *
1963 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile gio_defs.h ../../inst/gio/rtl/gio_regs.r
1964 * id: $Id: gio_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $
1965 * Any changes here will be lost.
1966 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/intr_vect.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/intr_vect.h
1967 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/intr_vect.h 2007-01-10 20:10:37.000000000 +0100
1968 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/intr_vect.h 2005-05-23 14:59:21.000000000 +0200
1969 @@ -3,7 +3,7 @@
1970 version . */
1971
1972 #ifndef _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R
1973 -#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R
1974 +#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R
1975 #define MEMARB_INTR_VECT 0x31
1976 #define GEN_IO_INTR_VECT 0x32
1977 #define IOP0_INTR_VECT 0x33
1978 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/intr_vect_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/intr_vect_defs.h
1979 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/intr_vect_defs.h 2007-01-10 20:10:37.000000000 +0100
1980 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/intr_vect_defs.h 2005-04-24 20:30:58.000000000 +0200
1981 @@ -4,9 +4,9 @@
1982 /*
1983 * This file is autogenerated from
1984 * file: ../../inst/intr_vect/rtl/guinness/ivmask.config.r
1985 - * id: ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp
1986 + * id: ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp
1987 * last modfied: Mon Apr 11 16:08:03 2005
1988 - *
1989 + *
1990 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile intr_vect_defs.h ../../inst/intr_vect/rtl/guinness/ivmask.config.r
1991 * id: $Id: intr_vect_defs.h,v 1.8 2005/04/24 18:30:58 starvik Exp $
1992 * Any changes here will be lost.
1993 @@ -209,7 +209,7 @@
1994 #define REG_RD_ADDR_intr_vect_r_guru 16
1995
1996 /* Register rw_ipi, scope intr_vect, type rw */
1997 -typedef struct
1998 +typedef struct
1999 {
2000 unsigned int vector;
2001 } reg_intr_vect_rw_ipi;
2002 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/Makefile linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/Makefile
2003 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/Makefile 2007-01-10 20:10:37.000000000 +0100
2004 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/Makefile 2004-01-07 21:34:55.000000000 +0100
2005 @@ -125,14 +125,14 @@
2006 done
2007
2008 .PHONY: axw
2009 -## %.axw - Generate the specified .axw file (doesn't work for all files
2010 +## %.axw - Generate the specified .axw file (doesn't work for all files
2011 ## due to inconsistent naming of .r files.
2012 %.axw: axw
2013 @for RDES in $(IOPROCREGDESC); do \
2014 if echo "$$RDES" | grep $* ; then \
2015 $(RDES2TXT) $$RDES; \
2016 fi \
2017 - done
2018 + done
2019
2020 .PHONY: clean
2021 ## clean - Remove .h files and .axw files.
2022 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h
2023 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2024 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2025 @@ -6,7 +6,7 @@
2026 * file: ../../inst/io_proc/rtl/iop_crc_par.r
2027 * id: <not found>
2028 * last modfied: Mon Apr 11 16:08:45 2005
2029 - *
2030 + *
2031 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_crc_par_defs_asm.h ../../inst/io_proc/rtl/iop_crc_par.r
2032 * id: $Id: iop_crc_par_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
2033 * Any changes here will be lost.
2034 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h
2035 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2036 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2037 @@ -4,9 +4,9 @@
2038 /*
2039 * This file is autogenerated from
2040 * file: ../../inst/io_proc/rtl/iop_dmc_in.r
2041 - * id: iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp
2042 + * id: iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp
2043 * last modfied: Mon Apr 11 16:08:45 2005
2044 - *
2045 + *
2046 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_dmc_in_defs_asm.h ../../inst/io_proc/rtl/iop_dmc_in.r
2047 * id: $Id: iop_dmc_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
2048 * Any changes here will be lost.
2049 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h
2050 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2051 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2052 @@ -4,9 +4,9 @@
2053 /*
2054 * This file is autogenerated from
2055 * file: ../../inst/io_proc/rtl/iop_dmc_out.r
2056 - * id: iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp
2057 + * id: iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp
2058 * last modfied: Mon Apr 11 16:08:45 2005
2059 - *
2060 + *
2061 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_dmc_out_defs_asm.h ../../inst/io_proc/rtl/iop_dmc_out.r
2062 * id: $Id: iop_dmc_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
2063 * Any changes here will be lost.
2064 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h
2065 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2066 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2067 @@ -6,7 +6,7 @@
2068 * file: ../../inst/io_proc/rtl/iop_fifo_in.r
2069 * id: <not found>
2070 * last modfied: Mon Apr 11 16:10:07 2005
2071 - *
2072 + *
2073 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_fifo_in_defs_asm.h ../../inst/io_proc/rtl/iop_fifo_in.r
2074 * id: $Id: iop_fifo_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
2075 * Any changes here will be lost.
2076 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h
2077 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2078 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2079 @@ -6,7 +6,7 @@
2080 * file: ../../inst/io_proc/rtl/iop_fifo_in_extra.r
2081 * id: <not found>
2082 * last modfied: Mon Apr 11 16:10:08 2005
2083 - *
2084 + *
2085 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_fifo_in_extra_defs_asm.h ../../inst/io_proc/rtl/iop_fifo_in_extra.r
2086 * id: $Id: iop_fifo_in_extra_defs_asm.h,v 1.1 2005/04/24 18:31:06 starvik Exp $
2087 * Any changes here will be lost.
2088 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h
2089 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2090 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2091 @@ -6,7 +6,7 @@
2092 * file: ../../inst/io_proc/rtl/iop_fifo_out.r
2093 * id: <not found>
2094 * last modfied: Mon Apr 11 16:10:09 2005
2095 - *
2096 + *
2097 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_fifo_out_defs_asm.h ../../inst/io_proc/rtl/iop_fifo_out.r
2098 * id: $Id: iop_fifo_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
2099 * Any changes here will be lost.
2100 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h
2101 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2102 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2103 @@ -6,7 +6,7 @@
2104 * file: ../../inst/io_proc/rtl/iop_fifo_out_extra.r
2105 * id: <not found>
2106 * last modfied: Mon Apr 11 16:10:10 2005
2107 - *
2108 + *
2109 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_fifo_out_extra_defs_asm.h ../../inst/io_proc/rtl/iop_fifo_out_extra.r
2110 * id: $Id: iop_fifo_out_extra_defs_asm.h,v 1.1 2005/04/24 18:31:06 starvik Exp $
2111 * Any changes here will be lost.
2112 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h
2113 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2114 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2115 @@ -4,9 +4,9 @@
2116 /*
2117 * This file is autogenerated from
2118 * file: ../../inst/io_proc/rtl/iop_mpu.r
2119 - * id: iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp
2120 + * id: iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp
2121 * last modfied: Mon Apr 11 16:08:45 2005
2122 - *
2123 + *
2124 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_mpu_defs_asm.h ../../inst/io_proc/rtl/iop_mpu.r
2125 * id: $Id: iop_mpu_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
2126 * Any changes here will be lost.
2127 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h
2128 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h 2007-01-10 20:10:37.000000000 +0100
2129 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h 2005-04-24 20:31:06.000000000 +0200
2130 @@ -1,5 +1,5 @@
2131 /* Autogenerated Changes here will be lost!
2132 - * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg
2133 + * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg
2134 */
2135 #define iop_version 0
2136 #define iop_fifo_in0_extra 64
2137 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h
2138 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2139 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2140 @@ -6,7 +6,7 @@
2141 * file: ../../inst/io_proc/rtl/iop_sap_in.r
2142 * id: <not found>
2143 * last modfied: Mon Apr 11 16:08:45 2005
2144 - *
2145 + *
2146 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sap_in_defs_asm.h ../../inst/io_proc/rtl/iop_sap_in.r
2147 * id: $Id: iop_sap_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
2148 * Any changes here will be lost.
2149 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h
2150 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2151 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2152 @@ -6,7 +6,7 @@
2153 * file: ../../inst/io_proc/rtl/iop_sap_out.r
2154 * id: <not found>
2155 * last modfied: Mon Apr 11 16:08:46 2005
2156 - *
2157 + *
2158 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sap_out_defs_asm.h ../../inst/io_proc/rtl/iop_sap_out.r
2159 * id: $Id: iop_sap_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
2160 * Any changes here will be lost.
2161 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h
2162 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2163 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2164 @@ -4,9 +4,9 @@
2165 /*
2166 * This file is autogenerated from
2167 * file: ../../inst/io_proc/rtl/iop_scrc_in.r
2168 - * id: iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp
2169 + * id: iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp
2170 * last modfied: Mon Apr 11 16:08:46 2005
2171 - *
2172 + *
2173 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_scrc_in_defs_asm.h ../../inst/io_proc/rtl/iop_scrc_in.r
2174 * id: $Id: iop_scrc_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
2175 * Any changes here will be lost.
2176 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h
2177 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2178 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2179 @@ -4,9 +4,9 @@
2180 /*
2181 * This file is autogenerated from
2182 * file: ../../inst/io_proc/rtl/iop_scrc_out.r
2183 - * id: iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp
2184 + * id: iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp
2185 * last modfied: Mon Apr 11 16:08:46 2005
2186 - *
2187 + *
2188 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_scrc_out_defs_asm.h ../../inst/io_proc/rtl/iop_scrc_out.r
2189 * id: $Id: iop_scrc_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
2190 * Any changes here will be lost.
2191 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h
2192 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2193 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h 2005-04-24 20:31:06.000000000 +0200
2194 @@ -6,7 +6,7 @@
2195 * file: ../../inst/io_proc/rtl/iop_spu.r
2196 * id: <not found>
2197 * last modfied: Mon Apr 11 16:08:46 2005
2198 - *
2199 + *
2200 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_spu_defs_asm.h ../../inst/io_proc/rtl/iop_spu.r
2201 * id: $Id: iop_spu_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
2202 * Any changes here will be lost.
2203 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h
2204 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2205 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h 2005-04-24 20:31:07.000000000 +0200
2206 @@ -6,7 +6,7 @@
2207 * file: ../../inst/io_proc/rtl/guinness/iop_sw_cfg.r
2208 * id: <not found>
2209 * last modfied: Mon Apr 11 16:10:19 2005
2210 - *
2211 + *
2212 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sw_cfg_defs_asm.h ../../inst/io_proc/rtl/guinness/iop_sw_cfg.r
2213 * id: $Id: iop_sw_cfg_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
2214 * Any changes here will be lost.
2215 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h
2216 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2217 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h 2005-04-24 20:31:07.000000000 +0200
2218 @@ -6,7 +6,7 @@
2219 * file: ../../inst/io_proc/rtl/guinness/iop_sw_cpu.r
2220 * id: <not found>
2221 * last modfied: Mon Apr 11 16:10:19 2005
2222 - *
2223 + *
2224 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sw_cpu_defs_asm.h ../../inst/io_proc/rtl/guinness/iop_sw_cpu.r
2225 * id: $Id: iop_sw_cpu_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
2226 * Any changes here will be lost.
2227 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h
2228 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2229 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h 2005-04-24 20:31:07.000000000 +0200
2230 @@ -6,7 +6,7 @@
2231 * file: ../../inst/io_proc/rtl/guinness/iop_sw_mpu.r
2232 * id: <not found>
2233 * last modfied: Mon Apr 11 16:10:19 2005
2234 - *
2235 + *
2236 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sw_mpu_defs_asm.h ../../inst/io_proc/rtl/guinness/iop_sw_mpu.r
2237 * id: $Id: iop_sw_mpu_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
2238 * Any changes here will be lost.
2239 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h
2240 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2241 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h 2005-04-24 20:31:07.000000000 +0200
2242 @@ -6,7 +6,7 @@
2243 * file: ../../inst/io_proc/rtl/guinness/iop_sw_spu.r
2244 * id: <not found>
2245 * last modfied: Mon Apr 11 16:10:19 2005
2246 - *
2247 + *
2248 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sw_spu_defs_asm.h ../../inst/io_proc/rtl/guinness/iop_sw_spu.r
2249 * id: $Id: iop_sw_spu_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
2250 * Any changes here will be lost.
2251 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h
2252 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2253 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h 2005-04-24 20:31:07.000000000 +0200
2254 @@ -4,9 +4,9 @@
2255 /*
2256 * This file is autogenerated from
2257 * file: ../../inst/io_proc/rtl/iop_timer_grp.r
2258 - * id: iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp
2259 + * id: iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp
2260 * last modfied: Mon Apr 11 16:08:46 2005
2261 - *
2262 + *
2263 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_timer_grp_defs_asm.h ../../inst/io_proc/rtl/iop_timer_grp.r
2264 * id: $Id: iop_timer_grp_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
2265 * Any changes here will be lost.
2266 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h
2267 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2268 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h 2005-04-24 20:31:07.000000000 +0200
2269 @@ -4,9 +4,9 @@
2270 /*
2271 * This file is autogenerated from
2272 * file: ../../inst/io_proc/rtl/iop_trigger_grp.r
2273 - * id: iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp
2274 + * id: iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp
2275 * last modfied: Mon Apr 11 16:08:46 2005
2276 - *
2277 + *
2278 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_trigger_grp_defs_asm.h ../../inst/io_proc/rtl/iop_trigger_grp.r
2279 * id: $Id: iop_trigger_grp_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
2280 * Any changes here will be lost.
2281 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h
2282 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h 2007-01-10 20:10:37.000000000 +0100
2283 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h 2005-04-24 20:31:07.000000000 +0200
2284 @@ -4,9 +4,9 @@
2285 /*
2286 * This file is autogenerated from
2287 * file: ../../inst/io_proc/rtl/guinness/iop_version.r
2288 - * id: iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp
2289 + * id: iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp
2290 * last modfied: Mon Apr 11 16:08:44 2005
2291 - *
2292 + *
2293 * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_version_defs_asm.h ../../inst/io_proc/rtl/guinness/iop_version.r
2294 * id: $Id: iop_version_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
2295 * Any changes here will be lost.
2296 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h
2297 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h 2007-01-10 20:10:37.000000000 +0100
2298 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h 2005-04-24 20:31:05.000000000 +0200
2299 @@ -6,7 +6,7 @@
2300 * file: ../../inst/io_proc/rtl/iop_crc_par.r
2301 * id: <not found>
2302 * last modfied: Mon Apr 11 16:08:45 2005
2303 - *
2304 + *
2305 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_crc_par_defs.h ../../inst/io_proc/rtl/iop_crc_par.r
2306 * id: $Id: iop_crc_par_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
2307 * Any changes here will be lost.
2308 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h
2309 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h 2007-01-10 20:10:37.000000000 +0100
2310 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h 2005-04-24 20:31:05.000000000 +0200
2311 @@ -4,9 +4,9 @@
2312 /*
2313 * This file is autogenerated from
2314 * file: ../../inst/io_proc/rtl/iop_dmc_in.r
2315 - * id: iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp
2316 + * id: iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp
2317 * last modfied: Mon Apr 11 16:08:45 2005
2318 - *
2319 + *
2320 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_dmc_in_defs.h ../../inst/io_proc/rtl/iop_dmc_in.r
2321 * id: $Id: iop_dmc_in_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
2322 * Any changes here will be lost.
2323 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h
2324 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h 2007-01-10 20:10:37.000000000 +0100
2325 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h 2005-04-24 20:31:05.000000000 +0200
2326 @@ -4,9 +4,9 @@
2327 /*
2328 * This file is autogenerated from
2329 * file: ../../inst/io_proc/rtl/iop_dmc_out.r
2330 - * id: iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp
2331 + * id: iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp
2332 * last modfied: Mon Apr 11 16:08:45 2005
2333 - *
2334 + *
2335 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_dmc_out_defs.h ../../inst/io_proc/rtl/iop_dmc_out.r
2336 * id: $Id: iop_dmc_out_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
2337 * Any changes here will be lost.
2338 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h
2339 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h 2007-01-10 20:10:37.000000000 +0100
2340 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h 2005-04-24 20:31:05.000000000 +0200
2341 @@ -6,7 +6,7 @@
2342 * file: ../../inst/io_proc/rtl/iop_fifo_in.r
2343 * id: <not found>
2344 * last modfied: Mon Apr 11 16:10:07 2005
2345 - *
2346 + *
2347 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_in_defs.h ../../inst/io_proc/rtl/iop_fifo_in.r
2348 * id: $Id: iop_fifo_in_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
2349 * Any changes here will be lost.
2350 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h
2351 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h 2007-01-10 20:10:37.000000000 +0100
2352 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h 2005-04-24 20:31:05.000000000 +0200
2353 @@ -6,7 +6,7 @@
2354 * file: ../../inst/io_proc/rtl/iop_fifo_in_extra.r
2355 * id: <not found>
2356 * last modfied: Mon Apr 11 16:10:08 2005
2357 - *
2358 + *
2359 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_in_extra_defs.h ../../inst/io_proc/rtl/iop_fifo_in_extra.r
2360 * id: $Id: iop_fifo_in_extra_defs.h,v 1.1 2005/04/24 18:31:05 starvik Exp $
2361 * Any changes here will be lost.
2362 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h
2363 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h 2007-01-10 20:10:37.000000000 +0100
2364 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h 2005-04-24 20:31:05.000000000 +0200
2365 @@ -6,7 +6,7 @@
2366 * file: ../../inst/io_proc/rtl/iop_fifo_out.r
2367 * id: <not found>
2368 * last modfied: Mon Apr 11 16:10:09 2005
2369 - *
2370 + *
2371 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_out_defs.h ../../inst/io_proc/rtl/iop_fifo_out.r
2372 * id: $Id: iop_fifo_out_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
2373 * Any changes here will be lost.
2374 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h
2375 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h 2007-01-10 20:10:37.000000000 +0100
2376 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h 2005-04-24 20:31:05.000000000 +0200
2377 @@ -6,7 +6,7 @@
2378 * file: ../../inst/io_proc/rtl/iop_fifo_out_extra.r
2379 * id: <not found>
2380 * last modfied: Mon Apr 11 16:10:10 2005
2381 - *
2382 + *
2383 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_out_extra_defs.h ../../inst/io_proc/rtl/iop_fifo_out_extra.r
2384 * id: $Id: iop_fifo_out_extra_defs.h,v 1.1 2005/04/24 18:31:05 starvik Exp $
2385 * Any changes here will be lost.
2386 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h
2387 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h 2007-01-10 20:10:37.000000000 +0100
2388 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h 2005-04-24 20:31:05.000000000 +0200
2389 @@ -4,9 +4,9 @@
2390 /*
2391 * This file is autogenerated from
2392 * file: ../../inst/io_proc/rtl/iop_mpu.r
2393 - * id: iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp
2394 + * id: iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp
2395 * last modfied: Mon Apr 11 16:08:45 2005
2396 - *
2397 + *
2398 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_mpu_defs.h ../../inst/io_proc/rtl/iop_mpu.r
2399 * id: $Id: iop_mpu_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
2400 * Any changes here will be lost.
2401 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h
2402 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h 2007-01-10 20:10:37.000000000 +0100
2403 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h 2004-01-07 16:18:30.000000000 +0100
2404 @@ -96,189 +96,189 @@
2405 #define MPU_ADD_RRR(S,N,D) (0x4000008C | ((S & ((1 << 5) - 1)) << 16)\
2406 | ((N & ((1 << 5) - 1)) << 11)\
2407 | ((D & ((1 << 5) - 1)) << 21))
2408 -
2409 +
2410 #define MPU_ADD_RRS(S,N,D) (0x4000048C | ((S & ((1 << 5) - 1)) << 16)\
2411 | ((N & ((1 << 5) - 1)) << 11)\
2412 | ((D & ((1 << 5) - 1)) << 21))
2413 -
2414 +
2415 #define MPU_ADD_RSR(S,N,D) (0x4000018C | ((S & ((1 << 5) - 1)) << 16)\
2416 | ((N & ((1 << 5) - 1)) << 11)\
2417 | ((D & ((1 << 5) - 1)) << 21))
2418 -
2419 +
2420 #define MPU_ADD_RSS(S,N,D) (0x4000058C | ((S & ((1 << 5) - 1)) << 16)\
2421 | ((N & ((1 << 5) - 1)) << 11)\
2422 | ((D & ((1 << 5) - 1)) << 21))
2423 -
2424 +
2425 #define MPU_ADD_SRR(S,N,D) (0x4000028C | ((S & ((1 << 5) - 1)) << 16)\
2426 | ((N & ((1 << 5) - 1)) << 11)\
2427 | ((D & ((1 << 5) - 1)) << 21))
2428 -
2429 +
2430 #define MPU_ADD_SRS(S,N,D) (0x4000068C | ((S & ((1 << 5) - 1)) << 16)\
2431 | ((N & ((1 << 5) - 1)) << 11)\
2432 | ((D & ((1 << 5) - 1)) << 21))
2433 -
2434 +
2435 #define MPU_ADD_SSR(S,N,D) (0x4000038C | ((S & ((1 << 5) - 1)) << 16)\
2436 | ((N & ((1 << 5) - 1)) << 11)\
2437 | ((D & ((1 << 5) - 1)) << 21))
2438 -
2439 +
2440 #define MPU_ADD_SSS(S,N,D) (0x4000078C | ((S & ((1 << 5) - 1)) << 16)\
2441 | ((N & ((1 << 5) - 1)) << 11)\
2442 | ((D & ((1 << 5) - 1)) << 21))
2443 -
2444 +
2445 #define MPU_ADDQ_RIR(S,N,D) (0x10000000 | ((S & ((1 << 5) - 1)) << 16)\
2446 | ((N & ((1 << 16) - 1)) << 0)\
2447 | ((D & ((1 << 5) - 1)) << 21))
2448 -
2449 +
2450 #define MPU_ADDQ_IRR(S,N,D) (0x10000000 | ((S & ((1 << 16) - 1)) << 0)\
2451 | ((N & ((1 << 5) - 1)) << 16)\
2452 | ((D & ((1 << 5) - 1)) << 21))
2453 -
2454 +
2455 #define MPU_ADDX_IRR_INSTR(S,N,D) (0xC000008C | ((N & ((1 << 5) - 1)) << 16)\
2456 | ((D & ((1 << 5) - 1)) << 21))
2457 -
2458 +
2459 #define MPU_ADDX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF)
2460
2461 #define MPU_ADDX_RIR_INSTR(S,N,D) (0xC000008C | ((S & ((1 << 5) - 1)) << 16)\
2462 | ((D & ((1 << 5) - 1)) << 21))
2463 -
2464 +
2465 #define MPU_ADDX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF)
2466
2467 #define MPU_ADDX_ISR_INSTR(S,N,D) (0xC000028C | ((N & ((1 << 5) - 1)) << 16)\
2468 | ((D & ((1 << 5) - 1)) << 21))
2469 -
2470 +
2471 #define MPU_ADDX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF)
2472
2473 #define MPU_ADDX_SIR_INSTR(S,N,D) (0xC000028C | ((S & ((1 << 5) - 1)) << 16)\
2474 | ((D & ((1 << 5) - 1)) << 21))
2475 -
2476 +
2477 #define MPU_ADDX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF)
2478
2479 #define MPU_ADDX_IRS_INSTR(S,N,D) (0xC000048C | ((N & ((1 << 5) - 1)) << 16)\
2480 | ((D & ((1 << 5) - 1)) << 21))
2481 -
2482 +
2483 #define MPU_ADDX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF)
2484
2485 #define MPU_ADDX_RIS_INSTR(S,N,D) (0xC000048C | ((S & ((1 << 5) - 1)) << 16)\
2486 | ((D & ((1 << 5) - 1)) << 21))
2487 -
2488 +
2489 #define MPU_ADDX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF)
2490
2491 #define MPU_ADDX_ISS_INSTR(S,N,D) (0xC000068C | ((N & ((1 << 5) - 1)) << 16)\
2492 | ((D & ((1 << 5) - 1)) << 21))
2493 -
2494 +
2495 #define MPU_ADDX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF)
2496
2497 #define MPU_ADDX_SIS_INSTR(S,N,D) (0xC000068C | ((S & ((1 << 5) - 1)) << 16)\
2498 | ((D & ((1 << 5) - 1)) << 21))
2499 -
2500 +
2501 #define MPU_ADDX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF)
2502
2503 #define MPU_AND_RRR(S,N,D) (0x4000008A | ((S & ((1 << 5) - 1)) << 16)\
2504 | ((N & ((1 << 5) - 1)) << 11)\
2505 | ((D & ((1 << 5) - 1)) << 21))
2506 -
2507 +
2508 #define MPU_AND_RRS(S,N,D) (0x4000048A | ((S & ((1 << 5) - 1)) << 16)\
2509 | ((N & ((1 << 5) - 1)) << 11)\
2510 | ((D & ((1 << 5) - 1)) << 21))
2511 -
2512 +
2513 #define MPU_AND_RSR(S,N,D) (0x4000018A | ((S & ((1 << 5) - 1)) << 16)\
2514 | ((N & ((1 << 5) - 1)) << 11)\
2515 | ((D & ((1 << 5) - 1)) << 21))
2516 -
2517 +
2518 #define MPU_AND_RSS(S,N,D) (0x4000058A | ((S & ((1 << 5) - 1)) << 16)\
2519 | ((N & ((1 << 5) - 1)) << 11)\
2520 | ((D & ((1 << 5) - 1)) << 21))
2521 -
2522 +
2523 #define MPU_AND_SRR(S,N,D) (0x4000028A | ((S & ((1 << 5) - 1)) << 16)\
2524 | ((N & ((1 << 5) - 1)) << 11)\
2525 | ((D & ((1 << 5) - 1)) << 21))
2526 -
2527 +
2528 #define MPU_AND_SRS(S,N,D) (0x4000068A | ((S & ((1 << 5) - 1)) << 16)\
2529 | ((N & ((1 << 5) - 1)) << 11)\
2530 | ((D & ((1 << 5) - 1)) << 21))
2531 -
2532 +
2533 #define MPU_AND_SSR(S,N,D) (0x4000038A | ((S & ((1 << 5) - 1)) << 16)\
2534 | ((N & ((1 << 5) - 1)) << 11)\
2535 | ((D & ((1 << 5) - 1)) << 21))
2536 -
2537 +
2538 #define MPU_AND_SSS(S,N,D) (0x4000078A | ((S & ((1 << 5) - 1)) << 16)\
2539 | ((N & ((1 << 5) - 1)) << 11)\
2540 | ((D & ((1 << 5) - 1)) << 21))
2541 -
2542 +
2543 #define MPU_ANDQ_RIR(S,N,D) (0x08000000 | ((S & ((1 << 5) - 1)) << 16)\
2544 | ((N & ((1 << 16) - 1)) << 0)\
2545 | ((D & ((1 << 5) - 1)) << 21))
2546 -
2547 +
2548 #define MPU_ANDQ_IRR(S,N,D) (0x08000000 | ((S & ((1 << 16) - 1)) << 0)\
2549 | ((N & ((1 << 5) - 1)) << 16)\
2550 | ((D & ((1 << 5) - 1)) << 21))
2551 -
2552 +
2553 #define MPU_ANDX_RIR_INSTR(S,N,D) (0xC000008A | ((S & ((1 << 5) - 1)) << 16)\
2554 | ((D & ((1 << 5) - 1)) << 21))
2555 -
2556 +
2557 #define MPU_ANDX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF)
2558
2559 #define MPU_ANDX_IRR_INSTR(S,N,D) (0xC000008A | ((N & ((1 << 5) - 1)) << 16)\
2560 | ((D & ((1 << 5) - 1)) << 21))
2561 -
2562 +
2563 #define MPU_ANDX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF)
2564
2565 #define MPU_ANDX_ISR_INSTR(S,N,D) (0xC000028A | ((N & ((1 << 5) - 1)) << 16)\
2566 | ((D & ((1 << 5) - 1)) << 21))
2567 -
2568 +
2569 #define MPU_ANDX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF)
2570
2571 #define MPU_ANDX_SIR_INSTR(S,N,D) (0xC000028A | ((S & ((1 << 5) - 1)) << 16)\
2572 | ((D & ((1 << 5) - 1)) << 21))
2573 -
2574 +
2575 #define MPU_ANDX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF)
2576
2577 #define MPU_ANDX_IRS_INSTR(S,N,D) (0xC000048A | ((N & ((1 << 5) - 1)) << 16)\
2578 | ((D & ((1 << 5) - 1)) << 21))
2579 -
2580 +
2581 #define MPU_ANDX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF)
2582
2583 #define MPU_ANDX_ISS_INSTR(S,N,D) (0xC000068A | ((N & ((1 << 5) - 1)) << 16)\
2584 | ((D & ((1 << 5) - 1)) << 21))
2585 -
2586 +
2587 #define MPU_ANDX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF)
2588
2589 #define MPU_ANDX_RIS_INSTR(S,N,D) (0xC000048A | ((S & ((1 << 5) - 1)) << 16)\
2590 | ((D & ((1 << 5) - 1)) << 21))
2591 -
2592 +
2593 #define MPU_ANDX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF)
2594
2595 #define MPU_ANDX_SIS_INSTR(S,N,D) (0xC000068A | ((S & ((1 << 5) - 1)) << 16)\
2596 | ((D & ((1 << 5) - 1)) << 21))
2597 -
2598 +
2599 #define MPU_ANDX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF)
2600
2601 #define MPU_BA_I(S) (0x60000000 | ((S & ((1 << 16) - 1)) << 0))
2602 -
2603 +
2604 #define MPU_BAR_R(S) (0x62000000 | ((S & ((1 << 5) - 1)) << 11))
2605 -
2606 +
2607 #define MPU_BAR_S(S) (0x63000000 | ((S & ((1 << 5) - 1)) << 11))
2608 -
2609 +
2610 #define MPU_BBC_RII(S,N,D) (0x78000000 | ((S & ((1 << 5) - 1)) << 16)\
2611 | ((N & ((1 << 5) - 1)) << 21)\
2612 | ((D & ((1 << 16) - 1)) << 0))
2613 -
2614 +
2615 #define MPU_BBS_RII(S,N,D) (0x7C000000 | ((S & ((1 << 5) - 1)) << 16)\
2616 | ((N & ((1 << 5) - 1)) << 21)\
2617 | ((D & ((1 << 16) - 1)) << 0))
2618 -
2619 +
2620 #define MPU_BNZ_RI(S,D) (0x74400000 | ((S & ((1 << 5) - 1)) << 16)\
2621 | ((D & ((1 << 16) - 1)) << 0))
2622 -
2623 +
2624 #define MPU_BMI_RI(S,D) (0x7FE00000 | ((S & ((1 << 5) - 1)) << 16)\
2625 | ((D & ((1 << 16) - 1)) << 0))
2626 -
2627 +
2628 #define MPU_BPL_RI(S,D) (0x7BE00000 | ((S & ((1 << 5) - 1)) << 16)\
2629 | ((D & ((1 << 16) - 1)) << 0))
2630 -
2631 +
2632 #define MPU_BZ_RI(S,D) (0x74000000 | ((S & ((1 << 5) - 1)) << 16)\
2633 | ((D & ((1 << 16) - 1)) << 0))
2634 -
2635 +
2636 #define MPU_DI() (0x40000001)
2637
2638 #define MPU_EI() (0x40000003)
2639 @@ -286,243 +286,243 @@
2640 #define MPU_HALT() (0x40000002)
2641
2642 #define MPU_JIR_I(S) (0x60200000 | ((S & ((1 << 16) - 1)) << 0))
2643 -
2644 +
2645 #define MPU_JIR_R(S) (0x62200000 | ((S & ((1 << 5) - 1)) << 11))
2646 -
2647 +
2648 #define MPU_JIR_S(S) (0x63200000 | ((S & ((1 << 5) - 1)) << 11))
2649 -
2650 +
2651 #define MPU_JNT() (0x61000000)
2652
2653 #define MPU_JSR_I(S) (0x60400000 | ((S & ((1 << 16) - 1)) << 0))
2654 -
2655 +
2656 #define MPU_JSR_R(S) (0x62400000 | ((S & ((1 << 5) - 1)) << 11))
2657 -
2658 +
2659 #define MPU_JSR_S(S) (0x63400000 | ((S & ((1 << 5) - 1)) << 11))
2660 -
2661 +
2662 #define MPU_LSL_RRR(S,N,D) (0x4000008E | ((S & ((1 << 5) - 1)) << 16)\
2663 | ((N & ((1 << 5) - 1)) << 11)\
2664 | ((D & ((1 << 5) - 1)) << 21))
2665 -
2666 +
2667 #define MPU_LSL_RRS(S,N,D) (0x4000048E | ((S & ((1 << 5) - 1)) << 16)\
2668 | ((N & ((1 << 5) - 1)) << 11)\
2669 | ((D & ((1 << 5) - 1)) << 21))
2670 -
2671 +
2672 #define MPU_LSL_RSR(S,N,D) (0x4000018E | ((S & ((1 << 5) - 1)) << 16)\
2673 | ((N & ((1 << 5) - 1)) << 11)\
2674 | ((D & ((1 << 5) - 1)) << 21))
2675 -
2676 +
2677 #define MPU_LSL_RSS(S,N,D) (0x4000058E | ((S & ((1 << 5) - 1)) << 16)\
2678 | ((N & ((1 << 5) - 1)) << 11)\
2679 | ((D & ((1 << 5) - 1)) << 21))
2680 -
2681 +
2682 #define MPU_LSL_SRR(S,N,D) (0x4000028E | ((S & ((1 << 5) - 1)) << 16)\
2683 | ((N & ((1 << 5) - 1)) << 11)\
2684 | ((D & ((1 << 5) - 1)) << 21))
2685 -
2686 +
2687 #define MPU_LSL_SRS(S,N,D) (0x4000068E | ((S & ((1 << 5) - 1)) << 16)\
2688 | ((N & ((1 << 5) - 1)) << 11)\
2689 | ((D & ((1 << 5) - 1)) << 21))
2690 -
2691 +
2692 #define MPU_LSL_SSR(S,N,D) (0x4000038E | ((S & ((1 << 5) - 1)) << 16)\
2693 | ((N & ((1 << 5) - 1)) << 11)\
2694 | ((D & ((1 << 5) - 1)) << 21))
2695 -
2696 +
2697 #define MPU_LSL_SSS(S,N,D) (0x4000078E | ((S & ((1 << 5) - 1)) << 16)\
2698 | ((N & ((1 << 5) - 1)) << 11)\
2699 | ((D & ((1 << 5) - 1)) << 21))
2700 -
2701 +
2702 #define MPU_LSLQ_RIR(S,N,D) (0x18000000 | ((S & ((1 << 5) - 1)) << 16)\
2703 | ((N & ((1 << 16) - 1)) << 0)\
2704 | ((D & ((1 << 5) - 1)) << 21))
2705 -
2706 +
2707 #define MPU_LSR_RRR(S,N,D) (0x4000008F | ((S & ((1 << 5) - 1)) << 16)\
2708 | ((N & ((1 << 5) - 1)) << 11)\
2709 | ((D & ((1 << 5) - 1)) << 21))
2710 -
2711 +
2712 #define MPU_LSR_RRS(S,N,D) (0x4000048F | ((S & ((1 << 5) - 1)) << 16)\
2713 | ((N & ((1 << 5) - 1)) << 11)\
2714 | ((D & ((1 << 5) - 1)) << 21))
2715 -
2716 +
2717 #define MPU_LSR_RSR(S,N,D) (0x4000018F | ((S & ((1 << 5) - 1)) << 16)\
2718 | ((N & ((1 << 5) - 1)) << 11)\
2719 | ((D & ((1 << 5) - 1)) << 21))
2720 -
2721 +
2722 #define MPU_LSR_RSS(S,N,D) (0x4000058F | ((S & ((1 << 5) - 1)) << 16)\
2723 | ((N & ((1 << 5) - 1)) << 11)\
2724 | ((D & ((1 << 5) - 1)) << 21))
2725 -
2726 +
2727 #define MPU_LSR_SRR(S,N,D) (0x4000028F | ((S & ((1 << 5) - 1)) << 16)\
2728 | ((N & ((1 << 5) - 1)) << 11)\
2729 | ((D & ((1 << 5) - 1)) << 21))
2730 -
2731 +
2732 #define MPU_LSR_SRS(S,N,D) (0x4000068F | ((S & ((1 << 5) - 1)) << 16)\
2733 | ((N & ((1 << 5) - 1)) << 11)\
2734 | ((D & ((1 << 5) - 1)) << 21))
2735 -
2736 +
2737 #define MPU_LSR_SSR(S,N,D) (0x4000038F | ((S & ((1 << 5) - 1)) << 16)\
2738 | ((N & ((1 << 5) - 1)) << 11)\
2739 | ((D & ((1 << 5) - 1)) << 21))
2740 -
2741 +
2742 #define MPU_LSR_SSS(S,N,D) (0x4000078F | ((S & ((1 << 5) - 1)) << 16)\
2743 | ((N & ((1 << 5) - 1)) << 11)\
2744 | ((D & ((1 << 5) - 1)) << 21))
2745 -
2746 +
2747 #define MPU_LSRQ_RIR(S,N,D) (0x1C000000 | ((S & ((1 << 5) - 1)) << 16)\
2748 | ((N & ((1 << 16) - 1)) << 0)\
2749 | ((D & ((1 << 5) - 1)) << 21))
2750 -
2751 +
2752 #define MPU_LW_IR(S,D) (0x64400000 | ((S & ((1 << 16) - 1)) << 0)\
2753 | ((D & ((1 << 5) - 1)) << 16))
2754 -
2755 +
2756 #define MPU_LW_IS(S,D) (0x64600000 | ((S & ((1 << 16) - 1)) << 0)\
2757 | ((D & ((1 << 5) - 1)) << 16))
2758 -
2759 +
2760 #define MPU_LW_RR(S,D) (0x66400000 | ((S & ((1 << 5) - 1)) << 11)\
2761 | ((D & ((1 << 5) - 1)) << 16))
2762 -
2763 +
2764 #define MPU_LW_RS(S,D) (0x66600000 | ((S & ((1 << 5) - 1)) << 11)\
2765 | ((D & ((1 << 5) - 1)) << 16))
2766 -
2767 +
2768 #define MPU_LW_SR(S,D) (0x67400000 | ((S & ((1 << 5) - 1)) << 11)\
2769 | ((D & ((1 << 5) - 1)) << 16))
2770 -
2771 +
2772 #define MPU_LW_SS(S,D) (0x67600000 | ((S & ((1 << 5) - 1)) << 11)\
2773 | ((D & ((1 << 5) - 1)) << 16))
2774 -
2775 +
2776 #define MPU_LW_RIR(S,N,D) (0x66400000 | ((S & ((1 << 5) - 1)) << 11)\
2777 | ((N & ((1 << 8) - 1)) << 0)\
2778 | ((D & ((1 << 5) - 1)) << 16))
2779 -
2780 +
2781 #define MPU_LW_RIS(S,N,D) (0x66600000 | ((S & ((1 << 5) - 1)) << 11)\
2782 | ((N & ((1 << 8) - 1)) << 0)\
2783 | ((D & ((1 << 5) - 1)) << 16))
2784 -
2785 +
2786 #define MPU_LW_SIR(S,N,D) (0x67400000 | ((S & ((1 << 5) - 1)) << 11)\
2787 | ((N & ((1 << 8) - 1)) << 0)\
2788 | ((D & ((1 << 5) - 1)) << 16))
2789 -
2790 +
2791 #define MPU_LW_SIS(S,N,D) (0x67600000 | ((S & ((1 << 5) - 1)) << 11)\
2792 | ((N & ((1 << 8) - 1)) << 0)\
2793 | ((D & ((1 << 5) - 1)) << 16))
2794 -
2795 +
2796 #define MPU_MOVE_RR(S,D) (0x40000081 | ((S & ((1 << 5) - 1)) << 11)\
2797 | ((D & ((1 << 5) - 1)) << 21))
2798 -
2799 +
2800 #define MPU_MOVE_RS(S,D) (0x40000481 | ((S & ((1 << 5) - 1)) << 11)\
2801 | ((D & ((1 << 5) - 1)) << 21))
2802 -
2803 +
2804 #define MPU_MOVE_SR(S,D) (0x40000181 | ((S & ((1 << 5) - 1)) << 11)\
2805 | ((D & ((1 << 5) - 1)) << 21))
2806 -
2807 +
2808 #define MPU_MOVE_SS(S,D) (0x40000581 | ((S & ((1 << 5) - 1)) << 11)\
2809 | ((D & ((1 << 5) - 1)) << 21))
2810 -
2811 +
2812 #define MPU_MOVEQ_IR(S,D) (0x24000000 | ((S & ((1 << 16) - 1)) << 0)\
2813 | ((D & ((1 << 5) - 1)) << 21))
2814 -
2815 +
2816 #define MPU_MOVEQ_IS(S,D) (0x2C000000 | ((S & ((1 << 16) - 1)) << 0)\
2817 | ((D & ((1 << 5) - 1)) << 21))
2818 -
2819 +
2820 #define MPU_MOVEX_IR_INSTR(S,D) (0xC0000081 | ((D & ((1 << 5) - 1)) << 21))
2821 -
2822 +
2823 #define MPU_MOVEX_IR_IMM(S,D) (S & 0xFFFFFFFF)
2824
2825 #define MPU_MOVEX_IS_INSTR(S,D) (0xC0000481 | ((D & ((1 << 5) - 1)) << 21))
2826 -
2827 +
2828 #define MPU_MOVEX_IS_IMM(S,D) (S & 0xFFFFFFFF)
2829
2830 #define MPU_NOP() (0x40000000)
2831
2832 #define MPU_NOT_RR(S,D) (0x40100081 | ((S & ((1 << 5) - 1)) << 11)\
2833 | ((D & ((1 << 5) - 1)) << 21))
2834 -
2835 +
2836 #define MPU_NOT_RS(S,D) (0x40100481 | ((S & ((1 << 5) - 1)) << 11)\
2837 | ((D & ((1 << 5) - 1)) << 21))
2838 -
2839 +
2840 #define MPU_NOT_SR(S,D) (0x40100181 | ((S & ((1 << 5) - 1)) << 11)\
2841 | ((D & ((1 << 5) - 1)) << 21))
2842 -
2843 +
2844 #define MPU_NOT_SS(S,D) (0x40100581 | ((S & ((1 << 5) - 1)) << 11)\
2845 | ((D & ((1 << 5) - 1)) << 21))
2846 -
2847 +
2848 #define MPU_OR_RRR(S,N,D) (0x4000008B | ((S & ((1 << 5) - 1)) << 16)\
2849 | ((N & ((1 << 5) - 1)) << 11)\
2850 | ((D & ((1 << 5) - 1)) << 21))
2851 -
2852 +
2853 #define MPU_OR_RRS(S,N,D) (0x4000048B | ((S & ((1 << 5) - 1)) << 16)\
2854 | ((N & ((1 << 5) - 1)) << 11)\
2855 | ((D & ((1 << 5) - 1)) << 21))
2856 -
2857 +
2858 #define MPU_OR_RSR(S,N,D) (0x4000018B | ((S & ((1 << 5) - 1)) << 16)\
2859 | ((N & ((1 << 5) - 1)) << 11)\
2860 | ((D & ((1 << 5) - 1)) << 21))
2861 -
2862 +
2863 #define MPU_OR_RSS(S,N,D) (0x4000058B | ((S & ((1 << 5) - 1)) << 16)\
2864 | ((N & ((1 << 5) - 1)) << 11)\
2865 | ((D & ((1 << 5) - 1)) << 21))
2866 -
2867 +
2868 #define MPU_OR_SRR(S,N,D) (0x4000028B | ((S & ((1 << 5) - 1)) << 16)\
2869 | ((N & ((1 << 5) - 1)) << 11)\
2870 | ((D & ((1 << 5) - 1)) << 21))
2871 -
2872 +
2873 #define MPU_OR_SRS(S,N,D) (0x4000068B | ((S & ((1 << 5) - 1)) << 16)\
2874 | ((N & ((1 << 5) - 1)) << 11)\
2875 | ((D & ((1 << 5) - 1)) << 21))
2876 -
2877 +
2878 #define MPU_OR_SSR(S,N,D) (0x4000038B | ((S & ((1 << 5) - 1)) << 16)\
2879 | ((N & ((1 << 5) - 1)) << 11)\
2880 | ((D & ((1 << 5) - 1)) << 21))
2881 -
2882 +
2883 #define MPU_OR_SSS(S,N,D) (0x4000078B | ((S & ((1 << 5) - 1)) << 16)\
2884 | ((N & ((1 << 5) - 1)) << 11)\
2885 | ((D & ((1 << 5) - 1)) << 21))
2886 -
2887 +
2888 #define MPU_ORQ_RIR(S,N,D) (0x0C000000 | ((S & ((1 << 5) - 1)) << 16)\
2889 | ((N & ((1 << 16) - 1)) << 0)\
2890 | ((D & ((1 << 5) - 1)) << 21))
2891 -
2892 +
2893 #define MPU_ORQ_IRR(S,N,D) (0x0C000000 | ((S & ((1 << 16) - 1)) << 0)\
2894 | ((N & ((1 << 5) - 1)) << 16)\
2895 | ((D & ((1 << 5) - 1)) << 21))
2896 -
2897 +
2898 #define MPU_ORX_RIR_INSTR(S,N,D) (0xC000008B | ((S & ((1 << 5) - 1)) << 16)\
2899 | ((D & ((1 << 5) - 1)) << 21))
2900 -
2901 +
2902 #define MPU_ORX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF)
2903
2904 #define MPU_ORX_IRR_INSTR(S,N,D) (0xC000008B | ((N & ((1 << 5) - 1)) << 16)\
2905 | ((D & ((1 << 5) - 1)) << 21))
2906 -
2907 +
2908 #define MPU_ORX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF)
2909
2910 #define MPU_ORX_SIR_INSTR(S,N,D) (0xC000028B | ((S & ((1 << 5) - 1)) << 16)\
2911 | ((D & ((1 << 5) - 1)) << 21))
2912 -
2913 +
2914 #define MPU_ORX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF)
2915
2916 #define MPU_ORX_ISR_INSTR(S,N,D) (0xC000028B | ((N & ((1 << 5) - 1)) << 16)\
2917 | ((D & ((1 << 5) - 1)) << 21))
2918 -
2919 +
2920 #define MPU_ORX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF)
2921
2922 #define MPU_ORX_RIS_INSTR(S,N,D) (0xC000048B | ((S & ((1 << 5) - 1)) << 16)\
2923 | ((D & ((1 << 5) - 1)) << 21))
2924 -
2925 +
2926 #define MPU_ORX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF)
2927
2928 #define MPU_ORX_IRS_INSTR(S,N,D) (0xC000048B | ((N & ((1 << 5) - 1)) << 16)\
2929 | ((D & ((1 << 5) - 1)) << 21))
2930 -
2931 +
2932 #define MPU_ORX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF)
2933
2934 #define MPU_ORX_SIS_INSTR(S,N,D) (0xC000068B | ((S & ((1 << 5) - 1)) << 16)\
2935 | ((D & ((1 << 5) - 1)) << 21))
2936 -
2937 +
2938 #define MPU_ORX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF)
2939
2940 #define MPU_ORX_ISS_INSTR(S,N,D) (0xC000068B | ((N & ((1 << 5) - 1)) << 16)\
2941 | ((D & ((1 << 5) - 1)) << 21))
2942 -
2943 +
2944 #define MPU_ORX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF)
2945
2946 #define MPU_RET() (0x63003000)
2947 @@ -531,232 +531,232 @@
2948
2949 #define MPU_RR_IR(S,D) (0x50000000 | ((S & ((1 << 11) - 1)) << 0)\
2950 | ((D & ((1 << 5) - 1)) << 21))
2951 -
2952 +
2953 #define MPU_RR_SR(S,D) (0x50008000 | ((S & ((1 << 5) - 1)) << 16)\
2954 | ((D & ((1 << 5) - 1)) << 21))
2955 -
2956 +
2957 #define MPU_RW_RI(S,D) (0x56000000 | ((S & ((1 << 5) - 1)) << 11)\
2958 | ((D & ((1 << 11) - 1)) << 0))
2959 -
2960 +
2961 #define MPU_RW_RS(S,D) (0x57000000 | ((S & ((1 << 5) - 1)) << 11)\
2962 | ((D & ((1 << 5) - 1)) << 16))
2963 -
2964 +
2965 #define MPU_RWQ_II(S,D) (0x58000000 | ((S & ((1 << 16) - 1)) << 11)\
2966 | ((D & ((1 << 11) - 1)) << 0))
2967 -
2968 +
2969 #define MPU_RWQ_IS(S,D) (0x55000000 | ((S & ((1 << 16) - 1)) << 0)\
2970 | ((D & ((1 << 5) - 1)) << 16))
2971 -
2972 +
2973 #define MPU_RWX_II_INSTR(S,D) (0xD4000000 | ((D & ((1 << 11) - 1)) << 0))
2974 -
2975 +
2976 #define MPU_RWX_II_IMM(S,D) (S & 0xFFFFFFFF)
2977
2978 #define MPU_RWX_IS_INSTR(S,D) (0xD5000000 | ((D & ((1 << 5) - 1)) << 16))
2979 -
2980 +
2981 #define MPU_RWX_IS_IMM(S,D) (S & 0xFFFFFFFF)
2982
2983 #define MPU_SUB_RRR(S,N,D) (0x4000008D | ((S & ((1 << 5) - 1)) << 16)\
2984 | ((N & ((1 << 5) - 1)) << 11)\
2985 | ((D & ((1 << 5) - 1)) << 21))
2986 -
2987 +
2988 #define MPU_SUB_RRS(S,N,D) (0x4000048D | ((S & ((1 << 5) - 1)) << 16)\
2989 | ((N & ((1 << 5) - 1)) << 11)\
2990 | ((D & ((1 << 5) - 1)) << 21))
2991 -
2992 +
2993 #define MPU_SUB_RSR(S,N,D) (0x4000018D | ((S & ((1 << 5) - 1)) << 16)\
2994 | ((N & ((1 << 5) - 1)) << 11)\
2995 | ((D & ((1 << 5) - 1)) << 21))
2996 -
2997 +
2998 #define MPU_SUB_RSS(S,N,D) (0x4000058D | ((S & ((1 << 5) - 1)) << 16)\
2999 | ((N & ((1 << 5) - 1)) << 11)\
3000 | ((D & ((1 << 5) - 1)) << 21))
3001 -
3002 +
3003 #define MPU_SUB_SRR(S,N,D) (0x4000028D | ((S & ((1 << 5) - 1)) << 16)\
3004 | ((N & ((1 << 5) - 1)) << 11)\
3005 | ((D & ((1 << 5) - 1)) << 21))
3006 -
3007 +
3008 #define MPU_SUB_SRS(S,N,D) (0x4000068D | ((S & ((1 << 5) - 1)) << 16)\
3009 | ((N & ((1 << 5) - 1)) << 11)\
3010 | ((D & ((1 << 5) - 1)) << 21))
3011 -
3012 +
3013 #define MPU_SUB_SSR(S,N,D) (0x4000038D | ((S & ((1 << 5) - 1)) << 16)\
3014 | ((N & ((1 << 5) - 1)) << 11)\
3015 | ((D & ((1 << 5) - 1)) << 21))
3016 -
3017 +
3018 #define MPU_SUB_SSS(S,N,D) (0x4000078D | ((S & ((1 << 5) - 1)) << 16)\
3019 | ((N & ((1 << 5) - 1)) << 11)\
3020 | ((D & ((1 << 5) - 1)) << 21))
3021 -
3022 +
3023 #define MPU_SUBQ_RIR(S,N,D) (0x14000000 | ((S & ((1 << 5) - 1)) << 16)\
3024 | ((N & ((1 << 16) - 1)) << 0)\
3025 | ((D & ((1 << 5) - 1)) << 21))
3026 -
3027 +
3028 #define MPU_SUBX_RIR_INSTR(S,N,D) (0xC000008D | ((S & ((1 << 5) - 1)) << 16)\
3029 | ((D & ((1 << 5) - 1)) << 21))
3030 -
3031 +
3032 #define MPU_SUBX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF)
3033
3034 #define MPU_SUBX_SIR_INSTR(S,N,D) (0xC000028D | ((S & ((1 << 5) - 1)) << 16)\
3035 | ((D & ((1 << 5) - 1)) << 21))
3036 -
3037 +
3038 #define MPU_SUBX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF)
3039
3040 #define MPU_SUBX_RIS_INSTR(S,N,D) (0xC000048D | ((S & ((1 << 5) - 1)) << 16)\
3041 | ((D & ((1 << 5) - 1)) << 21))
3042 -
3043 +
3044 #define MPU_SUBX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF)
3045
3046 #define MPU_SUBX_SIS_INSTR(S,N,D) (0xC000068D | ((S & ((1 << 5) - 1)) << 16)\
3047 | ((D & ((1 << 5) - 1)) << 21))
3048 -
3049 +
3050 #define MPU_SUBX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF)
3051
3052 #define MPU_SW_RI(S,D) (0x64000000 | ((S & ((1 << 5) - 1)) << 16)\
3053 | ((D & ((1 << 16) - 1)) << 0))
3054 -
3055 +
3056 #define MPU_SW_SI(S,D) (0x64200000 | ((S & ((1 << 5) - 1)) << 16)\
3057 | ((D & ((1 << 16) - 1)) << 0))
3058 -
3059 +
3060 #define MPU_SW_RR(S,D) (0x66000000 | ((S & ((1 << 5) - 1)) << 16)\
3061 | ((D & ((1 << 5) - 1)) << 11))
3062 -
3063 +
3064 #define MPU_SW_SR(S,D) (0x66200000 | ((S & ((1 << 5) - 1)) << 16)\
3065 | ((D & ((1 << 5) - 1)) << 11))
3066 -
3067 +
3068 #define MPU_SW_RS(S,D) (0x67000000 | ((S & ((1 << 5) - 1)) << 16)\
3069 | ((D & ((1 << 5) - 1)) << 11))
3070 -
3071 +
3072 #define MPU_SW_SS(S,D) (0x67200000 | ((S & ((1 << 5) - 1)) << 16)\
3073 | ((D & ((1 << 5) - 1)) << 11))
3074 -
3075 +
3076 #define MPU_SW_RIR(S,N,D) (0x66000000 | ((S & ((1 << 5) - 1)) << 16)\
3077 | ((N & ((1 << 8) - 1)) << 0)\
3078 | ((D & ((1 << 5) - 1)) << 11))
3079 -
3080 +
3081 #define MPU_SW_SIR(S,N,D) (0x66200000 | ((S & ((1 << 5) - 1)) << 16)\
3082 | ((N & ((1 << 8) - 1)) << 0)\
3083 | ((D & ((1 << 5) - 1)) << 11))
3084 -
3085 +
3086 #define MPU_SW_RIS(S,N,D) (0x67000000 | ((S & ((1 << 5) - 1)) << 16)\
3087 | ((N & ((1 << 8) - 1)) << 0)\
3088 | ((D & ((1 << 5) - 1)) << 11))
3089 -
3090 +
3091 #define MPU_SW_SIS(S,N,D) (0x67200000 | ((S & ((1 << 5) - 1)) << 16)\
3092 | ((N & ((1 << 8) - 1)) << 0)\
3093 | ((D & ((1 << 5) - 1)) << 11))
3094 -
3095 +
3096 #define MPU_SWX_II_INSTR(S,D) (0xE4000000 | ((D & ((1 << 16) - 1)) << 0))
3097 -
3098 +
3099 #define MPU_SWX_II_IMM(S,D) (S & 0xFFFFFFFF)
3100
3101 #define MPU_SWX_IR_INSTR(S,D) (0xE6000000 | ((D & ((1 << 5) - 1)) << 11))
3102 -
3103 +
3104 #define MPU_SWX_IR_IMM(S,D) (S & 0xFFFFFFFF)
3105
3106 #define MPU_SWX_IS_INSTR(S,D) (0xE7000000 | ((D & ((1 << 5) - 1)) << 11))
3107 -
3108 +
3109 #define MPU_SWX_IS_IMM(S,D) (S & 0xFFFFFFFF)
3110
3111 #define MPU_SWX_IIR_INSTR(S,N,D) (0xE6000000 | ((N & ((1 << 8) - 1)) << 0)\
3112 | ((D & ((1 << 5) - 1)) << 11))
3113 -
3114 +
3115 #define MPU_SWX_IIR_IMM(S,N,D) (S & 0xFFFFFFFF)
3116
3117 #define MPU_SWX_IIS_INSTR(S,N,D) (0xE7000000 | ((N & ((1 << 8) - 1)) << 0)\
3118 | ((D & ((1 << 5) - 1)) << 11))
3119 -
3120 +
3121 #define MPU_SWX_IIS_IMM(S,N,D) (S & 0xFFFFFFFF)
3122
3123 #define MPU_XOR_RRR(S,N,D) (0x40000089 | ((S & ((1 << 5) - 1)) << 16)\
3124 | ((N & ((1 << 5) - 1)) << 11)\
3125 | ((D & ((1 << 5) - 1)) << 21))
3126 -
3127 +
3128 #define MPU_XOR_RRS(S,N,D) (0x40000489 | ((S & ((1 << 5) - 1)) << 16)\
3129 | ((N & ((1 << 5) - 1)) << 11)\
3130 | ((D & ((1 << 5) - 1)) << 21))
3131 -
3132 +
3133 #define MPU_XOR_RSR(S,N,D) (0x40000189 | ((S & ((1 << 5) - 1)) << 16)\
3134 | ((N & ((1 << 5) - 1)) << 11)\
3135 | ((D & ((1 << 5) - 1)) << 21))
3136 -
3137 +
3138 #define MPU_XOR_RSS(S,N,D) (0x40000589 | ((S & ((1 << 5) - 1)) << 16)\
3139 | ((N & ((1 << 5) - 1)) << 11)\
3140 | ((D & ((1 << 5) - 1)) << 21))
3141 -
3142 +
3143 #define MPU_XOR_SRR(S,N,D) (0x40000289 | ((S & ((1 << 5) - 1)) << 16)\
3144 | ((N & ((1 << 5) - 1)) << 11)\
3145 | ((D & ((1 << 5) - 1)) << 21))
3146 -
3147 +
3148 #define MPU_XOR_SRS(S,N,D) (0x40000689 | ((S & ((1 << 5) - 1)) << 16)\
3149 | ((N & ((1 << 5) - 1)) << 11)\
3150 | ((D & ((1 << 5) - 1)) << 21))
3151 -
3152 +
3153 #define MPU_XOR_SSR(S,N,D) (0x40000389 | ((S & ((1 << 5) - 1)) << 16)\
3154 | ((N & ((1 << 5) - 1)) << 11)\
3155 | ((D & ((1 << 5) - 1)) << 21))
3156 -
3157 +
3158 #define MPU_XOR_SSS(S,N,D) (0x40000789 | ((S & ((1 << 5) - 1)) << 16)\
3159 | ((N & ((1 << 5) - 1)) << 11)\
3160 | ((D & ((1 << 5) - 1)) << 21))
3161 -
3162 +
3163 #define MPU_XOR_RR(S,D) (0x40000088 | ((S & ((1 << 5) - 1)) << 11)\
3164 | ((D & ((1 << 5) - 1)) << 21))
3165 -
3166 +
3167 #define MPU_XOR_RS(S,D) (0x40000488 | ((S & ((1 << 5) - 1)) << 11)\
3168 | ((D & ((1 << 5) - 1)) << 21))
3169 -
3170 +
3171 #define MPU_XOR_SR(S,D) (0x40000188 | ((S & ((1 << 5) - 1)) << 11)\
3172 | ((D & ((1 << 5) - 1)) << 21))
3173 -
3174 +
3175 #define MPU_XOR_SS(S,D) (0x40000588 | ((S & ((1 << 5) - 1)) << 11)\
3176 | ((D & ((1 << 5) - 1)) << 21))
3177 -
3178 +
3179 #define MPU_XORQ_RIR(S,N,D) (0x04000000 | ((S & ((1 << 5) - 1)) << 16)\
3180 | ((N & ((1 << 16) - 1)) << 0)\
3181 | ((D & ((1 << 5) - 1)) << 21))
3182 -
3183 +
3184 #define MPU_XORQ_IRR(S,N,D) (0x04000000 | ((S & ((1 << 16) - 1)) << 0)\
3185 | ((N & ((1 << 5) - 1)) << 16)\
3186 | ((D & ((1 << 5) - 1)) << 21))
3187 -
3188 +
3189 #define MPU_XORX_RIR_INSTR(S,N,D) (0xC0000089 | ((S & ((1 << 5) - 1)) << 16)\
3190 | ((D & ((1 << 5) - 1)) << 21))
3191 -
3192 +
3193 #define MPU_XORX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF)
3194
3195 #define MPU_XORX_IRR_INSTR(S,N,D) (0xC0000089 | ((N & ((1 << 5) - 1)) << 16)\
3196 | ((D & ((1 << 5) - 1)) << 21))
3197 -
3198 +
3199 #define MPU_XORX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF)
3200
3201 #define MPU_XORX_SIR_INSTR(S,N,D) (0xC0000289 | ((S & ((1 << 5) - 1)) << 16)\
3202 | ((D & ((1 << 5) - 1)) << 21))
3203 -
3204 +
3205 #define MPU_XORX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF)
3206
3207 #define MPU_XORX_ISR_INSTR(S,N,D) (0xC0000289 | ((N & ((1 << 5) - 1)) << 16)\
3208 | ((D & ((1 << 5) - 1)) << 21))
3209 -
3210 +
3211 #define MPU_XORX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF)
3212
3213 #define MPU_XORX_RIS_INSTR(S,N,D) (0xC0000489 | ((S & ((1 << 5) - 1)) << 16)\
3214 | ((D & ((1 << 5) - 1)) << 21))
3215 -
3216 +
3217 #define MPU_XORX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF)
3218
3219 #define MPU_XORX_IRS_INSTR(S,N,D) (0xC0000489 | ((N & ((1 << 5) - 1)) << 16)\
3220 | ((D & ((1 << 5) - 1)) << 21))
3221 -
3222 +
3223 #define MPU_XORX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF)
3224
3225 #define MPU_XORX_SIS_INSTR(S,N,D) (0xC0000689 | ((S & ((1 << 5) - 1)) << 16)\
3226 | ((D & ((1 << 5) - 1)) << 21))
3227 -
3228 +
3229 #define MPU_XORX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF)
3230
3231 #define MPU_XORX_ISS_INSTR(S,N,D) (0xC0000689 | ((N & ((1 << 5) - 1)) << 16)\
3232 | ((D & ((1 << 5) - 1)) << 21))
3233 -
3234 +
3235 #define MPU_XORX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF)
3236
3237
3238 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h
3239 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h 2007-01-10 20:10:37.000000000 +0100
3240 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h 2005-04-24 20:31:05.000000000 +0200
3241 @@ -1,5 +1,5 @@
3242 /* Autogenerated Changes here will be lost!
3243 - * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg
3244 + * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg
3245 */
3246 #define regi_iop_version (regi_iop + 0)
3247 #define regi_iop_fifo_in0_extra (regi_iop + 64)
3248 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h
3249 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h 2007-01-10 20:10:37.000000000 +0100
3250 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h 2005-04-24 20:31:05.000000000 +0200
3251 @@ -6,7 +6,7 @@
3252 * file: ../../inst/io_proc/rtl/iop_sap_in.r
3253 * id: <not found>
3254 * last modfied: Mon Apr 11 16:08:45 2005
3255 - *
3256 + *
3257 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sap_in_defs.h ../../inst/io_proc/rtl/iop_sap_in.r
3258 * id: $Id: iop_sap_in_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
3259 * Any changes here will be lost.
3260 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h
3261 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h 2007-01-10 20:10:37.000000000 +0100
3262 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h 2005-04-24 20:31:05.000000000 +0200
3263 @@ -6,7 +6,7 @@
3264 * file: ../../inst/io_proc/rtl/iop_sap_out.r
3265 * id: <not found>
3266 * last modfied: Mon Apr 11 16:08:46 2005
3267 - *
3268 + *
3269 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sap_out_defs.h ../../inst/io_proc/rtl/iop_sap_out.r
3270 * id: $Id: iop_sap_out_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
3271 * Any changes here will be lost.
3272 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h
3273 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h 2007-01-10 20:10:37.000000000 +0100
3274 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h 2005-04-24 20:31:05.000000000 +0200
3275 @@ -4,9 +4,9 @@
3276 /*
3277 * This file is autogenerated from
3278 * file: ../../inst/io_proc/rtl/iop_scrc_in.r
3279 - * id: iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp
3280 + * id: iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp
3281 * last modfied: Mon Apr 11 16:08:46 2005
3282 - *
3283 + *
3284 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_scrc_in_defs.h ../../inst/io_proc/rtl/iop_scrc_in.r
3285 * id: $Id: iop_scrc_in_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
3286 * Any changes here will be lost.
3287 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h
3288 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h 2007-01-10 20:10:37.000000000 +0100
3289 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h 2005-04-24 20:31:05.000000000 +0200
3290 @@ -4,9 +4,9 @@
3291 /*
3292 * This file is autogenerated from
3293 * file: ../../inst/io_proc/rtl/iop_scrc_out.r
3294 - * id: iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp
3295 + * id: iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp
3296 * last modfied: Mon Apr 11 16:08:46 2005
3297 - *
3298 + *
3299 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_scrc_out_defs.h ../../inst/io_proc/rtl/iop_scrc_out.r
3300 * id: $Id: iop_scrc_out_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
3301 * Any changes here will be lost.
3302 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h
3303 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h 2007-01-10 20:10:37.000000000 +0100
3304 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h 2005-04-24 20:31:05.000000000 +0200
3305 @@ -6,7 +6,7 @@
3306 * file: ../../inst/io_proc/rtl/iop_spu.r
3307 * id: <not found>
3308 * last modfied: Mon Apr 11 16:08:46 2005
3309 - *
3310 + *
3311 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_spu_defs.h ../../inst/io_proc/rtl/iop_spu.r
3312 * id: $Id: iop_spu_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
3313 * Any changes here will be lost.
3314 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h
3315 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h 2007-01-10 20:10:37.000000000 +0100
3316 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h 2005-04-24 20:31:05.000000000 +0200
3317 @@ -6,7 +6,7 @@
3318 * file: ../../inst/io_proc/rtl/guinness/iop_sw_cfg.r
3319 * id: <not found>
3320 * last modfied: Mon Apr 11 16:10:19 2005
3321 - *
3322 + *
3323 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_cfg_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_cfg.r
3324 * id: $Id: iop_sw_cfg_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
3325 * Any changes here will be lost.
3326 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h
3327 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h 2007-01-10 20:10:37.000000000 +0100
3328 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h 2005-04-24 20:31:05.000000000 +0200
3329 @@ -6,7 +6,7 @@
3330 * file: ../../inst/io_proc/rtl/guinness/iop_sw_cpu.r
3331 * id: <not found>
3332 * last modfied: Mon Apr 11 16:10:19 2005
3333 - *
3334 + *
3335 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_cpu_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_cpu.r
3336 * id: $Id: iop_sw_cpu_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
3337 * Any changes here will be lost.
3338 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h
3339 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h 2007-01-10 20:10:37.000000000 +0100
3340 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h 2005-04-24 20:31:05.000000000 +0200
3341 @@ -6,7 +6,7 @@
3342 * file: ../../inst/io_proc/rtl/guinness/iop_sw_mpu.r
3343 * id: <not found>
3344 * last modfied: Mon Apr 11 16:10:19 2005
3345 - *
3346 + *
3347 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_mpu_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_mpu.r
3348 * id: $Id: iop_sw_mpu_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
3349 * Any changes here will be lost.
3350 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h
3351 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h 2007-01-10 20:10:37.000000000 +0100
3352 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h 2005-04-24 20:31:05.000000000 +0200
3353 @@ -6,7 +6,7 @@
3354 * file: ../../inst/io_proc/rtl/guinness/iop_sw_spu.r
3355 * id: <not found>
3356 * last modfied: Mon Apr 11 16:10:19 2005
3357 - *
3358 + *
3359 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_spu_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_spu.r
3360 * id: $Id: iop_sw_spu_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
3361 * Any changes here will be lost.
3362 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h
3363 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h 2007-01-10 20:10:37.000000000 +0100
3364 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h 2005-04-24 20:31:05.000000000 +0200
3365 @@ -4,9 +4,9 @@
3366 /*
3367 * This file is autogenerated from
3368 * file: ../../inst/io_proc/rtl/iop_timer_grp.r
3369 - * id: iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp
3370 + * id: iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp
3371 * last modfied: Mon Apr 11 16:08:46 2005
3372 - *
3373 + *
3374 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_timer_grp_defs.h ../../inst/io_proc/rtl/iop_timer_grp.r
3375 * id: $Id: iop_timer_grp_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
3376 * Any changes here will be lost.
3377 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h
3378 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h 2007-01-10 20:10:37.000000000 +0100
3379 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h 2005-04-24 20:31:05.000000000 +0200
3380 @@ -4,9 +4,9 @@
3381 /*
3382 * This file is autogenerated from
3383 * file: ../../inst/io_proc/rtl/iop_trigger_grp.r
3384 - * id: iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp
3385 + * id: iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp
3386 * last modfied: Mon Apr 11 16:08:46 2005
3387 - *
3388 + *
3389 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_trigger_grp_defs.h ../../inst/io_proc/rtl/iop_trigger_grp.r
3390 * id: $Id: iop_trigger_grp_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
3391 * Any changes here will be lost.
3392 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h
3393 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h 2007-01-10 20:10:37.000000000 +0100
3394 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h 2005-04-24 20:31:05.000000000 +0200
3395 @@ -4,9 +4,9 @@
3396 /*
3397 * This file is autogenerated from
3398 * file: ../../inst/io_proc/rtl/guinness/iop_version.r
3399 - * id: iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp
3400 + * id: iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp
3401 * last modfied: Mon Apr 11 16:08:44 2005
3402 - *
3403 + *
3404 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_version_defs.h ../../inst/io_proc/rtl/guinness/iop_version.r
3405 * id: $Id: iop_version_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
3406 * Any changes here will be lost.
3407 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h
3408 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h 2007-01-10 20:10:37.000000000 +0100
3409 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h 2005-04-24 20:30:58.000000000 +0200
3410 @@ -6,7 +6,7 @@
3411 * file: ../../mod/irq_nmi.r
3412 * id: <not found>
3413 * last modfied: Thu Jan 22 09:22:43 2004
3414 - *
3415 + *
3416 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile irq_nmi_defs.h ../../mod/irq_nmi.r
3417 * id: $Id: irq_nmi_defs.h,v 1.1 2005/04/24 18:30:58 starvik Exp $
3418 * Any changes here will be lost.
3419 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h
3420 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h 2007-01-10 20:10:37.000000000 +0100
3421 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h 2004-06-04 09:15:33.000000000 +0200
3422 @@ -6,7 +6,7 @@
3423 * file: ../../inst/memarb/rtl/guinness/marb_top.r
3424 * id: <not found>
3425 * last modfied: Fri Nov 7 15:36:04 2003
3426 - *
3427 + *
3428 * by /n/asic/projects/guinness/design/top/inst/rdesc/rdes2c ../../rtl/global.rmap ../../mod/modreg.rmap -base 0xb0000000 ../../inst/memarb/rtl/guinness/marb_top.r
3429 * id: $Id: marb_bp_defs.h,v 1.2 2004/06/04 07:15:33 starvik Exp $
3430 * Any changes here will be lost.
3431 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/marb_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/marb_defs.h
3432 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/marb_defs.h 2007-01-10 20:10:37.000000000 +0100
3433 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/marb_defs.h 2005-04-24 20:30:58.000000000 +0200
3434 @@ -6,7 +6,7 @@
3435 * file: ../../inst/memarb/rtl/guinness/marb_top.r
3436 * id: <not found>
3437 * last modfied: Mon Apr 11 16:12:16 2005
3438 - *
3439 + *
3440 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile marb_defs.h ../../inst/memarb/rtl/guinness/marb_top.r
3441 * id: $Id: marb_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $
3442 * Any changes here will be lost.
3443 @@ -265,7 +265,7 @@
3444 * file: ../../inst/memarb/rtl/guinness/marb_top.r
3445 * id: <not found>
3446 * last modfied: Mon Apr 11 16:12:16 2005
3447 - *
3448 + *
3449 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile marb_defs.h ../../inst/memarb/rtl/guinness/marb_top.r
3450 * id: $Id: marb_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $
3451 * Any changes here will be lost.
3452 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/pinmux_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/pinmux_defs.h
3453 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/pinmux_defs.h 2007-01-10 20:10:37.000000000 +0100
3454 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/pinmux_defs.h 2005-04-24 20:30:58.000000000 +0200
3455 @@ -4,9 +4,9 @@
3456 /*
3457 * This file is autogenerated from
3458 * file: ../../inst/pinmux/rtl/guinness/pinmux_regs.r
3459 - * id: pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp
3460 + * id: pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp
3461 * last modfied: Mon Apr 11 16:09:11 2005
3462 - *
3463 + *
3464 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile pinmux_defs.h ../../inst/pinmux/rtl/guinness/pinmux_regs.r
3465 * id: $Id: pinmux_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $
3466 * Any changes here will be lost.
3467 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/reg_map.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/reg_map.h
3468 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/reg_map.h 2007-01-10 20:10:37.000000000 +0100
3469 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/reg_map.h 2005-04-24 20:30:58.000000000 +0200
3470 @@ -4,17 +4,17 @@
3471 /*
3472 * This file is autogenerated from
3473 * file: ../../mod/fakereg.rmap
3474 - * id: fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp
3475 + * id: fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp
3476 * last modified: Wed Feb 11 20:53:25 2004
3477 * file: ../../rtl/global.rmap
3478 - * id: global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp
3479 + * id: global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp
3480 * last modified: Mon Aug 18 17:08:23 2003
3481 * file: ../../mod/modreg.rmap
3482 - * id: modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp
3483 + * id: modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp
3484 * last modified: Fri Feb 20 16:40:04 2004
3485 - *
3486 + *
3487 * by /n/asic/design/tools/rdesc/src/rdes2c -map -base 0xb0000000 ../../rtl/global.rmap ../../mod/modreg.rmap ../../inst/io_proc/rtl/guinness/iop_top.r ../../inst/memarb/rtl/guinness/marb_top.r ../../mod/fakereg.rmap
3488 - * id: $Id: reg_map.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
3489 + * id: $Id: reg_map.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
3490 * Any changes here will be lost.
3491 *
3492 * -*- buffer-read-only: t -*-
3493 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h
3494 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h 2007-01-10 20:10:37.000000000 +0100
3495 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h 2005-04-24 20:30:58.000000000 +0200
3496 @@ -4,9 +4,9 @@
3497 /*
3498 * This file is autogenerated from
3499 * file: ../../inst/rt_trace/rtl/rt_regs.r
3500 - * id: rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp
3501 + * id: rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp
3502 * last modfied: Mon Apr 11 16:09:14 2005
3503 - *
3504 + *
3505 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile rt_trace_defs.h ../../inst/rt_trace/rtl/rt_regs.r
3506 * id: $Id: rt_trace_defs.h,v 1.1 2005/04/24 18:30:58 starvik Exp $
3507 * Any changes here will be lost.
3508 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/ser_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/ser_defs.h
3509 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/ser_defs.h 2007-01-10 20:10:37.000000000 +0100
3510 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/ser_defs.h 2005-04-24 20:30:58.000000000 +0200
3511 @@ -4,9 +4,9 @@
3512 /*
3513 * This file is autogenerated from
3514 * file: ../../inst/ser/rtl/ser_regs.r
3515 - * id: ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp
3516 + * id: ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp
3517 * last modfied: Mon Apr 11 16:09:21 2005
3518 - *
3519 + *
3520 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile ser_defs.h ../../inst/ser/rtl/ser_regs.r
3521 * id: $Id: ser_defs.h,v 1.10 2005/04/24 18:30:58 starvik Exp $
3522 * Any changes here will be lost.
3523 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/sser_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/sser_defs.h
3524 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/sser_defs.h 2007-01-10 20:10:37.000000000 +0100
3525 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/sser_defs.h 2005-04-24 20:30:58.000000000 +0200
3526 @@ -4,9 +4,9 @@
3527 /*
3528 * This file is autogenerated from
3529 * file: ../../inst/syncser/rtl/sser_regs.r
3530 - * id: sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp
3531 + * id: sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp
3532 * last modfied: Mon Apr 11 16:09:48 2005
3533 - *
3534 + *
3535 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile sser_defs.h ../../inst/syncser/rtl/sser_regs.r
3536 * id: $Id: sser_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $
3537 * Any changes here will be lost.
3538 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strcop.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strcop.h
3539 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strcop.h 2007-01-10 20:10:37.000000000 +0100
3540 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strcop.h 2003-10-22 15:27:12.000000000 +0200
3541 @@ -54,4 +54,4 @@
3542 hash_iv = 1
3543 };
3544
3545 -
3546 +
3547 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strcop_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strcop_defs.h
3548 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strcop_defs.h 2007-01-10 20:10:37.000000000 +0100
3549 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strcop_defs.h 2005-04-24 20:30:58.000000000 +0200
3550 @@ -4,9 +4,9 @@
3551 /*
3552 * This file is autogenerated from
3553 * file: ../../inst/strcop/rtl/strcop_regs.r
3554 - * id: strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp
3555 + * id: strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp
3556 * last modfied: Mon Apr 11 16:09:38 2005
3557 - *
3558 + *
3559 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile strcop_defs.h ../../inst/strcop/rtl/strcop_regs.r
3560 * id: $Id: strcop_defs.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
3561 * Any changes here will be lost.
3562 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strmux_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strmux_defs.h
3563 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strmux_defs.h 2007-01-10 20:10:37.000000000 +0100
3564 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strmux_defs.h 2005-04-24 20:30:58.000000000 +0200
3565 @@ -4,9 +4,9 @@
3566 /*
3567 * This file is autogenerated from
3568 * file: ../../inst/strmux/rtl/guinness/strmux_regs.r
3569 - * id: strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp
3570 + * id: strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp
3571 * last modfied: Mon Apr 11 16:09:43 2005
3572 - *
3573 + *
3574 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile strmux_defs.h ../../inst/strmux/rtl/guinness/strmux_regs.r
3575 * id: $Id: strmux_defs.h,v 1.5 2005/04/24 18:30:58 starvik Exp $
3576 * Any changes here will be lost.
3577 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/supp_reg.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/supp_reg.h
3578 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/supp_reg.h 2007-01-10 20:10:37.000000000 +0100
3579 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/supp_reg.h 2004-12-17 11:23:03.000000000 +0100
3580 @@ -37,7 +37,7 @@
3581 #define RW_MM_TLB_HI 6
3582 #define RW_MM_TLB_PGD 7
3583
3584 -#define BANK_GC 0
3585 +#define BANK_GC 0
3586 #define BANK_IM 1
3587 #define BANK_DM 2
3588 #define BANK_BP 3
3589 @@ -63,7 +63,7 @@
3590 SPEC_REG_WR(SPEC_REG_SRS,b); \
3591 NOP(); \
3592 NOP(); \
3593 - NOP();
3594 + NOP();
3595
3596 #define SUPP_REG_WR(r,v) \
3597 __asm__ __volatile__ ("move %0, $S" STRINGIFYFY(r) "\n\t" \
3598 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/timer_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/timer_defs.h
3599 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/timer_defs.h 2007-01-10 20:10:37.000000000 +0100
3600 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/timer_defs.h 2005-04-24 20:30:58.000000000 +0200
3601 @@ -4,9 +4,9 @@
3602 /*
3603 * This file is autogenerated from
3604 * file: ../../inst/timer/rtl/timer_regs.r
3605 - * id: timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp
3606 + * id: timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp
3607 * last modfied: Mon Apr 11 16:09:53 2005
3608 - *
3609 + *
3610 * by /n/asic/design/tools/rdesc/src/rdes2c --outfile timer_defs.h ../../inst/timer/rtl/timer_regs.r
3611 * id: $Id: timer_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $
3612 * Any changes here will be lost.
3613 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/ide.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/ide.h
3614 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/ide.h 2007-01-10 20:10:37.000000000 +0100
3615 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/ide.h 2005-08-23 11:44:37.000000000 +0200
3616 @@ -33,7 +33,7 @@
3617 * together in a hwgroup, and will serialize accesses. this is good, because
3618 * we can't access more than one interface at the same time on ETRAX100.
3619 */
3620 - return ATA_INTR_VECT;
3621 + return ATA_INTR_VECT;
3622 }
3623
3624 static inline unsigned long ide_default_io_base(int index)
3625 @@ -44,7 +44,7 @@
3626 * so we can use the io_base to remember that bitfield.
3627 */
3628 ctrl2.sel = index;
3629 -
3630 +
3631 return REG_TYPE_CONV(unsigned long, reg_ata_rw_ctrl2, ctrl2);
3632 }
3633
3634 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/io.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/io.h
3635 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/io.h 2007-01-10 20:10:37.000000000 +0100
3636 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/io.h 2006-12-06 14:17:02.000000000 +0100
3637 @@ -1,6 +1,7 @@
3638 #ifndef _ASM_ARCH_CRIS_IO_H
3639 #define _ASM_ARCH_CRIS_IO_H
3640
3641 +#include <linux/spinlock.h>
3642 #include <asm/arch/hwregs/reg_map.h>
3643 #include <asm/arch/hwregs/reg_rdwr.h>
3644 #include <asm/arch/hwregs/gio_defs.h>
3645 @@ -13,10 +14,11 @@
3646
3647 struct crisv32_ioport
3648 {
3649 - unsigned long* oe;
3650 - unsigned long* data;
3651 - unsigned long* data_in;
3652 + volatile unsigned long* oe;
3653 + volatile unsigned long* data;
3654 + volatile unsigned long* data_in;
3655 unsigned int pin_count;
3656 + spinlock_t lock;
3657 };
3658
3659 struct crisv32_iopin
3660 @@ -34,22 +36,37 @@
3661 extern struct crisv32_iopin crisv32_led3_green;
3662 extern struct crisv32_iopin crisv32_led3_red;
3663
3664 +extern struct crisv32_iopin crisv32_led_net0_green;
3665 +extern struct crisv32_iopin crisv32_led_net0_red;
3666 +extern struct crisv32_iopin crisv32_led_net1_green;
3667 +extern struct crisv32_iopin crisv32_led_net1_red;
3668 +
3669 static inline void crisv32_io_set(struct crisv32_iopin* iopin,
3670 int val)
3671 {
3672 + long flags;
3673 + spin_lock_irqsave(&iopin->port->lock, flags);
3674 +
3675 if (val)
3676 *iopin->port->data |= iopin->bit;
3677 else
3678 *iopin->port->data &= ~iopin->bit;
3679 +
3680 + spin_unlock_irqrestore(&iopin->port->lock, flags);
3681 }
3682
3683 static inline void crisv32_io_set_dir(struct crisv32_iopin* iopin,
3684 enum crisv32_io_dir dir)
3685 {
3686 + long flags;
3687 + spin_lock_irqsave(&iopin->port->lock, flags);
3688 +
3689 if (dir == crisv32_io_dir_in)
3690 *iopin->port->oe &= ~iopin->bit;
3691 else
3692 *iopin->port->oe |= iopin->bit;
3693 +
3694 + spin_unlock_irqrestore(&iopin->port->lock, flags);
3695 }
3696
3697 static inline int crisv32_io_rd(struct crisv32_iopin* iopin)
3698 @@ -60,28 +77,51 @@
3699 int crisv32_io_get(struct crisv32_iopin* iopin,
3700 unsigned int port, unsigned int pin);
3701 int crisv32_io_get_name(struct crisv32_iopin* iopin,
3702 - char* name);
3703 + const char* name);
3704
3705 #define LED_OFF 0x00
3706 #define LED_GREEN 0x01
3707 #define LED_RED 0x02
3708 #define LED_ORANGE (LED_GREEN | LED_RED)
3709
3710 -#define LED_NETWORK_SET(x) \
3711 - do { \
3712 - LED_NETWORK_SET_G((x) & LED_GREEN); \
3713 - LED_NETWORK_SET_R((x) & LED_RED); \
3714 +#if (defined(CONFIG_ETRAX_NBR_LED_GRP_ONE) || defined(CONFIG_ETRAX_NBR_LED_GRP_TWO))
3715 +#define LED_NETWORK_GRP0_SET(x) \
3716 + do { \
3717 + LED_NETWORK_GRP0_SET_G((x) & LED_GREEN); \
3718 + LED_NETWORK_GRP0_SET_R((x) & LED_RED); \
3719 } while (0)
3720 +#else
3721 +#define LED_NETWORK_GRP0_SET(x) while (0) {}
3722 +#endif
3723 +
3724 +#define LED_NETWORK_GRP0_SET_G(x) \
3725 + crisv32_io_set(&crisv32_led_net0_green, !(x));
3726 +
3727 +#define LED_NETWORK_GRP0_SET_R(x) \
3728 + crisv32_io_set(&crisv32_led_net0_red, !(x));
3729 +
3730 +#if defined(CONFIG_ETRAX_NBR_LED_GRP_TWO)
3731 +#define LED_NETWORK_GRP1_SET(x) \
3732 + do { \
3733 + LED_NETWORK_GRP1_SET_G((x) & LED_GREEN); \
3734 + LED_NETWORK_GRP1_SET_R((x) & LED_RED); \
3735 + } while (0)
3736 +#else
3737 +#define LED_NETWORK_GRP1_SET(x) while (0) {}
3738 +#endif
3739 +
3740 +#define LED_NETWORK_GRP1_SET_G(x) \
3741 + crisv32_io_set(&crisv32_led_net1_green, !(x));
3742 +
3743 +#define LED_NETWORK_GRP1_SET_R(x) \
3744 + crisv32_io_set(&crisv32_led_net1_red, !(x));
3745 +
3746 #define LED_ACTIVE_SET(x) \
3747 do { \
3748 LED_ACTIVE_SET_G((x) & LED_GREEN); \
3749 LED_ACTIVE_SET_R((x) & LED_RED); \
3750 } while (0)
3751
3752 -#define LED_NETWORK_SET_G(x) \
3753 - crisv32_io_set(&crisv32_led1_green, !(x));
3754 -#define LED_NETWORK_SET_R(x) \
3755 - crisv32_io_set(&crisv32_led1_red, !(x));
3756 #define LED_ACTIVE_SET_G(x) \
3757 crisv32_io_set(&crisv32_led2_green, !(x));
3758 #define LED_ACTIVE_SET_R(x) \
3759 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/irq.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/irq.h
3760 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/irq.h 2007-01-10 20:10:37.000000000 +0100
3761 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/irq.h 2006-10-13 14:45:18.000000000 +0200
3762 @@ -50,7 +50,7 @@
3763 #define IRQ_NAME2(nr) nr##_interrupt(void)
3764 #define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr)
3765
3766 -/*
3767 +/*
3768 * The reason for setting the S-bit when debugging the kernel is that we want
3769 * hardware breakpoints to remain active while we are in an exception handler.
3770 * Note that we cannot simply copy S1, since we may come here from user-space,
3771 @@ -86,7 +86,7 @@
3772 "moveq 1, $r11\n\t" \
3773 "jump ret_from_intr\n\t" \
3774 "nop\n\t");
3775 -/*
3776 +/*
3777 * This is subtle. The timer interrupt is crucial and it should not be disabled
3778 * for too long. However, if it had been a normal interrupt as per BUILD_IRQ, it
3779 * would have been BLOCK'ed, and then softirq's are run before we return here to
3780 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/juliette.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/juliette.h
3781 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/juliette.h 2007-01-10 20:10:37.000000000 +0100
3782 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/juliette.h 2004-06-09 11:20:19.000000000 +0200
3783 @@ -166,7 +166,7 @@
3784 #define PA_NULL 0x3fff /* CCD/VIDEO */
3785
3786 typedef enum {
3787 - jpeg = 0,
3788 + jpeg = 0,
3789 dummy = 1
3790 } request_type;
3791
3792 @@ -176,8 +176,8 @@
3793 halfsize = 2,
3794 fieldsize = 3
3795 } size_type;
3796 -
3797 -typedef enum {
3798 +
3799 +typedef enum {
3800 min = 0,
3801 low = 1,
3802 medium = 2,
3803 @@ -192,14 +192,14 @@
3804 q6 = 11
3805 } compr_type;
3806
3807 -typedef enum {
3808 +typedef enum {
3809 deg_0 = 0,
3810 deg_180 = 1,
3811 deg_90 = 2,
3812 deg_270 = 3
3813 } rotation_type;
3814
3815 -typedef enum {
3816 +typedef enum {
3817 auto_white = 0,
3818 hold = 1,
3819 fixed_outdoor = 2,
3820 @@ -207,12 +207,12 @@
3821 fixed_fluor = 4
3822 } white_balance_type;
3823
3824 -typedef enum {
3825 +typedef enum {
3826 auto_exp = 0,
3827 fixed_exp = 1
3828 } exposure_type;
3829
3830 -typedef enum {
3831 +typedef enum {
3832 no_window = 0,
3833 center = 1,
3834 top = 2,
3835 @@ -242,7 +242,7 @@
3836 right_align = 2
3837 } alignment_type;
3838
3839 -typedef enum {
3840 +typedef enum {
3841 off = 0,
3842 on = 1,
3843 no = 0,
3844 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/mmu.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/mmu.h
3845 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/mmu.h 2007-01-10 20:10:37.000000000 +0100
3846 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/mmu.h 2004-11-23 19:36:19.000000000 +0100
3847 @@ -34,7 +34,7 @@
3848 * +-----+------+--------+-------+--------+-------+---------+
3849 */
3850
3851 -/*
3852 +/*
3853 * Defines for accessing the bits. Also define some synonyms for use with
3854 * the software-based defined bits below.
3855 */
3856 @@ -46,7 +46,7 @@
3857 #define _PAGE_SILENT_READ (1 << 3) /* Same as above. */
3858 #define _PAGE_GLOBAL (1 << 4) /* Global page. */
3859
3860 -/*
3861 +/*
3862 * The hardware doesn't care about these bits, but the kernel uses them in
3863 * software.
3864 */
3865 @@ -84,9 +84,9 @@
3866
3867 #define _KERNPG_TABLE (_PAGE_TABLE | _PAGE_KERNEL)
3868
3869 -/* CRISv32 can do page protection for execute.
3870 +/* CRISv32 can do page protection for execute.
3871 * Write permissions imply read permissions.
3872 - * Note that the numbers are in Execute-Write-Read order!
3873 + * Note that the numbers are in Execute-Write-Read order!
3874 */
3875 #define __P000 PAGE_NONE
3876 #define __P001 PAGE_READONLY
3877 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/offset.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/offset.h
3878 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/offset.h 2007-01-10 20:10:37.000000000 +0100
3879 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/offset.h 2005-08-29 09:36:28.000000000 +0200
3880 @@ -27,7 +27,7 @@
3881 #define THREAD_usp 4 /* offsetof(struct thread_struct, usp) */
3882 #define THREAD_ccs 8 /* offsetof(struct thread_struct, ccs) */
3883
3884 -#define TASK_pid 149 /* offsetof(struct task_struct, pid) */
3885 +#define TASK_pid 151 /* offsetof(struct task_struct, pid) */
3886
3887 #define LCLONE_VM 256 /* CLONE_VM */
3888 #define LCLONE_UNTRACED 8388608 /* CLONE_UNTRACED */
3889 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/page.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/page.h
3890 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/page.h 2007-01-10 20:10:37.000000000 +0100
3891 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/page.h 2006-10-13 14:45:18.000000000 +0200
3892 @@ -11,7 +11,7 @@
3893 * selected bit it's possible to convert between KSEG_x and 0x40000000 where the
3894 * DRAM really resides. DRAM is virtually at 0xc.
3895 */
3896 -#ifndef CONFIG_ETRAXFS_SIM
3897 +#ifndef CONFIG_ETRAXFS_SIM
3898 #define __pa(x) ((unsigned long)(x) & 0x7fffffff)
3899 #define __va(x) ((void *)((unsigned long)(x) | 0x80000000))
3900 #else
3901 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/pinmux.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/pinmux.h
3902 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/pinmux.h 2007-01-10 20:10:37.000000000 +0100
3903 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/pinmux.h 2005-07-02 14:30:13.000000000 +0200
3904 @@ -1,7 +1,7 @@
3905 #ifndef _ASM_CRIS_ARCH_PINMUX_H
3906 #define _ASM_CRIS_ARCH_PINMUX_H
3907
3908 -#define PORT_B 0
3909 +#define PORT_B 0
3910 #define PORT_C 1
3911 #define PORT_D 2
3912 #define PORT_E 3
3913 @@ -34,6 +34,7 @@
3914 int crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode);
3915 int crisv32_pinmux_alloc_fixed(enum fixed_function function);
3916 int crisv32_pinmux_dealloc(int port, int first_pin, int last_pin);
3917 +int crisv32_pinmux_dealloc_fixed(enum fixed_function function);
3918 void crisv32_pinmux_dump(void);
3919
3920 #endif
3921 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/processor.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/processor.h
3922 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/processor.h 2007-01-10 20:10:37.000000000 +0100
3923 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/processor.h 2006-10-13 14:45:18.000000000 +0200
3924 @@ -19,7 +19,7 @@
3925 unsigned long ccs; /* Saved flags register. */
3926 };
3927
3928 -/*
3929 +/*
3930 * User-space process size. This is hardcoded into a few places, so don't
3931 * changed it unless everything's clear!
3932 */
3933 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/ptrace.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/ptrace.h
3934 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/ptrace.h 2007-01-10 20:10:37.000000000 +0100
3935 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/ptrace.h 2004-10-21 13:51:21.000000000 +0200
3936 @@ -49,7 +49,7 @@
3937 #define CCS_SHIFT 10 /* Shift count for each level in CCS */
3938
3939 /* pt_regs not only specifices the format in the user-struct during
3940 - * ptrace but is also the frame format used in the kernel prologue/epilogues
3941 + * ptrace but is also the frame format used in the kernel prologue/epilogues
3942 * themselves
3943 */
3944
3945 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/spinlock.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/spinlock.h
3946 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/spinlock.h 2007-01-10 20:10:37.000000000 +0100
3947 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/spinlock.h 2007-01-09 10:31:32.000000000 +0100
3948 @@ -19,7 +19,7 @@
3949 __asm__ volatile ("move.d %1,%0" \
3950 : "=m" (lock->lock) \
3951 : "r" (1) \
3952 - : "memory");
3953 + : "memory");
3954 }
3955
3956 static inline int _raw_spin_trylock(spinlock_t *lock)
3957 @@ -80,7 +80,7 @@
3958 {
3959 unsigned long flags;
3960 local_irq_save(flags);
3961 - _raw_spin_lock(&rw->lock);
3962 + _raw_spin_lock(&rw->lock);
3963
3964 rw->counter++;
3965
3966 @@ -92,7 +92,7 @@
3967 {
3968 unsigned long flags;
3969 local_irq_save(flags);
3970 - _raw_spin_lock(&rw->lock);
3971 + _raw_spin_lock(&rw->lock);
3972
3973 rw->counter--;
3974
3975 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/system.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/system.h
3976 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/system.h 2007-01-10 20:10:37.000000000 +0100
3977 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/system.h 2006-10-13 14:45:18.000000000 +0200
3978 @@ -39,7 +39,7 @@
3979 #define xchg(ptr,x) \
3980 ((__typeof__(*(ptr)))__xchg((unsigned long) (x),(ptr),sizeof(*(ptr))))
3981
3982 -#define tas(ptr) (xchg((ptr),1))
3983 +#define tas(ptr) (xchg((ptr),1))
3984
3985 struct __xchg_dummy { unsigned long a[100]; };
3986 #define __xg(x) ((struct __xchg_dummy *)(x))
3987 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/timex.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/timex.h
3988 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/timex.h 2007-01-10 20:10:37.000000000 +0100
3989 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/timex.h 2005-08-23 11:44:37.000000000 +0200
3990 @@ -6,8 +6,8 @@
3991 #include <asm/arch/hwregs/timer_defs.h>
3992
3993 /*
3994 - * The clock runs at 100MHz, we divide it by 1000000. If you change anything
3995 - * here you must check time.c as well.
3996 + * The clock runs at 100MHz, we divide it by 1000000. If you change anything
3997 + * here you must check time.c as well.
3998 */
3999
4000 #define CLOCK_TICK_RATE 100000000 /* Underlying frequency of the HZ timer */
4001 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/tlb.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/tlb.h
4002 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/tlb.h 2007-01-10 20:10:37.000000000 +0100
4003 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/tlb.h 2003-07-02 11:29:45.000000000 +0200
4004 @@ -2,8 +2,8 @@
4005 #define _CRIS_ARCH_TLB_H
4006
4007 /*
4008 - * The TLB is a 64-entry cache. Each entry has a 8-bit page_id that is used
4009 - * to store the "process" it belongs to (=> fast mm context switch). The
4010 + * The TLB is a 64-entry cache. Each entry has a 8-bit page_id that is used
4011 + * to store the "process" it belongs to (=> fast mm context switch). The
4012 * last page_id is never used so we can make TLB entries that never matches.
4013 */
4014 #define NUM_TLB_ENTRIES 64
4015 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/uaccess.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/uaccess.h
4016 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/uaccess.h 2007-01-10 20:10:37.000000000 +0100
4017 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/uaccess.h 2006-01-04 07:13:04.000000000 +0100
4018 @@ -1,4 +1,4 @@
4019 -/*
4020 +/*
4021 * Authors: Hans-Peter Nilsson (hp@axis.com)
4022 *
4023 */
4024 diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/unistd.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/unistd.h
4025 --- linux-2.6.19.2.old/include/asm-cris/arch-v32/unistd.h 2007-01-10 20:10:37.000000000 +0100
4026 +++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/unistd.h 2005-10-31 09:50:44.000000000 +0100
4027 @@ -16,7 +16,8 @@
4028 ".endif\n\t" \
4029 "break 13" \
4030 : "=r" (__a) \
4031 - : "r" (__n_)); \
4032 + : "r" (__n_) \
4033 + : "memory"); \
4034 if (__a >= 0) \
4035 return (type) __a; \
4036 errno = -__a; \
4037 @@ -33,7 +34,8 @@
4038 ".endif\n\t" \
4039 "break 13" \
4040 : "=r" (__a) \
4041 - : "r" (__n_), "0" (__a)); \
4042 + : "r" (__n_), "0" (__a) \
4043 + : "memory"); \
4044 if (__a >= 0) \
4045 return (type) __a; \
4046 errno = -__a; \
4047 @@ -51,7 +53,8 @@
4048 ".endif\n\t" \
4049 "break 13" \
4050 : "=r" (__a) \
4051 - : "r" (__n_), "0" (__a), "r" (__b)); \
4052 + : "r" (__n_), "0" (__a), "r" (__b) \
4053 + : "memory"); \
4054 if (__a >= 0) \
4055 return (type) __a; \
4056 errno = -__a; \
4057 @@ -70,7 +73,8 @@
4058 ".endif\n\t" \
4059 "break 13" \
4060 : "=r" (__a) \
4061 - : "r" (__n_), "0" (__a), "r" (__b), "r" (__c)); \
4062 + : "r" (__n_), "0" (__a), "r" (__b), "r" (__c) \
4063 + : "memory"); \
4064 if (__a >= 0) \
4065 return (type) __a; \
4066 errno = -__a; \
4067 @@ -91,12 +95,13 @@
4068 "break 13" \
4069 : "=r" (__a) \
4070 : "r" (__n_), "0" (__a), "r" (__b), \
4071 - "r" (__c), "r" (__d)); \
4072 + "r" (__c), "r" (__d)\
4073 + : "memory"); \
4074 if (__a >= 0) \
4075 return (type) __a; \
4076 errno = -__a; \
4077 return (type) -1; \
4078 -}
4079 +}
4080
4081 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
4082 type5,arg5) \
4083 @@ -114,7 +119,8 @@
4084 "break 13" \
4085 : "=r" (__a) \
4086 : "r" (__n_), "0" (__a), "r" (__b), \
4087 - "r" (__c), "r" (__d), "h" (__e)); \
4088 + "r" (__c), "r" (__d), "h" (__e) \
4089 + : "memory"); \
4090 if (__a >= 0) \
4091 return (type) __a; \
4092 errno = -__a; \
4093 @@ -138,7 +144,8 @@
4094 "break 13" \
4095 : "=r" (__a) \
4096 : "r" (__n_), "0" (__a), "r" (__b), \
4097 - "r" (__c), "r" (__d), "h" (__e), "x" (__f)); \
4098 + "r" (__c), "r" (__d), "h" (__e), "x" (__f) \
4099 + : "memory"); \
4100 if (__a >= 0) \
4101 return (type) __a; \
4102 errno = -__a; \
4103 diff -urN linux-2.6.19.2.old/include/asm-cris/atomic.h linux-2.6.19.2.dev/include/asm-cris/atomic.h
4104 --- linux-2.6.19.2.old/include/asm-cris/atomic.h 2007-01-10 20:10:37.000000000 +0100
4105 +++ linux-2.6.19.2.dev/include/asm-cris/atomic.h 2006-07-03 15:11:43.000000000 +0200
4106 @@ -5,6 +5,7 @@
4107
4108 #include <asm/system.h>
4109 #include <asm/arch/atomic.h>
4110 +#include <linux/compiler.h>
4111
4112 /*
4113 * Atomic operations that C can't guarantee us. Useful for
4114 @@ -89,7 +90,7 @@
4115 unsigned long flags;
4116 int retval;
4117 cris_atomic_save(v, flags);
4118 - retval = (v->counter)++;
4119 + retval = ++(v->counter);
4120 cris_atomic_restore(v, flags);
4121 return retval;
4122 }
4123 @@ -99,7 +100,7 @@
4124 unsigned long flags;
4125 int retval;
4126 cris_atomic_save(v, flags);
4127 - retval = (v->counter)--;
4128 + retval = --(v->counter);
4129 cris_atomic_restore(v, flags);
4130 return retval;
4131 }
4132 diff -urN linux-2.6.19.2.old/include/asm-cris/axisflashmap.h linux-2.6.19.2.dev/include/asm-cris/axisflashmap.h
4133 --- linux-2.6.19.2.old/include/asm-cris/axisflashmap.h 2007-01-10 20:10:37.000000000 +0100
4134 +++ linux-2.6.19.2.dev/include/asm-cris/axisflashmap.h 2006-09-07 14:24:25.000000000 +0200
4135 @@ -15,18 +15,18 @@
4136 /* The partitiontable_head is located at offset +10: */
4137 struct partitiontable_head {
4138 __u16 magic; /* PARTITION_TABLE_MAGIC */
4139 - __u16 size; /* Length of ptable block (not header) */
4140 - __u32 checksum; /* simple longword sum */
4141 + __u16 size; /* Length of ptable block (entries + end marker) */
4142 + __u32 checksum; /* simple longword sum, over entries + end marker */
4143 };
4144
4145 /* And followed by partition table entries */
4146 struct partitiontable_entry {
4147 - __u32 offset; /* Offset is relative to the sector the ptable is in */
4148 - __u32 size;
4149 + __u32 offset; /* relative to the sector the ptable is in */
4150 + __u32 size; /* in bytes */
4151 __u32 checksum; /* simple longword sum */
4152 - __u16 type;
4153 - __u16 flags; /* bit 0: ro/rw = 1/0 */
4154 - __u32 future0; /* 16 bytes reserved for future use */
4155 + __u16 type; /* see type codes below */
4156 + __u16 flags; /* bit 0: ro/rw = 1/0 */
4157 + __u32 future0; /* 16 bytes reserved for future use */
4158 __u32 future1;
4159 __u32 future2;
4160 __u32 future3;
4161 @@ -35,10 +35,25 @@
4162 #define PARTITIONTABLE_END_MARKER 0xFFFFFFFF
4163 #define PARTITIONTABLE_END_MARKER_SIZE 4
4164
4165 -/*#define PARTITION_TYPE_RESCUE 0x0000?*/ /* Not used, maybe it should? */
4166 +#define PARTITIONTABLE_END_PAD 10
4167 +
4168 +/* Complete structure for whole partition table */
4169 +/* note that table may end before CONFIG_ETRAX_PTABLE_ENTRIES by setting
4170 + * offset of the last entry + 1 to PARTITIONTABLE_END_MARKER.
4171 + */
4172 +struct partitiontable {
4173 + __u8 skip[PARTITION_TABLE_OFFSET];
4174 + struct partitiontable_head head;
4175 + struct partitiontable_entry entries[];
4176 +};
4177 +
4178 #define PARTITION_TYPE_PARAM 0x0001
4179 #define PARTITION_TYPE_KERNEL 0x0002
4180 #define PARTITION_TYPE_JFFS 0x0003
4181 +#define PARTITION_TYPE_JFFS2 0x0000
4182 +
4183 +#define PARTITION_FLAGS_READONLY_MASK 0x0001
4184 +#define PARTITION_FLAGS_READONLY 0x0001
4185
4186 /* The master mtd for the entire flash. */
4187 extern struct mtd_info* axisflash_mtd;
4188 diff -urN linux-2.6.19.2.old/include/asm-cris/bitops.h linux-2.6.19.2.dev/include/asm-cris/bitops.h
4189 --- linux-2.6.19.2.old/include/asm-cris/bitops.h 2007-01-10 20:10:37.000000000 +0100
4190 +++ linux-2.6.19.2.dev/include/asm-cris/bitops.h 2007-01-09 10:31:32.000000000 +0100
4191 @@ -155,7 +155,7 @@
4192 #include <asm-generic/bitops/hweight.h>
4193 #include <asm-generic/bitops/find.h>
4194
4195 -#include <asm-generic/bitops/ext2-non-atomic.h>
4196 +//#include <asm-generic/bitops/ext2-non-atomic.h>
4197
4198 #define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a)
4199 #define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)
4200 diff -urN linux-2.6.19.2.old/include/asm-cris/bug.h linux-2.6.19.2.dev/include/asm-cris/bug.h
4201 --- linux-2.6.19.2.old/include/asm-cris/bug.h 2007-01-10 20:10:37.000000000 +0100
4202 +++ linux-2.6.19.2.dev/include/asm-cris/bug.h 2006-06-21 10:29:15.000000000 +0200
4203 @@ -1,4 +1,4 @@
4204 #ifndef _CRIS_BUG_H
4205 #define _CRIS_BUG_H
4206 -#include <asm-generic/bug.h>
4207 +#include <asm/arch/bug.h>
4208 #endif
4209 diff -urN linux-2.6.19.2.old/include/asm-cris/delay.h linux-2.6.19.2.dev/include/asm-cris/delay.h
4210 --- linux-2.6.19.2.old/include/asm-cris/delay.h 2007-01-10 20:10:37.000000000 +0100
4211 +++ linux-2.6.19.2.dev/include/asm-cris/delay.h 2006-10-11 19:46:19.000000000 +0200
4212 @@ -13,10 +13,13 @@
4213
4214 extern unsigned long loops_per_usec; /* arch/cris/mm/init.c */
4215
4216 +/* May be defined by arch/delay.h. */
4217 +#ifndef udelay
4218 static inline void udelay(unsigned long usecs)
4219 {
4220 __delay(usecs * loops_per_usec);
4221 }
4222 +#endif
4223
4224 #endif /* defined(_CRIS_DELAY_H) */
4225
4226 diff -urN linux-2.6.19.2.old/include/asm-cris/ethernet.h linux-2.6.19.2.dev/include/asm-cris/ethernet.h
4227 --- linux-2.6.19.2.old/include/asm-cris/ethernet.h 2007-01-10 20:10:37.000000000 +0100
4228 +++ linux-2.6.19.2.dev/include/asm-cris/ethernet.h 2006-07-06 07:58:52.000000000 +0200
4229 @@ -15,4 +15,7 @@
4230 #define SET_ETH_DUPLEX_AUTO SIOCDEVPRIVATE+3 /* Auto neg duplex */
4231 #define SET_ETH_DUPLEX_HALF SIOCDEVPRIVATE+4 /* Full duplex */
4232 #define SET_ETH_DUPLEX_FULL SIOCDEVPRIVATE+5 /* Half duplex */
4233 +#define SET_ETH_ENABLE_LEDS SIOCDEVPRIVATE+6 /* Enable net LEDs */
4234 +#define SET_ETH_DISABLE_LEDS SIOCDEVPRIVATE+7 /* Disable net LEDs */
4235 +#define SET_ETH_AUTONEG SIOCDEVPRIVATE+8
4236 #endif /* _CRIS_ETHERNET_H */
4237 diff -urN linux-2.6.19.2.old/include/asm-cris/etraxgpio.h linux-2.6.19.2.dev/include/asm-cris/etraxgpio.h
4238 --- linux-2.6.19.2.old/include/asm-cris/etraxgpio.h 2007-01-10 20:10:37.000000000 +0100
4239 +++ linux-2.6.19.2.dev/include/asm-cris/etraxgpio.h 2007-01-09 10:31:32.000000000 +0100
4240 @@ -16,15 +16,19 @@
4241 * For ETRAX FS (ARCH_V32):
4242 * /dev/gpioa minor 0, 8 bit GPIO, each bit can change direction
4243 * /dev/gpiob minor 1, 18 bit GPIO, each bit can change direction
4244 - * /dev/gpioc minor 2, 18 bit GPIO, each bit can change direction
4245 - * /dev/gpiod minor 3, 18 bit GPIO, each bit can change direction
4246 - * /dev/gpioe minor 4, 18 bit GPIO, each bit can change direction
4247 - * /dev/leds minor 5, Access to leds depending on kernelconfig
4248 + * /dev/gpioc minor 3, 18 bit GPIO, each bit can change direction
4249 + * /dev/gpiod minor 4, 18 bit GPIO, each bit can change direction
4250 + * /dev/gpioe minor 5, 18 bit GPIO, each bit can change direction
4251 + * /dev/leds minor 2, Access to leds depending on kernelconfig
4252 *
4253 */
4254 #ifndef _ASM_ETRAXGPIO_H
4255 #define _ASM_ETRAXGPIO_H
4256
4257 +#ifndef __KERNEL__
4258 +#include <linux/autoconf.h>
4259 +#endif
4260 +
4261 /* etraxgpio _IOC_TYPE, bits 8 to 15 in ioctl cmd */
4262 #ifdef CONFIG_ETRAX_ARCH_V10
4263 #define ETRAXGPIO_IOCTYPE 43
4264 @@ -42,8 +46,13 @@
4265 #define GPIO_MINOR_C 3
4266 #define GPIO_MINOR_D 4
4267 #define GPIO_MINOR_E 5
4268 +#ifdef CONFIG_ETRAX_VIRTUAL_GPIO
4269 +#define GPIO_MINOR_V 6
4270 +#define GPIO_MINOR_LAST 6
4271 +#else
4272 #define GPIO_MINOR_LAST 5
4273 #endif
4274 +#endif
4275
4276 /* supported ioctl _IOC_NR's */
4277
4278 diff -urN linux-2.6.19.2.old/include/asm-cris/fasttimer.h linux-2.6.19.2.dev/include/asm-cris/fasttimer.h
4279 --- linux-2.6.19.2.old/include/asm-cris/fasttimer.h 2007-01-10 20:10:37.000000000 +0100
4280 +++ linux-2.6.19.2.dev/include/asm-cris/fasttimer.h 2006-12-11 12:22:38.000000000 +0100
4281 @@ -1,9 +1,9 @@
4282 -/* $Id: fasttimer.h,v 1.3 2004/05/14 10:19:19 starvik Exp $
4283 +/*
4284 * linux/include/asm-cris/fasttimer.h
4285 *
4286 * Fast timers for ETRAX100LX
4287 * This may be useful in other OS than Linux so use 2 space indentation...
4288 - * Copyright (C) 2000, 2002 Axis Communications AB
4289 + * Copyright (C) 2000-2006 Axis Communications AB
4290 */
4291 #include <linux/time.h> /* struct timeval */
4292 #include <linux/timex.h>
4293 @@ -12,11 +12,16 @@
4294
4295 typedef void fast_timer_function_type(unsigned long);
4296
4297 +struct fasttime_t {
4298 + unsigned long tv_jiff; /* jiffies */
4299 + unsigned long tv_usec; /* microseconds */
4300 +};
4301 +
4302 struct fast_timer{ /* Close to timer_list */
4303 struct fast_timer *next;
4304 struct fast_timer *prev;
4305 - struct timeval tv_set;
4306 - struct timeval tv_expires;
4307 + struct fasttime_t tv_set;
4308 + struct fasttime_t tv_expires;
4309 unsigned long delay_us;
4310 fast_timer_function_type *function;
4311 unsigned long data;
4312 @@ -38,6 +43,6 @@
4313 void schedule_usleep(unsigned long us);
4314
4315
4316 -void fast_timer_init(void);
4317 +int fast_timer_init(void);
4318
4319 #endif
4320 diff -urN linux-2.6.19.2.old/include/asm-cris/hardirq.h linux-2.6.19.2.dev/include/asm-cris/hardirq.h
4321 --- linux-2.6.19.2.old/include/asm-cris/hardirq.h 2007-01-10 20:10:37.000000000 +0100
4322 +++ linux-2.6.19.2.dev/include/asm-cris/hardirq.h 2005-10-31 09:50:43.000000000 +0100
4323 @@ -1,6 +1,7 @@
4324 #ifndef __ASM_HARDIRQ_H
4325 #define __ASM_HARDIRQ_H
4326
4327 +#include <asm/irq.h>
4328 #include <linux/threads.h>
4329 #include <linux/cache.h>
4330
4331 diff -urN linux-2.6.19.2.old/include/asm-cris/io.h linux-2.6.19.2.dev/include/asm-cris/io.h
4332 --- linux-2.6.19.2.old/include/asm-cris/io.h 2007-01-10 20:10:37.000000000 +0100
4333 +++ linux-2.6.19.2.dev/include/asm-cris/io.h 2006-01-04 07:13:03.000000000 +0100
4334 @@ -127,8 +127,8 @@
4335
4336 #define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void __force *)(b),(c),(d))
4337
4338 -/* The following is junk needed for the arch-independent code but which
4339 - * we never use in the CRIS port
4340 +/* I/O port access. Normally there is no I/O space on CRIS but when Cardbus/PCI
4341 + * is enable the request is passed through the bridge.
4342 */
4343
4344 #define IO_SPACE_LIMIT 0xffff
4345 diff -urN linux-2.6.19.2.old/include/asm-cris/irq_regs.h linux-2.6.19.2.dev/include/asm-cris/irq_regs.h
4346 --- linux-2.6.19.2.old/include/asm-cris/irq_regs.h 1970-01-01 01:00:00.000000000 +0100
4347 +++ linux-2.6.19.2.dev/include/asm-cris/irq_regs.h 2007-01-09 10:31:32.000000000 +0100
4348 @@ -0,0 +1 @@
4349 +#include <asm-generic/irq_regs.h>
4350 diff -urN linux-2.6.19.2.old/include/asm-cris/pgtable.h linux-2.6.19.2.dev/include/asm-cris/pgtable.h
4351 --- linux-2.6.19.2.old/include/asm-cris/pgtable.h 2007-01-10 20:10:37.000000000 +0100
4352 +++ linux-2.6.19.2.dev/include/asm-cris/pgtable.h 2007-01-12 15:41:37.000000000 +0100
4353 @@ -279,7 +279,7 @@
4354 #define pte_unmap(pte) do { } while (0)
4355 #define pte_unmap_nested(pte) do { } while (0)
4356 #define pte_pfn(x) ((unsigned long)(__va((x).pte)) >> PAGE_SHIFT)
4357 -#define pfn_pte(pfn, prot) __pte((__pa((pfn) << PAGE_SHIFT)) | pgprot_val(prot))
4358 +#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
4359
4360 #define pte_ERROR(e) \
4361 printk("%s:%d: bad pte %p(%08lx).\n", __FILE__, __LINE__, &(e), pte_val(e))
4362 diff -urN linux-2.6.19.2.old/include/asm-cris/semaphore-helper.h linux-2.6.19.2.dev/include/asm-cris/semaphore-helper.h
4363 --- linux-2.6.19.2.old/include/asm-cris/semaphore-helper.h 2007-01-10 20:10:37.000000000 +0100
4364 +++ linux-2.6.19.2.dev/include/asm-cris/semaphore-helper.h 2005-08-23 11:44:35.000000000 +0200
4365 @@ -20,12 +20,12 @@
4366 /*
4367 * These two _must_ execute atomically wrt each other.
4368 */
4369 -extern inline void wake_one_more(struct semaphore * sem)
4370 +static inline void wake_one_more(struct semaphore * sem)
4371 {
4372 atomic_inc(&sem->waking);
4373 }
4374
4375 -extern inline int waking_non_zero(struct semaphore *sem)
4376 +static inline int waking_non_zero(struct semaphore *sem)
4377 {
4378 unsigned long flags;
4379 int ret = 0;
4380 @@ -40,7 +40,7 @@
4381 return ret;
4382 }
4383
4384 -extern inline int waking_non_zero_interruptible(struct semaphore *sem,
4385 +static inline int waking_non_zero_interruptible(struct semaphore *sem,
4386 struct task_struct *tsk)
4387 {
4388 int ret = 0;
4389 @@ -59,7 +59,7 @@
4390 return ret;
4391 }
4392
4393 -extern inline int waking_non_zero_trylock(struct semaphore *sem)
4394 +static inline int waking_non_zero_trylock(struct semaphore *sem)
4395 {
4396 int ret = 1;
4397 unsigned long flags;
4398 diff -urN linux-2.6.19.2.old/include/asm-cris/semaphore.h linux-2.6.19.2.dev/include/asm-cris/semaphore.h
4399 --- linux-2.6.19.2.old/include/asm-cris/semaphore.h 2007-01-10 20:10:37.000000000 +0100
4400 +++ linux-2.6.19.2.dev/include/asm-cris/semaphore.h 2006-01-04 07:13:03.000000000 +0100
4401 @@ -51,7 +51,6 @@
4402 {
4403 sema_init(sem, 0);
4404 }
4405 -
4406 extern void __down(struct semaphore * sem);
4407 extern int __down_interruptible(struct semaphore * sem);
4408 extern int __down_trylock(struct semaphore * sem);
4409 diff -urN linux-2.6.19.2.old/include/asm-cris/smp.h linux-2.6.19.2.dev/include/asm-cris/smp.h
4410 --- linux-2.6.19.2.old/include/asm-cris/smp.h 2007-01-10 20:10:37.000000000 +0100
4411 +++ linux-2.6.19.2.dev/include/asm-cris/smp.h 2005-10-31 09:50:43.000000000 +0100
4412 @@ -4,7 +4,7 @@
4413 #include <linux/cpumask.h>
4414
4415 extern cpumask_t phys_cpu_present_map;
4416 -#define cpu_possible_map phys_cpu_present_map
4417 +extern cpumask_t cpu_possible_map;
4418
4419 #define __smp_processor_id() (current_thread_info()->cpu)
4420
4421 diff -urN linux-2.6.19.2.old/include/asm-cris/sync_serial.h linux-2.6.19.2.dev/include/asm-cris/sync_serial.h
4422 --- linux-2.6.19.2.old/include/asm-cris/sync_serial.h 2007-01-10 20:10:37.000000000 +0100
4423 +++ linux-2.6.19.2.dev/include/asm-cris/sync_serial.h 2005-11-10 15:43:16.000000000 +0100
4424 @@ -1,9 +1,9 @@
4425 -/*
4426 +/*
4427 * ioctl defines for synchronous serial port driver
4428 *
4429 * Copyright (c) 2001-2003 Axis Communications AB
4430 - *
4431 - * Author: Mikael Starvik
4432 + *
4433 + * Author: Mikael Starvik
4434 *
4435 */
4436
4437 @@ -24,7 +24,7 @@
4438 #define SSP150 0
4439 #define SSP300 1
4440 #define SSP600 2
4441 -#define SSP1200 3
4442 +#define SSP1200 3
4443 #define SSP2400 4
4444 #define SSP4800 5
4445 #define SSP9600 6
4446 @@ -67,6 +67,7 @@
4447 /* Values for SSP_FRAME_SYNC */
4448 #define NORMAL_SYNC 1
4449 #define EARLY_SYNC 2
4450 +#define SECOND_WORD_SYNC 0x40000
4451
4452 #define BIT_SYNC 4
4453 #define WORD_SYNC 8
4454 @@ -86,6 +87,8 @@
4455 #define CLOCK_GATED 0x10000
4456 #define CLOCK_NOT_GATED 0x20000
4457
4458 +
4459 +
4460 /* Values for SSP_IPOLARITY and SSP_OPOLARITY */
4461 #define CLOCK_NORMAL 1
4462 #define CLOCK_INVERT 2
4463 diff -urN linux-2.6.19.2.old/include/asm-cris/thread_info.h linux-2.6.19.2.dev/include/asm-cris/thread_info.h
4464 --- linux-2.6.19.2.old/include/asm-cris/thread_info.h 2007-01-10 20:10:37.000000000 +0100
4465 +++ linux-2.6.19.2.dev/include/asm-cris/thread_info.h 2006-03-22 11:01:27.000000000 +0100
4466 @@ -32,6 +32,7 @@
4467 unsigned long flags; /* low level flags */
4468 __u32 cpu; /* current CPU */
4469 int preempt_count; /* 0 => preemptable, <0 => BUG */
4470 + __u32 tls; /* TLS for this thread */
4471
4472 mm_segment_t addr_limit; /* thread address space:
4473 0-0xBFFFFFFF for user-thead
4474 @@ -82,6 +83,7 @@
4475 #define TIF_NOTIFY_RESUME 1 /* resumption notification requested */
4476 #define TIF_SIGPENDING 2 /* signal pending */
4477 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
4478 +#define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
4479 #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */
4480 #define TIF_MEMDIE 17
4481
4482 @@ -89,6 +91,7 @@
4483 #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
4484 #define _TIF_SIGPENDING (1<<TIF_SIGPENDING)
4485 #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)
4486 +#define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK)
4487 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
4488
4489 #define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */
4490 diff -urN linux-2.6.19.2.old/include/asm-cris/unistd.h linux-2.6.19.2.dev/include/asm-cris/unistd.h
4491 --- linux-2.6.19.2.old/include/asm-cris/unistd.h 2007-01-10 20:10:37.000000000 +0100
4492 +++ linux-2.6.19.2.dev/include/asm-cris/unistd.h 2007-01-09 10:31:32.000000000 +0100
4493 @@ -255,6 +255,7 @@
4494 #define __NR_io_submit 248
4495 #define __NR_io_cancel 249
4496 #define __NR_fadvise64 250
4497 +/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */
4498 #define __NR_exit_group 252
4499 #define __NR_lookup_dcookie 253
4500 #define __NR_epoll_create 254
4501 @@ -292,10 +293,41 @@
4502 #define __NR_add_key 286
4503 #define __NR_request_key 287
4504 #define __NR_keyctl 288
4505 +#define __NR_ioprio_set 289
4506 +#define __NR_ioprio_get 290
4507 +#define __NR_inotify_init 291
4508 +#define __NR_inotify_add_watch 292
4509 +#define __NR_inotify_rm_watch 293
4510 +#define __NR_migrate_pages 294
4511 +#define __NR_openat 295
4512 +#define __NR_mkdirat 296
4513 +#define __NR_mknodat 297
4514 +#define __NR_fchownat 298
4515 +#define __NR_futimesat 299
4516 +#define __NR_fstatat64 300
4517 +#define __NR_unlinkat 301
4518 +#define __NR_renameat 302
4519 +#define __NR_linkat 303
4520 +#define __NR_symlinkat 304
4521 +#define __NR_readlinkat 305
4522 +#define __NR_fchmodat 306
4523 +#define __NR_faccessat 307
4524 +#define __NR_pselect6 308
4525 +#define __NR_ppoll 309
4526 +#define __NR_unshare 310
4527 +#define __NR_set_robust_list 311
4528 +#define __NR_get_robust_list 312
4529 +#define __NR_splice 313
4530 +#define __NR_sync_file_range 314
4531 +#define __NR_tee 315
4532 +#define __NR_vmsplice 316
4533 +#define __NR_move_pages 317
4534 +#define __NR_getcpu 318
4535 +#define __NR_epoll_pwait 319
4536
4537 #ifdef __KERNEL__
4538
4539 -#define NR_syscalls 289
4540 +#define NR_syscalls 320
4541
4542 #include <asm/arch/unistd.h>
4543
4544 @@ -321,6 +353,7 @@
4545 #define __ARCH_WANT_SYS_SIGPENDING
4546 #define __ARCH_WANT_SYS_SIGPROCMASK
4547 #define __ARCH_WANT_SYS_RT_SIGACTION
4548 +#define __ARCH_WANT_SYS_RT_SIGSUSPEND
4549
4550 /*
4551 * "Conditional" syscalls
Staging tree of dedeckeh