diff options
Diffstat (limited to 'target/linux/etrax/patches/cris/001-include-cris.patch')
| -rw-r--r-- | target/linux/etrax/patches/cris/001-include-cris.patch | 4551 |
1 files changed, 4551 insertions, 0 deletions
diff --git a/target/linux/etrax/patches/cris/001-include-cris.patch b/target/linux/etrax/patches/cris/001-include-cris.patch new file mode 100644 index 0000000000..f384684414 --- /dev/null +++ b/target/linux/etrax/patches/cris/001-include-cris.patch @@ -0,0 +1,4551 @@ +diff -urN linux-2.6.19.2.old/include/asm-cris/Kbuild linux-2.6.19.2.dev/include/asm-cris/Kbuild +--- linux-2.6.19.2.old/include/asm-cris/Kbuild 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/Kbuild 2007-02-09 16:51:34.000000000 +0100 +@@ -3,3 +3,6 @@ + header-y += arch-v10/ arch-v32/ + + unifdef-y += rs485.h ++unifdef-y += ethernet.h ++unifdef-y += etraxgpio.h ++unifdef-y += rtc.h +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v10/Kbuild 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/Kbuild 2007-02-26 21:03:05.000000000 +0100 +@@ -1,2 +1,5 @@ + header-y += ptrace.h + header-y += user.h ++header-y += svinto.h ++header-y += sv_addr_ag.h ++header-y += sv_addr.agh +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v10/bug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/bug.h 2006-06-21 10:29:16.000000000 +0200 +@@ -0,0 +1,66 @@ ++#ifndef __ASM_CRIS_ARCH_BUG_H ++#define __ASM_CRIS_ARCH_BUG_H ++ ++#include <linux/stringify.h> ++ ++#ifdef CONFIG_BUG ++#ifdef CONFIG_DEBUG_BUGVERBOSE ++/* The BUG() macro is used for marking obviously incorrect code paths. ++ * It will cause a message with the file name and line number to be printed, ++ * and then cause an oops. The message is actually printed by handle_BUG() ++ * in arch/cris/kernel/traps.c, and the reason we use this method of storing ++ * the file name and line number is that we do not want to affect the registers ++ * by calling printk() before causing the oops. ++ */ ++ ++#define BUG_PREFIX 0x0D7F ++#define BUG_MAGIC 0x00001234 ++ ++struct bug_frame { ++ unsigned short prefix; ++ unsigned int magic; ++ unsigned short clear; ++ unsigned short movu; ++ unsigned short line; ++ unsigned short jump; ++ unsigned char* filename; ++}; ++ ++#if 0 ++/* Unfortunately this version of the macro does not work due to a problem ++ * with the compiler (aka a bug) when compiling with -O2, which sometimes ++ * erroneously causes the second input to be stored in a register... ++ */ ++#define BUG() \ ++ __asm__ __volatile__ ("clear.d [" __stringify(BUG_MAGIC) "]\n\t"\ ++ "movu.w %0,$r0\n\t" \ ++ "jump %1\n\t" \ ++ : : "i" (__LINE__), "i" (__FILE__)) ++#else ++/* This version will have to do for now, until the compiler is fixed. ++ * The drawbacks of this version are that the file name will appear multiple ++ * times in the .rodata section, and that __LINE__ and __FILE__ can probably ++ * not be used like this with newer versions of gcc. ++ */ ++#define BUG() \ ++ __asm__ __volatile__ ("clear.d [" __stringify(BUG_MAGIC) "]\n\t"\ ++ "movu.w " __stringify(__LINE__) ",$r0\n\t"\ ++ "jump 0f\n\t" \ ++ ".section .rodata\n" \ ++ "0:\t.string \"" __FILE__ "\"\n\t" \ ++ ".previous") ++#endif ++ ++#else ++ ++/* This just causes an oops. */ ++#define BUG() (*(int *)0 = 0) ++ ++#endif ++ ++#define HAVE_ARCH_BUG ++#endif ++ ++#include <asm-generic/bug.h> ++ ++#endif +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v10/ide.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/ide.h 2005-08-23 11:44:36.000000000 +0200 +@@ -32,7 +32,7 @@ + * together in a hwgroup, and will serialize accesses. this is good, because + * we can't access more than one interface at the same time on ETRAX100. + */ +- return 4; ++ return 4; + } + + static inline unsigned long ide_default_io_base(int index) +@@ -61,15 +61,15 @@ + /* fill in ports for ATA addresses 0 to 7 */ + + for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) { +- hw->io_ports[i] = data_port | +- IO_FIELD(R_ATA_CTRL_DATA, addr, i) | ++ hw->io_ports[i] = data_port | ++ IO_FIELD(R_ATA_CTRL_DATA, addr, i) | + IO_STATE(R_ATA_CTRL_DATA, cs0, active); + } + + /* the IDE control register is at ATA address 6, with CS1 active instead of CS0 */ + + hw->io_ports[IDE_CONTROL_OFFSET] = data_port | +- IO_FIELD(R_ATA_CTRL_DATA, addr, 6) | ++ IO_FIELD(R_ATA_CTRL_DATA, addr, 6) | + IO_STATE(R_ATA_CTRL_DATA, cs1, active); + + /* whats this for ? */ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v10/io.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/io.h 2007-03-06 12:16:16.000000000 +0100 +@@ -56,6 +56,9 @@ + #define LED_RED 0x02 + #define LED_ORANGE (LED_GREEN | LED_RED) + ++#if defined(CONFIG_ETRAX_NO_LEDS) ++#define LED_NETWORK_SET(x) ++#else + #if CONFIG_ETRAX_LED1G == CONFIG_ETRAX_LED1R + #define LED_NETWORK_SET(x) \ + do { \ +@@ -80,6 +83,7 @@ + LED_ACTIVE_SET_R((x) & LED_RED); \ + } while (0) + #endif ++#endif + + #ifdef CONFIG_ETRAX_PA_LEDS + #define LED_NETWORK_SET_G(x) \ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v10/juliette.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/juliette.h 2004-06-03 11:28:57.000000000 +0200 +@@ -0,0 +1,328 @@ ++#ifndef _ASM_JULIETTE_H ++#define _ASM_JULIETTE_H ++ ++#include <asm/arch/svinto.h> ++ ++/* juliette _IOC_TYPE, bits 8 to 15 in ioctl cmd */ ++ ++#define JULIOCTYPE 42 ++ ++/* supported ioctl _IOC_NR's */ ++ ++#define JULSTARTDMA 0x1 /* start a picture asynchronously */ ++ ++/* set parameters */ ++ ++#define SETDEFAULT 0x2 /* CCD/VIDEO/SS1M */ ++#define SETPARAMETERS 0x3 /* CCD/VIDEO */ ++#define SETSIZE 0x4 /* CCD/VIDEO/SS1M */ ++#define SETCOMPRESSION 0x5 /* CCD/VIDEO/SS1M */ ++#define SETCOLORLEVEL 0x6 /* CCD/VIDEO */ ++#define SETBRIGHTNESS 0x7 /* CCD */ ++#define SETROTATION 0x8 /* CCD */ ++#define SETTEXT 0x9 /* CCD/VIDEO/SS1M */ ++#define SETCLOCK 0xa /* CCD/VIDEO/SS1M */ ++#define SETDATE 0xb /* CCD/VIDEO/SS1M */ ++#define SETTIMEFORMAT 0xc /* CCD/VIDEO/SS1M */ ++#define SETDATEFORMAT 0xd /* VIDEO */ ++#define SETTEXTALIGNMENT 0xe /* VIDEO */ ++#define SETFPS 0xf /* CCD/VIDEO/SS1M */ ++#define SETVGA 0xff /* VIDEO */ ++#define SETCOMMENT 0xfe /* CCD/VIDEO */ ++ ++/* get parameters */ ++ ++#define GETDRIVERTYPE 0x10 /* CCD/VIDEO/SS1M */ ++#define GETNBROFCAMERAS 0x11 /* CCD/VIDEO/SS1M */ ++#define GETPARAMETERS 0x12 /* CCD/VIDEO/SS1M */ ++#define GETBUFFERSIZE 0x13 /* CCD/VIDEO/SS1M */ ++#define GETVIDEOTYPE 0x14 /* VIDEO/SS1M */ ++#define GETVIDEOSIGNAL 0x15 /* VIDEO */ ++#define GETMODULATION 0x16 /* VIDEO */ ++#define GETDCYVALUES 0xa0 /* CCD /SS1M */ ++#define GETDCYWIDTH 0xa1 /* CCD /SS1M */ ++#define GETDCYHEIGHT 0xa2 /* CCD /SS1M */ ++#define GETSIZE 0xa3 /* CCD/VIDEO */ ++#define GETCOMPRESSION 0xa4 /* CCD/VIDEO */ ++ ++/* detect and get parameters */ ++ ++#define DETECTMODULATION 0x17 /* VIDEO */ ++#define DETECTVIDEOTYPE 0x18 /* VIDEO */ ++#define DETECTVIDEOSIGNAL 0x19 /* VIDEO */ ++ ++/* configure default parameters */ ++ ++#define CONFIGUREDEFAULT 0x20 /* CCD/VIDEO/SS1M */ ++#define DEFSIZE 0x21 /* CCD/VIDEO/SS1M */ ++#define DEFCOMPRESSION 0x22 /* CCD/VIDEO/SS1M */ ++#define DEFCOLORLEVEL 0x23 /* CCD/VIDEO */ ++#define DEFBRIGHTNESS 0x24 /* CCD */ ++#define DEFROTATION 0x25 /* CCD */ ++#define DEFWHITEBALANCE 0x26 /* CCD */ ++#define DEFEXPOSURE 0x27 /* CCD */ ++#define DEFAUTOEXPWINDOW 0x28 /* CCD */ ++#define DEFTEXT 0x29 /* CCD/VIDEO/SS1M */ ++#define DEFCLOCK 0x2a /* CCD/VIDEO/SS1M */ ++#define DEFDATE 0x2b /* CCD/VIDEO/SS1M */ ++#define DEFTIMEFORMAT 0x2c /* CCD/VIDEO/SS1M */ ++#define DEFDATEFORMAT 0x2d /* VIDEO */ ++#define DEFTEXTALIGNMENT 0x2e /* VIDEO */ ++#define DEFFPS 0x2f /* CCD/VIDEO/SS1M */ ++#define DEFTEXTSTRING 0x30 /* CCD/VIDEO/SS1M */ ++#define DEFHEADERINFO 0x31 /* CCD/VIDEO/SS1M */ ++#define DEFWEXAR 0x32 /* CCD */ ++#define DEFLINEDELAY 0x33 /* CCD */ ++#define DEFDISABLEDVIDEO 0x34 /* VIDEO */ ++#define DEFVIDEOTYPE 0x35 /* VIDEO */ ++#define DEFMODULATION 0x36 /* VIDEO */ ++#define DEFXOFFSET 0x37 /* VIDEO */ ++#define DEFYOFFSET 0x38 /* VIDEO */ ++#define DEFYCMODE 0x39 /* VIDEO */ ++#define DEFVCRMODE 0x3a /* VIDEO */ ++#define DEFSTOREDCYVALUES 0x3b /* CCD/VIDEO/SS1M */ ++#define DEFWCDS 0x3c /* CCD */ ++#define DEFVGA 0x3d /* VIDEO */ ++#define DEFCOMMENT 0x3e /* CCD/VIDEO */ ++#define DEFCOMMENTSIZE 0x3f /* CCD/VIDEO */ ++#define DEFCOMMENTTEXT 0x50 /* CCD/VIDEO */ ++#define DEFSTOREDCYTEXT 0x51 /* VIDEO */ ++ ++ ++#define JULABORTDMA 0x70 /* Abort current DMA transfer */ ++ ++/* juliette general i/o port */ ++ ++#define JIO_READBITS 0x40 /* read and return current port bits */ ++#define JIO_SETBITS 0x41 /* set bits marked by 1 in the argument */ ++#define JIO_CLRBITS 0x42 /* clr bits marked by 1 in the argument */ ++#define JIO_READDIR 0x43 /* read direction, 0=input 1=output */ ++#define JIO_SETINPUT 0x44 /* set direction, 0=unchanged 1=input ++ returns current dir */ ++#define JIO_SETOUTPUT 0x45 /* set direction, 0=unchanged 1=output ++ returns current dir */ ++ ++/**** YumYum internal adresses ****/ ++ ++/* Juliette buffer addresses */ ++ ++#define BUFFER1_VIDEO 0x1100 ++#define BUFFER2_VIDEO 0x2800 ++#define ACDC_BUFF_VIDEO 0x0aaa ++#define BUFFER1 0x1700 ++#define BUFFER2 0x2b01 ++#define ACDC_BUFFER 0x1200 ++#define BUFFER1_SS1M 0x1100 ++#define BUFFER2_SS1M 0x2800 ++#define ACDC_BUFF_SS1M 0x0900 ++ ++/* Juliette parameter memory addresses */ ++ ++#define PA_BUFFER_CNT 0x3f09 /* CCD/VIDEO */ ++#define PA_CCD_BUFFER 0x3f10 /* CCD */ ++#define PA_VIDEO_BUFFER 0x3f10 /* VIDEO */ ++#define PA_DCT_BUFFER 0x3f11 /* CCD/VIDEO */ ++#define PA_TEMP 0x3f12 /* CCD/VIDEO */ ++#define PA_VIDEOLINE_RD 0x3f13 /* VIDEO */ ++#define PA_VIDEOLINE_WR 0x3f14 /* VIDEO */ ++#define PA_VI_HDELAY0 0x3f15 /* VIDEO */ ++#define PA_VI_VDELAY0 0x3f16 /* VIDEO */ ++#define PA_VI_HDELAY1 0x3f17 /* VIDEO */ ++#define PA_VI_VDELAY1 0x3f18 /* VIDEO */ ++#define PA_VI_HDELAY2 0x3f19 /* VIDEO */ ++#define PA_VI_VDELAY2 0x3f1a /* VIDEO */ ++#define PA_VI_HDELAY3 0x3f1b /* VIDEO */ ++#define PA_VI_VDELAY3 0x3f1c /* VIDEO */ ++#define PA_VI_CTRL 0x3f20 /* VIDEO */ ++#define PA_JPEG_CTRL 0x3f22 /* CCD/VIDEO */ ++#define PA_BUFFER_SIZE 0x3f24 /* CCD/VIDEO */ ++#define PA_PAL_NTSC 0x3f25 /* VIDEO */ ++#define PA_MACROBLOCKS 0x3f26 /* CCD/VIDEO */ ++#define PA_COLOR 0x3f27 /* VIDEO */ ++#define PA_MEMCH1CNT2 0x3f28 /* CCD/VIDEO */ ++#define PA_MEMCH1CNT3 0x3f29 /* VIDEO */ ++#define PA_MEMCH1STR2 0x3f2a /* CCD/VIDEO */ ++#define PA_MEMCH1STR3 0x3f2b /* VIDEO */ ++#define PA_BUFFERS 0x3f2c /* CCD/VIDEO */ ++#define PA_PROGRAM 0x3f2d /* CCD/VIDEO */ ++#define PA_ROTATION 0x3f2e /* CCD */ ++#define PA_PC 0x3f30 /* CCD/VIDEO */ ++#define PA_PC2 0x3f31 /* VIDEO */ ++#define PA_ODD_LINE 0x3f32 /* VIDEO */ ++#define PA_EXP_DELAY 0x3f34 /* CCD */ ++#define PA_MACROBLOCK_CNT 0x3f35 /* CCD/VIDEO */ ++#define PA_DRAM_PTR1_L 0x3f36 /* CCD/VIDEO */ ++#define PA_CLPOB_CNT 0x3f37 /* CCD */ ++#define PA_DRAM_PTR1_H 0x3f38 /* CCD/VIDEO */ ++#define PA_DRAM_PTR2_L 0x3f3a /* VIDEO */ ++#define PA_DRAM_PTR2_H 0x3f3c /* VIDEO */ ++#define PA_CCD_LINE_CNT 0x3f3f /* CCD */ ++#define PA_VIDEO_LINE_CNT 0x3f3f /* VIDEO */ ++#define PA_TEXT 0x3f41 /* CCD/VIDEO */ ++#define PA_CAMERA_CHANGED 0x3f42 /* VIDEO */ ++#define PA_TEXTALIGNMENT 0x3f43 /* VIDEO */ ++#define PA_DISABLED 0x3f44 /* VIDEO */ ++#define PA_MACROBLOCKTEXT 0x3f45 /* VIDEO */ ++#define PA_VGA 0x3f46 /* VIDEO */ ++#define PA_ZERO 0x3ffe /* VIDEO */ ++#define PA_NULL 0x3fff /* CCD/VIDEO */ ++ ++typedef enum { ++ jpeg = 0, ++ dummy = 1 ++} request_type; ++ ++typedef enum { ++ hugesize = 0, ++ fullsize = 1, ++ halfsize = 2, ++ fieldsize = 3 ++} size_type; ++ ++typedef enum { ++ min = 0, ++ low = 1, ++ medium = 2, ++ high = 3, ++ very_high = 4, ++ very_low = 5, ++ q1 = 6, ++ q2 = 7, ++ q3 = 8, ++ q4 = 9, ++ q5 = 10, ++ q6 = 11 ++} compr_type; ++ ++typedef enum { ++ deg_0 = 0, ++ deg_180 = 1, ++ deg_90 = 2, ++ deg_270 = 3 ++} rotation_type; ++ ++typedef enum { ++ auto_white = 0, ++ hold = 1, ++ fixed_outdoor = 2, ++ fixed_indoor = 3, ++ fixed_fluor = 4 ++} white_balance_type; ++ ++typedef enum { ++ auto_exp = 0, ++ fixed_exp = 1 ++} exposure_type; ++ ++typedef enum { ++ no_window = 0, ++ center = 1, ++ top = 2, ++ lower = 3, ++ left = 4, ++ right = 5, ++ spot = 6, ++ cw = 7 ++} exp_window_type; ++ ++typedef enum { ++ h_24 = 0, ++ h_12 = 1, ++ h_24P = 2 ++} hour_type; ++ ++typedef enum { ++ standard = 0, ++ YYYY_MM_DD = 1, ++ Www_Mmm_DD_YYYY = 2, ++ Www_DD_MM_YYYY = 3 ++} date_type; ++ ++typedef enum { ++ left_align = 0, ++ center_align = 1, ++ right_align = 2 ++} alignment_type; ++ ++typedef enum { ++ off = 0, ++ on = 1, ++ no = 0, ++ yes = 1 ++} enable_type; ++ ++typedef enum { ++ disabled = 0, ++ enabled = 1, ++ extended = 2 ++} comment_type; ++ ++typedef enum { ++ pal = 0, ++ ntsc = 1 ++} video_type; ++ ++typedef enum { ++ pal_bghi_ntsc_m = 0, ++ ntsc_4_43_50hz_pal_4_43_60hz = 1, ++ pal_n_ntsc_4_43_60hz = 2, ++ ntsc_n_pal_m = 3, ++ secam_pal_4_43_60hz = 4 ++} modulation_type; ++ ++typedef enum { ++ cam0 = 0, ++ cam1 = 1, ++ cam2 = 2, ++ cam3 = 3, ++ quad = 32 ++} camera_type; ++ ++typedef enum { ++ video_driver = 0, ++ ccd_driver = 1 ++} driver_type; ++ ++struct jul_param { ++ request_type req_type; ++ size_type size; ++ compr_type compression; ++ rotation_type rotation; ++ int color_level; ++ int brightness; ++ white_balance_type white_balance; ++ exposure_type exposure; ++ exp_window_type auto_exp_window; ++ hour_type time_format; ++ date_type date_format; ++ alignment_type text_alignment; ++ enable_type text; ++ enable_type clock; ++ enable_type date; ++ enable_type fps; ++ enable_type vga; ++ enable_type comment; ++}; ++ ++struct video_param { ++ enable_type disabled; ++ modulation_type modulation; ++ video_type video; ++ enable_type signal; ++ enable_type vcr; ++ int xoffset; ++ int yoffset; ++}; ++ ++/* The juliette_request structure is used during the JULSTARTDMA asynchronous ++ * picture-taking ioctl call as an argument to specify a buffer which will get ++ * the final picture. ++ */ ++ ++struct juliette_request { ++ char *buf; /* Pointer to the buffer to hold picture data */ ++ unsigned int buflen; /* Length of the above buffer */ ++ unsigned int size; /* Resulting length, 0 if the picture is not ready */ ++}; ++ ++#endif +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/Kbuild 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/Kbuild 2007-02-09 16:51:34.000000000 +0100 +@@ -1,2 +1,3 @@ + header-y += ptrace.h + header-y += user.h ++header-y += cryptocop.h +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/arbiter.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/arbiter.h 2006-10-13 14:45:18.000000000 +0200 +@@ -22,6 +22,7 @@ + + int crisv32_arbiter_allocate_bandwidth(int client, int region, + unsigned long bandwidth); ++void crisv32_arbiter_deallocate_bandwidth(int client, int region); + int crisv32_arbiter_watch(unsigned long start, unsigned long size, + unsigned long clients, unsigned long accesses, + watch_callback* cb); +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/bitops.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/bitops.h 2005-08-23 11:44:37.000000000 +0200 +@@ -16,7 +16,7 @@ + __asm__ __volatile__ ("swapnwbr %0\n\t" + "lz %0,%0" + : "=r" (res) : "0" (w)); +- ++ + return res; + } + +@@ -28,7 +28,7 @@ + __asm__ __volatile__ ("swapwbr %0\n\t" + "lz %0,%0" + : "=r" (res) : "0" (w)); +- ++ + return res; + } + +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/board.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/board.h 2007-01-29 15:05:01.000000000 +0100 +@@ -0,0 +1,74 @@ ++/* ++ * linux/include/asm-cris/arch-v32/board.h ++ * ++ * Types for board-specific data. ++ * ++ * Copyright (C) 2007 Axis Communications AB ++ */ ++ ++#ifndef __ARCH_V32_BOARD_H ++#define __ARCH_V32_BOARD_H ++ ++/* A tuple for a regi base and an interrupt. */ ++struct crisv32_regi_n_int { ++ u32 regi; ++ u32 irq; ++}; ++ ++/* ++ * SPI and SD/MMC types, arranged such that the data for mmc_spi is an ++ * add-on to SPI; the SPI data does not contain anything about SD/MMC ++ * and the SPI controller driver can't access it. SPI data is ++ * arranged to allow sharing common functions between SSER and GPIO. ++ */ ++ ++/* Hardware identification for the bitbanged GPIO SPI controller. */ ++struct crisv32_spi_gpio_controller_data { ++ /* Names of the pins. */ ++ const char *cs; ++ const char *miso; ++ const char *mosi; ++ const char *sclk; ++}; ++ ++/* Similar for the SSER SPI controller. */ ++struct crisv32_spi_sser_controller_data { ++ /* How to connect pins and claim the SSER interface and the DMA ++ channels. */ ++ int (*iface_allocate)(struct crisv32_regi_n_int *sser, ++ struct crisv32_regi_n_int *dmain, ++ struct crisv32_regi_n_int *dmaout); ++ void (*iface_free)(void); ++ ++ /* Whether DMA is to be used. */ ++ int using_dma; ++}; ++ ++struct crisv32_mmc_spi_pinstate; ++ ++/* ++ * Regardless of SPI controller, these pins are needed in addition to ++ * the SPI pins when the used as a SD/MMC SPI controller. ++ */ ++struct crisv32_mmc_spi_pindata { ++ /* Names of the pins. */ ++ const char *card_detect; ++ const char *write_protect; ++ ++ /* Related private state to interface to the mmc_spi API. */ ++ struct crisv32_mmc_spi_pinstate *pinstate; ++}; ++ ++/* When SD/MMC SPI on GPIO, here's all the hardware-identifying data. */ ++struct crisv32_mmc_spi_gpio_hwdata { ++ struct crisv32_spi_gpio_controller_data spi; ++ struct crisv32_mmc_spi_pindata mmc; ++}; ++ ++/* Similar for SSER. */ ++struct crisv32_mmc_spi_sser_hwdata { ++ struct crisv32_spi_sser_controller_data spi; ++ struct crisv32_mmc_spi_pindata mmc; ++}; ++ ++#endif /* __ARCH_V32_BOARD_H */ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/bug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/bug.h 2006-06-21 10:29:16.000000000 +0200 +@@ -0,0 +1,69 @@ ++#ifndef __ASM_CRIS_ARCH_BUG_H ++#define __ASM_CRIS_ARCH_BUG_H ++ ++#include <linux/stringify.h> ++ ++#ifdef CONFIG_BUG ++#ifdef CONFIG_DEBUG_BUGVERBOSE ++/* The BUG() macro is used for marking obviously incorrect code paths. ++ * It will cause a message with the file name and line number to be printed, ++ * and then cause an oops. The message is actually printed by handle_BUG() ++ * in arch/cris/kernel/traps.c, and the reason we use this method of storing ++ * the file name and line number is that we do not want to affect the registers ++ * by calling printk() before causing the oops (this is not entirely true ++ * for CRISv32 since we need to modify the $acr register). ++ */ ++ ++#define BUG_PREFIX 0xFE6F ++#define BUG_MAGIC 0x00001234 ++ ++struct bug_frame { ++ unsigned short prefix; ++ unsigned int magic; ++ unsigned short clear; ++ unsigned short movu; ++ unsigned short line; ++ unsigned short jump; ++ unsigned char* filename; ++}; ++ ++#if 0 ++/* Unfortunately this version of the macro does not work due to a problem ++ * with the compiler (aka a bug) when compiling with -O2, which sometimes ++ * erroneously causes the second input to be stored in a register... ++ */ ++#define BUG() \ ++ __asm__ __volatile__ ("move.d [" __stringify(BUG_MAGIC) "],$acr\n\t"\ ++ "clear.d [$acr]\n\t" \ ++ "movu.w %0,$r0\n\t" \ ++ "jump %1\n\t" \ ++ : : "i" (__LINE__), "i" (__FILE__)) ++#else ++/* This version will have to do for now, until the compiler is fixed. ++ * The drawbacks of this version are that the file name will appear multiple ++ * times in the .rodata section, and that __LINE__ and __FILE__ can probably ++ * not be used like this with newer versions of gcc. ++ */ ++#define BUG() \ ++ __asm__ __volatile__ ("move.d " __stringify(BUG_MAGIC) ",$acr\n\t"\ ++ "clear.d [$acr]\n\t" \ ++ "movu.w " __stringify(__LINE__) ",$r0\n\t"\ ++ "jump 0f\n\t" \ ++ ".section .rodata\n" \ ++ "0:\t.string \"" __FILE__ "\"\n\t" \ ++ ".previous") ++#endif ++ ++#else ++ ++/* This just causes an oops. */ ++#define BUG() (*(int *)0 = 0) ++ ++#endif ++ ++#define HAVE_ARCH_BUG ++#endif ++ ++#include <asm-generic/bug.h> ++ ++#endif +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/cache.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/cache.h 2007-01-05 09:59:53.000000000 +0100 +@@ -1,8 +1,19 @@ + #ifndef _ASM_CRIS_ARCH_CACHE_H + #define _ASM_CRIS_ARCH_CACHE_H + ++#include <asm/arch/hwregs/dma.h> ++ + /* A cache-line is 32 bytes. */ + #define L1_CACHE_BYTES 32 + #define L1_CACHE_SHIFT 5 + ++void flush_dma_list(dma_descr_data* descr); ++void flush_dma_descr(dma_descr_data* descr, int flush_buf); ++ ++#define flush_dma_context(c) \ ++ flush_dma_list(phys_to_virt((c)->saved_data)); ++ ++void cris_flush_cache_range(void* buf, unsigned long len); ++void cris_flush_cache(void); ++ + #endif /* _ASM_CRIS_ARCH_CACHE_H */ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/cryptocop.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/cryptocop.h 2005-04-20 14:33:25.000000000 +0200 +@@ -160,7 +160,7 @@ + cryptocop_source_dma = 0, + cryptocop_source_des, + cryptocop_source_3des, +- cryptocop_source_aes, ++ cryptocop_source_aes, + cryptocop_source_md5, + cryptocop_source_sha1, + cryptocop_source_csum, +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/delay.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/delay.h 2006-10-11 19:46:19.000000000 +0200 +@@ -1,6 +1,16 @@ + #ifndef _ASM_CRIS_ARCH_DELAY_H + #define _ASM_CRIS_ARCH_DELAY_H + ++extern void cris_delay10ns(u32 n10ns); ++#define udelay(u) cris_delay10ns((u)*100) ++#define ndelay(n) cris_delay10ns(((n)+9)/10) ++ ++/* ++ * Not used anymore for udelay or ndelay. Referenced by ++ * e.g. init/calibrate.c. All other references are likely bugs; ++ * should be replaced by mdelay, udelay or ndelay. ++ */ ++ + static inline void + __delay(int loops) + { +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/dma.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/dma.h 2005-05-02 12:43:02.000000000 +0200 +@@ -67,7 +67,7 @@ + dma_ext3 + }; + +-int crisv32_request_dma(unsigned int dmanr, const char * device_id, ++int crisv32_request_dma(unsigned int dmanr, const char * device_id, + unsigned options, unsigned bandwidth, enum dma_owner owner); + void crisv32_free_dma(unsigned int dmanr); + +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/Makefile 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/Makefile 2004-01-07 22:16:18.000000000 +0100 +@@ -126,9 +126,9 @@ + + # From /n/asic/projects/guinness/design/ + reg_map.h: $(DESIGNDIR)/top/rtl/global.rmap $(DESIGNDIR)/top/mod/modreg.rmap +- $(RDES2C) -base 0xb0000000 $^ ++ $(RDES2C) -base 0xb0000000 $^ + reg_map_asm.h: $(DESIGNDIR)/top/rtl/global.rmap $(DESIGNDIR)/top/mod/modreg.rmap +- $(RDES2C) -base 0xb0000000 -asm -outfile $@ $^ ++ $(RDES2C) -base 0xb0000000 -asm -outfile $@ $^ + + reg_rdwr.h: $(DESIGNDIR)/top/sw/include/reg_rdwr.h + cat $< | sed -e 's/\$$Id\:/id\:/g' >$@ +@@ -171,14 +171,14 @@ + done + + .PHONY: axw +-## %.axw - Generate the specified .axw file (doesn't work for all files ++## %.axw - Generate the specified .axw file (doesn't work for all files + ## due to inconsistent naming ir .r files. + %.axw: axw + @for RDES in $(REGDESC); do \ + if echo "$$RDES" | grep $* ; then \ + $(RDES2TXT) $$RDES; \ + fi \ +- done ++ done + + .PHONY: clean + ## clean - Remove .h files and .axw files. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/ata/rtl/ata_regs.r +- * id: ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp ++ * id: ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp + * last modfied: Mon Apr 11 16:06:25 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/ata_defs_asm.h ../../inst/ata/rtl/ata_regs.r + * id: $Id: ata_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/bif/rtl/bif_core_regs.r +- * id: bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp ++ * id: bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp + * last modfied: Mon Apr 11 16:06:33 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/bif_core_defs_asm.h ../../inst/bif/rtl/bif_core_regs.r + * id: $Id: bif_core_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/bif/rtl/bif_dma_regs.r +- * id: bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp ++ * id: bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp + * last modfied: Mon Apr 11 16:06:33 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/bif_dma_defs_asm.h ../../inst/bif/rtl/bif_dma_regs.r + * id: $Id: bif_dma_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/bif/rtl/bif_slave_regs.r +- * id: bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp ++ * id: bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp + * last modfied: Mon Apr 11 16:06:34 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/bif_slave_defs_asm.h ../../inst/bif/rtl/bif_slave_regs.r + * id: $Id: bif_slave_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../rtl/config_regs.r +- * id: config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp ++ * id: config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp + * last modfied: Thu Mar 4 12:34:39 2004 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/config_defs_asm.h ../../rtl/config_regs.r + * id: $Id: config_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h 2005-04-24 20:31:04.000000000 +0200 +@@ -3,7 +3,7 @@ + version . */ + + #ifndef _______INST_CRISP_DOC_CPU_VECT_R +-#define _______INST_CRISP_DOC_CPU_VECT_R ++#define _______INST_CRISP_DOC_CPU_VECT_R + #define NMI_INTR_VECT 0x00 + #define RESERVED_1_INTR_VECT 0x01 + #define RESERVED_2_INTR_VECT 0x02 +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/crisp/doc/cris.r +- * id: cris.r,v 1.6 2004/05/05 07:41:12 perz Exp ++ * id: cris.r,v 1.6 2004/05/05 07:41:12 perz Exp + * last modfied: Mon Apr 11 16:06:39 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/cris_defs_asm.h ../../inst/crisp/doc/cris.r + * id: $Id: cris_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/dma/inst/dma_common/rtl/dma_regdes.r +- * id: dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp ++ * id: dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp + * last modfied: Mon Apr 11 16:06:51 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/dma_defs_asm.h ../../inst/dma/inst/dma_common/rtl/dma_regdes.r + * id: $Id: dma_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/eth/rtl/eth_regs.r +- * id: eth_regs.r,v 1.11 2005/02/09 10:48:38 kriskn Exp ++ * id: eth_regs.r,v 1.11 2005/02/09 10:48:38 kriskn Exp + * last modfied: Mon Apr 11 16:07:03 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/eth_defs_asm.h ../../inst/eth/rtl/eth_regs.r + * id: $Id: eth_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/gio/rtl/gio_regs.r +- * id: gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp ++ * id: gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp + * last modfied: Mon Apr 11 16:07:47 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/gio_defs_asm.h ../../inst/gio/rtl/gio_regs.r + * id: $Id: gio_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h 2005-04-24 20:31:04.000000000 +0200 +@@ -3,7 +3,7 @@ + version . */ + + #ifndef _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R +-#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R ++#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R + #define MEMARB_INTR_VECT 0x31 + #define GEN_IO_INTR_VECT 0x32 + #define IOP0_INTR_VECT 0x33 +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/intr_vect/rtl/guinness/ivmask.config.r +- * id: ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp ++ * id: ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp + * last modfied: Mon Apr 11 16:08:03 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/intr_vect_defs_asm.h ../../inst/intr_vect/rtl/guinness/ivmask.config.r + * id: $Id: intr_vect_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../mod/irq_nmi.r + * id: <not found> + * last modfied: Thu Jan 22 09:22:43 2004 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/irq_nmi_defs_asm.h ../../mod/irq_nmi.r + * id: $Id: irq_nmi_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/memarb/rtl/guinness/marb_top.r + * id: <not found> + * last modfied: Mon Apr 11 16:12:16 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/marb_defs_asm.h ../../inst/memarb/rtl/guinness/marb_top.r + * id: $Id: marb_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +@@ -313,7 +313,7 @@ + * file: ../../inst/memarb/rtl/guinness/marb_top.r + * id: <not found> + * last modfied: Mon Apr 11 16:12:16 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/marb_defs_asm.h ../../inst/memarb/rtl/guinness/marb_top.r + * id: $Id: marb_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/mmu/doc/mmu_regs.r +- * id: mmu_regs.r,v 1.12 2004/05/06 13:48:45 mikaeln Exp ++ * id: mmu_regs.r,v 1.12 2004/05/06 13:48:45 mikaeln Exp + * last modfied: Mon Apr 11 17:03:20 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/mmu_defs_asm.h ../../inst/mmu/doc/mmu_regs.r + * id: $Id: mmu_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/pinmux/rtl/guinness/pinmux_regs.r +- * id: pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp ++ * id: pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp + * last modfied: Mon Apr 11 16:09:11 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/pinmux_defs_asm.h ../../inst/pinmux/rtl/guinness/pinmux_regs.r + * id: $Id: pinmux_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,17 +4,17 @@ + /* + * This file is autogenerated from + * file: ../../mod/fakereg.rmap +- * id: fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp ++ * id: fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp + * last modified: Wed Feb 11 20:53:25 2004 + * file: ../../rtl/global.rmap +- * id: global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp ++ * id: global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp + * last modified: Mon Aug 18 17:08:23 2003 + * file: ../../mod/modreg.rmap +- * id: modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp ++ * id: modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp + * last modified: Fri Feb 20 16:40:04 2004 +- * ++ * + * 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 +- * id: $Id: reg_map_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ ++ * id: $Id: reg_map_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. + * + * -*- buffer-read-only: t -*- +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/rt_trace/rtl/rt_regs.r +- * id: rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp ++ * id: rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp + * last modfied: Mon Apr 11 16:09:14 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/rt_trace_defs_asm.h ../../inst/rt_trace/rtl/rt_regs.r + * id: $Id: rt_trace_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/ser/rtl/ser_regs.r +- * id: ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp ++ * id: ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp + * last modfied: Mon Apr 11 16:09:21 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/ser_defs_asm.h ../../inst/ser/rtl/ser_regs.r + * id: $Id: ser_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/syncser/rtl/sser_regs.r +- * id: sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp ++ * id: sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp + * last modfied: Mon Apr 11 16:09:48 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/sser_defs_asm.h ../../inst/syncser/rtl/sser_regs.r + * id: $Id: sser_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/strcop/rtl/strcop_regs.r +- * id: strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp ++ * id: strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp + * last modfied: Mon Apr 11 16:09:38 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/strcop_defs_asm.h ../../inst/strcop/rtl/strcop_regs.r + * id: $Id: strcop_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/strmux/rtl/guinness/strmux_regs.r +- * id: strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp ++ * id: strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp + * last modfied: Mon Apr 11 16:09:43 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/strmux_defs_asm.h ../../inst/strmux/rtl/guinness/strmux_regs.r + * id: $Id: strmux_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/timer/rtl/timer_regs.r +- * id: timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp ++ * id: timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp + * last modfied: Mon Apr 11 16:09:53 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/timer_defs_asm.h ../../inst/timer/rtl/timer_regs.r + * id: $Id: timer_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/ata_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/ata_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/ata/rtl/ata_regs.r +- * id: ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp ++ * id: ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp + * last modfied: Mon Apr 11 16:06:25 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile ata_defs.h ../../inst/ata/rtl/ata_regs.r + * id: $Id: ata_defs.h,v 1.7 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_core_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_core_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/bif/rtl/bif_core_regs.r +- * id: bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp ++ * id: bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp + * last modfied: Mon Apr 11 16:06:33 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile bif_core_defs.h ../../inst/bif/rtl/bif_core_regs.r + * id: $Id: bif_core_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/bif/rtl/bif_dma_regs.r +- * id: bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp ++ * id: bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp + * last modfied: Mon Apr 11 16:06:33 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile bif_dma_defs.h ../../inst/bif/rtl/bif_dma_regs.r + * id: $Id: bif_dma_defs.h,v 1.2 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/bif/rtl/bif_slave_regs.r +- * id: bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp ++ * id: bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp + * last modfied: Mon Apr 11 16:06:34 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile bif_slave_defs.h ../../inst/bif/rtl/bif_slave_regs.r + * id: $Id: bif_slave_defs.h,v 1.2 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/config_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/config_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../rtl/config_regs.r +- * id: config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp ++ * id: config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp + * last modfied: Thu Mar 4 12:34:39 2004 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile config_defs.h ../../rtl/config_regs.r + * id: $Id: config_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/cpu_vect.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/cpu_vect.h 2005-04-24 20:30:58.000000000 +0200 +@@ -3,7 +3,7 @@ + version . */ + + #ifndef _______INST_CRISP_DOC_CPU_VECT_R +-#define _______INST_CRISP_DOC_CPU_VECT_R ++#define _______INST_CRISP_DOC_CPU_VECT_R + #define NMI_INTR_VECT 0x00 + #define RESERVED_1_INTR_VECT 0x01 + #define RESERVED_2_INTR_VECT 0x02 +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/dma.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/dma.h 2006-06-25 17:01:59.000000000 +0200 +@@ -1,6 +1,6 @@ +-/* $Id: dma.h,v 1.7 2005/04/24 18:30:58 starvik Exp $ ++/* $Id: dma.h,v 1.8 2006/06/25 15:01:59 starvik Exp $ + * +- * DMA C definitions and help macros ++ * DMA C definitions and help macros + * + */ + +@@ -98,10 +98,10 @@ + + // give stream command + #define DMA_WR_CMD( inst, cmd_par ) \ +- do { reg_dma_rw_stream_cmd r = {0}; \ +- do { r = REG_RD( dma, inst, rw_stream_cmd ); } while( r.busy ); \ +- r.cmd = (cmd_par); \ +- REG_WR( dma, inst, rw_stream_cmd, r ); \ ++ do { reg_dma_rw_stream_cmd __x = {0}; \ ++ do { __x = REG_RD( dma, inst, rw_stream_cmd ); } while( __x.busy ); \ ++ __x.cmd = (cmd_par); \ ++ REG_WR( dma, inst, rw_stream_cmd, __x ); \ + } while( 0 ) + + // load: g,c,d:burst +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/dma_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/dma_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/dma/inst/dma_common/rtl/dma_regdes.r +- * id: dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp ++ * id: dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp + * last modfied: Mon Apr 11 16:06:51 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile dma_defs.h ../../inst/dma/inst/dma_common/rtl/dma_regdes.r + * id: $Id: dma_defs.h,v 1.7 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/eth_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/eth_defs.h 2006-01-26 14:45:30.000000000 +0100 +@@ -3,12 +3,12 @@ + + /* + * This file is autogenerated from +- * file: ../../inst/eth/rtl/eth_regs.r +- * id: eth_regs.r,v 1.11 2005/02/09 10:48:38 kriskn Exp +- * last modfied: Mon Apr 11 16:07:03 2005 +- * +- * by /n/asic/design/tools/rdesc/src/rdes2c --outfile eth_defs.h ../../inst/eth/rtl/eth_regs.r +- * id: $Id: eth_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $ ++ * file: eth.r ++ * id: eth_regs.r,v 1.16 2005/05/20 15:41:22 perz Exp ++ * last modfied: Mon Jan 9 06:06:41 2006 ++ * ++ * by /n/asic/design/tools/rdesc/rdes2c eth.r ++ * id: $Id: eth_defs.h,v 1.7 2006/01/26 13:45:30 karljope Exp $ + * Any changes here will be lost. + * + * -*- buffer-read-only: t -*- +@@ -116,26 +116,28 @@ + + /* Register rw_ga_lo, scope eth, type rw */ + typedef struct { +- unsigned int table : 32; ++ unsigned int tbl : 32; + } reg_eth_rw_ga_lo; + #define REG_RD_ADDR_eth_rw_ga_lo 16 + #define REG_WR_ADDR_eth_rw_ga_lo 16 + + /* Register rw_ga_hi, scope eth, type rw */ + typedef struct { +- unsigned int table : 32; ++ unsigned int tbl : 32; + } reg_eth_rw_ga_hi; + #define REG_RD_ADDR_eth_rw_ga_hi 20 + #define REG_WR_ADDR_eth_rw_ga_hi 20 + + /* Register rw_gen_ctrl, scope eth, type rw */ + typedef struct { +- unsigned int en : 1; +- unsigned int phy : 2; +- unsigned int protocol : 1; +- unsigned int loopback : 1; +- unsigned int flow_ctrl_dis : 1; +- unsigned int dummy1 : 26; ++ unsigned int en : 1; ++ unsigned int phy : 2; ++ unsigned int protocol : 1; ++ unsigned int loopback : 1; ++ unsigned int flow_ctrl : 1; ++ unsigned int gtxclk_out : 1; ++ unsigned int phyrst_n : 1; ++ unsigned int dummy1 : 24; + } reg_eth_rw_gen_ctrl; + #define REG_RD_ADDR_eth_rw_gen_ctrl 24 + #define REG_WR_ADDR_eth_rw_gen_ctrl 24 +@@ -150,22 +152,23 @@ + unsigned int oversize : 1; + unsigned int bad_crc : 1; + unsigned int duplex : 1; +- unsigned int max_size : 1; +- unsigned int dummy1 : 23; ++ unsigned int max_size : 16; ++ unsigned int dummy1 : 8; + } reg_eth_rw_rec_ctrl; + #define REG_RD_ADDR_eth_rw_rec_ctrl 28 + #define REG_WR_ADDR_eth_rw_rec_ctrl 28 + + /* Register rw_tr_ctrl, scope eth, type rw */ + typedef struct { +- unsigned int crc : 1; +- unsigned int pad : 1; +- unsigned int retry : 1; +- unsigned int ignore_col : 1; +- unsigned int cancel : 1; +- unsigned int hsh_delay : 1; +- unsigned int ignore_crs : 1; +- unsigned int dummy1 : 25; ++ unsigned int crc : 1; ++ unsigned int pad : 1; ++ unsigned int retry : 1; ++ unsigned int ignore_col : 1; ++ unsigned int cancel : 1; ++ unsigned int hsh_delay : 1; ++ unsigned int ignore_crs : 1; ++ unsigned int carrier_ext : 1; ++ unsigned int dummy1 : 24; + } reg_eth_rw_tr_ctrl; + #define REG_RD_ADDR_eth_rw_tr_ctrl 32 + #define REG_WR_ADDR_eth_rw_tr_ctrl 32 +@@ -180,13 +183,10 @@ + + /* Register rw_mgm_ctrl, scope eth, type rw */ + typedef struct { +- unsigned int mdio : 1; +- unsigned int mdoe : 1; +- unsigned int mdc : 1; +- unsigned int phyclk : 1; +- unsigned int txdata : 4; +- unsigned int txen : 1; +- unsigned int dummy1 : 23; ++ unsigned int mdio : 1; ++ unsigned int mdoe : 1; ++ unsigned int mdc : 1; ++ unsigned int dummy1 : 29; + } reg_eth_rw_mgm_ctrl; + #define REG_RD_ADDR_eth_rw_mgm_ctrl 40 + #define REG_WR_ADDR_eth_rw_mgm_ctrl 40 +@@ -196,17 +196,8 @@ + unsigned int mdio : 1; + unsigned int exc_col : 1; + unsigned int urun : 1; +- unsigned int phyclk : 1; +- unsigned int txdata : 4; +- unsigned int txen : 1; +- unsigned int col : 1; +- unsigned int crs : 1; +- unsigned int txclk : 1; +- unsigned int rxdata : 4; +- unsigned int rxer : 1; +- unsigned int rxdv : 1; +- unsigned int rxclk : 1; +- unsigned int dummy1 : 13; ++ unsigned int clk_125 : 1; ++ unsigned int dummy1 : 28; + } reg_eth_r_stat; + #define REG_RD_ADDR_eth_r_stat 44 + +@@ -274,83 +265,83 @@ + + /* Register rw_intr_mask, scope eth, type rw */ + typedef struct { +- unsigned int crc : 1; +- unsigned int align : 1; +- unsigned int oversize : 1; +- unsigned int congestion : 1; +- unsigned int single_col : 1; +- unsigned int mult_col : 1; +- unsigned int late_col : 1; +- unsigned int deferred : 1; +- unsigned int carrier_loss : 1; +- unsigned int sqe_test_err : 1; +- unsigned int orun : 1; +- unsigned int urun : 1; +- unsigned int excessive_col : 1; +- unsigned int mdio : 1; +- unsigned int dummy1 : 18; ++ unsigned int crc : 1; ++ unsigned int align : 1; ++ unsigned int oversize : 1; ++ unsigned int congestion : 1; ++ unsigned int single_col : 1; ++ unsigned int mult_col : 1; ++ unsigned int late_col : 1; ++ unsigned int deferred : 1; ++ unsigned int carrier_loss : 1; ++ unsigned int sqe_test_err : 1; ++ unsigned int orun : 1; ++ unsigned int urun : 1; ++ unsigned int exc_col : 1; ++ unsigned int mdio : 1; ++ unsigned int dummy1 : 18; + } reg_eth_rw_intr_mask; + #define REG_RD_ADDR_eth_rw_intr_mask 76 + #define REG_WR_ADDR_eth_rw_intr_mask 76 + + /* Register rw_ack_intr, scope eth, type rw */ + typedef struct { +- unsigned int crc : 1; +- unsigned int align : 1; +- unsigned int oversize : 1; +- unsigned int congestion : 1; +- unsigned int single_col : 1; +- unsigned int mult_col : 1; +- unsigned int late_col : 1; +- unsigned int deferred : 1; +- unsigned int carrier_loss : 1; +- unsigned int sqe_test_err : 1; +- unsigned int orun : 1; +- unsigned int urun : 1; +- unsigned int excessive_col : 1; +- unsigned int mdio : 1; +- unsigned int dummy1 : 18; ++ unsigned int crc : 1; ++ unsigned int align : 1; ++ unsigned int oversize : 1; ++ unsigned int congestion : 1; ++ unsigned int single_col : 1; ++ unsigned int mult_col : 1; ++ unsigned int late_col : 1; ++ unsigned int deferred : 1; ++ unsigned int carrier_loss : 1; ++ unsigned int sqe_test_err : 1; ++ unsigned int orun : 1; ++ unsigned int urun : 1; ++ unsigned int exc_col : 1; ++ unsigned int mdio : 1; ++ unsigned int dummy1 : 18; + } reg_eth_rw_ack_intr; + #define REG_RD_ADDR_eth_rw_ack_intr 80 + #define REG_WR_ADDR_eth_rw_ack_intr 80 + + /* Register r_intr, scope eth, type r */ + typedef struct { +- unsigned int crc : 1; +- unsigned int align : 1; +- unsigned int oversize : 1; +- unsigned int congestion : 1; +- unsigned int single_col : 1; +- unsigned int mult_col : 1; +- unsigned int late_col : 1; +- unsigned int deferred : 1; +- unsigned int carrier_loss : 1; +- unsigned int sqe_test_err : 1; +- unsigned int orun : 1; +- unsigned int urun : 1; +- unsigned int excessive_col : 1; +- unsigned int mdio : 1; +- unsigned int dummy1 : 18; ++ unsigned int crc : 1; ++ unsigned int align : 1; ++ unsigned int oversize : 1; ++ unsigned int congestion : 1; ++ unsigned int single_col : 1; ++ unsigned int mult_col : 1; ++ unsigned int late_col : 1; ++ unsigned int deferred : 1; ++ unsigned int carrier_loss : 1; ++ unsigned int sqe_test_err : 1; ++ unsigned int orun : 1; ++ unsigned int urun : 1; ++ unsigned int exc_col : 1; ++ unsigned int mdio : 1; ++ unsigned int dummy1 : 18; + } reg_eth_r_intr; + #define REG_RD_ADDR_eth_r_intr 84 + + /* Register r_masked_intr, scope eth, type r */ + typedef struct { +- unsigned int crc : 1; +- unsigned int align : 1; +- unsigned int oversize : 1; +- unsigned int congestion : 1; +- unsigned int single_col : 1; +- unsigned int mult_col : 1; +- unsigned int late_col : 1; +- unsigned int deferred : 1; +- unsigned int carrier_loss : 1; +- unsigned int sqe_test_err : 1; +- unsigned int orun : 1; +- unsigned int urun : 1; +- unsigned int excessive_col : 1; +- unsigned int mdio : 1; +- unsigned int dummy1 : 18; ++ unsigned int crc : 1; ++ unsigned int align : 1; ++ unsigned int oversize : 1; ++ unsigned int congestion : 1; ++ unsigned int single_col : 1; ++ unsigned int mult_col : 1; ++ unsigned int late_col : 1; ++ unsigned int deferred : 1; ++ unsigned int carrier_loss : 1; ++ unsigned int sqe_test_err : 1; ++ unsigned int orun : 1; ++ unsigned int urun : 1; ++ unsigned int exc_col : 1; ++ unsigned int mdio : 1; ++ unsigned int dummy1 : 18; + } reg_eth_r_masked_intr; + #define REG_RD_ADDR_eth_r_masked_intr 88 + +@@ -360,12 +351,15 @@ + regk_eth_discard = 0x00000000, + regk_eth_ether = 0x00000000, + regk_eth_full = 0x00000001, ++ regk_eth_gmii = 0x00000003, ++ regk_eth_gtxclk = 0x00000001, + regk_eth_half = 0x00000000, + regk_eth_hsh = 0x00000001, + regk_eth_mii = 0x00000001, ++ regk_eth_mii_arec = 0x00000002, + regk_eth_mii_clk = 0x00000000, +- regk_eth_mii_rec = 0x00000002, + regk_eth_no = 0x00000000, ++ regk_eth_phyrst = 0x00000000, + regk_eth_rec = 0x00000001, + regk_eth_rw_ga_hi_default = 0x00000000, + regk_eth_rw_ga_lo_default = 0x00000000, +@@ -377,8 +371,8 @@ + regk_eth_rw_ma1_lo_default = 0x00000000, + regk_eth_rw_mgm_ctrl_default = 0x00000000, + regk_eth_rw_test_ctrl_default = 0x00000000, +- regk_eth_size1518 = 0x00000000, +- regk_eth_size1522 = 0x00000001, ++ regk_eth_size1518 = 0x000005ee, ++ regk_eth_size1522 = 0x000005f2, + regk_eth_yes = 0x00000001 + }; + #endif /* __eth_defs_h */ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/eth_defs_fs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/eth_defs_fs.h 2007-02-07 10:36:10.000000000 +0100 +@@ -0,0 +1,384 @@ ++#ifndef __eth_defs_h ++#define __eth_defs_h ++ ++/* ++ * This file is autogenerated from ++ * file: eth_regs.r ++ * id: eth_regs.r,v 1.17 2006/02/08 16:47:19 perz Exp perz ++ * last modfied: Tue Feb 6 13:57:16 2007 ++ * ++ * by /n/asic/design/io/eth/inst/rdesc/rdes2c eth_regs.r ++ * id: $Id: eth_defs_fs.h,v 1.1 2007/02/07 09:36:10 karljope Exp $ ++ * Any changes here will be lost. ++ * ++ * -*- buffer-read-only: t -*- ++ */ ++/* Main access macros */ ++#ifndef REG_RD ++#define REG_RD( scope, inst, reg ) \ ++ REG_READ( reg_##scope##_##reg, \ ++ (inst) + REG_RD_ADDR_##scope##_##reg ) ++#endif ++ ++#ifndef REG_WR ++#define REG_WR( scope, inst, reg, val ) \ ++ REG_WRITE( reg_##scope##_##reg, \ ++ (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) ++#endif ++ ++#ifndef REG_RD_VECT ++#define REG_RD_VECT( scope, inst, reg, index ) \ ++ REG_READ( reg_##scope##_##reg, \ ++ (inst) + REG_RD_ADDR_##scope##_##reg + \ ++ (index) * STRIDE_##scope##_##reg ) ++#endif ++ ++#ifndef REG_WR_VECT ++#define REG_WR_VECT( scope, inst, reg, index, val ) \ ++ REG_WRITE( reg_##scope##_##reg, \ ++ (inst) + REG_WR_ADDR_##scope##_##reg + \ ++ (index) * STRIDE_##scope##_##reg, (val) ) ++#endif ++ ++#ifndef REG_RD_INT ++#define REG_RD_INT( scope, inst, reg ) \ ++ REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg ) ++#endif ++ ++#ifndef REG_WR_INT ++#define REG_WR_INT( scope, inst, reg, val ) \ ++ REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg, (val) ) ++#endif ++ ++#ifndef REG_RD_INT_VECT ++#define REG_RD_INT_VECT( scope, inst, reg, index ) \ ++ REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg + \ ++ (index) * STRIDE_##scope##_##reg ) ++#endif ++ ++#ifndef REG_WR_INT_VECT ++#define REG_WR_INT_VECT( scope, inst, reg, index, val ) \ ++ REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg + \ ++ (index) * STRIDE_##scope##_##reg, (val) ) ++#endif ++ ++#ifndef REG_TYPE_CONV ++#define REG_TYPE_CONV( type, orgtype, val ) \ ++ ( { union { orgtype o; type n; } r; r.o = val; r.n; } ) ++#endif ++ ++#ifndef reg_page_size ++#define reg_page_size 8192 ++#endif ++ ++#ifndef REG_ADDR ++#define REG_ADDR( scope, inst, reg ) \ ++ ( (inst) + REG_RD_ADDR_##scope##_##reg ) ++#endif ++ ++#ifndef REG_ADDR_VECT ++#define REG_ADDR_VECT( scope, inst, reg, index ) \ ++ ( (inst) + REG_RD_ADDR_##scope##_##reg + \ ++ (index) * STRIDE_##scope##_##reg ) ++#endif ++ ++/* C-code for register scope eth */ ++ ++/* Register rw_ma0_lo, scope eth, type rw */ ++typedef struct { ++ unsigned int addr : 32; ++} reg_eth_rw_ma0_lo; ++#define REG_RD_ADDR_eth_rw_ma0_lo 0 ++#define REG_WR_ADDR_eth_rw_ma0_lo 0 ++ ++/* Register rw_ma0_hi, scope eth, type rw */ ++typedef struct { ++ unsigned int addr : 16; ++ unsigned int dummy1 : 16; ++} reg_eth_rw_ma0_hi; ++#define REG_RD_ADDR_eth_rw_ma0_hi 4 ++#define REG_WR_ADDR_eth_rw_ma0_hi 4 ++ ++/* Register rw_ma1_lo, scope eth, type rw */ ++typedef struct { ++ unsigned int addr : 32; ++} reg_eth_rw_ma1_lo; ++#define REG_RD_ADDR_eth_rw_ma1_lo 8 ++#define REG_WR_ADDR_eth_rw_ma1_lo 8 ++ ++/* Register rw_ma1_hi, scope eth, type rw */ ++typedef struct { ++ unsigned int addr : 16; ++ unsigned int dummy1 : 16; ++} reg_eth_rw_ma1_hi; ++#define REG_RD_ADDR_eth_rw_ma1_hi 12 ++#define REG_WR_ADDR_eth_rw_ma1_hi 12 ++ ++/* Register rw_ga_lo, scope eth, type rw */ ++typedef struct { ++ unsigned int table : 32; ++} reg_eth_rw_ga_lo; ++#define REG_RD_ADDR_eth_rw_ga_lo 16 ++#define REG_WR_ADDR_eth_rw_ga_lo 16 ++ ++/* Register rw_ga_hi, scope eth, type rw */ ++typedef struct { ++ unsigned int table : 32; ++} reg_eth_rw_ga_hi; ++#define REG_RD_ADDR_eth_rw_ga_hi 20 ++#define REG_WR_ADDR_eth_rw_ga_hi 20 ++ ++/* Register rw_gen_ctrl, scope eth, type rw */ ++typedef struct { ++ unsigned int en : 1; ++ unsigned int phy : 2; ++ unsigned int protocol : 1; ++ unsigned int loopback : 1; ++ unsigned int flow_ctrl : 1; ++ unsigned int dummy1 : 26; ++} reg_eth_rw_gen_ctrl; ++#define REG_RD_ADDR_eth_rw_gen_ctrl 24 ++#define REG_WR_ADDR_eth_rw_gen_ctrl 24 ++ ++/* Register rw_rec_ctrl, scope eth, type rw */ ++typedef struct { ++ unsigned int ma0 : 1; ++ unsigned int ma1 : 1; ++ unsigned int individual : 1; ++ unsigned int broadcast : 1; ++ unsigned int undersize : 1; ++ unsigned int oversize : 1; ++ unsigned int bad_crc : 1; ++ unsigned int duplex : 1; ++ unsigned int max_size : 1; ++ unsigned int dummy1 : 23; ++} reg_eth_rw_rec_ctrl; ++#define REG_RD_ADDR_eth_rw_rec_ctrl 28 ++#define REG_WR_ADDR_eth_rw_rec_ctrl 28 ++ ++/* Register rw_tr_ctrl, scope eth, type rw */ ++typedef struct { ++ unsigned int crc : 1; ++ unsigned int pad : 1; ++ unsigned int retry : 1; ++ unsigned int ignore_col : 1; ++ unsigned int cancel : 1; ++ unsigned int hsh_delay : 1; ++ unsigned int ignore_crs : 1; ++ unsigned int dummy1 : 25; ++} reg_eth_rw_tr_ctrl; ++#define REG_RD_ADDR_eth_rw_tr_ctrl 32 ++#define REG_WR_ADDR_eth_rw_tr_ctrl 32 ++ ++/* Register rw_clr_err, scope eth, type rw */ ++typedef struct { ++ unsigned int clr : 1; ++ unsigned int dummy1 : 31; ++} reg_eth_rw_clr_err; ++#define REG_RD_ADDR_eth_rw_clr_err 36 ++#define REG_WR_ADDR_eth_rw_clr_err 36 ++ ++/* Register rw_mgm_ctrl, scope eth, type rw */ ++typedef struct { ++ unsigned int mdio : 1; ++ unsigned int mdoe : 1; ++ unsigned int mdc : 1; ++ unsigned int phyclk : 1; ++ unsigned int txdata : 4; ++ unsigned int txen : 1; ++ unsigned int dummy1 : 23; ++} reg_eth_rw_mgm_ctrl; ++#define REG_RD_ADDR_eth_rw_mgm_ctrl 40 ++#define REG_WR_ADDR_eth_rw_mgm_ctrl 40 ++ ++/* Register r_stat, scope eth, type r */ ++typedef struct { ++ unsigned int mdio : 1; ++ unsigned int exc_col : 1; ++ unsigned int urun : 1; ++ unsigned int phyclk : 1; ++ unsigned int txdata : 4; ++ unsigned int txen : 1; ++ unsigned int col : 1; ++ unsigned int crs : 1; ++ unsigned int txclk : 1; ++ unsigned int rxdata : 4; ++ unsigned int rxer : 1; ++ unsigned int rxdv : 1; ++ unsigned int rxclk : 1; ++ unsigned int dummy1 : 13; ++} reg_eth_r_stat; ++#define REG_RD_ADDR_eth_r_stat 44 ++ ++/* Register rs_rec_cnt, scope eth, type rs */ ++typedef struct { ++ unsigned int crc_err : 8; ++ unsigned int align_err : 8; ++ unsigned int oversize : 8; ++ unsigned int congestion : 8; ++} reg_eth_rs_rec_cnt; ++#define REG_RD_ADDR_eth_rs_rec_cnt 48 ++ ++/* Register r_rec_cnt, scope eth, type r */ ++typedef struct { ++ unsigned int crc_err : 8; ++ unsigned int align_err : 8; ++ unsigned int oversize : 8; ++ unsigned int congestion : 8; ++} reg_eth_r_rec_cnt; ++#define REG_RD_ADDR_eth_r_rec_cnt 52 ++ ++/* Register rs_tr_cnt, scope eth, type rs */ ++typedef struct { ++ unsigned int single_col : 8; ++ unsigned int mult_col : 8; ++ unsigned int late_col : 8; ++ unsigned int deferred : 8; ++} reg_eth_rs_tr_cnt; ++#define REG_RD_ADDR_eth_rs_tr_cnt 56 ++ ++/* Register r_tr_cnt, scope eth, type r */ ++typedef struct { ++ unsigned int single_col : 8; ++ unsigned int mult_col : 8; ++ unsigned int late_col : 8; ++ unsigned int deferred : 8; ++} reg_eth_r_tr_cnt; ++#define REG_RD_ADDR_eth_r_tr_cnt 60 ++ ++/* Register rs_phy_cnt, scope eth, type rs */ ++typedef struct { ++ unsigned int carrier_loss : 8; ++ unsigned int sqe_err : 8; ++ unsigned int dummy1 : 16; ++} reg_eth_rs_phy_cnt; ++#define REG_RD_ADDR_eth_rs_phy_cnt 64 ++ ++/* Register r_phy_cnt, scope eth, type r */ ++typedef struct { ++ unsigned int carrier_loss : 8; ++ unsigned int sqe_err : 8; ++ unsigned int dummy1 : 16; ++} reg_eth_r_phy_cnt; ++#define REG_RD_ADDR_eth_r_phy_cnt 68 ++ ++/* Register rw_test_ctrl, scope eth, type rw */ ++typedef struct { ++ unsigned int snmp_inc : 1; ++ unsigned int snmp : 1; ++ unsigned int backoff : 1; ++ unsigned int dummy1 : 29; ++} reg_eth_rw_test_ctrl; ++#define REG_RD_ADDR_eth_rw_test_ctrl 72 ++#define REG_WR_ADDR_eth_rw_test_ctrl 72 ++ ++/* Register rw_intr_mask, scope eth, type rw */ ++typedef struct { ++ unsigned int crc : 1; ++ unsigned int align : 1; ++ unsigned int oversize : 1; ++ unsigned int congestion : 1; ++ unsigned int single_col : 1; ++ unsigned int mult_col : 1; ++ unsigned int late_col : 1; ++ unsigned int deferred : 1; ++ unsigned int carrier_loss : 1; ++ unsigned int sqe_test_err : 1; ++ unsigned int orun : 1; ++ unsigned int urun : 1; ++ unsigned int exc_col : 1; ++ unsigned int mdio : 1; ++ unsigned int dummy1 : 18; ++} reg_eth_rw_intr_mask; ++#define REG_RD_ADDR_eth_rw_intr_mask 76 ++#define REG_WR_ADDR_eth_rw_intr_mask 76 ++ ++/* Register rw_ack_intr, scope eth, type rw */ ++typedef struct { ++ unsigned int crc : 1; ++ unsigned int align : 1; ++ unsigned int oversize : 1; ++ unsigned int congestion : 1; ++ unsigned int single_col : 1; ++ unsigned int mult_col : 1; ++ unsigned int late_col : 1; ++ unsigned int deferred : 1; ++ unsigned int carrier_loss : 1; ++ unsigned int sqe_test_err : 1; ++ unsigned int orun : 1; ++ unsigned int urun : 1; ++ unsigned int exc_col : 1; ++ unsigned int mdio : 1; ++ unsigned int dummy1 : 18; ++} reg_eth_rw_ack_intr; ++#define REG_RD_ADDR_eth_rw_ack_intr 80 ++#define REG_WR_ADDR_eth_rw_ack_intr 80 ++ ++/* Register r_intr, scope eth, type r */ ++typedef struct { ++ unsigned int crc : 1; ++ unsigned int align : 1; ++ unsigned int oversize : 1; ++ unsigned int congestion : 1; ++ unsigned int single_col : 1; ++ unsigned int mult_col : 1; ++ unsigned int late_col : 1; ++ unsigned int deferred : 1; ++ unsigned int carrier_loss : 1; ++ unsigned int sqe_test_err : 1; ++ unsigned int orun : 1; ++ unsigned int urun : 1; ++ unsigned int exc_col : 1; ++ unsigned int mdio : 1; ++ unsigned int dummy1 : 18; ++} reg_eth_r_intr; ++#define REG_RD_ADDR_eth_r_intr 84 ++ ++/* Register r_masked_intr, scope eth, type r */ ++typedef struct { ++ unsigned int crc : 1; ++ unsigned int align : 1; ++ unsigned int oversize : 1; ++ unsigned int congestion : 1; ++ unsigned int single_col : 1; ++ unsigned int mult_col : 1; ++ unsigned int late_col : 1; ++ unsigned int deferred : 1; ++ unsigned int carrier_loss : 1; ++ unsigned int sqe_test_err : 1; ++ unsigned int orun : 1; ++ unsigned int urun : 1; ++ unsigned int exc_col : 1; ++ unsigned int mdio : 1; ++ unsigned int dummy1 : 18; ++} reg_eth_r_masked_intr; ++#define REG_RD_ADDR_eth_r_masked_intr 88 ++ ++ ++/* Constants */ ++enum { ++ regk_eth_discard = 0x00000000, ++ regk_eth_ether = 0x00000000, ++ regk_eth_full = 0x00000001, ++ regk_eth_half = 0x00000000, ++ regk_eth_hsh = 0x00000001, ++ regk_eth_mii = 0x00000001, ++ regk_eth_mii_arec = 0x00000002, ++ regk_eth_mii_clk = 0x00000000, ++ regk_eth_no = 0x00000000, ++ regk_eth_rec = 0x00000001, ++ regk_eth_rw_ga_hi_default = 0x00000000, ++ regk_eth_rw_ga_lo_default = 0x00000000, ++ regk_eth_rw_gen_ctrl_default = 0x00000000, ++ regk_eth_rw_intr_mask_default = 0x00000000, ++ regk_eth_rw_ma0_hi_default = 0x00000000, ++ regk_eth_rw_ma0_lo_default = 0x00000000, ++ regk_eth_rw_ma1_hi_default = 0x00000000, ++ regk_eth_rw_ma1_lo_default = 0x00000000, ++ regk_eth_rw_mgm_ctrl_default = 0x00000000, ++ regk_eth_rw_test_ctrl_default = 0x00000000, ++ regk_eth_size1518 = 0x00000000, ++ regk_eth_size1522 = 0x00000001, ++ regk_eth_yes = 0x00000001 ++}; ++#endif /* __eth_defs_h */ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/extmem_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/extmem_defs.h 2004-06-04 09:15:33.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/ext_mem/mod/extmem_regs.r +- * id: extmem_regs.r,v 1.1 2004/02/16 13:29:30 np Exp ++ * id: extmem_regs.r,v 1.1 2004/02/16 13:29:30 np Exp + * last modfied: Tue Mar 30 22:26:21 2004 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile extmem_defs.h ../../inst/ext_mem/mod/extmem_regs.r + * id: $Id: extmem_defs.h,v 1.5 2004/06/04 07:15:33 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/gio_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/gio_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/gio/rtl/gio_regs.r +- * id: gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp ++ * id: gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp + * last modfied: Mon Apr 11 16:07:47 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile gio_defs.h ../../inst/gio/rtl/gio_regs.r + * id: $Id: gio_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/intr_vect.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/intr_vect.h 2005-05-23 14:59:21.000000000 +0200 +@@ -3,7 +3,7 @@ + version . */ + + #ifndef _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R +-#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R ++#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R + #define MEMARB_INTR_VECT 0x31 + #define GEN_IO_INTR_VECT 0x32 + #define IOP0_INTR_VECT 0x33 +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/intr_vect_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/intr_vect_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/intr_vect/rtl/guinness/ivmask.config.r +- * id: ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp ++ * id: ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp + * last modfied: Mon Apr 11 16:08:03 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile intr_vect_defs.h ../../inst/intr_vect/rtl/guinness/ivmask.config.r + * id: $Id: intr_vect_defs.h,v 1.8 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +@@ -209,7 +209,7 @@ + #define REG_RD_ADDR_intr_vect_r_guru 16 + + /* Register rw_ipi, scope intr_vect, type rw */ +-typedef struct ++typedef struct + { + unsigned int vector; + } reg_intr_vect_rw_ipi; +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/Makefile 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/Makefile 2004-01-07 21:34:55.000000000 +0100 +@@ -125,14 +125,14 @@ + done + + .PHONY: axw +-## %.axw - Generate the specified .axw file (doesn't work for all files ++## %.axw - Generate the specified .axw file (doesn't work for all files + ## due to inconsistent naming of .r files. + %.axw: axw + @for RDES in $(IOPROCREGDESC); do \ + if echo "$$RDES" | grep $* ; then \ + $(RDES2TXT) $$RDES; \ + fi \ +- done ++ done + + .PHONY: clean + ## clean - Remove .h files and .axw files. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_crc_par.r + * id: <not found> + * last modfied: Mon Apr 11 16:08:45 2005 +- * ++ * + * 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 + * id: $Id: iop_crc_par_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_dmc_in.r +- * id: iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp ++ * id: iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp + * last modfied: Mon Apr 11 16:08:45 2005 +- * ++ * + * 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 + * id: $Id: iop_dmc_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_dmc_out.r +- * id: iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp ++ * id: iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp + * last modfied: Mon Apr 11 16:08:45 2005 +- * ++ * + * 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 + * id: $Id: iop_dmc_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_fifo_in.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:07 2005 +- * ++ * + * 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 + * id: $Id: iop_fifo_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_fifo_in_extra.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:08 2005 +- * ++ * + * 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 + * id: $Id: iop_fifo_in_extra_defs_asm.h,v 1.1 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_fifo_out.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:09 2005 +- * ++ * + * 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 + * id: $Id: iop_fifo_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_fifo_out_extra.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:10 2005 +- * ++ * + * 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 + * id: $Id: iop_fifo_out_extra_defs_asm.h,v 1.1 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_mpu.r +- * id: iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp ++ * id: iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp + * last modfied: Mon Apr 11 16:08:45 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_mpu_defs_asm.h ../../inst/io_proc/rtl/iop_mpu.r + * id: $Id: iop_mpu_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -1,5 +1,5 @@ + /* Autogenerated Changes here will be lost! +- * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg ++ * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg + */ + #define iop_version 0 + #define iop_fifo_in0_extra 64 +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_sap_in.r + * id: <not found> + * last modfied: Mon Apr 11 16:08:45 2005 +- * ++ * + * 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 + * id: $Id: iop_sap_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_sap_out.r + * id: <not found> + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * 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 + * id: $Id: iop_sap_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_scrc_in.r +- * id: iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp ++ * id: iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * 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 + * id: $Id: iop_scrc_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_scrc_out.r +- * id: iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp ++ * id: iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * 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 + * id: $Id: iop_scrc_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_spu.r + * id: <not found> + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_spu_defs_asm.h ../../inst/io_proc/rtl/iop_spu.r + * id: $Id: iop_spu_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/guinness/iop_sw_cfg.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:19 2005 +- * ++ * + * 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 + * id: $Id: iop_sw_cfg_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/guinness/iop_sw_cpu.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:19 2005 +- * ++ * + * 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 + * id: $Id: iop_sw_cpu_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/guinness/iop_sw_mpu.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:19 2005 +- * ++ * + * 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 + * id: $Id: iop_sw_mpu_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/guinness/iop_sw_spu.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:19 2005 +- * ++ * + * 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 + * id: $Id: iop_sw_spu_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_timer_grp.r +- * id: iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp ++ * id: iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * 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 + * id: $Id: iop_timer_grp_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_trigger_grp.r +- * id: iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp ++ * id: iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * 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 + * id: $Id: iop_trigger_grp_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/guinness/iop_version.r +- * id: iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp ++ * id: iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp + * last modfied: Mon Apr 11 16:08:44 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_version_defs_asm.h ../../inst/io_proc/rtl/guinness/iop_version.r + * id: $Id: iop_version_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_crc_par.r + * id: <not found> + * last modfied: Mon Apr 11 16:08:45 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_crc_par_defs.h ../../inst/io_proc/rtl/iop_crc_par.r + * id: $Id: iop_crc_par_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_dmc_in.r +- * id: iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp ++ * id: iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp + * last modfied: Mon Apr 11 16:08:45 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_dmc_in_defs.h ../../inst/io_proc/rtl/iop_dmc_in.r + * id: $Id: iop_dmc_in_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_dmc_out.r +- * id: iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp ++ * id: iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp + * last modfied: Mon Apr 11 16:08:45 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_dmc_out_defs.h ../../inst/io_proc/rtl/iop_dmc_out.r + * id: $Id: iop_dmc_out_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_fifo_in.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:07 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_in_defs.h ../../inst/io_proc/rtl/iop_fifo_in.r + * id: $Id: iop_fifo_in_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_fifo_in_extra.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:08 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_in_extra_defs.h ../../inst/io_proc/rtl/iop_fifo_in_extra.r + * id: $Id: iop_fifo_in_extra_defs.h,v 1.1 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_fifo_out.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:09 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_out_defs.h ../../inst/io_proc/rtl/iop_fifo_out.r + * id: $Id: iop_fifo_out_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_fifo_out_extra.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:10 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_out_extra_defs.h ../../inst/io_proc/rtl/iop_fifo_out_extra.r + * id: $Id: iop_fifo_out_extra_defs.h,v 1.1 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_mpu.r +- * id: iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp ++ * id: iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp + * last modfied: Mon Apr 11 16:08:45 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_mpu_defs.h ../../inst/io_proc/rtl/iop_mpu.r + * id: $Id: iop_mpu_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -96,189 +96,189 @@ + #define MPU_ADD_RRR(S,N,D) (0x4000008C | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADD_RRS(S,N,D) (0x4000048C | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADD_RSR(S,N,D) (0x4000018C | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADD_RSS(S,N,D) (0x4000058C | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADD_SRR(S,N,D) (0x4000028C | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADD_SRS(S,N,D) (0x4000068C | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADD_SSR(S,N,D) (0x4000038C | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADD_SSS(S,N,D) (0x4000078C | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADDQ_RIR(S,N,D) (0x10000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADDQ_IRR(S,N,D) (0x10000000 | ((S & ((1 << 16) - 1)) << 0)\ + | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADDX_IRR_INSTR(S,N,D) (0xC000008C | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADDX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_ADDX_RIR_INSTR(S,N,D) (0xC000008C | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADDX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_ADDX_ISR_INSTR(S,N,D) (0xC000028C | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADDX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_ADDX_SIR_INSTR(S,N,D) (0xC000028C | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADDX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_ADDX_IRS_INSTR(S,N,D) (0xC000048C | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADDX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_ADDX_RIS_INSTR(S,N,D) (0xC000048C | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADDX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_ADDX_ISS_INSTR(S,N,D) (0xC000068C | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADDX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_ADDX_SIS_INSTR(S,N,D) (0xC000068C | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ADDX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_AND_RRR(S,N,D) (0x4000008A | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_AND_RRS(S,N,D) (0x4000048A | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_AND_RSR(S,N,D) (0x4000018A | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_AND_RSS(S,N,D) (0x4000058A | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_AND_SRR(S,N,D) (0x4000028A | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_AND_SRS(S,N,D) (0x4000068A | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_AND_SSR(S,N,D) (0x4000038A | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_AND_SSS(S,N,D) (0x4000078A | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ANDQ_RIR(S,N,D) (0x08000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ANDQ_IRR(S,N,D) (0x08000000 | ((S & ((1 << 16) - 1)) << 0)\ + | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ANDX_RIR_INSTR(S,N,D) (0xC000008A | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ANDX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_ANDX_IRR_INSTR(S,N,D) (0xC000008A | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ANDX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_ANDX_ISR_INSTR(S,N,D) (0xC000028A | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ANDX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_ANDX_SIR_INSTR(S,N,D) (0xC000028A | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ANDX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_ANDX_IRS_INSTR(S,N,D) (0xC000048A | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ANDX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_ANDX_ISS_INSTR(S,N,D) (0xC000068A | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ANDX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_ANDX_RIS_INSTR(S,N,D) (0xC000048A | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ANDX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_ANDX_SIS_INSTR(S,N,D) (0xC000068A | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ANDX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_BA_I(S) (0x60000000 | ((S & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_BAR_R(S) (0x62000000 | ((S & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_BAR_S(S) (0x63000000 | ((S & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_BBC_RII(S,N,D) (0x78000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 21)\ + | ((D & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_BBS_RII(S,N,D) (0x7C000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 21)\ + | ((D & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_BNZ_RI(S,D) (0x74400000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_BMI_RI(S,D) (0x7FE00000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_BPL_RI(S,D) (0x7BE00000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_BZ_RI(S,D) (0x74000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_DI() (0x40000001) + + #define MPU_EI() (0x40000003) +@@ -286,243 +286,243 @@ + #define MPU_HALT() (0x40000002) + + #define MPU_JIR_I(S) (0x60200000 | ((S & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_JIR_R(S) (0x62200000 | ((S & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_JIR_S(S) (0x63200000 | ((S & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_JNT() (0x61000000) + + #define MPU_JSR_I(S) (0x60400000 | ((S & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_JSR_R(S) (0x62400000 | ((S & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_JSR_S(S) (0x63400000 | ((S & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_LSL_RRR(S,N,D) (0x4000008E | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSL_RRS(S,N,D) (0x4000048E | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSL_RSR(S,N,D) (0x4000018E | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSL_RSS(S,N,D) (0x4000058E | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSL_SRR(S,N,D) (0x4000028E | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSL_SRS(S,N,D) (0x4000068E | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSL_SSR(S,N,D) (0x4000038E | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSL_SSS(S,N,D) (0x4000078E | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSLQ_RIR(S,N,D) (0x18000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSR_RRR(S,N,D) (0x4000008F | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSR_RRS(S,N,D) (0x4000048F | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSR_RSR(S,N,D) (0x4000018F | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSR_RSS(S,N,D) (0x4000058F | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSR_SRR(S,N,D) (0x4000028F | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSR_SRS(S,N,D) (0x4000068F | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSR_SSR(S,N,D) (0x4000038F | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSR_SSS(S,N,D) (0x4000078F | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LSRQ_RIR(S,N,D) (0x1C000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_LW_IR(S,D) (0x64400000 | ((S & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_LW_IS(S,D) (0x64600000 | ((S & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_LW_RR(S,D) (0x66400000 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_LW_RS(S,D) (0x66600000 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_LW_SR(S,D) (0x67400000 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_LW_SS(S,D) (0x67600000 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_LW_RIR(S,N,D) (0x66400000 | ((S & ((1 << 5) - 1)) << 11)\ + | ((N & ((1 << 8) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_LW_RIS(S,N,D) (0x66600000 | ((S & ((1 << 5) - 1)) << 11)\ + | ((N & ((1 << 8) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_LW_SIR(S,N,D) (0x67400000 | ((S & ((1 << 5) - 1)) << 11)\ + | ((N & ((1 << 8) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_LW_SIS(S,N,D) (0x67600000 | ((S & ((1 << 5) - 1)) << 11)\ + | ((N & ((1 << 8) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_MOVE_RR(S,D) (0x40000081 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_MOVE_RS(S,D) (0x40000481 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_MOVE_SR(S,D) (0x40000181 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_MOVE_SS(S,D) (0x40000581 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_MOVEQ_IR(S,D) (0x24000000 | ((S & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_MOVEQ_IS(S,D) (0x2C000000 | ((S & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_MOVEX_IR_INSTR(S,D) (0xC0000081 | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_MOVEX_IR_IMM(S,D) (S & 0xFFFFFFFF) + + #define MPU_MOVEX_IS_INSTR(S,D) (0xC0000481 | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_MOVEX_IS_IMM(S,D) (S & 0xFFFFFFFF) + + #define MPU_NOP() (0x40000000) + + #define MPU_NOT_RR(S,D) (0x40100081 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_NOT_RS(S,D) (0x40100481 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_NOT_SR(S,D) (0x40100181 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_NOT_SS(S,D) (0x40100581 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_OR_RRR(S,N,D) (0x4000008B | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_OR_RRS(S,N,D) (0x4000048B | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_OR_RSR(S,N,D) (0x4000018B | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_OR_RSS(S,N,D) (0x4000058B | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_OR_SRR(S,N,D) (0x4000028B | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_OR_SRS(S,N,D) (0x4000068B | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_OR_SSR(S,N,D) (0x4000038B | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_OR_SSS(S,N,D) (0x4000078B | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ORQ_RIR(S,N,D) (0x0C000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ORQ_IRR(S,N,D) (0x0C000000 | ((S & ((1 << 16) - 1)) << 0)\ + | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ORX_RIR_INSTR(S,N,D) (0xC000008B | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ORX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_ORX_IRR_INSTR(S,N,D) (0xC000008B | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ORX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_ORX_SIR_INSTR(S,N,D) (0xC000028B | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ORX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_ORX_ISR_INSTR(S,N,D) (0xC000028B | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ORX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_ORX_RIS_INSTR(S,N,D) (0xC000048B | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ORX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_ORX_IRS_INSTR(S,N,D) (0xC000048B | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ORX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_ORX_SIS_INSTR(S,N,D) (0xC000068B | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ORX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_ORX_ISS_INSTR(S,N,D) (0xC000068B | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_ORX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_RET() (0x63003000) +@@ -531,232 +531,232 @@ + + #define MPU_RR_IR(S,D) (0x50000000 | ((S & ((1 << 11) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_RR_SR(S,D) (0x50008000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_RW_RI(S,D) (0x56000000 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 11) - 1)) << 0)) +- ++ + #define MPU_RW_RS(S,D) (0x57000000 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_RWQ_II(S,D) (0x58000000 | ((S & ((1 << 16) - 1)) << 11)\ + | ((D & ((1 << 11) - 1)) << 0)) +- ++ + #define MPU_RWQ_IS(S,D) (0x55000000 | ((S & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_RWX_II_INSTR(S,D) (0xD4000000 | ((D & ((1 << 11) - 1)) << 0)) +- ++ + #define MPU_RWX_II_IMM(S,D) (S & 0xFFFFFFFF) + + #define MPU_RWX_IS_INSTR(S,D) (0xD5000000 | ((D & ((1 << 5) - 1)) << 16)) +- ++ + #define MPU_RWX_IS_IMM(S,D) (S & 0xFFFFFFFF) + + #define MPU_SUB_RRR(S,N,D) (0x4000008D | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUB_RRS(S,N,D) (0x4000048D | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUB_RSR(S,N,D) (0x4000018D | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUB_RSS(S,N,D) (0x4000058D | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUB_SRR(S,N,D) (0x4000028D | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUB_SRS(S,N,D) (0x4000068D | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUB_SSR(S,N,D) (0x4000038D | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUB_SSS(S,N,D) (0x4000078D | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUBQ_RIR(S,N,D) (0x14000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUBX_RIR_INSTR(S,N,D) (0xC000008D | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUBX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_SUBX_SIR_INSTR(S,N,D) (0xC000028D | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUBX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_SUBX_RIS_INSTR(S,N,D) (0xC000048D | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUBX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_SUBX_SIS_INSTR(S,N,D) (0xC000068D | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_SUBX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_SW_RI(S,D) (0x64000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_SW_SI(S,D) (0x64200000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_SW_RR(S,D) (0x66000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SW_SR(S,D) (0x66200000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SW_RS(S,D) (0x67000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SW_SS(S,D) (0x67200000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SW_RIR(S,N,D) (0x66000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 8) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SW_SIR(S,N,D) (0x66200000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 8) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SW_RIS(S,N,D) (0x67000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 8) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SW_SIS(S,N,D) (0x67200000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 8) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SWX_II_INSTR(S,D) (0xE4000000 | ((D & ((1 << 16) - 1)) << 0)) +- ++ + #define MPU_SWX_II_IMM(S,D) (S & 0xFFFFFFFF) + + #define MPU_SWX_IR_INSTR(S,D) (0xE6000000 | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SWX_IR_IMM(S,D) (S & 0xFFFFFFFF) + + #define MPU_SWX_IS_INSTR(S,D) (0xE7000000 | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SWX_IS_IMM(S,D) (S & 0xFFFFFFFF) + + #define MPU_SWX_IIR_INSTR(S,N,D) (0xE6000000 | ((N & ((1 << 8) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SWX_IIR_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_SWX_IIS_INSTR(S,N,D) (0xE7000000 | ((N & ((1 << 8) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 11)) +- ++ + #define MPU_SWX_IIS_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_XOR_RRR(S,N,D) (0x40000089 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XOR_RRS(S,N,D) (0x40000489 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XOR_RSR(S,N,D) (0x40000189 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XOR_RSS(S,N,D) (0x40000589 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XOR_SRR(S,N,D) (0x40000289 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XOR_SRS(S,N,D) (0x40000689 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XOR_SSR(S,N,D) (0x40000389 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XOR_SSS(S,N,D) (0x40000789 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XOR_RR(S,D) (0x40000088 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XOR_RS(S,D) (0x40000488 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XOR_SR(S,D) (0x40000188 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XOR_SS(S,D) (0x40000588 | ((S & ((1 << 5) - 1)) << 11)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XORQ_RIR(S,N,D) (0x04000000 | ((S & ((1 << 5) - 1)) << 16)\ + | ((N & ((1 << 16) - 1)) << 0)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XORQ_IRR(S,N,D) (0x04000000 | ((S & ((1 << 16) - 1)) << 0)\ + | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XORX_RIR_INSTR(S,N,D) (0xC0000089 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XORX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_XORX_IRR_INSTR(S,N,D) (0xC0000089 | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XORX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_XORX_SIR_INSTR(S,N,D) (0xC0000289 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XORX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_XORX_ISR_INSTR(S,N,D) (0xC0000289 | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XORX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_XORX_RIS_INSTR(S,N,D) (0xC0000489 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XORX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_XORX_IRS_INSTR(S,N,D) (0xC0000489 | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XORX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF) + + #define MPU_XORX_SIS_INSTR(S,N,D) (0xC0000689 | ((S & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XORX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF) + + #define MPU_XORX_ISS_INSTR(S,N,D) (0xC0000689 | ((N & ((1 << 5) - 1)) << 16)\ + | ((D & ((1 << 5) - 1)) << 21)) +- ++ + #define MPU_XORX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF) + + +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 +--- 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 ++++ 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 +@@ -1,5 +1,5 @@ + /* Autogenerated Changes here will be lost! +- * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg ++ * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg + */ + #define regi_iop_version (regi_iop + 0) + #define regi_iop_fifo_in0_extra (regi_iop + 64) +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_sap_in.r + * id: <not found> + * last modfied: Mon Apr 11 16:08:45 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sap_in_defs.h ../../inst/io_proc/rtl/iop_sap_in.r + * id: $Id: iop_sap_in_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_sap_out.r + * id: <not found> + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sap_out_defs.h ../../inst/io_proc/rtl/iop_sap_out.r + * id: $Id: iop_sap_out_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_scrc_in.r +- * id: iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp ++ * id: iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_scrc_in_defs.h ../../inst/io_proc/rtl/iop_scrc_in.r + * id: $Id: iop_scrc_in_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_scrc_out.r +- * id: iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp ++ * id: iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_scrc_out_defs.h ../../inst/io_proc/rtl/iop_scrc_out.r + * id: $Id: iop_scrc_out_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/iop_spu.r + * id: <not found> + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_spu_defs.h ../../inst/io_proc/rtl/iop_spu.r + * id: $Id: iop_spu_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/guinness/iop_sw_cfg.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:19 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_cfg_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_cfg.r + * id: $Id: iop_sw_cfg_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/guinness/iop_sw_cpu.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:19 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_cpu_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_cpu.r + * id: $Id: iop_sw_cpu_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/guinness/iop_sw_mpu.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:19 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_mpu_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_mpu.r + * id: $Id: iop_sw_mpu_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -6,7 +6,7 @@ + * file: ../../inst/io_proc/rtl/guinness/iop_sw_spu.r + * id: <not found> + * last modfied: Mon Apr 11 16:10:19 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_spu_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_spu.r + * id: $Id: iop_sw_spu_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_timer_grp.r +- * id: iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp ++ * id: iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_timer_grp_defs.h ../../inst/io_proc/rtl/iop_timer_grp.r + * id: $Id: iop_timer_grp_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/iop_trigger_grp.r +- * id: iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp ++ * id: iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp + * last modfied: Mon Apr 11 16:08:46 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_trigger_grp_defs.h ../../inst/io_proc/rtl/iop_trigger_grp.r + * id: $Id: iop_trigger_grp_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- 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 ++++ 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 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/io_proc/rtl/guinness/iop_version.r +- * id: iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp ++ * id: iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp + * last modfied: Mon Apr 11 16:08:44 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_version_defs.h ../../inst/io_proc/rtl/guinness/iop_version.r + * id: $Id: iop_version_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -6,7 +6,7 @@ + * file: ../../mod/irq_nmi.r + * id: <not found> + * last modfied: Thu Jan 22 09:22:43 2004 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile irq_nmi_defs.h ../../mod/irq_nmi.r + * id: $Id: irq_nmi_defs.h,v 1.1 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h 2004-06-04 09:15:33.000000000 +0200 +@@ -6,7 +6,7 @@ + * file: ../../inst/memarb/rtl/guinness/marb_top.r + * id: <not found> + * last modfied: Fri Nov 7 15:36:04 2003 +- * ++ * + * 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 + * id: $Id: marb_bp_defs.h,v 1.2 2004/06/04 07:15:33 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/marb_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/marb_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -6,7 +6,7 @@ + * file: ../../inst/memarb/rtl/guinness/marb_top.r + * id: <not found> + * last modfied: Mon Apr 11 16:12:16 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile marb_defs.h ../../inst/memarb/rtl/guinness/marb_top.r + * id: $Id: marb_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +@@ -265,7 +265,7 @@ + * file: ../../inst/memarb/rtl/guinness/marb_top.r + * id: <not found> + * last modfied: Mon Apr 11 16:12:16 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile marb_defs.h ../../inst/memarb/rtl/guinness/marb_top.r + * id: $Id: marb_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/pinmux_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/pinmux_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/pinmux/rtl/guinness/pinmux_regs.r +- * id: pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp ++ * id: pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp + * last modfied: Mon Apr 11 16:09:11 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile pinmux_defs.h ../../inst/pinmux/rtl/guinness/pinmux_regs.r + * id: $Id: pinmux_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/reg_map.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/reg_map.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,17 +4,17 @@ + /* + * This file is autogenerated from + * file: ../../mod/fakereg.rmap +- * id: fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp ++ * id: fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp + * last modified: Wed Feb 11 20:53:25 2004 + * file: ../../rtl/global.rmap +- * id: global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp ++ * id: global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp + * last modified: Mon Aug 18 17:08:23 2003 + * file: ../../mod/modreg.rmap +- * id: modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp ++ * id: modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp + * last modified: Fri Feb 20 16:40:04 2004 +- * ++ * + * 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 +- * id: $Id: reg_map.h,v 1.7 2005/04/24 18:30:58 starvik Exp $ ++ * id: $Id: reg_map.h,v 1.7 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. + * + * -*- buffer-read-only: t -*- +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/rt_trace/rtl/rt_regs.r +- * id: rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp ++ * id: rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp + * last modfied: Mon Apr 11 16:09:14 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile rt_trace_defs.h ../../inst/rt_trace/rtl/rt_regs.r + * id: $Id: rt_trace_defs.h,v 1.1 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/ser_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/ser_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/ser/rtl/ser_regs.r +- * id: ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp ++ * id: ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp + * last modfied: Mon Apr 11 16:09:21 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile ser_defs.h ../../inst/ser/rtl/ser_regs.r + * id: $Id: ser_defs.h,v 1.10 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/sser_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/sser_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/syncser/rtl/sser_regs.r +- * id: sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp ++ * id: sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp + * last modfied: Mon Apr 11 16:09:48 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile sser_defs.h ../../inst/syncser/rtl/sser_regs.r + * id: $Id: sser_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strcop.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strcop.h 2003-10-22 15:27:12.000000000 +0200 +@@ -54,4 +54,4 @@ + hash_iv = 1 + }; + +- ++ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strcop_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strcop_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/strcop/rtl/strcop_regs.r +- * id: strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp ++ * id: strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp + * last modfied: Mon Apr 11 16:09:38 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile strcop_defs.h ../../inst/strcop/rtl/strcop_regs.r + * id: $Id: strcop_defs.h,v 1.7 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strmux_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strmux_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/strmux/rtl/guinness/strmux_regs.r +- * id: strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp ++ * id: strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp + * last modfied: Mon Apr 11 16:09:43 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile strmux_defs.h ../../inst/strmux/rtl/guinness/strmux_regs.r + * id: $Id: strmux_defs.h,v 1.5 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/supp_reg.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/supp_reg.h 2004-12-17 11:23:03.000000000 +0100 +@@ -37,7 +37,7 @@ + #define RW_MM_TLB_HI 6 + #define RW_MM_TLB_PGD 7 + +-#define BANK_GC 0 ++#define BANK_GC 0 + #define BANK_IM 1 + #define BANK_DM 2 + #define BANK_BP 3 +@@ -63,7 +63,7 @@ + SPEC_REG_WR(SPEC_REG_SRS,b); \ + NOP(); \ + NOP(); \ +- NOP(); ++ NOP(); + + #define SUPP_REG_WR(r,v) \ + __asm__ __volatile__ ("move %0, $S" STRINGIFYFY(r) "\n\t" \ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/timer_defs.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/timer_defs.h 2005-04-24 20:30:58.000000000 +0200 +@@ -4,9 +4,9 @@ + /* + * This file is autogenerated from + * file: ../../inst/timer/rtl/timer_regs.r +- * id: timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp ++ * id: timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp + * last modfied: Mon Apr 11 16:09:53 2005 +- * ++ * + * by /n/asic/design/tools/rdesc/src/rdes2c --outfile timer_defs.h ../../inst/timer/rtl/timer_regs.r + * id: $Id: timer_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $ + * Any changes here will be lost. +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/ide.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/ide.h 2005-08-23 11:44:37.000000000 +0200 +@@ -33,7 +33,7 @@ + * together in a hwgroup, and will serialize accesses. this is good, because + * we can't access more than one interface at the same time on ETRAX100. + */ +- return ATA_INTR_VECT; ++ return ATA_INTR_VECT; + } + + static inline unsigned long ide_default_io_base(int index) +@@ -44,7 +44,7 @@ + * so we can use the io_base to remember that bitfield. + */ + ctrl2.sel = index; +- ++ + return REG_TYPE_CONV(unsigned long, reg_ata_rw_ctrl2, ctrl2); + } + +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/io.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/io.h 2006-12-06 14:17:02.000000000 +0100 +@@ -1,6 +1,7 @@ + #ifndef _ASM_ARCH_CRIS_IO_H + #define _ASM_ARCH_CRIS_IO_H + ++#include <linux/spinlock.h> + #include <asm/arch/hwregs/reg_map.h> + #include <asm/arch/hwregs/reg_rdwr.h> + #include <asm/arch/hwregs/gio_defs.h> +@@ -13,10 +14,11 @@ + + struct crisv32_ioport + { +- unsigned long* oe; +- unsigned long* data; +- unsigned long* data_in; ++ volatile unsigned long* oe; ++ volatile unsigned long* data; ++ volatile unsigned long* data_in; + unsigned int pin_count; ++ spinlock_t lock; + }; + + struct crisv32_iopin +@@ -34,22 +36,37 @@ + extern struct crisv32_iopin crisv32_led3_green; + extern struct crisv32_iopin crisv32_led3_red; + ++extern struct crisv32_iopin crisv32_led_net0_green; ++extern struct crisv32_iopin crisv32_led_net0_red; ++extern struct crisv32_iopin crisv32_led_net1_green; ++extern struct crisv32_iopin crisv32_led_net1_red; ++ + static inline void crisv32_io_set(struct crisv32_iopin* iopin, + int val) + { ++ long flags; ++ spin_lock_irqsave(&iopin->port->lock, flags); ++ + if (val) + *iopin->port->data |= iopin->bit; + else + *iopin->port->data &= ~iopin->bit; ++ ++ spin_unlock_irqrestore(&iopin->port->lock, flags); + } + + static inline void crisv32_io_set_dir(struct crisv32_iopin* iopin, + enum crisv32_io_dir dir) + { ++ long flags; ++ spin_lock_irqsave(&iopin->port->lock, flags); ++ + if (dir == crisv32_io_dir_in) + *iopin->port->oe &= ~iopin->bit; + else + *iopin->port->oe |= iopin->bit; ++ ++ spin_unlock_irqrestore(&iopin->port->lock, flags); + } + + static inline int crisv32_io_rd(struct crisv32_iopin* iopin) +@@ -60,28 +77,51 @@ + int crisv32_io_get(struct crisv32_iopin* iopin, + unsigned int port, unsigned int pin); + int crisv32_io_get_name(struct crisv32_iopin* iopin, +- char* name); ++ const char* name); + + #define LED_OFF 0x00 + #define LED_GREEN 0x01 + #define LED_RED 0x02 + #define LED_ORANGE (LED_GREEN | LED_RED) + +-#define LED_NETWORK_SET(x) \ +- do { \ +- LED_NETWORK_SET_G((x) & LED_GREEN); \ +- LED_NETWORK_SET_R((x) & LED_RED); \ ++#if (defined(CONFIG_ETRAX_NBR_LED_GRP_ONE) || defined(CONFIG_ETRAX_NBR_LED_GRP_TWO)) ++#define LED_NETWORK_GRP0_SET(x) \ ++ do { \ ++ LED_NETWORK_GRP0_SET_G((x) & LED_GREEN); \ ++ LED_NETWORK_GRP0_SET_R((x) & LED_RED); \ + } while (0) ++#else ++#define LED_NETWORK_GRP0_SET(x) while (0) {} ++#endif ++ ++#define LED_NETWORK_GRP0_SET_G(x) \ ++ crisv32_io_set(&crisv32_led_net0_green, !(x)); ++ ++#define LED_NETWORK_GRP0_SET_R(x) \ ++ crisv32_io_set(&crisv32_led_net0_red, !(x)); ++ ++#if defined(CONFIG_ETRAX_NBR_LED_GRP_TWO) ++#define LED_NETWORK_GRP1_SET(x) \ ++ do { \ ++ LED_NETWORK_GRP1_SET_G((x) & LED_GREEN); \ ++ LED_NETWORK_GRP1_SET_R((x) & LED_RED); \ ++ } while (0) ++#else ++#define LED_NETWORK_GRP1_SET(x) while (0) {} ++#endif ++ ++#define LED_NETWORK_GRP1_SET_G(x) \ ++ crisv32_io_set(&crisv32_led_net1_green, !(x)); ++ ++#define LED_NETWORK_GRP1_SET_R(x) \ ++ crisv32_io_set(&crisv32_led_net1_red, !(x)); ++ + #define LED_ACTIVE_SET(x) \ + do { \ + LED_ACTIVE_SET_G((x) & LED_GREEN); \ + LED_ACTIVE_SET_R((x) & LED_RED); \ + } while (0) + +-#define LED_NETWORK_SET_G(x) \ +- crisv32_io_set(&crisv32_led1_green, !(x)); +-#define LED_NETWORK_SET_R(x) \ +- crisv32_io_set(&crisv32_led1_red, !(x)); + #define LED_ACTIVE_SET_G(x) \ + crisv32_io_set(&crisv32_led2_green, !(x)); + #define LED_ACTIVE_SET_R(x) \ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/irq.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/irq.h 2006-10-13 14:45:18.000000000 +0200 +@@ -50,7 +50,7 @@ + #define IRQ_NAME2(nr) nr##_interrupt(void) + #define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr) + +-/* ++/* + * The reason for setting the S-bit when debugging the kernel is that we want + * hardware breakpoints to remain active while we are in an exception handler. + * Note that we cannot simply copy S1, since we may come here from user-space, +@@ -86,7 +86,7 @@ + "moveq 1, $r11\n\t" \ + "jump ret_from_intr\n\t" \ + "nop\n\t"); +-/* ++/* + * This is subtle. The timer interrupt is crucial and it should not be disabled + * for too long. However, if it had been a normal interrupt as per BUILD_IRQ, it + * would have been BLOCK'ed, and then softirq's are run before we return here to +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/juliette.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/juliette.h 2004-06-09 11:20:19.000000000 +0200 +@@ -166,7 +166,7 @@ + #define PA_NULL 0x3fff /* CCD/VIDEO */ + + typedef enum { +- jpeg = 0, ++ jpeg = 0, + dummy = 1 + } request_type; + +@@ -176,8 +176,8 @@ + halfsize = 2, + fieldsize = 3 + } size_type; +- +-typedef enum { ++ ++typedef enum { + min = 0, + low = 1, + medium = 2, +@@ -192,14 +192,14 @@ + q6 = 11 + } compr_type; + +-typedef enum { ++typedef enum { + deg_0 = 0, + deg_180 = 1, + deg_90 = 2, + deg_270 = 3 + } rotation_type; + +-typedef enum { ++typedef enum { + auto_white = 0, + hold = 1, + fixed_outdoor = 2, +@@ -207,12 +207,12 @@ + fixed_fluor = 4 + } white_balance_type; + +-typedef enum { ++typedef enum { + auto_exp = 0, + fixed_exp = 1 + } exposure_type; + +-typedef enum { ++typedef enum { + no_window = 0, + center = 1, + top = 2, +@@ -242,7 +242,7 @@ + right_align = 2 + } alignment_type; + +-typedef enum { ++typedef enum { + off = 0, + on = 1, + no = 0, +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/mmu.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/mmu.h 2004-11-23 19:36:19.000000000 +0100 +@@ -34,7 +34,7 @@ + * +-----+------+--------+-------+--------+-------+---------+ + */ + +-/* ++/* + * Defines for accessing the bits. Also define some synonyms for use with + * the software-based defined bits below. + */ +@@ -46,7 +46,7 @@ + #define _PAGE_SILENT_READ (1 << 3) /* Same as above. */ + #define _PAGE_GLOBAL (1 << 4) /* Global page. */ + +-/* ++/* + * The hardware doesn't care about these bits, but the kernel uses them in + * software. + */ +@@ -84,9 +84,9 @@ + + #define _KERNPG_TABLE (_PAGE_TABLE | _PAGE_KERNEL) + +-/* CRISv32 can do page protection for execute. ++/* CRISv32 can do page protection for execute. + * Write permissions imply read permissions. +- * Note that the numbers are in Execute-Write-Read order! ++ * Note that the numbers are in Execute-Write-Read order! + */ + #define __P000 PAGE_NONE + #define __P001 PAGE_READONLY +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/offset.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/offset.h 2005-08-29 09:36:28.000000000 +0200 +@@ -27,7 +27,7 @@ + #define THREAD_usp 4 /* offsetof(struct thread_struct, usp) */ + #define THREAD_ccs 8 /* offsetof(struct thread_struct, ccs) */ + +-#define TASK_pid 149 /* offsetof(struct task_struct, pid) */ ++#define TASK_pid 151 /* offsetof(struct task_struct, pid) */ + + #define LCLONE_VM 256 /* CLONE_VM */ + #define LCLONE_UNTRACED 8388608 /* CLONE_UNTRACED */ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/page.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/page.h 2006-10-13 14:45:18.000000000 +0200 +@@ -11,7 +11,7 @@ + * selected bit it's possible to convert between KSEG_x and 0x40000000 where the + * DRAM really resides. DRAM is virtually at 0xc. + */ +-#ifndef CONFIG_ETRAXFS_SIM ++#ifndef CONFIG_ETRAXFS_SIM + #define __pa(x) ((unsigned long)(x) & 0x7fffffff) + #define __va(x) ((void *)((unsigned long)(x) | 0x80000000)) + #else +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/pinmux.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/pinmux.h 2005-07-02 14:30:13.000000000 +0200 +@@ -1,7 +1,7 @@ + #ifndef _ASM_CRIS_ARCH_PINMUX_H + #define _ASM_CRIS_ARCH_PINMUX_H + +-#define PORT_B 0 ++#define PORT_B 0 + #define PORT_C 1 + #define PORT_D 2 + #define PORT_E 3 +@@ -34,6 +34,7 @@ + int crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode); + int crisv32_pinmux_alloc_fixed(enum fixed_function function); + int crisv32_pinmux_dealloc(int port, int first_pin, int last_pin); ++int crisv32_pinmux_dealloc_fixed(enum fixed_function function); + void crisv32_pinmux_dump(void); + + #endif +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/processor.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/processor.h 2006-10-13 14:45:18.000000000 +0200 +@@ -19,7 +19,7 @@ + unsigned long ccs; /* Saved flags register. */ + }; + +-/* ++/* + * User-space process size. This is hardcoded into a few places, so don't + * changed it unless everything's clear! + */ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/ptrace.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/ptrace.h 2004-10-21 13:51:21.000000000 +0200 +@@ -49,7 +49,7 @@ + #define CCS_SHIFT 10 /* Shift count for each level in CCS */ + + /* pt_regs not only specifices the format in the user-struct during +- * ptrace but is also the frame format used in the kernel prologue/epilogues ++ * ptrace but is also the frame format used in the kernel prologue/epilogues + * themselves + */ + +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/spinlock.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/spinlock.h 2007-01-09 10:31:32.000000000 +0100 +@@ -19,7 +19,7 @@ + __asm__ volatile ("move.d %1,%0" \ + : "=m" (lock->lock) \ + : "r" (1) \ +- : "memory"); ++ : "memory"); + } + + static inline int _raw_spin_trylock(spinlock_t *lock) +@@ -80,7 +80,7 @@ + { + unsigned long flags; + local_irq_save(flags); +- _raw_spin_lock(&rw->lock); ++ _raw_spin_lock(&rw->lock); + + rw->counter++; + +@@ -92,7 +92,7 @@ + { + unsigned long flags; + local_irq_save(flags); +- _raw_spin_lock(&rw->lock); ++ _raw_spin_lock(&rw->lock); + + rw->counter--; + +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/system.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/system.h 2006-10-13 14:45:18.000000000 +0200 +@@ -39,7 +39,7 @@ + #define xchg(ptr,x) \ + ((__typeof__(*(ptr)))__xchg((unsigned long) (x),(ptr),sizeof(*(ptr)))) + +-#define tas(ptr) (xchg((ptr),1)) ++#define tas(ptr) (xchg((ptr),1)) + + struct __xchg_dummy { unsigned long a[100]; }; + #define __xg(x) ((struct __xchg_dummy *)(x)) +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/timex.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/timex.h 2005-08-23 11:44:37.000000000 +0200 +@@ -6,8 +6,8 @@ + #include <asm/arch/hwregs/timer_defs.h> + + /* +- * The clock runs at 100MHz, we divide it by 1000000. If you change anything +- * here you must check time.c as well. ++ * The clock runs at 100MHz, we divide it by 1000000. If you change anything ++ * here you must check time.c as well. + */ + + #define CLOCK_TICK_RATE 100000000 /* Underlying frequency of the HZ timer */ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/tlb.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/tlb.h 2003-07-02 11:29:45.000000000 +0200 +@@ -2,8 +2,8 @@ + #define _CRIS_ARCH_TLB_H + + /* +- * The TLB is a 64-entry cache. Each entry has a 8-bit page_id that is used +- * to store the "process" it belongs to (=> fast mm context switch). The ++ * The TLB is a 64-entry cache. Each entry has a 8-bit page_id that is used ++ * to store the "process" it belongs to (=> fast mm context switch). The + * last page_id is never used so we can make TLB entries that never matches. + */ + #define NUM_TLB_ENTRIES 64 +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/uaccess.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/uaccess.h 2006-01-04 07:13:04.000000000 +0100 +@@ -1,4 +1,4 @@ +-/* ++/* + * Authors: Hans-Peter Nilsson (hp@axis.com) + * + */ +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 +--- linux-2.6.19.2.old/include/asm-cris/arch-v32/unistd.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/unistd.h 2005-10-31 09:50:44.000000000 +0100 +@@ -16,7 +16,8 @@ + ".endif\n\t" \ + "break 13" \ + : "=r" (__a) \ +- : "r" (__n_)); \ ++ : "r" (__n_) \ ++ : "memory"); \ + if (__a >= 0) \ + return (type) __a; \ + errno = -__a; \ +@@ -33,7 +34,8 @@ + ".endif\n\t" \ + "break 13" \ + : "=r" (__a) \ +- : "r" (__n_), "0" (__a)); \ ++ : "r" (__n_), "0" (__a) \ ++ : "memory"); \ + if (__a >= 0) \ + return (type) __a; \ + errno = -__a; \ +@@ -51,7 +53,8 @@ + ".endif\n\t" \ + "break 13" \ + : "=r" (__a) \ +- : "r" (__n_), "0" (__a), "r" (__b)); \ ++ : "r" (__n_), "0" (__a), "r" (__b) \ ++ : "memory"); \ + if (__a >= 0) \ + return (type) __a; \ + errno = -__a; \ +@@ -70,7 +73,8 @@ + ".endif\n\t" \ + "break 13" \ + : "=r" (__a) \ +- : "r" (__n_), "0" (__a), "r" (__b), "r" (__c)); \ ++ : "r" (__n_), "0" (__a), "r" (__b), "r" (__c) \ ++ : "memory"); \ + if (__a >= 0) \ + return (type) __a; \ + errno = -__a; \ +@@ -91,12 +95,13 @@ + "break 13" \ + : "=r" (__a) \ + : "r" (__n_), "0" (__a), "r" (__b), \ +- "r" (__c), "r" (__d)); \ ++ "r" (__c), "r" (__d)\ ++ : "memory"); \ + if (__a >= 0) \ + return (type) __a; \ + errno = -__a; \ + return (type) -1; \ +-} ++} + + #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ + type5,arg5) \ +@@ -114,7 +119,8 @@ + "break 13" \ + : "=r" (__a) \ + : "r" (__n_), "0" (__a), "r" (__b), \ +- "r" (__c), "r" (__d), "h" (__e)); \ ++ "r" (__c), "r" (__d), "h" (__e) \ ++ : "memory"); \ + if (__a >= 0) \ + return (type) __a; \ + errno = -__a; \ +@@ -138,7 +144,8 @@ + "break 13" \ + : "=r" (__a) \ + : "r" (__n_), "0" (__a), "r" (__b), \ +- "r" (__c), "r" (__d), "h" (__e), "x" (__f)); \ ++ "r" (__c), "r" (__d), "h" (__e), "x" (__f) \ ++ : "memory"); \ + if (__a >= 0) \ + return (type) __a; \ + errno = -__a; \ +diff -urN linux-2.6.19.2.old/include/asm-cris/atomic.h linux-2.6.19.2.dev/include/asm-cris/atomic.h +--- linux-2.6.19.2.old/include/asm-cris/atomic.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/atomic.h 2006-07-03 15:11:43.000000000 +0200 +@@ -5,6 +5,7 @@ + + #include <asm/system.h> + #include <asm/arch/atomic.h> ++#include <linux/compiler.h> + + /* + * Atomic operations that C can't guarantee us. Useful for +@@ -89,7 +90,7 @@ + unsigned long flags; + int retval; + cris_atomic_save(v, flags); +- retval = (v->counter)++; ++ retval = ++(v->counter); + cris_atomic_restore(v, flags); + return retval; + } +@@ -99,7 +100,7 @@ + unsigned long flags; + int retval; + cris_atomic_save(v, flags); +- retval = (v->counter)--; ++ retval = --(v->counter); + cris_atomic_restore(v, flags); + return retval; + } +diff -urN linux-2.6.19.2.old/include/asm-cris/axisflashmap.h linux-2.6.19.2.dev/include/asm-cris/axisflashmap.h +--- linux-2.6.19.2.old/include/asm-cris/axisflashmap.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/axisflashmap.h 2006-09-07 14:24:25.000000000 +0200 +@@ -15,18 +15,18 @@ + /* The partitiontable_head is located at offset +10: */ + struct partitiontable_head { + __u16 magic; /* PARTITION_TABLE_MAGIC */ +- __u16 size; /* Length of ptable block (not header) */ +- __u32 checksum; /* simple longword sum */ ++ __u16 size; /* Length of ptable block (entries + end marker) */ ++ __u32 checksum; /* simple longword sum, over entries + end marker */ + }; + + /* And followed by partition table entries */ + struct partitiontable_entry { +- __u32 offset; /* Offset is relative to the sector the ptable is in */ +- __u32 size; ++ __u32 offset; /* relative to the sector the ptable is in */ ++ __u32 size; /* in bytes */ + __u32 checksum; /* simple longword sum */ +- __u16 type; +- __u16 flags; /* bit 0: ro/rw = 1/0 */ +- __u32 future0; /* 16 bytes reserved for future use */ ++ __u16 type; /* see type codes below */ ++ __u16 flags; /* bit 0: ro/rw = 1/0 */ ++ __u32 future0; /* 16 bytes reserved for future use */ + __u32 future1; + __u32 future2; + __u32 future3; +@@ -35,10 +35,25 @@ + #define PARTITIONTABLE_END_MARKER 0xFFFFFFFF + #define PARTITIONTABLE_END_MARKER_SIZE 4 + +-/*#define PARTITION_TYPE_RESCUE 0x0000?*/ /* Not used, maybe it should? */ ++#define PARTITIONTABLE_END_PAD 10 ++ ++/* Complete structure for whole partition table */ ++/* note that table may end before CONFIG_ETRAX_PTABLE_ENTRIES by setting ++ * offset of the last entry + 1 to PARTITIONTABLE_END_MARKER. ++ */ ++struct partitiontable { ++ __u8 skip[PARTITION_TABLE_OFFSET]; ++ struct partitiontable_head head; ++ struct partitiontable_entry entries[]; ++}; ++ + #define PARTITION_TYPE_PARAM 0x0001 + #define PARTITION_TYPE_KERNEL 0x0002 + #define PARTITION_TYPE_JFFS 0x0003 ++#define PARTITION_TYPE_JFFS2 0x0000 ++ ++#define PARTITION_FLAGS_READONLY_MASK 0x0001 ++#define PARTITION_FLAGS_READONLY 0x0001 + + /* The master mtd for the entire flash. */ + extern struct mtd_info* axisflash_mtd; +diff -urN linux-2.6.19.2.old/include/asm-cris/bitops.h linux-2.6.19.2.dev/include/asm-cris/bitops.h +--- linux-2.6.19.2.old/include/asm-cris/bitops.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/bitops.h 2007-01-09 10:31:32.000000000 +0100 +@@ -155,7 +155,7 @@ + #include <asm-generic/bitops/hweight.h> + #include <asm-generic/bitops/find.h> + +-#include <asm-generic/bitops/ext2-non-atomic.h> ++//#include <asm-generic/bitops/ext2-non-atomic.h> + + #define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a) + #define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a) +diff -urN linux-2.6.19.2.old/include/asm-cris/bug.h linux-2.6.19.2.dev/include/asm-cris/bug.h +--- linux-2.6.19.2.old/include/asm-cris/bug.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/bug.h 2006-06-21 10:29:15.000000000 +0200 +@@ -1,4 +1,4 @@ + #ifndef _CRIS_BUG_H + #define _CRIS_BUG_H +-#include <asm-generic/bug.h> ++#include <asm/arch/bug.h> + #endif +diff -urN linux-2.6.19.2.old/include/asm-cris/delay.h linux-2.6.19.2.dev/include/asm-cris/delay.h +--- linux-2.6.19.2.old/include/asm-cris/delay.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/delay.h 2006-10-11 19:46:19.000000000 +0200 +@@ -13,10 +13,13 @@ + + extern unsigned long loops_per_usec; /* arch/cris/mm/init.c */ + ++/* May be defined by arch/delay.h. */ ++#ifndef udelay + static inline void udelay(unsigned long usecs) + { + __delay(usecs * loops_per_usec); + } ++#endif + + #endif /* defined(_CRIS_DELAY_H) */ + +diff -urN linux-2.6.19.2.old/include/asm-cris/ethernet.h linux-2.6.19.2.dev/include/asm-cris/ethernet.h +--- linux-2.6.19.2.old/include/asm-cris/ethernet.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/ethernet.h 2006-07-06 07:58:52.000000000 +0200 +@@ -15,4 +15,7 @@ + #define SET_ETH_DUPLEX_AUTO SIOCDEVPRIVATE+3 /* Auto neg duplex */ + #define SET_ETH_DUPLEX_HALF SIOCDEVPRIVATE+4 /* Full duplex */ + #define SET_ETH_DUPLEX_FULL SIOCDEVPRIVATE+5 /* Half duplex */ ++#define SET_ETH_ENABLE_LEDS SIOCDEVPRIVATE+6 /* Enable net LEDs */ ++#define SET_ETH_DISABLE_LEDS SIOCDEVPRIVATE+7 /* Disable net LEDs */ ++#define SET_ETH_AUTONEG SIOCDEVPRIVATE+8 + #endif /* _CRIS_ETHERNET_H */ +diff -urN linux-2.6.19.2.old/include/asm-cris/etraxgpio.h linux-2.6.19.2.dev/include/asm-cris/etraxgpio.h +--- linux-2.6.19.2.old/include/asm-cris/etraxgpio.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/etraxgpio.h 2007-01-09 10:31:32.000000000 +0100 +@@ -16,15 +16,19 @@ + * For ETRAX FS (ARCH_V32): + * /dev/gpioa minor 0, 8 bit GPIO, each bit can change direction + * /dev/gpiob minor 1, 18 bit GPIO, each bit can change direction +- * /dev/gpioc minor 2, 18 bit GPIO, each bit can change direction +- * /dev/gpiod minor 3, 18 bit GPIO, each bit can change direction +- * /dev/gpioe minor 4, 18 bit GPIO, each bit can change direction +- * /dev/leds minor 5, Access to leds depending on kernelconfig ++ * /dev/gpioc minor 3, 18 bit GPIO, each bit can change direction ++ * /dev/gpiod minor 4, 18 bit GPIO, each bit can change direction ++ * /dev/gpioe minor 5, 18 bit GPIO, each bit can change direction ++ * /dev/leds minor 2, Access to leds depending on kernelconfig + * + */ + #ifndef _ASM_ETRAXGPIO_H + #define _ASM_ETRAXGPIO_H + ++#ifndef __KERNEL__ ++#include <linux/autoconf.h> ++#endif ++ + /* etraxgpio _IOC_TYPE, bits 8 to 15 in ioctl cmd */ + #ifdef CONFIG_ETRAX_ARCH_V10 + #define ETRAXGPIO_IOCTYPE 43 +@@ -42,8 +46,13 @@ + #define GPIO_MINOR_C 3 + #define GPIO_MINOR_D 4 + #define GPIO_MINOR_E 5 ++#ifdef CONFIG_ETRAX_VIRTUAL_GPIO ++#define GPIO_MINOR_V 6 ++#define GPIO_MINOR_LAST 6 ++#else + #define GPIO_MINOR_LAST 5 + #endif ++#endif + + /* supported ioctl _IOC_NR's */ + +diff -urN linux-2.6.19.2.old/include/asm-cris/fasttimer.h linux-2.6.19.2.dev/include/asm-cris/fasttimer.h +--- linux-2.6.19.2.old/include/asm-cris/fasttimer.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/fasttimer.h 2006-12-11 12:22:38.000000000 +0100 +@@ -1,9 +1,9 @@ +-/* $Id: fasttimer.h,v 1.3 2004/05/14 10:19:19 starvik Exp $ ++/* + * linux/include/asm-cris/fasttimer.h + * + * Fast timers for ETRAX100LX + * This may be useful in other OS than Linux so use 2 space indentation... +- * Copyright (C) 2000, 2002 Axis Communications AB ++ * Copyright (C) 2000-2006 Axis Communications AB + */ + #include <linux/time.h> /* struct timeval */ + #include <linux/timex.h> +@@ -12,11 +12,16 @@ + + typedef void fast_timer_function_type(unsigned long); + ++struct fasttime_t { ++ unsigned long tv_jiff; /* jiffies */ ++ unsigned long tv_usec; /* microseconds */ ++}; ++ + struct fast_timer{ /* Close to timer_list */ + struct fast_timer *next; + struct fast_timer *prev; +- struct timeval tv_set; +- struct timeval tv_expires; ++ struct fasttime_t tv_set; ++ struct fasttime_t tv_expires; + unsigned long delay_us; + fast_timer_function_type *function; + unsigned long data; +@@ -38,6 +43,6 @@ + void schedule_usleep(unsigned long us); + + +-void fast_timer_init(void); ++int fast_timer_init(void); + + #endif +diff -urN linux-2.6.19.2.old/include/asm-cris/hardirq.h linux-2.6.19.2.dev/include/asm-cris/hardirq.h +--- linux-2.6.19.2.old/include/asm-cris/hardirq.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/hardirq.h 2005-10-31 09:50:43.000000000 +0100 +@@ -1,6 +1,7 @@ + #ifndef __ASM_HARDIRQ_H + #define __ASM_HARDIRQ_H + ++#include <asm/irq.h> + #include <linux/threads.h> + #include <linux/cache.h> + +diff -urN linux-2.6.19.2.old/include/asm-cris/io.h linux-2.6.19.2.dev/include/asm-cris/io.h +--- linux-2.6.19.2.old/include/asm-cris/io.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/io.h 2006-01-04 07:13:03.000000000 +0100 +@@ -127,8 +127,8 @@ + + #define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void __force *)(b),(c),(d)) + +-/* The following is junk needed for the arch-independent code but which +- * we never use in the CRIS port ++/* I/O port access. Normally there is no I/O space on CRIS but when Cardbus/PCI ++ * is enable the request is passed through the bridge. + */ + + #define IO_SPACE_LIMIT 0xffff +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 +--- linux-2.6.19.2.old/include/asm-cris/irq_regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/irq_regs.h 2007-01-09 10:31:32.000000000 +0100 +@@ -0,0 +1 @@ ++#include <asm-generic/irq_regs.h> +diff -urN linux-2.6.19.2.old/include/asm-cris/pgtable.h linux-2.6.19.2.dev/include/asm-cris/pgtable.h +--- linux-2.6.19.2.old/include/asm-cris/pgtable.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/pgtable.h 2007-01-12 15:41:37.000000000 +0100 +@@ -279,7 +279,7 @@ + #define pte_unmap(pte) do { } while (0) + #define pte_unmap_nested(pte) do { } while (0) + #define pte_pfn(x) ((unsigned long)(__va((x).pte)) >> PAGE_SHIFT) +-#define pfn_pte(pfn, prot) __pte((__pa((pfn) << PAGE_SHIFT)) | pgprot_val(prot)) ++#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) + + #define pte_ERROR(e) \ + printk("%s:%d: bad pte %p(%08lx).\n", __FILE__, __LINE__, &(e), pte_val(e)) +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 +--- linux-2.6.19.2.old/include/asm-cris/semaphore-helper.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/semaphore-helper.h 2005-08-23 11:44:35.000000000 +0200 +@@ -20,12 +20,12 @@ + /* + * These two _must_ execute atomically wrt each other. + */ +-extern inline void wake_one_more(struct semaphore * sem) ++static inline void wake_one_more(struct semaphore * sem) + { + atomic_inc(&sem->waking); + } + +-extern inline int waking_non_zero(struct semaphore *sem) ++static inline int waking_non_zero(struct semaphore *sem) + { + unsigned long flags; + int ret = 0; +@@ -40,7 +40,7 @@ + return ret; + } + +-extern inline int waking_non_zero_interruptible(struct semaphore *sem, ++static inline int waking_non_zero_interruptible(struct semaphore *sem, + struct task_struct *tsk) + { + int ret = 0; +@@ -59,7 +59,7 @@ + return ret; + } + +-extern inline int waking_non_zero_trylock(struct semaphore *sem) ++static inline int waking_non_zero_trylock(struct semaphore *sem) + { + int ret = 1; + unsigned long flags; +diff -urN linux-2.6.19.2.old/include/asm-cris/semaphore.h linux-2.6.19.2.dev/include/asm-cris/semaphore.h +--- linux-2.6.19.2.old/include/asm-cris/semaphore.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/semaphore.h 2006-01-04 07:13:03.000000000 +0100 +@@ -51,7 +51,6 @@ + { + sema_init(sem, 0); + } +- + extern void __down(struct semaphore * sem); + extern int __down_interruptible(struct semaphore * sem); + extern int __down_trylock(struct semaphore * sem); +diff -urN linux-2.6.19.2.old/include/asm-cris/smp.h linux-2.6.19.2.dev/include/asm-cris/smp.h +--- linux-2.6.19.2.old/include/asm-cris/smp.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/smp.h 2005-10-31 09:50:43.000000000 +0100 +@@ -4,7 +4,7 @@ + #include <linux/cpumask.h> + + extern cpumask_t phys_cpu_present_map; +-#define cpu_possible_map phys_cpu_present_map ++extern cpumask_t cpu_possible_map; + + #define __smp_processor_id() (current_thread_info()->cpu) + +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 +--- linux-2.6.19.2.old/include/asm-cris/sync_serial.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/sync_serial.h 2005-11-10 15:43:16.000000000 +0100 +@@ -1,9 +1,9 @@ +-/* ++/* + * ioctl defines for synchronous serial port driver + * + * Copyright (c) 2001-2003 Axis Communications AB +- * +- * Author: Mikael Starvik ++ * ++ * Author: Mikael Starvik + * + */ + +@@ -24,7 +24,7 @@ + #define SSP150 0 + #define SSP300 1 + #define SSP600 2 +-#define SSP1200 3 ++#define SSP1200 3 + #define SSP2400 4 + #define SSP4800 5 + #define SSP9600 6 +@@ -67,6 +67,7 @@ + /* Values for SSP_FRAME_SYNC */ + #define NORMAL_SYNC 1 + #define EARLY_SYNC 2 ++#define SECOND_WORD_SYNC 0x40000 + + #define BIT_SYNC 4 + #define WORD_SYNC 8 +@@ -86,6 +87,8 @@ + #define CLOCK_GATED 0x10000 + #define CLOCK_NOT_GATED 0x20000 + ++ ++ + /* Values for SSP_IPOLARITY and SSP_OPOLARITY */ + #define CLOCK_NORMAL 1 + #define CLOCK_INVERT 2 +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 +--- linux-2.6.19.2.old/include/asm-cris/thread_info.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/thread_info.h 2006-03-22 11:01:27.000000000 +0100 +@@ -32,6 +32,7 @@ + unsigned long flags; /* low level flags */ + __u32 cpu; /* current CPU */ + int preempt_count; /* 0 => preemptable, <0 => BUG */ ++ __u32 tls; /* TLS for this thread */ + + mm_segment_t addr_limit; /* thread address space: + 0-0xBFFFFFFF for user-thead +@@ -82,6 +83,7 @@ + #define TIF_NOTIFY_RESUME 1 /* resumption notification requested */ + #define TIF_SIGPENDING 2 /* signal pending */ + #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ ++#define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ + #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ + #define TIF_MEMDIE 17 + +@@ -89,6 +91,7 @@ + #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) + #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) + #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) ++#define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) + #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) + + #define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */ +diff -urN linux-2.6.19.2.old/include/asm-cris/unistd.h linux-2.6.19.2.dev/include/asm-cris/unistd.h +--- linux-2.6.19.2.old/include/asm-cris/unistd.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux-2.6.19.2.dev/include/asm-cris/unistd.h 2007-01-09 10:31:32.000000000 +0100 +@@ -255,6 +255,7 @@ + #define __NR_io_submit 248 + #define __NR_io_cancel 249 + #define __NR_fadvise64 250 ++/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */ + #define __NR_exit_group 252 + #define __NR_lookup_dcookie 253 + #define __NR_epoll_create 254 +@@ -292,10 +293,41 @@ + #define __NR_add_key 286 + #define __NR_request_key 287 + #define __NR_keyctl 288 ++#define __NR_ioprio_set 289 ++#define __NR_ioprio_get 290 ++#define __NR_inotify_init 291 ++#define __NR_inotify_add_watch 292 ++#define __NR_inotify_rm_watch 293 ++#define __NR_migrate_pages 294 ++#define __NR_openat 295 ++#define __NR_mkdirat 296 ++#define __NR_mknodat 297 ++#define __NR_fchownat 298 ++#define __NR_futimesat 299 ++#define __NR_fstatat64 300 ++#define __NR_unlinkat 301 ++#define __NR_renameat 302 ++#define __NR_linkat 303 ++#define __NR_symlinkat 304 ++#define __NR_readlinkat 305 ++#define __NR_fchmodat 306 ++#define __NR_faccessat 307 ++#define __NR_pselect6 308 ++#define __NR_ppoll 309 ++#define __NR_unshare 310 ++#define __NR_set_robust_list 311 ++#define __NR_get_robust_list 312 ++#define __NR_splice 313 ++#define __NR_sync_file_range 314 ++#define __NR_tee 315 ++#define __NR_vmsplice 316 ++#define __NR_move_pages 317 ++#define __NR_getcpu 318 ++#define __NR_epoll_pwait 319 + + #ifdef __KERNEL__ + +-#define NR_syscalls 289 ++#define NR_syscalls 320 + + #include <asm/arch/unistd.h> + +@@ -321,6 +353,7 @@ + #define __ARCH_WANT_SYS_SIGPENDING + #define __ARCH_WANT_SYS_SIGPROCMASK + #define __ARCH_WANT_SYS_RT_SIGACTION ++#define __ARCH_WANT_SYS_RT_SIGSUSPEND + + /* + * "Conditional" syscalls |