diff options
| author |   Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/linux/linux-wrt-2.4.30 | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
| download | openembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/linux/linux-wrt-2.4.30')
59 files changed, 103367 insertions, 0 deletions
diff --git a/recipes/linux/linux-wrt-2.4.30/000-linux-mips-2_4_30.patch b/recipes/linux/linux-wrt-2.4.30/000-linux-mips-2_4_30.patch new file mode 100644 index 0000000000..e2ebfce285 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/000-linux-mips-2_4_30.patch @@ -0,0 +1,26900 @@ +diff -Nur linux-2.4.30/Makefile linux-2.4.30-mips/Makefile +--- linux-2.4.30/Makefile 2005-04-04 03:42:20.000000000 +0200 ++++ linux-2.4.30-mips/Makefile 2005-04-05 21:09:54.000000000 +0200 +@@ -5,7 +5,7 @@ + + KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) + +-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) ++ARCH = mips + KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g") + + CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ +@@ -462,10 +462,11 @@ + $(MAKE) -C Documentation/DocBook mrproper + + distclean: mrproper +- rm -f core `find . \( -not -type d \) -and \ +- \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ +- -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ +- -o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f -print` TAGS tags ++ find . \( -not -type d \) -and \ ++ \( -name core -o -name '*.orig' -o -name '*.rej' \ ++ -o -name '*~' -o -name '*.bak' -o -name '#*#' \ ++ -o -name '.*.rej' -o -name '.SUMS' -o -size 0 \ ++ -o -name TAGS -o -name tags \) -print | env -i xargs rm -f + + backup: mrproper + cd .. && tar cf - linux/ | gzip -9 > backup.gz +@@ -492,7 +493,7 @@ + $(MAKE) -C Documentation/DocBook man + + sums: +- find . -type f -print | sort | xargs sum > .SUMS ++ find . -type f -print | sort | env -i xargs sum > .SUMS + + dep-files: scripts/mkdep archdep include/linux/version.h + rm -f .depend .hdepend +diff -Nur linux-2.4.30/arch/mips/Makefile linux-2.4.30-mips/arch/mips/Makefile +--- linux-2.4.30/arch/mips/Makefile 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/Makefile 2005-01-30 09:01:26.000000000 +0100 +@@ -211,7 +211,7 @@ + endif + + # +-# Au1000 (Alchemy Semi PB1000) eval board ++# Au1x AMD Alchemy eval boards + # + ifdef CONFIG_MIPS_PB1000 + LIBS += arch/mips/au1000/pb1000/pb1000.o \ +@@ -220,9 +220,6 @@ + LOADADDR := 0x80100000 + endif + +-# +-# Au1100 (Alchemy Semi PB1100) eval board +-# + ifdef CONFIG_MIPS_PB1100 + LIBS += arch/mips/au1000/pb1100/pb1100.o \ + arch/mips/au1000/common/au1000.o +@@ -230,9 +227,6 @@ + LOADADDR += 0x80100000 + endif + +-# +-# Au1500 (Alchemy Semi PB1500) eval board +-# + ifdef CONFIG_MIPS_PB1500 + LIBS += arch/mips/au1000/pb1500/pb1500.o \ + arch/mips/au1000/common/au1000.o +@@ -240,9 +234,6 @@ + LOADADDR := 0x80100000 + endif + +-# +-# Au1x00 (AMD/Alchemy) eval boards +-# + ifdef CONFIG_MIPS_DB1000 + LIBS += arch/mips/au1000/db1x00/db1x00.o \ + arch/mips/au1000/common/au1000.o +@@ -313,6 +304,27 @@ + LOADADDR += 0x80100000 + endif + ++ifdef CONFIG_MIPS_PB1200 ++LIBS += arch/mips/au1000/pb1200/pb1200.o \ ++ arch/mips/au1000/common/au1000.o ++SUBDIRS += arch/mips/au1000/pb1200 arch/mips/au1000/common ++LOADADDR += 0x80100000 ++endif ++ ++ifdef CONFIG_MIPS_DB1200 ++LIBS += arch/mips/au1000/pb1200/pb1200.o \ ++ arch/mips/au1000/common/au1000.o ++SUBDIRS += arch/mips/au1000/pb1200 arch/mips/au1000/common ++LOADADDR += 0x80100000 ++endif ++ ++ifdef CONFIG_MIPS_FICMMP ++LIBS += arch/mips/au1000/ficmmp/ficmmp.o \ ++ arch/mips/au1000/common/au1000.o ++SUBDIRS += arch/mips/au1000/ficmmp arch/mips/au1000/common ++LOADADDR += 0x80100000 ++endif ++ + + # + # Cogent CSB250 +diff -Nur linux-2.4.30/arch/mips/au1000/common/Makefile linux-2.4.30-mips/arch/mips/au1000/common/Makefile +--- linux-2.4.30/arch/mips/au1000/common/Makefile 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/Makefile 2005-01-30 09:01:27.000000000 +0100 +@@ -19,9 +19,9 @@ + export-objs = prom.o clocks.o power.o usbdev.o + + obj-y := prom.o int-handler.o irq.o puts.o time.o reset.o cputable.o \ +- au1xxx_irqmap.o clocks.o power.o setup.o sleeper.o dma.o dbdma.o ++ au1xxx_irqmap.o clocks.o power.o setup.o sleeper.o dma.o dbdma.o gpio.o + +-export-objs += dma.o dbdma.o ++export-objs += dma.o dbdma.o gpio.o + + obj-$(CONFIG_AU1X00_USB_DEVICE) += usbdev.o + obj-$(CONFIG_KGDB) += dbg_io.o +diff -Nur linux-2.4.30/arch/mips/au1000/common/au1xxx_irqmap.c linux-2.4.30-mips/arch/mips/au1000/common/au1xxx_irqmap.c +--- linux-2.4.30/arch/mips/au1000/common/au1xxx_irqmap.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/au1xxx_irqmap.c 2005-01-30 09:01:27.000000000 +0100 +@@ -172,14 +172,14 @@ + { AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0}, + { AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0}, + { AU1550_PSC3_INT, INTC_INT_HIGH_LEVEL, 0}, +- { AU1550_TOY_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1550_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1550_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1550_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 }, +- { AU1550_RTC_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1550_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1550_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1550_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 }, ++ { AU1000_RTC_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1550_NAND_INT, INTC_INT_RISE_EDGE, 0}, + { AU1550_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 }, + { AU1550_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 }, +@@ -200,14 +200,14 @@ + { AU1200_PSC1_INT, INTC_INT_HIGH_LEVEL, 0}, + { AU1200_AES_INT, INTC_INT_HIGH_LEVEL, 0}, + { AU1200_CAMERA_INT, INTC_INT_HIGH_LEVEL, 0}, +- { AU1200_TOY_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1200_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1200_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1200_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 }, +- { AU1200_RTC_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1200_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1200_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, +- { AU1200_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 }, ++ { AU1000_RTC_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, ++ { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1200_NAND_INT, INTC_INT_RISE_EDGE, 0}, + { AU1200_USB_INT, INTC_INT_HIGH_LEVEL, 0 }, + { AU1200_LCD_INT, INTC_INT_HIGH_LEVEL, 0}, +diff -Nur linux-2.4.30/arch/mips/au1000/common/cputable.c linux-2.4.30-mips/arch/mips/au1000/common/cputable.c +--- linux-2.4.30/arch/mips/au1000/common/cputable.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/cputable.c 2005-01-30 09:01:27.000000000 +0100 +@@ -39,7 +39,8 @@ + { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1 }, + { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 }, + { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1 }, +- { 0xffffffff, 0x04030200, "Au1200 AA", 0, 1 }, ++ { 0xffffffff, 0x04030200, "Au1200 AB", 0, 0 }, ++ { 0xffffffff, 0x04030201, "Au1200 AC", 0, 0 }, + { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 }, + }; + +diff -Nur linux-2.4.30/arch/mips/au1000/common/dbdma.c linux-2.4.30-mips/arch/mips/au1000/common/dbdma.c +--- linux-2.4.30/arch/mips/au1000/common/dbdma.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/dbdma.c 2005-02-08 07:28:37.000000000 +0100 +@@ -41,6 +41,8 @@ + #include <asm/au1xxx_dbdma.h> + #include <asm/system.h> + ++#include <linux/module.h> ++ + #if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) + + /* +@@ -60,37 +62,10 @@ + */ + #define ALIGN_ADDR(x, a) ((((u32)(x)) + (a-1)) & ~(a-1)) + +-static volatile dbdma_global_t *dbdma_gptr = (dbdma_global_t *)DDMA_GLOBAL_BASE; +-static int dbdma_initialized; ++static dbdma_global_t *dbdma_gptr = (dbdma_global_t *)DDMA_GLOBAL_BASE; ++static int dbdma_initialized=0; + static void au1xxx_dbdma_init(void); + +-typedef struct dbdma_device_table { +- u32 dev_id; +- u32 dev_flags; +- u32 dev_tsize; +- u32 dev_devwidth; +- u32 dev_physaddr; /* If FIFO */ +- u32 dev_intlevel; +- u32 dev_intpolarity; +-} dbdev_tab_t; +- +-typedef struct dbdma_chan_config { +- u32 chan_flags; +- u32 chan_index; +- dbdev_tab_t *chan_src; +- dbdev_tab_t *chan_dest; +- au1x_dma_chan_t *chan_ptr; +- au1x_ddma_desc_t *chan_desc_base; +- au1x_ddma_desc_t *get_ptr, *put_ptr, *cur_ptr; +- void *chan_callparam; +- void (*chan_callback)(int, void *, struct pt_regs *); +-} chan_tab_t; +- +-#define DEV_FLAGS_INUSE (1 << 0) +-#define DEV_FLAGS_ANYUSE (1 << 1) +-#define DEV_FLAGS_OUT (1 << 2) +-#define DEV_FLAGS_IN (1 << 3) +- + static dbdev_tab_t dbdev_tab[] = { + #ifdef CONFIG_SOC_AU1550 + /* UARTS */ +@@ -156,13 +131,13 @@ + { DSCR_CMD0_MAE_BOTH, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, + { DSCR_CMD0_LCD, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, + +- { DSCR_CMD0_SDMS_TX0, DEV_FLAGS_OUT, 0, 0, 0x00000000, 0, 0 }, +- { DSCR_CMD0_SDMS_RX0, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, +- { DSCR_CMD0_SDMS_TX1, DEV_FLAGS_OUT, 0, 0, 0x00000000, 0, 0 }, +- { DSCR_CMD0_SDMS_RX1, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, ++ { DSCR_CMD0_SDMS_TX0, DEV_FLAGS_OUT, 4, 8, 0x10600000, 0, 0 }, ++ { DSCR_CMD0_SDMS_RX0, DEV_FLAGS_IN, 4, 8, 0x10600004, 0, 0 }, ++ { DSCR_CMD0_SDMS_TX1, DEV_FLAGS_OUT, 4, 8, 0x10680000, 0, 0 }, ++ { DSCR_CMD0_SDMS_RX1, DEV_FLAGS_IN, 4, 8, 0x10680004, 0, 0 }, + +- { DSCR_CMD0_AES_TX, DEV_FLAGS_OUT, 0, 0, 0x00000000, 0, 0 }, +- { DSCR_CMD0_AES_RX, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, ++ { DSCR_CMD0_AES_RX, DEV_FLAGS_IN , 4, 32, 0x10300008, 0, 0 }, ++ { DSCR_CMD0_AES_TX, DEV_FLAGS_OUT, 4, 32, 0x10300004, 0, 0 }, + + { DSCR_CMD0_PSC0_TX, DEV_FLAGS_OUT, 0, 0, 0x11a0001c, 0, 0 }, + { DSCR_CMD0_PSC0_RX, DEV_FLAGS_IN, 0, 0, 0x11a0001c, 0, 0 }, +@@ -172,9 +147,9 @@ + { DSCR_CMD0_PSC1_RX, DEV_FLAGS_IN, 0, 0, 0x11b0001c, 0, 0 }, + { DSCR_CMD0_PSC1_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, + +- { DSCR_CMD0_CIM_RXA, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, +- { DSCR_CMD0_CIM_RXB, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, +- { DSCR_CMD0_CIM_RXC, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, ++ { DSCR_CMD0_CIM_RXA, DEV_FLAGS_IN, 0, 32, 0x14004020, 0, 0 }, ++ { DSCR_CMD0_CIM_RXB, DEV_FLAGS_IN, 0, 32, 0x14004040, 0, 0 }, ++ { DSCR_CMD0_CIM_RXC, DEV_FLAGS_IN, 0, 32, 0x14004060, 0, 0 }, + { DSCR_CMD0_CIM_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, + + { DSCR_CMD0_NAND_FLASH, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, +@@ -183,6 +158,24 @@ + + { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, + { DSCR_CMD0_ALWAYS, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, ++ ++ /* Provide 16 user definable device types */ ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, ++ { 0, 0, 0, 0, 0, 0, 0 }, + }; + + #define DBDEV_TAB_SIZE (sizeof(dbdev_tab) / sizeof(dbdev_tab_t)) +@@ -202,6 +195,30 @@ + return NULL; + } + ++u32 ++au1xxx_ddma_add_device(dbdev_tab_t *dev) ++{ ++ u32 ret = 0; ++ dbdev_tab_t *p=NULL; ++ static u16 new_id=0x1000; ++ ++ p = find_dbdev_id(0); ++ if ( NULL != p ) ++ { ++ memcpy(p, dev, sizeof(dbdev_tab_t)); ++ p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id); ++ ret = p->dev_id; ++ new_id++; ++#if 0 ++ printk("add_device: id:%x flags:%x padd:%x\n", ++ p->dev_id, p->dev_flags, p->dev_physaddr ); ++#endif ++ } ++ ++ return ret; ++} ++EXPORT_SYMBOL(au1xxx_ddma_add_device); ++ + /* Allocate a channel and return a non-zero descriptor if successful. + */ + u32 +@@ -214,7 +231,7 @@ + int i; + dbdev_tab_t *stp, *dtp; + chan_tab_t *ctp; +- volatile au1x_dma_chan_t *cp; ++ au1x_dma_chan_t *cp; + + /* We do the intialization on the first channel allocation. + * We have to wait because of the interrupt handler initialization +@@ -224,9 +241,6 @@ + au1xxx_dbdma_init(); + dbdma_initialized = 1; + +- if ((srcid > DSCR_NDEV_IDS) || (destid > DSCR_NDEV_IDS)) +- return 0; +- + if ((stp = find_dbdev_id(srcid)) == NULL) return 0; + if ((dtp = find_dbdev_id(destid)) == NULL) return 0; + +@@ -268,9 +282,9 @@ + /* If kmalloc fails, it is caught below same + * as a channel not available. + */ +- ctp = (chan_tab_t *)kmalloc(sizeof(chan_tab_t), GFP_KERNEL); ++ ctp = (chan_tab_t *) ++ kmalloc(sizeof(chan_tab_t), GFP_KERNEL); + chan_tab_ptr[i] = ctp; +- ctp->chan_index = chan = i; + break; + } + } +@@ -278,10 +292,11 @@ + + if (ctp != NULL) { + memset(ctp, 0, sizeof(chan_tab_t)); ++ ctp->chan_index = chan = i; + dcp = DDMA_CHANNEL_BASE; + dcp += (0x0100 * chan); + ctp->chan_ptr = (au1x_dma_chan_t *)dcp; +- cp = (volatile au1x_dma_chan_t *)dcp; ++ cp = (au1x_dma_chan_t *)dcp; + ctp->chan_src = stp; + ctp->chan_dest = dtp; + ctp->chan_callback = callback; +@@ -298,6 +313,9 @@ + i |= DDMA_CFG_DED; + if (dtp->dev_intpolarity) + i |= DDMA_CFG_DP; ++ if ((stp->dev_flags & DEV_FLAGS_SYNC) || ++ (dtp->dev_flags & DEV_FLAGS_SYNC)) ++ i |= DDMA_CFG_SYNC; + cp->ddma_cfg = i; + au_sync(); + +@@ -308,14 +326,14 @@ + rv = (u32)(&chan_tab_ptr[chan]); + } + else { +- /* Release devices. +- */ ++ /* Release devices */ + stp->dev_flags &= ~DEV_FLAGS_INUSE; + dtp->dev_flags &= ~DEV_FLAGS_INUSE; + } + } + return rv; + } ++EXPORT_SYMBOL(au1xxx_dbdma_chan_alloc); + + /* Set the device width if source or destination is a FIFO. + * Should be 8, 16, or 32 bits. +@@ -343,6 +361,7 @@ + + return rv; + } ++EXPORT_SYMBOL(au1xxx_dbdma_set_devwidth); + + /* Allocate a descriptor ring, initializing as much as possible. + */ +@@ -369,7 +388,8 @@ + * and if we try that first we are likely to not waste larger + * slabs of memory. + */ +- desc_base = (u32)kmalloc(entries * sizeof(au1x_ddma_desc_t), GFP_KERNEL); ++ desc_base = (u32)kmalloc(entries * sizeof(au1x_ddma_desc_t), ++ GFP_KERNEL|GFP_DMA); + if (desc_base == 0) + return 0; + +@@ -380,7 +400,7 @@ + kfree((const void *)desc_base); + i = entries * sizeof(au1x_ddma_desc_t); + i += (sizeof(au1x_ddma_desc_t) - 1); +- if ((desc_base = (u32)kmalloc(i, GFP_KERNEL)) == 0) ++ if ((desc_base = (u32)kmalloc(i, GFP_KERNEL|GFP_DMA)) == 0) + return 0; + + desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t)); +@@ -460,9 +480,14 @@ + /* If source input is fifo, set static address. + */ + if (stp->dev_flags & DEV_FLAGS_IN) { +- src0 = stp->dev_physaddr; +- src1 |= DSCR_SRC1_SAM(DSCR_xAM_STATIC); ++ if ( stp->dev_flags & DEV_FLAGS_BURSTABLE ) ++ src1 |= DSCR_SRC1_SAM(DSCR_xAM_BURST); ++ else ++ src1 |= DSCR_SRC1_SAM(DSCR_xAM_STATIC); ++ + } ++ if (stp->dev_physaddr) ++ src0 = stp->dev_physaddr; + + /* Set up dest1. For now, assume no stride and increment. + * A channel attribute update can change this later. +@@ -486,10 +511,18 @@ + /* If destination output is fifo, set static address. + */ + if (dtp->dev_flags & DEV_FLAGS_OUT) { +- dest0 = dtp->dev_physaddr; ++ if ( dtp->dev_flags & DEV_FLAGS_BURSTABLE ) ++ dest1 |= DSCR_DEST1_DAM(DSCR_xAM_BURST); ++ else + dest1 |= DSCR_DEST1_DAM(DSCR_xAM_STATIC); + } ++ if (dtp->dev_physaddr) ++ dest0 = dtp->dev_physaddr; + ++#if 0 ++ printk("did:%x sid:%x cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n", ++ dtp->dev_id, stp->dev_id, cmd0, cmd1, src0, src1, dest0, dest1 ); ++#endif + for (i=0; i<entries; i++) { + dp->dscr_cmd0 = cmd0; + dp->dscr_cmd1 = cmd1; +@@ -498,6 +531,7 @@ + dp->dscr_dest0 = dest0; + dp->dscr_dest1 = dest1; + dp->dscr_stat = 0; ++ dp->sw_context = dp->sw_status = 0; + dp->dscr_nxtptr = DSCR_NXTPTR(virt_to_phys(dp + 1)); + dp++; + } +@@ -510,13 +544,14 @@ + + return (u32)(ctp->chan_desc_base); + } ++EXPORT_SYMBOL(au1xxx_dbdma_ring_alloc); + + /* Put a source buffer into the DMA ring. + * This updates the source pointer and byte count. Normally used + * for memory to fifo transfers. + */ + u32 +-au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes) ++_au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags) + { + chan_tab_t *ctp; + au1x_ddma_desc_t *dp; +@@ -543,24 +578,40 @@ + */ + dp->dscr_source0 = virt_to_phys(buf); + dp->dscr_cmd1 = nbytes; +- dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ +- ctp->chan_ptr->ddma_dbell = 0xffffffff; /* Make it go */ +- ++ /* Check flags */ ++ if (flags & DDMA_FLAGS_IE) ++ dp->dscr_cmd0 |= DSCR_CMD0_IE; ++ if (flags & DDMA_FLAGS_NOIE) ++ dp->dscr_cmd0 &= ~DSCR_CMD0_IE; + /* Get next descriptor pointer. + */ + ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); + ++ /* ++ * There is an errata on the Au1200/Au1550 parts that could result ++ * in "stale" data being DMA'd. It has to do with the snoop logic on ++ * the dache eviction buffer. NONCOHERENT_IO is on by default for ++ * these parts. If it is fixedin the future, these dma_cache_inv will ++ * just be nothing more than empty macros. See io.h. ++ * */ ++ dma_cache_wback_inv(buf,nbytes); ++ dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ ++ au_sync(); ++ dma_cache_wback_inv(dp, sizeof(dp)); ++ ctp->chan_ptr->ddma_dbell = 0; ++ + /* return something not zero. + */ + return nbytes; + } ++EXPORT_SYMBOL(_au1xxx_dbdma_put_source); + + /* Put a destination buffer into the DMA ring. + * This updates the destination pointer and byte count. Normally used + * to place an empty buffer into the ring for fifo to memory transfers. + */ + u32 +-au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes) ++_au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes, u32 flags) + { + chan_tab_t *ctp; + au1x_ddma_desc_t *dp; +@@ -582,11 +633,33 @@ + if (dp->dscr_cmd0 & DSCR_CMD0_V) + return 0; + +- /* Load up buffer address and byte count. +- */ ++ /* Load up buffer address and byte count */ ++ ++ /* Check flags */ ++ if (flags & DDMA_FLAGS_IE) ++ dp->dscr_cmd0 |= DSCR_CMD0_IE; ++ if (flags & DDMA_FLAGS_NOIE) ++ dp->dscr_cmd0 &= ~DSCR_CMD0_IE; ++ + dp->dscr_dest0 = virt_to_phys(buf); + dp->dscr_cmd1 = nbytes; ++#if 0 ++ printk("cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n", ++ dp->dscr_cmd0, dp->dscr_cmd1, dp->dscr_source0, ++ dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1 ); ++#endif ++ /* ++ * There is an errata on the Au1200/Au1550 parts that could result in ++ * "stale" data being DMA'd. It has to do with the snoop logic on the ++ * dache eviction buffer. NONCOHERENT_IO is on by default for these ++ * parts. If it is fixedin the future, these dma_cache_inv will just ++ * be nothing more than empty macros. See io.h. ++ * */ ++ dma_cache_inv(buf,nbytes); + dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ ++ au_sync(); ++ dma_cache_wback_inv(dp, sizeof(dp)); ++ ctp->chan_ptr->ddma_dbell = 0; + + /* Get next descriptor pointer. + */ +@@ -596,6 +669,7 @@ + */ + return nbytes; + } ++EXPORT_SYMBOL(_au1xxx_dbdma_put_dest); + + /* Get a destination buffer into the DMA ring. + * Normally used to get a full buffer from the ring during fifo +@@ -645,7 +719,7 @@ + au1xxx_dbdma_stop(u32 chanid) + { + chan_tab_t *ctp; +- volatile au1x_dma_chan_t *cp; ++ au1x_dma_chan_t *cp; + int halt_timeout = 0; + + ctp = *((chan_tab_t **)chanid); +@@ -665,6 +739,7 @@ + cp->ddma_stat |= (DDMA_STAT_DB | DDMA_STAT_V); + au_sync(); + } ++EXPORT_SYMBOL(au1xxx_dbdma_stop); + + /* Start using the current descriptor pointer. If the dbdma encounters + * a not valid descriptor, it will stop. In this case, we can just +@@ -674,17 +749,17 @@ + au1xxx_dbdma_start(u32 chanid) + { + chan_tab_t *ctp; +- volatile au1x_dma_chan_t *cp; ++ au1x_dma_chan_t *cp; + + ctp = *((chan_tab_t **)chanid); +- + cp = ctp->chan_ptr; + cp->ddma_desptr = virt_to_phys(ctp->cur_ptr); + cp->ddma_cfg |= DDMA_CFG_EN; /* Enable channel */ + au_sync(); +- cp->ddma_dbell = 0xffffffff; /* Make it go */ ++ cp->ddma_dbell = 0; + au_sync(); + } ++EXPORT_SYMBOL(au1xxx_dbdma_start); + + void + au1xxx_dbdma_reset(u32 chanid) +@@ -703,15 +778,21 @@ + + do { + dp->dscr_cmd0 &= ~DSCR_CMD0_V; ++ /* reset our SW status -- this is used to determine ++ * if a descriptor is in use by upper level SW. Since ++ * posting can reset 'V' bit. ++ */ ++ dp->sw_status = 0; + dp = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); + } while (dp != ctp->chan_desc_base); + } ++EXPORT_SYMBOL(au1xxx_dbdma_reset); + + u32 + au1xxx_get_dma_residue(u32 chanid) + { + chan_tab_t *ctp; +- volatile au1x_dma_chan_t *cp; ++ au1x_dma_chan_t *cp; + u32 rv; + + ctp = *((chan_tab_t **)chanid); +@@ -746,15 +827,16 @@ + + kfree(ctp); + } ++EXPORT_SYMBOL(au1xxx_dbdma_chan_free); + + static void + dbdma_interrupt(int irq, void *dev_id, struct pt_regs *regs) + { +- u32 intstat; ++ u32 intstat, flags; + u32 chan_index; + chan_tab_t *ctp; + au1x_ddma_desc_t *dp; +- volatile au1x_dma_chan_t *cp; ++ au1x_dma_chan_t *cp; + + intstat = dbdma_gptr->ddma_intstat; + au_sync(); +@@ -773,18 +855,26 @@ + (ctp->chan_callback)(irq, ctp->chan_callparam, regs); + + ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); +- + } + +-static void +-au1xxx_dbdma_init(void) ++static void au1xxx_dbdma_init(void) + { ++ int irq_nr; ++ + dbdma_gptr->ddma_config = 0; + dbdma_gptr->ddma_throttle = 0; + dbdma_gptr->ddma_inten = 0xffff; + au_sync(); + +- if (request_irq(AU1550_DDMA_INT, dbdma_interrupt, SA_INTERRUPT, ++#if defined(CONFIG_SOC_AU1550) ++ irq_nr = AU1550_DDMA_INT; ++#elif defined(CONFIG_SOC_AU1200) ++ irq_nr = AU1200_DDMA_INT; ++#else ++ #error Unknown Au1x00 SOC ++#endif ++ ++ if (request_irq(irq_nr, dbdma_interrupt, SA_INTERRUPT, + "Au1xxx dbdma", (void *)dbdma_gptr)) + printk("Can't get 1550 dbdma irq"); + } +@@ -795,7 +885,8 @@ + chan_tab_t *ctp; + au1x_ddma_desc_t *dp; + dbdev_tab_t *stp, *dtp; +- volatile au1x_dma_chan_t *cp; ++ au1x_dma_chan_t *cp; ++ u32 i = 0; + + ctp = *((chan_tab_t **)chanid); + stp = ctp->chan_src; +@@ -820,15 +911,64 @@ + dp = ctp->chan_desc_base; + + do { +- printk("dp %08x, cmd0 %08x, cmd1 %08x\n", +- (u32)dp, dp->dscr_cmd0, dp->dscr_cmd1); +- printk("src0 %08x, src1 %08x, dest0 %08x\n", +- dp->dscr_source0, dp->dscr_source1, dp->dscr_dest0); +- printk("dest1 %08x, stat %08x, nxtptr %08x\n", +- dp->dscr_dest1, dp->dscr_stat, dp->dscr_nxtptr); ++ printk("Dp[%d]= %08x, cmd0 %08x, cmd1 %08x\n", ++ i++, (u32)dp, dp->dscr_cmd0, dp->dscr_cmd1); ++ printk("src0 %08x, src1 %08x, dest0 %08x, dest1 %08x\n", ++ dp->dscr_source0, dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1); ++ printk("stat %08x, nxtptr %08x\n", ++ dp->dscr_stat, dp->dscr_nxtptr); + dp = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); + } while (dp != ctp->chan_desc_base); + } + ++/* Put a descriptor into the DMA ring. ++ * This updates the source/destination pointers and byte count. ++ */ ++u32 ++au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr ) ++{ ++ chan_tab_t *ctp; ++ au1x_ddma_desc_t *dp; ++ u32 nbytes=0; ++ ++ /* I guess we could check this to be within the ++ * range of the table...... ++ */ ++ ctp = *((chan_tab_t **)chanid); ++ ++ /* We should have multiple callers for a particular channel, ++ * an interrupt doesn't affect this pointer nor the descriptor, ++ * so no locking should be needed. ++ */ ++ dp = ctp->put_ptr; ++ ++ /* If the descriptor is valid, we are way ahead of the DMA ++ * engine, so just return an error condition. ++ */ ++ if (dp->dscr_cmd0 & DSCR_CMD0_V) ++ return 0; ++ ++ /* Load up buffer addresses and byte count. ++ */ ++ dp->dscr_dest0 = dscr->dscr_dest0; ++ dp->dscr_source0 = dscr->dscr_source0; ++ dp->dscr_dest1 = dscr->dscr_dest1; ++ dp->dscr_source1 = dscr->dscr_source1; ++ dp->dscr_cmd1 = dscr->dscr_cmd1; ++ nbytes = dscr->dscr_cmd1; ++ /* Allow the caller to specifiy if an interrupt is generated */ ++ dp->dscr_cmd0 &= ~DSCR_CMD0_IE; ++ dp->dscr_cmd0 |= dscr->dscr_cmd0 | DSCR_CMD0_V; ++ ctp->chan_ptr->ddma_dbell = 0; ++ ++ /* Get next descriptor pointer. ++ */ ++ ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); ++ ++ /* return something not zero. ++ */ ++ return nbytes; ++} ++ + #endif /* defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) */ + +diff -Nur linux-2.4.30/arch/mips/au1000/common/gpio.c linux-2.4.30-mips/arch/mips/au1000/common/gpio.c +--- linux-2.4.30/arch/mips/au1000/common/gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/gpio.c 2005-01-30 09:01:27.000000000 +0100 +@@ -0,0 +1,118 @@ ++/* ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include <asm/au1000.h> ++#include <asm/au1xxx_gpio.h> ++ ++#define gpio1 sys ++#if !defined(CONFIG_SOC_AU1000) ++static AU1X00_GPIO2 * const gpio2 = (AU1X00_GPIO2 *)GPIO2_BASE; ++ ++#define GPIO2_OUTPUT_ENABLE_MASK 0x00010000 ++ ++int au1xxx_gpio2_read(int signal) ++{ ++ signal -= 200; ++/* gpio2->dir &= ~(0x01 << signal); //Set GPIO to input */ ++ return ((gpio2->pinstate >> signal) & 0x01); ++} ++ ++void au1xxx_gpio2_write(int signal, int value) ++{ ++ signal -= 200; ++ ++ gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << signal) | ++ (value << signal); ++} ++ ++void au1xxx_gpio2_tristate(int signal) ++{ ++ signal -= 200; ++ gpio2->dir &= ~(0x01 << signal); /* Set GPIO to input */ ++} ++#endif ++ ++int au1xxx_gpio1_read(int signal) ++{ ++/* gpio1->trioutclr |= (0x01 << signal); */ ++ return ((gpio1->pinstaterd >> signal) & 0x01); ++} ++ ++void au1xxx_gpio1_write(int signal, int value) ++{ ++ if(value) ++ gpio1->outputset = (0x01 << signal); ++ else ++ gpio1->outputclr = (0x01 << signal); /* Output a Zero */ ++} ++ ++void au1xxx_gpio1_tristate(int signal) ++{ ++ gpio1->trioutclr = (0x01 << signal); /* Tristate signal */ ++} ++ ++ ++int au1xxx_gpio_read(int signal) ++{ ++ if(signal >= 200) ++#if defined(CONFIG_SOC_AU1000) ++ return 0; ++#else ++ return au1xxx_gpio2_read(signal); ++#endif ++ else ++ return au1xxx_gpio1_read(signal); ++} ++ ++void au1xxx_gpio_write(int signal, int value) ++{ ++ if(signal >= 200) ++#if defined(CONFIG_SOC_AU1000) ++ ; ++#else ++ au1xxx_gpio2_write(signal, value); ++#endif ++ else ++ au1xxx_gpio1_write(signal, value); ++} ++ ++void au1xxx_gpio_tristate(int signal) ++{ ++ if(signal >= 200) ++#if defined(CONFIG_SOC_AU1000) ++ ; ++#else ++ au1xxx_gpio2_tristate(signal); ++#endif ++ else ++ au1xxx_gpio1_tristate(signal); ++} ++ ++void au1xxx_gpio1_set_inputs(void) ++{ ++ gpio1->pininputen = 0; ++} ++ ++EXPORT_SYMBOL(au1xxx_gpio1_set_inputs); ++EXPORT_SYMBOL(au1xxx_gpio_tristate); ++EXPORT_SYMBOL(au1xxx_gpio_write); ++EXPORT_SYMBOL(au1xxx_gpio_read); +diff -Nur linux-2.4.30/arch/mips/au1000/common/irq.c linux-2.4.30-mips/arch/mips/au1000/common/irq.c +--- linux-2.4.30/arch/mips/au1000/common/irq.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/irq.c 2005-03-13 08:56:57.000000000 +0100 +@@ -303,8 +303,30 @@ + }; + + #ifdef CONFIG_PM +-void startup_match20_interrupt(void) ++void startup_match20_interrupt(void (*handler)(int, void *, struct pt_regs *)) + { ++ static struct irqaction action; ++ /* This is a big problem.... since we didn't use request_irq ++ when kernel/irq.c calls probe_irq_xxx this interrupt will ++ be probed for usage. This will end up disabling the device :( ++ ++ Give it a bogus "action" pointer -- this will keep it from ++ getting auto-probed! ++ ++ By setting the status to match that of request_irq() we ++ can avoid it. --cgray ++ */ ++ action.dev_id = handler; ++ action.flags = 0; ++ action.mask = 0; ++ action.name = "Au1xxx TOY"; ++ action.handler = handler; ++ action.next = NULL; ++ ++ irq_desc[AU1000_TOY_MATCH2_INT].action = &action; ++ irq_desc[AU1000_TOY_MATCH2_INT].status ++ &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING | IRQ_INPROGRESS); ++ + local_enable_irq(AU1000_TOY_MATCH2_INT); + } + #endif +@@ -508,6 +530,7 @@ + + if (!intc0_req0) return; + ++#ifdef AU1000_USB_DEV_REQ_INT + /* + * Because of the tight timing of SETUP token to reply + * transactions, the USB devices-side packet complete +@@ -518,6 +541,7 @@ + do_IRQ(AU1000_USB_DEV_REQ_INT, regs); + return; + } ++#endif + + irq = au_ffs(intc0_req0) - 1; + intc0_req0 &= ~(1<<irq); +@@ -536,17 +560,7 @@ + + irq = au_ffs(intc0_req1) - 1; + intc0_req1 &= ~(1<<irq); +-#ifdef CONFIG_PM +- if (irq == AU1000_TOY_MATCH2_INT) { +- mask_and_ack_rise_edge_irq(irq); +- counter0_irq(irq, NULL, regs); +- local_enable_irq(irq); +- } +- else +-#endif +- { +- do_IRQ(irq, regs); +- } ++ do_IRQ(irq, regs); + } + + +diff -Nur linux-2.4.30/arch/mips/au1000/common/pci_fixup.c linux-2.4.30-mips/arch/mips/au1000/common/pci_fixup.c +--- linux-2.4.30/arch/mips/au1000/common/pci_fixup.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/pci_fixup.c 2004-12-03 09:00:32.000000000 +0100 +@@ -75,9 +75,13 @@ + + #ifdef CONFIG_NONCOHERENT_IO + /* +- * Set the NC bit in controller for pre-AC silicon ++ * Set the NC bit in controller for Au1500 pre-AC silicon + */ +- au_writel( 1<<16 | au_readl(Au1500_PCI_CFG), Au1500_PCI_CFG); ++ u32 prid = read_c0_prid(); ++ if ( (prid & 0xFF000000) == 0x01000000 && prid < 0x01030202) { ++ au_writel( 1<<16 | au_readl(Au1500_PCI_CFG), Au1500_PCI_CFG); ++ printk("Non-coherent PCI accesses enabled\n"); ++ } + printk("Non-coherent PCI accesses enabled\n"); + #endif + +diff -Nur linux-2.4.30/arch/mips/au1000/common/pci_ops.c linux-2.4.30-mips/arch/mips/au1000/common/pci_ops.c +--- linux-2.4.30/arch/mips/au1000/common/pci_ops.c 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/pci_ops.c 2005-02-27 23:14:24.000000000 +0100 +@@ -162,6 +162,7 @@ + static int config_access(unsigned char access_type, struct pci_dev *dev, + unsigned char where, u32 * data) + { ++ int error = PCIBIOS_SUCCESSFUL; + #if defined( CONFIG_SOC_AU1500 ) || defined( CONFIG_SOC_AU1550 ) + unsigned char bus = dev->bus->number; + unsigned int dev_fn = dev->devfn; +@@ -170,7 +171,6 @@ + unsigned long offset, status; + unsigned long cfg_base; + unsigned long flags; +- int error = PCIBIOS_SUCCESSFUL; + unsigned long entryLo0, entryLo1; + + if (device > 19) { +@@ -205,9 +205,8 @@ + last_entryLo0 = last_entryLo1 = 0xffffffff; + } + +- /* Since the Au1xxx doesn't do the idsel timing exactly to spec, +- * many board vendors implement their own off-chip idsel, so call +- * it now. If it doesn't succeed, may as well bail out at this point. ++ /* Allow board vendors to implement their own off-chip idsel. ++ * If it doesn't succeed, may as well bail out at this point. + */ + if (board_pci_idsel) { + if (board_pci_idsel(device, 1) == 0) { +@@ -271,8 +270,11 @@ + } + + local_irq_restore(flags); +- return error; ++#else ++ /* Fake out Config space access with no responder */ ++ *data = 0xFFFFFFFF; + #endif ++ return error; + } + #endif + +diff -Nur linux-2.4.30/arch/mips/au1000/common/power.c linux-2.4.30-mips/arch/mips/au1000/common/power.c +--- linux-2.4.30/arch/mips/au1000/common/power.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/power.c 2005-04-07 02:37:19.000000000 +0200 +@@ -50,7 +50,6 @@ + + static void calibrate_delay(void); + +-extern void set_au1x00_speed(unsigned int new_freq); + extern unsigned int get_au1x00_speed(void); + extern unsigned long get_au1x00_uart_baud_base(void); + extern void set_au1x00_uart_baud_base(unsigned long new_baud_base); +@@ -116,6 +115,7 @@ + sleep_uart0_clkdiv = au_readl(UART0_ADDR + UART_CLK); + sleep_uart0_enable = au_readl(UART0_ADDR + UART_MOD_CNTRL); + ++#ifndef CONFIG_SOC_AU1200 + /* Shutdown USB host/device. + */ + sleep_usbhost_enable = au_readl(USB_HOST_CONFIG); +@@ -127,6 +127,7 @@ + + sleep_usbdev_enable = au_readl(USBD_ENABLE); + au_writel(0, USBD_ENABLE); au_sync(); ++#endif + + /* Save interrupt controller state. + */ +@@ -212,14 +213,12 @@ + int au_sleep(void) + { + unsigned long wakeup, flags; +- extern void save_and_sleep(void); ++ extern unsigned int save_and_sleep(void); + + spin_lock_irqsave(&pm_lock,flags); + + save_core_regs(); + +- flush_cache_all(); +- + /** The code below is all system dependent and we should probably + ** have a function call out of here to set this up. You need + ** to configure the GPIO or timer interrupts that will bring +@@ -227,27 +226,26 @@ + ** For testing, the TOY counter wakeup is useful. + **/ + +-#if 0 ++#if 1 + au_writel(au_readl(SYS_PINSTATERD) & ~(1 << 11), SYS_PINSTATERD); + + /* gpio 6 can cause a wake up event */ + wakeup = au_readl(SYS_WAKEMSK); + wakeup &= ~(1 << 8); /* turn off match20 wakeup */ +- wakeup |= 1 << 6; /* turn on gpio 6 wakeup */ ++ wakeup = 1 << 5; /* turn on gpio 6 wakeup */ + #else +- /* For testing, allow match20 to wake us up. +- */ ++ /* For testing, allow match20 to wake us up. */ + #ifdef SLEEP_TEST_TIMEOUT + wakeup_counter0_set(sleep_ticks); + #endif + wakeup = 1 << 8; /* turn on match20 wakeup */ + wakeup = 0; + #endif +- au_writel(1, SYS_WAKESRC); /* clear cause */ ++ au_writel(0, SYS_WAKESRC); /* clear cause */ + au_sync(); + au_writel(wakeup, SYS_WAKEMSK); + au_sync(); +- ++ DPRINTK("Entering sleep!\n"); + save_and_sleep(); + + /* after a wakeup, the cpu vectors back to 0x1fc00000 so +@@ -255,6 +253,7 @@ + */ + restore_core_regs(); + spin_unlock_irqrestore(&pm_lock, flags); ++ DPRINTK("Leaving sleep!\n"); + return 0; + } + +@@ -285,7 +284,6 @@ + + if (retval) + return retval; +- + au_sleep(); + retval = pm_send_all(PM_RESUME, (void *) 0); + } +@@ -296,7 +294,6 @@ + void *buffer, size_t * len) + { + int retval = 0; +- void au1k_wait(void); + + if (!write) { + *len = 0; +@@ -305,119 +302,9 @@ + if (retval) + return retval; + suspend_mode = 1; +- au1k_wait(); +- retval = pm_send_all(PM_RESUME, (void *) 0); +- } +- return retval; +-} + +- +-static int pm_do_freq(ctl_table * ctl, int write, struct file *file, +- void *buffer, size_t * len) +-{ +- int retval = 0, i; +- unsigned long val, pll; +-#define TMPBUFLEN 64 +-#define MAX_CPU_FREQ 396 +- char buf[TMPBUFLEN], *p; +- unsigned long flags, intc0_mask, intc1_mask; +- unsigned long old_baud_base, old_cpu_freq, baud_rate, old_clk, +- old_refresh; +- unsigned long new_baud_base, new_cpu_freq, new_clk, new_refresh; +- +- spin_lock_irqsave(&pm_lock, flags); +- if (!write) { +- *len = 0; +- } else { +- /* Parse the new frequency */ +- if (*len > TMPBUFLEN - 1) { +- spin_unlock_irqrestore(&pm_lock, flags); +- return -EFAULT; +- } +- if (copy_from_user(buf, buffer, *len)) { +- spin_unlock_irqrestore(&pm_lock, flags); +- return -EFAULT; +- } +- buf[*len] = 0; +- p = buf; +- val = simple_strtoul(p, &p, 0); +- if (val > MAX_CPU_FREQ) { +- spin_unlock_irqrestore(&pm_lock, flags); +- return -EFAULT; +- } +- +- pll = val / 12; +- if ((pll > 33) || (pll < 7)) { /* 396 MHz max, 84 MHz min */ +- /* revisit this for higher speed cpus */ +- spin_unlock_irqrestore(&pm_lock, flags); +- return -EFAULT; +- } +- +- old_baud_base = get_au1x00_uart_baud_base(); +- old_cpu_freq = get_au1x00_speed(); +- +- new_cpu_freq = pll * 12 * 1000000; +- new_baud_base = (new_cpu_freq / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16)); +- set_au1x00_speed(new_cpu_freq); +- set_au1x00_uart_baud_base(new_baud_base); +- +- old_refresh = au_readl(MEM_SDREFCFG) & 0x1ffffff; +- new_refresh = +- ((old_refresh * new_cpu_freq) / +- old_cpu_freq) | (au_readl(MEM_SDREFCFG) & ~0x1ffffff); +- +- au_writel(pll, SYS_CPUPLL); +- au_sync_delay(1); +- au_writel(new_refresh, MEM_SDREFCFG); +- au_sync_delay(1); +- +- for (i = 0; i < 4; i++) { +- if (au_readl +- (UART_BASE + UART_MOD_CNTRL + +- i * 0x00100000) == 3) { +- old_clk = +- au_readl(UART_BASE + UART_CLK + +- i * 0x00100000); +- // baud_rate = baud_base/clk +- baud_rate = old_baud_base / old_clk; +- /* we won't get an exact baud rate and the error +- * could be significant enough that our new +- * calculation will result in a clock that will +- * give us a baud rate that's too far off from +- * what we really want. +- */ +- if (baud_rate > 100000) +- baud_rate = 115200; +- else if (baud_rate > 50000) +- baud_rate = 57600; +- else if (baud_rate > 30000) +- baud_rate = 38400; +- else if (baud_rate > 17000) +- baud_rate = 19200; +- else +- (baud_rate = 9600); +- // new_clk = new_baud_base/baud_rate +- new_clk = new_baud_base / baud_rate; +- au_writel(new_clk, +- UART_BASE + UART_CLK + +- i * 0x00100000); +- au_sync_delay(10); +- } +- } ++ retval = pm_send_all(PM_RESUME, (void *) 0); + } +- +- +- /* We don't want _any_ interrupts other than +- * match20. Otherwise our calibrate_delay() +- * calculation will be off, potentially a lot. +- */ +- intc0_mask = save_local_and_disable(0); +- intc1_mask = save_local_and_disable(1); +- local_enable_irq(AU1000_TOY_MATCH2_INT); +- spin_unlock_irqrestore(&pm_lock, flags); +- calibrate_delay(); +- restore_local_and_enable(0, intc0_mask); +- restore_local_and_enable(1, intc1_mask); + return retval; + } + +@@ -425,7 +312,6 @@ + static struct ctl_table pm_table[] = { + {ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend}, + {ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep}, +- {CTL_ACPI, "freq", NULL, 0, 0600, NULL, &pm_do_freq}, + {0} + }; + +diff -Nur linux-2.4.30/arch/mips/au1000/common/reset.c linux-2.4.30-mips/arch/mips/au1000/common/reset.c +--- linux-2.4.30/arch/mips/au1000/common/reset.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/reset.c 2005-03-19 08:17:51.000000000 +0100 +@@ -37,8 +37,6 @@ + #include <asm/system.h> + #include <asm/au1000.h> + +-extern int au_sleep(void); +- + void au1000_restart(char *command) + { + /* Set all integrated peripherals to disabled states */ +@@ -144,6 +142,26 @@ + au_writel(0x00, 0xb1900064); /* sys_auxpll */ + au_writel(0x00, 0xb1900100); /* sys_pininputen */ + break; ++ case 0x04000000: /* Au1200 */ ++ au_writel(0x00, 0xb400300c); /* ddma */ ++ au_writel(0x00, 0xb1a00004); /* psc 0 */ ++ au_writel(0x00, 0xb1b00004); /* psc 1 */ ++ au_writel(0x00d02000, 0xb4020004); /* ehci, ohci, udc, otg */ ++ au_writel(0x00, 0xb5000004); /* lcd */ ++ au_writel(0x00, 0xb060000c); /* sd0 */ ++ au_writel(0x00, 0xb068000c); /* sd1 */ ++ au_writel(0x00, 0xb1100100); /* swcnt */ ++ au_writel(0x00, 0xb0300000); /* aes */ ++ au_writel(0x00, 0xb4004000); /* cim */ ++ au_writel(0x00, 0xb1100100); /* uart0_enable */ ++ au_writel(0x00, 0xb1200100); /* uart1_enable */ ++ au_writel(0x00, 0xb1900020); /* sys_freqctrl0 */ ++ au_writel(0x00, 0xb1900024); /* sys_freqctrl1 */ ++ au_writel(0x00, 0xb1900028); /* sys_clksrc */ ++ au_writel(0x10, 0xb1900060); /* sys_cpupll */ ++ au_writel(0x00, 0xb1900064); /* sys_auxpll */ ++ au_writel(0x00, 0xb1900100); /* sys_pininputen */ ++ break; + + default: + break; +@@ -163,32 +181,23 @@ + + void au1000_halt(void) + { +-#if defined(CONFIG_MIPS_PB1550) +- /* power off system */ +- printk("\n** Powering off Pb1550\n"); +- au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C); +- au_sync(); +- while(1); /* should not get here */ +-#endif +- printk(KERN_NOTICE "\n** You can safely turn off the power\n"); +-#ifdef CONFIG_MIPS_MIRAGE +- au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT); +-#endif +-#ifdef CONFIG_PM +- au_sleep(); +- +- /* should not get here */ +- printk(KERN_ERR "Unable to put cpu in sleep mode\n"); +- while(1); +-#else +- while (1) ++ /* Use WAIT in a low-power infinite spin loop */ ++ while (1) { + __asm__(".set\tmips3\n\t" + "wait\n\t" + ".set\tmips0"); +-#endif ++ } + } + + void au1000_power_off(void) + { ++ extern void board_power_off (void); ++ ++ printk(KERN_NOTICE "\n** You can safely turn off the power\n"); ++ ++ /* Give board a chance to power-off */ ++ board_power_off(); ++ ++ /* If board can't power-off, spin forever */ + au1000_halt(); + } +diff -Nur linux-2.4.30/arch/mips/au1000/common/setup.c linux-2.4.30-mips/arch/mips/au1000/common/setup.c +--- linux-2.4.30/arch/mips/au1000/common/setup.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/setup.c 2005-01-30 09:01:27.000000000 +0100 +@@ -174,6 +174,40 @@ + initrd_end = (unsigned long)&__rd_end; + #endif + ++#if defined(CONFIG_SOC_AU1200) ++#ifdef CONFIG_USB_EHCI_HCD ++ if ((argptr = strstr(argptr, "usb_ehci=")) == NULL) { ++ char usb_args[80]; ++ argptr = prom_getcmdline(); ++ memset(usb_args, 0, sizeof(usb_args)); ++ sprintf(usb_args, " usb_ehci=base:0x%x,len:0x%x,irq:%d", ++ USB_EHCI_BASE, USB_EHCI_LEN, AU1000_USB_HOST_INT); ++ strcat(argptr, usb_args); ++ } ++#ifdef CONFIG_USB_AMD5536UDC ++ /* enable EHC + OHC + UDC clocks, memory and bus mastering */ ++/* au_writel( 0x00DF207F, USB_MSR_BASE + 4); */ ++ au_writel( 0xC0DF207F, USB_MSR_BASE + 4); // incl. prefetch ++#else ++ /* enable EHC + OHC clocks, memory and bus mastering */ ++/* au_writel( 0x00DB200F, USB_MSR_BASE + 4); */ ++ au_writel( 0xC0DB200F, USB_MSR_BASE + 4); /* incl. prefetch */ ++#endif ++ udelay(1000); ++ ++#else /* CONFIG_USB_EHCI_HCD */ ++ ++#ifdef CONFIG_USB_AMD5536UDC ++#ifndef CONFIG_USB_OHCI ++ /* enable UDC clocks, memory and bus mastering */ ++/* au_writel( 0x00DC2070, USB_MSR_BASE + 4); */ ++ au_writel( 0xC0DC2070, USB_MSR_BASE + 4); // incl. prefetch ++ udelay(1000); ++#endif ++#endif ++#endif /* CONFIG_USB_EHCI_HCD */ ++#endif /* CONFIG_SOC_AU1200 */ ++ + #if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE) + #ifdef CONFIG_USB_OHCI + if ((argptr = strstr(argptr, "usb_ohci=")) == NULL) { +@@ -187,19 +221,38 @@ + #endif + + #ifdef CONFIG_USB_OHCI +- // enable host controller and wait for reset done ++#if defined(CONFIG_SOC_AU1200) ++#ifndef CONFIG_USB_EHCI_HCD ++#ifdef CONFIG_USB_AMD5536UDC ++ /* enable OHC + UDC clocks, memory and bus mastering */ ++/* au_writel( 0x00DD2073, USB_MSR_BASE + 4); */ ++ au_writel( 0xC0DD2073, USB_MSR_BASE + 4); // incl. prefetch ++#else ++ /* enable OHC clocks, memory and bus mastering */ ++ au_writel( 0x00D12003, USB_MSR_BASE + 4); ++#endif ++ udelay(1000); ++printk("DEBUG: Reading Au1200 USB2 reg 0x%x\n", au_readl(USB_MSR_BASE + 4)); ++#endif ++#else ++ /* Au1000, Au1500, Au1100, Au1550 */ ++ /* enable host controller and wait for reset done */ + au_writel(0x08, USB_HOST_CONFIG); + udelay(1000); + au_writel(0x0E, USB_HOST_CONFIG); + udelay(1000); +- au_readl(USB_HOST_CONFIG); // throw away first read ++ au_readl(USB_HOST_CONFIG); /* throw away first read */ + while (!(au_readl(USB_HOST_CONFIG) & 0x10)) + au_readl(USB_HOST_CONFIG); ++#endif /* CONFIG_SOC_AU1200 */ + #endif +-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE) ++#else ++ ++#endif /* defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE) */ ++ + + #ifdef CONFIG_FB +- // Needed if PCI video card in use ++ /* Needed if PCI video card in use */ + conswitchp = &dummy_con; + #endif + +@@ -209,8 +262,7 @@ + #endif + + #ifdef CONFIG_BLK_DEV_IDE +- /* Board setup takes precedence for unique devices. +- */ ++ /* Board setup takes precedence for unique devices. */ + if ((ide_ops == NULL) || (ide_ops == &no_ide_ops)) + ide_ops = &std_ide_ops; + #endif +diff -Nur linux-2.4.30/arch/mips/au1000/common/sleeper.S linux-2.4.30-mips/arch/mips/au1000/common/sleeper.S +--- linux-2.4.30/arch/mips/au1000/common/sleeper.S 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/sleeper.S 2005-01-30 09:01:27.000000000 +0100 +@@ -15,17 +15,48 @@ + #include <asm/addrspace.h> + #include <asm/regdef.h> + #include <asm/stackframe.h> ++#include <asm/au1000.h> ++ ++/* ++ * Note: This file is *not* conditional on CONFIG_PM since Alchemy sleep ++ * need not be tied to any particular power management scheme. ++ */ ++ ++ .extern ___flush_cache_all + + .text +- .set macro +- .set noat + .align 5 + +-/* Save all of the processor general registers and go to sleep. +- * A wakeup condition will get us back here to restore the registers. ++/* ++ * Save the processor general registers and go to sleep. A wakeup ++ * condition will get us back here to restore the registers. + */ +-LEAF(save_and_sleep) + ++/* still need to fix alignment issues here */ ++save_and_sleep_frmsz = 48 ++NESTED(save_and_sleep, save_and_sleep_frmsz, ra) ++ .set noreorder ++ .set nomacro ++ .set noat ++ subu sp, save_and_sleep_frmsz ++ sw ra, save_and_sleep_frmsz-4(sp) ++ sw s0, save_and_sleep_frmsz-8(sp) ++ sw s1, save_and_sleep_frmsz-12(sp) ++ sw s2, save_and_sleep_frmsz-16(sp) ++ sw s3, save_and_sleep_frmsz-20(sp) ++ sw s4, save_and_sleep_frmsz-24(sp) ++ sw s5, save_and_sleep_frmsz-28(sp) ++ sw s6, save_and_sleep_frmsz-32(sp) ++ sw s7, save_and_sleep_frmsz-36(sp) ++ sw s8, save_and_sleep_frmsz-40(sp) ++ sw gp, save_and_sleep_frmsz-44(sp) ++ ++ /* We only need to save the registers that the calling function ++ * hasn't saved for us. 0 is always zero. 8 - 15, 24 and 25 are ++ * temporaries and can be used without saving. 26 and 27 are reserved ++ * for interrupt/trap handling and expected to change. 29 is the ++ * stack pointer which is handled as a special case here. ++ */ + subu sp, PT_SIZE + sw $1, PT_R1(sp) + sw $2, PT_R2(sp) +@@ -34,14 +65,6 @@ + sw $5, PT_R5(sp) + sw $6, PT_R6(sp) + sw $7, PT_R7(sp) +- sw $8, PT_R8(sp) +- sw $9, PT_R9(sp) +- sw $10, PT_R10(sp) +- sw $11, PT_R11(sp) +- sw $12, PT_R12(sp) +- sw $13, PT_R13(sp) +- sw $14, PT_R14(sp) +- sw $15, PT_R15(sp) + sw $16, PT_R16(sp) + sw $17, PT_R17(sp) + sw $18, PT_R18(sp) +@@ -50,32 +73,47 @@ + sw $21, PT_R21(sp) + sw $22, PT_R22(sp) + sw $23, PT_R23(sp) +- sw $24, PT_R24(sp) +- sw $25, PT_R25(sp) +- sw $26, PT_R26(sp) +- sw $27, PT_R27(sp) + sw $28, PT_R28(sp) +- sw $29, PT_R29(sp) + sw $30, PT_R30(sp) + sw $31, PT_R31(sp) ++#define PT_C0STATUS PT_LO ++#define PT_CONTEXT PT_HI ++#define PT_PAGEMASK PT_EPC ++#define PT_CONFIG PT_BVADDR + mfc0 k0, CP0_STATUS +- sw k0, 0x20(sp) ++ sw k0, PT_C0STATUS(sp) // 0x20 + mfc0 k0, CP0_CONTEXT +- sw k0, 0x1c(sp) ++ sw k0, PT_CONTEXT(sp) // 0x1c + mfc0 k0, CP0_PAGEMASK +- sw k0, 0x18(sp) ++ sw k0, PT_PAGEMASK(sp) // 0x18 + mfc0 k0, CP0_CONFIG +- sw k0, 0x14(sp) ++ sw k0, PT_CONFIG(sp) // 0x14 ++ ++ .set macro ++ .set at ++ ++ li t0, SYS_SLPPWR ++ sw zero, 0(t0) /* Get the processor ready to sleep */ ++ sync + + /* Now set up the scratch registers so the boot rom will + * return to this point upon wakeup. ++ * sys_scratch0 : SP ++ * sys_scratch1 : RA ++ */ ++ li t0, SYS_SCRATCH0 ++ li t1, SYS_SCRATCH1 ++ sw sp, 0(t0) ++ la k0, resume_from_sleep ++ sw k0, 0(t1) ++ ++/* ++ * Flush DCACHE to make sure context is in memory + */ +- la k0, 1f +- lui k1, 0xb190 +- ori k1, 0x18 +- sw sp, 0(k1) +- ori k1, 0x1c +- sw k0, 0(k1) ++ la t1,___flush_cache_all /* _flush_cache_all is a function pointer */ ++ lw t0,0(t1) ++ jal t0 ++ nop + + /* Put SDRAM into self refresh. Preload instructions into cache, + * issue a precharge, then auto refresh, then sleep commands to it. +@@ -88,30 +126,65 @@ + cache 0x14, 96(t0) + .set mips0 + ++ /* Put SDRAM to sleep */ + sdsleep: +- lui k0, 0xb400 +- sw zero, 0x001c(k0) /* Precharge */ +- sw zero, 0x0020(k0) /* Auto refresh */ +- sw zero, 0x0030(k0) /* SDRAM sleep */ ++ li a0, MEM_PHYS_ADDR ++ or a0, a0, 0xA0000000 ++#if defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1100) || defined(CONFIG_SOC_AU1500) ++ lw k0, MEM_SDMODE0(a0) ++ sw zero, MEM_SDPRECMD(a0) /* Precharge */ ++ sw zero, MEM_SDAUTOREF(a0) /* Auto Refresh */ ++ sw zero, MEM_SDSLEEP(a0) /* Sleep */ + sync +- +- lui k1, 0xb190 +- sw zero, 0x0078(k1) /* get ready to sleep */ ++#endif ++#if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) ++ sw zero, MEM_SDPRECMD(a0) /* Precharge */ ++ sw zero, MEM_SDSREF(a0) ++ ++ #lw t0, MEM_SDSTAT(a0) ++ #and t0, t0, 0x01000000 ++ li t0, 0x01000000 ++refresh_not_set: ++ lw t1, MEM_SDSTAT(a0) ++ and t2, t1, t0 ++ beq zero, t2, refresh_not_set ++ nop ++ ++ li t0, ~0x30000000 ++ lw t1, MEM_SDCONFIGA(a0) ++ and t1, t0, t1 ++ sw t1, MEM_SDCONFIGA(a0) + sync +- sw zero, 0x007c(k1) /* Put processor to sleep */ ++#endif ++ ++ li t0, SYS_SLEEP ++ sw zero, 0(t0) /* Put processor to sleep */ + sync ++ nop ++ nop ++ nop ++ nop ++ nop ++ nop ++ nop ++ nop ++ + + /* This is where we return upon wakeup. + * Reload all of the registers and return. + */ +-1: nop +- lw k0, 0x20(sp) ++resume_from_sleep: ++ nop ++ .set nomacro ++ .set noat ++ ++ lw k0, PT_C0STATUS(sp) // 0x20 + mtc0 k0, CP0_STATUS +- lw k0, 0x1c(sp) ++ lw k0, PT_CONTEXT(sp) // 0x1c + mtc0 k0, CP0_CONTEXT +- lw k0, 0x18(sp) ++ lw k0, PT_PAGEMASK(sp) // 0x18 + mtc0 k0, CP0_PAGEMASK +- lw k0, 0x14(sp) ++ lw k0, PT_CONFIG(sp) // 0x14 + mtc0 k0, CP0_CONFIG + lw $1, PT_R1(sp) + lw $2, PT_R2(sp) +@@ -120,14 +193,6 @@ + lw $5, PT_R5(sp) + lw $6, PT_R6(sp) + lw $7, PT_R7(sp) +- lw $8, PT_R8(sp) +- lw $9, PT_R9(sp) +- lw $10, PT_R10(sp) +- lw $11, PT_R11(sp) +- lw $12, PT_R12(sp) +- lw $13, PT_R13(sp) +- lw $14, PT_R14(sp) +- lw $15, PT_R15(sp) + lw $16, PT_R16(sp) + lw $17, PT_R17(sp) + lw $18, PT_R18(sp) +@@ -136,15 +201,36 @@ + lw $21, PT_R21(sp) + lw $22, PT_R22(sp) + lw $23, PT_R23(sp) +- lw $24, PT_R24(sp) +- lw $25, PT_R25(sp) +- lw $26, PT_R26(sp) +- lw $27, PT_R27(sp) + lw $28, PT_R28(sp) +- lw $29, PT_R29(sp) + lw $30, PT_R30(sp) + lw $31, PT_R31(sp) ++ ++ .set macro ++ .set at ++ ++ /* clear the wake source, but save it as the return value of the function */ ++ li t0, SYS_WAKESRC ++ lw v0, 0(t0) ++ sw v0, PT_R2(sp) ++ sw zero, 0(t0) ++ + addiu sp, PT_SIZE + ++ lw gp, save_and_sleep_frmsz-44(sp) ++ lw s8, save_and_sleep_frmsz-40(sp) ++ lw s7, save_and_sleep_frmsz-36(sp) ++ lw s6, save_and_sleep_frmsz-32(sp) ++ lw s5, save_and_sleep_frmsz-28(sp) ++ lw s4, save_and_sleep_frmsz-24(sp) ++ lw s3, save_and_sleep_frmsz-20(sp) ++ lw s2, save_and_sleep_frmsz-16(sp) ++ lw s1, save_and_sleep_frmsz-12(sp) ++ lw s0, save_and_sleep_frmsz-8(sp) ++ lw ra, save_and_sleep_frmsz-4(sp) ++ ++ addu sp, save_and_sleep_frmsz + jr ra ++ nop ++ .set reorder + END(save_and_sleep) ++ +diff -Nur linux-2.4.30/arch/mips/au1000/common/time.c linux-2.4.30-mips/arch/mips/au1000/common/time.c +--- linux-2.4.30/arch/mips/au1000/common/time.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/common/time.c 2005-04-08 10:33:17.000000000 +0200 +@@ -50,7 +50,6 @@ + #include <linux/mc146818rtc.h> + #include <linux/timex.h> + +-extern void startup_match20_interrupt(void); + extern void do_softirq(void); + extern volatile unsigned long wall_jiffies; + unsigned long missed_heart_beats = 0; +@@ -59,14 +58,14 @@ + static unsigned long r4k_cur; /* What counter should be at next timer irq */ + extern rwlock_t xtime_lock; + int no_au1xxx_32khz; +-void (*au1k_wait_ptr)(void); ++extern int allow_au1k_wait; /* default off for CP0 Counter */ + + /* Cycle counter value at the previous timer interrupt.. */ + static unsigned int timerhi = 0, timerlo = 0; + + #ifdef CONFIG_PM + #define MATCH20_INC 328 +-extern void startup_match20_interrupt(void); ++extern void startup_match20_interrupt(void (*handler)(int, void *, struct pt_regs *)); + static unsigned long last_pc0, last_match20; + #endif + +@@ -385,7 +384,6 @@ + { + unsigned int est_freq; + extern unsigned long (*do_gettimeoffset)(void); +- extern void au1k_wait(void); + + printk("calculating r4koff... "); + r4k_offset = cal_r4koff(); +@@ -437,9 +435,6 @@ + au_writel(0, SYS_TOYWRITE); + while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S); + +- au_writel(au_readl(SYS_WAKEMSK) | (1<<8), SYS_WAKEMSK); +- au_writel(~0, SYS_WAKESRC); +- au_sync(); + while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20); + + /* setup match20 to interrupt once every 10ms */ +@@ -447,13 +442,13 @@ + au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2); + au_sync(); + while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20); +- startup_match20_interrupt(); ++ startup_match20_interrupt(counter0_irq); + + do_gettimeoffset = do_fast_pm_gettimeoffset; + + /* We can use the real 'wait' instruction. + */ +- au1k_wait_ptr = au1k_wait; ++ allow_au1k_wait = 1; + } + + #else +diff -Nur linux-2.4.30/arch/mips/au1000/db1x00/Makefile linux-2.4.30-mips/arch/mips/au1000/db1x00/Makefile +--- linux-2.4.30/arch/mips/au1000/db1x00/Makefile 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/db1x00/Makefile 2005-01-30 09:06:19.000000000 +0100 +@@ -17,4 +17,11 @@ + obj-y := init.o board_setup.o irqmap.o + obj-$(CONFIG_WM97XX_COMODULE) += mirage_ts.o + ++ifdef CONFIG_MIPS_DB1100 ++ifdef CONFIG_MMC ++obj-y += mmc_support.o ++export-objs += mmc_support.o ++endif ++endif ++ + include $(TOPDIR)/Rules.make +diff -Nur linux-2.4.30/arch/mips/au1000/db1x00/board_setup.c linux-2.4.30-mips/arch/mips/au1000/db1x00/board_setup.c +--- linux-2.4.30/arch/mips/au1000/db1x00/board_setup.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/db1x00/board_setup.c 2005-03-19 08:17:51.000000000 +0100 +@@ -46,10 +46,22 @@ + #include <asm/au1000.h> + #include <asm/db1x00.h> + +-extern struct rtc_ops no_rtc_ops; ++#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) && defined(CONFIG_MIPS_DB1550) ++#include <asm/au1xxx_dbdma.h> ++extern struct ide_ops *ide_ops; ++extern struct ide_ops au1xxx_ide_ops; ++extern u32 au1xxx_ide_virtbase; ++extern u64 au1xxx_ide_physbase; ++extern int au1xxx_ide_irq; ++ ++/* Ddma */ ++chan_tab_t *ide_read_ch, *ide_write_ch; ++u32 au1xxx_ide_ddma_enable = 0, switch4ddma = 1; // PIO+ddma ++ ++dbdev_tab_t new_dbdev_tab_element = { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }; ++#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX */ + +-/* not correct for db1550 */ +-static BCSR * const bcsr = (BCSR *)0xAE000000; ++extern struct rtc_ops no_rtc_ops; + + void board_reset (void) + { +@@ -57,6 +69,13 @@ + au_writel(0x00000000, 0xAE00001C); + } + ++void board_power_off (void) ++{ ++#ifdef CONFIG_MIPS_MIRAGE ++ au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT); ++#endif ++} ++ + void __init board_setup(void) + { + u32 pin_func; +@@ -108,8 +127,42 @@ + au_writel(0x02000200, GPIO2_OUTPUT); + #endif + ++#if defined(CONFIG_AU1XXX_SMC91111) ++#define CPLD_CONTROL (0xAF00000C) ++ { ++ extern uint32_t au1xxx_smc91111_base; ++ extern unsigned int au1xxx_smc91111_irq; ++ extern int au1xxx_smc91111_nowait; ++ ++ au1xxx_smc91111_base = 0xAC000300; ++ au1xxx_smc91111_irq = AU1000_GPIO_8; ++ au1xxx_smc91111_nowait = 1; ++ ++ /* set up the Static Bus timing - only 396Mhz */ ++ bcsr->resets |= 0x7; ++ au_writel(0x00010003, MEM_STCFG0); ++ au_writel(0x000c00c0, MEM_STCFG2); ++ au_writel(0x85E1900D, MEM_STTIME2); ++ } ++#endif /* end CONFIG_SMC91111 */ + au_sync(); + ++#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) && defined(CONFIG_MIPS_DB1550) ++ /* ++ * Iniz IDE parameters ++ */ ++ ide_ops = &au1xxx_ide_ops; ++ au1xxx_ide_irq = DAUGHTER_CARD_IRQ; ++ au1xxx_ide_physbase = AU1XXX_ATA_PHYS_ADDR; ++ au1xxx_ide_virtbase = KSEG1ADDR(AU1XXX_ATA_PHYS_ADDR); ++ ++ /* ++ * change PIO or PIO+Ddma ++ * check the GPIO-6 pin condition. db1550:s6_dot ++ */ ++ switch4ddma = (au_readl(SYS_PINSTATERD) & (1 << 6)) ? 1 : 0; ++#endif ++ + #ifdef CONFIG_MIPS_DB1000 + printk("AMD Alchemy Au1000/Db1000 Board\n"); + #endif +diff -Nur linux-2.4.30/arch/mips/au1000/db1x00/irqmap.c linux-2.4.30-mips/arch/mips/au1000/db1x00/irqmap.c +--- linux-2.4.30/arch/mips/au1000/db1x00/irqmap.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/db1x00/irqmap.c 2005-01-30 09:06:19.000000000 +0100 +@@ -53,6 +53,7 @@ + #ifdef CONFIG_MIPS_DB1550 + { AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 IRQ# + { AU1000_GPIO_5, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 1 IRQ# ++ { AU1000_GPIO_8, INTC_INT_LOW_LEVEL, 0 }, // Daughtercard IRQ# + #else + { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 Fully_Interted# + { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 STSCHG# +diff -Nur linux-2.4.30/arch/mips/au1000/db1x00/mmc_support.c linux-2.4.30-mips/arch/mips/au1000/db1x00/mmc_support.c +--- linux-2.4.30/arch/mips/au1000/db1x00/mmc_support.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/db1x00/mmc_support.c 2005-01-30 09:07:01.000000000 +0100 +@@ -0,0 +1,126 @@ ++/* ++ * BRIEF MODULE DESCRIPTION ++ * ++ * MMC support routines for DB1100. ++ * ++ * ++ * Copyright (c) 2003-2004 Embedded Edge, LLC. ++ * Author: Embedded Edge, LLC. ++ * Contact: dan@embeddededge.com ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++ ++#include <linux/config.h> ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/init.h> ++ ++#include <asm/irq.h> ++#include <asm/au1000.h> ++#include <asm/au1100_mmc.h> ++#include <asm/db1x00.h> ++ ++ ++/* SD/MMC controller support functions */ ++ ++/* ++ * Detect card. ++ */ ++void mmc_card_inserted(int _n_, int *_res_) ++{ ++ u32 gpios = au_readl(SYS_PINSTATERD); ++ u32 emptybit = (_n_) ? (1<<20) : (1<<19); ++ *_res_ = ((gpios & emptybit) == 0); ++} ++ ++/* ++ * Check card write protection. ++ */ ++void mmc_card_writable(int _n_, int *_res_) ++{ ++ BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++ unsigned long mmc_wp, board_specific; ++ ++ if (_n_) { ++ mmc_wp = BCSR_BOARD_SD1_WP; ++ } else { ++ mmc_wp = BCSR_BOARD_SD0_WP; ++ } ++ ++ board_specific = au_readl((unsigned long)(&bcsr->specific)); ++ ++ if (!(board_specific & mmc_wp)) {/* low means card writable */ ++ *_res_ = 1; ++ } else { ++ *_res_ = 0; ++ } ++} ++ ++/* ++ * Apply power to card slot. ++ */ ++void mmc_power_on(int _n_) ++{ ++ BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++ unsigned long mmc_pwr, board_specific; ++ ++ if (_n_) { ++ mmc_pwr = BCSR_BOARD_SD1_PWR; ++ } else { ++ mmc_pwr = BCSR_BOARD_SD0_PWR; ++ } ++ ++ board_specific = au_readl((unsigned long)(&bcsr->specific)); ++ board_specific |= mmc_pwr; ++ ++ au_writel(board_specific, (int)(&bcsr->specific)); ++ au_sync_delay(1); ++} ++ ++/* ++ * Remove power from card slot. ++ */ ++void mmc_power_off(int _n_) ++{ ++ BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++ unsigned long mmc_pwr, board_specific; ++ ++ if (_n_) { ++ mmc_pwr = BCSR_BOARD_SD1_PWR; ++ } else { ++ mmc_pwr = BCSR_BOARD_SD0_PWR; ++ } ++ ++ board_specific = au_readl((unsigned long)(&bcsr->specific)); ++ board_specific &= ~mmc_pwr; ++ ++ au_writel(board_specific, (int)(&bcsr->specific)); ++ au_sync_delay(1); ++} ++ ++EXPORT_SYMBOL(mmc_card_inserted); ++EXPORT_SYMBOL(mmc_card_writable); ++EXPORT_SYMBOL(mmc_power_on); ++EXPORT_SYMBOL(mmc_power_off); ++ +diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/Makefile linux-2.4.30-mips/arch/mips/au1000/ficmmp/Makefile +--- linux-2.4.30/arch/mips/au1000/ficmmp/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/Makefile 2005-01-30 09:01:27.000000000 +0100 +@@ -0,0 +1,25 @@ ++# ++# Copyright 2000 MontaVista Software Inc. ++# Author: MontaVista Software, Inc. ++# ppopov@mvista.com or source@mvista.com ++# ++# Makefile for the Alchemy Semiconductor FIC board. ++# ++# Note! Dependencies are done automagically by 'make dep', which also ++# removes any old dependencies. DON'T put your own dependencies here ++# unless it's something special (ie not a .c file). ++# ++ ++USE_STANDARD_AS_RULE := true ++ ++O_TARGET := ficmmp.o ++ ++obj-y := init.o board_setup.o irqmap.o au1200_ibutton.o au1xxx_dock.o ++ ++ifdef CONFIG_MMC ++obj-y += mmc_support.o ++export-objs +=mmc_support.o ++endif ++ ++ ++include $(TOPDIR)/Rules.make +diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/au1200_ibutton.c linux-2.4.30-mips/arch/mips/au1000/ficmmp/au1200_ibutton.c +--- linux-2.4.30/arch/mips/au1000/ficmmp/au1200_ibutton.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/au1200_ibutton.c 2005-02-03 07:35:29.000000000 +0100 +@@ -0,0 +1,270 @@ ++/* ---------------------------------------------------------------------- ++ * mtwilson_keys.c ++ * ++ * Copyright (C) 2003 Intrinsyc Software Inc. ++ * ++ * Intel Personal Media Player buttons ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * May 02, 2003 : Initial version [FB] ++ * ++ ------------------------------------------------------------------------*/ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/kernel.h> ++#include <linux/init.h> ++#include <linux/fs.h> ++#include <linux/sched.h> ++#include <linux/miscdevice.h> ++#include <linux/errno.h> ++#include <linux/poll.h> ++#include <linux/delay.h> ++#include <linux/input.h> ++ ++#include <asm/au1000.h> ++#include <asm/uaccess.h> ++#include <asm/au1xxx_gpio.h> ++#include <asm/irq.h> ++#include <asm/keyboard.h> ++#include <linux/time.h> ++ ++#define DRIVER_VERSION "V1.0" ++#define DRIVER_AUTHOR "FIC" ++#define DRIVER_DESC "FIC Travis Media Player Button Driver" ++#define DRIVER_NAME "Au1200Button" ++ ++#define BUTTON_MAIN (1<<1) ++#define BUTTON_SELECT (1<<6) ++#define BUTTON_GUIDE (1<<12) ++#define BUTTON_DOWN (1<<17) ++#define BUTTON_LEFT (1<<19) ++#define BUTTON_RIGHT (1<<26) ++#define BUTTON_UP (1<<28) ++ ++#define BUTTON_MASK (\ ++ BUTTON_MAIN \ ++ | BUTTON_SELECT \ ++ | BUTTON_GUIDE \ ++ | BUTTON_DOWN \ ++ | BUTTON_LEFT \ ++ | BUTTON_RIGHT \ ++ | BUTTON_UP \ ++ ) ++ ++#define BUTTON_INVERT (\ ++ BUTTON_MAIN \ ++ | 0 \ ++ | BUTTON_GUIDE \ ++ | 0 \ ++ | 0 \ ++ | 0 \ ++ | 0 \ ++ ) ++ ++char button_map[32]={0,KEY_S,0,0,0,0,KEY_ENTER,0,0,0,0,0,KEY_G,0,0,0,0,KEY_DOWN,0,KEY_LEFT,0,0,0,0,0,0,KEY_RIGHT,0,KEY_UP,0,0,0}; ++//char button_map[32]={0,0,0,0,0,0,KEY_ENTER,0,0,0,0,0,KEY_G,0,0,0,0,KEY_DOWN,0,KEY_LEFT,0,0,0,0,0,0,KEY_RIGHT,0,KEY_UP,0,0,0}; ++ ++//char button_map[32]={0,KEY_TAB,0,0,0,0,KEY_M,0,0,0,0,0,KEY_S,0,0,0,0,KEY_DOWN,0,KEY_LEFT,0,0,0,0,0,0,KEY_RIGHT,0,KEY_UP,0,0,0}; ++//char button_map[32]={0,0,0,0,0,0,KEY_M,0,0,0,0,0,KEY_S,0,0,0,0,KEY_DOWN,0,KEY_LEFT,0,0,0,0,0,0,KEY_RIGHT,0,KEY_UP,0,0,0}; ++ ++#define BUTTON_COUNT (sizeof (button_map) / sizeof (button_map[0])) ++ ++struct input_dev dev; ++struct timeval cur_tv; ++ ++static unsigned int old_tv_usec = 0; ++ ++static unsigned int read_button_state(void) ++{ ++ unsigned int state; ++ ++ state = au_readl(SYS_PINSTATERD) & BUTTON_MASK; /* get gpio status */ ++ ++ state ^= BUTTON_INVERT; /* invert main & guide button */ ++ ++ /* printk("au1200_ibutton.c: button state [0x%X]\r\n",state); */ ++ return state; ++} ++ ++//This function returns 0 if the allowed microseconds have elapsed since the last call to ths function, otherwise it returns 1 to indicate a bounce condition ++static unsigned int bounce() ++{ ++ ++ unsigned int elapsed_time; ++ ++ do_gettimeofday (&cur_tv); ++ ++ if (!old_tv_usec) { ++ old_tv_usec = cur_tv.tv_usec; ++ return 0; ++ } ++ ++ if(cur_tv.tv_usec > old_tv_usec) { ++ /* If there hasn't been rollover */ ++ elapsed_time = ((cur_tv.tv_usec - old_tv_usec)); ++ } ++ else { ++ /* Accounting for rollover */ ++ elapsed_time = ((1000000 - old_tv_usec + cur_tv.tv_usec)); ++ } ++ ++ if (elapsed_time > 250000) { ++ old_tv_usec = 0; /* reset the bounce time */ ++ return 0; ++ } ++ ++ return 1; ++} ++ ++/* button interrupt handler */ ++static void button_interrupt(int irq, void *dev, struct pt_regs *regs) ++{ ++ ++ unsigned int i,bit_mask, key_choice; ++ u32 button_state; ++ ++ /* Report state to upper level */ ++ ++ button_state = read_button_state() & BUTTON_MASK; /* get new gpio status */ ++ ++ /* Return if this is a repeated (bouncing) event */ ++ if(bounce()) ++ return; ++ ++ /* we want to make keystrokes */ ++ for( i=0; i< BUTTON_COUNT; i++) { ++ bit_mask = 1<<i; ++ if (button_state & bit_mask) { ++ key_choice = button_map[i]; ++ /* toggle key down */ ++ input_report_key(dev, key_choice, 1); ++ /* toggle key up */ ++ input_report_key(dev, key_choice, 0); ++ printk("ibutton gpio %d stat %x scan code %d\r\n", ++ i, button_state, key_choice); ++ /* Only report the first key event; it doesn't make ++ * sense for two keys to be pressed at the same time, ++ * and causes problems with the directional keys ++ * return; ++ */ ++ } ++ } ++} ++ ++static int ++button_translate(unsigned char scancode, unsigned char *keycode, char raw_mode) ++{ ++ static int prev_scancode; ++ ++ printk( "ibutton.c: translate: scancode=%x raw_mode=%x\n", ++ scancode, raw_mode); ++ ++ if (scancode == 0xe0 || scancode == 0xe1) { ++ prev_scancode = scancode; ++ return 0; ++ } ++ ++ if (scancode == 0x00 || scancode == 0xff) { ++ prev_scancode = 0; ++ return 0; ++ } ++ ++ *keycode = scancode; ++ ++ return 1; ++} ++ ++/* init button hardware */ ++static int button_hw_init(void) ++{ ++ unsigned int ipinfunc=0; ++ ++ printk("au1200_ibutton.c: Initializing buttons hardware\n"); ++ ++ // initialize GPIO pin function assignments ++ ++ ipinfunc = au_readl(SYS_PINFUNC); ++ ++ ipinfunc &= ~(SYS_PINFUNC_DMA | SYS_PINFUNC_S0A | SYS_PINFUNC_S0B); ++ au_writel( ipinfunc ,SYS_PINFUNC); ++ ++ ipinfunc |= (SYS_PINFUNC_S0C); ++ au_writel( ipinfunc ,SYS_PINFUNC); ++ ++ return 0; ++} ++ ++/* button driver init */ ++static int __init button_init(void) ++{ ++ int ret, i; ++ unsigned int flag=0; ++ ++ printk("au1200_ibutton.c: button_init()\r\n"); ++ ++ button_hw_init(); ++ ++ /* register all button irq handler */ ++ ++ for(i=0; i< sizeof(button_map)/sizeof(button_map[0]); i++) ++ { ++ /* register irq <-- gpio 1 ,6 ,12 , 17 ,19 , 26 ,28 */ ++ if(button_map[i] != 0) ++ { ++ ret = request_irq(AU1000_GPIO_0 + i , ++ &button_interrupt , SA_INTERRUPT , ++ DRIVER_NAME , &dev); ++ if(ret) flag |= 1<<i; ++ } ++ } ++ ++ printk("au1200_ibutton.c: request_irq,ret:0x%x\r\n",ret); ++ ++ if (ret) { ++ printk("au1200_ibutton.c: request_irq:%X failed\r\n",flag); ++ return ret; ++ } ++ ++ dev.name = DRIVER_NAME; ++ dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REP); ++ ++ for (i=0;i<sizeof(button_map)/sizeof(button_map[0]);i++) ++ { ++ dev.keybit[LONG(button_map[i])] |= BIT(button_map[i]); ++ } ++ ++ input_register_device(&dev); ++ ++ /* ready to receive interrupts */ ++ ++ return 0; ++} ++ ++/* button driver exit */ ++static void __exit button_exit(void) ++{ ++ int i; ++ ++ for(i=0;i<sizeof(button_map)/sizeof(button_map[0]);i++) ++ { ++ if(button_map[i] != 0) ++ { ++ free_irq( AU1000_GPIO_0 + i, &dev); ++ } ++ } ++ ++ input_unregister_device(&dev); ++ ++ printk("au1200_ibutton.c: button_exit()\r\n"); ++} ++ ++module_init(button_init); ++module_exit(button_exit); ++ ++MODULE_AUTHOR( DRIVER_AUTHOR ); ++MODULE_DESCRIPTION( DRIVER_DESC ); ++MODULE_LICENSE("GPL"); +diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/au1xxx_dock.c linux-2.4.30-mips/arch/mips/au1000/ficmmp/au1xxx_dock.c +--- linux-2.4.30/arch/mips/au1000/ficmmp/au1xxx_dock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/au1xxx_dock.c 2005-01-30 09:01:27.000000000 +0100 +@@ -0,0 +1,261 @@ ++/* ++ * Copyright (C) 2003 Metrowerks, All Rights Reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/init.h> ++#include <linux/fs.h> ++#include <linux/sched.h> ++#include <linux/miscdevice.h> ++#include <linux/errno.h> ++#include <linux/poll.h> ++#include <asm/au1000.h> ++#include <asm/uaccess.h> ++#include <asm/au1xxx_gpio.h> ++ ++ ++#if defined(CONFIG_MIPS_FICMMP) ++ #define DOCK_GPIO 215 ++#else ++ #error Unsupported Au1xxx Platform ++#endif ++ ++#define MAKE_FLAG 0x20 ++ ++#undef DEBUG ++ ++#define DEBUG 0 ++//#define DEBUG 1 ++ ++#if DEBUG ++#define DPRINTK(format, args...) printk(__FUNCTION__ ": " format, ## args) ++#else ++#define DPRINTK(format, args...) do { } while (0) ++#endif ++ ++/* Please note that this driver is based on a timer and is not interrupt ++ * driven. If you are going to make use of this driver, you will need to have ++ * your application open the dock listing from the /dev directory first. ++ */ ++ ++struct au1xxx_dock { ++ struct fasync_struct *fasync; ++ wait_queue_head_t read_wait; ++ int open_count; ++ unsigned int debounce; ++ unsigned int current; ++ unsigned int last; ++}; ++ ++static struct au1xxx_dock dock_info; ++ ++ ++static void dock_timer_periodic(void *data); ++ ++static struct tq_struct dock_task = { ++ routine: dock_timer_periodic, ++ data: NULL ++}; ++ ++static int cleanup_flag = 0; ++static DECLARE_WAIT_QUEUE_HEAD(cleanup_wait_queue); ++ ++ ++static unsigned int read_dock_state(void) ++{ ++ u32 state; ++ ++ state = au1xxx_gpio_read(DOCK_GPIO); ++ ++ /* printk( "Current Dock State: %d\n", state ); */ ++ ++ return state; ++} ++ ++ ++static void dock_timer_periodic(void *data) ++{ ++ struct au1xxx_dock *dock = (struct au1xxx_dock *)data; ++ unsigned long dock_state; ++ ++ /* If cleanup wants us to die */ ++ if (cleanup_flag) { ++ /* now cleanup_module can return */ ++ wake_up(&cleanup_wait_queue); ++ } else { ++ /* put ourselves back in the task queue */ ++ queue_task(&dock_task, &tq_timer); ++ } ++ ++ /* read current dock */ ++ dock_state = read_dock_state(); ++ ++ /* if dock states hasn't changed */ ++ /* save time and be done. */ ++ if (dock_state == dock->current) { ++ return; ++ } ++ ++ if (dock_state == dock->debounce) { ++ dock->current = dock_state; ++ } else { ++ dock->debounce = dock_state; ++ } ++ if (dock->current != dock->last) { ++ if (waitqueue_active(&dock->read_wait)) { ++ wake_up_interruptible(&dock->read_wait); ++ } ++ } ++} ++ ++ ++static ssize_t au1xxx_dock_read(struct file *filp, char *buffer, size_t count, loff_t *ppos) ++{ ++ struct au1xxx_dock *dock = filp->private_data; ++ char event[3]; ++ int last; ++ int cur; ++ int err; ++ ++try_again: ++ ++ while (dock->current == dock->last) { ++ if (filp->f_flags & O_NONBLOCK) { ++ return -EAGAIN; ++ } ++ interruptible_sleep_on(&dock->read_wait); ++ if (signal_pending(current)) { ++ return -ERESTARTSYS; ++ } ++ } ++ ++ cur = dock->current; ++ last = dock->last; ++ ++ if(cur != last) ++ { ++ event[0] = cur ? 'D' : 'U'; ++ event[1] = '\r'; ++ event[2] = '\n'; ++ } ++ else ++ goto try_again; ++ ++ dock->last = cur; ++ err = copy_to_user(buffer, &event, 3); ++ if (err) { ++ return err; ++ } ++ ++ return 3; ++} ++ ++ ++static int au1xxx_dock_open(struct inode *inode, struct file *filp) ++{ ++ struct au1xxx_dock *dock = &dock_info; ++ ++ MOD_INC_USE_COUNT; ++ ++ filp->private_data = dock; ++ ++ if (dock->open_count++ == 0) { ++ dock_task.data = dock; ++ cleanup_flag = 0; ++ queue_task(&dock_task, &tq_timer); ++ } ++ ++ return 0; ++} ++ ++ ++static unsigned int au1xxx_dock_poll(struct file *filp, poll_table *wait) ++{ ++ struct au1xxx_dock *dock = filp->private_data; ++ int ret = 0; ++ ++ DPRINTK("start\n"); ++ poll_wait(filp, &dock->read_wait, wait); ++ if (dock->current != dock->last) { ++ ret = POLLIN | POLLRDNORM; ++ } ++ return ret; ++} ++ ++ ++static int au1xxx_dock_release(struct inode *inode, struct file *filp) ++{ ++ struct au1xxx_dock *dock = filp->private_data; ++ ++ DPRINTK("start\n"); ++ ++ if (--dock->open_count == 0) { ++ cleanup_flag = 1; ++ sleep_on(&cleanup_wait_queue); ++ } ++ MOD_DEC_USE_COUNT; ++ ++ return 0; ++} ++ ++ ++ ++static struct file_operations au1xxx_dock_fops = { ++ owner: THIS_MODULE, ++ read: au1xxx_dock_read, ++ poll: au1xxx_dock_poll, ++ open: au1xxx_dock_open, ++ release: au1xxx_dock_release, ++}; ++ ++/* ++ * The au1xxx dock is a misc device: ++ * Major 10 char ++ * Minor 22 /dev/dock ++ * ++ * This is /dev/misc/dock if devfs is used. ++ */ ++ ++static struct miscdevice au1xxx_dock_dev = { ++ minor: 23, ++ name: "dock", ++ fops: &au1xxx_dock_fops, ++}; ++ ++static int __init au1xxx_dock_init(void) ++{ ++ struct au1xxx_dock *dock = &dock_info; ++ int ret; ++ ++ DPRINTK("Initializing dock driver\n"); ++ dock->open_count = 0; ++ cleanup_flag = 0; ++ init_waitqueue_head(&dock->read_wait); ++ ++ ++ /* yamon configures GPIO pins for the dock ++ * no initialization needed ++ */ ++ ++ ret = misc_register(&au1xxx_dock_dev); ++ ++ DPRINTK("dock driver fully initialized.\n"); ++ ++ return ret; ++} ++ ++ ++static void __exit au1xxx_dock_exit(void) ++{ ++ DPRINTK("unloading dock driver\n"); ++ misc_deregister(&au1xxx_dock_dev); ++} ++ ++ ++module_init(au1xxx_dock_init); ++module_exit(au1xxx_dock_exit); +diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/board_setup.c linux-2.4.30-mips/arch/mips/au1000/ficmmp/board_setup.c +--- linux-2.4.30/arch/mips/au1000/ficmmp/board_setup.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/board_setup.c 2005-03-19 08:17:51.000000000 +0100 +@@ -0,0 +1,226 @@ ++/* ++ * ++ * BRIEF MODULE DESCRIPTION ++ * Alchemy Pb1200 board setup. ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++#include <linux/config.h> ++#include <linux/init.h> ++#include <linux/sched.h> ++#include <linux/ioport.h> ++#include <linux/mm.h> ++#include <linux/console.h> ++#include <linux/mc146818rtc.h> ++#include <linux/delay.h> ++#include <linux/ide.h> ++ ++#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) ++#include <linux/ide.h> ++#endif ++ ++#include <asm/cpu.h> ++#include <asm/bootinfo.h> ++#include <asm/irq.h> ++#include <asm/keyboard.h> ++#include <asm/mipsregs.h> ++#include <asm/reboot.h> ++#include <asm/pgtable.h> ++#include <asm/au1000.h> ++#include <asm/ficmmp.h> ++#include <asm/au1xxx_dbdma.h> ++#include <asm/au1xxx_gpio.h> ++ ++extern struct rtc_ops no_rtc_ops; ++ ++/* value currently in the board configuration register */ ++u16 ficmmp_config = 0; ++ ++#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) ++extern struct ide_ops *ide_ops; ++extern struct ide_ops au1xxx_ide_ops; ++extern u32 au1xxx_ide_virtbase; ++extern u64 au1xxx_ide_physbase; ++extern int au1xxx_ide_irq; ++ ++u32 led_base_addr; ++/* Ddma */ ++chan_tab_t *ide_read_ch, *ide_write_ch; ++u32 au1xxx_ide_ddma_enable = 0, switch4ddma = 1; // PIO+ddma ++ ++dbdev_tab_t new_dbdev_tab_element = { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }; ++#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX */ ++ ++void board_reset (void) ++{ ++ au_writel(0, 0xAD80001C); ++} ++ ++void board_power_off (void) ++{ ++} ++ ++void __init board_setup(void) ++{ ++ char *argptr = NULL; ++ u32 pin_func; ++ rtc_ops = &no_rtc_ops; ++ ++ ficmmp_config_init(); //Initialize FIC control register ++ ++#if 0 ++ /* Enable PSC1 SYNC for AC97. Normaly done in audio driver, ++ * but it is board specific code, so put it here. ++ */ ++ pin_func = au_readl(SYS_PINFUNC); ++ au_sync(); ++ pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1; ++ au_writel(pin_func, SYS_PINFUNC); ++ ++ au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */ ++ au_sync(); ++#endif ++ ++#if defined( CONFIG_I2C_ALGO_AU1550 ) ++ { ++ u32 freq0, clksrc; ++ ++ /* Select SMBUS in CPLD */ ++ /* bcsr->resets &= ~(BCSR_RESETS_PCS0MUX); */ ++ ++ pin_func = au_readl(SYS_PINFUNC); ++ au_sync(); ++ pin_func &= ~(3<<17 | 1<<4); ++ /* Set GPIOs correctly */ ++ pin_func |= 2<<17; ++ au_writel(pin_func, SYS_PINFUNC); ++ au_sync(); ++ ++ /* The i2c driver depends on 50Mhz clock */ ++ freq0 = au_readl(SYS_FREQCTRL0); ++ au_sync(); ++ freq0 &= ~(SYS_FC_FRDIV1_MASK | SYS_FC_FS1 | SYS_FC_FE1); ++ freq0 |= (3<<SYS_FC_FRDIV1_BIT); ++ /* 396Mhz / (3+1)*2 == 49.5Mhz */ ++ au_writel(freq0, SYS_FREQCTRL0); ++ au_sync(); ++ freq0 |= SYS_FC_FE1; ++ au_writel(freq0, SYS_FREQCTRL0); ++ au_sync(); ++ ++ clksrc = au_readl(SYS_CLKSRC); ++ au_sync(); ++ clksrc &= ~0x01f00000; ++ /* bit 22 is EXTCLK0 for PSC0 */ ++ clksrc |= (0x3 << 22); ++ au_writel(clksrc, SYS_CLKSRC); ++ au_sync(); ++ } ++#endif ++ ++#ifdef CONFIG_FB_AU1200 ++ argptr = prom_getcmdline(); ++ strcat(argptr, " video=au1200fb:"); ++#endif ++ ++#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) ++ /* ++ * Iniz IDE parameters ++ */ ++ ide_ops = &au1xxx_ide_ops; ++ au1xxx_ide_irq = FICMMP_IDE_INT; ++ au1xxx_ide_physbase = AU1XXX_ATA_PHYS_ADDR; ++ au1xxx_ide_virtbase = KSEG1ADDR(AU1XXX_ATA_PHYS_ADDR); ++ switch4ddma = 0; ++ /* ++ ide_ops = &au1xxx_ide_ops; ++ au1xxx_ide_irq = FICMMP_IDE_INT; ++ au1xxx_ide_base = KSEG1ADDR(AU1XXX_ATA_BASE); ++ */ ++ au1xxx_gpio_write(9, 1); ++ printk("B4001010: %X\n", *((u32*)0xB4001010)); ++ printk("B4001014: %X\n", *((u32*)0xB4001014)); ++ printk("B4001018: %X\n", *((u32*)0xB4001018)); ++ printk("B1900100: %X\n", *((u32*)0xB1900100)); ++ ++#if 0 ++ ficmmp_config_clear(FICMMP_CONFIG_IDERST); ++ mdelay(100); ++ ficmmp_config_set(FICMMP_CONFIG_IDERST); ++ mdelay(100); ++#endif ++ /* ++ * change PIO or PIO+Ddma ++ * check the GPIO-5 pin condition. pb1200:s18_dot ++ */ ++/* switch4ddma = 0; //(au_readl(SYS_PINSTATERD) & (1 << 5)) ? 1 : 0; */ ++#endif ++ ++ /* The Pb1200 development board uses external MUX for PSC0 to ++ support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI ++ */ ++#if defined(CONFIG_AU1550_PSC_SPI) && defined(CONFIG_I2C_ALGO_AU1550) ++ #error I2C and SPI are mutually exclusive. Both are physically connected to PSC0.\ ++ Refer to Pb1200 documentation. ++#elif defined( CONFIG_AU1550_PSC_SPI ) ++ //bcsr->resets |= BCSR_RESETS_PCS0MUX; ++#elif defined( CONFIG_I2C_ALGO_AU1550 ) ++ //bcsr->resets &= (~BCSR_RESETS_PCS0MUX); ++#endif ++ au_sync(); ++ ++ printk("FIC Multimedia Player Board\n"); ++ au1xxx_gpio_tristate(5); ++ printk("B1900100: %X\n", *((volatile u32*)0xB1900100)); ++ printk("B190002C: %X\n", *((volatile u32*)0xB190002C)); ++} ++ ++int ++board_au1200fb_panel (void) ++{ ++ au1xxx_gpio_tristate(6); ++ ++ if (au1xxx_gpio_read(12) == 0) ++ return 9; /* FS453_640x480 (Composite/S-Video) */ ++ else ++ return 7; /* Sharp 320x240 TFT */ ++} ++ ++int ++board_au1200fb_panel_init (void) ++{ ++ /*Enable data buffers*/ ++ ficmmp_config_clear(FICMMP_CONFIG_LCMDATAOUT); ++ /*Take LCD out of reset*/ ++ ficmmp_config_set(FICMMP_CONFIG_LCMPWREN | FICMMP_CONFIG_LCMEN); ++ return 0; ++} ++ ++int ++board_au1200fb_panel_shutdown (void) ++{ ++ /*Disable data buffers*/ ++ ficmmp_config_set(FICMMP_CONFIG_LCMDATAOUT); ++ /*Put LCD in reset, remove power*/ ++ ficmmp_config_clear(FICMMP_CONFIG_LCMEN | FICMMP_CONFIG_LCMPWREN); ++ return 0; ++} ++ +diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/init.c linux-2.4.30-mips/arch/mips/au1000/ficmmp/init.c +--- linux-2.4.30/arch/mips/au1000/ficmmp/init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/init.c 2005-01-30 09:01:27.000000000 +0100 +@@ -0,0 +1,76 @@ ++/* ++ * ++ * BRIEF MODULE DESCRIPTION ++ * PB1200 board setup ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include <linux/init.h> ++#include <linux/mm.h> ++#include <linux/sched.h> ++#include <linux/bootmem.h> ++#include <asm/addrspace.h> ++#include <asm/bootinfo.h> ++#include <linux/config.h> ++#include <linux/string.h> ++#include <linux/kernel.h> ++#include <linux/sched.h> ++ ++int prom_argc; ++char **prom_argv, **prom_envp; ++extern void __init prom_init_cmdline(void); ++extern char *prom_getenv(char *envname); ++ ++const char *get_system_type(void) ++{ ++ return "FIC Multimedia Player (Au1200)"; ++} ++ ++u32 mae_memsize = 0; ++ ++int __init prom_init(int argc, char **argv, char **envp, int *prom_vec) ++{ ++ unsigned char *memsize_str; ++ unsigned long memsize; ++ ++ prom_argc = argc; ++ prom_argv = argv; ++ prom_envp = envp; ++ ++ mips_machgroup = MACH_GROUP_ALCHEMY; ++ mips_machtype = MACH_PB1000; /* set the platform # */ ++ prom_init_cmdline(); ++ ++ memsize_str = prom_getenv("memsize"); ++ if (!memsize_str) { ++ memsize = 0x08000000; ++ } else { ++ memsize = simple_strtol(memsize_str, NULL, 0); ++ } ++ ++ /* reserved 32MB for MAE driver */ ++ memsize -= (32 * 1024 * 1024); ++ add_memory_region(0, memsize, BOOT_MEM_RAM); ++ mae_memsize = memsize; /* for drivers/char/au1xxx_mae.c */ ++ return 0; ++} ++ +diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/irqmap.c linux-2.4.30-mips/arch/mips/au1000/ficmmp/irqmap.c +--- linux-2.4.30/arch/mips/au1000/ficmmp/irqmap.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/irqmap.c 2005-01-30 09:01:27.000000000 +0100 +@@ -0,0 +1,61 @@ ++/* ++ * BRIEF MODULE DESCRIPTION ++ * Au1xxx irq map table ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++#include <linux/errno.h> ++#include <linux/init.h> ++#include <linux/irq.h> ++#include <linux/kernel_stat.h> ++#include <linux/module.h> ++#include <linux/signal.h> ++#include <linux/sched.h> ++#include <linux/types.h> ++#include <linux/interrupt.h> ++#include <linux/ioport.h> ++#include <linux/timex.h> ++#include <linux/slab.h> ++#include <linux/random.h> ++#include <linux/delay.h> ++ ++#include <asm/bitops.h> ++#include <asm/bootinfo.h> ++#include <asm/io.h> ++#include <asm/mipsregs.h> ++#include <asm/system.h> ++#include <asm/au1000.h> ++#include <asm/ficmmp.h> ++ ++au1xxx_irq_map_t au1xxx_irq_map[] = { ++ { FICMMP_IDE_INT, INTC_INT_HIGH_LEVEL, 0 }, ++ { AU1XXX_SMC91111_IRQ, INTC_INT_HIGH_LEVEL, 0 }, ++ { AU1000_GPIO_1 , INTC_INT_FALL_EDGE, 0 }, // main button ++ { AU1000_GPIO_6 , INTC_INT_RISE_EDGE, 0 }, // select button ++ { AU1000_GPIO_12, INTC_INT_FALL_EDGE, 0 }, // guide button ++ { AU1000_GPIO_17, INTC_INT_RISE_EDGE, 0 }, // down button ++ { AU1000_GPIO_19, INTC_INT_RISE_EDGE, 0 }, // left button ++ { AU1000_GPIO_26, INTC_INT_RISE_EDGE, 0 }, // right button ++ { AU1000_GPIO_28, INTC_INT_RISE_EDGE, 0 }, // up button ++}; ++ ++int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t); ++ +diff -Nur linux-2.4.30/arch/mips/au1000/hydrogen3/Makefile linux-2.4.30-mips/arch/mips/au1000/hydrogen3/Makefile +--- linux-2.4.30/arch/mips/au1000/hydrogen3/Makefile 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/hydrogen3/Makefile 2005-02-11 22:09:55.000000000 +0100 +@@ -14,6 +14,11 @@ + + O_TARGET := hydrogen3.o + +-obj-y := init.o board_setup.o irqmap.o ++obj-y := init.o board_setup.o irqmap.o buttons.o ++ ++ifdef CONFIG_MMC ++obj-y += mmc_support.o ++export-objs +=mmc_support.o ++endif + + include $(TOPDIR)/Rules.make +diff -Nur linux-2.4.30/arch/mips/au1000/hydrogen3/board_setup.c linux-2.4.30-mips/arch/mips/au1000/hydrogen3/board_setup.c +--- linux-2.4.30/arch/mips/au1000/hydrogen3/board_setup.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/hydrogen3/board_setup.c 2005-03-19 08:17:51.000000000 +0100 +@@ -51,12 +51,19 @@ + { + } + ++void board_power_off (void) ++{ ++} ++ + void __init board_setup(void) + { + u32 pin_func; + + rtc_ops = &no_rtc_ops; + ++ /* Set GPIO14 high to make CD/DAT1 high for MMC to work */ ++ au_writel(1<<14, SYS_OUTPUTSET); ++ + #ifdef CONFIG_AU1X00_USB_DEVICE + // 2nd USB port is USB device + pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000); +diff -Nur linux-2.4.30/arch/mips/au1000/hydrogen3/buttons.c linux-2.4.30-mips/arch/mips/au1000/hydrogen3/buttons.c +--- linux-2.4.30/arch/mips/au1000/hydrogen3/buttons.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/hydrogen3/buttons.c 2005-02-11 22:09:55.000000000 +0100 +@@ -0,0 +1,308 @@ ++/* ++ * Copyright (C) 2003 Metrowerks, All Rights Reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/init.h> ++#include <linux/fs.h> ++#include <linux/sched.h> ++#include <linux/miscdevice.h> ++#include <linux/errno.h> ++#include <linux/poll.h> ++#include <asm/au1000.h> ++#include <asm/uaccess.h> ++ ++#define BUTTON_SELECT (1<<1) ++#define BUTTON_1 (1<<2) ++#define BUTTON_2 (1<<3) ++#define BUTTON_ONOFF (1<<6) ++#define BUTTON_3 (1<<7) ++#define BUTTON_4 (1<<8) ++#define BUTTON_LEFT (1<<9) ++#define BUTTON_DOWN (1<<10) ++#define BUTTON_RIGHT (1<<11) ++#define BUTTON_UP (1<<12) ++ ++#define BUTTON_MASK (\ ++ BUTTON_SELECT \ ++ | BUTTON_1 \ ++ | BUTTON_2 \ ++ | BUTTON_ONOFF \ ++ | BUTTON_3 \ ++ | BUTTON_4 \ ++ | BUTTON_LEFT \ ++ | BUTTON_DOWN \ ++ | BUTTON_RIGHT \ ++ | BUTTON_UP \ ++ ) ++ ++#define BUTTON_INVERT (\ ++ BUTTON_SELECT \ ++ | BUTTON_1 \ ++ | BUTTON_2 \ ++ | BUTTON_3 \ ++ | BUTTON_4 \ ++ | BUTTON_LEFT \ ++ | BUTTON_DOWN \ ++ | BUTTON_RIGHT \ ++ | BUTTON_UP \ ++ ) ++ ++ ++ ++#define MAKE_FLAG 0x20 ++ ++#undef DEBUG ++ ++#define DEBUG 0 ++//#define DEBUG 1 ++ ++#if DEBUG ++#define DPRINTK(format, args...) printk(__FUNCTION__ ": " format, ## args) ++#else ++#define DPRINTK(format, args...) do { } while (0) ++#endif ++ ++/* Please note that this driver is based on a timer and is not interrupt ++ * driven. If you are going to make use of this driver, you will need to have ++ * your application open the buttons listing from the /dev directory first. ++ */ ++ ++struct hydrogen3_buttons { ++ struct fasync_struct *fasync; ++ wait_queue_head_t read_wait; ++ int open_count; ++ unsigned int debounce; ++ unsigned int current; ++ unsigned int last; ++}; ++ ++static struct hydrogen3_buttons buttons_info; ++ ++ ++static void button_timer_periodic(void *data); ++ ++static struct tq_struct button_task = { ++ routine: button_timer_periodic, ++ data: NULL ++}; ++ ++static int cleanup_flag = 0; ++static DECLARE_WAIT_QUEUE_HEAD(cleanup_wait_queue); ++ ++ ++static unsigned int read_button_state(void) ++{ ++ unsigned long state; ++ ++ state = inl(SYS_PINSTATERD) & BUTTON_MASK; ++ state ^= BUTTON_INVERT; ++ ++ DPRINTK( "Current Button State: %d\n", state ); ++ ++ return state; ++} ++ ++ ++static void button_timer_periodic(void *data) ++{ ++ struct hydrogen3_buttons *buttons = (struct hydrogen3_buttons *)data; ++ unsigned long button_state; ++ ++ // If cleanup wants us to die ++ if (cleanup_flag) { ++ wake_up(&cleanup_wait_queue); // now cleanup_module can return ++ } else { ++ queue_task(&button_task, &tq_timer); // put ourselves back in the task queue ++ } ++ ++ // read current buttons ++ button_state = read_button_state(); ++ ++ // if no buttons are down and nothing to do then ++ // save time and be done. ++ if ((button_state == 0) && (buttons->current == 0)) { ++ return; ++ } ++ ++ if (button_state == buttons->debounce) { ++ buttons->current = button_state; ++ } else { ++ buttons->debounce = button_state; ++ } ++// printk("0x%04x\n", button_state); ++ if (buttons->current != buttons->last) { ++ if (waitqueue_active(&buttons->read_wait)) { ++ wake_up_interruptible(&buttons->read_wait); ++ } ++ } ++} ++ ++ ++static ssize_t hydrogen3_buttons_read(struct file *filp, char *buffer, size_t count, loff_t *ppos) ++{ ++ struct hydrogen3_buttons *buttons = filp->private_data; ++ char events[16]; ++ int index; ++ int last; ++ int cur; ++ int bit; ++ int bit_mask; ++ int err; ++ ++ DPRINTK("start\n"); ++ ++try_again: ++ ++ while (buttons->current == buttons->last) { ++ if (filp->f_flags & O_NONBLOCK) { ++ return -EAGAIN; ++ } ++ interruptible_sleep_on(&buttons->read_wait); ++ if (signal_pending(current)) { ++ return -ERESTARTSYS; ++ } ++ } ++ ++ cur = buttons->current; ++ last = buttons->last; ++ ++ index = 0; ++ bit_mask = 1; ++ for (bit = 0; (bit < 16) && count; bit++) { ++ if ((cur ^ last) & bit_mask) { ++ if (cur & bit_mask) { ++ events[index] = (bit | MAKE_FLAG) + 'A'; ++ last |= bit_mask; ++ } else { ++ events[index] = bit + 'A'; ++ last &= ~bit_mask; ++ } ++ index++; ++ count--; ++ } ++ bit_mask <<= 1; ++ } ++ buttons->last = last; ++ ++ if (index == 0) { ++ goto try_again; ++ } ++ ++ err = copy_to_user(buffer, events, index); ++ if (err) { ++ return err; ++ } ++ ++ return index; ++} ++ ++ ++static int hydrogen3_buttons_open(struct inode *inode, struct file *filp) ++{ ++ struct hydrogen3_buttons *buttons = &buttons_info; ++ ++ DPRINTK("start\n"); ++ MOD_INC_USE_COUNT; ++ ++ filp->private_data = buttons; ++ ++ if (buttons->open_count++ == 0) { ++ button_task.data = buttons; ++ cleanup_flag = 0; ++ queue_task(&button_task, &tq_timer); ++ } ++ ++ return 0; ++} ++ ++ ++static unsigned int hydrogen3_buttons_poll(struct file *filp, poll_table *wait) ++{ ++ struct hydrogen3_buttons *buttons = filp->private_data; ++ int ret = 0; ++ ++ DPRINTK("start\n"); ++ poll_wait(filp, &buttons->read_wait, wait); ++ if (buttons->current != buttons->last) { ++ ret = POLLIN | POLLRDNORM; ++ } ++ return ret; ++} ++ ++ ++static int hydrogen3_buttons_release(struct inode *inode, struct file *filp) ++{ ++ struct hydrogen3_buttons *buttons = filp->private_data; ++ ++ DPRINTK("start\n"); ++ ++ if (--buttons->open_count == 0) { ++ cleanup_flag = 1; ++ sleep_on(&cleanup_wait_queue); ++ } ++ MOD_DEC_USE_COUNT; ++ ++ return 0; ++} ++ ++ ++ ++static struct file_operations hydrogen3_buttons_fops = { ++ owner: THIS_MODULE, ++ read: hydrogen3_buttons_read, ++ poll: hydrogen3_buttons_poll, ++ open: hydrogen3_buttons_open, ++ release: hydrogen3_buttons_release, ++}; ++ ++/* ++ * The hydrogen3 buttons is a misc device: ++ * Major 10 char ++ * Minor 22 /dev/buttons ++ * ++ * This is /dev/misc/buttons if devfs is used. ++ */ ++ ++static struct miscdevice hydrogen3_buttons_dev = { ++ minor: 22, ++ name: "buttons", ++ fops: &hydrogen3_buttons_fops, ++}; ++ ++static int __init hydrogen3_buttons_init(void) ++{ ++ struct hydrogen3_buttons *buttons = &buttons_info; ++ int ret; ++ ++ DPRINTK("Initializing buttons driver\n"); ++ buttons->open_count = 0; ++ cleanup_flag = 0; ++ init_waitqueue_head(&buttons->read_wait); ++ ++ ++ // yamon configures GPIO pins for the buttons ++ // no initialization needed ++ ++ ret = misc_register(&hydrogen3_buttons_dev); ++ ++ DPRINTK("Buttons driver fully initialized.\n"); ++ ++ return ret; ++} ++ ++ ++static void __exit hydrogen3_buttons_exit(void) ++{ ++ DPRINTK("unloading buttons driver\n"); ++ misc_deregister(&hydrogen3_buttons_dev); ++} ++ ++ ++module_init(hydrogen3_buttons_init); ++module_exit(hydrogen3_buttons_exit); +diff -Nur linux-2.4.30/arch/mips/au1000/hydrogen3/mmc_support.c linux-2.4.30-mips/arch/mips/au1000/hydrogen3/mmc_support.c +--- linux-2.4.30/arch/mips/au1000/hydrogen3/mmc_support.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/hydrogen3/mmc_support.c 2005-02-02 05:27:06.000000000 +0100 +@@ -0,0 +1,89 @@ ++/* ++ * BRIEF MODULE DESCRIPTION ++ * ++ * MMC support routines for Hydrogen3. ++ * ++ * ++ * Copyright (c) 2003-2004 Embedded Edge, LLC. ++ * Author: Embedded Edge, LLC. ++ * Contact: dan@embeddededge.com ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++ ++#include <linux/config.h> ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/init.h> ++ ++#include <asm/irq.h> ++#include <asm/au1000.h> ++#include <asm/au1100_mmc.h> ++ ++#define GPIO_17_WP 0x20000 ++ ++/* SD/MMC controller support functions */ ++ ++/* ++ * Detect card. ++ */ ++void mmc_card_inserted(int _n_, int *_res_) ++{ ++ u32 gpios = au_readl(SYS_PINSTATERD); ++ u32 emptybit = (1<<16); ++ *_res_ = ((gpios & emptybit) == 0); ++} ++ ++/* ++ * Check card write protection. ++ */ ++void mmc_card_writable(int _n_, int *_res_) ++{ ++ unsigned long mmc_wp, board_specific; ++ board_specific = au_readl(SYS_OUTPUTSET); ++ mmc_wp=GPIO_17_WP; ++ if (!(board_specific & mmc_wp)) {/* low means card writable */ ++ *_res_ = 1; ++ } else { ++ *_res_ = 0; ++ } ++} ++/* ++ * Apply power to card slot. ++ */ ++void mmc_power_on(int _n_) ++{ ++} ++ ++/* ++ * Remove power from card slot. ++ */ ++void mmc_power_off(int _n_) ++{ ++} ++ ++EXPORT_SYMBOL(mmc_card_inserted); ++EXPORT_SYMBOL(mmc_card_writable); ++EXPORT_SYMBOL(mmc_power_on); ++EXPORT_SYMBOL(mmc_power_off); ++ +diff -Nur linux-2.4.30/arch/mips/au1000/mtx-1/board_setup.c linux-2.4.30-mips/arch/mips/au1000/mtx-1/board_setup.c +--- linux-2.4.30/arch/mips/au1000/mtx-1/board_setup.c 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/mtx-1/board_setup.c 2004-11-26 09:37:16.000000000 +0100 +@@ -48,6 +48,12 @@ + + extern struct rtc_ops no_rtc_ops; + ++void board_reset (void) ++{ ++ /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ ++ au_writel(0x00000000, 0xAE00001C); ++} ++ + void __init board_setup(void) + { + rtc_ops = &no_rtc_ops; +diff -Nur linux-2.4.30/arch/mips/au1000/mtx-1/irqmap.c linux-2.4.30-mips/arch/mips/au1000/mtx-1/irqmap.c +--- linux-2.4.30/arch/mips/au1000/mtx-1/irqmap.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/mtx-1/irqmap.c 2004-11-26 09:37:16.000000000 +0100 +@@ -72,10 +72,10 @@ + * A B C D + */ + { +- {INTA, INTB, INTC, INTD}, /* IDSEL 0 */ +- {INTA, INTB, INTC, INTD}, /* IDSEL 1 */ +- {INTA, INTB, INTC, INTD}, /* IDSEL 2 */ +- {INTA, INTB, INTC, INTD}, /* IDSEL 3 */ ++ {INTA, INTB, INTX, INTX}, /* IDSEL 0 */ ++ {INTB, INTA, INTX, INTX}, /* IDSEL 1 */ ++ {INTC, INTD, INTX, INTX}, /* IDSEL 2 */ ++ {INTD, INTC, INTX, INTX}, /* IDSEL 3 */ + }; + const long min_idsel = 0, max_idsel = 3, irqs_per_slot = 4; + return PCI_IRQ_TABLE_LOOKUP; +diff -Nur linux-2.4.30/arch/mips/au1000/pb1000/board_setup.c linux-2.4.30-mips/arch/mips/au1000/pb1000/board_setup.c +--- linux-2.4.30/arch/mips/au1000/pb1000/board_setup.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1000/board_setup.c 2005-03-19 08:17:51.000000000 +0100 +@@ -58,6 +58,10 @@ + { + } + ++void board_power_off (void) ++{ ++} ++ + void __init board_setup(void) + { + u32 pin_func, static_cfg0; +diff -Nur linux-2.4.30/arch/mips/au1000/pb1100/Makefile linux-2.4.30-mips/arch/mips/au1000/pb1100/Makefile +--- linux-2.4.30/arch/mips/au1000/pb1100/Makefile 2003-08-25 13:44:39.000000000 +0200 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1100/Makefile 2005-01-30 09:10:29.000000000 +0100 +@@ -16,4 +16,10 @@ + + obj-y := init.o board_setup.o irqmap.o + ++ ++ifdef CONFIG_MMC ++obj-y += mmc_support.o ++export-objs += mmc_support.o ++endif ++ + include $(TOPDIR)/Rules.make +diff -Nur linux-2.4.30/arch/mips/au1000/pb1100/board_setup.c linux-2.4.30-mips/arch/mips/au1000/pb1100/board_setup.c +--- linux-2.4.30/arch/mips/au1000/pb1100/board_setup.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1100/board_setup.c 2005-03-19 08:17:51.000000000 +0100 +@@ -62,6 +62,10 @@ + au_writel(0x00000000, 0xAE00001C); + } + ++void board_power_off (void) ++{ ++} ++ + void __init board_setup(void) + { + u32 pin_func; +diff -Nur linux-2.4.30/arch/mips/au1000/pb1100/mmc_support.c linux-2.4.30-mips/arch/mips/au1000/pb1100/mmc_support.c +--- linux-2.4.30/arch/mips/au1000/pb1100/mmc_support.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1100/mmc_support.c 2005-01-30 09:10:29.000000000 +0100 +@@ -0,0 +1,126 @@ ++/* ++ * BRIEF MODULE DESCRIPTION ++ * ++ * MMC support routines for PB1100. ++ * ++ * ++ * Copyright (c) 2003-2004 Embedded Edge, LLC. ++ * Author: Embedded Edge, LLC. ++ * Contact: dan@embeddededge.com ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++ ++#include <linux/config.h> ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/init.h> ++ ++#include <asm/irq.h> ++#include <asm/au1000.h> ++#include <asm/au1100_mmc.h> ++#include <asm/pb1100.h> ++ ++ ++/* SD/MMC controller support functions */ ++ ++/* ++ * Detect card. ++ */ ++void mmc_card_inserted(int _n_, int *_res_) ++{ ++ u32 gpios = au_readl(SYS_PINSTATERD); ++ u32 emptybit = (_n_) ? (1<<15) : (1<<14); ++ *_res_ = ((gpios & emptybit) == 0); ++} ++ ++/* ++ * Check card write protection. ++ */ ++void mmc_card_writable(int _n_, int *_res_) ++{ ++ BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++ unsigned long mmc_wp, board_specific; ++ ++ if (_n_) { ++ mmc_wp = BCSR_PCMCIA_SD1_WP; ++ } else { ++ mmc_wp = BCSR_PCMCIA_SD0_WP; ++ } ++ ++ board_specific = au_readl((unsigned long)(&bcsr->pcmcia)); ++ ++ if (!(board_specific & mmc_wp)) {/* low means card writable */ ++ *_res_ = 1; ++ } else { ++ *_res_ = 0; ++ } ++} ++ ++/* ++ * Apply power to card slot. ++ */ ++void mmc_power_on(int _n_) ++{ ++ BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++ unsigned long mmc_pwr, board_specific; ++ ++ if (_n_) { ++ mmc_pwr = BCSR_PCMCIA_SD1_PWR; ++ } else { ++ mmc_pwr = BCSR_PCMCIA_SD0_PWR; ++ } ++ ++ board_specific = au_readl((unsigned long)(&bcsr->pcmcia)); ++ board_specific |= mmc_pwr; ++ ++ au_writel(board_specific, (int)(&bcsr->pcmcia)); ++ au_sync_delay(1); ++} ++ ++/* ++ * Remove power from card slot. ++ */ ++void mmc_power_off(int _n_) ++{ ++ BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++ unsigned long mmc_pwr, board_specific; ++ ++ if (_n_) { ++ mmc_pwr = BCSR_PCMCIA_SD1_PWR; ++ } else { ++ mmc_pwr = BCSR_PCMCIA_SD0_PWR; ++ } ++ ++ board_specific = au_readl((unsigned long)(&bcsr->pcmcia)); ++ board_specific &= ~mmc_pwr; ++ ++ au_writel(board_specific, (int)(&bcsr->pcmcia)); ++ au_sync_delay(1); ++} ++ ++EXPORT_SYMBOL(mmc_card_inserted); ++EXPORT_SYMBOL(mmc_card_writable); ++EXPORT_SYMBOL(mmc_power_on); ++EXPORT_SYMBOL(mmc_power_off); ++ +diff -Nur linux-2.4.30/arch/mips/au1000/pb1200/Makefile linux-2.4.30-mips/arch/mips/au1000/pb1200/Makefile +--- linux-2.4.30/arch/mips/au1000/pb1200/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1200/Makefile 2005-01-30 09:01:27.000000000 +0100 +@@ -0,0 +1,25 @@ ++# ++# Copyright 2000 MontaVista Software Inc. ++# Author: MontaVista Software, Inc. ++# ppopov@mvista.com or source@mvista.com ++# ++# Makefile for the Alchemy Semiconductor PB1000 board. ++# ++# Note! Dependencies are done automagically by 'make dep', which also ++# removes any old dependencies. DON'T put your own dependencies here ++# unless it's something special (ie not a .c file). ++# ++ ++USE_STANDARD_AS_RULE := true ++ ++O_TARGET := pb1200.o ++ ++obj-y := init.o board_setup.o irqmap.o ++ ++ifdef CONFIG_MMC ++obj-y += mmc_support.o ++export-objs +=mmc_support.o ++endif ++ ++ ++include $(TOPDIR)/Rules.make +diff -Nur linux-2.4.30/arch/mips/au1000/pb1200/board_setup.c linux-2.4.30-mips/arch/mips/au1000/pb1200/board_setup.c +--- linux-2.4.30/arch/mips/au1000/pb1200/board_setup.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1200/board_setup.c 2005-03-19 08:17:51.000000000 +0100 +@@ -0,0 +1,221 @@ ++/* ++ * ++ * BRIEF MODULE DESCRIPTION ++ * Alchemy Pb1200 board setup. ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++#include <linux/config.h> ++#include <linux/init.h> ++#include <linux/sched.h> ++#include <linux/ioport.h> ++#include <linux/mm.h> ++#include <linux/console.h> ++#include <linux/mc146818rtc.h> ++#include <linux/delay.h> ++ ++#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) ++#include <linux/ide.h> ++#endif ++ ++#include <asm/cpu.h> ++#include <asm/bootinfo.h> ++#include <asm/irq.h> ++#include <asm/keyboard.h> ++#include <asm/mipsregs.h> ++#include <asm/reboot.h> ++#include <asm/pgtable.h> ++#include <asm/au1000.h> ++#include <asm/au1xxx_dbdma.h> ++ ++#ifdef CONFIG_MIPS_PB1200 ++#include <asm/pb1200.h> ++#endif ++ ++#ifdef CONFIG_MIPS_DB1200 ++#include <asm/db1200.h> ++#define PB1200_ETH_INT DB1200_ETH_INT ++#define PB1200_IDE_INT DB1200_IDE_INT ++#endif ++ ++extern struct rtc_ops no_rtc_ops; ++ ++extern void _board_init_irq(void); ++extern void (*board_init_irq)(void); ++ ++#ifdef CONFIG_BLK_DEV_IDE_AU1XXX ++extern struct ide_ops *ide_ops; ++extern struct ide_ops au1xxx_ide_ops; ++extern u32 au1xxx_ide_virtbase; ++extern u64 au1xxx_ide_physbase; ++extern int au1xxx_ide_irq; ++ ++u32 led_base_addr; ++/* Ddma */ ++chan_tab_t *ide_read_ch, *ide_write_ch; ++u32 au1xxx_ide_ddma_enable = 0, switch4ddma = 1; // PIO+ddma ++ ++dbdev_tab_t new_dbdev_tab_element = { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }; ++#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX */ ++ ++void board_reset (void) ++{ ++ bcsr->resets = 0; ++} ++ ++void board_power_off (void) ++{ ++ bcsr->resets = 0xC000; ++} ++ ++void __init board_setup(void) ++{ ++ char *argptr = NULL; ++ u32 pin_func; ++ rtc_ops = &no_rtc_ops; ++ ++#if 0 ++ /* Enable PSC1 SYNC for AC97. Normaly done in audio driver, ++ * but it is board specific code, so put it here. ++ */ ++ pin_func = au_readl(SYS_PINFUNC); ++ au_sync(); ++ pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1; ++ au_writel(pin_func, SYS_PINFUNC); ++ ++ au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */ ++ au_sync(); ++#endif ++ ++#if defined( CONFIG_I2C_ALGO_AU1550 ) ++ { ++ u32 freq0, clksrc; ++ ++ /* Select SMBUS in CPLD */ ++ bcsr->resets &= ~(BCSR_RESETS_PCS0MUX); ++ ++ pin_func = au_readl(SYS_PINFUNC); ++ au_sync(); ++ pin_func &= ~(3<<17 | 1<<4); ++ /* Set GPIOs correctly */ ++ pin_func |= 2<<17; ++ au_writel(pin_func, SYS_PINFUNC); ++ au_sync(); ++ ++ /* The i2c driver depends on 50Mhz clock */ ++ freq0 = au_readl(SYS_FREQCTRL0); ++ au_sync(); ++ freq0 &= ~(SYS_FC_FRDIV1_MASK | SYS_FC_FS1 | SYS_FC_FE1); ++ freq0 |= (3<<SYS_FC_FRDIV1_BIT); ++ /* 396Mhz / (3+1)*2 == 49.5Mhz */ ++ au_writel(freq0, SYS_FREQCTRL0); ++ au_sync(); ++ freq0 |= SYS_FC_FE1; ++ au_writel(freq0, SYS_FREQCTRL0); ++ au_sync(); ++ ++ clksrc = au_readl(SYS_CLKSRC); ++ au_sync(); ++ clksrc &= ~0x01f00000; ++ /* bit 22 is EXTCLK0 for PSC0 */ ++ clksrc |= (0x3 << 22); ++ au_writel(clksrc, SYS_CLKSRC); ++ au_sync(); ++ } ++#endif ++ ++#ifdef CONFIG_FB_AU1200 ++ argptr = prom_getcmdline(); ++ strcat(argptr, " video=au1200fb:"); ++#endif ++ ++#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) ++ /* ++ * Iniz IDE parameters ++ */ ++ ide_ops = &au1xxx_ide_ops; ++ au1xxx_ide_irq = PB1200_IDE_INT; ++ au1xxx_ide_physbase = AU1XXX_ATA_PHYS_ADDR; ++ au1xxx_ide_virtbase = KSEG1ADDR(AU1XXX_ATA_PHYS_ADDR); ++ /* ++ * change PIO or PIO+Ddma ++ * check the GPIO-5 pin condition. pb1200:s18_dot */ ++ switch4ddma = (au_readl(SYS_PINSTATERD) & (1 << 5)) ? 1 : 0; ++#endif ++ ++ /* The Pb1200 development board uses external MUX for PSC0 to ++ support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI ++ */ ++#if defined(CONFIG_AU1550_PSC_SPI) && defined(CONFIG_I2C_ALGO_AU1550) ++ #error I2C and SPI are mutually exclusive. Both are physically connected to PSC0.\ ++ Refer to Pb1200/Db1200 documentation. ++#elif defined( CONFIG_AU1550_PSC_SPI ) ++ bcsr->resets |= BCSR_RESETS_PCS0MUX; ++#elif defined( CONFIG_I2C_ALGO_AU1550 ) ++ bcsr->resets &= (~BCSR_RESETS_PCS0MUX); ++#endif ++ au_sync(); ++ ++#ifdef CONFIG_MIPS_PB1200 ++ printk("AMD Alchemy Pb1200 Board\n"); ++#endif ++#ifdef CONFIG_MIPS_DB1200 ++ printk("AMD Alchemy Db1200 Board\n"); ++#endif ++ ++ /* Setup Pb1200 External Interrupt Controller */ ++ { ++ extern void (*board_init_irq)(void); ++ extern void _board_init_irq(void); ++ board_init_irq = _board_init_irq; ++ } ++} ++ ++int ++board_au1200fb_panel (void) ++{ ++ BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++ int p; ++ ++ p = bcsr->switches; ++ p >>= 8; ++ p &= 0x0F; ++ return p; ++} ++ ++int ++board_au1200fb_panel_init (void) ++{ ++ /* Apply power */ ++ BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++ bcsr->board |= (BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL); ++ return 0; ++} ++ ++int ++board_au1200fb_panel_shutdown (void) ++{ ++ /* Remove power */ ++ BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++ bcsr->board &= ~(BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL); ++ return 0; ++} ++ +diff -Nur linux-2.4.30/arch/mips/au1000/pb1200/init.c linux-2.4.30-mips/arch/mips/au1000/pb1200/init.c +--- linux-2.4.30/arch/mips/au1000/pb1200/init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1200/init.c 2005-01-30 09:01:28.000000000 +0100 +@@ -0,0 +1,72 @@ ++/* ++ * ++ * BRIEF MODULE DESCRIPTION ++ * PB1200 board setup ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include <linux/init.h> ++#include <linux/mm.h> ++#include <linux/sched.h> ++#include <linux/bootmem.h> ++#include <asm/addrspace.h> ++#include <asm/bootinfo.h> ++#include <linux/config.h> ++#include <linux/string.h> ++#include <linux/kernel.h> ++#include <linux/sched.h> ++ ++int prom_argc; ++char **prom_argv, **prom_envp; ++extern void __init prom_init_cmdline(void); ++extern char *prom_getenv(char *envname); ++ ++const char *get_system_type(void) ++{ ++ return "AMD Alchemy Au1200/Pb1200"; ++} ++ ++u32 mae_memsize = 0; ++ ++int __init prom_init(int argc, char **argv, char **envp, int *prom_vec) ++{ ++ unsigned char *memsize_str; ++ unsigned long memsize; ++ ++ prom_argc = argc; ++ prom_argv = argv; ++ prom_envp = envp; ++ ++ mips_machgroup = MACH_GROUP_ALCHEMY; ++ mips_machtype = MACH_PB1000; /* set the platform # */ ++ prom_init_cmdline(); ++ ++ memsize_str = prom_getenv("memsize"); ++ if (!memsize_str) { ++ memsize = 0x08000000; ++ } else { ++ memsize = simple_strtol(memsize_str, NULL, 0); ++ } ++ add_memory_region(0, memsize, BOOT_MEM_RAM); ++ return 0; ++} ++ +diff -Nur linux-2.4.30/arch/mips/au1000/pb1200/irqmap.c linux-2.4.30-mips/arch/mips/au1000/pb1200/irqmap.c +--- linux-2.4.30/arch/mips/au1000/pb1200/irqmap.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1200/irqmap.c 2005-01-30 09:01:28.000000000 +0100 +@@ -0,0 +1,180 @@ ++/* ++ * BRIEF MODULE DESCRIPTION ++ * Au1xxx irq map table ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++#include <linux/errno.h> ++#include <linux/init.h> ++#include <linux/irq.h> ++#include <linux/kernel_stat.h> ++#include <linux/module.h> ++#include <linux/signal.h> ++#include <linux/sched.h> ++#include <linux/types.h> ++#include <linux/interrupt.h> ++#include <linux/ioport.h> ++#include <linux/timex.h> ++#include <linux/slab.h> ++#include <linux/random.h> ++#include <linux/delay.h> ++ ++#include <asm/bitops.h> ++#include <asm/bootinfo.h> ++#include <asm/io.h> ++#include <asm/mipsregs.h> ++#include <asm/system.h> ++#include <asm/au1000.h> ++ ++#ifdef CONFIG_MIPS_PB1200 ++#include <asm/pb1200.h> ++#endif ++ ++#ifdef CONFIG_MIPS_DB1200 ++#include <asm/db1200.h> ++#define PB1200_INT_BEGIN DB1200_INT_BEGIN ++#define PB1200_INT_END DB1200_INT_END ++#endif ++ ++au1xxx_irq_map_t au1xxx_irq_map[] = { ++ { AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 }, // This is exteranl interrupt cascade ++}; ++ ++int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t); ++ ++/* ++ * Support for External interrupts on the PbAu1200 Development platform. ++ */ ++static volatile int pb1200_cascade_en=0; ++ ++void pb1200_cascade_handler( int irq, void *dev_id, struct pt_regs *regs) ++{ ++ unsigned short bisr = bcsr->int_status; ++ int extirq_nr = 0; ++ ++ /* Clear all the edge interrupts. This has no effect on level */ ++ bcsr->int_status = bisr; ++ for( ; bisr; bisr &= (bisr-1) ) ++ { ++ extirq_nr = (PB1200_INT_BEGIN-1) + au_ffs(bisr); ++ /* Ack and dispatch IRQ */ ++ do_IRQ(extirq_nr,regs); ++ } ++} ++ ++inline void pb1200_enable_irq(unsigned int irq_nr) ++{ ++ bcsr->intset_mask = 1<<(irq_nr - PB1200_INT_BEGIN); ++ bcsr->intset = 1<<(irq_nr - PB1200_INT_BEGIN); ++} ++ ++inline void pb1200_disable_irq(unsigned int irq_nr) ++{ ++ bcsr->intclr_mask = 1<<(irq_nr - PB1200_INT_BEGIN); ++ bcsr->intclr = 1<<(irq_nr - PB1200_INT_BEGIN); ++} ++ ++static unsigned int pb1200_startup_irq( unsigned int irq_nr ) ++{ ++ if (++pb1200_cascade_en == 1) ++ { ++ request_irq(AU1000_GPIO_7, &pb1200_cascade_handler, ++ 0, "Pb1200 Cascade", &pb1200_cascade_handler ); ++#ifdef CONFIG_MIPS_PB1200 ++ /* We have a problem with CPLD rev3. Enable a workaround */ ++ if( ((bcsr->whoami & BCSR_WHOAMI_CPLD)>>4) <= 3) ++ { ++ printk("\nWARNING!!!\n"); ++ printk("\nWARNING!!!\n"); ++ printk("\nWARNING!!!\n"); ++ printk("\nWARNING!!!\n"); ++ printk("\nWARNING!!!\n"); ++ printk("\nWARNING!!!\n"); ++ printk("Pb1200 must be at CPLD rev4. Please have Pb1200\n"); ++ printk("updated to latest revision. This software will not\n"); ++ printk("work on anything less than CPLD rev4\n"); ++ printk("\nWARNING!!!\n"); ++ printk("\nWARNING!!!\n"); ++ printk("\nWARNING!!!\n"); ++ printk("\nWARNING!!!\n"); ++ printk("\nWARNING!!!\n"); ++ printk("\nWARNING!!!\n"); ++ while(1); ++ } ++#endif ++ } ++ pb1200_enable_irq(irq_nr); ++ return 0; ++} ++ ++static void pb1200_shutdown_irq( unsigned int irq_nr ) ++{ ++ pb1200_disable_irq(irq_nr); ++ if (--pb1200_cascade_en == 0) ++ { ++ free_irq(AU1000_GPIO_7,&pb1200_cascade_handler ); ++ } ++ return; ++} ++ ++static inline void pb1200_mask_and_ack_irq(unsigned int irq_nr) ++{ ++ pb1200_disable_irq( irq_nr ); ++} ++ ++static void pb1200_end_irq(unsigned int irq_nr) ++{ ++ if (!(irq_desc[irq_nr].status & (IRQ_DISABLED|IRQ_INPROGRESS))) { ++ pb1200_enable_irq(irq_nr); ++ } ++} ++ ++static struct hw_interrupt_type external_irq_type = ++{ ++#ifdef CONFIG_MIPS_PB1200 ++ "Pb1200 Ext", ++#endif ++#ifdef CONFIG_MIPS_DB1200 ++ "Db1200 Ext", ++#endif ++ pb1200_startup_irq, ++ pb1200_shutdown_irq, ++ pb1200_enable_irq, ++ pb1200_disable_irq, ++ pb1200_mask_and_ack_irq, ++ pb1200_end_irq, ++ NULL ++}; ++ ++void _board_init_irq(void) ++{ ++ int irq_nr; ++ ++ for (irq_nr = PB1200_INT_BEGIN; irq_nr <= PB1200_INT_END; irq_nr++) ++ { ++ irq_desc[irq_nr].handler = &external_irq_type; ++ pb1200_disable_irq(irq_nr); ++ } ++ ++ /* GPIO_7 can not be hooked here, so it is hooked upon first ++ request of any source attached to the cascade */ ++} ++ +diff -Nur linux-2.4.30/arch/mips/au1000/pb1200/mmc_support.c linux-2.4.30-mips/arch/mips/au1000/pb1200/mmc_support.c +--- linux-2.4.30/arch/mips/au1000/pb1200/mmc_support.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1200/mmc_support.c 2005-01-30 09:01:28.000000000 +0100 +@@ -0,0 +1,141 @@ ++/* ++ * BRIEF MODULE DESCRIPTION ++ * ++ * MMC support routines for PB1200. ++ * ++ * ++ * Copyright (c) 2003-2004 Embedded Edge, LLC. ++ * Author: Embedded Edge, LLC. ++ * Contact: dan@embeddededge.com ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++ ++#include <linux/config.h> ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/init.h> ++ ++#include <asm/irq.h> ++#include <asm/au1000.h> ++#include <asm/au1100_mmc.h> ++ ++#ifdef CONFIG_MIPS_PB1200 ++#include <asm/pb1200.h> ++#endif ++ ++#ifdef CONFIG_MIPS_DB1200 ++/* NOTE: DB1200 only has SD0 pinned out and usable */ ++#include <asm/db1200.h> ++#endif ++ ++/* SD/MMC controller support functions */ ++ ++/* ++ * Detect card. ++ */ ++void mmc_card_inserted(int socket, int *result) ++{ ++ u16 mask; ++ ++ if (socket) ++#ifdef CONFIG_MIPS_DB1200 ++ mask = 0; ++#else ++ mask = BCSR_INT_SD1INSERT; ++#endif ++ else ++ mask = BCSR_INT_SD0INSERT; ++ ++ *result = ((bcsr->sig_status & mask) != 0); ++} ++ ++/* ++ * Check card write protection. ++ */ ++void mmc_card_writable(int socket, int *result) ++{ ++ u16 mask; ++ ++ if (socket) ++#ifdef CONFIG_MIPS_DB1200 ++ mask = 0; ++#else ++ mask = BCSR_STATUS_SD1WP; ++#endif ++ else ++ mask = BCSR_STATUS_SD0WP; ++ ++ /* low means card writable */ ++ if (!(bcsr->status & mask)) { ++ *result = 1; ++ } else { ++ *result = 0; ++ } ++} ++ ++/* ++ * Apply power to card slot. ++ */ ++void mmc_power_on(int socket) ++{ ++ u16 mask; ++ ++ if (socket) ++#ifdef CONFIG_MIPS_DB1200 ++ mask = 0; ++#else ++ mask = BCSR_BOARD_SD1PWR; ++#endif ++ else ++ mask = BCSR_BOARD_SD0PWR; ++ ++ bcsr->board |= mask; ++ au_sync_delay(1); ++} ++ ++/* ++ * Remove power from card slot. ++ */ ++void mmc_power_off(int socket) ++{ ++ u16 mask; ++ ++ if (socket) ++#ifdef CONFIG_MIPS_DB1200 ++ mask = 0; ++#else ++ mask = BCSR_BOARD_SD1PWR; ++#endif ++ else ++ mask = BCSR_BOARD_SD0PWR; ++ ++ bcsr->board &= ~mask; ++ au_sync_delay(1); ++} ++ ++EXPORT_SYMBOL(mmc_card_inserted); ++EXPORT_SYMBOL(mmc_card_writable); ++EXPORT_SYMBOL(mmc_power_on); ++EXPORT_SYMBOL(mmc_power_off); ++ +diff -Nur linux-2.4.30/arch/mips/au1000/pb1500/board_setup.c linux-2.4.30-mips/arch/mips/au1000/pb1500/board_setup.c +--- linux-2.4.30/arch/mips/au1000/pb1500/board_setup.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1500/board_setup.c 2005-03-19 08:17:51.000000000 +0100 +@@ -62,6 +62,10 @@ + au_writel(0x00000000, 0xAE00001C); + } + ++void board_power_off (void) ++{ ++} ++ + void __init board_setup(void) + { + u32 pin_func; +diff -Nur linux-2.4.30/arch/mips/au1000/pb1550/board_setup.c linux-2.4.30-mips/arch/mips/au1000/pb1550/board_setup.c +--- linux-2.4.30/arch/mips/au1000/pb1550/board_setup.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1550/board_setup.c 2005-03-19 08:17:51.000000000 +0100 +@@ -48,12 +48,31 @@ + + extern struct rtc_ops no_rtc_ops; + ++#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) ++extern struct ide_ops *ide_ops; ++extern struct ide_ops au1xxx_ide_ops; ++extern u32 au1xxx_ide_virtbase; ++extern u64 au1xxx_ide_physbase; ++extern unsigned int au1xxx_ide_irq; ++ ++u32 au1xxx_ide_ddma_enable = 0, switch4ddma = 1; // PIO+ddma ++#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX */ ++ + void board_reset (void) + { + /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ + au_writew(au_readw(0xAF00001C) & ~(1<<15), 0xAF00001C); + } + ++void board_power_off (void) ++{ ++ /* power off system */ ++ printk("\n** Powering off Pb1550\n"); ++ au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C); ++ au_sync(); ++ while(1); /* should not get here */ ++} ++ + void __init board_setup(void) + { + u32 pin_func; +@@ -78,5 +97,36 @@ + au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */ + au_sync(); + ++#if defined(CONFIG_AU1XXX_SMC91111) ++#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) ++#error "Resource conflict occured. Disable either Ethernet or IDE daughter card." ++#else ++#define CPLD_CONTROL (0xAF00000C) ++ { ++ /* set up the Static Bus timing */ ++ /* only 396Mhz */ ++ /* reset the DC */ ++ au_writew(au_readw(CPLD_CONTROL) | 0x0f, CPLD_CONTROL); ++ au_writel(0x00010003, MEM_STCFG0); ++ au_writel(0x000c00c0, MEM_STCFG2); ++ au_writel(0x85E1900D, MEM_STTIME2); ++ } ++#endif ++#endif /* end CONFIG_SMC91111 */ ++ ++#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) ++ /* ++ * Iniz IDE parameters ++ */ ++ ide_ops = &au1xxx_ide_ops; ++ au1xxx_ide_irq = DAUGHTER_CARD_IRQ;; ++ au1xxx_ide_physbase = AU1XXX_ATA_PHYS_ADDR; ++ au1xxx_ide_virtbase = KSEG1ADDR(AU1XXX_ATA_PHYS_ADDR); ++ /* ++ * change PIO or PIO+Ddma ++ * check the GPIO-6 pin condition. pb1550:s15_dot ++ */ ++ switch4ddma = (au_readl(SYS_PINSTATERD) & (1 << 6)) ? 1 : 0; ++#endif + printk("AMD Alchemy Pb1550 Board\n"); + } +diff -Nur linux-2.4.30/arch/mips/au1000/pb1550/irqmap.c linux-2.4.30-mips/arch/mips/au1000/pb1550/irqmap.c +--- linux-2.4.30/arch/mips/au1000/pb1550/irqmap.c 2005-01-19 15:09:26.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/au1000/pb1550/irqmap.c 2005-01-30 09:01:28.000000000 +0100 +@@ -50,6 +50,9 @@ + au1xxx_irq_map_t au1xxx_irq_map[] = { + { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, + { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, ++#ifdef CONFIG_AU1XXX_SMC91111 ++ { AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 }, ++#endif + }; + + int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t); +diff -Nur linux-2.4.30/arch/mips/config-shared.in linux-2.4.30-mips/arch/mips/config-shared.in +--- linux-2.4.30/arch/mips/config-shared.in 2005-01-19 15:09:27.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/config-shared.in 2005-01-30 09:01:26.000000000 +0100 +@@ -21,16 +21,19 @@ + comment 'Machine selection' + dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL + dep_bool 'Support for Alchemy Bosporus board' CONFIG_MIPS_BOSPORUS $CONFIG_MIPS32 ++dep_bool 'Support for FIC Multimedia Player board' CONFIG_MIPS_FICMMP $CONFIG_MIPS32 + dep_bool 'Support for Alchemy Mirage board' CONFIG_MIPS_MIRAGE $CONFIG_MIPS32 + dep_bool 'Support for Alchemy Db1000 board' CONFIG_MIPS_DB1000 $CONFIG_MIPS32 + dep_bool 'Support for Alchemy Db1100 board' CONFIG_MIPS_DB1100 $CONFIG_MIPS32 + dep_bool 'Support for Alchemy Db1500 board' CONFIG_MIPS_DB1500 $CONFIG_MIPS32 + dep_bool 'Support for Alchemy Db1550 board' CONFIG_MIPS_DB1550 $CONFIG_MIPS32 ++dep_bool 'Support for Alchemy Db1200 board' CONFIG_MIPS_DB1200 $CONFIG_MIPS32 + dep_bool 'Support for Alchemy PB1000 board' CONFIG_MIPS_PB1000 $CONFIG_MIPS32 + dep_bool 'Support for Alchemy PB1100 board' CONFIG_MIPS_PB1100 $CONFIG_MIPS32 + dep_bool 'Support for Alchemy PB1500 board' CONFIG_MIPS_PB1500 $CONFIG_MIPS32 +-dep_bool 'Support for Alchemy Hydrogen3 board' CONFIG_MIPS_HYDROGEN3 $CONFIG_MIPS32 + dep_bool 'Support for Alchemy PB1550 board' CONFIG_MIPS_PB1550 $CONFIG_MIPS32 ++dep_bool 'Support for Alchemy PB1200 board' CONFIG_MIPS_PB1200 $CONFIG_MIPS32 ++dep_bool 'Support for Alchemy Hydrogen3 board' CONFIG_MIPS_HYDROGEN3 $CONFIG_MIPS32 + dep_bool 'Support for MyCable XXS1500 board' CONFIG_MIPS_XXS1500 $CONFIG_MIPS32 + dep_bool 'Support for 4G Systems MTX-1 board' CONFIG_MIPS_MTX1 $CONFIG_MIPS32 + dep_bool 'Support for Cogent CSB250 board' CONFIG_COGENT_CSB250 $CONFIG_MIPS32 +@@ -249,6 +252,12 @@ + define_bool CONFIG_PC_KEYB y + define_bool CONFIG_NONCOHERENT_IO y + fi ++if [ "$CONFIG_MIPS_FICMMP" = "y" ]; then ++ define_bool CONFIG_SOC_AU1X00 y ++ define_bool CONFIG_SOC_AU1200 y ++ define_bool CONFIG_NONCOHERENT_IO y ++ define_bool CONFIG_PC_KEYB y ++fi + if [ "$CONFIG_MIPS_BOSPORUS" = "y" ]; then + define_bool CONFIG_SOC_AU1X00 y + define_bool CONFIG_SOC_AU1500 y +@@ -263,6 +272,12 @@ + define_bool CONFIG_SWAP_IO_SPACE_W y + define_bool CONFIG_SWAP_IO_SPACE_L y + fi ++if [ "$CONFIG_MIPS_PB1500" = "y" ]; then ++ define_bool CONFIG_SOC_AU1X00 y ++ define_bool CONFIG_SOC_AU1500 y ++ define_bool CONFIG_NONCOHERENT_IO y ++ define_bool CONFIG_PC_KEYB y ++fi + if [ "$CONFIG_MIPS_PB1100" = "y" ]; then + define_bool CONFIG_SOC_AU1X00 y + define_bool CONFIG_SOC_AU1100 y +@@ -271,9 +286,15 @@ + define_bool CONFIG_SWAP_IO_SPACE_W y + define_bool CONFIG_SWAP_IO_SPACE_L y + fi +-if [ "$CONFIG_MIPS_PB1500" = "y" ]; then ++if [ "$CONFIG_MIPS_PB1550" = "y" ]; then + define_bool CONFIG_SOC_AU1X00 y +- define_bool CONFIG_SOC_AU1500 y ++ define_bool CONFIG_SOC_AU1550 y ++ define_bool CONFIG_NONCOHERENT_IO n ++ define_bool CONFIG_PC_KEYB y ++fi ++if [ "$CONFIG_MIPS_PB1200" = "y" ]; then ++ define_bool CONFIG_SOC_AU1X00 y ++ define_bool CONFIG_SOC_AU1200 y + define_bool CONFIG_NONCOHERENT_IO y + define_bool CONFIG_PC_KEYB y + fi +@@ -290,18 +311,24 @@ + define_bool CONFIG_NONCOHERENT_IO y + define_bool CONFIG_PC_KEYB y + fi ++if [ "$CONFIG_MIPS_DB1100" = "y" ]; then ++ define_bool CONFIG_SOC_AU1X00 y ++ define_bool CONFIG_SOC_AU1100 y ++ define_bool CONFIG_NONCOHERENT_IO y ++ define_bool CONFIG_PC_KEYB y ++ define_bool CONFIG_SWAP_IO_SPACE y ++fi + if [ "$CONFIG_MIPS_DB1550" = "y" ]; then + define_bool CONFIG_SOC_AU1X00 y + define_bool CONFIG_SOC_AU1550 y + define_bool CONFIG_NONCOHERENT_IO y + define_bool CONFIG_PC_KEYB y + fi +-if [ "$CONFIG_MIPS_DB1100" = "y" ]; then ++if [ "$CONFIG_MIPS_DB1200" = "y" ]; then + define_bool CONFIG_SOC_AU1X00 y +- define_bool CONFIG_SOC_AU1100 y ++ define_bool CONFIG_SOC_AU1200 y + define_bool CONFIG_NONCOHERENT_IO y + define_bool CONFIG_PC_KEYB y +- define_bool CONFIG_SWAP_IO_SPACE y + fi + if [ "$CONFIG_MIPS_HYDROGEN3" = "y" ]; then + define_bool CONFIG_SOC_AU1X00 y +@@ -327,12 +354,6 @@ + define_bool CONFIG_NONCOHERENT_IO y + define_bool CONFIG_PC_KEYB y + fi +-if [ "$CONFIG_MIPS_PB1550" = "y" ]; then +- define_bool CONFIG_SOC_AU1X00 y +- define_bool CONFIG_SOC_AU1550 y +- define_bool CONFIG_NONCOHERENT_IO n +- define_bool CONFIG_PC_KEYB y +-fi + if [ "$CONFIG_MIPS_COBALT" = "y" ]; then + define_bool CONFIG_BOOT_ELF32 y + define_bool CONFIG_COBALT_LCD y +@@ -729,6 +750,13 @@ + "$CONFIG_MIPS_PB1000" = "y" -o \ + "$CONFIG_MIPS_PB1100" = "y" -o \ + "$CONFIG_MIPS_PB1500" = "y" -o \ ++ "$CONFIG_MIPS_PB1550" = "y" -o \ ++ "$CONFIG_MIPS_PB1200" = "y" -o \ ++ "$CONFIG_MIPS_DB1000" = "y" -o \ ++ "$CONFIG_MIPS_DB1100" = "y" -o \ ++ "$CONFIG_MIPS_DB1500" = "y" -o \ ++ "$CONFIG_MIPS_DB1550" = "y" -o \ ++ "$CONFIG_MIPS_DB1200" = "y" -o \ + "$CONFIG_NEC_OSPREY" = "y" -o \ + "$CONFIG_NEC_EAGLE" = "y" -o \ + "$CONFIG_NINO" = "y" -o \ +diff -Nur linux-2.4.30/arch/mips/defconfig linux-2.4.30-mips/arch/mips/defconfig +--- linux-2.4.30/arch/mips/defconfig 2005-01-19 15:09:27.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -235,11 +235,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -319,9 +314,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -465,7 +462,6 @@ + # CONFIG_SERIAL is not set + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-atlas linux-2.4.30-mips/arch/mips/defconfig-atlas +--- linux-2.4.30/arch/mips/defconfig-atlas 2005-01-19 15:09:27.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-atlas 2005-03-18 13:13:21.000000000 +0100 +@@ -28,8 +28,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -235,11 +235,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -317,9 +312,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -528,7 +525,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-bosporus linux-2.4.30-mips/arch/mips/defconfig-bosporus +--- linux-2.4.30/arch/mips/defconfig-bosporus 2005-01-19 15:09:27.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-bosporus 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -208,9 +208,7 @@ + CONFIG_MTD_BOSPORUS=y + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -229,7 +227,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -373,11 +370,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -457,9 +449,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -681,7 +675,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-capcella linux-2.4.30-mips/arch/mips/defconfig-capcella +--- linux-2.4.30/arch/mips/defconfig-capcella 2005-01-19 15:09:27.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-capcella 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -228,11 +228,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -472,7 +467,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_VR41XX_KIU is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 +diff -Nur linux-2.4.30/arch/mips/defconfig-cobalt linux-2.4.30-mips/arch/mips/defconfig-cobalt +--- linux-2.4.30/arch/mips/defconfig-cobalt 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-cobalt 2005-03-18 13:13:21.000000000 +0100 +@@ -28,8 +28,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -222,11 +222,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -505,7 +500,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=16 + +diff -Nur linux-2.4.30/arch/mips/defconfig-csb250 linux-2.4.30-mips/arch/mips/defconfig-csb250 +--- linux-2.4.30/arch/mips/defconfig-csb250 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-csb250 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + CONFIG_COGENT_CSB250=y +@@ -268,11 +268,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -556,7 +551,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-db1000 linux-2.4.30-mips/arch/mips/defconfig-db1000 +--- linux-2.4.30/arch/mips/defconfig-db1000 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-db1000 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -214,11 +214,7 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-CONFIG_MTD_DB1X00=y +-CONFIG_MTD_DB1X00_BOOT=y +-CONFIG_MTD_DB1X00_USER=y + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -237,7 +233,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -342,11 +337,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -636,7 +626,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-db1100 linux-2.4.30-mips/arch/mips/defconfig-db1100 +--- linux-2.4.30/arch/mips/defconfig-db1100 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-db1100 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -214,11 +214,7 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-CONFIG_MTD_DB1X00=y +-# CONFIG_MTD_DB1X00_BOOT is not set +-CONFIG_MTD_DB1X00_USER=y + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -237,7 +233,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -342,11 +337,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -636,7 +626,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +@@ -884,6 +873,7 @@ + # CONFIG_FB_PM2 is not set + # CONFIG_FB_PM3 is not set + # CONFIG_FB_CYBER2000 is not set ++CONFIG_FB_AU1100=y + # CONFIG_FB_MATROX is not set + # CONFIG_FB_ATY is not set + # CONFIG_FB_RADEON is not set +@@ -895,7 +885,6 @@ + # CONFIG_FB_VOODOO1 is not set + # CONFIG_FB_TRIDENT is not set + # CONFIG_FB_E1356 is not set +-CONFIG_FB_AU1100=y + # CONFIG_FB_IT8181 is not set + # CONFIG_FB_VIRTUAL is not set + CONFIG_FBCON_ADVANCED=y +diff -Nur linux-2.4.30/arch/mips/defconfig-db1200 linux-2.4.30-mips/arch/mips/defconfig-db1200 +--- linux-2.4.30/arch/mips/defconfig-db1200 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-db1200 2005-03-18 13:13:21.000000000 +0100 +@@ -0,0 +1,1032 @@ ++# ++# Automatically generated make config: don't edit ++# ++CONFIG_MIPS=y ++CONFIG_MIPS32=y ++# CONFIG_MIPS64 is not set ++ ++# ++# Code maturity level options ++# ++CONFIG_EXPERIMENTAL=y ++ ++# ++# Loadable module support ++# ++CONFIG_MODULES=y ++# CONFIG_MODVERSIONS is not set ++CONFIG_KMOD=y ++ ++# ++# Machine selection ++# ++# CONFIG_ACER_PICA_61 is not set ++# CONFIG_MIPS_BOSPORUS is not set ++# CONFIG_MIPS_MIRAGE is not set ++# CONFIG_MIPS_DB1000 is not set ++# CONFIG_MIPS_DB1100 is not set ++# CONFIG_MIPS_DB1500 is not set ++# CONFIG_MIPS_DB1550 is not set ++# CONFIG_MIPS_PB1000 is not set ++# CONFIG_MIPS_PB1100 is not set ++# CONFIG_MIPS_PB1500 is not set ++# CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set ++# CONFIG_MIPS_XXS1500 is not set ++# CONFIG_MIPS_MTX1 is not set ++# CONFIG_COGENT_CSB250 is not set ++# CONFIG_BAGET_MIPS is not set ++# CONFIG_CASIO_E55 is not set ++# CONFIG_MIPS_COBALT is not set ++# CONFIG_DECSTATION is not set ++# CONFIG_MIPS_EV64120 is not set ++# CONFIG_MIPS_EV96100 is not set ++# CONFIG_MIPS_IVR is not set ++# CONFIG_HP_LASERJET is not set ++# CONFIG_IBM_WORKPAD is not set ++# CONFIG_LASAT is not set ++# CONFIG_MIPS_ITE8172 is not set ++# CONFIG_MIPS_ATLAS is not set ++# CONFIG_MIPS_MAGNUM_4000 is not set ++# CONFIG_MIPS_MALTA is not set ++# CONFIG_MIPS_SEAD is not set ++# CONFIG_MOMENCO_OCELOT is not set ++# CONFIG_MOMENCO_OCELOT_G is not set ++# CONFIG_MOMENCO_OCELOT_C is not set ++# CONFIG_MOMENCO_JAGUAR_ATX is not set ++# CONFIG_PMC_BIG_SUR is not set ++# CONFIG_PMC_STRETCH is not set ++# CONFIG_PMC_YOSEMITE is not set ++# CONFIG_DDB5074 is not set ++# CONFIG_DDB5476 is not set ++# CONFIG_DDB5477 is not set ++# CONFIG_NEC_OSPREY is not set ++# CONFIG_NEC_EAGLE is not set ++# CONFIG_OLIVETTI_M700 is not set ++# CONFIG_NINO is not set ++# CONFIG_SGI_IP22 is not set ++# CONFIG_SGI_IP27 is not set ++# CONFIG_SIBYTE_SB1xxx_SOC is not set ++# CONFIG_SNI_RM200_PCI is not set ++# CONFIG_TANBAC_TB0226 is not set ++# CONFIG_TANBAC_TB0229 is not set ++# CONFIG_TOSHIBA_JMR3927 is not set ++# CONFIG_TOSHIBA_RBTX4927 is not set ++# CONFIG_VICTOR_MPC30X is not set ++# CONFIG_ZAO_CAPCELLA is not set ++# CONFIG_HIGHMEM is not set ++CONFIG_RWSEM_GENERIC_SPINLOCK=y ++# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set ++# CONFIG_MIPS_AU1000 is not set ++ ++# ++# CPU selection ++# ++CONFIG_CPU_MIPS32=y ++# CONFIG_CPU_MIPS64 is not set ++# CONFIG_CPU_R3000 is not set ++# CONFIG_CPU_TX39XX is not set ++# CONFIG_CPU_VR41XX is not set ++# CONFIG_CPU_R4300 is not set ++# CONFIG_CPU_R4X00 is not set ++# CONFIG_CPU_TX49XX is not set ++# CONFIG_CPU_R5000 is not set ++# CONFIG_CPU_R5432 is not set ++# CONFIG_CPU_R6000 is not set ++# CONFIG_CPU_NEVADA is not set ++# CONFIG_CPU_R8000 is not set ++# CONFIG_CPU_R10000 is not set ++# CONFIG_CPU_RM7000 is not set ++# CONFIG_CPU_RM9000 is not set ++# CONFIG_CPU_SB1 is not set ++CONFIG_PAGE_SIZE_4KB=y ++# CONFIG_PAGE_SIZE_16KB is not set ++# CONFIG_PAGE_SIZE_64KB is not set ++CONFIG_CPU_HAS_PREFETCH=y ++# CONFIG_VTAG_ICACHE is not set ++CONFIG_64BIT_PHYS_ADDR=y ++# CONFIG_CPU_ADVANCED is not set ++CONFIG_CPU_HAS_LLSC=y ++# CONFIG_CPU_HAS_LLDSCD is not set ++# CONFIG_CPU_HAS_WB is not set ++CONFIG_CPU_HAS_SYNC=y ++ ++# ++# General setup ++# ++CONFIG_CPU_LITTLE_ENDIAN=y ++# CONFIG_BUILD_ELF64 is not set ++CONFIG_NET=y ++CONFIG_PCI=y ++CONFIG_PCI_NEW=y ++CONFIG_PCI_AUTO=y ++# CONFIG_PCI_NAMES is not set ++# CONFIG_ISA is not set ++# CONFIG_TC is not set ++# CONFIG_MCA is not set ++# CONFIG_SBUS is not set ++CONFIG_HOTPLUG=y ++ ++# ++# PCMCIA/CardBus support ++# ++CONFIG_PCMCIA=m ++# CONFIG_CARDBUS is not set ++# CONFIG_TCIC is not set ++# CONFIG_I82092 is not set ++# CONFIG_I82365 is not set ++ ++# ++# PCI Hotplug Support ++# ++# CONFIG_HOTPLUG_PCI is not set ++# CONFIG_HOTPLUG_PCI_COMPAQ is not set ++# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set ++# CONFIG_HOTPLUG_PCI_SHPC is not set ++# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set ++# CONFIG_HOTPLUG_PCI_PCIE is not set ++# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set ++CONFIG_SYSVIPC=y ++# CONFIG_BSD_PROCESS_ACCT is not set ++CONFIG_SYSCTL=y ++CONFIG_KCORE_ELF=y ++# CONFIG_KCORE_AOUT is not set ++# CONFIG_BINFMT_AOUT is not set ++CONFIG_BINFMT_ELF=y ++# CONFIG_MIPS32_COMPAT is not set ++# CONFIG_MIPS32_O32 is not set ++# CONFIG_MIPS32_N32 is not set ++# CONFIG_BINFMT_ELF32 is not set ++# CONFIG_BINFMT_MISC is not set ++# CONFIG_OOM_KILLER is not set ++CONFIG_CMDLINE_BOOL=y ++CONFIG_CMDLINE="mem=96M" ++ ++# ++# Memory Technology Devices (MTD) ++# ++# CONFIG_MTD is not set ++ ++# ++# Parallel port support ++# ++# CONFIG_PARPORT is not set ++ ++# ++# Plug and Play configuration ++# ++# CONFIG_PNP is not set ++# CONFIG_ISAPNP is not set ++ ++# ++# Block devices ++# ++# CONFIG_BLK_DEV_FD is not set ++# CONFIG_BLK_DEV_XD is not set ++# CONFIG_PARIDE is not set ++# CONFIG_BLK_CPQ_DA is not set ++# CONFIG_BLK_CPQ_CISS_DA is not set ++# CONFIG_CISS_SCSI_TAPE is not set ++# CONFIG_CISS_MONITOR_THREAD is not set ++# CONFIG_BLK_DEV_DAC960 is not set ++# CONFIG_BLK_DEV_UMEM is not set ++# CONFIG_BLK_DEV_SX8 is not set ++CONFIG_BLK_DEV_LOOP=y ++# CONFIG_BLK_DEV_NBD is not set ++# CONFIG_BLK_DEV_RAM is not set ++# CONFIG_BLK_DEV_INITRD is not set ++# CONFIG_BLK_STATS is not set ++ ++# ++# Multi-device support (RAID and LVM) ++# ++# CONFIG_MD is not set ++# CONFIG_BLK_DEV_MD is not set ++# CONFIG_MD_LINEAR is not set ++# CONFIG_MD_RAID0 is not set ++# CONFIG_MD_RAID1 is not set ++# CONFIG_MD_RAID5 is not set ++# CONFIG_MD_MULTIPATH is not set ++# CONFIG_BLK_DEV_LVM is not set ++ ++# ++# Networking options ++# ++CONFIG_PACKET=y ++# CONFIG_PACKET_MMAP is not set ++# CONFIG_NETLINK_DEV is not set ++CONFIG_NETFILTER=y ++# CONFIG_NETFILTER_DEBUG is not set ++CONFIG_FILTER=y ++CONFIG_UNIX=y ++CONFIG_INET=y ++CONFIG_IP_MULTICAST=y ++# CONFIG_IP_ADVANCED_ROUTER is not set ++CONFIG_IP_PNP=y ++# CONFIG_IP_PNP_DHCP is not set ++CONFIG_IP_PNP_BOOTP=y ++# CONFIG_IP_PNP_RARP is not set ++# CONFIG_NET_IPIP is not set ++# CONFIG_NET_IPGRE is not set ++# CONFIG_IP_MROUTE is not set ++# CONFIG_ARPD is not set ++# CONFIG_INET_ECN is not set ++# CONFIG_SYN_COOKIES is not set ++ ++# ++# IP: Netfilter Configuration ++# ++# CONFIG_IP_NF_CONNTRACK is not set ++# CONFIG_IP_NF_QUEUE is not set ++# CONFIG_IP_NF_IPTABLES is not set ++# CONFIG_IP_NF_ARPTABLES is not set ++# CONFIG_IP_NF_COMPAT_IPCHAINS is not set ++# CONFIG_IP_NF_COMPAT_IPFWADM is not set ++ ++# ++# IP: Virtual Server Configuration ++# ++# CONFIG_IP_VS is not set ++# CONFIG_IPV6 is not set ++# CONFIG_KHTTPD is not set ++ ++# ++# SCTP Configuration (EXPERIMENTAL) ++# ++# CONFIG_IP_SCTP is not set ++# CONFIG_ATM is not set ++# CONFIG_VLAN_8021Q is not set ++ ++# ++# ++# ++# CONFIG_IPX is not set ++# CONFIG_ATALK is not set ++# CONFIG_DECNET is not set ++# CONFIG_BRIDGE is not set ++# CONFIG_X25 is not set ++# CONFIG_LAPB is not set ++# CONFIG_LLC is not set ++# CONFIG_NET_DIVERT is not set ++# CONFIG_ECONET is not set ++# CONFIG_WAN_ROUTER is not set ++# CONFIG_NET_FASTROUTE is not set ++# CONFIG_NET_HW_FLOWCONTROL is not set ++ ++# ++# QoS and/or fair queueing ++# ++# CONFIG_NET_SCHED is not set ++ ++# ++# Network testing ++# ++# CONFIG_NET_PKTGEN is not set ++ ++# ++# Telephony Support ++# ++# CONFIG_PHONE is not set ++# CONFIG_PHONE_IXJ is not set ++# CONFIG_PHONE_IXJ_PCMCIA is not set ++ ++# ++# ATA/IDE/MFM/RLL support ++# ++CONFIG_IDE=y ++ ++# ++# IDE, ATA and ATAPI Block devices ++# ++CONFIG_BLK_DEV_IDE=y ++ ++# ++# Please see Documentation/ide.txt for help/info on IDE drives ++# ++# CONFIG_BLK_DEV_HD_IDE is not set ++# CONFIG_BLK_DEV_HD is not set ++# CONFIG_BLK_DEV_IDE_SATA is not set ++CONFIG_BLK_DEV_IDEDISK=y ++CONFIG_IDEDISK_MULTI_MODE=y ++CONFIG_IDEDISK_STROKE=y ++CONFIG_BLK_DEV_IDECS=m ++# CONFIG_BLK_DEV_DELKIN is not set ++# CONFIG_BLK_DEV_IDECD is not set ++# CONFIG_BLK_DEV_IDETAPE is not set ++# CONFIG_BLK_DEV_IDEFLOPPY is not set ++# CONFIG_BLK_DEV_IDESCSI is not set ++# CONFIG_IDE_TASK_IOCTL is not set ++ ++# ++# IDE chipset support/bugfixes ++# ++# CONFIG_BLK_DEV_CMD640 is not set ++# CONFIG_BLK_DEV_CMD640_ENHANCED is not set ++# CONFIG_BLK_DEV_ISAPNP is not set ++# CONFIG_BLK_DEV_IDEPCI is not set ++# CONFIG_IDE_CHIPSETS is not set ++# CONFIG_IDEDMA_AUTO is not set ++# CONFIG_DMA_NONPCI is not set ++# CONFIG_BLK_DEV_ATARAID is not set ++# CONFIG_BLK_DEV_ATARAID_PDC is not set ++# CONFIG_BLK_DEV_ATARAID_HPT is not set ++# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set ++# CONFIG_BLK_DEV_ATARAID_SII is not set ++ ++# ++# SCSI support ++# ++CONFIG_SCSI=y ++ ++# ++# SCSI support type (disk, tape, CD-ROM) ++# ++CONFIG_BLK_DEV_SD=y ++CONFIG_SD_EXTRA_DEVS=40 ++CONFIG_CHR_DEV_ST=y ++# CONFIG_CHR_DEV_OSST is not set ++CONFIG_BLK_DEV_SR=y ++# CONFIG_BLK_DEV_SR_VENDOR is not set ++CONFIG_SR_EXTRA_DEVS=2 ++# CONFIG_CHR_DEV_SG is not set ++ ++# ++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs ++# ++# CONFIG_SCSI_DEBUG_QUEUES is not set ++# CONFIG_SCSI_MULTI_LUN is not set ++CONFIG_SCSI_CONSTANTS=y ++# CONFIG_SCSI_LOGGING is not set ++ ++# ++# SCSI low-level drivers ++# ++# CONFIG_BLK_DEV_3W_XXXX_RAID is not set ++# CONFIG_SCSI_7000FASST is not set ++# CONFIG_SCSI_ACARD is not set ++# CONFIG_SCSI_AHA152X is not set ++# CONFIG_SCSI_AHA1542 is not set ++# CONFIG_SCSI_AHA1740 is not set ++# CONFIG_SCSI_AACRAID is not set ++# CONFIG_SCSI_AIC7XXX is not set ++# CONFIG_SCSI_AIC79XX is not set ++# CONFIG_SCSI_AIC7XXX_OLD is not set ++# CONFIG_SCSI_DPT_I2O is not set ++# CONFIG_SCSI_ADVANSYS is not set ++# CONFIG_SCSI_IN2000 is not set ++# CONFIG_SCSI_AM53C974 is not set ++# CONFIG_SCSI_MEGARAID is not set ++# CONFIG_SCSI_MEGARAID2 is not set ++# CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set ++# CONFIG_SCSI_SATA_SVW is not set ++# CONFIG_SCSI_ATA_PIIX is not set ++# CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set ++# CONFIG_SCSI_SATA_PROMISE is not set ++# CONFIG_SCSI_SATA_SX4 is not set ++# CONFIG_SCSI_SATA_SIL is not set ++# CONFIG_SCSI_SATA_SIS is not set ++# CONFIG_SCSI_SATA_ULI is not set ++# CONFIG_SCSI_SATA_VIA is not set ++# CONFIG_SCSI_SATA_VITESSE is not set ++# CONFIG_SCSI_BUSLOGIC is not set ++# CONFIG_SCSI_CPQFCTS is not set ++# CONFIG_SCSI_DMX3191D is not set ++# CONFIG_SCSI_DTC3280 is not set ++# CONFIG_SCSI_EATA is not set ++# CONFIG_SCSI_EATA_DMA is not set ++# CONFIG_SCSI_EATA_PIO is not set ++# CONFIG_SCSI_FUTURE_DOMAIN is not set ++# CONFIG_SCSI_GDTH is not set ++# CONFIG_SCSI_GENERIC_NCR5380 is not set ++# CONFIG_SCSI_INITIO is not set ++# CONFIG_SCSI_INIA100 is not set ++# CONFIG_SCSI_NCR53C406A is not set ++# CONFIG_SCSI_NCR53C7xx is not set ++# CONFIG_SCSI_SYM53C8XX_2 is not set ++# CONFIG_SCSI_NCR53C8XX is not set ++# CONFIG_SCSI_SYM53C8XX is not set ++# CONFIG_SCSI_PAS16 is not set ++# CONFIG_SCSI_PCI2000 is not set ++# CONFIG_SCSI_PCI2220I is not set ++# CONFIG_SCSI_PSI240I is not set ++# CONFIG_SCSI_QLOGIC_FAS is not set ++# CONFIG_SCSI_QLOGIC_ISP is not set ++# CONFIG_SCSI_QLOGIC_FC is not set ++# CONFIG_SCSI_QLOGIC_1280 is not set ++# CONFIG_SCSI_SIM710 is not set ++# CONFIG_SCSI_SYM53C416 is not set ++# CONFIG_SCSI_DC390T is not set ++# CONFIG_SCSI_T128 is not set ++# CONFIG_SCSI_U14_34F is not set ++# CONFIG_SCSI_NSP32 is not set ++# CONFIG_SCSI_DEBUG is not set ++ ++# ++# PCMCIA SCSI adapter support ++# ++# CONFIG_SCSI_PCMCIA is not set ++ ++# ++# Fusion MPT device support ++# ++# CONFIG_FUSION is not set ++# CONFIG_FUSION_BOOT is not set ++# CONFIG_FUSION_ISENSE is not set ++# CONFIG_FUSION_CTL is not set ++# CONFIG_FUSION_LAN is not set ++ ++# ++# IEEE 1394 (FireWire) support (EXPERIMENTAL) ++# ++# CONFIG_IEEE1394 is not set ++ ++# ++# I2O device support ++# ++# CONFIG_I2O is not set ++# CONFIG_I2O_PCI is not set ++# CONFIG_I2O_BLOCK is not set ++# CONFIG_I2O_LAN is not set ++# CONFIG_I2O_SCSI is not set ++# CONFIG_I2O_PROC is not set ++ ++# ++# Network device support ++# ++CONFIG_NETDEVICES=y ++ ++# ++# ARCnet devices ++# ++# CONFIG_ARCNET is not set ++# CONFIG_DUMMY is not set ++# CONFIG_BONDING is not set ++# CONFIG_EQUALIZER is not set ++# CONFIG_TUN is not set ++# CONFIG_ETHERTAP is not set ++ ++# ++# Ethernet (10 or 100Mbit) ++# ++CONFIG_NET_ETHERNET=y ++# CONFIG_SUNLANCE is not set ++# CONFIG_HAPPYMEAL is not set ++# CONFIG_SUNBMAC is not set ++# CONFIG_SUNQE is not set ++# CONFIG_SUNGEM is not set ++# CONFIG_NET_VENDOR_3COM is not set ++# CONFIG_LANCE is not set ++# CONFIG_NET_VENDOR_SMC is not set ++# CONFIG_NET_VENDOR_RACAL is not set ++# CONFIG_HP100 is not set ++# CONFIG_NET_ISA is not set ++# CONFIG_NET_PCI is not set ++# CONFIG_NET_POCKET is not set ++ ++# ++# Ethernet (1000 Mbit) ++# ++# CONFIG_ACENIC is not set ++# CONFIG_DL2K is not set ++# CONFIG_E1000 is not set ++# CONFIG_MYRI_SBUS is not set ++# CONFIG_NS83820 is not set ++# CONFIG_HAMACHI is not set ++# CONFIG_YELLOWFIN is not set ++# CONFIG_R8169 is not set ++# CONFIG_SK98LIN is not set ++# CONFIG_TIGON3 is not set ++# CONFIG_FDDI is not set ++# CONFIG_HIPPI is not set ++# CONFIG_PLIP is not set ++# CONFIG_PPP is not set ++# CONFIG_SLIP is not set ++ ++# ++# Wireless LAN (non-hamradio) ++# ++# CONFIG_NET_RADIO is not set ++ ++# ++# Token Ring devices ++# ++# CONFIG_TR is not set ++# CONFIG_NET_FC is not set ++# CONFIG_RCPCI is not set ++# CONFIG_SHAPER is not set ++ ++# ++# Wan interfaces ++# ++# CONFIG_WAN is not set ++ ++# ++# PCMCIA network device support ++# ++# CONFIG_NET_PCMCIA is not set ++ ++# ++# Amateur Radio support ++# ++# CONFIG_HAMRADIO is not set ++ ++# ++# IrDA (infrared) support ++# ++# CONFIG_IRDA is not set ++ ++# ++# ISDN subsystem ++# ++# CONFIG_ISDN is not set ++ ++# ++# Input core support ++# ++CONFIG_INPUT=y ++CONFIG_INPUT_KEYBDEV=y ++CONFIG_INPUT_MOUSEDEV=y ++CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 ++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 ++# CONFIG_INPUT_JOYDEV is not set ++CONFIG_INPUT_EVDEV=y ++# CONFIG_INPUT_UINPUT is not set ++ ++# ++# Character devices ++# ++CONFIG_VT=y ++# CONFIG_VT_CONSOLE is not set ++# CONFIG_SERIAL is not set ++# CONFIG_SERIAL_EXTENDED is not set ++CONFIG_SERIAL_NONSTANDARD=y ++# CONFIG_COMPUTONE is not set ++# CONFIG_ROCKETPORT is not set ++# CONFIG_CYCLADES is not set ++# CONFIG_DIGIEPCA is not set ++# CONFIG_DIGI is not set ++# CONFIG_ESPSERIAL is not set ++# CONFIG_MOXA_INTELLIO is not set ++# CONFIG_MOXA_SMARTIO is not set ++# CONFIG_ISI is not set ++# CONFIG_SYNCLINK is not set ++# CONFIG_SYNCLINKMP is not set ++# CONFIG_N_HDLC is not set ++# CONFIG_RISCOM8 is not set ++# CONFIG_SPECIALIX is not set ++# CONFIG_SX is not set ++# CONFIG_RIO is not set ++# CONFIG_STALDRV is not set ++# CONFIG_SERIAL_TX3912 is not set ++# CONFIG_SERIAL_TX3912_CONSOLE is not set ++# CONFIG_SERIAL_TXX9 is not set ++# CONFIG_SERIAL_TXX9_CONSOLE is not set ++# CONFIG_TXX927_SERIAL is not set ++CONFIG_UNIX98_PTYS=y ++CONFIG_UNIX98_PTY_COUNT=256 ++ ++# ++# I2C support ++# ++# CONFIG_I2C is not set ++ ++# ++# Mice ++# ++# CONFIG_BUSMOUSE is not set ++# CONFIG_MOUSE is not set ++ ++# ++# Joysticks ++# ++# CONFIG_INPUT_GAMEPORT is not set ++# CONFIG_INPUT_NS558 is not set ++# CONFIG_INPUT_LIGHTNING is not set ++# CONFIG_INPUT_PCIGAME is not set ++# CONFIG_INPUT_CS461X is not set ++# CONFIG_INPUT_EMU10K1 is not set ++# CONFIG_INPUT_SERIO is not set ++# CONFIG_INPUT_SERPORT is not set ++ ++# ++# Joysticks ++# ++# CONFIG_INPUT_ANALOG is not set ++# CONFIG_INPUT_A3D is not set ++# CONFIG_INPUT_ADI is not set ++# CONFIG_INPUT_COBRA is not set ++# CONFIG_INPUT_GF2K is not set ++# CONFIG_INPUT_GRIP is not set ++# CONFIG_INPUT_INTERACT is not set ++# CONFIG_INPUT_TMDC is not set ++# CONFIG_INPUT_SIDEWINDER is not set ++# CONFIG_INPUT_IFORCE_USB is not set ++# CONFIG_INPUT_IFORCE_232 is not set ++# CONFIG_INPUT_WARRIOR is not set ++# CONFIG_INPUT_MAGELLAN is not set ++# CONFIG_INPUT_SPACEORB is not set ++# CONFIG_INPUT_SPACEBALL is not set ++# CONFIG_INPUT_STINGER is not set ++# CONFIG_INPUT_DB9 is not set ++# CONFIG_INPUT_GAMECON is not set ++# CONFIG_INPUT_TURBOGRAFX is not set ++# CONFIG_QIC02_TAPE is not set ++# CONFIG_IPMI_HANDLER is not set ++# CONFIG_IPMI_PANIC_EVENT is not set ++# CONFIG_IPMI_DEVICE_INTERFACE is not set ++# CONFIG_IPMI_KCS is not set ++# CONFIG_IPMI_WATCHDOG is not set ++ ++# ++# Watchdog Cards ++# ++# CONFIG_WATCHDOG is not set ++# CONFIG_SCx200 is not set ++# CONFIG_SCx200_GPIO is not set ++# CONFIG_AMD_PM768 is not set ++# CONFIG_NVRAM is not set ++# CONFIG_RTC is not set ++# CONFIG_DTLK is not set ++# CONFIG_R3964 is not set ++# CONFIG_APPLICOM is not set ++ ++# ++# Ftape, the floppy tape device driver ++# ++# CONFIG_FTAPE is not set ++# CONFIG_AGP is not set ++ ++# ++# Direct Rendering Manager (XFree86 DRI support) ++# ++# CONFIG_DRM is not set ++ ++# ++# PCMCIA character devices ++# ++# CONFIG_PCMCIA_SERIAL_CS is not set ++# CONFIG_SYNCLINK_CS is not set ++ ++# ++# File systems ++# ++# CONFIG_QUOTA is not set ++# CONFIG_QFMT_V2 is not set ++CONFIG_AUTOFS_FS=y ++# CONFIG_AUTOFS4_FS is not set ++# CONFIG_REISERFS_FS is not set ++# CONFIG_REISERFS_CHECK is not set ++# CONFIG_REISERFS_PROC_INFO is not set ++# CONFIG_ADFS_FS is not set ++# CONFIG_ADFS_FS_RW is not set ++# CONFIG_AFFS_FS is not set ++# CONFIG_HFS_FS is not set ++# CONFIG_HFSPLUS_FS is not set ++# CONFIG_BEFS_FS is not set ++# CONFIG_BEFS_DEBUG is not set ++# CONFIG_BFS_FS is not set ++CONFIG_EXT3_FS=y ++CONFIG_JBD=y ++# CONFIG_JBD_DEBUG is not set ++CONFIG_FAT_FS=y ++CONFIG_MSDOS_FS=y ++# CONFIG_UMSDOS_FS is not set ++CONFIG_VFAT_FS=y ++# CONFIG_EFS_FS is not set ++# CONFIG_JFFS_FS is not set ++# CONFIG_JFFS2_FS is not set ++# CONFIG_CRAMFS is not set ++CONFIG_TMPFS=y ++CONFIG_RAMFS=y ++# CONFIG_ISO9660_FS is not set ++# CONFIG_JOLIET is not set ++# CONFIG_ZISOFS is not set ++# CONFIG_JFS_FS is not set ++# CONFIG_JFS_DEBUG is not set ++# CONFIG_JFS_STATISTICS is not set ++# CONFIG_MINIX_FS is not set ++# CONFIG_VXFS_FS is not set ++# CONFIG_NTFS_FS is not set ++# CONFIG_NTFS_RW is not set ++# CONFIG_HPFS_FS is not set ++CONFIG_PROC_FS=y ++# CONFIG_DEVFS_FS is not set ++# CONFIG_DEVFS_MOUNT is not set ++# CONFIG_DEVFS_DEBUG is not set ++CONFIG_DEVPTS_FS=y ++# CONFIG_QNX4FS_FS is not set ++# CONFIG_QNX4FS_RW is not set ++# CONFIG_ROMFS_FS is not set ++CONFIG_EXT2_FS=y ++# CONFIG_SYSV_FS is not set ++# CONFIG_UDF_FS is not set ++# CONFIG_UDF_RW is not set ++# CONFIG_UFS_FS is not set ++# CONFIG_UFS_FS_WRITE is not set ++# CONFIG_XFS_FS is not set ++# CONFIG_XFS_QUOTA is not set ++# CONFIG_XFS_RT is not set ++# CONFIG_XFS_TRACE is not set ++# CONFIG_XFS_DEBUG is not set ++ ++# ++# Network File Systems ++# ++# CONFIG_CODA_FS is not set ++# CONFIG_INTERMEZZO_FS is not set ++CONFIG_NFS_FS=y ++CONFIG_NFS_V3=y ++# CONFIG_NFS_DIRECTIO is not set ++CONFIG_ROOT_NFS=y ++# CONFIG_NFSD is not set ++# CONFIG_NFSD_V3 is not set ++# CONFIG_NFSD_TCP is not set ++CONFIG_SUNRPC=y ++CONFIG_LOCKD=y ++CONFIG_LOCKD_V4=y ++# CONFIG_SMB_FS is not set ++# CONFIG_NCP_FS is not set ++# CONFIG_NCPFS_PACKET_SIGNING is not set ++# CONFIG_NCPFS_IOCTL_LOCKING is not set ++# CONFIG_NCPFS_STRONG is not set ++# CONFIG_NCPFS_NFS_NS is not set ++# CONFIG_NCPFS_OS2_NS is not set ++# CONFIG_NCPFS_SMALLDOS is not set ++# CONFIG_NCPFS_NLS is not set ++# CONFIG_NCPFS_EXTRAS is not set ++# CONFIG_ZISOFS_FS is not set ++ ++# ++# Partition Types ++# ++# CONFIG_PARTITION_ADVANCED is not set ++CONFIG_MSDOS_PARTITION=y ++# CONFIG_SMB_NLS is not set ++CONFIG_NLS=y ++ ++# ++# Native Language Support ++# ++CONFIG_NLS_DEFAULT="iso8859-1" ++# CONFIG_NLS_CODEPAGE_437 is not set ++# CONFIG_NLS_CODEPAGE_737 is not set ++# CONFIG_NLS_CODEPAGE_775 is not set ++# CONFIG_NLS_CODEPAGE_850 is not set ++# CONFIG_NLS_CODEPAGE_852 is not set ++# CONFIG_NLS_CODEPAGE_855 is not set ++# CONFIG_NLS_CODEPAGE_857 is not set ++# CONFIG_NLS_CODEPAGE_860 is not set ++# CONFIG_NLS_CODEPAGE_861 is not set ++# CONFIG_NLS_CODEPAGE_862 is not set ++# CONFIG_NLS_CODEPAGE_863 is not set ++# CONFIG_NLS_CODEPAGE_864 is not set ++# CONFIG_NLS_CODEPAGE_865 is not set ++# CONFIG_NLS_CODEPAGE_866 is not set ++# CONFIG_NLS_CODEPAGE_869 is not set ++# CONFIG_NLS_CODEPAGE_936 is not set ++# CONFIG_NLS_CODEPAGE_950 is not set ++# CONFIG_NLS_CODEPAGE_932 is not set ++# CONFIG_NLS_CODEPAGE_949 is not set ++# CONFIG_NLS_CODEPAGE_874 is not set ++# CONFIG_NLS_ISO8859_8 is not set ++# CONFIG_NLS_CODEPAGE_1250 is not set ++# CONFIG_NLS_CODEPAGE_1251 is not set ++# CONFIG_NLS_ISO8859_1 is not set ++# CONFIG_NLS_ISO8859_2 is not set ++# CONFIG_NLS_ISO8859_3 is not set ++# CONFIG_NLS_ISO8859_4 is not set ++# CONFIG_NLS_ISO8859_5 is not set ++# CONFIG_NLS_ISO8859_6 is not set ++# CONFIG_NLS_ISO8859_7 is not set ++# CONFIG_NLS_ISO8859_9 is not set ++# CONFIG_NLS_ISO8859_13 is not set ++# CONFIG_NLS_ISO8859_14 is not set ++# CONFIG_NLS_ISO8859_15 is not set ++# CONFIG_NLS_KOI8_R is not set ++# CONFIG_NLS_KOI8_U is not set ++# CONFIG_NLS_UTF8 is not set ++ ++# ++# Multimedia devices ++# ++# CONFIG_VIDEO_DEV is not set ++ ++# ++# Console drivers ++# ++# CONFIG_VGA_CONSOLE is not set ++# CONFIG_MDA_CONSOLE is not set ++ ++# ++# Frame-buffer support ++# ++CONFIG_FB=y ++CONFIG_DUMMY_CONSOLE=y ++# CONFIG_FB_RIVA is not set ++# CONFIG_FB_CLGEN is not set ++# CONFIG_FB_PM2 is not set ++# CONFIG_FB_PM3 is not set ++# CONFIG_FB_CYBER2000 is not set ++# CONFIG_FB_MATROX is not set ++# CONFIG_FB_ATY is not set ++# CONFIG_FB_RADEON is not set ++# CONFIG_FB_ATY128 is not set ++# CONFIG_FB_INTEL is not set ++# CONFIG_FB_SIS is not set ++# CONFIG_FB_NEOMAGIC is not set ++# CONFIG_FB_3DFX is not set ++# CONFIG_FB_VOODOO1 is not set ++# CONFIG_FB_TRIDENT is not set ++# CONFIG_FB_E1356 is not set ++# CONFIG_FB_IT8181 is not set ++# CONFIG_FB_VIRTUAL is not set ++CONFIG_FBCON_ADVANCED=y ++# CONFIG_FBCON_MFB is not set ++# CONFIG_FBCON_CFB2 is not set ++# CONFIG_FBCON_CFB4 is not set ++# CONFIG_FBCON_CFB8 is not set ++CONFIG_FBCON_CFB16=y ++# CONFIG_FBCON_CFB24 is not set ++CONFIG_FBCON_CFB32=y ++# CONFIG_FBCON_AFB is not set ++# CONFIG_FBCON_ILBM is not set ++# CONFIG_FBCON_IPLAN2P2 is not set ++# CONFIG_FBCON_IPLAN2P4 is not set ++# CONFIG_FBCON_IPLAN2P8 is not set ++# CONFIG_FBCON_MAC is not set ++# CONFIG_FBCON_VGA_PLANES is not set ++# CONFIG_FBCON_VGA is not set ++# CONFIG_FBCON_HGA is not set ++# CONFIG_FBCON_FONTWIDTH8_ONLY is not set ++CONFIG_FBCON_FONTS=y ++CONFIG_FONT_8x8=y ++CONFIG_FONT_8x16=y ++# CONFIG_FONT_SUN8x16 is not set ++# CONFIG_FONT_SUN12x22 is not set ++# CONFIG_FONT_6x11 is not set ++# CONFIG_FONT_PEARL_8x8 is not set ++# CONFIG_FONT_ACORN_8x8 is not set ++ ++# ++# Sound ++# ++CONFIG_SOUND=y ++# CONFIG_SOUND_ALI5455 is not set ++# CONFIG_SOUND_BT878 is not set ++# CONFIG_SOUND_CMPCI is not set ++# CONFIG_SOUND_EMU10K1 is not set ++# CONFIG_MIDI_EMU10K1 is not set ++# CONFIG_SOUND_FUSION is not set ++# CONFIG_SOUND_CS4281 is not set ++# CONFIG_SOUND_ES1370 is not set ++# CONFIG_SOUND_ES1371 is not set ++# CONFIG_SOUND_ESSSOLO1 is not set ++# CONFIG_SOUND_MAESTRO is not set ++# CONFIG_SOUND_MAESTRO3 is not set ++# CONFIG_SOUND_FORTE is not set ++# CONFIG_SOUND_ICH is not set ++# CONFIG_SOUND_RME96XX is not set ++# CONFIG_SOUND_SONICVIBES is not set ++# CONFIG_SOUND_TRIDENT is not set ++# CONFIG_SOUND_MSNDCLAS is not set ++# CONFIG_SOUND_MSNDPIN is not set ++# CONFIG_SOUND_VIA82CXXX is not set ++# CONFIG_MIDI_VIA82CXXX is not set ++# CONFIG_SOUND_OSS is not set ++# CONFIG_SOUND_TVMIXER is not set ++# CONFIG_SOUND_AD1980 is not set ++# CONFIG_SOUND_WM97XX is not set ++ ++# ++# USB support ++# ++CONFIG_USB=y ++# CONFIG_USB_DEBUG is not set ++ ++# ++# Miscellaneous USB options ++# ++CONFIG_USB_DEVICEFS=y ++# CONFIG_USB_BANDWIDTH is not set ++ ++# ++# USB Host Controller Drivers ++# ++# CONFIG_USB_EHCI_HCD is not set ++# CONFIG_USB_UHCI is not set ++# CONFIG_USB_UHCI_ALT is not set ++CONFIG_USB_OHCI=y ++ ++# ++# USB Device Class drivers ++# ++# CONFIG_USB_AUDIO is not set ++# CONFIG_USB_EMI26 is not set ++# CONFIG_USB_BLUETOOTH is not set ++# CONFIG_USB_MIDI is not set ++CONFIG_USB_STORAGE=y ++# CONFIG_USB_STORAGE_DEBUG is not set ++# CONFIG_USB_STORAGE_DATAFAB is not set ++# CONFIG_USB_STORAGE_FREECOM is not set ++# CONFIG_USB_STORAGE_ISD200 is not set ++# CONFIG_USB_STORAGE_DPCM is not set ++# CONFIG_USB_STORAGE_HP8200e is not set ++# CONFIG_USB_STORAGE_SDDR09 is not set ++# CONFIG_USB_STORAGE_SDDR55 is not set ++# CONFIG_USB_STORAGE_JUMPSHOT is not set ++# CONFIG_USB_ACM is not set ++# CONFIG_USB_PRINTER is not set ++ ++# ++# USB Human Interface Devices (HID) ++# ++CONFIG_USB_HID=y ++CONFIG_USB_HIDINPUT=y ++CONFIG_USB_HIDDEV=y ++# CONFIG_USB_AIPTEK is not set ++# CONFIG_USB_WACOM is not set ++# CONFIG_USB_KBTAB is not set ++# CONFIG_USB_POWERMATE is not set ++ ++# ++# USB Imaging devices ++# ++# CONFIG_USB_DC2XX is not set ++# CONFIG_USB_MDC800 is not set ++# CONFIG_USB_SCANNER is not set ++# CONFIG_USB_MICROTEK is not set ++# CONFIG_USB_HPUSBSCSI is not set ++ ++# ++# USB Multimedia devices ++# ++ ++# ++# Video4Linux support is needed for USB Multimedia device support ++# ++ ++# ++# USB Network adaptors ++# ++# CONFIG_USB_PEGASUS is not set ++# CONFIG_USB_RTL8150 is not set ++# CONFIG_USB_KAWETH is not set ++# CONFIG_USB_CATC is not set ++# CONFIG_USB_CDCETHER is not set ++# CONFIG_USB_USBNET is not set ++ ++# ++# USB port drivers ++# ++# CONFIG_USB_USS720 is not set ++ ++# ++# USB Serial Converter support ++# ++# CONFIG_USB_SERIAL is not set ++ ++# ++# USB Miscellaneous drivers ++# ++# CONFIG_USB_RIO500 is not set ++# CONFIG_USB_AUERSWALD is not set ++# CONFIG_USB_TIGL is not set ++# CONFIG_USB_BRLVGER is not set ++# CONFIG_USB_LCD is not set ++ ++# ++# Support for USB gadgets ++# ++# CONFIG_USB_GADGET is not set ++ ++# ++# Bluetooth support ++# ++# CONFIG_BLUEZ is not set ++ ++# ++# Kernel hacking ++# ++CONFIG_CROSSCOMPILE=y ++# CONFIG_RUNTIME_DEBUG is not set ++# CONFIG_KGDB is not set ++# CONFIG_GDB_CONSOLE is not set ++# CONFIG_DEBUG_INFO is not set ++# CONFIG_MAGIC_SYSRQ is not set ++# CONFIG_MIPS_UNCACHED is not set ++CONFIG_LOG_BUF_SHIFT=0 ++ ++# ++# Cryptographic options ++# ++# CONFIG_CRYPTO is not set ++ ++# ++# Library routines ++# ++# CONFIG_CRC32 is not set ++CONFIG_ZLIB_INFLATE=m ++CONFIG_ZLIB_DEFLATE=m ++# CONFIG_FW_LOADER is not set +diff -Nur linux-2.4.30/arch/mips/defconfig-db1500 linux-2.4.30-mips/arch/mips/defconfig-db1500 +--- linux-2.4.30/arch/mips/defconfig-db1500 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-db1500 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -267,11 +267,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -555,7 +550,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-db1550 linux-2.4.30-mips/arch/mips/defconfig-db1550 +--- linux-2.4.30/arch/mips/defconfig-db1550 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-db1550 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -213,11 +213,9 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + CONFIG_MTD_PB1550=y + CONFIG_MTD_PB1550_BOOT=y + CONFIG_MTD_PB1550_USER=y +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -236,7 +234,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -343,11 +340,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -633,7 +625,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-ddb5476 linux-2.4.30-mips/arch/mips/defconfig-ddb5476 +--- linux-2.4.30/arch/mips/defconfig-ddb5476 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-ddb5476 2005-03-18 13:13:21.000000000 +0100 +@@ -28,8 +28,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -226,11 +226,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -517,7 +512,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-ddb5477 linux-2.4.30-mips/arch/mips/defconfig-ddb5477 +--- linux-2.4.30/arch/mips/defconfig-ddb5477 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-ddb5477 2005-03-18 13:13:21.000000000 +0100 +@@ -28,8 +28,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -226,11 +226,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -434,7 +429,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-decstation linux-2.4.30-mips/arch/mips/defconfig-decstation +--- linux-2.4.30/arch/mips/defconfig-decstation 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-decstation 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -223,11 +223,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -306,9 +301,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -477,7 +474,6 @@ + CONFIG_SERIAL_DEC_CONSOLE=y + CONFIG_DZ=y + CONFIG_ZS=y +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-e55 linux-2.4.30-mips/arch/mips/defconfig-e55 +--- linux-2.4.30/arch/mips/defconfig-e55 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-e55 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -222,11 +222,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -426,7 +421,6 @@ + # CONFIG_SERIAL_MULTIPORT is not set + # CONFIG_HUB6 is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_VR41XX_KIU is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 +diff -Nur linux-2.4.30/arch/mips/defconfig-eagle linux-2.4.30-mips/arch/mips/defconfig-eagle +--- linux-2.4.30/arch/mips/defconfig-eagle 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-eagle 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -208,8 +208,8 @@ + # Mapping drivers for chip access + # + CONFIG_MTD_PHYSMAP=y +-CONFIG_MTD_PHYSMAP_START=1c000000 +-CONFIG_MTD_PHYSMAP_LEN=2000000 ++CONFIG_MTD_PHYSMAP_START=0x1c000000 ++CONFIG_MTD_PHYSMAP_LEN=0x2000000 + CONFIG_MTD_PHYSMAP_BUSWIDTH=4 + # CONFIG_MTD_PB1000 is not set + # CONFIG_MTD_PB1500 is not set +@@ -217,9 +217,7 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -238,7 +236,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -327,11 +324,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -587,7 +579,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_VR41XX_KIU is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 +diff -Nur linux-2.4.30/arch/mips/defconfig-ev64120 linux-2.4.30-mips/arch/mips/defconfig-ev64120 +--- linux-2.4.30/arch/mips/defconfig-ev64120 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-ev64120 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -230,11 +230,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -443,7 +438,6 @@ + # CONFIG_SERIAL_CONSOLE is not set + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-ev96100 linux-2.4.30-mips/arch/mips/defconfig-ev96100 +--- linux-2.4.30/arch/mips/defconfig-ev96100 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-ev96100 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -232,11 +232,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -441,7 +436,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-ficmmp linux-2.4.30-mips/arch/mips/defconfig-ficmmp +--- linux-2.4.30/arch/mips/defconfig-ficmmp 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-ficmmp 2005-03-18 13:13:21.000000000 +0100 +@@ -0,0 +1,862 @@ ++# ++# Automatically generated make config: don't edit ++# ++CONFIG_MIPS=y ++CONFIG_MIPS32=y ++# CONFIG_MIPS64 is not set ++ ++# ++# Code maturity level options ++# ++CONFIG_EXPERIMENTAL=y ++ ++# ++# Loadable module support ++# ++CONFIG_MODULES=y ++# CONFIG_MODVERSIONS is not set ++CONFIG_KMOD=y ++ ++# ++# Machine selection ++# ++# CONFIG_ACER_PICA_61 is not set ++# CONFIG_MIPS_BOSPORUS is not set ++# CONFIG_MIPS_MIRAGE is not set ++# CONFIG_MIPS_DB1000 is not set ++# CONFIG_MIPS_DB1100 is not set ++# CONFIG_MIPS_DB1500 is not set ++# CONFIG_MIPS_DB1550 is not set ++# CONFIG_MIPS_PB1000 is not set ++# CONFIG_MIPS_PB1100 is not set ++# CONFIG_MIPS_PB1500 is not set ++# CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set ++# CONFIG_MIPS_XXS1500 is not set ++# CONFIG_MIPS_MTX1 is not set ++# CONFIG_COGENT_CSB250 is not set ++# CONFIG_BAGET_MIPS is not set ++# CONFIG_CASIO_E55 is not set ++# CONFIG_MIPS_COBALT is not set ++# CONFIG_DECSTATION is not set ++# CONFIG_MIPS_EV64120 is not set ++# CONFIG_MIPS_EV96100 is not set ++# CONFIG_MIPS_IVR is not set ++# CONFIG_HP_LASERJET is not set ++# CONFIG_IBM_WORKPAD is not set ++# CONFIG_LASAT is not set ++# CONFIG_MIPS_ITE8172 is not set ++# CONFIG_MIPS_ATLAS is not set ++# CONFIG_MIPS_MAGNUM_4000 is not set ++# CONFIG_MIPS_MALTA is not set ++# CONFIG_MIPS_SEAD is not set ++# CONFIG_MOMENCO_OCELOT is not set ++# CONFIG_MOMENCO_OCELOT_G is not set ++# CONFIG_MOMENCO_OCELOT_C is not set ++# CONFIG_MOMENCO_JAGUAR_ATX is not set ++# CONFIG_PMC_BIG_SUR is not set ++# CONFIG_PMC_STRETCH is not set ++# CONFIG_PMC_YOSEMITE is not set ++# CONFIG_DDB5074 is not set ++# CONFIG_DDB5476 is not set ++# CONFIG_DDB5477 is not set ++# CONFIG_NEC_OSPREY is not set ++# CONFIG_NEC_EAGLE is not set ++# CONFIG_OLIVETTI_M700 is not set ++# CONFIG_NINO is not set ++# CONFIG_SGI_IP22 is not set ++# CONFIG_SGI_IP27 is not set ++# CONFIG_SIBYTE_SB1xxx_SOC is not set ++# CONFIG_SNI_RM200_PCI is not set ++# CONFIG_TANBAC_TB0226 is not set ++# CONFIG_TANBAC_TB0229 is not set ++# CONFIG_TOSHIBA_JMR3927 is not set ++# CONFIG_TOSHIBA_RBTX4927 is not set ++# CONFIG_VICTOR_MPC30X is not set ++# CONFIG_ZAO_CAPCELLA is not set ++# CONFIG_HIGHMEM is not set ++CONFIG_RWSEM_GENERIC_SPINLOCK=y ++# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set ++# CONFIG_MIPS_AU1000 is not set ++ ++# ++# CPU selection ++# ++CONFIG_CPU_MIPS32=y ++# CONFIG_CPU_MIPS64 is not set ++# CONFIG_CPU_R3000 is not set ++# CONFIG_CPU_TX39XX is not set ++# CONFIG_CPU_VR41XX is not set ++# CONFIG_CPU_R4300 is not set ++# CONFIG_CPU_R4X00 is not set ++# CONFIG_CPU_TX49XX is not set ++# CONFIG_CPU_R5000 is not set ++# CONFIG_CPU_R5432 is not set ++# CONFIG_CPU_R6000 is not set ++# CONFIG_CPU_NEVADA is not set ++# CONFIG_CPU_R8000 is not set ++# CONFIG_CPU_R10000 is not set ++# CONFIG_CPU_RM7000 is not set ++# CONFIG_CPU_RM9000 is not set ++# CONFIG_CPU_SB1 is not set ++CONFIG_PAGE_SIZE_4KB=y ++# CONFIG_PAGE_SIZE_16KB is not set ++# CONFIG_PAGE_SIZE_64KB is not set ++CONFIG_CPU_HAS_PREFETCH=y ++# CONFIG_VTAG_ICACHE is not set ++CONFIG_64BIT_PHYS_ADDR=y ++# CONFIG_CPU_ADVANCED is not set ++CONFIG_CPU_HAS_LLSC=y ++# CONFIG_CPU_HAS_LLDSCD is not set ++# CONFIG_CPU_HAS_WB is not set ++CONFIG_CPU_HAS_SYNC=y ++ ++# ++# General setup ++# ++CONFIG_CPU_LITTLE_ENDIAN=y ++# CONFIG_BUILD_ELF64 is not set ++CONFIG_NET=y ++# CONFIG_PCI is not set ++# CONFIG_PCI_NEW is not set ++CONFIG_PCI_AUTO=y ++# CONFIG_ISA is not set ++# CONFIG_TC is not set ++# CONFIG_MCA is not set ++# CONFIG_SBUS is not set ++# CONFIG_HOTPLUG is not set ++# CONFIG_PCMCIA is not set ++# CONFIG_HOTPLUG_PCI is not set ++CONFIG_SYSVIPC=y ++# CONFIG_BSD_PROCESS_ACCT is not set ++CONFIG_SYSCTL=y ++CONFIG_KCORE_ELF=y ++# CONFIG_KCORE_AOUT is not set ++# CONFIG_BINFMT_AOUT is not set ++CONFIG_BINFMT_ELF=y ++# CONFIG_MIPS32_COMPAT is not set ++# CONFIG_MIPS32_O32 is not set ++# CONFIG_MIPS32_N32 is not set ++# CONFIG_BINFMT_ELF32 is not set ++# CONFIG_BINFMT_MISC is not set ++# CONFIG_OOM_KILLER is not set ++CONFIG_CMDLINE_BOOL=y ++CONFIG_CMDLINE="ide3=dma mem=96M root=/dev/hda2 rootflags=data=journal" ++ ++# ++# Memory Technology Devices (MTD) ++# ++# CONFIG_MTD is not set ++ ++# ++# Parallel port support ++# ++# CONFIG_PARPORT is not set ++ ++# ++# Plug and Play configuration ++# ++# CONFIG_PNP is not set ++# CONFIG_ISAPNP is not set ++ ++# ++# Block devices ++# ++# CONFIG_BLK_DEV_FD is not set ++# CONFIG_BLK_DEV_XD is not set ++# CONFIG_PARIDE is not set ++# CONFIG_BLK_CPQ_DA is not set ++# CONFIG_BLK_CPQ_CISS_DA is not set ++# CONFIG_CISS_SCSI_TAPE is not set ++# CONFIG_CISS_MONITOR_THREAD is not set ++# CONFIG_BLK_DEV_DAC960 is not set ++# CONFIG_BLK_DEV_UMEM is not set ++# CONFIG_BLK_DEV_SX8 is not set ++CONFIG_BLK_DEV_LOOP=y ++# CONFIG_BLK_DEV_NBD is not set ++# CONFIG_BLK_DEV_RAM is not set ++# CONFIG_BLK_DEV_INITRD is not set ++# CONFIG_BLK_STATS is not set ++ ++# ++# Multi-device support (RAID and LVM) ++# ++# CONFIG_MD is not set ++# CONFIG_BLK_DEV_MD is not set ++# CONFIG_MD_LINEAR is not set ++# CONFIG_MD_RAID0 is not set ++# CONFIG_MD_RAID1 is not set ++# CONFIG_MD_RAID5 is not set ++# CONFIG_MD_MULTIPATH is not set ++# CONFIG_BLK_DEV_LVM is not set ++ ++# ++# Networking options ++# ++CONFIG_PACKET=y ++# CONFIG_PACKET_MMAP is not set ++# CONFIG_NETLINK_DEV is not set ++CONFIG_NETFILTER=y ++# CONFIG_NETFILTER_DEBUG is not set ++CONFIG_FILTER=y ++CONFIG_UNIX=y ++CONFIG_INET=y ++CONFIG_IP_MULTICAST=y ++# CONFIG_IP_ADVANCED_ROUTER is not set ++# CONFIG_IP_PNP is not set ++# CONFIG_NET_IPIP is not set ++# CONFIG_NET_IPGRE is not set ++# CONFIG_IP_MROUTE is not set ++# CONFIG_ARPD is not set ++# CONFIG_INET_ECN is not set ++# CONFIG_SYN_COOKIES is not set ++ ++# ++# IP: Netfilter Configuration ++# ++# CONFIG_IP_NF_CONNTRACK is not set ++# CONFIG_IP_NF_QUEUE is not set ++# CONFIG_IP_NF_IPTABLES is not set ++# CONFIG_IP_NF_ARPTABLES is not set ++# CONFIG_IP_NF_COMPAT_IPCHAINS is not set ++# CONFIG_IP_NF_COMPAT_IPFWADM is not set ++ ++# ++# IP: Virtual Server Configuration ++# ++# CONFIG_IP_VS is not set ++# CONFIG_IPV6 is not set ++# CONFIG_KHTTPD is not set ++ ++# ++# SCTP Configuration (EXPERIMENTAL) ++# ++# CONFIG_IP_SCTP is not set ++# CONFIG_ATM is not set ++# CONFIG_VLAN_8021Q is not set ++ ++# ++# ++# ++# CONFIG_IPX is not set ++# CONFIG_ATALK is not set ++# CONFIG_DECNET is not set ++# CONFIG_BRIDGE is not set ++# CONFIG_X25 is not set ++# CONFIG_LAPB is not set ++# CONFIG_LLC is not set ++# CONFIG_NET_DIVERT is not set ++# CONFIG_ECONET is not set ++# CONFIG_WAN_ROUTER is not set ++# CONFIG_NET_FASTROUTE is not set ++# CONFIG_NET_HW_FLOWCONTROL is not set ++ ++# ++# QoS and/or fair queueing ++# ++# CONFIG_NET_SCHED is not set ++ ++# ++# Network testing ++# ++# CONFIG_NET_PKTGEN is not set ++ ++# ++# Telephony Support ++# ++# CONFIG_PHONE is not set ++# CONFIG_PHONE_IXJ is not set ++# CONFIG_PHONE_IXJ_PCMCIA is not set ++ ++# ++# ATA/IDE/MFM/RLL support ++# ++CONFIG_IDE=y ++ ++# ++# IDE, ATA and ATAPI Block devices ++# ++CONFIG_BLK_DEV_IDE=y ++ ++# ++# Please see Documentation/ide.txt for help/info on IDE drives ++# ++CONFIG_BLK_DEV_HD_IDE=y ++CONFIG_BLK_DEV_HD=y ++# CONFIG_BLK_DEV_IDE_SATA is not set ++CONFIG_BLK_DEV_IDEDISK=y ++CONFIG_IDEDISK_MULTI_MODE=y ++CONFIG_IDEDISK_STROKE=y ++# CONFIG_BLK_DEV_IDECS is not set ++# CONFIG_BLK_DEV_DELKIN is not set ++# CONFIG_BLK_DEV_IDECD is not set ++# CONFIG_BLK_DEV_IDETAPE is not set ++# CONFIG_BLK_DEV_IDEFLOPPY is not set ++# CONFIG_BLK_DEV_IDESCSI is not set ++# CONFIG_IDE_TASK_IOCTL is not set ++ ++# ++# IDE chipset support/bugfixes ++# ++# CONFIG_BLK_DEV_CMD640 is not set ++# CONFIG_BLK_DEV_CMD640_ENHANCED is not set ++# CONFIG_BLK_DEV_ISAPNP is not set ++# CONFIG_IDE_CHIPSETS is not set ++# CONFIG_IDEDMA_AUTO is not set ++# CONFIG_DMA_NONPCI is not set ++# CONFIG_BLK_DEV_ATARAID is not set ++# CONFIG_BLK_DEV_ATARAID_PDC is not set ++# CONFIG_BLK_DEV_ATARAID_HPT is not set ++# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set ++# CONFIG_BLK_DEV_ATARAID_SII is not set ++ ++# ++# SCSI support ++# ++CONFIG_SCSI=y ++ ++# ++# SCSI support type (disk, tape, CD-ROM) ++# ++CONFIG_BLK_DEV_SD=y ++CONFIG_SD_EXTRA_DEVS=40 ++CONFIG_CHR_DEV_ST=y ++# CONFIG_CHR_DEV_OSST is not set ++CONFIG_BLK_DEV_SR=y ++# CONFIG_BLK_DEV_SR_VENDOR is not set ++CONFIG_SR_EXTRA_DEVS=2 ++# CONFIG_CHR_DEV_SG is not set ++ ++# ++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs ++# ++# CONFIG_SCSI_DEBUG_QUEUES is not set ++# CONFIG_SCSI_MULTI_LUN is not set ++CONFIG_SCSI_CONSTANTS=y ++# CONFIG_SCSI_LOGGING is not set ++ ++# ++# SCSI low-level drivers ++# ++# CONFIG_SCSI_7000FASST is not set ++# CONFIG_SCSI_ACARD is not set ++# CONFIG_SCSI_AHA152X is not set ++# CONFIG_SCSI_AHA1542 is not set ++# CONFIG_SCSI_AHA1740 is not set ++# CONFIG_SCSI_AACRAID is not set ++# CONFIG_SCSI_AIC7XXX is not set ++# CONFIG_SCSI_AIC79XX is not set ++# CONFIG_SCSI_AIC7XXX_OLD is not set ++# CONFIG_SCSI_DPT_I2O is not set ++# CONFIG_SCSI_ADVANSYS is not set ++# CONFIG_SCSI_IN2000 is not set ++# CONFIG_SCSI_AM53C974 is not set ++# CONFIG_SCSI_MEGARAID is not set ++# CONFIG_SCSI_MEGARAID2 is not set ++# CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set ++# CONFIG_SCSI_SATA_SVW is not set ++# CONFIG_SCSI_ATA_PIIX is not set ++# CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set ++# CONFIG_SCSI_SATA_PROMISE is not set ++# CONFIG_SCSI_SATA_SX4 is not set ++# CONFIG_SCSI_SATA_SIL is not set ++# CONFIG_SCSI_SATA_SIS is not set ++# CONFIG_SCSI_SATA_ULI is not set ++# CONFIG_SCSI_SATA_VIA is not set ++# CONFIG_SCSI_SATA_VITESSE is not set ++# CONFIG_SCSI_BUSLOGIC is not set ++# CONFIG_SCSI_DMX3191D is not set ++# CONFIG_SCSI_DTC3280 is not set ++# CONFIG_SCSI_EATA is not set ++# CONFIG_SCSI_EATA_DMA is not set ++# CONFIG_SCSI_EATA_PIO is not set ++# CONFIG_SCSI_FUTURE_DOMAIN is not set ++# CONFIG_SCSI_GDTH is not set ++# CONFIG_SCSI_GENERIC_NCR5380 is not set ++# CONFIG_SCSI_INITIO is not set ++# CONFIG_SCSI_INIA100 is not set ++# CONFIG_SCSI_NCR53C406A is not set ++# CONFIG_SCSI_NCR53C7xx is not set ++# CONFIG_SCSI_PAS16 is not set ++# CONFIG_SCSI_PCI2000 is not set ++# CONFIG_SCSI_PCI2220I is not set ++# CONFIG_SCSI_PSI240I is not set ++# CONFIG_SCSI_QLOGIC_FAS is not set ++# CONFIG_SCSI_SIM710 is not set ++# CONFIG_SCSI_SYM53C416 is not set ++# CONFIG_SCSI_T128 is not set ++# CONFIG_SCSI_U14_34F is not set ++# CONFIG_SCSI_NSP32 is not set ++# CONFIG_SCSI_DEBUG is not set ++ ++# ++# Fusion MPT device support ++# ++# CONFIG_FUSION is not set ++# CONFIG_FUSION_BOOT is not set ++# CONFIG_FUSION_ISENSE is not set ++# CONFIG_FUSION_CTL is not set ++# CONFIG_FUSION_LAN is not set ++ ++# ++# Network device support ++# ++CONFIG_NETDEVICES=y ++ ++# ++# ARCnet devices ++# ++# CONFIG_ARCNET is not set ++# CONFIG_DUMMY is not set ++# CONFIG_BONDING is not set ++# CONFIG_EQUALIZER is not set ++# CONFIG_TUN is not set ++# CONFIG_ETHERTAP is not set ++ ++# ++# Ethernet (10 or 100Mbit) ++# ++CONFIG_NET_ETHERNET=y ++# CONFIG_SUNLANCE is not set ++# CONFIG_SUNBMAC is not set ++# CONFIG_SUNQE is not set ++# CONFIG_SUNGEM is not set ++# CONFIG_NET_VENDOR_3COM is not set ++# CONFIG_LANCE is not set ++# CONFIG_NET_VENDOR_SMC is not set ++# CONFIG_NET_VENDOR_RACAL is not set ++# CONFIG_NET_ISA is not set ++# CONFIG_NET_PCI is not set ++# CONFIG_NET_POCKET is not set ++ ++# ++# Ethernet (1000 Mbit) ++# ++# CONFIG_ACENIC is not set ++# CONFIG_DL2K is not set ++# CONFIG_E1000 is not set ++# CONFIG_MYRI_SBUS is not set ++# CONFIG_NS83820 is not set ++# CONFIG_HAMACHI is not set ++# CONFIG_YELLOWFIN is not set ++# CONFIG_R8169 is not set ++# CONFIG_SK98LIN is not set ++# CONFIG_TIGON3 is not set ++# CONFIG_FDDI is not set ++# CONFIG_HIPPI is not set ++# CONFIG_PLIP is not set ++# CONFIG_PPP is not set ++# CONFIG_SLIP is not set ++ ++# ++# Wireless LAN (non-hamradio) ++# ++# CONFIG_NET_RADIO is not set ++ ++# ++# Token Ring devices ++# ++# CONFIG_TR is not set ++# CONFIG_NET_FC is not set ++# CONFIG_RCPCI is not set ++# CONFIG_SHAPER is not set ++ ++# ++# Wan interfaces ++# ++# CONFIG_WAN is not set ++ ++# ++# Amateur Radio support ++# ++# CONFIG_HAMRADIO is not set ++ ++# ++# IrDA (infrared) support ++# ++# CONFIG_IRDA is not set ++ ++# ++# ISDN subsystem ++# ++# CONFIG_ISDN is not set ++ ++# ++# Input core support ++# ++CONFIG_INPUT=y ++CONFIG_INPUT_KEYBDEV=y ++CONFIG_INPUT_MOUSEDEV=y ++CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 ++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 ++# CONFIG_INPUT_JOYDEV is not set ++CONFIG_INPUT_EVDEV=y ++# CONFIG_INPUT_UINPUT is not set ++ ++# ++# Character devices ++# ++CONFIG_VT=y ++CONFIG_VT_CONSOLE=y ++# CONFIG_SERIAL is not set ++# CONFIG_SERIAL_EXTENDED is not set ++CONFIG_SERIAL_NONSTANDARD=y ++# CONFIG_COMPUTONE is not set ++# CONFIG_ROCKETPORT is not set ++# CONFIG_CYCLADES is not set ++# CONFIG_DIGIEPCA is not set ++# CONFIG_DIGI is not set ++# CONFIG_ESPSERIAL is not set ++# CONFIG_MOXA_INTELLIO is not set ++# CONFIG_MOXA_SMARTIO is not set ++# CONFIG_ISI is not set ++# CONFIG_SYNCLINK is not set ++# CONFIG_SYNCLINKMP is not set ++# CONFIG_N_HDLC is not set ++# CONFIG_RISCOM8 is not set ++# CONFIG_SPECIALIX is not set ++# CONFIG_SX is not set ++# CONFIG_RIO is not set ++# CONFIG_STALDRV is not set ++# CONFIG_SERIAL_TX3912 is not set ++# CONFIG_SERIAL_TX3912_CONSOLE is not set ++# CONFIG_SERIAL_TXX9 is not set ++# CONFIG_SERIAL_TXX9_CONSOLE is not set ++# CONFIG_TXX927_SERIAL is not set ++CONFIG_UNIX98_PTYS=y ++CONFIG_UNIX98_PTY_COUNT=256 ++ ++# ++# I2C support ++# ++CONFIG_I2C=y ++# CONFIG_I2C_ALGOBIT is not set ++# CONFIG_SCx200_ACB is not set ++# CONFIG_I2C_ALGOPCF is not set ++# CONFIG_I2C_CHARDEV is not set ++# CONFIG_I2C_PROC is not set ++ ++# ++# Mice ++# ++# CONFIG_BUSMOUSE is not set ++# CONFIG_MOUSE is not set ++ ++# ++# Joysticks ++# ++# CONFIG_INPUT_GAMEPORT is not set ++# CONFIG_INPUT_NS558 is not set ++# CONFIG_INPUT_LIGHTNING is not set ++# CONFIG_INPUT_PCIGAME is not set ++# CONFIG_INPUT_CS461X is not set ++# CONFIG_INPUT_EMU10K1 is not set ++# CONFIG_INPUT_SERIO is not set ++# CONFIG_INPUT_SERPORT is not set ++ ++# ++# Joysticks ++# ++# CONFIG_INPUT_ANALOG is not set ++# CONFIG_INPUT_A3D is not set ++# CONFIG_INPUT_ADI is not set ++# CONFIG_INPUT_COBRA is not set ++# CONFIG_INPUT_GF2K is not set ++# CONFIG_INPUT_GRIP is not set ++# CONFIG_INPUT_INTERACT is not set ++# CONFIG_INPUT_TMDC is not set ++# CONFIG_INPUT_SIDEWINDER is not set ++# CONFIG_INPUT_IFORCE_USB is not set ++# CONFIG_INPUT_IFORCE_232 is not set ++# CONFIG_INPUT_WARRIOR is not set ++# CONFIG_INPUT_MAGELLAN is not set ++# CONFIG_INPUT_SPACEORB is not set ++# CONFIG_INPUT_SPACEBALL is not set ++# CONFIG_INPUT_STINGER is not set ++# CONFIG_INPUT_DB9 is not set ++# CONFIG_INPUT_GAMECON is not set ++# CONFIG_INPUT_TURBOGRAFX is not set ++# CONFIG_QIC02_TAPE is not set ++# CONFIG_IPMI_HANDLER is not set ++# CONFIG_IPMI_PANIC_EVENT is not set ++# CONFIG_IPMI_DEVICE_INTERFACE is not set ++# CONFIG_IPMI_KCS is not set ++# CONFIG_IPMI_WATCHDOG is not set ++ ++# ++# Watchdog Cards ++# ++# CONFIG_WATCHDOG is not set ++# CONFIG_SCx200 is not set ++# CONFIG_SCx200_GPIO is not set ++# CONFIG_AMD_PM768 is not set ++# CONFIG_NVRAM is not set ++# CONFIG_RTC is not set ++# CONFIG_DTLK is not set ++# CONFIG_R3964 is not set ++# CONFIG_APPLICOM is not set ++ ++# ++# Ftape, the floppy tape device driver ++# ++# CONFIG_FTAPE is not set ++# CONFIG_AGP is not set ++ ++# ++# Direct Rendering Manager (XFree86 DRI support) ++# ++# CONFIG_DRM is not set ++ ++# ++# File systems ++# ++# CONFIG_QUOTA is not set ++# CONFIG_QFMT_V2 is not set ++CONFIG_AUTOFS_FS=y ++# CONFIG_AUTOFS4_FS is not set ++# CONFIG_REISERFS_FS is not set ++# CONFIG_REISERFS_CHECK is not set ++# CONFIG_REISERFS_PROC_INFO is not set ++# CONFIG_ADFS_FS is not set ++# CONFIG_ADFS_FS_RW is not set ++# CONFIG_AFFS_FS is not set ++# CONFIG_HFS_FS is not set ++# CONFIG_HFSPLUS_FS is not set ++# CONFIG_BEFS_FS is not set ++# CONFIG_BEFS_DEBUG is not set ++# CONFIG_BFS_FS is not set ++CONFIG_EXT3_FS=y ++CONFIG_JBD=y ++# CONFIG_JBD_DEBUG is not set ++CONFIG_FAT_FS=y ++CONFIG_MSDOS_FS=y ++# CONFIG_UMSDOS_FS is not set ++CONFIG_VFAT_FS=y ++# CONFIG_EFS_FS is not set ++# CONFIG_JFFS_FS is not set ++# CONFIG_JFFS2_FS is not set ++# CONFIG_CRAMFS is not set ++# CONFIG_TMPFS is not set ++CONFIG_RAMFS=y ++# CONFIG_ISO9660_FS is not set ++# CONFIG_JOLIET is not set ++# CONFIG_ZISOFS is not set ++# CONFIG_JFS_FS is not set ++# CONFIG_JFS_DEBUG is not set ++# CONFIG_JFS_STATISTICS is not set ++# CONFIG_MINIX_FS is not set ++# CONFIG_VXFS_FS is not set ++# CONFIG_NTFS_FS is not set ++# CONFIG_NTFS_RW is not set ++# CONFIG_HPFS_FS is not set ++CONFIG_PROC_FS=y ++# CONFIG_DEVFS_FS is not set ++# CONFIG_DEVFS_MOUNT is not set ++# CONFIG_DEVFS_DEBUG is not set ++CONFIG_DEVPTS_FS=y ++# CONFIG_QNX4FS_FS is not set ++# CONFIG_QNX4FS_RW is not set ++# CONFIG_ROMFS_FS is not set ++CONFIG_EXT2_FS=y ++# CONFIG_SYSV_FS is not set ++# CONFIG_UDF_FS is not set ++# CONFIG_UDF_RW is not set ++# CONFIG_UFS_FS is not set ++# CONFIG_UFS_FS_WRITE is not set ++# CONFIG_XFS_FS is not set ++# CONFIG_XFS_QUOTA is not set ++# CONFIG_XFS_RT is not set ++# CONFIG_XFS_TRACE is not set ++# CONFIG_XFS_DEBUG is not set ++ ++# ++# Network File Systems ++# ++# CONFIG_CODA_FS is not set ++# CONFIG_INTERMEZZO_FS is not set ++# CONFIG_NFS_FS is not set ++# CONFIG_NFS_V3 is not set ++# CONFIG_NFS_DIRECTIO is not set ++# CONFIG_ROOT_NFS is not set ++# CONFIG_NFSD is not set ++# CONFIG_NFSD_V3 is not set ++# CONFIG_NFSD_TCP is not set ++# CONFIG_SUNRPC is not set ++# CONFIG_LOCKD is not set ++# CONFIG_SMB_FS is not set ++# CONFIG_NCP_FS is not set ++# CONFIG_NCPFS_PACKET_SIGNING is not set ++# CONFIG_NCPFS_IOCTL_LOCKING is not set ++# CONFIG_NCPFS_STRONG is not set ++# CONFIG_NCPFS_NFS_NS is not set ++# CONFIG_NCPFS_OS2_NS is not set ++# CONFIG_NCPFS_SMALLDOS is not set ++# CONFIG_NCPFS_NLS is not set ++# CONFIG_NCPFS_EXTRAS is not set ++# CONFIG_ZISOFS_FS is not set ++ ++# ++# Partition Types ++# ++# CONFIG_PARTITION_ADVANCED is not set ++CONFIG_MSDOS_PARTITION=y ++# CONFIG_SMB_NLS is not set ++CONFIG_NLS=y ++ ++# ++# Native Language Support ++# ++CONFIG_NLS_DEFAULT="iso8859-1" ++# CONFIG_NLS_CODEPAGE_437 is not set ++# CONFIG_NLS_CODEPAGE_737 is not set ++# CONFIG_NLS_CODEPAGE_775 is not set ++# CONFIG_NLS_CODEPAGE_850 is not set ++# CONFIG_NLS_CODEPAGE_852 is not set ++# CONFIG_NLS_CODEPAGE_855 is not set ++# CONFIG_NLS_CODEPAGE_857 is not set ++# CONFIG_NLS_CODEPAGE_860 is not set ++# CONFIG_NLS_CODEPAGE_861 is not set ++# CONFIG_NLS_CODEPAGE_862 is not set ++# CONFIG_NLS_CODEPAGE_863 is not set ++# CONFIG_NLS_CODEPAGE_864 is not set ++# CONFIG_NLS_CODEPAGE_865 is not set ++# CONFIG_NLS_CODEPAGE_866 is not set ++# CONFIG_NLS_CODEPAGE_869 is not set ++# CONFIG_NLS_CODEPAGE_936 is not set ++# CONFIG_NLS_CODEPAGE_950 is not set ++# CONFIG_NLS_CODEPAGE_932 is not set ++# CONFIG_NLS_CODEPAGE_949 is not set ++# CONFIG_NLS_CODEPAGE_874 is not set ++# CONFIG_NLS_ISO8859_8 is not set ++# CONFIG_NLS_CODEPAGE_1250 is not set ++# CONFIG_NLS_CODEPAGE_1251 is not set ++# CONFIG_NLS_ISO8859_1 is not set ++# CONFIG_NLS_ISO8859_2 is not set ++# CONFIG_NLS_ISO8859_3 is not set ++# CONFIG_NLS_ISO8859_4 is not set ++# CONFIG_NLS_ISO8859_5 is not set ++# CONFIG_NLS_ISO8859_6 is not set ++# CONFIG_NLS_ISO8859_7 is not set ++# CONFIG_NLS_ISO8859_9 is not set ++# CONFIG_NLS_ISO8859_13 is not set ++# CONFIG_NLS_ISO8859_14 is not set ++# CONFIG_NLS_ISO8859_15 is not set ++# CONFIG_NLS_KOI8_R is not set ++# CONFIG_NLS_KOI8_U is not set ++# CONFIG_NLS_UTF8 is not set ++ ++# ++# Multimedia devices ++# ++# CONFIG_VIDEO_DEV is not set ++ ++# ++# Console drivers ++# ++# CONFIG_VGA_CONSOLE is not set ++# CONFIG_MDA_CONSOLE is not set ++ ++# ++# Frame-buffer support ++# ++CONFIG_FB=y ++CONFIG_DUMMY_CONSOLE=y ++# CONFIG_FB_CYBER2000 is not set ++# CONFIG_FB_VIRTUAL is not set ++CONFIG_FBCON_ADVANCED=y ++# CONFIG_FBCON_MFB is not set ++# CONFIG_FBCON_CFB2 is not set ++# CONFIG_FBCON_CFB4 is not set ++# CONFIG_FBCON_CFB8 is not set ++CONFIG_FBCON_CFB16=y ++# CONFIG_FBCON_CFB24 is not set ++# CONFIG_FBCON_CFB32 is not set ++# CONFIG_FBCON_AFB is not set ++# CONFIG_FBCON_ILBM is not set ++# CONFIG_FBCON_IPLAN2P2 is not set ++# CONFIG_FBCON_IPLAN2P4 is not set ++# CONFIG_FBCON_IPLAN2P8 is not set ++# CONFIG_FBCON_MAC is not set ++# CONFIG_FBCON_VGA_PLANES is not set ++# CONFIG_FBCON_VGA is not set ++# CONFIG_FBCON_HGA is not set ++# CONFIG_FBCON_FONTWIDTH8_ONLY is not set ++CONFIG_FBCON_FONTS=y ++CONFIG_FONT_8x8=y ++CONFIG_FONT_8x16=y ++# CONFIG_FONT_SUN8x16 is not set ++# CONFIG_FONT_SUN12x22 is not set ++# CONFIG_FONT_6x11 is not set ++# CONFIG_FONT_PEARL_8x8 is not set ++# CONFIG_FONT_ACORN_8x8 is not set ++ ++# ++# Sound ++# ++CONFIG_SOUND=y ++# CONFIG_SOUND_ALI5455 is not set ++# CONFIG_SOUND_BT878 is not set ++# CONFIG_SOUND_CMPCI is not set ++# CONFIG_SOUND_EMU10K1 is not set ++# CONFIG_MIDI_EMU10K1 is not set ++# CONFIG_SOUND_FUSION is not set ++# CONFIG_SOUND_CS4281 is not set ++# CONFIG_SOUND_ES1370 is not set ++# CONFIG_SOUND_ES1371 is not set ++# CONFIG_SOUND_ESSSOLO1 is not set ++# CONFIG_SOUND_MAESTRO is not set ++# CONFIG_SOUND_MAESTRO3 is not set ++# CONFIG_SOUND_FORTE is not set ++# CONFIG_SOUND_ICH is not set ++# CONFIG_SOUND_RME96XX is not set ++# CONFIG_SOUND_SONICVIBES is not set ++# CONFIG_SOUND_TRIDENT is not set ++# CONFIG_SOUND_MSNDCLAS is not set ++# CONFIG_SOUND_MSNDPIN is not set ++# CONFIG_SOUND_VIA82CXXX is not set ++# CONFIG_MIDI_VIA82CXXX is not set ++# CONFIG_SOUND_OSS is not set ++# CONFIG_SOUND_TVMIXER is not set ++# CONFIG_SOUND_AD1980 is not set ++# CONFIG_SOUND_WM97XX is not set ++ ++# ++# USB support ++# ++# CONFIG_USB is not set ++ ++# ++# Support for USB gadgets ++# ++# CONFIG_USB_GADGET is not set ++ ++# ++# Bluetooth support ++# ++# CONFIG_BLUEZ is not set ++ ++# ++# Kernel hacking ++# ++CONFIG_CROSSCOMPILE=y ++# CONFIG_RUNTIME_DEBUG is not set ++# CONFIG_KGDB is not set ++# CONFIG_GDB_CONSOLE is not set ++# CONFIG_DEBUG_INFO is not set ++# CONFIG_MAGIC_SYSRQ is not set ++# CONFIG_MIPS_UNCACHED is not set ++CONFIG_LOG_BUF_SHIFT=0 ++ ++# ++# Cryptographic options ++# ++# CONFIG_CRYPTO is not set ++ ++# ++# Library routines ++# ++# CONFIG_CRC32 is not set ++CONFIG_ZLIB_INFLATE=m ++CONFIG_ZLIB_DEFLATE=m +diff -Nur linux-2.4.30/arch/mips/defconfig-hp-lj linux-2.4.30-mips/arch/mips/defconfig-hp-lj +--- linux-2.4.30/arch/mips/defconfig-hp-lj 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-hp-lj 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -184,8 +184,8 @@ + # Mapping drivers for chip access + # + CONFIG_MTD_PHYSMAP=y +-CONFIG_MTD_PHYSMAP_START=10040000 +-CONFIG_MTD_PHYSMAP_LEN=00fc0000 ++CONFIG_MTD_PHYSMAP_START=0x10040000 ++CONFIG_MTD_PHYSMAP_LEN=0x00fc0000 + CONFIG_MTD_PHYSMAP_BUSWIDTH=4 + # CONFIG_MTD_PB1000 is not set + # CONFIG_MTD_PB1500 is not set +@@ -193,9 +193,7 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -214,7 +212,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -304,11 +301,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -604,7 +596,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_UNIX98_PTYS is not set + + # +diff -Nur linux-2.4.30/arch/mips/defconfig-hydrogen3 linux-2.4.30-mips/arch/mips/defconfig-hydrogen3 +--- linux-2.4.30/arch/mips/defconfig-hydrogen3 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-hydrogen3 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-CONFIG_MIPS_HYDROGEN3=y + # CONFIG_MIPS_PB1550 is not set ++CONFIG_MIPS_HYDROGEN3=y + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -214,9 +214,7 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-CONFIG_MTD_HYDROGEN3=y + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -235,7 +233,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -340,11 +337,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -590,7 +582,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-CONFIG_MIPS_HYDROGEN3_BUTTONS=y + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +@@ -838,6 +829,7 @@ + # CONFIG_FB_PM2 is not set + # CONFIG_FB_PM3 is not set + # CONFIG_FB_CYBER2000 is not set ++CONFIG_FB_AU1100=y + # CONFIG_FB_MATROX is not set + # CONFIG_FB_ATY is not set + # CONFIG_FB_RADEON is not set +@@ -849,7 +841,6 @@ + # CONFIG_FB_VOODOO1 is not set + # CONFIG_FB_TRIDENT is not set + # CONFIG_FB_E1356 is not set +-CONFIG_FB_AU1100=y + # CONFIG_FB_IT8181 is not set + # CONFIG_FB_VIRTUAL is not set + CONFIG_FBCON_ADVANCED=y +diff -Nur linux-2.4.30/arch/mips/defconfig-ip22 linux-2.4.30-mips/arch/mips/defconfig-ip22 +--- linux-2.4.30/arch/mips/defconfig-ip22 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-ip22 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -235,11 +235,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -319,9 +314,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -465,7 +462,6 @@ + # CONFIG_SERIAL is not set + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-it8172 linux-2.4.30-mips/arch/mips/defconfig-it8172 +--- linux-2.4.30/arch/mips/defconfig-it8172 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-it8172 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -186,8 +186,8 @@ + # Mapping drivers for chip access + # + CONFIG_MTD_PHYSMAP=y +-CONFIG_MTD_PHYSMAP_START=8000000 +-CONFIG_MTD_PHYSMAP_LEN=2000000 ++CONFIG_MTD_PHYSMAP_START=0x8000000 ++CONFIG_MTD_PHYSMAP_LEN=0x2000000 + CONFIG_MTD_PHYSMAP_BUSWIDTH=4 + # CONFIG_MTD_PB1000 is not set + # CONFIG_MTD_PB1500 is not set +@@ -195,9 +195,7 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -216,7 +214,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -304,11 +301,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -592,7 +584,6 @@ + CONFIG_PC_KEYB=y + # CONFIG_IT8172_SCR0 is not set + # CONFIG_IT8172_SCR1 is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-ivr linux-2.4.30-mips/arch/mips/defconfig-ivr +--- linux-2.4.30/arch/mips/defconfig-ivr 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-ivr 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -226,11 +226,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -516,7 +511,6 @@ + CONFIG_QTRONIX_KEYBOARD=y + CONFIG_IT8172_CIR=y + # CONFIG_IT8172_SCR0 is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-jmr3927 linux-2.4.30-mips/arch/mips/defconfig-jmr3927 +--- linux-2.4.30/arch/mips/defconfig-jmr3927 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-jmr3927 2005-03-18 13:13:21.000000000 +0100 +@@ -28,8 +28,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -225,11 +225,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -454,7 +449,6 @@ + # CONFIG_SERIAL_TXX9_CONSOLE is not set + CONFIG_TXX927_SERIAL=y + CONFIG_TXX927_SERIAL_CONSOLE=y +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_UNIX98_PTYS is not set + + # +diff -Nur linux-2.4.30/arch/mips/defconfig-lasat linux-2.4.30-mips/arch/mips/defconfig-lasat +--- linux-2.4.30/arch/mips/defconfig-lasat 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-lasat 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -198,9 +198,7 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -219,7 +217,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -303,11 +300,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -584,7 +576,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-malta linux-2.4.30-mips/arch/mips/defconfig-malta +--- linux-2.4.30/arch/mips/defconfig-malta 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-malta 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -237,11 +237,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -319,9 +314,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -524,7 +521,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-mirage linux-2.4.30-mips/arch/mips/defconfig-mirage +--- linux-2.4.30/arch/mips/defconfig-mirage 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-mirage 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -209,9 +209,7 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + CONFIG_MTD_MIRAGE=y + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -230,7 +228,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -335,11 +332,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -560,7 +552,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-mpc30x linux-2.4.30-mips/arch/mips/defconfig-mpc30x +--- linux-2.4.30/arch/mips/defconfig-mpc30x 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-mpc30x 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -228,11 +228,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -400,7 +395,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_VR41XX_KIU is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 +diff -Nur linux-2.4.30/arch/mips/defconfig-mtx-1 linux-2.4.30-mips/arch/mips/defconfig-mtx-1 +--- linux-2.4.30/arch/mips/defconfig-mtx-1 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-mtx-1 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + CONFIG_MIPS_MTX1=y + # CONFIG_COGENT_CSB250 is not set +@@ -193,9 +193,7 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + CONFIG_MTD_MTX1=y +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -214,7 +212,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -371,11 +368,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + CONFIG_BRIDGE=m + # CONFIG_X25 is not set +@@ -479,9 +471,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -700,7 +694,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-nino linux-2.4.30-mips/arch/mips/defconfig-nino +--- linux-2.4.30/arch/mips/defconfig-nino 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-nino 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -226,11 +226,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -339,7 +334,6 @@ + # CONFIG_SERIAL_TXX9 is not set + # CONFIG_SERIAL_TXX9_CONSOLE is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_UNIX98_PTYS is not set + + # +diff -Nur linux-2.4.30/arch/mips/defconfig-ocelot linux-2.4.30-mips/arch/mips/defconfig-ocelot +--- linux-2.4.30/arch/mips/defconfig-ocelot 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-ocelot 2005-03-18 13:13:21.000000000 +0100 +@@ -28,8 +28,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -194,9 +194,7 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + CONFIG_MTD_OCELOT=y +@@ -215,7 +213,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + CONFIG_MTD_DOC2000=y + # CONFIG_MTD_DOC2001 is not set + CONFIG_MTD_DOCPROBE=y +@@ -307,11 +304,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -513,7 +505,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-osprey linux-2.4.30-mips/arch/mips/defconfig-osprey +--- linux-2.4.30/arch/mips/defconfig-osprey 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-osprey 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -227,11 +227,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -388,7 +383,6 @@ + # CONFIG_SERIAL_MULTIPORT is not set + # CONFIG_HUB6 is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_VR41XX_KIU is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 +diff -Nur linux-2.4.30/arch/mips/defconfig-pb1000 linux-2.4.30-mips/arch/mips/defconfig-pb1000 +--- linux-2.4.30/arch/mips/defconfig-pb1000 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-pb1000 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + CONFIG_MIPS_PB1000=y + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -215,9 +215,7 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -236,7 +234,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -324,11 +321,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -622,7 +614,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +@@ -707,7 +698,7 @@ + # + # CONFIG_PCMCIA_SERIAL_CS is not set + # CONFIG_SYNCLINK_CS is not set +-CONFIG_AU1X00_GPIO=m ++CONFIG_AU1X00_GPIO=y + # CONFIG_TS_AU1X00_ADS7846 is not set + + # +diff -Nur linux-2.4.30/arch/mips/defconfig-pb1100 linux-2.4.30-mips/arch/mips/defconfig-pb1100 +--- linux-2.4.30/arch/mips/defconfig-pb1100 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-pb1100 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + CONFIG_MIPS_PB1100=y + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -198,9 +198,7 @@ + # CONFIG_MTD_MTX1 is not set + CONFIG_MTD_PB1500_BOOT=y + CONFIG_MTD_PB1500_USER=y +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -219,7 +217,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -324,11 +321,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -613,7 +605,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +@@ -859,6 +850,7 @@ + # CONFIG_FB_PM2 is not set + # CONFIG_FB_PM3 is not set + # CONFIG_FB_CYBER2000 is not set ++CONFIG_FB_AU1100=y + # CONFIG_FB_MATROX is not set + # CONFIG_FB_ATY is not set + # CONFIG_FB_RADEON is not set +@@ -870,7 +862,6 @@ + # CONFIG_FB_VOODOO1 is not set + # CONFIG_FB_TRIDENT is not set + # CONFIG_FB_E1356 is not set +-CONFIG_FB_AU1100=y + # CONFIG_FB_IT8181 is not set + # CONFIG_FB_VIRTUAL is not set + CONFIG_FBCON_ADVANCED=y +diff -Nur linux-2.4.30/arch/mips/defconfig-pb1200 linux-2.4.30-mips/arch/mips/defconfig-pb1200 +--- linux-2.4.30/arch/mips/defconfig-pb1200 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-pb1200 2005-03-18 13:13:21.000000000 +0100 +@@ -0,0 +1,1060 @@ ++# ++# Automatically generated make config: don't edit ++# ++CONFIG_MIPS=y ++CONFIG_MIPS32=y ++# CONFIG_MIPS64 is not set ++ ++# ++# Code maturity level options ++# ++CONFIG_EXPERIMENTAL=y ++ ++# ++# Loadable module support ++# ++CONFIG_MODULES=y ++# CONFIG_MODVERSIONS is not set ++CONFIG_KMOD=y ++ ++# ++# Machine selection ++# ++# CONFIG_ACER_PICA_61 is not set ++# CONFIG_MIPS_BOSPORUS is not set ++# CONFIG_MIPS_MIRAGE is not set ++# CONFIG_MIPS_DB1000 is not set ++# CONFIG_MIPS_DB1100 is not set ++# CONFIG_MIPS_DB1500 is not set ++# CONFIG_MIPS_DB1550 is not set ++# CONFIG_MIPS_PB1000 is not set ++# CONFIG_MIPS_PB1100 is not set ++# CONFIG_MIPS_PB1500 is not set ++# CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set ++# CONFIG_MIPS_XXS1500 is not set ++# CONFIG_MIPS_MTX1 is not set ++# CONFIG_COGENT_CSB250 is not set ++# CONFIG_BAGET_MIPS is not set ++# CONFIG_CASIO_E55 is not set ++# CONFIG_MIPS_COBALT is not set ++# CONFIG_DECSTATION is not set ++# CONFIG_MIPS_EV64120 is not set ++# CONFIG_MIPS_EV96100 is not set ++# CONFIG_MIPS_IVR is not set ++# CONFIG_HP_LASERJET is not set ++# CONFIG_IBM_WORKPAD is not set ++# CONFIG_LASAT is not set ++# CONFIG_MIPS_ITE8172 is not set ++# CONFIG_MIPS_ATLAS is not set ++# CONFIG_MIPS_MAGNUM_4000 is not set ++# CONFIG_MIPS_MALTA is not set ++# CONFIG_MIPS_SEAD is not set ++# CONFIG_MOMENCO_OCELOT is not set ++# CONFIG_MOMENCO_OCELOT_G is not set ++# CONFIG_MOMENCO_OCELOT_C is not set ++# CONFIG_MOMENCO_JAGUAR_ATX is not set ++# CONFIG_PMC_BIG_SUR is not set ++# CONFIG_PMC_STRETCH is not set ++# CONFIG_PMC_YOSEMITE is not set ++# CONFIG_DDB5074 is not set ++# CONFIG_DDB5476 is not set ++# CONFIG_DDB5477 is not set ++# CONFIG_NEC_OSPREY is not set ++# CONFIG_NEC_EAGLE is not set ++# CONFIG_OLIVETTI_M700 is not set ++# CONFIG_NINO is not set ++# CONFIG_SGI_IP22 is not set ++# CONFIG_SGI_IP27 is not set ++# CONFIG_SIBYTE_SB1xxx_SOC is not set ++# CONFIG_SNI_RM200_PCI is not set ++# CONFIG_TANBAC_TB0226 is not set ++# CONFIG_TANBAC_TB0229 is not set ++# CONFIG_TOSHIBA_JMR3927 is not set ++# CONFIG_TOSHIBA_RBTX4927 is not set ++# CONFIG_VICTOR_MPC30X is not set ++# CONFIG_ZAO_CAPCELLA is not set ++# CONFIG_HIGHMEM is not set ++CONFIG_RWSEM_GENERIC_SPINLOCK=y ++# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set ++CONFIG_SOC_AU1X00=y ++CONFIG_SOC_AU1200=y ++CONFIG_NONCOHERENT_IO=y ++CONFIG_PC_KEYB=y ++# CONFIG_MIPS_AU1000 is not set ++ ++# ++# CPU selection ++# ++CONFIG_CPU_MIPS32=y ++# CONFIG_CPU_MIPS64 is not set ++# CONFIG_CPU_R3000 is not set ++# CONFIG_CPU_TX39XX is not set ++# CONFIG_CPU_VR41XX is not set ++# CONFIG_CPU_R4300 is not set ++# CONFIG_CPU_R4X00 is not set ++# CONFIG_CPU_TX49XX is not set ++# CONFIG_CPU_R5000 is not set ++# CONFIG_CPU_R5432 is not set ++# CONFIG_CPU_R6000 is not set ++# CONFIG_CPU_NEVADA is not set ++# CONFIG_CPU_R8000 is not set ++# CONFIG_CPU_R10000 is not set ++# CONFIG_CPU_RM7000 is not set ++# CONFIG_CPU_RM9000 is not set ++# CONFIG_CPU_SB1 is not set ++CONFIG_PAGE_SIZE_4KB=y ++# CONFIG_PAGE_SIZE_16KB is not set ++# CONFIG_PAGE_SIZE_64KB is not set ++CONFIG_CPU_HAS_PREFETCH=y ++# CONFIG_VTAG_ICACHE is not set ++CONFIG_64BIT_PHYS_ADDR=y ++# CONFIG_CPU_ADVANCED is not set ++CONFIG_CPU_HAS_LLSC=y ++# CONFIG_CPU_HAS_LLDSCD is not set ++# CONFIG_CPU_HAS_WB is not set ++CONFIG_CPU_HAS_SYNC=y ++ ++# ++# General setup ++# ++CONFIG_CPU_LITTLE_ENDIAN=y ++# CONFIG_BUILD_ELF64 is not set ++CONFIG_NET=y ++CONFIG_PCI=y ++CONFIG_PCI_NEW=y ++CONFIG_PCI_AUTO=y ++# CONFIG_PCI_NAMES is not set ++# CONFIG_ISA is not set ++# CONFIG_TC is not set ++# CONFIG_MCA is not set ++# CONFIG_SBUS is not set ++CONFIG_HOTPLUG=y ++ ++# ++# PCMCIA/CardBus support ++# ++CONFIG_PCMCIA=m ++# CONFIG_CARDBUS is not set ++# CONFIG_TCIC is not set ++# CONFIG_I82092 is not set ++# CONFIG_I82365 is not set ++CONFIG_PCMCIA_AU1X00=m ++ ++# ++# PCI Hotplug Support ++# ++# CONFIG_HOTPLUG_PCI is not set ++# CONFIG_HOTPLUG_PCI_COMPAQ is not set ++# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set ++# CONFIG_HOTPLUG_PCI_SHPC is not set ++# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set ++# CONFIG_HOTPLUG_PCI_PCIE is not set ++# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set ++CONFIG_SYSVIPC=y ++# CONFIG_BSD_PROCESS_ACCT is not set ++CONFIG_SYSCTL=y ++CONFIG_KCORE_ELF=y ++# CONFIG_KCORE_AOUT is not set ++# CONFIG_BINFMT_AOUT is not set ++CONFIG_BINFMT_ELF=y ++# CONFIG_MIPS32_COMPAT is not set ++# CONFIG_MIPS32_O32 is not set ++# CONFIG_MIPS32_N32 is not set ++# CONFIG_BINFMT_ELF32 is not set ++# CONFIG_BINFMT_MISC is not set ++# CONFIG_OOM_KILLER is not set ++CONFIG_CMDLINE_BOOL=y ++CONFIG_CMDLINE="mem=96M" ++# CONFIG_PM is not set ++ ++# ++# Memory Technology Devices (MTD) ++# ++# CONFIG_MTD is not set ++ ++# ++# Parallel port support ++# ++# CONFIG_PARPORT is not set ++ ++# ++# Plug and Play configuration ++# ++# CONFIG_PNP is not set ++# CONFIG_ISAPNP is not set ++ ++# ++# Block devices ++# ++# CONFIG_BLK_DEV_FD is not set ++# CONFIG_BLK_DEV_XD is not set ++# CONFIG_PARIDE is not set ++# CONFIG_BLK_CPQ_DA is not set ++# CONFIG_BLK_CPQ_CISS_DA is not set ++# CONFIG_CISS_SCSI_TAPE is not set ++# CONFIG_CISS_MONITOR_THREAD is not set ++# CONFIG_BLK_DEV_DAC960 is not set ++# CONFIG_BLK_DEV_UMEM is not set ++# CONFIG_BLK_DEV_SX8 is not set ++CONFIG_BLK_DEV_LOOP=y ++# CONFIG_BLK_DEV_NBD is not set ++# CONFIG_BLK_DEV_RAM is not set ++# CONFIG_BLK_DEV_INITRD is not set ++# CONFIG_BLK_STATS is not set ++ ++# ++# Multi-device support (RAID and LVM) ++# ++# CONFIG_MD is not set ++# CONFIG_BLK_DEV_MD is not set ++# CONFIG_MD_LINEAR is not set ++# CONFIG_MD_RAID0 is not set ++# CONFIG_MD_RAID1 is not set ++# CONFIG_MD_RAID5 is not set ++# CONFIG_MD_MULTIPATH is not set ++# CONFIG_BLK_DEV_LVM is not set ++ ++# ++# Networking options ++# ++CONFIG_PACKET=y ++# CONFIG_PACKET_MMAP is not set ++# CONFIG_NETLINK_DEV is not set ++CONFIG_NETFILTER=y ++# CONFIG_NETFILTER_DEBUG is not set ++CONFIG_FILTER=y ++CONFIG_UNIX=y ++CONFIG_INET=y ++CONFIG_IP_MULTICAST=y ++# CONFIG_IP_ADVANCED_ROUTER is not set ++CONFIG_IP_PNP=y ++# CONFIG_IP_PNP_DHCP is not set ++CONFIG_IP_PNP_BOOTP=y ++# CONFIG_IP_PNP_RARP is not set ++# CONFIG_NET_IPIP is not set ++# CONFIG_NET_IPGRE is not set ++# CONFIG_IP_MROUTE is not set ++# CONFIG_ARPD is not set ++# CONFIG_INET_ECN is not set ++# CONFIG_SYN_COOKIES is not set ++ ++# ++# IP: Netfilter Configuration ++# ++# CONFIG_IP_NF_CONNTRACK is not set ++# CONFIG_IP_NF_QUEUE is not set ++# CONFIG_IP_NF_IPTABLES is not set ++# CONFIG_IP_NF_ARPTABLES is not set ++# CONFIG_IP_NF_COMPAT_IPCHAINS is not set ++# CONFIG_IP_NF_COMPAT_IPFWADM is not set ++ ++# ++# IP: Virtual Server Configuration ++# ++# CONFIG_IP_VS is not set ++# CONFIG_IPV6 is not set ++# CONFIG_KHTTPD is not set ++ ++# ++# SCTP Configuration (EXPERIMENTAL) ++# ++# CONFIG_IP_SCTP is not set ++# CONFIG_ATM is not set ++# CONFIG_VLAN_8021Q is not set ++ ++# ++# ++# ++# CONFIG_IPX is not set ++# CONFIG_ATALK is not set ++# CONFIG_DECNET is not set ++# CONFIG_BRIDGE is not set ++# CONFIG_X25 is not set ++# CONFIG_LAPB is not set ++# CONFIG_LLC is not set ++# CONFIG_NET_DIVERT is not set ++# CONFIG_ECONET is not set ++# CONFIG_WAN_ROUTER is not set ++# CONFIG_NET_FASTROUTE is not set ++# CONFIG_NET_HW_FLOWCONTROL is not set ++ ++# ++# QoS and/or fair queueing ++# ++# CONFIG_NET_SCHED is not set ++ ++# ++# Network testing ++# ++# CONFIG_NET_PKTGEN is not set ++ ++# ++# Telephony Support ++# ++# CONFIG_PHONE is not set ++# CONFIG_PHONE_IXJ is not set ++# CONFIG_PHONE_IXJ_PCMCIA is not set ++ ++# ++# ATA/IDE/MFM/RLL support ++# ++CONFIG_IDE=y ++ ++# ++# IDE, ATA and ATAPI Block devices ++# ++CONFIG_BLK_DEV_IDE=y ++ ++# ++# Please see Documentation/ide.txt for help/info on IDE drives ++# ++# CONFIG_BLK_DEV_HD_IDE is not set ++# CONFIG_BLK_DEV_HD is not set ++# CONFIG_BLK_DEV_IDE_SATA is not set ++CONFIG_BLK_DEV_IDEDISK=y ++CONFIG_IDEDISK_MULTI_MODE=y ++CONFIG_IDEDISK_STROKE=y ++CONFIG_BLK_DEV_IDECS=m ++# CONFIG_BLK_DEV_DELKIN is not set ++# CONFIG_BLK_DEV_IDECD is not set ++# CONFIG_BLK_DEV_IDETAPE is not set ++# CONFIG_BLK_DEV_IDEFLOPPY is not set ++# CONFIG_BLK_DEV_IDESCSI is not set ++# CONFIG_IDE_TASK_IOCTL is not set ++ ++# ++# IDE chipset support/bugfixes ++# ++# CONFIG_BLK_DEV_CMD640 is not set ++# CONFIG_BLK_DEV_CMD640_ENHANCED is not set ++# CONFIG_BLK_DEV_ISAPNP is not set ++# CONFIG_BLK_DEV_IDEPCI is not set ++# CONFIG_IDE_CHIPSETS is not set ++# CONFIG_IDEDMA_AUTO is not set ++# CONFIG_DMA_NONPCI is not set ++# CONFIG_BLK_DEV_ATARAID is not set ++# CONFIG_BLK_DEV_ATARAID_PDC is not set ++# CONFIG_BLK_DEV_ATARAID_HPT is not set ++# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set ++# CONFIG_BLK_DEV_ATARAID_SII is not set ++ ++# ++# SCSI support ++# ++CONFIG_SCSI=y ++ ++# ++# SCSI support type (disk, tape, CD-ROM) ++# ++CONFIG_BLK_DEV_SD=y ++CONFIG_SD_EXTRA_DEVS=40 ++CONFIG_CHR_DEV_ST=y ++# CONFIG_CHR_DEV_OSST is not set ++CONFIG_BLK_DEV_SR=y ++# CONFIG_BLK_DEV_SR_VENDOR is not set ++CONFIG_SR_EXTRA_DEVS=2 ++# CONFIG_CHR_DEV_SG is not set ++ ++# ++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs ++# ++# CONFIG_SCSI_DEBUG_QUEUES is not set ++# CONFIG_SCSI_MULTI_LUN is not set ++CONFIG_SCSI_CONSTANTS=y ++# CONFIG_SCSI_LOGGING is not set ++ ++# ++# SCSI low-level drivers ++# ++# CONFIG_BLK_DEV_3W_XXXX_RAID is not set ++# CONFIG_SCSI_7000FASST is not set ++# CONFIG_SCSI_ACARD is not set ++# CONFIG_SCSI_AHA152X is not set ++# CONFIG_SCSI_AHA1542 is not set ++# CONFIG_SCSI_AHA1740 is not set ++# CONFIG_SCSI_AACRAID is not set ++# CONFIG_SCSI_AIC7XXX is not set ++# CONFIG_SCSI_AIC79XX is not set ++# CONFIG_SCSI_AIC7XXX_OLD is not set ++# CONFIG_SCSI_DPT_I2O is not set ++# CONFIG_SCSI_ADVANSYS is not set ++# CONFIG_SCSI_IN2000 is not set ++# CONFIG_SCSI_AM53C974 is not set ++# CONFIG_SCSI_MEGARAID is not set ++# CONFIG_SCSI_MEGARAID2 is not set ++# CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set ++# CONFIG_SCSI_SATA_SVW is not set ++# CONFIG_SCSI_ATA_PIIX is not set ++# CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set ++# CONFIG_SCSI_SATA_PROMISE is not set ++# CONFIG_SCSI_SATA_SX4 is not set ++# CONFIG_SCSI_SATA_SIL is not set ++# CONFIG_SCSI_SATA_SIS is not set ++# CONFIG_SCSI_SATA_ULI is not set ++# CONFIG_SCSI_SATA_VIA is not set ++# CONFIG_SCSI_SATA_VITESSE is not set ++# CONFIG_SCSI_BUSLOGIC is not set ++# CONFIG_SCSI_CPQFCTS is not set ++# CONFIG_SCSI_DMX3191D is not set ++# CONFIG_SCSI_DTC3280 is not set ++# CONFIG_SCSI_EATA is not set ++# CONFIG_SCSI_EATA_DMA is not set ++# CONFIG_SCSI_EATA_PIO is not set ++# CONFIG_SCSI_FUTURE_DOMAIN is not set ++# CONFIG_SCSI_GDTH is not set ++# CONFIG_SCSI_GENERIC_NCR5380 is not set ++# CONFIG_SCSI_INITIO is not set ++# CONFIG_SCSI_INIA100 is not set ++# CONFIG_SCSI_NCR53C406A is not set ++# CONFIG_SCSI_NCR53C7xx is not set ++# CONFIG_SCSI_SYM53C8XX_2 is not set ++# CONFIG_SCSI_NCR53C8XX is not set ++# CONFIG_SCSI_SYM53C8XX is not set ++# CONFIG_SCSI_PAS16 is not set ++# CONFIG_SCSI_PCI2000 is not set ++# CONFIG_SCSI_PCI2220I is not set ++# CONFIG_SCSI_PSI240I is not set ++# CONFIG_SCSI_QLOGIC_FAS is not set ++# CONFIG_SCSI_QLOGIC_ISP is not set ++# CONFIG_SCSI_QLOGIC_FC is not set ++# CONFIG_SCSI_QLOGIC_1280 is not set ++# CONFIG_SCSI_SIM710 is not set ++# CONFIG_SCSI_SYM53C416 is not set ++# CONFIG_SCSI_DC390T is not set ++# CONFIG_SCSI_T128 is not set ++# CONFIG_SCSI_U14_34F is not set ++# CONFIG_SCSI_NSP32 is not set ++# CONFIG_SCSI_DEBUG is not set ++ ++# ++# PCMCIA SCSI adapter support ++# ++# CONFIG_SCSI_PCMCIA is not set ++ ++# ++# Fusion MPT device support ++# ++# CONFIG_FUSION is not set ++# CONFIG_FUSION_BOOT is not set ++# CONFIG_FUSION_ISENSE is not set ++# CONFIG_FUSION_CTL is not set ++# CONFIG_FUSION_LAN is not set ++ ++# ++# IEEE 1394 (FireWire) support (EXPERIMENTAL) ++# ++# CONFIG_IEEE1394 is not set ++ ++# ++# I2O device support ++# ++# CONFIG_I2O is not set ++# CONFIG_I2O_PCI is not set ++# CONFIG_I2O_BLOCK is not set ++# CONFIG_I2O_LAN is not set ++# CONFIG_I2O_SCSI is not set ++# CONFIG_I2O_PROC is not set ++ ++# ++# Network device support ++# ++CONFIG_NETDEVICES=y ++ ++# ++# ARCnet devices ++# ++# CONFIG_ARCNET is not set ++# CONFIG_DUMMY is not set ++# CONFIG_BONDING is not set ++# CONFIG_EQUALIZER is not set ++# CONFIG_TUN is not set ++# CONFIG_ETHERTAP is not set ++ ++# ++# Ethernet (10 or 100Mbit) ++# ++CONFIG_NET_ETHERNET=y ++# CONFIG_MIPS_AU1X00_ENET is not set ++# CONFIG_SUNLANCE is not set ++# CONFIG_HAPPYMEAL is not set ++# CONFIG_SUNBMAC is not set ++# CONFIG_SUNQE is not set ++# CONFIG_SUNGEM is not set ++# CONFIG_NET_VENDOR_3COM is not set ++# CONFIG_LANCE is not set ++# CONFIG_NET_VENDOR_SMC is not set ++# CONFIG_NET_VENDOR_RACAL is not set ++# CONFIG_HP100 is not set ++# CONFIG_NET_ISA is not set ++# CONFIG_NET_PCI is not set ++# CONFIG_NET_POCKET is not set ++ ++# ++# Ethernet (1000 Mbit) ++# ++# CONFIG_ACENIC is not set ++# CONFIG_DL2K is not set ++# CONFIG_E1000 is not set ++# CONFIG_MYRI_SBUS is not set ++# CONFIG_NS83820 is not set ++# CONFIG_HAMACHI is not set ++# CONFIG_YELLOWFIN is not set ++# CONFIG_R8169 is not set ++# CONFIG_SK98LIN is not set ++# CONFIG_TIGON3 is not set ++# CONFIG_FDDI is not set ++# CONFIG_HIPPI is not set ++# CONFIG_PLIP is not set ++CONFIG_PPP=m ++CONFIG_PPP_MULTILINK=y ++# CONFIG_PPP_FILTER is not set ++CONFIG_PPP_ASYNC=m ++# CONFIG_PPP_SYNC_TTY is not set ++CONFIG_PPP_DEFLATE=m ++# CONFIG_PPP_BSDCOMP is not set ++CONFIG_PPPOE=m ++# CONFIG_SLIP is not set ++ ++# ++# Wireless LAN (non-hamradio) ++# ++# CONFIG_NET_RADIO is not set ++ ++# ++# Token Ring devices ++# ++# CONFIG_TR is not set ++# CONFIG_NET_FC is not set ++# CONFIG_RCPCI is not set ++# CONFIG_SHAPER is not set ++ ++# ++# Wan interfaces ++# ++# CONFIG_WAN is not set ++ ++# ++# PCMCIA network device support ++# ++# CONFIG_NET_PCMCIA is not set ++ ++# ++# Amateur Radio support ++# ++# CONFIG_HAMRADIO is not set ++ ++# ++# IrDA (infrared) support ++# ++# CONFIG_IRDA is not set ++ ++# ++# ISDN subsystem ++# ++# CONFIG_ISDN is not set ++ ++# ++# Input core support ++# ++CONFIG_INPUT=y ++CONFIG_INPUT_KEYBDEV=y ++CONFIG_INPUT_MOUSEDEV=y ++CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 ++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 ++# CONFIG_INPUT_JOYDEV is not set ++CONFIG_INPUT_EVDEV=y ++# CONFIG_INPUT_UINPUT is not set ++ ++# ++# Character devices ++# ++CONFIG_VT=y ++# CONFIG_VT_CONSOLE is not set ++# CONFIG_SERIAL is not set ++# CONFIG_SERIAL_EXTENDED is not set ++CONFIG_SERIAL_NONSTANDARD=y ++# CONFIG_COMPUTONE is not set ++# CONFIG_ROCKETPORT is not set ++# CONFIG_CYCLADES is not set ++# CONFIG_DIGIEPCA is not set ++# CONFIG_DIGI is not set ++# CONFIG_ESPSERIAL is not set ++# CONFIG_MOXA_INTELLIO is not set ++# CONFIG_MOXA_SMARTIO is not set ++# CONFIG_ISI is not set ++# CONFIG_SYNCLINK is not set ++# CONFIG_SYNCLINKMP is not set ++# CONFIG_N_HDLC is not set ++# CONFIG_RISCOM8 is not set ++# CONFIG_SPECIALIX is not set ++# CONFIG_SX is not set ++# CONFIG_RIO is not set ++# CONFIG_STALDRV is not set ++# CONFIG_SERIAL_TX3912 is not set ++# CONFIG_SERIAL_TX3912_CONSOLE is not set ++# CONFIG_SERIAL_TXX9 is not set ++# CONFIG_SERIAL_TXX9_CONSOLE is not set ++CONFIG_AU1X00_UART=y ++CONFIG_AU1X00_SERIAL_CONSOLE=y ++# CONFIG_AU1X00_USB_TTY is not set ++# CONFIG_AU1X00_USB_RAW is not set ++# CONFIG_TXX927_SERIAL is not set ++CONFIG_UNIX98_PTYS=y ++CONFIG_UNIX98_PTY_COUNT=256 ++ ++# ++# I2C support ++# ++CONFIG_I2C=y ++# CONFIG_I2C_ALGOBIT is not set ++# CONFIG_SCx200_ACB is not set ++# CONFIG_I2C_ALGOPCF is not set ++# CONFIG_I2C_CHARDEV is not set ++CONFIG_I2C_PROC=y ++ ++# ++# Mice ++# ++# CONFIG_BUSMOUSE is not set ++# CONFIG_MOUSE is not set ++ ++# ++# Joysticks ++# ++# CONFIG_INPUT_GAMEPORT is not set ++# CONFIG_INPUT_NS558 is not set ++# CONFIG_INPUT_LIGHTNING is not set ++# CONFIG_INPUT_PCIGAME is not set ++# CONFIG_INPUT_CS461X is not set ++# CONFIG_INPUT_EMU10K1 is not set ++# CONFIG_INPUT_SERIO is not set ++# CONFIG_INPUT_SERPORT is not set ++ ++# ++# Joysticks ++# ++# CONFIG_INPUT_ANALOG is not set ++# CONFIG_INPUT_A3D is not set ++# CONFIG_INPUT_ADI is not set ++# CONFIG_INPUT_COBRA is not set ++# CONFIG_INPUT_GF2K is not set ++# CONFIG_INPUT_GRIP is not set ++# CONFIG_INPUT_INTERACT is not set ++# CONFIG_INPUT_TMDC is not set ++# CONFIG_INPUT_SIDEWINDER is not set ++# CONFIG_INPUT_IFORCE_USB is not set ++# CONFIG_INPUT_IFORCE_232 is not set ++# CONFIG_INPUT_WARRIOR is not set ++# CONFIG_INPUT_MAGELLAN is not set ++# CONFIG_INPUT_SPACEORB is not set ++# CONFIG_INPUT_SPACEBALL is not set ++# CONFIG_INPUT_STINGER is not set ++# CONFIG_INPUT_DB9 is not set ++# CONFIG_INPUT_GAMECON is not set ++# CONFIG_INPUT_TURBOGRAFX is not set ++# CONFIG_QIC02_TAPE is not set ++# CONFIG_IPMI_HANDLER is not set ++# CONFIG_IPMI_PANIC_EVENT is not set ++# CONFIG_IPMI_DEVICE_INTERFACE is not set ++# CONFIG_IPMI_KCS is not set ++# CONFIG_IPMI_WATCHDOG is not set ++ ++# ++# Watchdog Cards ++# ++# CONFIG_WATCHDOG is not set ++# CONFIG_SCx200 is not set ++# CONFIG_SCx200_GPIO is not set ++# CONFIG_AMD_PM768 is not set ++# CONFIG_NVRAM is not set ++# CONFIG_RTC is not set ++# CONFIG_DTLK is not set ++# CONFIG_R3964 is not set ++# CONFIG_APPLICOM is not set ++ ++# ++# Ftape, the floppy tape device driver ++# ++# CONFIG_FTAPE is not set ++# CONFIG_AGP is not set ++ ++# ++# Direct Rendering Manager (XFree86 DRI support) ++# ++# CONFIG_DRM is not set ++ ++# ++# PCMCIA character devices ++# ++# CONFIG_PCMCIA_SERIAL_CS is not set ++# CONFIG_SYNCLINK_CS is not set ++# CONFIG_AU1X00_GPIO is not set ++# CONFIG_TS_AU1X00_ADS7846 is not set ++ ++# ++# File systems ++# ++# CONFIG_QUOTA is not set ++# CONFIG_QFMT_V2 is not set ++CONFIG_AUTOFS_FS=y ++# CONFIG_AUTOFS4_FS is not set ++# CONFIG_REISERFS_FS is not set ++# CONFIG_REISERFS_CHECK is not set ++# CONFIG_REISERFS_PROC_INFO is not set ++# CONFIG_ADFS_FS is not set ++# CONFIG_ADFS_FS_RW is not set ++# CONFIG_AFFS_FS is not set ++# CONFIG_HFS_FS is not set ++# CONFIG_HFSPLUS_FS is not set ++# CONFIG_BEFS_FS is not set ++# CONFIG_BEFS_DEBUG is not set ++# CONFIG_BFS_FS is not set ++CONFIG_EXT3_FS=y ++CONFIG_JBD=y ++# CONFIG_JBD_DEBUG is not set ++CONFIG_FAT_FS=y ++CONFIG_MSDOS_FS=y ++# CONFIG_UMSDOS_FS is not set ++CONFIG_VFAT_FS=y ++# CONFIG_EFS_FS is not set ++# CONFIG_JFFS_FS is not set ++# CONFIG_JFFS2_FS is not set ++# CONFIG_CRAMFS is not set ++CONFIG_TMPFS=y ++CONFIG_RAMFS=y ++# CONFIG_ISO9660_FS is not set ++# CONFIG_JOLIET is not set ++# CONFIG_ZISOFS is not set ++# CONFIG_JFS_FS is not set ++# CONFIG_JFS_DEBUG is not set ++# CONFIG_JFS_STATISTICS is not set ++# CONFIG_MINIX_FS is not set ++# CONFIG_VXFS_FS is not set ++# CONFIG_NTFS_FS is not set ++# CONFIG_NTFS_RW is not set ++# CONFIG_HPFS_FS is not set ++CONFIG_PROC_FS=y ++# CONFIG_DEVFS_FS is not set ++# CONFIG_DEVFS_MOUNT is not set ++# CONFIG_DEVFS_DEBUG is not set ++CONFIG_DEVPTS_FS=y ++# CONFIG_QNX4FS_FS is not set ++# CONFIG_QNX4FS_RW is not set ++# CONFIG_ROMFS_FS is not set ++CONFIG_EXT2_FS=y ++# CONFIG_SYSV_FS is not set ++# CONFIG_UDF_FS is not set ++# CONFIG_UDF_RW is not set ++# CONFIG_UFS_FS is not set ++# CONFIG_UFS_FS_WRITE is not set ++# CONFIG_XFS_FS is not set ++# CONFIG_XFS_QUOTA is not set ++# CONFIG_XFS_RT is not set ++# CONFIG_XFS_TRACE is not set ++# CONFIG_XFS_DEBUG is not set ++ ++# ++# Network File Systems ++# ++# CONFIG_CODA_FS is not set ++# CONFIG_INTERMEZZO_FS is not set ++CONFIG_NFS_FS=y ++CONFIG_NFS_V3=y ++# CONFIG_NFS_DIRECTIO is not set ++CONFIG_ROOT_NFS=y ++# CONFIG_NFSD is not set ++# CONFIG_NFSD_V3 is not set ++# CONFIG_NFSD_TCP is not set ++CONFIG_SUNRPC=y ++CONFIG_LOCKD=y ++CONFIG_LOCKD_V4=y ++# CONFIG_SMB_FS is not set ++# CONFIG_NCP_FS is not set ++# CONFIG_NCPFS_PACKET_SIGNING is not set ++# CONFIG_NCPFS_IOCTL_LOCKING is not set ++# CONFIG_NCPFS_STRONG is not set ++# CONFIG_NCPFS_NFS_NS is not set ++# CONFIG_NCPFS_OS2_NS is not set ++# CONFIG_NCPFS_SMALLDOS is not set ++# CONFIG_NCPFS_NLS is not set ++# CONFIG_NCPFS_EXTRAS is not set ++# CONFIG_ZISOFS_FS is not set ++ ++# ++# Partition Types ++# ++# CONFIG_PARTITION_ADVANCED is not set ++CONFIG_MSDOS_PARTITION=y ++# CONFIG_SMB_NLS is not set ++CONFIG_NLS=y ++ ++# ++# Native Language Support ++# ++CONFIG_NLS_DEFAULT="iso8859-1" ++# CONFIG_NLS_CODEPAGE_437 is not set ++# CONFIG_NLS_CODEPAGE_737 is not set ++# CONFIG_NLS_CODEPAGE_775 is not set ++# CONFIG_NLS_CODEPAGE_850 is not set ++# CONFIG_NLS_CODEPAGE_852 is not set ++# CONFIG_NLS_CODEPAGE_855 is not set ++# CONFIG_NLS_CODEPAGE_857 is not set ++# CONFIG_NLS_CODEPAGE_860 is not set ++# CONFIG_NLS_CODEPAGE_861 is not set ++# CONFIG_NLS_CODEPAGE_862 is not set ++# CONFIG_NLS_CODEPAGE_863 is not set ++# CONFIG_NLS_CODEPAGE_864 is not set ++# CONFIG_NLS_CODEPAGE_865 is not set ++# CONFIG_NLS_CODEPAGE_866 is not set ++# CONFIG_NLS_CODEPAGE_869 is not set ++# CONFIG_NLS_CODEPAGE_936 is not set ++# CONFIG_NLS_CODEPAGE_950 is not set ++# CONFIG_NLS_CODEPAGE_932 is not set ++# CONFIG_NLS_CODEPAGE_949 is not set ++# CONFIG_NLS_CODEPAGE_874 is not set ++# CONFIG_NLS_ISO8859_8 is not set ++# CONFIG_NLS_CODEPAGE_1250 is not set ++# CONFIG_NLS_CODEPAGE_1251 is not set ++# CONFIG_NLS_ISO8859_1 is not set ++# CONFIG_NLS_ISO8859_2 is not set ++# CONFIG_NLS_ISO8859_3 is not set ++# CONFIG_NLS_ISO8859_4 is not set ++# CONFIG_NLS_ISO8859_5 is not set ++# CONFIG_NLS_ISO8859_6 is not set ++# CONFIG_NLS_ISO8859_7 is not set ++# CONFIG_NLS_ISO8859_9 is not set ++# CONFIG_NLS_ISO8859_13 is not set ++# CONFIG_NLS_ISO8859_14 is not set ++# CONFIG_NLS_ISO8859_15 is not set ++# CONFIG_NLS_KOI8_R is not set ++# CONFIG_NLS_KOI8_U is not set ++# CONFIG_NLS_UTF8 is not set ++ ++# ++# Multimedia devices ++# ++# CONFIG_VIDEO_DEV is not set ++ ++# ++# Console drivers ++# ++# CONFIG_VGA_CONSOLE is not set ++# CONFIG_MDA_CONSOLE is not set ++ ++# ++# Frame-buffer support ++# ++CONFIG_FB=y ++CONFIG_DUMMY_CONSOLE=y ++# CONFIG_FB_RIVA is not set ++# CONFIG_FB_CLGEN is not set ++# CONFIG_FB_PM2 is not set ++# CONFIG_FB_PM3 is not set ++# CONFIG_FB_CYBER2000 is not set ++# CONFIG_FB_MATROX is not set ++# CONFIG_FB_ATY is not set ++# CONFIG_FB_RADEON is not set ++# CONFIG_FB_ATY128 is not set ++# CONFIG_FB_INTEL is not set ++# CONFIG_FB_SIS is not set ++# CONFIG_FB_NEOMAGIC is not set ++# CONFIG_FB_3DFX is not set ++# CONFIG_FB_VOODOO1 is not set ++# CONFIG_FB_TRIDENT is not set ++# CONFIG_FB_E1356 is not set ++# CONFIG_FB_IT8181 is not set ++# CONFIG_FB_VIRTUAL is not set ++CONFIG_FBCON_ADVANCED=y ++# CONFIG_FBCON_MFB is not set ++# CONFIG_FBCON_CFB2 is not set ++# CONFIG_FBCON_CFB4 is not set ++# CONFIG_FBCON_CFB8 is not set ++CONFIG_FBCON_CFB16=y ++# CONFIG_FBCON_CFB24 is not set ++CONFIG_FBCON_CFB32=y ++# CONFIG_FBCON_AFB is not set ++# CONFIG_FBCON_ILBM is not set ++# CONFIG_FBCON_IPLAN2P2 is not set ++# CONFIG_FBCON_IPLAN2P4 is not set ++# CONFIG_FBCON_IPLAN2P8 is not set ++# CONFIG_FBCON_MAC is not set ++# CONFIG_FBCON_VGA_PLANES is not set ++# CONFIG_FBCON_VGA is not set ++# CONFIG_FBCON_HGA is not set ++# CONFIG_FBCON_FONTWIDTH8_ONLY is not set ++CONFIG_FBCON_FONTS=y ++CONFIG_FONT_8x8=y ++CONFIG_FONT_8x16=y ++# CONFIG_FONT_SUN8x16 is not set ++# CONFIG_FONT_SUN12x22 is not set ++# CONFIG_FONT_6x11 is not set ++# CONFIG_FONT_PEARL_8x8 is not set ++# CONFIG_FONT_ACORN_8x8 is not set ++ ++# ++# Sound ++# ++CONFIG_SOUND=y ++# CONFIG_SOUND_ALI5455 is not set ++# CONFIG_SOUND_BT878 is not set ++# CONFIG_SOUND_CMPCI is not set ++# CONFIG_SOUND_EMU10K1 is not set ++# CONFIG_MIDI_EMU10K1 is not set ++# CONFIG_SOUND_FUSION is not set ++# CONFIG_SOUND_CS4281 is not set ++# CONFIG_SOUND_ES1370 is not set ++# CONFIG_SOUND_ES1371 is not set ++# CONFIG_SOUND_ESSSOLO1 is not set ++# CONFIG_SOUND_MAESTRO is not set ++# CONFIG_SOUND_MAESTRO3 is not set ++# CONFIG_SOUND_FORTE is not set ++# CONFIG_SOUND_ICH is not set ++# CONFIG_SOUND_RME96XX is not set ++# CONFIG_SOUND_SONICVIBES is not set ++# CONFIG_SOUND_AU1X00 is not set ++CONFIG_SOUND_AU1550_PSC=y ++# CONFIG_SOUND_AU1550_I2S is not set ++# CONFIG_SOUND_TRIDENT is not set ++# CONFIG_SOUND_MSNDCLAS is not set ++# CONFIG_SOUND_MSNDPIN is not set ++# CONFIG_SOUND_VIA82CXXX is not set ++# CONFIG_MIDI_VIA82CXXX is not set ++# CONFIG_SOUND_OSS is not set ++# CONFIG_SOUND_TVMIXER is not set ++# CONFIG_SOUND_AD1980 is not set ++# CONFIG_SOUND_WM97XX is not set ++ ++# ++# USB support ++# ++CONFIG_USB=y ++# CONFIG_USB_DEBUG is not set ++ ++# ++# Miscellaneous USB options ++# ++CONFIG_USB_DEVICEFS=y ++# CONFIG_USB_BANDWIDTH is not set ++ ++# ++# USB Host Controller Drivers ++# ++# CONFIG_USB_EHCI_HCD is not set ++# CONFIG_USB_UHCI is not set ++# CONFIG_USB_UHCI_ALT is not set ++CONFIG_USB_OHCI=y ++ ++# ++# USB Device Class drivers ++# ++# CONFIG_USB_AUDIO is not set ++# CONFIG_USB_EMI26 is not set ++# CONFIG_USB_BLUETOOTH is not set ++# CONFIG_USB_MIDI is not set ++CONFIG_USB_STORAGE=y ++# CONFIG_USB_STORAGE_DEBUG is not set ++# CONFIG_USB_STORAGE_DATAFAB is not set ++# CONFIG_USB_STORAGE_FREECOM is not set ++# CONFIG_USB_STORAGE_ISD200 is not set ++# CONFIG_USB_STORAGE_DPCM is not set ++# CONFIG_USB_STORAGE_HP8200e is not set ++# CONFIG_USB_STORAGE_SDDR09 is not set ++# CONFIG_USB_STORAGE_SDDR55 is not set ++# CONFIG_USB_STORAGE_JUMPSHOT is not set ++# CONFIG_USB_ACM is not set ++# CONFIG_USB_PRINTER is not set ++ ++# ++# USB Human Interface Devices (HID) ++# ++CONFIG_USB_HID=y ++CONFIG_USB_HIDINPUT=y ++CONFIG_USB_HIDDEV=y ++# CONFIG_USB_AIPTEK is not set ++# CONFIG_USB_WACOM is not set ++# CONFIG_USB_KBTAB is not set ++# CONFIG_USB_POWERMATE is not set ++ ++# ++# USB Imaging devices ++# ++# CONFIG_USB_DC2XX is not set ++# CONFIG_USB_MDC800 is not set ++# CONFIG_USB_SCANNER is not set ++# CONFIG_USB_MICROTEK is not set ++# CONFIG_USB_HPUSBSCSI is not set ++ ++# ++# USB Multimedia devices ++# ++ ++# ++# Video4Linux support is needed for USB Multimedia device support ++# ++ ++# ++# USB Network adaptors ++# ++# CONFIG_USB_PEGASUS is not set ++# CONFIG_USB_RTL8150 is not set ++# CONFIG_USB_KAWETH is not set ++# CONFIG_USB_CATC is not set ++# CONFIG_USB_CDCETHER is not set ++# CONFIG_USB_USBNET is not set ++ ++# ++# USB port drivers ++# ++# CONFIG_USB_USS720 is not set ++ ++# ++# USB Serial Converter support ++# ++# CONFIG_USB_SERIAL is not set ++ ++# ++# USB Miscellaneous drivers ++# ++# CONFIG_USB_RIO500 is not set ++# CONFIG_USB_AUERSWALD is not set ++# CONFIG_USB_TIGL is not set ++# CONFIG_USB_BRLVGER is not set ++# CONFIG_USB_LCD is not set ++ ++# ++# Support for USB gadgets ++# ++# CONFIG_USB_GADGET is not set ++ ++# ++# Bluetooth support ++# ++# CONFIG_BLUEZ is not set ++ ++# ++# Kernel hacking ++# ++CONFIG_CROSSCOMPILE=y ++# CONFIG_RUNTIME_DEBUG is not set ++# CONFIG_KGDB is not set ++# CONFIG_GDB_CONSOLE is not set ++# CONFIG_DEBUG_INFO is not set ++# CONFIG_MAGIC_SYSRQ is not set ++# CONFIG_MIPS_UNCACHED is not set ++CONFIG_LOG_BUF_SHIFT=0 ++ ++# ++# Cryptographic options ++# ++# CONFIG_CRYPTO is not set ++ ++# ++# Library routines ++# ++# CONFIG_CRC32 is not set ++CONFIG_ZLIB_INFLATE=m ++CONFIG_ZLIB_DEFLATE=m ++# CONFIG_FW_LOADER is not set +diff -Nur linux-2.4.30/arch/mips/defconfig-pb1500 linux-2.4.30-mips/arch/mips/defconfig-pb1500 +--- linux-2.4.30/arch/mips/defconfig-pb1500 2005-01-19 15:09:28.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-pb1500 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + CONFIG_MIPS_PB1500=y +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -215,9 +215,7 @@ + # CONFIG_MTD_MTX1 is not set + CONFIG_MTD_PB1500_BOOT=y + # CONFIG_MTD_PB1500_USER is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -236,7 +234,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -341,11 +338,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -675,7 +667,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-pb1550 linux-2.4.30-mips/arch/mips/defconfig-pb1550 +--- linux-2.4.30/arch/mips/defconfig-pb1550 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-pb1550 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + CONFIG_MIPS_PB1550=y ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -213,11 +213,9 @@ + # CONFIG_MTD_BOSPORUS is not set + # CONFIG_MTD_XXS1500 is not set + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + CONFIG_MTD_PB1550=y + CONFIG_MTD_PB1550_BOOT=y + CONFIG_MTD_PB1550_USER=y +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -236,7 +234,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -343,11 +340,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -633,7 +625,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-rbtx4927 linux-2.4.30-mips/arch/mips/defconfig-rbtx4927 +--- linux-2.4.30/arch/mips/defconfig-rbtx4927 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-rbtx4927 2005-03-18 13:13:21.000000000 +0100 +@@ -28,8 +28,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -223,11 +223,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -466,7 +461,6 @@ + CONFIG_SERIAL_TXX9=y + CONFIG_SERIAL_TXX9_CONSOLE=y + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_UNIX98_PTYS is not set + + # +diff -Nur linux-2.4.30/arch/mips/defconfig-rm200 linux-2.4.30-mips/arch/mips/defconfig-rm200 +--- linux-2.4.30/arch/mips/defconfig-rm200 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-rm200 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -229,11 +229,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -340,7 +335,6 @@ + # CONFIG_SERIAL is not set + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-sb1250-swarm linux-2.4.30-mips/arch/mips/defconfig-sb1250-swarm +--- linux-2.4.30/arch/mips/defconfig-sb1250-swarm 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-sb1250-swarm 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -90,6 +90,7 @@ + # CONFIG_SIBYTE_TBPROF is not set + CONFIG_SIBYTE_GENBUS_IDE=y + CONFIG_SMP_CAPABLE=y ++CONFIG_MIPS_RTC=y + # CONFIG_SNI_RM200_PCI is not set + # CONFIG_TANBAC_TB0226 is not set + # CONFIG_TANBAC_TB0229 is not set +@@ -253,11 +254,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -469,7 +465,6 @@ + CONFIG_SIBYTE_SB1250_DUART=y + CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y + CONFIG_SERIAL_CONSOLE=y +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-sead linux-2.4.30-mips/arch/mips/defconfig-sead +--- linux-2.4.30/arch/mips/defconfig-sead 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-sead 2005-03-18 13:13:21.000000000 +0100 +@@ -28,8 +28,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -244,7 +244,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_UNIX98_PTYS is not set + + # +diff -Nur linux-2.4.30/arch/mips/defconfig-stretch linux-2.4.30-mips/arch/mips/defconfig-stretch +--- linux-2.4.30/arch/mips/defconfig-stretch 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-stretch 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -240,11 +240,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -324,9 +319,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -516,7 +513,6 @@ + # CONFIG_SERIAL_TXX9 is not set + # CONFIG_SERIAL_TXX9_CONSOLE is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-tb0226 linux-2.4.30-mips/arch/mips/defconfig-tb0226 +--- linux-2.4.30/arch/mips/defconfig-tb0226 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-tb0226 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -228,11 +228,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -312,9 +307,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -518,7 +515,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_VR41XX_KIU is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 +diff -Nur linux-2.4.30/arch/mips/defconfig-tb0229 linux-2.4.30-mips/arch/mips/defconfig-tb0229 +--- linux-2.4.30/arch/mips/defconfig-tb0229 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-tb0229 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -230,11 +230,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -445,7 +440,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_VR41XX_KIU is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 +diff -Nur linux-2.4.30/arch/mips/defconfig-ti1500 linux-2.4.30-mips/arch/mips/defconfig-ti1500 +--- linux-2.4.30/arch/mips/defconfig-ti1500 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-ti1500 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + CONFIG_MIPS_XXS1500=y + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -213,9 +213,7 @@ + # CONFIG_MTD_BOSPORUS is not set + CONFIG_MTD_XXS1500=y + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -234,7 +232,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -339,11 +336,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -600,7 +592,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-workpad linux-2.4.30-mips/arch/mips/defconfig-workpad +--- linux-2.4.30/arch/mips/defconfig-workpad 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-workpad 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -222,11 +222,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -426,7 +421,6 @@ + # CONFIG_SERIAL_MULTIPORT is not set + # CONFIG_HUB6 is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_VR41XX_KIU is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 +diff -Nur linux-2.4.30/arch/mips/defconfig-xxs1500 linux-2.4.30-mips/arch/mips/defconfig-xxs1500 +--- linux-2.4.30/arch/mips/defconfig-xxs1500 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-xxs1500 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + CONFIG_MIPS_XXS1500=y + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -213,9 +213,7 @@ + # CONFIG_MTD_BOSPORUS is not set + CONFIG_MTD_XXS1500=y + # CONFIG_MTD_MTX1 is not set +-# CONFIG_MTD_DB1X00 is not set + # CONFIG_MTD_PB1550 is not set +-# CONFIG_MTD_HYDROGEN3 is not set + # CONFIG_MTD_MIRAGE is not set + # CONFIG_MTD_CSTM_MIPS_IXX is not set + # CONFIG_MTD_OCELOT is not set +@@ -234,7 +232,6 @@ + # + # Disk-On-Chip Device Drivers + # +-# CONFIG_MTD_DOC1000 is not set + # CONFIG_MTD_DOC2000 is not set + # CONFIG_MTD_DOC2001 is not set + # CONFIG_MTD_DOCPROBE is not set +@@ -339,11 +336,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -671,7 +663,6 @@ + # CONFIG_AU1X00_USB_TTY is not set + # CONFIG_AU1X00_USB_RAW is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/defconfig-yosemite linux-2.4.30-mips/arch/mips/defconfig-yosemite +--- linux-2.4.30/arch/mips/defconfig-yosemite 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/defconfig-yosemite 2005-03-18 13:13:21.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -227,11 +227,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -310,9 +305,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -477,7 +474,6 @@ + # CONFIG_SERIAL_TXX9 is not set + # CONFIG_SERIAL_TXX9_CONSOLE is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips/kernel/cpu-probe.c linux-2.4.30-mips/arch/mips/kernel/cpu-probe.c +--- linux-2.4.30/arch/mips/kernel/cpu-probe.c 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/kernel/cpu-probe.c 2005-04-08 10:33:17.000000000 +0200 +@@ -34,16 +34,12 @@ + ".set\tmips0"); + } + +-/* The Au1xxx wait is available only if we run CONFIG_PM and +- * the timer setup found we had a 32KHz counter available. +- * There are still problems with functions that may call au1k_wait +- * directly, but that will be discovered pretty quickly. +- */ +-extern void (*au1k_wait_ptr)(void); +-void au1k_wait(void) ++/* The Au1xxx wait is available only if using 32khz counter or ++ * external timer source, but specifically not CP0 Counter. */ ++int allow_au1k_wait; ++static void au1k_wait(void) + { +-#ifdef CONFIG_PM +- unsigned long addr; ++ unsigned long addr = 0; + /* using the wait instruction makes CP0 counter unusable */ + __asm__("la %0,au1k_wait\n\t" + ".set mips3\n\t" +@@ -58,10 +54,6 @@ + "nop\n\t" + ".set mips0\n\t" + : : "r" (addr)); +-#else +- __asm__("nop\n\t" +- "nop"); +-#endif + } + + static inline void check_wait(void) +@@ -100,20 +92,17 @@ + cpu_wait = r4k_wait; + printk(" available.\n"); + break; +-#ifdef CONFIG_PM + case CPU_AU1000: + case CPU_AU1100: + case CPU_AU1500: + case CPU_AU1550: +- if (au1k_wait_ptr != NULL) { +- cpu_wait = au1k_wait_ptr; ++ case CPU_AU1200: ++ if (allow_au1k_wait) { ++ cpu_wait = au1k_wait; + printk(" available.\n"); +- } +- else { ++ } else + printk(" unavailable.\n"); +- } + break; +-#endif + default: + printk(" unavailable.\n"); + break; +diff -Nur linux-2.4.30/arch/mips/kernel/head.S linux-2.4.30-mips/arch/mips/kernel/head.S +--- linux-2.4.30/arch/mips/kernel/head.S 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/kernel/head.S 2004-11-22 14:38:23.000000000 +0100 +@@ -43,9 +43,9 @@ + + /* Cache Error */ + LEAF(except_vec2_generic) ++ .set push + .set noreorder + .set noat +- .set mips0 + /* + * This is a very bad place to be. Our cache error + * detection has triggered. If we have write-back data +@@ -64,10 +64,9 @@ + + j cache_parity_error + nop ++ .set pop + END(except_vec2_generic) + +- .set at +- + /* + * Special interrupt vector for embedded MIPS. This is a + * dedicated interrupt vector which reduces interrupt processing +@@ -76,8 +75,11 @@ + * size! + */ + NESTED(except_vec4, 0, sp) ++ .set push ++ .set noreorder + 1: j 1b /* Dummy, will be replaced */ + nop ++ .set pop + END(except_vec4) + + /* +@@ -87,8 +89,11 @@ + * unconditional jump to this vector. + */ + NESTED(except_vec_ejtag_debug, 0, sp) ++ .set push ++ .set noreorder + j ejtag_debug_handler + nop ++ .set pop + END(except_vec_ejtag_debug) + + __FINIT +@@ -97,6 +102,7 @@ + * EJTAG debug exception handler. + */ + NESTED(ejtag_debug_handler, PT_SIZE, sp) ++ .set push + .set noat + .set noreorder + mtc0 k0, CP0_DESAVE +@@ -120,7 +126,7 @@ + deret + .set mips0 + nop +- .set at ++ .set pop + END(ejtag_debug_handler) + + __INIT +@@ -132,13 +138,17 @@ + * unconditional jump to this vector. + */ + NESTED(except_vec_nmi, 0, sp) ++ .set push ++ .set noreorder + j nmi_handler + nop ++ .set pop + END(except_vec_nmi) + + __FINIT + + NESTED(nmi_handler, PT_SIZE, sp) ++ .set push + .set noat + .set noreorder + .set mips3 +@@ -147,8 +157,7 @@ + move a0, sp + RESTORE_ALL + eret +- .set at +- .set mips0 ++ .set pop + END(nmi_handler) + + __INIT +@@ -157,7 +166,20 @@ + * Kernel entry point + */ + NESTED(kernel_entry, 16, sp) ++ .set push ++ /* ++ * For the moment disable interrupts and mark the kernel mode. ++ * A full initialization of the CPU's status register is done ++ * later in per_cpu_trap_init(). ++ */ ++ mfc0 t0, CP0_STATUS ++ or t0, ST0_CU0|0x1f ++ xor t0, 0x1f ++ mtc0 t0, CP0_STATUS ++ + .set noreorder ++ sll zero,3 # ehb ++ .set reorder + + /* + * The firmware/bootloader passes argc/argp/envp +@@ -170,8 +192,8 @@ + la t1, (_end - 4) + 1: + addiu t0, 4 ++ sw zero, (t0) + bne t0, t1, 1b +- sw zero, (t0) + + /* + * Stack for kernel and init, current variable +@@ -182,7 +204,7 @@ + sw t0, kernelsp + + jal init_arch +- nop ++ .set pop + END(kernel_entry) + + +@@ -193,17 +215,26 @@ + * function after setting up the stack and gp registers. + */ + LEAF(smp_bootstrap) +- .set push +- .set noreorder +- mtc0 zero, CP0_WIRED +- CLI ++ .set push ++ /* ++ * For the moment disable interrupts and bootstrap exception ++ * vectors and mark the kernel mode. A full initialization of ++ * the CPU's status register is done later in ++ * per_cpu_trap_init(). ++ */ + mfc0 t0, CP0_STATUS +- li t1, ~(ST0_CU1|ST0_CU2|ST0_CU3|ST0_KX|ST0_SX|ST0_UX) +- and t0, t1 +- or t0, (ST0_CU0); ++ or t0, ST0_CU0|ST0_BEV|0x1f ++ xor t0, ST0_BEV|0x1f ++ mtc0 t0, CP0_STATUS ++ ++ .set noreorder ++ sll zero,3 # ehb ++ .set reorder ++ ++ mtc0 zero, CP0_WIRED ++ + jal start_secondary +- mtc0 t0, CP0_STATUS +- .set pop ++ .set pop + END(smp_bootstrap) + #endif + +diff -Nur linux-2.4.30/arch/mips/kernel/scall_o32.S linux-2.4.30-mips/arch/mips/kernel/scall_o32.S +--- linux-2.4.30/arch/mips/kernel/scall_o32.S 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/kernel/scall_o32.S 2005-02-07 22:21:53.000000000 +0100 +@@ -121,15 +121,14 @@ + + trace_a_syscall: + SAVE_STATIC +- sw t2, PT_R1(sp) ++ move s0, t2 + jal syscall_trace +- lw t2, PT_R1(sp) + + lw a0, PT_R4(sp) # Restore argument registers + lw a1, PT_R5(sp) + lw a2, PT_R6(sp) + lw a3, PT_R7(sp) +- jalr t2 ++ jalr s0 + + li t0, -EMAXERRNO - 1 # error? + sltu t0, t0, v0 +diff -Nur linux-2.4.30/arch/mips/kernel/setup.c linux-2.4.30-mips/arch/mips/kernel/setup.c +--- linux-2.4.30/arch/mips/kernel/setup.c 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/kernel/setup.c 2005-01-13 22:15:57.000000000 +0100 +@@ -5,7 +5,7 @@ + * + * Copyright (C) 1995 Linus Torvalds + * Copyright (C) 1995 Waldorf Electronics +- * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 Ralf Baechle ++ * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 01, 05 Ralf Baechle + * Copyright (C) 1996 Stoned Elipot + * Copyright (C) 2000, 2001, 2002 Maciej W. Rozycki + */ +@@ -71,6 +71,8 @@ + extern struct rtc_ops no_rtc_ops; + struct rtc_ops *rtc_ops; + ++EXPORT_SYMBOL(rtc_ops); ++ + #ifdef CONFIG_PC_KEYB + struct kbd_ops *kbd_ops; + #endif +@@ -132,10 +134,6 @@ + */ + load_mmu(); + +- /* Disable coprocessors and set FPU for 16/32 FPR register model */ +- clear_c0_status(ST0_CU1|ST0_CU2|ST0_CU3|ST0_KX|ST0_SX|ST0_FR); +- set_c0_status(ST0_CU0); +- + start_kernel(); + } + +diff -Nur linux-2.4.30/arch/mips/kernel/traps.c linux-2.4.30-mips/arch/mips/kernel/traps.c +--- linux-2.4.30/arch/mips/kernel/traps.c 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/kernel/traps.c 2005-04-12 22:25:34.000000000 +0200 +@@ -452,9 +452,10 @@ + } + ll_task = current; + ++ compute_return_epc(regs); ++ + regs->regs[(opcode & RT) >> 16] = value; + +- compute_return_epc(regs); + return; + + sig: +@@ -485,8 +486,8 @@ + goto sig; + } + if (ll_bit == 0 || ll_task != current) { +- regs->regs[reg] = 0; + compute_return_epc(regs); ++ regs->regs[reg] = 0; + return; + } + +@@ -495,9 +496,9 @@ + goto sig; + } + ++ compute_return_epc(regs); + regs->regs[reg] = 1; + +- compute_return_epc(regs); + return; + + sig: +@@ -887,12 +888,18 @@ + void __init per_cpu_trap_init(void) + { + unsigned int cpu = smp_processor_id(); ++ unsigned int status_set = ST0_CU0; + +- /* Some firmware leaves the BEV flag set, clear it. */ +- clear_c0_status(ST0_CU3|ST0_CU2|ST0_CU1|ST0_BEV|ST0_KX|ST0_SX|ST0_UX); +- ++ /* ++ * Disable coprocessors and 64-bit addressing and set FPU for ++ * the 16/32 FPR register model. Reset the BEV flag that some ++ * firmware may have left set and the TS bit (for IP27). Set ++ * XX for ISA IV code to work. ++ */ + if (current_cpu_data.isa_level == MIPS_CPU_ISA_IV) +- set_c0_status(ST0_XX); ++ status_set |= ST0_XX; ++ change_c0_status(ST0_CU|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX, ++ status_set); + + /* + * Some MIPS CPUs have a dedicated interrupt vector which reduces the +@@ -902,7 +909,7 @@ + set_c0_cause(CAUSEF_IV); + + cpu_data[cpu].asid_cache = ASID_FIRST_VERSION; +- write_c0_context(cpu << 23); ++ TLBMISS_HANDLER_SETUP(); + + atomic_inc(&init_mm.mm_count); + current->active_mm = &init_mm; +@@ -918,8 +925,6 @@ + extern char except_vec4; + unsigned long i; + +- per_cpu_trap_init(); +- + /* Copy the generic exception handler code to it's final destination. */ + memcpy((void *)(KSEG0 + 0x80), &except_vec1_generic, 0x80); + +@@ -1020,10 +1025,5 @@ + + flush_icache_range(KSEG0, KSEG0 + 0x400); + +- atomic_inc(&init_mm.mm_count); /* XXX UP? */ +- current->active_mm = &init_mm; +- +- /* XXX Must be done for all CPUs */ +- current_cpu_data.asid_cache = ASID_FIRST_VERSION; +- TLBMISS_HANDLER_SETUP(); ++ per_cpu_trap_init(); + } +diff -Nur linux-2.4.30/arch/mips/lib/rtc-no.c linux-2.4.30-mips/arch/mips/lib/rtc-no.c +--- linux-2.4.30/arch/mips/lib/rtc-no.c 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/lib/rtc-no.c 2005-01-13 22:15:57.000000000 +0100 +@@ -6,10 +6,9 @@ + * Stub RTC routines to keep Linux from crashing on machine which don't + * have a RTC chip. + * +- * Copyright (C) 1998, 2001 by Ralf Baechle ++ * Copyright (C) 1998, 2001, 2005 by Ralf Baechle + */ + #include <linux/kernel.h> +-#include <linux/module.h> + #include <linux/mc146818rtc.h> + + static unsigned int shouldnt_happen(void) +@@ -29,5 +28,3 @@ + .rtc_write_data = (void *) &shouldnt_happen, + .rtc_bcd_mode = (void *) &shouldnt_happen + }; +- +-EXPORT_SYMBOL(rtc_ops); +diff -Nur linux-2.4.30/arch/mips/lib/rtc-std.c linux-2.4.30-mips/arch/mips/lib/rtc-std.c +--- linux-2.4.30/arch/mips/lib/rtc-std.c 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/lib/rtc-std.c 2005-01-13 22:15:57.000000000 +0100 +@@ -5,9 +5,8 @@ + * + * RTC routines for PC style attached Dallas chip. + * +- * Copyright (C) 1998, 2001 by Ralf Baechle ++ * Copyright (C) 1998, 2001, 05 by Ralf Baechle + */ +-#include <linux/module.h> + #include <linux/mc146818rtc.h> + #include <asm/io.h> + +@@ -33,5 +32,3 @@ + &std_rtc_write_data, + &std_rtc_bcd_mode + }; +- +-EXPORT_SYMBOL(rtc_ops); +diff -Nur linux-2.4.30/arch/mips/mm/c-r4k.c linux-2.4.30-mips/arch/mips/mm/c-r4k.c +--- linux-2.4.30/arch/mips/mm/c-r4k.c 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/mm/c-r4k.c 2005-02-06 22:55:42.000000000 +0100 +@@ -867,9 +867,16 @@ + * normally they'd suffer from aliases but magic in the hardware deals + * with that for us so we don't need to take care ourselves. + */ +- if (c->cputype != CPU_R10000 && c->cputype != CPU_R12000) +- if (c->dcache.waysize > PAGE_SIZE) +- c->dcache.flags |= MIPS_CACHE_ALIASES; ++ switch (c->cputype) { ++ case CPU_R10000: ++ case CPU_R12000: ++ break; ++ case CPU_24K: ++ if (!(read_c0_config7() & (1 << 16))) ++ default: ++ if (c->dcache.waysize > PAGE_SIZE) ++ c->dcache.flags |= MIPS_CACHE_ALIASES; ++ } + + switch (c->cputype) { + case CPU_20KC: +@@ -1069,9 +1076,6 @@ + probe_pcache(); + setup_scache(); + +- if (c->dcache.sets * c->dcache.ways > PAGE_SIZE) +- c->dcache.flags |= MIPS_CACHE_ALIASES; +- + r4k_blast_dcache_page_setup(); + r4k_blast_dcache_page_indexed_setup(); + r4k_blast_dcache_setup(); +diff -Nur linux-2.4.30/arch/mips/mm/cerr-sb1.c linux-2.4.30-mips/arch/mips/mm/cerr-sb1.c +--- linux-2.4.30/arch/mips/mm/cerr-sb1.c 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/mm/cerr-sb1.c 2004-12-13 18:37:23.000000000 +0100 +@@ -252,14 +252,14 @@ + + /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */ + static const uint64_t mask_72_64[8] = { +- 0x0738C808099264FFL, +- 0x38C808099264FF07L, +- 0xC808099264FF0738L, +- 0x08099264FF0738C8L, +- 0x099264FF0738C808L, +- 0x9264FF0738C80809L, +- 0x64FF0738C8080992L, +- 0xFF0738C808099264L ++ 0x0738C808099264FFULL, ++ 0x38C808099264FF07ULL, ++ 0xC808099264FF0738ULL, ++ 0x08099264FF0738C8ULL, ++ 0x099264FF0738C808ULL, ++ 0x9264FF0738C80809ULL, ++ 0x64FF0738C8080992ULL, ++ 0xFF0738C808099264ULL + }; + + /* Calculate the parity on a range of bits */ +@@ -331,9 +331,9 @@ + ((lru >> 4) & 0x3), + ((lru >> 6) & 0x3)); + } +- va = (taglo & 0xC0000FFFFFFFE000) | addr; ++ va = (taglo & 0xC0000FFFFFFFE000ULL) | addr; + if ((taglo & (1 << 31)) && (((taglo >> 62) & 0x3) == 3)) +- va |= 0x3FFFF00000000000; ++ va |= 0x3FFFF00000000000ULL; + valid = ((taghi >> 29) & 1); + if (valid) { + tlo_tmp = taglo & 0xfff3ff; +@@ -474,7 +474,7 @@ + : "r" ((way << 13) | addr)); + + taglo = ((unsigned long long)taglohi << 32) | taglolo; +- pa = (taglo & 0xFFFFFFE000) | addr; ++ pa = (taglo & 0xFFFFFFE000ULL) | addr; + if (way == 0) { + lru = (taghi >> 14) & 0xff; + prom_printf("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n", +diff -Nur linux-2.4.30/arch/mips/mm/tlb-r4k.c linux-2.4.30-mips/arch/mips/mm/tlb-r4k.c +--- linux-2.4.30/arch/mips/mm/tlb-r4k.c 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/mm/tlb-r4k.c 2004-11-25 23:18:38.000000000 +0100 +@@ -3,17 +3,12 @@ + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * +- * r4xx0.c: R4000 processor variant specific MMU/Cache routines. +- * + * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) + * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org +- * +- * To do: +- * +- * - this code is a overbloated pig +- * - many of the bug workarounds are not efficient at all, but at +- * least they are functional ... ++ * Carsten Langgaard, carstenl@mips.com ++ * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. + */ ++#include <linux/config.h> + #include <linux/init.h> + #include <linux/sched.h> + #include <linux/mm.h> +@@ -25,9 +20,6 @@ + #include <asm/pgtable.h> + #include <asm/system.h> + +-#undef DEBUG_TLB +-#undef DEBUG_TLBUPDATE +- + extern char except_vec0_nevada, except_vec0_r4000, except_vec0_r4600; + + /* CP0 hazard avoidance. */ +@@ -41,33 +33,23 @@ + unsigned long old_ctx; + int entry; + +-#ifdef DEBUG_TLB +- printk("[tlball]"); +-#endif +- + local_irq_save(flags); + /* Save old context and create impossible VPN2 value */ + old_ctx = read_c0_entryhi(); + write_c0_entrylo0(0); + write_c0_entrylo1(0); +- BARRIER; + + entry = read_c0_wired(); + + /* Blast 'em all away. */ + while (entry < current_cpu_data.tlbsize) { +- /* +- * Make sure all entries differ. If they're not different +- * MIPS32 will take revenge ... +- */ + write_c0_entryhi(KSEG0 + entry*0x2000); + write_c0_index(entry); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_write_indexed(); +- BARRIER; + entry++; + } +- BARRIER; ++ tlbw_use_hazard(); + write_c0_entryhi(old_ctx); + local_irq_restore(flags); + } +@@ -76,12 +58,8 @@ + { + int cpu = smp_processor_id(); + +- if (cpu_context(cpu, mm) != 0) { +-#ifdef DEBUG_TLB +- printk("[tlbmm<%d>]", cpu_context(cpu, mm)); +-#endif ++ if (cpu_context(cpu, mm) != 0) + drop_mmu_context(mm,cpu); +- } + } + + void local_flush_tlb_range(struct mm_struct *mm, unsigned long start, +@@ -93,10 +71,6 @@ + unsigned long flags; + int size; + +-#ifdef DEBUG_TLB +- printk("[tlbrange<%02x,%08lx,%08lx>]", +- cpu_asid(cpu, mm), start, end); +-#endif + local_irq_save(flags); + size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; + size = (size + 1) >> 1; +@@ -112,7 +86,7 @@ + + write_c0_entryhi(start | newpid); + start += (PAGE_SIZE << 1); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_probe(); + BARRIER; + idx = read_c0_index(); +@@ -122,10 +96,10 @@ + continue; + /* Make sure all entries differ. */ + write_c0_entryhi(KSEG0 + idx*0x2000); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_write_indexed(); +- BARRIER; + } ++ tlbw_use_hazard(); + write_c0_entryhi(oldpid); + } else { + drop_mmu_context(mm, cpu); +@@ -138,34 +112,30 @@ + { + int cpu = smp_processor_id(); + +- if (!vma || cpu_context(cpu, vma->vm_mm) != 0) { ++ if (cpu_context(cpu, vma->vm_mm) != 0) { + unsigned long flags; +- int oldpid, newpid, idx; ++ unsigned long oldpid, newpid, idx; + +-#ifdef DEBUG_TLB +- printk("[tlbpage<%d,%08lx>]", cpu_context(cpu, vma->vm_mm), +- page); +-#endif + newpid = cpu_asid(cpu, vma->vm_mm); + page &= (PAGE_MASK << 1); + local_irq_save(flags); + oldpid = read_c0_entryhi(); + write_c0_entryhi(page | newpid); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_probe(); + BARRIER; + idx = read_c0_index(); + write_c0_entrylo0(0); + write_c0_entrylo1(0); +- if(idx < 0) ++ if (idx < 0) + goto finish; + /* Make sure all entries differ. */ + write_c0_entryhi(KSEG0+idx*0x2000); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_write_indexed(); ++ tlbw_use_hazard(); + + finish: +- BARRIER; + write_c0_entryhi(oldpid); + local_irq_restore(flags); + } +@@ -185,7 +155,7 @@ + + local_irq_save(flags); + write_c0_entryhi(page); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_probe(); + BARRIER; + idx = read_c0_index(); +@@ -194,18 +164,19 @@ + if (idx >= 0) { + /* Make sure all entries differ. */ + write_c0_entryhi(KSEG0+idx*0x2000); ++ mtc0_tlbw_hazard(); + tlb_write_indexed(); ++ tlbw_use_hazard(); + } +- BARRIER; + write_c0_entryhi(oldpid); ++ + local_irq_restore(flags); + } + + EXPORT_SYMBOL(local_flush_tlb_one); + +-/* We will need multiple versions of update_mmu_cache(), one that just +- * updates the TLB with the new pte(s), and another which also checks +- * for the R4k "end of page" hardware bug and does the needy. ++/* ++ * Updates the TLB with the new pte(s). + */ + void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte) + { +@@ -223,25 +194,16 @@ + + pid = read_c0_entryhi() & ASID_MASK; + +-#ifdef DEBUG_TLB +- if ((pid != cpu_asid(cpu, vma->vm_mm)) || +- (cpu_context(vma->vm_mm) == 0)) { +- printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d " +- "tlbpid=%d\n", (int) (cpu_asid(cpu, vma->vm_mm)), pid); +- } +-#endif +- + local_irq_save(flags); + address &= (PAGE_MASK << 1); + write_c0_entryhi(address | pid); + pgdp = pgd_offset(vma->vm_mm, address); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_probe(); + BARRIER; + pmdp = pmd_offset(pgdp, address); + idx = read_c0_index(); + ptep = pte_offset(pmdp, address); +- BARRIER; + #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) + write_c0_entrylo0(ptep->pte_high); + ptep++; +@@ -251,15 +213,13 @@ + write_c0_entrylo1(pte_val(*ptep) >> 6); + #endif + write_c0_entryhi(address | pid); +- BARRIER; +- if (idx < 0) { ++ mtc0_tlbw_hazard(); ++ if (idx < 0) + tlb_write_random(); +- } else { ++ else + tlb_write_indexed(); +- } +- BARRIER; ++ tlbw_use_hazard(); + write_c0_entryhi(pid); +- BARRIER; + local_irq_restore(flags); + } + +@@ -279,24 +239,26 @@ + asid = read_c0_entryhi() & ASID_MASK; + write_c0_entryhi(address | asid); + pgdp = pgd_offset(vma->vm_mm, address); ++ mtc0_tlbw_hazard(); + tlb_probe(); ++ BARRIER; + pmdp = pmd_offset(pgdp, address); + idx = read_c0_index(); + ptep = pte_offset(pmdp, address); + write_c0_entrylo0(pte_val(*ptep++) >> 6); + write_c0_entrylo1(pte_val(*ptep) >> 6); +- BARRIER; ++ mtc0_tlbw_hazard(); + if (idx < 0) + tlb_write_random(); + else + tlb_write_indexed(); +- BARRIER; ++ tlbw_use_hazard(); + local_irq_restore(flags); + } + #endif + + void __init add_wired_entry(unsigned long entrylo0, unsigned long entrylo1, +- unsigned long entryhi, unsigned long pagemask) ++ unsigned long entryhi, unsigned long pagemask) + { + unsigned long flags; + unsigned long wired; +@@ -315,9 +277,9 @@ + write_c0_entryhi(entryhi); + write_c0_entrylo0(entrylo0); + write_c0_entrylo1(entrylo1); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_write_indexed(); +- BARRIER; ++ tlbw_use_hazard(); + + write_c0_entryhi(old_ctx); + BARRIER; +@@ -355,17 +317,15 @@ + } + + write_c0_index(temp_tlb_entry); +- BARRIER; + write_c0_pagemask(pagemask); + write_c0_entryhi(entryhi); + write_c0_entrylo0(entrylo0); + write_c0_entrylo1(entrylo1); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_write_indexed(); +- BARRIER; ++ tlbw_use_hazard(); + + write_c0_entryhi(old_ctx); +- BARRIER; + write_c0_pagemask(old_pagemask); + out: + local_irq_restore(flags); +@@ -375,7 +335,7 @@ + static void __init probe_tlb(unsigned long config) + { + struct cpuinfo_mips *c = ¤t_cpu_data; +- unsigned int reg; ++ unsigned int config1; + + /* + * If this isn't a MIPS32 / MIPS64 compliant CPU. Config 1 register +@@ -385,16 +345,16 @@ + if ((c->processor_id & 0xff0000) == PRID_COMP_LEGACY) + return; + +- reg = read_c0_config1(); ++ config1 = read_c0_config1(); + if (!((config >> 7) & 3)) + panic("No TLB present"); + +- c->tlbsize = ((reg >> 25) & 0x3f) + 1; ++ c->tlbsize = ((config1 >> 25) & 0x3f) + 1; + } + + void __init r4k_tlb_init(void) + { +- u32 config = read_c0_config(); ++ unsigned int config = read_c0_config(); + + /* + * You should never change this register: +diff -Nur linux-2.4.30/arch/mips/mm/tlbex-mips32.S linux-2.4.30-mips/arch/mips/mm/tlbex-mips32.S +--- linux-2.4.30/arch/mips/mm/tlbex-mips32.S 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/mm/tlbex-mips32.S 2004-11-29 00:33:15.000000000 +0100 +@@ -196,7 +196,7 @@ + .set noat; \ + SAVE_ALL; \ + mfc0 a2, CP0_BADVADDR; \ +- STI; \ ++ KMODE; \ + .set at; \ + move a0, sp; \ + jal do_page_fault; \ +diff -Nur linux-2.4.30/arch/mips/mm/tlbex-r4k.S linux-2.4.30-mips/arch/mips/mm/tlbex-r4k.S +--- linux-2.4.30/arch/mips/mm/tlbex-r4k.S 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips/mm/tlbex-r4k.S 2004-11-25 23:18:38.000000000 +0100 +@@ -184,13 +184,10 @@ + P_MTC0 k0, CP0_ENTRYLO0 # load it + PTE_SRL k1, k1, 6 # convert to entrylo1 + P_MTC0 k1, CP0_ENTRYLO1 # load it +- b 1f +- rm9000_tlb_hazard ++ mtc0_tlbw_hazard + tlbwr # write random tlb entry +-1: +- nop +- rm9000_tlb_hazard +- eret # return from trap ++ tlbw_eret_hazard ++ eret + END(except_vec0_r4000) + + /* TLB refill, EXL == 0, R4600 version */ +@@ -468,13 +465,10 @@ + PTE_PRESENT(k0, k1, nopage_tlbl) + PTE_MAKEVALID(k0, k1) + PTE_RELOAD(k1, k0) +- rm9000_tlb_hazard +- nop +- b 1f +- tlbwi +-1: ++ mtc0_tlbw_hazard ++ tlbwi + nop +- rm9000_tlb_hazard ++ tlbw_eret_hazard + .set mips3 + eret + .set mips0 +@@ -496,13 +490,10 @@ + PTE_WRITABLE(k0, k1, nopage_tlbs) + PTE_MAKEWRITE(k0, k1) + PTE_RELOAD(k1, k0) +- rm9000_tlb_hazard +- nop +- b 1f +- tlbwi +-1: ++ mtc0_tlbw_hazard ++ tlbwi + nop +- rm9000_tlb_hazard ++ tlbw_eret_hazard + .set mips3 + eret + .set mips0 +@@ -529,13 +520,10 @@ + + /* Now reload the entry into the tlb. */ + PTE_RELOAD(k1, k0) +- rm9000_tlb_hazard +- nop +- b 1f +- tlbwi +-1: +- rm9000_tlb_hazard ++ mtc0_tlbw_hazard ++ tlbwi + nop ++ tlbw_eret_hazard + .set mips3 + eret + .set mips0 +diff -Nur linux-2.4.30/arch/mips64/defconfig linux-2.4.30-mips/arch/mips64/defconfig +--- linux-2.4.30/arch/mips64/defconfig 2005-01-19 15:09:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/defconfig 2005-03-18 13:13:23.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -470,9 +470,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -658,7 +660,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips64/defconfig-atlas linux-2.4.30-mips/arch/mips64/defconfig-atlas +--- linux-2.4.30/arch/mips64/defconfig-atlas 2005-01-19 15:09:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/defconfig-atlas 2005-03-18 13:13:23.000000000 +0100 +@@ -28,8 +28,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -232,11 +232,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -314,9 +309,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -474,7 +471,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips64/defconfig-decstation linux-2.4.30-mips/arch/mips64/defconfig-decstation +--- linux-2.4.30/arch/mips64/defconfig-decstation 2005-01-19 15:09:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/defconfig-decstation 2005-03-18 13:13:23.000000000 +0100 +@@ -28,8 +28,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -224,11 +224,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -307,9 +302,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -477,7 +474,6 @@ + CONFIG_SERIAL_DEC_CONSOLE=y + # CONFIG_DZ is not set + CONFIG_ZS=y +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips64/defconfig-ip22 linux-2.4.30-mips/arch/mips64/defconfig-ip22 +--- linux-2.4.30/arch/mips64/defconfig-ip22 2005-01-19 15:09:31.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/defconfig-ip22 2005-03-18 13:13:23.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -235,11 +235,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -319,9 +314,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -488,7 +485,6 @@ + # CONFIG_SERIAL_TXX9_CONSOLE is not set + # CONFIG_TXX927_SERIAL is not set + CONFIG_IP22_SERIAL=y +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips64/defconfig-ip27 linux-2.4.30-mips/arch/mips64/defconfig-ip27 +--- linux-2.4.30/arch/mips64/defconfig-ip27 2005-01-19 15:09:31.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/defconfig-ip27 2005-03-18 13:13:23.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -470,9 +470,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -658,7 +660,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips64/defconfig-jaguar linux-2.4.30-mips/arch/mips64/defconfig-jaguar +--- linux-2.4.30/arch/mips64/defconfig-jaguar 2005-01-19 15:09:31.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/defconfig-jaguar 2005-03-18 13:13:23.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -227,11 +227,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -403,7 +398,6 @@ + # CONFIG_SERIAL_TXX9 is not set + # CONFIG_SERIAL_TXX9_CONSOLE is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips64/defconfig-malta linux-2.4.30-mips/arch/mips64/defconfig-malta +--- linux-2.4.30/arch/mips64/defconfig-malta 2005-01-19 15:09:31.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/defconfig-malta 2005-03-18 13:13:23.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -235,11 +235,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -317,9 +312,11 @@ + # CONFIG_SCSI_MEGARAID is not set + # CONFIG_SCSI_MEGARAID2 is not set + # CONFIG_SCSI_SATA is not set ++# CONFIG_SCSI_SATA_AHCI is not set + # CONFIG_SCSI_SATA_SVW is not set + # CONFIG_SCSI_ATA_PIIX is not set + # CONFIG_SCSI_SATA_NV is not set ++# CONFIG_SCSI_SATA_QSTOR is not set + # CONFIG_SCSI_SATA_PROMISE is not set + # CONFIG_SCSI_SATA_SX4 is not set + # CONFIG_SCSI_SATA_SIL is not set +@@ -477,7 +474,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips64/defconfig-ocelotc linux-2.4.30-mips/arch/mips64/defconfig-ocelotc +--- linux-2.4.30/arch/mips64/defconfig-ocelotc 2005-01-19 15:09:31.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/defconfig-ocelotc 2005-03-18 13:13:23.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -231,11 +231,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -453,7 +448,6 @@ + # CONFIG_SERIAL_TXX9 is not set + # CONFIG_SERIAL_TXX9_CONSOLE is not set + # CONFIG_TXX927_SERIAL is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips64/defconfig-sb1250-swarm linux-2.4.30-mips/arch/mips64/defconfig-sb1250-swarm +--- linux-2.4.30/arch/mips64/defconfig-sb1250-swarm 2005-01-19 15:09:31.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/defconfig-sb1250-swarm 2005-03-18 13:13:23.000000000 +0100 +@@ -30,8 +30,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -90,6 +90,7 @@ + # CONFIG_SIBYTE_TBPROF is not set + CONFIG_SIBYTE_GENBUS_IDE=y + CONFIG_SMP_CAPABLE=y ++CONFIG_MIPS_RTC=y + # CONFIG_SNI_RM200_PCI is not set + # CONFIG_TANBAC_TB0226 is not set + # CONFIG_TANBAC_TB0229 is not set +@@ -253,11 +254,6 @@ + # + # CONFIG_IPX is not set + # CONFIG_ATALK is not set +- +-# +-# Appletalk devices +-# +-# CONFIG_DEV_APPLETALK is not set + # CONFIG_DECNET is not set + # CONFIG_BRIDGE is not set + # CONFIG_X25 is not set +@@ -432,7 +428,6 @@ + CONFIG_SIBYTE_SB1250_DUART=y + CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y + CONFIG_SERIAL_CONSOLE=y +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + CONFIG_UNIX98_PTYS=y + CONFIG_UNIX98_PTY_COUNT=256 + +diff -Nur linux-2.4.30/arch/mips64/defconfig-sead linux-2.4.30-mips/arch/mips64/defconfig-sead +--- linux-2.4.30/arch/mips64/defconfig-sead 2005-01-19 15:09:31.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/defconfig-sead 2005-03-18 13:13:23.000000000 +0100 +@@ -28,8 +28,8 @@ + # CONFIG_MIPS_PB1000 is not set + # CONFIG_MIPS_PB1100 is not set + # CONFIG_MIPS_PB1500 is not set +-# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_PB1550 is not set ++# CONFIG_MIPS_HYDROGEN3 is not set + # CONFIG_MIPS_XXS1500 is not set + # CONFIG_MIPS_MTX1 is not set + # CONFIG_COGENT_CSB250 is not set +@@ -242,7 +242,6 @@ + CONFIG_SERIAL_CONSOLE=y + # CONFIG_SERIAL_EXTENDED is not set + # CONFIG_SERIAL_NONSTANDARD is not set +-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set + # CONFIG_UNIX98_PTYS is not set + + # +diff -Nur linux-2.4.30/arch/mips64/kernel/binfmt_elfn32.c linux-2.4.30-mips/arch/mips64/kernel/binfmt_elfn32.c +--- linux-2.4.30/arch/mips64/kernel/binfmt_elfn32.c 2003-08-25 13:44:40.000000000 +0200 ++++ linux-2.4.30-mips/arch/mips64/kernel/binfmt_elfn32.c 2005-01-26 03:40:47.000000000 +0100 +@@ -116,4 +116,7 @@ + #undef MODULE_DESCRIPTION + #undef MODULE_AUTHOR + ++#undef TASK_SIZE ++#define TASK_SIZE TASK_SIZE32 ++ + #include "../../../fs/binfmt_elf.c" +diff -Nur linux-2.4.30/arch/mips64/kernel/binfmt_elfo32.c linux-2.4.30-mips/arch/mips64/kernel/binfmt_elfo32.c +--- linux-2.4.30/arch/mips64/kernel/binfmt_elfo32.c 2003-08-25 13:44:40.000000000 +0200 ++++ linux-2.4.30-mips/arch/mips64/kernel/binfmt_elfo32.c 2005-01-26 03:40:47.000000000 +0100 +@@ -137,4 +137,7 @@ + #undef MODULE_DESCRIPTION + #undef MODULE_AUTHOR + ++#undef TASK_SIZE ++#define TASK_SIZE TASK_SIZE32 ++ + #include "../../../fs/binfmt_elf.c" +diff -Nur linux-2.4.30/arch/mips64/kernel/head.S linux-2.4.30-mips/arch/mips64/kernel/head.S +--- linux-2.4.30/arch/mips64/kernel/head.S 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/kernel/head.S 2004-11-22 14:38:26.000000000 +0100 +@@ -91,6 +91,21 @@ + __INIT + + NESTED(kernel_entry, 16, sp) # kernel entry point ++ .set push ++ /* ++ * For the moment disable interrupts, mark the kernel mode and ++ * set ST0_KX so that the CPU does not spit fire when using ++ * 64-bit addresses. A full initialization of the CPU's status ++ * register is done later in per_cpu_trap_init(). ++ */ ++ mfc0 t0, CP0_STATUS ++ or t0, ST0_CU0|ST0_KX|0x1f ++ xor t0, 0x1f ++ mtc0 t0, CP0_STATUS ++ ++ .set noreorder ++ sll zero,3 # ehb ++ .set reorder + + ori sp, 0xf # align stack on 16 byte. + xori sp, 0xf +@@ -103,8 +118,6 @@ + + ARC64_TWIDDLE_PC + +- CLI # disable interrupts +- + /* + * The firmware/bootloader passes argc/argp/envp + * to us as arguments. But clear bss first because +@@ -125,6 +138,7 @@ + dsubu sp, 4*SZREG # init stack pointer + + j init_arch ++ .set pop + END(kernel_entry) + + #ifdef CONFIG_SMP +@@ -133,6 +147,23 @@ + * function after setting up the stack and gp registers. + */ + NESTED(smp_bootstrap, 16, sp) ++ .set push ++ /* ++ * For the moment disable interrupts and bootstrap exception ++ * vectors, mark the kernel mode and set ST0_KX so that the CPU ++ * does not spit fire when using 64-bit addresses. A full ++ * initialization of the CPU's status register is done later in ++ * per_cpu_trap_init(). ++ */ ++ mfc0 t0, CP0_STATUS ++ or t0, ST0_CU0|ST0_BEV|ST0_KX|0x1f ++ xor t0, ST0_BEV|0x1f ++ mtc0 t0, CP0_STATUS ++ ++ .set noreorder ++ sll zero,3 # ehb ++ .set reorder ++ + #ifdef CONFIG_SGI_IP27 + GET_NASID_ASM t1 + dli t0, KLDIR_OFFSET + (KLI_KERN_VARS * KLDIR_ENT_SIZE) + \ +@@ -146,19 +177,8 @@ + ARC64_TWIDDLE_PC + #endif /* CONFIG_SGI_IP27 */ + +- CLI +- +- /* +- * For the moment set ST0_KU so the CPU will not spit fire when +- * executing 64-bit instructions. The full initialization of the +- * CPU's status register is done later in per_cpu_trap_init(). +- */ +- mfc0 t0, CP0_STATUS +- or t0, ST0_KX +- mtc0 t0, CP0_STATUS +- + jal start_secondary # XXX: IP27: cboot +- ++ .set pop + END(smp_bootstrap) + #endif /* CONFIG_SMP */ + +diff -Nur linux-2.4.30/arch/mips64/kernel/ioctl32.c linux-2.4.30-mips/arch/mips64/kernel/ioctl32.c +--- linux-2.4.30/arch/mips64/kernel/ioctl32.c 2005-01-19 15:09:31.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/kernel/ioctl32.c 2005-01-26 03:36:17.000000000 +0100 +@@ -2352,7 +2352,7 @@ + IOCTL32_HANDLER(AUTOFS_IOC_SETTIMEOUT32, ioc_settimeout), + IOCTL32_DEFAULT(AUTOFS_IOC_EXPIRE), + IOCTL32_DEFAULT(AUTOFS_IOC_EXPIRE_MULTI), +- IOCTL32_DEFAULT(AUTOFS_IOC_PROTSUBVER), ++ IOCTL32_DEFAULT(AUTOFS_IOC_PROTOSUBVER), + IOCTL32_DEFAULT(AUTOFS_IOC_ASKREGHOST), + IOCTL32_DEFAULT(AUTOFS_IOC_TOGGLEREGHOST), + IOCTL32_DEFAULT(AUTOFS_IOC_ASKUMOUNT), +diff -Nur linux-2.4.30/arch/mips64/kernel/linux32.c linux-2.4.30-mips/arch/mips64/kernel/linux32.c +--- linux-2.4.30/arch/mips64/kernel/linux32.c 2005-04-04 03:42:19.000000000 +0200 ++++ linux-2.4.30-mips/arch/mips64/kernel/linux32.c 2005-03-18 13:13:23.000000000 +0100 +@@ -1187,72 +1187,19 @@ + lseek back to original location. They fail just like lseek does on + non-seekable files. */ + +-asmlinkage ssize_t sys32_pread(unsigned int fd, char * buf, +- size_t count, u32 unused, u64 a4, u64 a5) ++asmlinkage ssize_t sys32_pread(unsigned int fd, char *buf, ++ size_t count, u32 unused, u64 a4, u64 a5) + { +- ssize_t ret; +- struct file * file; +- ssize_t (*read)(struct file *, char *, size_t, loff_t *); +- loff_t pos; +- +- ret = -EBADF; +- file = fget(fd); +- if (!file) +- goto bad_file; +- if (!(file->f_mode & FMODE_READ)) +- goto out; +- pos = merge_64(a4, a5); +- ret = locks_verify_area(FLOCK_VERIFY_READ, file->f_dentry->d_inode, +- file, pos, count); +- if (ret) +- goto out; +- ret = -EINVAL; +- if (!file->f_op || !(read = file->f_op->read)) +- goto out; +- if (pos < 0) +- goto out; +- ret = read(file, buf, count, &pos); +- if (ret > 0) +- dnotify_parent(file->f_dentry, DN_ACCESS); +-out: +- fput(file); +-bad_file: +- return ret; ++ return sys_pread(fd, buf, count, merge_64(a4, a5)); + } + + asmlinkage ssize_t sys32_pwrite(unsigned int fd, const char * buf, + size_t count, u32 unused, u64 a4, u64 a5) + { +- ssize_t ret; +- struct file * file; +- ssize_t (*write)(struct file *, const char *, size_t, loff_t *); +- loff_t pos; +- +- ret = -EBADF; +- file = fget(fd); +- if (!file) +- goto bad_file; +- if (!(file->f_mode & FMODE_WRITE)) +- goto out; +- pos = merge_64(a4, a5); +- ret = locks_verify_area(FLOCK_VERIFY_WRITE, file->f_dentry->d_inode, +- file, pos, count); +- if (ret) +- goto out; +- ret = -EINVAL; +- if (!file->f_op || !(write = file->f_op->write)) +- goto out; +- if (pos < 0) +- goto out; +- +- ret = write(file, buf, count, &pos); +- if (ret > 0) +- dnotify_parent(file->f_dentry, DN_MODIFY); +-out: +- fput(file); +-bad_file: +- return ret; ++ return sys_pwrite(fd, buf, count, merge_64(a4, a5)); + } ++ ++ + /* + * Ooo, nasty. We need here to frob 32-bit unsigned longs to + * 64-bit unsigned longs. +diff -Nur linux-2.4.30/arch/mips64/kernel/scall_64.S linux-2.4.30-mips/arch/mips64/kernel/scall_64.S +--- linux-2.4.30/arch/mips64/kernel/scall_64.S 2005-01-19 15:09:32.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/kernel/scall_64.S 2005-02-07 22:21:54.000000000 +0100 +@@ -102,15 +102,14 @@ + + trace_a_syscall: + SAVE_STATIC +- sd t2,PT_R1(sp) ++ move s0, t2 + jal syscall_trace +- ld t2,PT_R1(sp) + + ld a0, PT_R4(sp) # Restore argument registers + ld a1, PT_R5(sp) + ld a2, PT_R6(sp) + ld a3, PT_R7(sp) +- jalr t2 ++ jalr s0 + + li t0, -EMAXERRNO - 1 # error? + sltu t0, t0, v0 +diff -Nur linux-2.4.30/arch/mips64/kernel/scall_n32.S linux-2.4.30-mips/arch/mips64/kernel/scall_n32.S +--- linux-2.4.30/arch/mips64/kernel/scall_n32.S 2005-01-19 15:09:32.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/kernel/scall_n32.S 2005-02-07 22:21:54.000000000 +0100 +@@ -106,15 +106,14 @@ + + trace_a_syscall: + SAVE_STATIC +- sd t2,PT_R1(sp) ++ move s0, t2 + jal syscall_trace +- ld t2,PT_R1(sp) + + ld a0, PT_R4(sp) # Restore argument registers + ld a1, PT_R5(sp) + ld a2, PT_R6(sp) + ld a3, PT_R7(sp) +- jalr t2 ++ jalr s0 + + li t0, -EMAXERRNO - 1 # error? + sltu t0, t0, v0 +diff -Nur linux-2.4.30/arch/mips64/kernel/scall_o32.S linux-2.4.30-mips/arch/mips64/kernel/scall_o32.S +--- linux-2.4.30/arch/mips64/kernel/scall_o32.S 2005-01-19 15:09:32.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/kernel/scall_o32.S 2005-02-14 04:52:57.000000000 +0100 +@@ -118,9 +118,8 @@ + sd a6, PT_R10(sp) + sd a7, PT_R11(sp) + +- sd t2,PT_R1(sp) ++ move s0, t2 + jal syscall_trace +- ld t2,PT_R1(sp) + + ld a0, PT_R4(sp) # Restore argument registers + ld a1, PT_R5(sp) +@@ -129,7 +128,7 @@ + ld a4, PT_R8(sp) + ld a5, PT_R9(sp) + +- jalr t2 ++ jalr s0 + + li t0, -EMAXERRNO - 1 # error? + sltu t0, t0, v0 +@@ -576,6 +575,8 @@ + sys_call_table: + syscalltable + ++ .purgem sys ++ + .macro sys function, nargs + .byte \nargs + .endm +diff -Nur linux-2.4.30/arch/mips64/kernel/setup.c linux-2.4.30-mips/arch/mips64/kernel/setup.c +--- linux-2.4.30/arch/mips64/kernel/setup.c 2005-01-19 15:09:32.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/kernel/setup.c 2004-11-22 14:38:26.000000000 +0100 +@@ -129,14 +129,6 @@ + */ + load_mmu(); + +- /* +- * On IP27, I am seeing the TS bit set when the kernel is loaded. +- * Maybe because the kernel is in ckseg0 and not xkphys? Clear it +- * anyway ... +- */ +- clear_c0_status(ST0_BEV|ST0_TS|ST0_CU1|ST0_CU2|ST0_CU3); +- set_c0_status(ST0_CU0|ST0_KX|ST0_SX|ST0_FR); +- + start_kernel(); + } + +diff -Nur linux-2.4.30/arch/mips64/kernel/signal_n32.c linux-2.4.30-mips/arch/mips64/kernel/signal_n32.c +--- linux-2.4.30/arch/mips64/kernel/signal_n32.c 2005-01-19 15:09:33.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/kernel/signal_n32.c 2005-02-07 22:10:53.000000000 +0100 +@@ -68,7 +68,7 @@ + }; + + extern asmlinkage int restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc); +-extern int inline setup_sigcontext(struct pt_regs *regs, struct sigcontext *sc); ++extern int setup_sigcontext(struct pt_regs *regs, struct sigcontext *sc); + + asmlinkage void sysn32_rt_sigreturn(abi64_no_regargs, struct pt_regs regs) + { +diff -Nur linux-2.4.30/arch/mips64/kernel/traps.c linux-2.4.30-mips/arch/mips64/kernel/traps.c +--- linux-2.4.30/arch/mips64/kernel/traps.c 2005-01-19 15:09:33.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/kernel/traps.c 2005-04-12 22:25:34.000000000 +0200 +@@ -462,9 +462,10 @@ + } + ll_task = current; + ++ compute_return_epc(regs); ++ + regs->regs[(opcode & RT) >> 16] = value; + +- compute_return_epc(regs); + return; + + sig: +@@ -495,8 +496,8 @@ + goto sig; + } + if (ll_bit == 0 || ll_task != current) { +- regs->regs[reg] = 0; + compute_return_epc(regs); ++ regs->regs[reg] = 0; + return; + } + +@@ -505,9 +506,9 @@ + goto sig; + } + ++ compute_return_epc(regs); + regs->regs[reg] = 1; + +- compute_return_epc(regs); + return; + + sig: +@@ -809,13 +810,18 @@ + void __init per_cpu_trap_init(void) + { + unsigned int cpu = smp_processor_id(); ++ unsigned int status_set = ST0_CU0|ST0_FR|ST0_KX|ST0_SX|ST0_UX; + +- /* Some firmware leaves the BEV flag set, clear it. */ +- clear_c0_status(ST0_CU1|ST0_CU2|ST0_CU3|ST0_BEV); +- set_c0_status(ST0_CU0|ST0_FR|ST0_KX|ST0_SX|ST0_UX); +- ++ /* ++ * Disable coprocessors, enable 64-bit addressing and set FPU ++ * for the 32/32 FPR register model. Reset the BEV flag that ++ * some firmware may have left set and the TS bit (for IP27). ++ * Set XX for ISA IV code to work. ++ */ + if (current_cpu_data.isa_level == MIPS_CPU_ISA_IV) +- set_c0_status(ST0_XX); ++ status_set |= ST0_XX; ++ change_c0_status(ST0_CU|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX, ++ status_set); + + /* + * Some MIPS CPUs have a dedicated interrupt vector which reduces the +@@ -825,13 +831,11 @@ + set_c0_cause(CAUSEF_IV); + + cpu_data[cpu].asid_cache = ASID_FIRST_VERSION; +- write_c0_context(((long)(&pgd_current[cpu])) << 23); +- write_c0_wired(0); ++ TLBMISS_HANDLER_SETUP(); + + atomic_inc(&init_mm.mm_count); + current->active_mm = &init_mm; +- if (current->mm) +- BUG(); ++ BUG_ON(current->mm); + enter_lazy_tlb(&init_mm, current, cpu); + } + +@@ -842,8 +846,6 @@ + extern char except_vec4; + unsigned long i; + +- per_cpu_trap_init(); +- + /* Copy the generic exception handlers to their final destination. */ + memcpy((void *) KSEG0 , &except_vec0_generic, 0x80); + memcpy((void *)(KSEG0 + 0x180), &except_vec3_generic, 0x80); +@@ -933,6 +935,5 @@ + + flush_icache_range(KSEG0, KSEG0 + 0x400); + +- atomic_inc(&init_mm.mm_count); /* XXX UP? */ +- current->active_mm = &init_mm; ++ per_cpu_trap_init(); + } +diff -Nur linux-2.4.30/arch/mips64/mm/c-r4k.c linux-2.4.30-mips/arch/mips64/mm/c-r4k.c +--- linux-2.4.30/arch/mips64/mm/c-r4k.c 2005-01-19 15:09:33.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/mm/c-r4k.c 2005-02-06 22:55:42.000000000 +0100 +@@ -867,9 +867,16 @@ + * normally they'd suffer from aliases but magic in the hardware deals + * with that for us so we don't need to take care ourselves. + */ +- if (c->cputype != CPU_R10000 && c->cputype != CPU_R12000) +- if (c->dcache.waysize > PAGE_SIZE) +- c->dcache.flags |= MIPS_CACHE_ALIASES; ++ switch (c->cputype) { ++ case CPU_R10000: ++ case CPU_R12000: ++ break; ++ case CPU_24K: ++ if (!(read_c0_config7() & (1 << 16))) ++ default: ++ if (c->dcache.waysize > PAGE_SIZE) ++ c->dcache.flags |= MIPS_CACHE_ALIASES; ++ } + + switch (c->cputype) { + case CPU_20KC: +@@ -1070,9 +1077,6 @@ + setup_scache(); + coherency_setup(); + +- if (c->dcache.sets * c->dcache.ways > PAGE_SIZE) +- c->dcache.flags |= MIPS_CACHE_ALIASES; +- + r4k_blast_dcache_page_setup(); + r4k_blast_dcache_page_indexed_setup(); + r4k_blast_dcache_setup(); +diff -Nur linux-2.4.30/arch/mips64/mm/cerr-sb1.c linux-2.4.30-mips/arch/mips64/mm/cerr-sb1.c +--- linux-2.4.30/arch/mips64/mm/cerr-sb1.c 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/mm/cerr-sb1.c 2004-12-13 18:37:26.000000000 +0100 +@@ -252,14 +252,14 @@ + + /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */ + static const uint64_t mask_72_64[8] = { +- 0x0738C808099264FFL, +- 0x38C808099264FF07L, +- 0xC808099264FF0738L, +- 0x08099264FF0738C8L, +- 0x099264FF0738C808L, +- 0x9264FF0738C80809L, +- 0x64FF0738C8080992L, +- 0xFF0738C808099264L ++ 0x0738C808099264FFULL, ++ 0x38C808099264FF07ULL, ++ 0xC808099264FF0738ULL, ++ 0x08099264FF0738C8ULL, ++ 0x099264FF0738C808ULL, ++ 0x9264FF0738C80809ULL, ++ 0x64FF0738C8080992ULL, ++ 0xFF0738C808099264ULL + }; + + /* Calculate the parity on a range of bits */ +@@ -331,9 +331,9 @@ + ((lru >> 4) & 0x3), + ((lru >> 6) & 0x3)); + } +- va = (taglo & 0xC0000FFFFFFFE000) | addr; ++ va = (taglo & 0xC0000FFFFFFFE000ULL) | addr; + if ((taglo & (1 << 31)) && (((taglo >> 62) & 0x3) == 3)) +- va |= 0x3FFFF00000000000; ++ va |= 0x3FFFF00000000000ULL; + valid = ((taghi >> 29) & 1); + if (valid) { + tlo_tmp = taglo & 0xfff3ff; +@@ -474,7 +474,7 @@ + : "r" ((way << 13) | addr)); + + taglo = ((unsigned long long)taglohi << 32) | taglolo; +- pa = (taglo & 0xFFFFFFE000) | addr; ++ pa = (taglo & 0xFFFFFFE000ULL) | addr; + if (way == 0) { + lru = (taghi >> 14) & 0xff; + prom_printf("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n", +diff -Nur linux-2.4.30/arch/mips64/mm/tlb-r4k.c linux-2.4.30-mips/arch/mips64/mm/tlb-r4k.c +--- linux-2.4.30/arch/mips64/mm/tlb-r4k.c 2005-01-19 15:09:33.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/mm/tlb-r4k.c 2004-11-25 23:18:38.000000000 +0100 +@@ -1,24 +1,12 @@ + /* +- * Carsten Langgaard, carstenl@mips.com +- * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. +- * +- * This program is free software; you can distribute it and/or modify it +- * under the terms of the GNU General Public License (Version 2) as +- * published by the Free Software Foundation. +- * +- * This program is distributed in the hope it will be useful, but WITHOUT +- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file "COPYING" in the main directory of this archive + * for more details. + * +- * You should have received a copy of the GNU General Public License along +- * with this program; if not, write to the Free Software Foundation, Inc., +- * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. +- * +- * MIPS64 CPU variant specific MMU routines. +- * These routine are not optimized in any way, they are done in a generic way +- * so they can be used on all MIPS64 compliant CPUs, and also done in an +- * attempt not to break anything for the R4xx0 style CPUs. ++ * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) ++ * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org ++ * Carsten Langgaard, carstenl@mips.com ++ * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. + */ + #include <linux/init.h> + #include <linux/sched.h> +@@ -30,9 +18,6 @@ + #include <asm/pgtable.h> + #include <asm/system.h> + +-#undef DEBUG_TLB +-#undef DEBUG_TLBUPDATE +- + extern void except_vec1_r4k(void); + + /* CP0 hazard avoidance. */ +@@ -46,31 +31,23 @@ + unsigned long old_ctx; + int entry; + +-#ifdef DEBUG_TLB +- printk("[tlball]"); +-#endif +- + local_irq_save(flags); + /* Save old context and create impossible VPN2 value */ + old_ctx = read_c0_entryhi(); +- write_c0_entryhi(XKPHYS); + write_c0_entrylo0(0); + write_c0_entrylo1(0); +- BARRIER; + + entry = read_c0_wired(); + + /* Blast 'em all away. */ +- while(entry < current_cpu_data.tlbsize) { +- /* Make sure all entries differ. */ +- write_c0_entryhi(XKPHYS+entry*0x2000); ++ while (entry < current_cpu_data.tlbsize) { ++ write_c0_entryhi(XKPHYS + entry*0x2000); + write_c0_index(entry); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_write_indexed(); +- BARRIER; + entry++; + } +- BARRIER; ++ tlbw_use_hazard(); + write_c0_entryhi(old_ctx); + local_irq_restore(flags); + } +@@ -79,12 +56,8 @@ + { + int cpu = smp_processor_id(); + +- if (cpu_context(cpu, mm) != 0) { +-#ifdef DEBUG_TLB +- printk("[tlbmm<%d>]", mm->context); +-#endif ++ if (cpu_context(cpu, mm) != 0) + drop_mmu_context(mm,cpu); +- } + } + + void local_flush_tlb_range(struct mm_struct *mm, unsigned long start, +@@ -96,10 +69,6 @@ + unsigned long flags; + int size; + +-#ifdef DEBUG_TLB +- printk("[tlbrange<%02x,%08lx,%08lx>]", (mm->context & ASID_MASK), +- start, end); +-#endif + local_irq_save(flags); + size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; + size = (size + 1) >> 1; +@@ -110,25 +79,25 @@ + start &= (PAGE_MASK << 1); + end += ((PAGE_SIZE << 1) - 1); + end &= (PAGE_MASK << 1); +- while(start < end) { ++ while (start < end) { + int idx; + + write_c0_entryhi(start | newpid); + start += (PAGE_SIZE << 1); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_probe(); + BARRIER; + idx = read_c0_index(); + write_c0_entrylo0(0); + write_c0_entrylo1(0); +- if(idx < 0) ++ if (idx < 0) + continue; + /* Make sure all entries differ. */ + write_c0_entryhi(XKPHYS+idx*0x2000); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_write_indexed(); +- BARRIER; + } ++ tlbw_use_hazard(); + write_c0_entryhi(oldpid); + } else { + drop_mmu_context(mm, cpu); +@@ -145,28 +114,26 @@ + unsigned long flags; + unsigned long oldpid, newpid, idx; + +-#ifdef DEBUG_TLB +- printk("[tlbpage<%d,%08lx>]", vma->vm_mm->context, page); +-#endif + newpid = cpu_asid(cpu, vma->vm_mm); + page &= (PAGE_MASK << 1); + local_irq_save(flags); + oldpid = read_c0_entryhi(); + write_c0_entryhi(page | newpid); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_probe(); + BARRIER; + idx = read_c0_index(); + write_c0_entrylo0(0); + write_c0_entrylo1(0); +- if(idx < 0) ++ if (idx < 0) + goto finish; + /* Make sure all entries differ. */ + write_c0_entryhi(XKPHYS+idx*0x2000); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_write_indexed(); ++ tlbw_use_hazard(); ++ + finish: +- BARRIER; + write_c0_entryhi(oldpid); + local_irq_restore(flags); + } +@@ -186,7 +153,7 @@ + + local_irq_save(flags); + write_c0_entryhi(page); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_probe(); + BARRIER; + idx = read_c0_index(); +@@ -195,10 +162,12 @@ + if (idx >= 0) { + /* Make sure all entries differ. */ + write_c0_entryhi(KSEG0+idx*0x2000); ++ mtc0_tlbw_hazard(); + tlb_write_indexed(); ++ tlbw_use_hazard(); + } +- BARRIER; + write_c0_entryhi(oldpid); ++ + local_irq_restore(flags); + } + +@@ -208,7 +177,6 @@ + void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte) + { + unsigned long flags; +- unsigned int asid; + pgd_t *pgdp; + pmd_t *pmdp; + pte_t *ptep; +@@ -222,70 +190,58 @@ + + pid = read_c0_entryhi() & ASID_MASK; + +-#ifdef DEBUG_TLB +- if ((pid != (cpu_asid(smp_processor_id(), vma->vm_mm))) || +- (cpu_context(smp_processor_id(), vma->vm_mm) == 0)) { +- printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d" +- "tlbpid=%d\n", (int) (cpu_context(smp_processor_id(), +- vma->vm_mm) & ASID_MASK), pid); +- } +-#endif +- + local_irq_save(flags); + address &= (PAGE_MASK << 1); +- write_c0_entryhi(address | (pid)); ++ write_c0_entryhi(address | pid); + pgdp = pgd_offset(vma->vm_mm, address); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_probe(); + BARRIER; + pmdp = pmd_offset(pgdp, address); + idx = read_c0_index(); + ptep = pte_offset(pmdp, address); +- BARRIER; + write_c0_entrylo0(pte_val(*ptep++) >> 6); + write_c0_entrylo1(pte_val(*ptep) >> 6); +- write_c0_entryhi(address | (pid)); +- BARRIER; +- if(idx < 0) { ++ write_c0_entryhi(address | pid); ++ mtc0_tlbw_hazard(); ++ if (idx < 0) + tlb_write_random(); +- } else { ++ else + tlb_write_indexed(); +- } +- BARRIER; ++ tlbw_use_hazard(); + write_c0_entryhi(pid); +- BARRIER; + local_irq_restore(flags); + } + +-void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1, +- unsigned long entryhi, unsigned long pagemask) ++void __init add_wired_entry(unsigned long entrylo0, unsigned long entrylo1, ++ unsigned long entryhi, unsigned long pagemask) + { +- unsigned long flags; +- unsigned long wired; +- unsigned long old_pagemask; +- unsigned long old_ctx; +- +- local_irq_save(flags); +- /* Save old context and create impossible VPN2 value */ +- old_ctx = (read_c0_entryhi() & ASID_MASK); +- old_pagemask = read_c0_pagemask(); +- wired = read_c0_wired(); +- write_c0_wired(wired + 1); +- write_c0_index(wired); +- BARRIER; +- write_c0_pagemask(pagemask); +- write_c0_entryhi(entryhi); +- write_c0_entrylo0(entrylo0); +- write_c0_entrylo1(entrylo1); +- BARRIER; +- tlb_write_indexed(); +- BARRIER; +- +- write_c0_entryhi(old_ctx); +- BARRIER; +- write_c0_pagemask(old_pagemask); +- local_flush_tlb_all(); +- local_irq_restore(flags); ++ unsigned long flags; ++ unsigned long wired; ++ unsigned long old_pagemask; ++ unsigned long old_ctx; ++ ++ local_irq_save(flags); ++ /* Save old context and create impossible VPN2 value */ ++ old_ctx = read_c0_entryhi() & ASID_MASK; ++ old_pagemask = read_c0_pagemask(); ++ wired = read_c0_wired(); ++ write_c0_wired(wired + 1); ++ write_c0_index(wired); ++ BARRIER; ++ write_c0_pagemask(pagemask); ++ write_c0_entryhi(entryhi); ++ write_c0_entrylo0(entrylo0); ++ write_c0_entrylo1(entrylo1); ++ mtc0_tlbw_hazard(); ++ tlb_write_indexed(); ++ tlbw_use_hazard(); ++ ++ write_c0_entryhi(old_ctx); ++ BARRIER; ++ write_c0_pagemask(old_pagemask); ++ local_flush_tlb_all(); ++ local_irq_restore(flags); + } + + /* +@@ -317,17 +273,15 @@ + } + + write_c0_index(temp_tlb_entry); +- BARRIER; + write_c0_pagemask(pagemask); + write_c0_entryhi(entryhi); + write_c0_entrylo0(entrylo0); + write_c0_entrylo1(entrylo1); +- BARRIER; ++ mtc0_tlbw_hazard(); + tlb_write_indexed(); +- BARRIER; ++ tlbw_use_hazard(); + + write_c0_entryhi(old_ctx); +- BARRIER; + write_c0_pagemask(old_pagemask); + out: + local_irq_restore(flags); +@@ -348,15 +302,23 @@ + return; + + config1 = read_c0_config1(); +- if (!((config1 >> 7) & 3)) +- panic("No MMU present"); ++ if (!((config >> 7) & 3)) ++ panic("No TLB present"); + + c->tlbsize = ((config1 >> 25) & 0x3f) + 1; + } + + void __init r4k_tlb_init(void) + { +- unsigned long config = read_c0_config(); ++ unsigned int config = read_c0_config(); ++ ++ /* ++ * You should never change this register: ++ * - On R4600 1.7 the tlbp never hits for pages smaller than ++ * the value in the c0_pagemask register. ++ * - The entire mm handling assumes the c0_pagemask register to ++ * be set for 4kb pages. ++ */ + probe_tlb(config); + write_c0_pagemask(PM_DEFAULT_MASK); + write_c0_wired(0); +diff -Nur linux-2.4.30/arch/mips64/mm/tlbex-r4k.S linux-2.4.30-mips/arch/mips64/mm/tlbex-r4k.S +--- linux-2.4.30/arch/mips64/mm/tlbex-r4k.S 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.30-mips/arch/mips64/mm/tlbex-r4k.S 2004-11-25 23:18:38.000000000 +0100 +@@ -151,11 +151,9 @@ + ld k0, 0(k1) # get even pte + ld k1, 8(k1) # get odd pte + PTE_RELOAD k0 k1 +- rm9000_tlb_hazard +- b 1f +- tlbwr +-1: nop +- rm9000_tlb_hazard ++ mtc0_tlbw_hazard ++ tlbwr ++1: tlbw_eret_hazard + eret + + 9: # handle the vmalloc range +@@ -163,11 +161,9 @@ + ld k0, 0(k1) # get even pte + ld k1, 8(k1) # get odd pte + PTE_RELOAD k0 k1 +- rm9000_tlb_hazard +- b 1f +- tlbwr +-1: nop +- rm9000_tlb_hazard ++ mtc0_tlbw_hazard ++ tlbwr ++1: tlbw_eret_hazard + eret + END(handle_vec1_r4k) + +@@ -195,10 +191,9 @@ + ld k0, 0(k1) # get even pte + ld k1, 8(k1) # get odd pte + PTE_RELOAD k0 k1 +- rm9000_tlb_hazard +- nop ++ mtc0_tlbw_hazard + tlbwr +- rm9000_tlb_hazard ++ tlbw_eret_hazard + eret + + 9: # handle the vmalloc range +@@ -206,10 +201,9 @@ + ld k0, 0(k1) # get even pte + ld k1, 8(k1) # get odd pte + PTE_RELOAD k0 k1 +- rm9000_tlb_hazard +- nop ++ mtc0_tlbw_hazard + tlbwr +- rm9000_tlb_hazard ++ tlbw_eret_hazard + eret + END(handle_vec1_r10k) + +diff -Nur linux-2.4.30/drivers/char/Config.in linux-2.4.30-mips/drivers/char/Config.in +--- linux-2.4.30/drivers/char/Config.in 2004-08-08 01:26:04.000000000 +0200 ++++ linux-2.4.30-mips/drivers/char/Config.in 2005-02-11 22:09:56.000000000 +0100 +@@ -313,14 +313,11 @@ + if [ "$CONFIG_OBSOLETE" = "y" -a "$CONFIG_ALPHA_BOOK1" = "y" ]; then + bool 'Tadpole ANA H8 Support (OBSOLETE)' CONFIG_H8 + fi +-if [ "$CONFIG_MIPS" = "y" -a "$CONFIG_NEW_TIME_C" = "y" ]; then +- tristate 'Generic MIPS RTC Support' CONFIG_MIPS_RTC +-fi + if [ "$CONFIG_SGI_IP22" = "y" ]; then +- bool 'SGI DS1286 RTC support' CONFIG_SGI_DS1286 ++ tristate 'Dallas DS1286 RTC support' CONFIG_DS1286 + fi + if [ "$CONFIG_SGI_IP27" = "y" ]; then +- bool 'SGI M48T35 RTC support' CONFIG_SGI_IP27_RTC ++ tristate 'SGI M48T35 RTC support' CONFIG_SGI_IP27_RTC + fi + if [ "$CONFIG_TOSHIBA_RBTX4927" = "y" -o "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then + tristate 'Dallas DS1742 RTC support' CONFIG_DS1742 +@@ -383,6 +380,11 @@ + source drivers/char/drm/Config.in + fi + fi ++ ++if [ "$CONFIG_X86" = "y" ]; then ++ tristate 'ACP Modem (Mwave) support' CONFIG_MWAVE ++fi ++ + endmenu + + if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then +@@ -391,6 +393,7 @@ + if [ "$CONFIG_SOC_AU1X00" = "y" ]; then + tristate ' Alchemy Au1x00 GPIO device support' CONFIG_AU1X00_GPIO + tristate ' Au1000/ADS7846 touchscreen support' CONFIG_TS_AU1X00_ADS7846 ++ #tristate ' Alchemy Au1550 PSC SPI support' CONFIG_AU1550_PSC_SPI + fi + if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then + tristate ' ITE GPIO' CONFIG_ITE_GPIO +diff -Nur linux-2.4.30/drivers/char/Makefile linux-2.4.30-mips/drivers/char/Makefile +--- linux-2.4.30/drivers/char/Makefile 2004-08-08 01:26:04.000000000 +0200 ++++ linux-2.4.30-mips/drivers/char/Makefile 2005-02-11 22:09:56.000000000 +0100 +@@ -48,7 +48,12 @@ + KEYBD = + endif + ifeq ($(CONFIG_VR41XX_KIU),y) +- KEYMAP = ++ ifeq ($(CONFIG_IBM_WORKPAD),y) ++ KEYMAP = ibm_workpad_keymap.o ++ endif ++ ifeq ($(CONFIG_VICTOR_MPC30X),y) ++ KEYMAP = victor_mpc30x_keymap.o ++ endif + KEYBD = vr41xx_keyb.o + endif + endif +@@ -251,7 +256,6 @@ + obj-$(CONFIG_RTC) += rtc.o + obj-$(CONFIG_GEN_RTC) += genrtc.o + obj-$(CONFIG_EFI_RTC) += efirtc.o +-obj-$(CONFIG_SGI_DS1286) += ds1286.o + obj-$(CONFIG_MIPS_RTC) += mips_rtc.o + obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o + ifeq ($(CONFIG_PPC),) +@@ -259,6 +263,7 @@ + endif + obj-$(CONFIG_TOSHIBA) += toshiba.o + obj-$(CONFIG_I8K) += i8k.o ++obj-$(CONFIG_DS1286) += ds1286.o + obj-$(CONFIG_DS1620) += ds1620.o + obj-$(CONFIG_DS1742) += ds1742.o + obj-$(CONFIG_INTEL_RNG) += i810_rng.o +@@ -269,6 +274,7 @@ + + obj-$(CONFIG_ITE_GPIO) += ite_gpio.o + obj-$(CONFIG_AU1X00_GPIO) += au1000_gpio.o ++obj-$(CONFIG_AU1550_PSC_SPI) += au1550_psc_spi.o + obj-$(CONFIG_AU1X00_USB_TTY) += au1000_usbtty.o + obj-$(CONFIG_AU1X00_USB_RAW) += au1000_usbraw.o + obj-$(CONFIG_COBALT_LCD) += lcd.o +@@ -353,3 +359,9 @@ + + qtronixmap.c: qtronixmap.map + set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@ ++ ++ibm_workpad_keymap.c: ibm_workpad_keymap.map ++ set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@ ++ ++victor_mpc30x_keymap.c: victor_mpc30x_keymap.map ++ set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@ +diff -Nur linux-2.4.30/drivers/char/au1000_gpio.c linux-2.4.30-mips/drivers/char/au1000_gpio.c +--- linux-2.4.30/drivers/char/au1000_gpio.c 2003-08-25 13:44:41.000000000 +0200 ++++ linux-2.4.30-mips/drivers/char/au1000_gpio.c 2003-12-20 14:18:51.000000000 +0100 +@@ -246,7 +246,7 @@ + + static struct miscdevice au1000gpio_miscdev = + { +- GPIO_MINOR, ++ MISC_DYNAMIC_MINOR, + "au1000_gpio", + &au1000gpio_fops + }; +diff -Nur linux-2.4.30/drivers/char/au1550_psc_spi.c linux-2.4.30-mips/drivers/char/au1550_psc_spi.c +--- linux-2.4.30/drivers/char/au1550_psc_spi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/char/au1550_psc_spi.c 2005-02-11 21:37:24.000000000 +0100 +@@ -0,0 +1,466 @@ ++/* ++ * Driver for Alchemy Au1550 SPI on the PSC. ++ * ++ * Copyright 2004 Embedded Edge, LLC. ++ * dan@embeddededge.com ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include <linux/module.h> ++#include <linux/config.h> ++#include <linux/types.h> ++#include <linux/kernel.h> ++#include <linux/miscdevice.h> ++#include <linux/init.h> ++#include <asm/uaccess.h> ++#include <asm/io.h> ++#include <asm/au1000.h> ++#include <asm/au1550_spi.h> ++#include <asm/au1xxx_psc.h> ++ ++#ifdef CONFIG_MIPS_PB1550 ++#include <asm/pb1550.h> ++#endif ++ ++#ifdef CONFIG_MIPS_DB1550 ++#include <asm/db1x00.h> ++#endif ++ ++#ifdef CONFIG_MIPS_PB1200 ++#include <asm/pb1200.h> ++#endif ++ ++/* This is just a simple programmed I/O SPI interface on the PSC of the 1550. ++ * We support open, close, write, and ioctl. The SPI is a full duplex ++ * interface, you can't read without writing. So, the write system call ++ * copies the bytes out to the SPI, and whatever is returned is placed ++ * in the same buffer. Kinda weird, maybe we'll change it, but for now ++ * it works OK. ++ * I didn't implement any DMA yet, and it's a debate about the necessity. ++ * The SPI clocks are usually quite fast, so data is sent/received as ++ * quickly as you can stuff the FIFO. The overhead of DMA and interrupts ++ * are usually far greater than the data transfer itself. If, however, ++ * we find applications that move large amounts of data, we may choose ++ * use the overhead of buffering and DMA to do the work. ++ */ ++ ++/* The maximum clock rate specified in the manual is 2mHz. ++*/ ++#define MAX_BAUD_RATE (2 * 1000000) ++#define PSC_INTCLK_RATE (32 * 1000000) ++ ++static int inuse; ++ ++/* We have to know what the user requested for the data length ++ * so we know how to stuff the fifo. The FIFO is 32 bits wide, ++ * and we have to load it with the bits to go in a single transfer. ++ */ ++static uint spi_datalen; ++ ++static int ++au1550spi_master_done( int ms ) ++{ ++ int timeout=ms; ++ volatile psc_spi_t *sp; ++ ++ sp = (volatile psc_spi_t *)SPI_PSC_BASE; ++ ++ /* Loop until MD is set or timeout has expired */ ++ while(!(sp->psc_spievent & PSC_SPIEVNT_MD) && timeout--) udelay(1000); ++ ++ if ( !timeout ) ++ return 0; ++ else ++ sp->psc_spievent |= PSC_SPIEVNT_MD; ++ ++ return 1; ++} ++ ++static int ++au1550spi_open(struct inode *inode, struct file *file) ++{ ++ if (inuse) ++ return -EBUSY; ++ ++ inuse = 1; ++ ++ MOD_INC_USE_COUNT; ++ ++ return 0; ++} ++ ++static ssize_t ++au1550spi_write(struct file *fp, const char *bp, size_t count, loff_t *ppos) ++{ ++ int bytelen, i; ++ size_t rcount, retval; ++ unsigned char sb, *rp, *wp; ++ uint fifoword, pcr, stat; ++ volatile psc_spi_t *sp; ++ ++ /* Get the number of bytes per transfer. ++ */ ++ bytelen = ((spi_datalen - 1) / 8) + 1; ++ ++ /* User needs to send us multiple of this count. ++ */ ++ if ((count % bytelen) != 0) ++ return -EINVAL; ++ ++ rp = wp = (unsigned char *)bp; ++ retval = rcount = count; ++ ++ /* Reset the FIFO. ++ */ ++ sp = (volatile psc_spi_t *)SPI_PSC_BASE; ++ sp->psc_spipcr = (PSC_SPIPCR_RC | PSC_SPIPCR_TC); ++ au_sync(); ++ do { ++ pcr = sp->psc_spipcr; ++ au_sync(); ++ } while (pcr != 0); ++ ++ /* Prime the transmit FIFO. ++ */ ++ while (count > 0) { ++ fifoword = 0; ++ for (i=0; i<bytelen; i++) { ++ fifoword <<= 8; ++ if (get_user(sb, wp) < 0) ++ return -EFAULT; ++ fifoword |= sb; ++ wp++; ++ } ++ count -= bytelen; ++ if (count <= 0) ++ fifoword |= PSC_SPITXRX_LC; ++ sp->psc_spitxrx = fifoword; ++ au_sync(); ++ stat = sp->psc_spistat; ++ au_sync(); ++ if (stat & PSC_SPISTAT_TF) ++ break; ++ } ++ ++ /* Start the transfer. ++ */ ++ sp->psc_spipcr = PSC_SPIPCR_MS; ++ au_sync(); ++ ++ /* Now, just keep the transmit fifo full and empty the receive. ++ */ ++ while (count > 0) { ++ stat = sp->psc_spistat; ++ au_sync(); ++ while ((stat & PSC_SPISTAT_RE) == 0) { ++ fifoword = sp->psc_spitxrx; ++ au_sync(); ++ for (i=0; i<bytelen; i++) { ++ sb = fifoword & 0xff; ++ if (put_user(sb, rp) < 0) ++ return -EFAULT; ++ fifoword >>= 8; ++ rp++; ++ } ++ rcount -= bytelen; ++ stat = sp->psc_spistat; ++ au_sync(); ++ } ++ if ((stat & PSC_SPISTAT_TF) == 0) { ++ fifoword = 0; ++ for (i=0; i<bytelen; i++) { ++ fifoword <<= 8; ++ if (get_user(sb, wp) < 0) ++ return -EFAULT; ++ fifoword |= sb; ++ wp++; ++ } ++ count -= bytelen; ++ if (count <= 0) ++ fifoword |= PSC_SPITXRX_LC; ++ sp->psc_spitxrx = fifoword; ++ au_sync(); ++ } ++ } ++ ++ /* All of the bytes for transmit have been written. Hang ++ * out waiting for any residual bytes that are yet to be ++ * read from the fifo. ++ */ ++ while (rcount > 0) { ++ stat = sp->psc_spistat; ++ au_sync(); ++ if ((stat & PSC_SPISTAT_RE) == 0) { ++ fifoword = sp->psc_spitxrx; ++ au_sync(); ++ for (i=0; i<bytelen; i++) { ++ sb = fifoword & 0xff; ++ if (put_user(sb, rp) < 0) ++ return -EFAULT; ++ fifoword >>= 8; ++ rp++; ++ } ++ rcount -= bytelen; ++ } ++ } ++ ++ /* Wait for MasterDone event. 30ms timeout */ ++ if (!au1550spi_master_done(30) ) retval = -EFAULT; ++ return retval; ++} ++ ++static int ++au1550spi_release(struct inode *inode, struct file *file) ++{ ++ MOD_DEC_USE_COUNT; ++ ++ inuse = 0; ++ ++ return 0; ++} ++ ++/* Set the baud rate closest to the request, then return the actual ++ * value we are using. ++ */ ++static uint ++set_baud_rate(uint baud) ++{ ++ uint rate, tmpclk, brg, ctl, stat; ++ volatile psc_spi_t *sp; ++ ++ /* For starters, the input clock is divided by two. ++ */ ++ tmpclk = PSC_INTCLK_RATE/2; ++ ++ rate = tmpclk / baud; ++ ++ /* The dividers work as follows: ++ * baud = tmpclk / (2 * (brg + 1)) ++ */ ++ brg = (rate/2) - 1; ++ ++ /* Test BRG to ensure it will fit into the 6 bits allocated. ++ */ ++ ++ /* Make sure the device is disabled while we make the change. ++ */ ++ sp = (volatile psc_spi_t *)SPI_PSC_BASE; ++ ctl = sp->psc_spicfg; ++ au_sync(); ++ sp->psc_spicfg = ctl & ~PSC_SPICFG_DE_ENABLE; ++ au_sync(); ++ ctl = PSC_SPICFG_CLR_BAUD(ctl); ++ ctl |= PSC_SPICFG_SET_BAUD(brg); ++ sp->psc_spicfg = ctl; ++ au_sync(); ++ ++ /* If the device was running prior to getting here, wait for ++ * it to restart. ++ */ ++ if (ctl & PSC_SPICFG_DE_ENABLE) { ++ do { ++ stat = sp->psc_spistat; ++ au_sync(); ++ } while ((stat & PSC_SPISTAT_DR) == 0); ++ } ++ ++ /* Return the actual value. ++ */ ++ rate = tmpclk / (2 * (brg + 1)); ++ ++ return(rate); ++} ++ ++static uint ++set_word_len(uint len) ++{ ++ uint ctl, stat; ++ volatile psc_spi_t *sp; ++ ++ if ((len < 4) || (len > 24)) ++ return -EINVAL; ++ ++ /* Make sure the device is disabled while we make the change. ++ */ ++ sp = (volatile psc_spi_t *)SPI_PSC_BASE; ++ ctl = sp->psc_spicfg; ++ au_sync(); ++ sp->psc_spicfg = ctl & ~PSC_SPICFG_DE_ENABLE; ++ au_sync(); ++ ctl = PSC_SPICFG_CLR_LEN(ctl); ++ ctl |= PSC_SPICFG_SET_LEN(len); ++ sp->psc_spicfg = ctl; ++ au_sync(); ++ ++ /* If the device was running prior to getting here, wait for ++ * it to restart. ++ */ ++ if (ctl & PSC_SPICFG_DE_ENABLE) { ++ do { ++ stat = sp->psc_spistat; ++ au_sync(); ++ } while ((stat & PSC_SPISTAT_DR) == 0); ++ } ++ ++ return 0; ++} ++ ++static int ++au1550spi_ioctl(struct inode *inode, struct file *file, ++ unsigned int cmd, unsigned long arg) ++{ ++ int status; ++ u32 val; ++ ++ status = 0; ++ ++ switch(cmd) { ++ case AU1550SPI_WORD_LEN: ++ status = set_word_len(arg); ++ break; ++ ++ case AU1550SPI_SET_BAUD: ++ if (get_user(val, (u32 *)arg)) ++ return -EFAULT; ++ ++ val = set_baud_rate(val); ++ if (put_user(val, (u32 *)arg)) ++ return -EFAULT; ++ break; ++ ++ default: ++ status = -ENOIOCTLCMD; ++ ++ } ++ ++ return status; ++} ++ ++ ++static struct file_operations au1550spi_fops = ++{ ++ owner: THIS_MODULE, ++ write: au1550spi_write, ++ ioctl: au1550spi_ioctl, ++ open: au1550spi_open, ++ release: au1550spi_release, ++}; ++ ++ ++static struct miscdevice au1550spi_miscdev = ++{ ++ MISC_DYNAMIC_MINOR, ++ "au1550_spi", ++ &au1550spi_fops ++}; ++ ++ ++int __init ++au1550spi_init(void) ++{ ++ uint clk, rate, stat; ++ volatile psc_spi_t *sp; ++ ++ /* Wire up Freq3 as a clock for the SPI. The PSC does ++ * factor of 2 divisor, so run a higher rate so we can ++ * get some granularity to the clock speeds. ++ * We can't do this in board set up because the frequency ++ * is computed too late. ++ */ ++ rate = get_au1x00_speed(); ++ rate /= PSC_INTCLK_RATE; ++ ++ /* The FRDIV in the frequency control is (FRDIV + 1) * 2 ++ */ ++ rate /=2; ++ rate--; ++ clk = au_readl(SYS_FREQCTRL1); ++ au_sync(); ++ clk &= ~SYS_FC_FRDIV3_MASK; ++ clk |= (rate << SYS_FC_FRDIV3_BIT); ++ clk |= SYS_FC_FE3; ++ au_writel(clk, SYS_FREQCTRL1); ++ au_sync(); ++ ++ /* Set up the clock source routing to get Freq3 to PSC0_intclk. ++ */ ++ clk = au_readl(SYS_CLKSRC); ++ au_sync(); ++ clk &= ~0x03e0; ++ clk |= (5 << 7); ++ au_writel(clk, SYS_CLKSRC); ++ au_sync(); ++ ++ /* Set up GPIO pin function to drive PSC0_SYNC1, which is ++ * the SPI Select. ++ */ ++ clk = au_readl(SYS_PINFUNC); ++ au_sync(); ++ clk |= 1; ++ au_writel(clk, SYS_PINFUNC); ++ au_sync(); ++ ++ /* Now, set up the PSC for SPI PIO mode. ++ */ ++ sp = (volatile psc_spi_t *)SPI_PSC_BASE; ++ sp->psc_ctrl = PSC_CTRL_DISABLE; ++ au_sync(); ++ sp->psc_sel = PSC_SEL_PS_SPIMODE; ++ sp->psc_spicfg = 0; ++ au_sync(); ++ sp->psc_ctrl = PSC_CTRL_ENABLE; ++ au_sync(); ++ do { ++ stat = sp->psc_spistat; ++ au_sync(); ++ } while ((stat & PSC_SPISTAT_SR) == 0); ++ ++ sp->psc_spicfg = (PSC_SPICFG_RT_FIFO8 | PSC_SPICFG_TT_FIFO8 | ++ PSC_SPICFG_DD_DISABLE | PSC_SPICFG_MO); ++ sp->psc_spicfg |= PSC_SPICFG_SET_LEN(8); ++ spi_datalen = 8; ++ sp->psc_spimsk = PSC_SPIMSK_ALLMASK; ++ au_sync(); ++ ++ set_baud_rate(1000000); ++ ++ sp->psc_spicfg |= PSC_SPICFG_DE_ENABLE; ++ do { ++ stat = sp->psc_spistat; ++ au_sync(); ++ } while ((stat & PSC_SPISTAT_DR) == 0); ++ ++ misc_register(&au1550spi_miscdev); ++ printk("Au1550 SPI driver\n"); ++ return 0; ++} ++ ++ ++void __exit ++au1550spi_exit(void) ++{ ++ misc_deregister(&au1550spi_miscdev); ++} ++ ++ ++module_init(au1550spi_init); ++module_exit(au1550spi_exit); +diff -Nur linux-2.4.30/drivers/char/decserial.c linux-2.4.30-mips/drivers/char/decserial.c +--- linux-2.4.30/drivers/char/decserial.c 2003-08-25 13:44:41.000000000 +0200 ++++ linux-2.4.30-mips/drivers/char/decserial.c 2004-09-28 02:53:01.000000000 +0200 +@@ -3,95 +3,105 @@ + * choose the right serial device at boot time + * + * triemer 6-SEP-1998 +- * sercons.c is designed to allow the three different kinds ++ * sercons.c is designed to allow the three different kinds + * of serial devices under the decstation world to co-exist +- * in the same kernel. The idea here is to abstract ++ * in the same kernel. The idea here is to abstract + * the pieces of the drivers that are common to this file + * so that they do not clash at compile time and runtime. + * + * HK 16-SEP-1998 v0.002 + * removed the PROM console as this is not a real serial + * device. Added support for PROM console in drivers/char/tty_io.c +- * instead. Although it may work to enable more than one ++ * instead. Although it may work to enable more than one + * console device I strongly recommend to use only one. ++ * ++ * Copyright (C) 2004 Maciej W. Rozycki + */ + + #include <linux/config.h> ++#include <linux/errno.h> + #include <linux/init.h> ++ + #include <asm/dec/machtype.h> ++#include <asm/dec/serial.h> ++ ++extern int register_zs_hook(unsigned int channel, ++ struct dec_serial_hook *hook); ++extern int unregister_zs_hook(unsigned int channel); ++ ++extern int register_dz_hook(unsigned int channel, ++ struct dec_serial_hook *hook); ++extern int unregister_dz_hook(unsigned int channel); + ++int register_dec_serial_hook(unsigned int channel, ++ struct dec_serial_hook *hook) ++{ + #ifdef CONFIG_ZS +-extern int zs_init(void); ++ if (IOASIC) ++ return register_zs_hook(channel, hook); + #endif +- + #ifdef CONFIG_DZ +-extern int dz_init(void); ++ if (!IOASIC) ++ return register_dz_hook(channel, hook); + #endif ++ return 0; ++} + +-#ifdef CONFIG_SERIAL_DEC_CONSOLE +- ++int unregister_dec_serial_hook(unsigned int channel) ++{ + #ifdef CONFIG_ZS +-extern void zs_serial_console_init(void); ++ if (IOASIC) ++ return unregister_zs_hook(channel); + #endif +- + #ifdef CONFIG_DZ +-extern void dz_serial_console_init(void); +-#endif +- ++ if (!IOASIC) ++ return unregister_dz_hook(channel); + #endif ++ return 0; ++} + +-/* rs_init - starts up the serial interface - +- handle normal case of starting up the serial interface */ + +-#ifdef CONFIG_SERIAL_DEC ++extern int zs_init(void); ++extern int dz_init(void); + ++/* ++ * rs_init - starts up the serial interface - ++ * handle normal case of starting up the serial interface ++ */ + int __init rs_init(void) + { +- +-#if defined(CONFIG_ZS) && defined(CONFIG_DZ) +- if (IOASIC) +- return zs_init(); +- else +- return dz_init(); +-#else +- + #ifdef CONFIG_ZS +- return zs_init(); ++ if (IOASIC) ++ return zs_init(); + #endif +- + #ifdef CONFIG_DZ +- return dz_init(); +-#endif +- ++ if (!IOASIC) ++ return dz_init(); + #endif ++ return -ENXIO; + } + + __initcall(rs_init); + +-#endif + + #ifdef CONFIG_SERIAL_DEC_CONSOLE + +-/* dec_serial_console_init handles the special case of starting +- * up the console on the serial port ++extern void zs_serial_console_init(void); ++extern void dz_serial_console_init(void); ++ ++/* ++ * dec_serial_console_init handles the special case of starting ++ * up the console on the serial port + */ + void __init dec_serial_console_init(void) + { +-#if defined(CONFIG_ZS) && defined(CONFIG_DZ) +- if (IOASIC) +- zs_serial_console_init(); +- else +- dz_serial_console_init(); +-#else +- + #ifdef CONFIG_ZS +- zs_serial_console_init(); ++ if (IOASIC) ++ zs_serial_console_init(); + #endif +- + #ifdef CONFIG_DZ +- dz_serial_console_init(); +-#endif +- ++ if (!IOASIC) ++ dz_serial_console_init(); + #endif + } + +diff -Nur linux-2.4.30/drivers/char/ds1286.c linux-2.4.30-mips/drivers/char/ds1286.c +--- linux-2.4.30/drivers/char/ds1286.c 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/char/ds1286.c 2004-01-10 06:21:39.000000000 +0100 +@@ -1,6 +1,10 @@ + /* + * DS1286 Real Time Clock interface for Linux + * ++ * Copyright (C) 2003 TimeSys Corp. ++ * S. James Hill (James.Hill@timesys.com) ++ * (sjhill@realitydiluted.com) ++ * + * Copyright (C) 1998, 1999, 2000 Ralf Baechle + * + * Based on code written by Paul Gortmaker. +@@ -29,6 +33,7 @@ + #include <linux/types.h> + #include <linux/errno.h> + #include <linux/miscdevice.h> ++#include <linux/module.h> + #include <linux/slab.h> + #include <linux/ioport.h> + #include <linux/fcntl.h> +@@ -95,6 +100,12 @@ + return -EIO; + } + ++void rtc_ds1286_wait(void) ++{ ++ unsigned char sec = CMOS_READ(RTC_SECONDS); ++ while (sec == CMOS_READ(RTC_SECONDS)); ++} ++ + static int ds1286_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) + { +@@ -249,23 +260,22 @@ + { + spin_lock_irq(&ds1286_lock); + +- if (ds1286_status & RTC_IS_OPEN) +- goto out_busy; ++ if (ds1286_status & RTC_IS_OPEN) { ++ spin_unlock_irq(&ds1286_lock); ++ return -EBUSY; ++ } + + ds1286_status |= RTC_IS_OPEN; + +- spin_lock_irq(&ds1286_lock); ++ spin_unlock_irq(&ds1286_lock); + return 0; +- +-out_busy: +- spin_lock_irq(&ds1286_lock); +- return -EBUSY; + } + + static int ds1286_release(struct inode *inode, struct file *file) + { ++ spin_lock_irq(&ds1286_lock); + ds1286_status &= ~RTC_IS_OPEN; +- ++ spin_unlock_irq(&ds1286_lock); + return 0; + } + +@@ -276,32 +286,6 @@ + return 0; + } + +-/* +- * The various file operations we support. +- */ +- +-static struct file_operations ds1286_fops = { +- .llseek = no_llseek, +- .read = ds1286_read, +- .poll = ds1286_poll, +- .ioctl = ds1286_ioctl, +- .open = ds1286_open, +- .release = ds1286_release, +-}; +- +-static struct miscdevice ds1286_dev= +-{ +- .minor = RTC_MINOR, +- .name = "rtc", +- .fops = &ds1286_fops, +-}; +- +-int __init ds1286_init(void) +-{ +- printk(KERN_INFO "DS1286 Real Time Clock Driver v%s\n", DS1286_VERSION); +- return misc_register(&ds1286_dev); +-} +- + static char *days[] = { + "***", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" + }; +@@ -528,3 +512,38 @@ + BCD_TO_BIN(alm_tm->tm_hour); + alm_tm->tm_sec = 0; + } ++ ++static struct file_operations ds1286_fops = { ++ .owner = THIS_MODULE, ++ .llseek = no_llseek, ++ .read = ds1286_read, ++ .poll = ds1286_poll, ++ .ioctl = ds1286_ioctl, ++ .open = ds1286_open, ++ .release = ds1286_release, ++}; ++ ++static struct miscdevice ds1286_dev = ++{ ++ .minor = RTC_MINOR, ++ .name = "rtc", ++ .fops = &ds1286_fops, ++}; ++ ++static int __init ds1286_init(void) ++{ ++ printk(KERN_INFO "DS1286 Real Time Clock Driver v%s\n", DS1286_VERSION); ++ return misc_register(&ds1286_dev); ++} ++ ++static void __exit ds1286_exit(void) ++{ ++ misc_deregister(&ds1286_dev); ++} ++ ++module_init(ds1286_init); ++module_exit(ds1286_exit); ++EXPORT_NO_SYMBOLS; ++ ++MODULE_AUTHOR("Ralf Baechle"); ++MODULE_LICENSE("GPL"); +diff -Nur linux-2.4.30/drivers/char/ds1742.c linux-2.4.30-mips/drivers/char/ds1742.c +--- linux-2.4.30/drivers/char/ds1742.c 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/char/ds1742.c 2004-01-09 20:27:16.000000000 +0100 +@@ -142,6 +142,7 @@ + CMOS_WRITE(RTC_WRITE, RTC_CONTROL); + + /* convert */ ++ memset(&tm, 0, sizeof(struct rtc_time)); + to_tm(t, &tm); + + /* check each field one by one */ +@@ -216,6 +217,7 @@ + unsigned long curr_time; + + curr_time = rtc_ds1742_get_time(); ++ memset(&tm, 0, sizeof(struct rtc_time)); + to_tm(curr_time, &tm); + + p = buf; +@@ -251,8 +253,8 @@ + + void rtc_ds1742_wait(void) + { +- while (CMOS_READ(RTC_SECONDS) & 1); +- while (!(CMOS_READ(RTC_SECONDS) & 1)); ++ unsigned char sec = CMOS_READ(RTC_SECONDS); ++ while (sec == CMOS_READ(RTC_SECONDS)); + } + + static int ds1742_ioctl(struct inode *inode, struct file *file, +@@ -264,6 +266,7 @@ + switch (cmd) { + case RTC_RD_TIME: /* Read the time/date from RTC */ + curr_time = rtc_ds1742_get_time(); ++ memset(&rtc_tm, 0, sizeof(struct rtc_time)); + to_tm(curr_time, &rtc_tm); + rtc_tm.tm_year -= 1900; + return copy_to_user((void *) arg, &rtc_tm, sizeof(rtc_tm)) ? +diff -Nur linux-2.4.30/drivers/char/dummy_keyb.c linux-2.4.30-mips/drivers/char/dummy_keyb.c +--- linux-2.4.30/drivers/char/dummy_keyb.c 2003-08-25 13:44:41.000000000 +0200 ++++ linux-2.4.30-mips/drivers/char/dummy_keyb.c 2004-01-09 09:53:08.000000000 +0100 +@@ -140,3 +140,7 @@ + { + printk("Dummy keyboard driver installed.\n"); + } ++#ifdef CONFIG_MAGIC_SYSRQ ++unsigned char kbd_sysrq_key; ++unsigned char kbd_sysrq_xlate[128]; ++#endif +diff -Nur linux-2.4.30/drivers/char/dz.c linux-2.4.30-mips/drivers/char/dz.c +--- linux-2.4.30/drivers/char/dz.c 2005-01-19 15:09:44.000000000 +0100 ++++ linux-2.4.30-mips/drivers/char/dz.c 2004-12-27 05:13:42.000000000 +0100 +@@ -1,11 +1,13 @@ + /* +- * dz.c: Serial port driver for DECStations equiped ++ * dz.c: Serial port driver for DECstations equipped + * with the DZ chipset. + * + * Copyright (C) 1998 Olivier A. D. Lebaillif + * + * Email: olivier.lebaillif@ifrsys.com + * ++ * Copyright (C) 2004 Maciej W. Rozycki ++ * + * [31-AUG-98] triemer + * Changed IRQ to use Harald's dec internals interrupts.h + * removed base_addr code - moving address assignment to setup.c +@@ -24,6 +26,7 @@ + #undef DEBUG_DZ + + #include <linux/config.h> ++#include <linux/delay.h> + #include <linux/version.h> + #include <linux/kernel.h> + #include <linux/sched.h> +@@ -54,33 +57,56 @@ + #include <asm/system.h> + #include <asm/uaccess.h> + +-#define CONSOLE_LINE (3) /* for definition of struct console */ ++#ifdef CONFIG_MAGIC_SYSRQ ++#include <linux/sysrq.h> ++#endif + + #include "dz.h" + +-#define DZ_INTR_DEBUG 1 +- + DECLARE_TASK_QUEUE(tq_serial); + +-static struct dz_serial *lines[4]; +-static unsigned char tmp_buffer[256]; ++static struct dz_serial multi[DZ_NB_PORT]; /* Four serial lines in the DZ chip */ ++static struct tty_driver serial_driver, callout_driver; ++ ++static struct tty_struct *serial_table[DZ_NB_PORT]; ++static struct termios *serial_termios[DZ_NB_PORT]; ++static struct termios *serial_termios_locked[DZ_NB_PORT]; ++ ++static int serial_refcount; + +-#ifdef DEBUG_DZ + /* +- * debugging code to send out chars via prom ++ * tmp_buf is used as a temporary buffer by serial_write. We need to ++ * lock it in case the copy_from_user blocks while swapping in a page, ++ * and some other program tries to do a serial write at the same time. ++ * Since the lock will only come under contention when the system is ++ * swapping and available memory is low, it makes sense to share one ++ * buffer across all the serial ports, since it significantly saves ++ * memory if large numbers of serial ports are open. + */ +-static void debug_console(const char *s, int count) +-{ +- unsigned i; ++static unsigned char *tmp_buf; ++static DECLARE_MUTEX(tmp_buf_sem); + +- for (i = 0; i < count; i++) { +- if (*s == 10) +- prom_printf("%c", 13); +- prom_printf("%c", *s++); +- } +-} ++static char *dz_name __initdata = "DECstation DZ serial driver version "; ++static char *dz_version __initdata = "1.03"; ++ ++static struct dz_serial *lines[DZ_NB_PORT]; ++static unsigned char tmp_buffer[256]; ++ ++#ifdef CONFIG_SERIAL_DEC_CONSOLE ++static struct console dz_sercons; ++#endif ++#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ ++ !defined(MODULE) ++static unsigned long break_pressed; /* break, really ... */ + #endif + ++static void change_speed (struct dz_serial *); ++ ++static int baud_table[] = { ++ 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, ++ 9600, 0 ++}; ++ + /* + * ------------------------------------------------------------ + * dz_in () and dz_out () +@@ -94,15 +120,16 @@ + { + volatile unsigned short *addr = + (volatile unsigned short *) (info->port + offset); ++ + return *addr; + } + + static inline void dz_out(struct dz_serial *info, unsigned offset, + unsigned short value) + { +- + volatile unsigned short *addr = + (volatile unsigned short *) (info->port + offset); ++ + *addr = value; + } + +@@ -143,25 +170,24 @@ + + tmp |= mask; /* set the TX flag */ + dz_out(info, DZ_TCR, tmp); +- + } + + /* + * ------------------------------------------------------------ +- * Here starts the interrupt handling routines. All of the +- * following subroutines are declared as inline and are folded +- * into dz_interrupt. They were separated out for readability's +- * sake. + * +- * Note: rs_interrupt() is a "fast" interrupt, which means that it ++ * Here starts the interrupt handling routines. All of the following ++ * subroutines are declared as inline and are folded into ++ * dz_interrupt(). They were separated out for readability's sake. ++ * ++ * Note: dz_interrupt() is a "fast" interrupt, which means that it + * runs with interrupts turned off. People who may want to modify +- * rs_interrupt() should try to keep the interrupt handler as fast as ++ * dz_interrupt() should try to keep the interrupt handler as fast as + * possible. After you are done making modifications, it is not a bad + * idea to do: + * + * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer dz.c + * +- * and look at the resulting assemble code in serial.s. ++ * and look at the resulting assemble code in dz.s. + * + * ------------------------------------------------------------ + */ +@@ -188,101 +214,97 @@ + * This routine deals with inputs from any lines. + * ------------------------------------------------------------ + */ +-static inline void receive_chars(struct dz_serial *info_in) ++static inline void receive_chars(struct dz_serial *info_in, ++ struct pt_regs *regs) + { +- + struct dz_serial *info; +- struct tty_struct *tty = 0; ++ struct tty_struct *tty; + struct async_icount *icount; +- int ignore = 0; +- unsigned short status, tmp; +- unsigned char ch; +- +- /* this code is going to be a problem... +- the call to tty_flip_buffer is going to need +- to be rethought... +- */ +- do { +- status = dz_in(info_in, DZ_RBUF); +- info = lines[LINE(status)]; ++ int lines_rx[DZ_NB_PORT] = { [0 ... DZ_NB_PORT - 1] = 0 }; ++ unsigned short status; ++ unsigned char ch, flag; ++ int i; + +- /* punt so we don't get duplicate characters */ +- if (!(status & DZ_DVAL)) +- goto ignore_char; +- +- ch = UCHAR(status); /* grab the char */ +- +-#if 0 +- if (info->is_console) { +- if (ch == 0) +- return; /* it's a break ... */ +- } +-#endif ++ while ((status = dz_in(info_in, DZ_RBUF)) & DZ_DVAL) { ++ info = lines[LINE(status)]; ++ tty = info->tty; /* point to the proper dev */ + +- tty = info->tty; /* now tty points to the proper dev */ +- icount = &info->icount; ++ ch = UCHAR(status); /* grab the char */ + +- if (!tty) +- break; +- if (tty->flip.count >= TTY_FLIPBUF_SIZE) +- break; ++ if (!tty && (!info->hook || !info->hook->rx_char)) ++ continue; + +- *tty->flip.char_buf_ptr = ch; +- *tty->flip.flag_buf_ptr = 0; ++ icount = &info->icount; + icount->rx++; + +- /* keep track of the statistics */ +- if (status & (DZ_OERR | DZ_FERR | DZ_PERR)) { +- if (status & DZ_PERR) /* parity error */ +- icount->parity++; +- else if (status & DZ_FERR) /* frame error */ +- icount->frame++; +- if (status & DZ_OERR) /* overrun error */ +- icount->overrun++; +- +- /* check to see if we should ignore the character +- and mask off conditions that should be ignored ++ flag = 0; ++ if (status & DZ_FERR) { /* frame error */ ++ /* ++ * There is no separate BREAK status bit, so ++ * treat framing errors as BREAKs for Magic SysRq ++ * and SAK; normally, otherwise. + */ +- +- if (status & info->ignore_status_mask) { +- if (++ignore > 100) +- break; +- goto ignore_char; ++#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ ++ !defined(MODULE) ++ if (info->line == dz_sercons.index) { ++ if (!break_pressed) ++ break_pressed = jiffies; ++ continue; + } +- /* mask off the error conditions we want to ignore */ +- tmp = status & info->read_status_mask; +- +- if (tmp & DZ_PERR) { +- *tty->flip.flag_buf_ptr = TTY_PARITY; +-#ifdef DEBUG_DZ +- debug_console("PERR\n", 5); +-#endif +- } else if (tmp & DZ_FERR) { +- *tty->flip.flag_buf_ptr = TTY_FRAME; +-#ifdef DEBUG_DZ +- debug_console("FERR\n", 5); + #endif ++ flag = TTY_BREAK; ++ if (info->flags & DZ_SAK) ++ do_SAK(tty); ++ else ++ flag = TTY_FRAME; ++ } else if (status & DZ_OERR) /* overrun error */ ++ flag = TTY_OVERRUN; ++ else if (status & DZ_PERR) /* parity error */ ++ flag = TTY_PARITY; ++ ++#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ ++ !defined(MODULE) ++ if (break_pressed && info->line == dz_sercons.index) { ++ if (time_before(jiffies, break_pressed + HZ * 5)) { ++ handle_sysrq(ch, regs, NULL, NULL); ++ break_pressed = 0; ++ continue; + } +- if (tmp & DZ_OERR) { +-#ifdef DEBUG_DZ +- debug_console("OERR\n", 5); ++ break_pressed = 0; ++ } + #endif +- if (tty->flip.count < TTY_FLIPBUF_SIZE) { +- tty->flip.count++; +- tty->flip.flag_buf_ptr++; +- tty->flip.char_buf_ptr++; +- *tty->flip.flag_buf_ptr = TTY_OVERRUN; +- } +- } ++ ++ if (info->hook && info->hook->rx_char) { ++ (*info->hook->rx_char)(ch, flag); ++ return; + } +- tty->flip.flag_buf_ptr++; +- tty->flip.char_buf_ptr++; +- tty->flip.count++; +- ignore_char: +- } while (status & DZ_DVAL); + +- if (tty) +- tty_flip_buffer_push(tty); ++ /* keep track of the statistics */ ++ switch (flag) { ++ case TTY_FRAME: ++ icount->frame++; ++ break; ++ case TTY_PARITY: ++ icount->parity++; ++ break; ++ case TTY_OVERRUN: ++ icount->overrun++; ++ break; ++ case TTY_BREAK: ++ icount->brk++; ++ break; ++ default: ++ break; ++ } ++ ++ if ((status & info->ignore_status_mask) == 0) { ++ tty_insert_flip_char(tty, ch, flag); ++ lines_rx[LINE(status)] = 1; ++ } ++ } ++ for (i = 0; i < DZ_NB_PORT; i++) ++ if (lines_rx[i]) ++ tty_flip_buffer_push(lines[i]->tty); + } + + /* +@@ -292,20 +314,34 @@ + * This routine deals with outputs to any lines. + * ------------------------------------------------------------ + */ +-static inline void transmit_chars(struct dz_serial *info) ++static inline void transmit_chars(struct dz_serial *info_in) + { ++ struct dz_serial *info; ++ unsigned short status; + unsigned char tmp; + ++ status = dz_in(info_in, DZ_CSR); ++ info = lines[LINE(status)]; + ++ if (info->hook || !info->tty) { ++ unsigned short mask, tmp; + +- if (info->x_char) { /* XON/XOFF chars */ ++ mask = 1 << info->line; ++ tmp = dz_in(info, DZ_TCR); /* read the TX flag */ ++ tmp &= ~mask; /* clear the TX flag */ ++ dz_out(info, DZ_TCR, tmp); ++ return; ++ } ++ ++ if (info->x_char) { /* XON/XOFF chars */ + dz_out(info, DZ_TDR, info->x_char); + info->icount.tx++; + info->x_char = 0; + return; + } + /* if nothing to do or stopped or hardware stopped */ +- if ((info->xmit_cnt <= 0) || info->tty->stopped || info->tty->hw_stopped) { ++ if (info->xmit_cnt <= 0 || ++ info->tty->stopped || info->tty->hw_stopped) { + dz_stop(info->tty); + return; + } +@@ -359,15 +395,14 @@ + */ + static void dz_interrupt(int irq, void *dev, struct pt_regs *regs) + { +- struct dz_serial *info; ++ struct dz_serial *info = (struct dz_serial *)dev; + unsigned short status; + + /* get the reason why we just got an irq */ +- status = dz_in((struct dz_serial *) dev, DZ_CSR); +- info = lines[LINE(status)]; /* re-arrange info the proper port */ ++ status = dz_in(info, DZ_CSR); + + if (status & DZ_RDONE) +- receive_chars(info); /* the receive function */ ++ receive_chars(info, regs); + + if (status & DZ_TRDY) + transmit_chars(info); +@@ -514,7 +549,7 @@ + + + info->cflags &= ~DZ_CREAD; /* turn off receive enable flag */ +- dz_out(info, DZ_LPR, info->cflags); ++ dz_out(info, DZ_LPR, info->cflags | info->line); + + if (info->xmit_buf) { /* free Tx buffer */ + free_page((unsigned long) info->xmit_buf); +@@ -545,18 +580,21 @@ + { + unsigned long flags; + unsigned cflag; +- int baud; ++ int baud, i; + +- if (!info->tty || !info->tty->termios) +- return; ++ if (!info->hook) { ++ if (!info->tty || !info->tty->termios) ++ return; ++ cflag = info->tty->termios->c_cflag; ++ } else { ++ cflag = info->hook->cflags; ++ } + + save_flags(flags); + cli(); + + info->cflags = info->line; + +- cflag = info->tty->termios->c_cflag; +- + switch (cflag & CSIZE) { + case CS5: + info->cflags |= DZ_CS5; +@@ -579,7 +617,16 @@ + if (cflag & PARODD) + info->cflags |= DZ_PARODD; + +- baud = tty_get_baud_rate(info->tty); ++ i = cflag & CBAUD; ++ if (i & CBAUDEX) { ++ i &= ~CBAUDEX; ++ if (!info->hook) ++ info->tty->termios->c_cflag &= ~CBAUDEX; ++ else ++ info->hook->cflags &= ~CBAUDEX; ++ } ++ baud = baud_table[i]; ++ + switch (baud) { + case 50: + info->cflags |= DZ_B50; +@@ -629,16 +676,16 @@ + } + + info->cflags |= DZ_RXENAB; +- dz_out(info, DZ_LPR, info->cflags); ++ dz_out(info, DZ_LPR, info->cflags | info->line); + + /* setup accept flag */ + info->read_status_mask = DZ_OERR; +- if (I_INPCK(info->tty)) ++ if (info->tty && I_INPCK(info->tty)) + info->read_status_mask |= (DZ_FERR | DZ_PERR); + + /* characters to ignore */ + info->ignore_status_mask = 0; +- if (I_IGNPAR(info->tty)) ++ if (info->tty && I_IGNPAR(info->tty)) + info->ignore_status_mask |= (DZ_FERR | DZ_PERR); + + restore_flags(flags); +@@ -694,7 +741,7 @@ + + down(&tmp_buf_sem); + while (1) { +- c = MIN(count, MIN(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head)); ++ c = min(count, min(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head)); + if (c <= 0) + break; + +@@ -707,7 +754,7 @@ + save_flags(flags); + cli(); + +- c = MIN(c, MIN(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head)); ++ c = min(c, min(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head)); + memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c); + info->xmit_head = ((info->xmit_head + c) & (DZ_XMIT_SIZE - 1)); + info->xmit_cnt += c; +@@ -727,7 +774,7 @@ + save_flags(flags); + cli(); + +- c = MIN(count, MIN(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head)); ++ c = min(count, min(DZ_XMIT_SIZE - info->xmit_cnt - 1, DZ_XMIT_SIZE - info->xmit_head)); + if (c <= 0) { + restore_flags(flags); + break; +@@ -845,7 +892,7 @@ + + /* + * ------------------------------------------------------------ +- * rs_ioctl () and friends ++ * dz_ioctl () and friends + * ------------------------------------------------------------ + */ + static int get_serial_info(struct dz_serial *info, +@@ -958,6 +1005,9 @@ + struct dz_serial *info = (struct dz_serial *) tty->driver_data; + int retval; + ++ if (info->hook) ++ return -ENODEV; ++ + if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && + (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGWILD) && + (cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT)) { +@@ -1252,19 +1302,14 @@ + int retval, line; + + line = MINOR(tty->device) - tty->driver.minor_start; +- +- /* The dz lines for the mouse/keyboard must be +- * opened using their respective drivers. +- */ + if ((line < 0) || (line >= DZ_NB_PORT)) + return -ENODEV; ++ info = lines[line]; + +- if ((line == DZ_KEYBOARD) || (line == DZ_MOUSE)) ++ if (info->hook) + return -ENODEV; + +- info = lines[line]; + info->count++; +- + tty->driver_data = info; + info->tty = tty; + +@@ -1285,14 +1330,21 @@ + else + *tty->termios = info->callout_termios; + change_speed(info); +- + } ++#ifdef CONFIG_SERIAL_DEC_CONSOLE ++ if (dz_sercons.cflag && dz_sercons.index == line) { ++ tty->termios->c_cflag = dz_sercons.cflag; ++ dz_sercons.cflag = 0; ++ change_speed(info); ++ } ++#endif ++ + info->session = current->session; + info->pgrp = current->pgrp; + return 0; + } + +-static void show_serial_version(void) ++static void __init show_serial_version(void) + { + printk("%s%s\n", dz_name, dz_version); + } +@@ -1300,7 +1352,6 @@ + int __init dz_init(void) + { + int i; +- long flags; + struct dz_serial *info; + + /* Setup base handler, and timer table. */ +@@ -1311,9 +1362,9 @@ + memset(&serial_driver, 0, sizeof(struct tty_driver)); + serial_driver.magic = TTY_DRIVER_MAGIC; + #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) +- serial_driver.name = "ttyS"; +-#else + serial_driver.name = "tts/%d"; ++#else ++ serial_driver.name = "ttyS"; + #endif + serial_driver.major = TTY_MAJOR; + serial_driver.minor_start = 64; +@@ -1352,9 +1403,9 @@ + */ + callout_driver = serial_driver; + #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) +- callout_driver.name = "cua"; +-#else + callout_driver.name = "cua/%d"; ++#else ++ callout_driver.name = "cua"; + #endif + callout_driver.major = TTYAUX_MAJOR; + callout_driver.subtype = SERIAL_TYPE_CALLOUT; +@@ -1363,25 +1414,27 @@ + panic("Couldn't register serial driver"); + if (tty_register_driver(&callout_driver)) + panic("Couldn't register callout driver"); +- save_flags(flags); +- cli(); + + for (i = 0; i < DZ_NB_PORT; i++) { + info = &multi[i]; + lines[i] = info; +- info->magic = SERIAL_MAGIC; +- ++ info->tty = 0; ++ info->x_char = 0; + if (mips_machtype == MACH_DS23100 || + mips_machtype == MACH_DS5100) + info->port = (unsigned long) KN01_DZ11_BASE; + else + info->port = (unsigned long) KN02_DZ11_BASE; +- + info->line = i; +- info->tty = 0; ++ ++ if (info->hook && info->hook->init_info) { ++ (*info->hook->init_info)(info); ++ continue; ++ } ++ ++ info->magic = SERIAL_MAGIC; + info->close_delay = 50; + info->closing_wait = 3000; +- info->x_char = 0; + info->event = 0; + info->count = 0; + info->blocked_open = 0; +@@ -1393,25 +1446,16 @@ + info->normal_termios = serial_driver.init_termios; + init_waitqueue_head(&info->open_wait); + init_waitqueue_head(&info->close_wait); +- +- /* +- * If we are pointing to address zero then punt - not correctly +- * set up in setup.c to handle this. +- */ +- if (!info->port) +- return 0; +- +- printk("ttyS%02d at 0x%08x (irq = %d)\n", info->line, +- info->port, dec_interrupt[DEC_IRQ_DZ11]); +- ++ printk("ttyS%02d at 0x%08x (irq = %d) is a DC7085 DZ\n", ++ info->line, info->port, dec_interrupt[DEC_IRQ_DZ11]); + tty_register_devfs(&serial_driver, 0, +- serial_driver.minor_start + info->line); ++ serial_driver.minor_start + info->line); + tty_register_devfs(&callout_driver, 0, +- callout_driver.minor_start + info->line); ++ callout_driver.minor_start + info->line); + } + +- /* reset the chip */ + #ifndef CONFIG_SERIAL_DEC_CONSOLE ++ /* reset the chip */ + dz_out(info, DZ_CSR, DZ_CLR); + while (dz_in(info, DZ_CSR) & DZ_CLR); + iob(); +@@ -1420,43 +1464,104 @@ + dz_out(info, DZ_CSR, DZ_MSE); + #endif + +- /* order matters here... the trick is that flags +- is updated... in request_irq - to immediatedly obliterate +- it is unwise. */ +- restore_flags(flags); +- +- + if (request_irq(dec_interrupt[DEC_IRQ_DZ11], dz_interrupt, +- SA_INTERRUPT, "DZ", lines[0])) ++ 0, "DZ", lines[0])) + panic("Unable to register DZ interrupt"); + ++ for (i = 0; i < DZ_NB_PORT; i++) ++ if (lines[i]->hook) { ++ startup(lines[i]); ++ if (lines[i]->hook->init_channel) ++ (*lines[i]->hook->init_channel)(lines[i]); ++ } ++ + return 0; + } + +-#ifdef CONFIG_SERIAL_DEC_CONSOLE +-static void dz_console_put_char(unsigned char ch) ++/* ++ * polling I/O routines ++ */ ++static int dz_poll_tx_char(void *handle, unsigned char ch) + { + unsigned long flags; +- int loops = 2500; +- unsigned short tmp = ch; +- /* this code sends stuff out to serial device - spinning its +- wheels and waiting. */ ++ struct dz_serial *info = handle; ++ unsigned short csr, tcr, trdy, mask; ++ int loops = 10000; ++ int ret; + +- /* force the issue - point it at lines[3] */ +- dz_console = &multi[CONSOLE_LINE]; ++ local_irq_save(flags); ++ csr = dz_in(info, DZ_CSR); ++ dz_out(info, DZ_CSR, csr & ~DZ_TIE); ++ tcr = dz_in(info, DZ_TCR); ++ tcr |= 1 << info->line; ++ mask = tcr; ++ dz_out(info, DZ_TCR, mask); ++ iob(); ++ local_irq_restore(flags); + +- save_flags(flags); +- cli(); ++ while (loops--) { ++ trdy = dz_in(info, DZ_CSR); ++ if (!(trdy & DZ_TRDY)) ++ continue; ++ trdy = (trdy & DZ_TLINE) >> 8; ++ if (trdy == info->line) ++ break; ++ mask &= ~(1 << trdy); ++ dz_out(info, DZ_TCR, mask); ++ iob(); ++ udelay(2); ++ } + ++ if (loops) { ++ dz_out(info, DZ_TDR, ch); ++ ret = 0; ++ } else ++ ret = -EAGAIN; + +- /* spin our wheels */ +- while (((dz_in(dz_console, DZ_CSR) & DZ_TRDY) != DZ_TRDY) && loops--); ++ dz_out(info, DZ_TCR, tcr); ++ dz_out(info, DZ_CSR, csr); + +- /* Actually transmit the character. */ +- dz_out(dz_console, DZ_TDR, tmp); ++ return ret; ++} + +- restore_flags(flags); ++static int dz_poll_rx_char(void *handle) ++{ ++ return -ENODEV; ++} ++ ++int register_dz_hook(unsigned int channel, struct dec_serial_hook *hook) ++{ ++ struct dz_serial *info = multi + channel; ++ ++ if (info->hook) { ++ printk("%s: line %d has already a hook registered\n", ++ __FUNCTION__, channel); ++ ++ return 0; ++ } else { ++ hook->poll_rx_char = dz_poll_rx_char; ++ hook->poll_tx_char = dz_poll_tx_char; ++ info->hook = hook; ++ ++ return 1; ++ } ++} ++ ++int unregister_dz_hook(unsigned int channel) ++{ ++ struct dz_serial *info = &multi[channel]; ++ ++ if (info->hook) { ++ info->hook = NULL; ++ return 1; ++ } else { ++ printk("%s: trying to unregister hook on line %d," ++ " but none is registered\n", __FUNCTION__, channel); ++ return 0; ++ } + } ++ ++#ifdef CONFIG_SERIAL_DEC_CONSOLE + /* + * ------------------------------------------------------------------- + * dz_console_print () +@@ -1465,17 +1570,19 @@ + * The console must be locked when we get here. + * ------------------------------------------------------------------- + */ +-static void dz_console_print(struct console *cons, ++static void dz_console_print(struct console *co, + const char *str, + unsigned int count) + { ++ struct dz_serial *info = multi + co->index; ++ + #ifdef DEBUG_DZ + prom_printf((char *) str); + #endif + while (count--) { + if (*str == '\n') +- dz_console_put_char('\r'); +- dz_console_put_char(*str++); ++ dz_poll_tx_char(info, '\r'); ++ dz_poll_tx_char(info, *str++); + } + } + +@@ -1486,12 +1593,12 @@ + + static int __init dz_console_setup(struct console *co, char *options) + { ++ struct dz_serial *info = multi + co->index; + int baud = 9600; + int bits = 8; + int parity = 'n'; + int cflag = CREAD | HUPCL | CLOCAL; + char *s; +- unsigned short mask, tmp; + + if (options) { + baud = simple_strtoul(options, NULL, 10); +@@ -1542,44 +1649,31 @@ + } + co->cflag = cflag; + +- /* TOFIX: force to console line */ +- dz_console = &multi[CONSOLE_LINE]; + if ((mips_machtype == MACH_DS23100) || (mips_machtype == MACH_DS5100)) +- dz_console->port = KN01_DZ11_BASE; ++ info->port = KN01_DZ11_BASE; + else +- dz_console->port = KN02_DZ11_BASE; +- dz_console->line = CONSOLE_LINE; ++ info->port = KN02_DZ11_BASE; ++ info->line = co->index; + +- dz_out(dz_console, DZ_CSR, DZ_CLR); +- while ((tmp = dz_in(dz_console, DZ_CSR)) & DZ_CLR); ++ dz_out(info, DZ_CSR, DZ_CLR); ++ while (dz_in(info, DZ_CSR) & DZ_CLR); + + /* enable scanning */ +- dz_out(dz_console, DZ_CSR, DZ_MSE); ++ dz_out(info, DZ_CSR, DZ_MSE); + + /* Set up flags... */ +- dz_console->cflags = 0; +- dz_console->cflags |= DZ_B9600; +- dz_console->cflags |= DZ_CS8; +- dz_console->cflags |= DZ_PARENB; +- dz_out(dz_console, DZ_LPR, dz_console->cflags); +- +- mask = 1 << dz_console->line; +- tmp = dz_in(dz_console, DZ_TCR); /* read the TX flag */ +- if (!(tmp & mask)) { +- tmp |= mask; /* set the TX flag */ +- dz_out(dz_console, DZ_TCR, tmp); +- } ++ dz_out(info, DZ_LPR, cflag | info->line); ++ + return 0; + } + +-static struct console dz_sercons = +-{ +- .name = "ttyS", +- .write = dz_console_print, +- .device = dz_console_device, +- .setup = dz_console_setup, +- .flags = CON_CONSDEV | CON_PRINTBUFFER, +- .index = CONSOLE_LINE, ++static struct console dz_sercons = { ++ .name = "ttyS", ++ .write = dz_console_print, ++ .device = dz_console_device, ++ .setup = dz_console_setup, ++ .flags = CON_PRINTBUFFER, ++ .index = -1, + }; + + void __init dz_serial_console_init(void) +diff -Nur linux-2.4.30/drivers/char/dz.h linux-2.4.30-mips/drivers/char/dz.h +--- linux-2.4.30/drivers/char/dz.h 2002-08-03 02:39:43.000000000 +0200 ++++ linux-2.4.30-mips/drivers/char/dz.h 2004-09-28 02:53:01.000000000 +0200 +@@ -10,6 +10,8 @@ + #ifndef DZ_SERIAL_H + #define DZ_SERIAL_H + ++#include <asm/dec/serial.h> ++ + #define SERIAL_MAGIC 0x5301 + + /* +@@ -17,6 +19,7 @@ + */ + #define DZ_TRDY 0x8000 /* Transmitter empty */ + #define DZ_TIE 0x4000 /* Transmitter Interrupt Enable */ ++#define DZ_TLINE 0x0300 /* Transmitter Line Number */ + #define DZ_RDONE 0x0080 /* Receiver data ready */ + #define DZ_RIE 0x0040 /* Receive Interrupt Enable */ + #define DZ_MSE 0x0020 /* Master Scan Enable */ +@@ -37,19 +40,30 @@ + #define UCHAR(x) (unsigned char)(x & DZ_RBUF_MASK) + + /* +- * Definitions for the Transmit Register. ++ * Definitions for the Transmit Control Register. + */ + #define DZ_LINE_KEYBOARD 0x0001 + #define DZ_LINE_MOUSE 0x0002 + #define DZ_LINE_MODEM 0x0004 + #define DZ_LINE_PRINTER 0x0008 + ++#define DZ_MODEM_RTS 0x0800 /* RTS for the modem line (2) */ + #define DZ_MODEM_DTR 0x0400 /* DTR for the modem line (2) */ ++#define DZ_PRINT_RTS 0x0200 /* RTS for the printer line (3) */ ++#define DZ_PRINT_DTR 0x0100 /* DTR for the printer line (3) */ ++#define DZ_LNENB 0x000f /* Transmitter Line Enable */ + + /* + * Definitions for the Modem Status Register. + */ ++#define DZ_MODEM_RI 0x0800 /* RI for the modem line (2) */ ++#define DZ_MODEM_CD 0x0400 /* CD for the modem line (2) */ + #define DZ_MODEM_DSR 0x0200 /* DSR for the modem line (2) */ ++#define DZ_MODEM_CTS 0x0100 /* CTS for the modem line (2) */ ++#define DZ_PRINT_RI 0x0008 /* RI for the printer line (2) */ ++#define DZ_PRINT_CD 0x0004 /* CD for the printer line (2) */ ++#define DZ_PRINT_DSR 0x0002 /* DSR for the printer line (2) */ ++#define DZ_PRINT_CTS 0x0001 /* CTS for the printer line (2) */ + + /* + * Definitions for the Transmit Data Register. +@@ -115,9 +129,6 @@ + + #define DZ_EVENT_WRITE_WAKEUP 0 + +-#ifndef MIN +-#define MIN(a,b) ((a) < (b) ? (a) : (b)) +- + #define DZ_INITIALIZED 0x80000000 /* Serial port was initialized */ + #define DZ_CALLOUT_ACTIVE 0x40000000 /* Call out device is active */ + #define DZ_NORMAL_ACTIVE 0x20000000 /* Normal device is active */ +@@ -129,6 +140,7 @@ + #define DZ_CLOSING_WAIT_INF 0 + #define DZ_CLOSING_WAIT_NONE 65535 + ++#define DZ_SAK 0x0004 /* Secure Attention Key (Orange book) */ + #define DZ_SPLIT_TERMIOS 0x0008 /* Separate termios for dialin/callout */ + #define DZ_SESSION_LOCKOUT 0x0100 /* Lock out cua opens based on session */ + #define DZ_PGRP_LOCKOUT 0x0200 /* Lock out cua opens based on pgrp */ +@@ -166,79 +178,9 @@ + long session; /* Session of opening process */ + long pgrp; /* pgrp of opening process */ + ++ struct dec_serial_hook *hook; /* Hook on this channel. */ + unsigned char is_console; /* flag indicating a serial console */ + unsigned char is_initialized; + }; + +-static struct dz_serial multi[DZ_NB_PORT]; /* Four serial lines in the DZ chip */ +-static struct dz_serial *dz_console; +-static struct tty_driver serial_driver, callout_driver; +- +-static struct tty_struct *serial_table[DZ_NB_PORT]; +-static struct termios *serial_termios[DZ_NB_PORT]; +-static struct termios *serial_termios_locked[DZ_NB_PORT]; +- +-static int serial_refcount; +- +-/* +- * tmp_buf is used as a temporary buffer by serial_write. We need to +- * lock it in case the copy_from_user blocks while swapping in a page, +- * and some other program tries to do a serial write at the same time. +- * Since the lock will only come under contention when the system is +- * swapping and available memory is low, it makes sense to share one +- * buffer across all the serial ports, since it significantly saves +- * memory if large numbers of serial ports are open. +- */ +-static unsigned char *tmp_buf; +-static DECLARE_MUTEX(tmp_buf_sem); +- +-static char *dz_name = "DECstation DZ serial driver version "; +-static char *dz_version = "1.02"; +- +-static inline unsigned short dz_in (struct dz_serial *, unsigned); +-static inline void dz_out (struct dz_serial *, unsigned, unsigned short); +- +-static inline void dz_sched_event (struct dz_serial *, int); +-static inline void receive_chars (struct dz_serial *); +-static inline void transmit_chars (struct dz_serial *); +-static inline void check_modem_status (struct dz_serial *); +- +-static void dz_stop (struct tty_struct *); +-static void dz_start (struct tty_struct *); +-static void dz_interrupt (int, void *, struct pt_regs *); +-static void do_serial_bh (void); +-static void do_softint (void *); +-static void do_serial_hangup (void *); +-static void change_speed (struct dz_serial *); +-static void dz_flush_chars (struct tty_struct *); +-static void dz_console_print (struct console *, const char *, unsigned int); +-static void dz_flush_buffer (struct tty_struct *); +-static void dz_throttle (struct tty_struct *); +-static void dz_unthrottle (struct tty_struct *); +-static void dz_send_xchar (struct tty_struct *, char); +-static void shutdown (struct dz_serial *); +-static void send_break (struct dz_serial *, int); +-static void dz_set_termios (struct tty_struct *, struct termios *); +-static void dz_close (struct tty_struct *, struct file *); +-static void dz_hangup (struct tty_struct *); +-static void show_serial_version (void); +- +-static int dz_write (struct tty_struct *, int, const unsigned char *, int); +-static int dz_write_room (struct tty_struct *); +-static int dz_chars_in_buffer (struct tty_struct *); +-static int startup (struct dz_serial *); +-static int get_serial_info (struct dz_serial *, struct serial_struct *); +-static int set_serial_info (struct dz_serial *, struct serial_struct *); +-static int get_lsr_info (struct dz_serial *, unsigned int *); +-static int dz_ioctl (struct tty_struct *, struct file *, unsigned int, unsigned long); +-static int block_til_ready (struct tty_struct *, struct file *, struct dz_serial *); +-static int dz_open (struct tty_struct *, struct file *); +- +-#ifdef MODULE +-int init_module (void) +-void cleanup_module (void) +-#endif +- +-#endif +- + #endif /* DZ_SERIAL_H */ +diff -Nur linux-2.4.30/drivers/char/ibm_workpad_keymap.map linux-2.4.30-mips/drivers/char/ibm_workpad_keymap.map +--- linux-2.4.30/drivers/char/ibm_workpad_keymap.map 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/char/ibm_workpad_keymap.map 2003-12-20 15:20:44.000000000 +0100 +@@ -0,0 +1,343 @@ ++# Keymap for IBM Workpad z50 ++# US Mapping ++# ++# by Michael Klar <wyldfier@iname.com> ++# ++# This is a great big mess on account of how the Caps Lock key is handled as ++# LeftShift-RightShift. Right shift key had to be broken out, so don't use ++# use this map file as a basis for other keyboards that don't do the same ++# thing with Caps Lock. ++# ++# This file is subject to the terms and conditions of the GNU General Public ++# License. See the file "COPYING" in the main directory of this archive ++# for more details. ++ ++keymaps 0-2,4-5,8,12,32-33,36-37 ++strings as usual ++ ++keycode 0 = F1 F11 Console_13 ++ shiftr keycode 0 = F11 ++ shift shiftr keycode 0 = F11 ++ control keycode 0 = F1 ++ alt keycode 0 = Console_1 ++ control alt keycode 0 = Console_1 ++keycode 1 = F3 F13 Console_15 ++ shiftr keycode 1 = F13 ++ shift shiftr keycode 1 = F13 ++ control keycode 1 = F3 ++ alt keycode 1 = Console_3 ++ control alt keycode 1 = Console_3 ++keycode 2 = F5 F15 Console_17 ++ shiftr keycode 2 = F15 ++ shift shiftr keycode 2 = F15 ++ control keycode 2 = F5 ++ alt keycode 2 = Console_5 ++ control alt keycode 2 = Console_5 ++keycode 3 = F7 F17 Console_19 ++ shiftr keycode 3 = F17 ++ shift shiftr keycode 3 = F17 ++ control keycode 3 = F7 ++ alt keycode 3 = Console_7 ++ control alt keycode 3 = Console_7 ++keycode 4 = F9 F19 Console_21 ++ shiftr keycode 4 = F19 ++ shift shiftr keycode 4 = F19 ++ control keycode 4 = F9 ++ alt keycode 4 = Console_9 ++ control alt keycode 4 = Console_9 ++#keycode 5 is contrast down ++#keycode 6 is contrast up ++keycode 7 = F11 F11 Console_23 ++ shiftr keycode 7 = F11 ++ shift shiftr keycode 7 = F11 ++ control keycode 7 = F11 ++ alt keycode 7 = Console_11 ++ control alt keycode 7 = Console_11 ++keycode 8 = F2 F12 Console_14 ++ shiftr keycode 8 = F12 ++ shift shiftr keycode 8 = F12 ++ control keycode 8 = F2 ++ alt keycode 8 = Console_2 ++ control alt keycode 8 = Console_2 ++keycode 9 = F4 F14 Console_16 ++ shiftr keycode 9 = F14 ++ shift shiftr keycode 9 = F14 ++ control keycode 9 = F4 ++ alt keycode 9 = Console_4 ++ control alt keycode 9 = Console_4 ++keycode 10 = F6 F16 Console_18 ++ shiftr keycode 10 = F16 ++ shift shiftr keycode 10 = F16 ++ control keycode 10 = F6 ++ alt keycode 10 = Console_6 ++ control alt keycode 10 = Console_6 ++keycode 11 = F8 F18 Console_20 ++ shiftr keycode 11 = F18 ++ shift shiftr keycode 11 = F18 ++ control keycode 11 = F8 ++ alt keycode 11 = Console_8 ++ control alt keycode 11 = Console_8 ++keycode 12 = F10 F20 Console_22 ++ shiftr keycode 12 = F20 ++ shift shiftr keycode 12 = F20 ++ control keycode 12 = F10 ++ alt keycode 12 = Console_10 ++ control alt keycode 12 = Console_10 ++#keycode 13 is brightness down ++#keycode 14 is brightness up ++keycode 15 = F12 F12 Console_24 ++ shiftr keycode 15 = F12 ++ shift shiftr keycode 15 = F12 ++ control keycode 15 = F12 ++ alt keycode 15 = Console_12 ++ control alt keycode 15 = Console_12 ++keycode 16 = apostrophe quotedbl ++ shiftr keycode 16 = quotedbl ++ shift shiftr keycode 16 = quotedbl ++ control keycode 16 = Control_g ++ alt keycode 16 = Meta_apostrophe ++keycode 17 = bracketleft braceleft ++ shiftr keycode 17 = braceleft ++ shift shiftr keycode 17 = braceleft ++ control keycode 17 = Escape ++ alt keycode 17 = Meta_bracketleft ++keycode 18 = minus underscore backslash ++ shiftr keycode 18 = underscore ++ shift shiftr keycode 18 = underscore ++ control keycode 18 = Control_underscore ++ shift control keycode 18 = Control_underscore ++ shiftr control keycode 18 = Control_underscore ++ shift shiftr control keycode 18 = Control_underscore ++ alt keycode 18 = Meta_minus ++keycode 19 = zero parenright braceright ++ shiftr keycode 19 = parenright ++ shift shiftr keycode 19 = parenright ++ alt keycode 19 = Meta_zero ++keycode 20 = p ++ shiftr keycode 20 = +P ++ shift shiftr keycode 20 = +p ++keycode 21 = semicolon colon ++ shiftr keycode 21 = colon ++ shift shiftr keycode 21 = colon ++ alt keycode 21 = Meta_semicolon ++keycode 22 = Up Scroll_Backward ++ shiftr keycode 22 = Scroll_Backward ++ shift shiftr keycode 22 = Scroll_Backward ++ alt keycode 22 = Prior ++keycode 23 = slash question ++ shiftr keycode 23 = question ++ shift shiftr keycode 23 = question ++ control keycode 23 = Delete ++ alt keycode 23 = Meta_slash ++ ++keycode 27 = nine parenleft bracketright ++ shiftr keycode 27 = parenleft ++ shift shiftr keycode 27 = parenleft ++ alt keycode 27 = Meta_nine ++keycode 28 = o ++ shiftr keycode 28 = +O ++ shift shiftr keycode 28 = +o ++keycode 29 = l ++ shiftr keycode 29 = +L ++ shift shiftr keycode 29 = +l ++keycode 30 = period greater ++ shiftr keycode 30 = greater ++ shift shiftr keycode 30 = greater ++ control keycode 30 = Compose ++ alt keycode 30 = Meta_period ++ ++keycode 32 = Left Decr_Console ++ shiftr keycode 32 = Decr_Console ++ shift shiftr keycode 32 = Decr_Console ++ alt keycode 32 = Home ++keycode 33 = bracketright braceright asciitilde ++ shiftr keycode 33 = braceright ++ shift shiftr keycode 33 = braceright ++ control keycode 33 = Control_bracketright ++ alt keycode 33 = Meta_bracketright ++keycode 34 = equal plus ++ shiftr keycode 34 = plus ++ shift shiftr keycode 34 = plus ++ alt keycode 34 = Meta_equal ++keycode 35 = eight asterisk bracketleft ++ shiftr keycode 35 = asterisk ++ shift shiftr keycode 35 = asterisk ++ control keycode 35 = Delete ++ alt keycode 35 = Meta_eight ++keycode 36 = i ++ shiftr keycode 36 = +I ++ shift shiftr keycode 36 = +i ++keycode 37 = k ++ shiftr keycode 37 = +K ++ shift shiftr keycode 37 = +k ++keycode 38 = comma less ++ shiftr keycode 38 = less ++ shift shiftr keycode 38 = less ++ alt keycode 38 = Meta_comma ++ ++keycode 40 = h ++ shiftr keycode 40 = +H ++ shift shiftr keycode 40 = +h ++keycode 41 = y ++ shiftr keycode 41 = +Y ++ shift shiftr keycode 41 = +y ++keycode 42 = six asciicircum ++ shiftr keycode 42 = asciicircum ++ shift shiftr keycode 42 = asciicircum ++ control keycode 42 = Control_asciicircum ++ alt keycode 42 = Meta_six ++keycode 43 = seven ampersand braceleft ++ shiftr keycode 43 = ampersand ++ shift shiftr keycode 43 = ampersand ++ control keycode 43 = Control_underscore ++ alt keycode 43 = Meta_seven ++keycode 44 = u ++ shiftr keycode 44 = +U ++ shift shiftr keycode 44 = +u ++keycode 45 = j ++ shiftr keycode 45 = +J ++ shift shiftr keycode 45 = +j ++keycode 46 = m ++ shiftr keycode 46 = +M ++ shift shiftr keycode 46 = +m ++keycode 47 = n ++ shiftr keycode 47 = +N ++ shift shiftr keycode 47 = +n ++ ++# This is the "Backspace" key: ++keycode 49 = Delete Delete ++ shiftr keycode 49 = Delete ++ shift shiftr keycode 49 = Delete ++ control keycode 49 = BackSpace ++ alt keycode 49 = Meta_Delete ++keycode 50 = Num_Lock ++ shift keycode 50 = Bare_Num_Lock ++ shiftr keycode 50 = Bare_Num_Lock ++ shift shiftr keycode 50 = Bare_Num_Lock ++# This is the "Delete" key: ++keycode 51 = Remove ++ control alt keycode 51 = Boot ++ ++keycode 53 = backslash bar ++ shiftr keycode 53 = bar ++ shift shiftr keycode 53 = bar ++ control keycode 53 = Control_backslash ++ alt keycode 53 = Meta_backslash ++keycode 54 = Return ++ alt keycode 54 = Meta_Control_m ++keycode 55 = space space ++ shiftr keycode 55 = space ++ shift shiftr keycode 55 = space ++ control keycode 55 = nul ++ alt keycode 55 = Meta_space ++keycode 56 = g ++ shiftr keycode 56 = +G ++ shift shiftr keycode 56 = +g ++keycode 57 = t ++ shiftr keycode 57 = +T ++ shift shiftr keycode 57 = +t ++keycode 58 = five percent ++ shiftr keycode 58 = percent ++ shift shiftr keycode 58 = percent ++ control keycode 58 = Control_bracketright ++ alt keycode 58 = Meta_five ++keycode 59 = four dollar dollar ++ shiftr keycode 59 = dollar ++ shift shiftr keycode 59 = dollar ++ control keycode 59 = Control_backslash ++ alt keycode 59 = Meta_four ++keycode 60 = r ++ shiftr keycode 60 = +R ++ shift shiftr keycode 60 = +r ++keycode 61 = f ++ shiftr keycode 61 = +F ++ shift shiftr keycode 61 = +f ++ altgr keycode 61 = Hex_F ++keycode 62 = v ++ shiftr keycode 62 = +V ++ shift shiftr keycode 62 = +v ++keycode 63 = b ++ shiftr keycode 63 = +B ++ shift shiftr keycode 63 = +b ++ altgr keycode 63 = Hex_B ++ ++keycode 67 = three numbersign ++ shiftr keycode 67 = numbersign ++ shift shiftr keycode 67 = numbersign ++ control keycode 67 = Escape ++ alt keycode 67 = Meta_three ++keycode 68 = e ++ shiftr keycode 68 = +E ++ shift shiftr keycode 68 = +e ++ altgr keycode 68 = Hex_E ++keycode 69 = d ++ shiftr keycode 69 = +D ++ shift shiftr keycode 69 = +d ++ altgr keycode 69 = Hex_D ++keycode 70 = c ++ shiftr keycode 70 = +C ++ shift shiftr keycode 70 = +c ++ altgr keycode 70 = Hex_C ++keycode 71 = Right Incr_Console ++ shiftr keycode 71 = Incr_Console ++ shift shiftr keycode 71 = Incr_Console ++ alt keycode 71 = End ++ ++keycode 75 = two at at ++ shiftr keycode 75 = at ++ shift shiftr keycode 75 = at ++ control keycode 75 = nul ++ shift control keycode 75 = nul ++ shiftr control keycode 75 = nul ++ shift shiftr control keycode 75 = nul ++ alt keycode 75 = Meta_two ++keycode 76 = w ++ shiftr keycode 76 = +W ++ shift shiftr keycode 76 = +w ++keycode 77 = s ++ shiftr keycode 77 = +S ++ shift shiftr keycode 77 = +s ++keycode 78 = x ++ shiftr keycode 78 = +X ++ shift shiftr keycode 78 = +x ++keycode 79 = Down Scroll_Forward ++ shiftr keycode 79 = Scroll_Forward ++ shift shiftr keycode 79 = Scroll_Forward ++ alt keycode 79 = Next ++keycode 80 = Escape Escape ++ shiftr keycode 80 = Escape ++ shift shiftr keycode 80 = Escape ++ alt keycode 80 = Meta_Escape ++keycode 81 = Tab Tab ++ shiftr keycode 81 = Tab ++ shift shiftr keycode 81 = Tab ++ alt keycode 81 = Meta_Tab ++keycode 82 = grave asciitilde ++ shiftr keycode 82 = asciitilde ++ shift shiftr keycode 82 = asciitilde ++ control keycode 82 = nul ++ alt keycode 82 = Meta_grave ++keycode 83 = one exclam ++ shiftr keycode 83 = exclam ++ shift shiftr keycode 83 = exclam ++ alt keycode 83 = Meta_one ++keycode 84 = q ++ shiftr keycode 84 = +Q ++ shift shiftr keycode 84 = +q ++keycode 85 = a ++ shiftr keycode 85 = +A ++ shift shiftr keycode 85 = +a ++ altgr keycode 85 = Hex_A ++keycode 86 = z ++ shiftr keycode 86 = +Z ++ shift shiftr keycode 86 = +z ++ ++# This is the windows key: ++keycode 88 = Decr_Console ++keycode 89 = Shift ++keycode 90 = Control ++keycode 91 = Control ++keycode 92 = Alt ++keycode 93 = AltGr ++keycode 94 = ShiftR ++ shift keycode 94 = Caps_Lock +diff -Nur linux-2.4.30/drivers/char/indydog.c linux-2.4.30-mips/drivers/char/indydog.c +--- linux-2.4.30/drivers/char/indydog.c 2003-08-25 13:44:41.000000000 +0200 ++++ linux-2.4.30-mips/drivers/char/indydog.c 2004-06-22 17:32:07.000000000 +0200 +@@ -1,5 +1,5 @@ + /* +- * IndyDog 0.2 A Hardware Watchdog Device for SGI IP22 ++ * IndyDog 0.3 A Hardware Watchdog Device for SGI IP22 + * + * (c) Copyright 2002 Guido Guenther <agx@sigxcpu.org>, All Rights Reserved. + * +@@ -7,10 +7,10 @@ + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. +- * ++ * + * based on softdog.c by Alan Cox <alan@redhat.com> + */ +- ++ + #include <linux/module.h> + #include <linux/config.h> + #include <linux/types.h> +@@ -19,13 +19,12 @@ + #include <linux/mm.h> + #include <linux/miscdevice.h> + #include <linux/watchdog.h> +-#include <linux/smp_lock.h> + #include <linux/init.h> + #include <asm/uaccess.h> + #include <asm/sgi/mc.h> + +-static unsigned long indydog_alive; +-static int expect_close = 0; ++#define PFX "indydog: " ++static int indydog_alive; + + #ifdef CONFIG_WATCHDOG_NOWAYOUT + static int nowayout = 1; +@@ -33,10 +32,30 @@ + static int nowayout = 0; + #endif + ++#define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */ ++ + MODULE_PARM(nowayout,"i"); + MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); + +-static inline void indydog_ping(void) ++static void indydog_start(void) ++{ ++ u32 mc_ctrl0 = sgimc->cpuctrl0; ++ ++ mc_ctrl0 = sgimc->cpuctrl0 | SGIMC_CCTRL0_WDOG; ++ sgimc->cpuctrl0 = mc_ctrl0; ++} ++ ++static void indydog_stop(void) ++{ ++ u32 mc_ctrl0 = sgimc->cpuctrl0; ++ ++ mc_ctrl0 &= ~SGIMC_CCTRL0_WDOG; ++ sgimc->cpuctrl0 = mc_ctrl0; ++ ++ printk(KERN_INFO PFX "Stopped watchdog timer.\n"); ++} ++ ++static void indydog_ping(void) + { + sgimc->watchdogt = 0; + } +@@ -46,18 +65,14 @@ + */ + static int indydog_open(struct inode *inode, struct file *file) + { +- u32 mc_ctrl0; +- +- if (test_and_set_bit(0,&indydog_alive)) ++ if (indydog_alive) + return -EBUSY; + +- if (nowayout) { ++ if (nowayout) + MOD_INC_USE_COUNT; +- } + + /* Activate timer */ +- mc_ctrl0 = sgimc->cpuctrl0 | SGIMC_CCTRL0_WDOG; +- sgimc->cpuctrl0 = mc_ctrl0; ++ indydog_start(); + indydog_ping(); + + indydog_alive = 1; +@@ -69,63 +84,48 @@ + static int indydog_release(struct inode *inode, struct file *file) + { + /* Shut off the timer. +- * Lock it in if it's a module and we set nowayout. */ +- lock_kernel(); +- if (expect_close) { +- u32 mc_ctrl0 = sgimc->cpuctrl0; ++ * Lock it in if it's a module and we defined ...NOWAYOUT */ ++ if (!nowayout) { ++ u32 mc_ctrl0 = sgimc->cpuctrl0; + mc_ctrl0 &= ~SGIMC_CCTRL0_WDOG; + sgimc->cpuctrl0 = mc_ctrl0; + printk(KERN_INFO "Stopped watchdog timer.\n"); +- } else +- printk(KERN_CRIT "WDT device closed unexpectedly. WDT will not stop!\n"); +- clear_bit(0, &indydog_alive); +- unlock_kernel(); ++ } ++ indydog_alive = 0; + + return 0; + } + + static ssize_t indydog_write(struct file *file, const char *data, size_t len, loff_t *ppos) + { +- /* Can't seek (pwrite) on this device */ ++ /* Can't seek (pwrite) on this device */ + if (ppos != &file->f_pos) + return -ESPIPE; + +- /* +- * Refresh the timer. +- */ ++ /* Refresh the timer. */ + if (len) { +- if (!nowayout) { +- size_t i; +- +- /* In case it was set long ago */ +- expect_close = 0; +- +- for (i = 0; i != len; i++) { +- char c; +- if (get_user(c, data + i)) +- return -EFAULT; +- if (c == 'V') +- expect_close = 1; +- } +- } + indydog_ping(); +- return 1; + } +- return 0; ++ return len; + } + + static int indydog_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) + { ++ int options, retval = -EINVAL; + static struct watchdog_info ident = { +- options: WDIOF_MAGICCLOSE, +- identity: "Hardware Watchdog for SGI IP22", ++ .options = WDIOF_KEEPALIVEPING | ++ WDIOF_MAGICCLOSE, ++ .firmware_version = 0, ++ .identity = "Hardware Watchdog for SGI IP22", + }; ++ + switch (cmd) { + default: + return -ENOIOCTLCMD; + case WDIOC_GETSUPPORT: +- if(copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident))) ++ if (copy_to_user((struct watchdog_info *)arg, ++ &ident, sizeof(ident))) + return -EFAULT; + return 0; + case WDIOC_GETSTATUS: +@@ -134,31 +134,53 @@ + case WDIOC_KEEPALIVE: + indydog_ping(); + return 0; ++ case WDIOC_GETTIMEOUT: ++ return put_user(WATCHDOG_TIMEOUT,(int *)arg); ++ case WDIOC_SETOPTIONS: ++ { ++ if (get_user(options, (int *)arg)) ++ return -EFAULT; ++ ++ if (options & WDIOS_DISABLECARD) { ++ indydog_stop(); ++ retval = 0; ++ } ++ ++ if (options & WDIOS_ENABLECARD) { ++ indydog_start(); ++ retval = 0; ++ } ++ ++ return retval; ++ } + } + } + + static struct file_operations indydog_fops = { +- owner: THIS_MODULE, +- write: indydog_write, +- ioctl: indydog_ioctl, +- open: indydog_open, +- release: indydog_release, ++ .owner = THIS_MODULE, ++ .write = indydog_write, ++ .ioctl = indydog_ioctl, ++ .open = indydog_open, ++ .release = indydog_release, + }; + + static struct miscdevice indydog_miscdev = { +- minor: WATCHDOG_MINOR, +- name: "watchdog", +- fops: &indydog_fops, ++ .minor = WATCHDOG_MINOR, ++ .name = "watchdog", ++ .fops = &indydog_fops, + }; + +-static const char banner[] __initdata = KERN_INFO "Hardware Watchdog Timer for SGI IP22: 0.2\n"; ++static char banner[] __initdata = ++ KERN_INFO PFX "Hardware Watchdog Timer for SGI IP22: 0.3\n"; + + static int __init watchdog_init(void) + { + int ret = misc_register(&indydog_miscdev); +- +- if (ret) ++ if (ret) { ++ printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n", ++ WATCHDOG_MINOR, ret); + return ret; ++ } + + printk(banner); + +@@ -172,4 +194,7 @@ + + module_init(watchdog_init); + module_exit(watchdog_exit); ++ ++MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>"); ++MODULE_DESCRIPTION("Hardware Watchdog Device for SGI IP22"); + MODULE_LICENSE("GPL"); +diff -Nur linux-2.4.30/drivers/char/ip27-rtc.c linux-2.4.30-mips/drivers/char/ip27-rtc.c +--- linux-2.4.30/drivers/char/ip27-rtc.c 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/char/ip27-rtc.c 2004-04-06 03:35:30.000000000 +0200 +@@ -44,6 +44,7 @@ + #include <asm/sn/klconfig.h> + #include <asm/sn/sn0/ip27.h> + #include <asm/sn/sn0/hub.h> ++#include <asm/sn/sn_private.h> + + static int rtc_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg); +@@ -209,11 +210,8 @@ + + static int __init rtc_init(void) + { +- nasid_t nid; +- +- nid = get_nasid(); + rtc = (struct m48t35_rtc *) +- (KL_CONFIG_CH_CONS_INFO(nid)->memory_base + IOC3_BYTEBUS_DEV0); ++ (KL_CONFIG_CH_CONS_INFO(master_nasid)->memory_base + IOC3_BYTEBUS_DEV0); + + printk(KERN_INFO "Real Time Clock Driver v%s\n", RTC_VERSION); + if (misc_register(&rtc_dev)) { +@@ -325,3 +323,7 @@ + + rtc_tm->tm_mon--; + } ++ ++MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>"); ++MODULE_DESCRIPTION("SGI IP27 M48T35 RTC driver"); ++MODULE_LICENSE("GPL"); +diff -Nur linux-2.4.30/drivers/char/mips_rtc.c linux-2.4.30-mips/drivers/char/mips_rtc.c +--- linux-2.4.30/drivers/char/mips_rtc.c 2004-01-05 14:53:56.000000000 +0100 ++++ linux-2.4.30-mips/drivers/char/mips_rtc.c 2004-06-28 14:54:53.000000000 +0200 +@@ -53,14 +53,6 @@ + #include <asm/io.h> + #include <asm/uaccess.h> + #include <asm/system.h> +- +-/* +- * Check machine +- */ +-#if !defined(CONFIG_MIPS) || !defined(CONFIG_NEW_TIME_C) +-#error "This driver is for MIPS machines with CONFIG_NEW_TIME_C defined" +-#endif +- + #include <asm/time.h> + + static unsigned long rtc_status = 0; /* bitmapped status byte. */ +diff -Nur linux-2.4.30/drivers/char/sb1250_duart.c linux-2.4.30-mips/drivers/char/sb1250_duart.c +--- linux-2.4.30/drivers/char/sb1250_duart.c 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/char/sb1250_duart.c 2004-09-17 01:25:44.000000000 +0200 +@@ -328,10 +328,11 @@ + if (c <= 0) break; + + if (from_user) { ++ spin_unlock_irqrestore(&us->outp_lock, flags); + if (copy_from_user(us->outp_buf + us->outp_tail, buf, c)) { +- spin_unlock_irqrestore(&us->outp_lock, flags); + return -EFAULT; + } ++ spin_lock_irqsave(&us->outp_lock, flags); + } else { + memcpy(us->outp_buf + us->outp_tail, buf, c); + } +@@ -498,9 +499,31 @@ + duart_set_cflag(us->line, tty->termios->c_cflag); + } + ++static int get_serial_info(uart_state_t *us, struct serial_struct * retinfo) { ++ ++ struct serial_struct tmp; ++ ++ memset(&tmp, 0, sizeof(tmp)); ++ ++ tmp.type=PORT_SB1250; ++ tmp.line=us->line; ++ tmp.port=A_DUART_CHANREG(tmp.line,0); ++ tmp.irq=K_INT_UART_0 + tmp.line; ++ tmp.xmit_fifo_size=16; /* fixed by hw */ ++ tmp.baud_base=5000000; ++ tmp.io_type=SERIAL_IO_MEM; ++ ++ if (copy_to_user(retinfo,&tmp,sizeof(*retinfo))) ++ return -EFAULT; ++ ++ return 0; ++} ++ + static int duart_ioctl(struct tty_struct *tty, struct file * file, + unsigned int cmd, unsigned long arg) + { ++ uart_state_t *us = (uart_state_t *) tty->driver_data; ++ + /* if (serial_paranoia_check(info, tty->device, "rs_ioctl")) + return -ENODEV;*/ + switch (cmd) { +@@ -517,7 +540,7 @@ + printk("Ignoring TIOCMSET\n"); + break; + case TIOCGSERIAL: +- printk("Ignoring TIOCGSERIAL\n"); ++ return get_serial_info(us,(struct serial_struct *) arg); + break; + case TIOCSSERIAL: + printk("Ignoring TIOCSSERIAL\n"); +diff -Nur linux-2.4.30/drivers/char/serial.c linux-2.4.30-mips/drivers/char/serial.c +--- linux-2.4.30/drivers/char/serial.c 2005-01-19 15:09:50.000000000 +0100 ++++ linux-2.4.30-mips/drivers/char/serial.c 2004-12-27 05:13:43.000000000 +0100 +@@ -62,6 +62,12 @@ + * Robert Schwebel <robert@schwebel.de>, + * Juergen Beisert <jbeisert@eurodsn.de>, + * Theodore Ts'o <tytso@mit.edu> ++ * ++ * 10/00: Added suport for MIPS Atlas board. ++ * 11/00: Hooks for serial kernel debug port support added. ++ * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, ++ * carstenl@mips.com ++ * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. + */ + + static char *serial_version = "5.05c"; +@@ -413,6 +419,22 @@ + return 0; + } + ++#if defined(CONFIG_MIPS_ATLAS) || defined(CONFIG_MIPS_SEAD) ++ ++#include <asm/mips-boards/atlas.h> ++ ++static _INLINE_ unsigned int serial_in(struct async_struct *info, int offset) ++{ ++ return (*(volatile unsigned int *)(mips_io_port_base + ATLAS_UART_REGS_BASE + offset*8) & 0xff); ++} ++ ++static _INLINE_ void serial_out(struct async_struct *info, int offset, int value) ++{ ++ *(volatile unsigned int *)(mips_io_port_base + ATLAS_UART_REGS_BASE + offset*8) = value; ++} ++ ++#else ++ + static _INLINE_ unsigned int serial_in(struct async_struct *info, int offset) + { + switch (info->io_type) { +@@ -447,6 +469,8 @@ + outb(value, info->port+offset); + } + } ++#endif ++ + + /* + * We used to support using pause I/O for certain machines. We +diff -Nur linux-2.4.30/drivers/char/victor_mpc30x_keymap.map linux-2.4.30-mips/drivers/char/victor_mpc30x_keymap.map +--- linux-2.4.30/drivers/char/victor_mpc30x_keymap.map 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/char/victor_mpc30x_keymap.map 2004-02-05 18:04:42.000000000 +0100 +@@ -0,0 +1,102 @@ ++# Victor Interlink MP-C303/304 keyboard keymap ++# ++# Copyright (C) 2003 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> ++# ++# This file is subject to the terms and conditions of the GNU General Public ++# License. See the file "COPYING" in the main directory of this archive ++# for more details. ++keymaps 0-1,4-5,8-9,12 ++alt_is_meta ++strings as usual ++compose as usual for "iso-8859-1" ++ ++# First line ++keycode 89 = Escape ++keycode 9 = Delete ++ ++# 2nd line ++keycode 73 = one exclam ++keycode 18 = two quotedbl ++keycode 92 = three numbersign ++ control keycode 92 = Escape ++keycode 53 = four dollar ++ control keycode 53 = Control_backslash ++keycode 21 = five percent ++ control keycode 21 = Control_bracketright ++keycode 50 = six ampersand ++ control keycode 50 = Control_underscore ++keycode 48 = seven apostrophe ++keycode 51 = eight parenleft ++keycode 16 = nine parenright ++keycode 80 = zero asciitilde ++ control keycode 80 = nul ++keycode 49 = minus equal ++keycode 30 = asciicircum asciitilde ++ control keycode 30 = Control_asciicircum ++keycode 5 = backslash bar ++ control keycode 5 = Control_backslash ++keycode 13 = BackSpace ++# 3rd line ++keycode 57 = Tab ++keycode 74 = q ++keycode 26 = w ++keycode 81 = e ++keycode 29 = r ++keycode 37 = t ++keycode 45 = y ++keycode 72 = u ++keycode 24 = i ++keycode 32 = o ++keycode 41 = p ++keycode 1 = at grave ++ control keycode 1 = nul ++keycode 54 = bracketleft braceleft ++keycode 63 = Return ++ alt keycode 63 = Meta_Control_m ++# 4th line ++keycode 23 = Caps_Lock ++keycode 34 = a ++keycode 66 = s ++keycode 52 = d ++keycode 20 = f ++keycode 84 = g ++keycode 67 = h ++keycode 64 = j ++keycode 17 = k ++keycode 83 = l ++keycode 22 = semicolon plus ++keycode 61 = colon asterisk ++ control keycode 61 = Control_g ++keycode 65 = bracketright braceright ++ control keycode 65 = Control_bracketright ++# 5th line ++keycode 91 = Shift ++keycode 76 = z ++keycode 68 = x ++keycode 28 = c ++keycode 36 = v ++keycode 44 = b ++keycode 19 = n ++keycode 27 = m ++keycode 35 = comma less ++keycode 3 = period greater ++ control keycode 3 = Compose ++keycode 38 = slash question ++ control keycode 38 = Delete ++ shift control keycode 38 = Delete ++keycode 6 = backslash underscore ++ control keycode 6 = Control_backslash ++keycode 55 = Up ++ alt keycode 55 = PageUp ++keycode 14 = Shift ++# 6th line ++keycode 56 = Control ++keycode 42 = Alt ++keycode 33 = space ++ control keycode 33 = nul ++keycode 7 = Left ++ alt keycode 7 = Home ++keycode 31 = Down ++ alt keycode 31 = PageDown ++keycode 47 = Right ++ alt keycode 47 = End +diff -Nur linux-2.4.30/drivers/char/vr41xx_keyb.c linux-2.4.30-mips/drivers/char/vr41xx_keyb.c +--- linux-2.4.30/drivers/char/vr41xx_keyb.c 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/char/vr41xx_keyb.c 2004-02-17 13:08:55.000000000 +0100 +@@ -308,7 +308,7 @@ + if (found != 0) { + kiu_base = VRC4173_KIU_OFFSET; + mkiuintreg = VRC4173_MKIUINTREG_OFFSET; +- vrc4173_clock_supply(VRC4173_KIU_CLOCK); ++ vrc4173_supply_clock(VRC4173_KIU_CLOCK); + } + } + #endif +@@ -325,7 +325,7 @@ + + if (current_cpu_data.cputype == CPU_VR4111 || + current_cpu_data.cputype == CPU_VR4121) +- vr41xx_clock_supply(KIU_CLOCK); ++ vr41xx_supply_clock(KIU_CLOCK); + + kiu_writew(KIURST_KIURST, KIURST); + +diff -Nur linux-2.4.30/drivers/i2c/Config.in linux-2.4.30-mips/drivers/i2c/Config.in +--- linux-2.4.30/drivers/i2c/Config.in 2004-04-14 15:05:29.000000000 +0200 ++++ linux-2.4.30-mips/drivers/i2c/Config.in 2005-02-11 20:49:04.000000000 +0100 +@@ -57,6 +57,10 @@ + if [ "$CONFIG_SGI_IP22" = "y" ]; then + dep_tristate 'I2C SGI interfaces' CONFIG_I2C_ALGO_SGI $CONFIG_I2C + fi ++ ++ if [ "$CONFIG_SOC_AU1550" = "y" -o "$CONFIG_SOC_AU1200" ]; then ++ dep_tristate 'Au1550/Au1200 SMBus interface' CONFIG_I2C_ALGO_AU1550 $CONFIG_I2C ++ fi + + # This is needed for automatic patch generation: sensors code starts here + # This is needed for automatic patch generation: sensors code ends here +diff -Nur linux-2.4.30/drivers/i2c/Makefile linux-2.4.30-mips/drivers/i2c/Makefile +--- linux-2.4.30/drivers/i2c/Makefile 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/i2c/Makefile 2005-02-11 20:49:04.000000000 +0100 +@@ -6,7 +6,7 @@ + + export-objs := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \ + i2c-algo-ite.o i2c-algo-sibyte.o i2c-algo-sgi.o \ +- i2c-proc.o ++ i2c-algo-au1550.o i2c-proc.o i2c-au1550.o + + obj-$(CONFIG_I2C) += i2c-core.o + obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o +@@ -25,6 +25,7 @@ + obj-$(CONFIG_I2C_ALGO_SIBYTE) += i2c-algo-sibyte.o i2c-sibyte.o + obj-$(CONFIG_I2C_MAX1617) += i2c-max1617.o + obj-$(CONFIG_I2C_ALGO_SGI) += i2c-algo-sgi.o ++obj-$(CONFIG_I2C_ALGO_AU1550) += i2c-algo-au1550.o i2c-au1550.o + + # This is needed for automatic patch generation: sensors code starts here + # This is needed for automatic patch generation: sensors code ends here +diff -Nur linux-2.4.30/drivers/i2c/i2c-algo-au1550.c linux-2.4.30-mips/drivers/i2c/i2c-algo-au1550.c +--- linux-2.4.30/drivers/i2c/i2c-algo-au1550.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/i2c/i2c-algo-au1550.c 2005-02-11 20:49:04.000000000 +0100 +@@ -0,0 +1,340 @@ ++/* ++ * i2c-algo-au1550.c: SMBus (i2c) driver algorithms for Alchemy PSC interface ++ * Copyright (C) 2004 Embedded Edge, LLC <dan@embeddededge.com> ++ * ++ * The documentation describes this as an SMBus controller, but it doesn't ++ * understand any of the SMBus protocol in hardware. It's really an I2C ++ * controller that could emulate most of the SMBus in software. ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/init.h> ++#include <linux/errno.h> ++#include <linux/delay.h> ++ ++#include <asm/au1000.h> ++#include <asm/au1xxx_psc.h> ++ ++#include <linux/i2c.h> ++#include <linux/i2c-algo-au1550.h> ++ ++static int ++wait_xfer_done(struct i2c_algo_au1550_data *adap) ++{ ++ u32 stat; ++ int i; ++ volatile psc_smb_t *sp; ++ ++ sp = (volatile psc_smb_t *)(adap->psc_base); ++ ++ /* Wait for Tx FIFO Underflow. ++ */ ++ for (i = 0; i < adap->xfer_timeout; i++) { ++ stat = sp->psc_smbevnt; ++ au_sync(); ++ if ((stat & PSC_SMBEVNT_TU) != 0) { ++ /* Clear it. */ ++ sp->psc_smbevnt = PSC_SMBEVNT_TU; ++ au_sync(); ++ return 0; ++ } ++ udelay(1); ++ } ++ ++ return -ETIMEDOUT; ++} ++ ++static int ++wait_ack(struct i2c_algo_au1550_data *adap) ++{ ++ u32 stat; ++ volatile psc_smb_t *sp; ++ ++ if (wait_xfer_done(adap)) ++ return -ETIMEDOUT; ++ ++ sp = (volatile psc_smb_t *)(adap->psc_base); ++ ++ stat = sp->psc_smbevnt; ++ au_sync(); ++ ++ if ((stat & (PSC_SMBEVNT_DN | PSC_SMBEVNT_AN | PSC_SMBEVNT_AL)) != 0) ++ return -ETIMEDOUT; ++ ++ return 0; ++} ++ ++static int ++wait_master_done(struct i2c_algo_au1550_data *adap) ++{ ++ u32 stat; ++ int i; ++ volatile psc_smb_t *sp; ++ ++ sp = (volatile psc_smb_t *)(adap->psc_base); ++ ++ /* Wait for Master Done. ++ */ ++ for (i = 0; i < adap->xfer_timeout; i++) { ++ stat = sp->psc_smbevnt; ++ au_sync(); ++ if ((stat & PSC_SMBEVNT_MD) != 0) ++ return 0; ++ udelay(1); ++ } ++ ++ return -ETIMEDOUT; ++} ++ ++static int ++do_address(struct i2c_algo_au1550_data *adap, unsigned int addr, int rd) ++{ ++ volatile psc_smb_t *sp; ++ u32 stat; ++ ++ sp = (volatile psc_smb_t *)(adap->psc_base); ++ ++ /* Reset the FIFOs, clear events. ++ */ ++ sp->psc_smbpcr = PSC_SMBPCR_DC; ++ sp->psc_smbevnt = PSC_SMBEVNT_ALLCLR; ++ au_sync(); ++ do { ++ stat = sp->psc_smbpcr; ++ au_sync(); ++ } while ((stat & PSC_SMBPCR_DC) != 0); ++ ++ /* Write out the i2c chip address and specify operation ++ */ ++ addr <<= 1; ++ if (rd) ++ addr |= 1; ++ ++ /* Put byte into fifo, start up master. ++ */ ++ sp->psc_smbtxrx = addr; ++ au_sync(); ++ sp->psc_smbpcr = PSC_SMBPCR_MS; ++ au_sync(); ++ if (wait_ack(adap)) ++ return -EIO; ++ return 0; ++} ++ ++static u32 ++wait_for_rx_byte(struct i2c_algo_au1550_data *adap, u32 *ret_data) ++{ ++ int j; ++ u32 data, stat; ++ volatile psc_smb_t *sp; ++ ++ if (wait_xfer_done(adap)) ++ return -EIO; ++ ++ sp = (volatile psc_smb_t *)(adap->psc_base); ++ ++ j = adap->xfer_timeout * 100; ++ do { ++ j--; ++ if (j <= 0) ++ return -EIO; ++ ++ stat = sp->psc_smbstat; ++ au_sync(); ++ if ((stat & PSC_SMBSTAT_RE) == 0) ++ j = 0; ++ else ++ udelay(1); ++ } while (j > 0); ++ data = sp->psc_smbtxrx; ++ au_sync(); ++ *ret_data = data; ++ ++ return 0; ++} ++ ++static int ++i2c_read(struct i2c_algo_au1550_data *adap, unsigned char *buf, ++ unsigned int len) ++{ ++ int i; ++ u32 data; ++ volatile psc_smb_t *sp; ++ ++ if (len == 0) ++ return 0; ++ ++ /* A read is performed by stuffing the transmit fifo with ++ * zero bytes for timing, waiting for bytes to appear in the ++ * receive fifo, then reading the bytes. ++ */ ++ ++ sp = (volatile psc_smb_t *)(adap->psc_base); ++ ++ i = 0; ++ while (i < (len-1)) { ++ sp->psc_smbtxrx = 0; ++ au_sync(); ++ if (wait_for_rx_byte(adap, &data)) ++ return -EIO; ++ ++ buf[i] = data; ++ i++; ++ } ++ ++ /* The last byte has to indicate transfer done. ++ */ ++ sp->psc_smbtxrx = PSC_SMBTXRX_STP; ++ au_sync(); ++ if (wait_master_done(adap)) ++ return -EIO; ++ ++ data = sp->psc_smbtxrx; ++ au_sync(); ++ buf[i] = data; ++ return 0; ++} ++ ++static int ++i2c_write(struct i2c_algo_au1550_data *adap, unsigned char *buf, ++ unsigned int len) ++{ ++ int i; ++ u32 data; ++ volatile psc_smb_t *sp; ++ ++ if (len == 0) ++ return 0; ++ ++ sp = (volatile psc_smb_t *)(adap->psc_base); ++ ++ i = 0; ++ while (i < (len-1)) { ++ data = buf[i]; ++ sp->psc_smbtxrx = data; ++ au_sync(); ++ if (wait_ack(adap)) ++ return -EIO; ++ i++; ++ } ++ ++ /* The last byte has to indicate transfer done. ++ */ ++ data = buf[i]; ++ data |= PSC_SMBTXRX_STP; ++ sp->psc_smbtxrx = data; ++ au_sync(); ++ if (wait_master_done(adap)) ++ return -EIO; ++ return 0; ++} ++ ++static int ++au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) ++{ ++ struct i2c_algo_au1550_data *adap = i2c_adap->algo_data; ++ struct i2c_msg *p; ++ int i, err = 0; ++ ++ for (i = 0; !err && i < num; i++) { ++ p = &msgs[i]; ++ err = do_address(adap, p->addr, p->flags & I2C_M_RD); ++ if (err || !p->len) ++ continue; ++ if (p->flags & I2C_M_RD) ++ err = i2c_read(adap, p->buf, p->len); ++ else ++ err = i2c_write(adap, p->buf, p->len); ++ } ++ ++ /* Return the number of messages processed, or the error code. ++ */ ++ if (err == 0) ++ err = num; ++ return err; ++} ++ ++static u32 ++au1550_func(struct i2c_adapter *adap) ++{ ++ return I2C_FUNC_I2C; ++} ++ ++static struct i2c_algorithm au1550_algo = { ++ .name = "Au1550 algorithm", ++ .id = I2C_ALGO_AU1550, ++ .master_xfer = au1550_xfer, ++ .functionality = au1550_func, ++}; ++ ++/* ++ * registering functions to load algorithms at runtime ++ * Prior to calling us, the 50MHz clock frequency and routing ++ * must have been set up for the PSC indicated by the adapter. ++ */ ++int ++i2c_au1550_add_bus(struct i2c_adapter *i2c_adap) ++{ ++ struct i2c_algo_au1550_data *adap = i2c_adap->algo_data; ++ volatile psc_smb_t *sp; ++ u32 stat; ++ ++ i2c_adap->algo = &au1550_algo; ++ ++ /* Now, set up the PSC for SMBus PIO mode. ++ */ ++ sp = (volatile psc_smb_t *)(adap->psc_base); ++ sp->psc_ctrl = PSC_CTRL_DISABLE; ++ au_sync(); ++ sp->psc_sel = PSC_SEL_PS_SMBUSMODE; ++ sp->psc_smbcfg = 0; ++ au_sync(); ++ sp->psc_ctrl = PSC_CTRL_ENABLE; ++ au_sync(); ++ do { ++ stat = sp->psc_smbstat; ++ au_sync(); ++ } while ((stat & PSC_SMBSTAT_SR) == 0); ++ ++ sp->psc_smbcfg = (PSC_SMBCFG_RT_FIFO8 | PSC_SMBCFG_TT_FIFO8 | ++ PSC_SMBCFG_DD_DISABLE); ++ ++ /* Divide by 8 to get a 6.25 MHz clock. The later protocol ++ * timings are based on this clock. ++ */ ++ sp->psc_smbcfg |= PSC_SMBCFG_SET_DIV(PSC_SMBCFG_DIV2); ++ sp->psc_smbmsk = PSC_SMBMSK_ALLMASK; ++ au_sync(); ++ ++ /* Set the protocol timer values. See Table 71 in the ++ * Au1550 Data Book for standard timing values. ++ */ ++ sp->psc_smbtmr = PSC_SMBTMR_SET_TH(2) | PSC_SMBTMR_SET_PS(15) | \ ++ PSC_SMBTMR_SET_PU(11) | PSC_SMBTMR_SET_SH(11) | \ ++ PSC_SMBTMR_SET_SU(11) | PSC_SMBTMR_SET_CL(15) | \ ++ PSC_SMBTMR_SET_CH(11); ++ au_sync(); ++ ++ sp->psc_smbcfg |= PSC_SMBCFG_DE_ENABLE; ++ do { ++ stat = sp->psc_smbstat; ++ au_sync(); ++ } while ((stat & PSC_SMBSTAT_DR) == 0); ++ ++ return i2c_add_adapter(i2c_adap); ++} ++ ++ ++int ++i2c_au1550_del_bus(struct i2c_adapter *adap) ++{ ++ return i2c_del_adapter(adap); ++} ++ ++EXPORT_SYMBOL(i2c_au1550_add_bus); ++EXPORT_SYMBOL(i2c_au1550_del_bus); ++ ++MODULE_AUTHOR("Dan Malek <dan@embeddededge.com>"); ++MODULE_DESCRIPTION("SMBus Au1550 algorithm"); ++MODULE_LICENSE("GPL"); +diff -Nur linux-2.4.30/drivers/i2c/i2c-au1550.c linux-2.4.30-mips/drivers/i2c/i2c-au1550.c +--- linux-2.4.30/drivers/i2c/i2c-au1550.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/i2c/i2c-au1550.c 2005-02-11 20:49:04.000000000 +0100 +@@ -0,0 +1,154 @@ ++/* ++ * i2c-au1550.c: SMBus (i2c) adapter for Alchemy PSC interface ++ * Copyright (C) 2004 Embedded Edge, LLC <dan@embeddededge.com> ++ * ++ * This is just a skeleton adapter to use with the Au1550 PSC ++ * algorithm. It was developed for the Pb1550, but will work with ++ * any Au1550 board that has a similar PSC configuration. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ */ ++ ++#include <linux/config.h> ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/init.h> ++#include <linux/errno.h> ++ ++#include <asm/au1000.h> ++#include <asm/au1xxx_psc.h> ++#if defined( CONFIG_MIPS_PB1550 ) ++ #include <asm/pb1550.h> ++#endif ++#if defined( CONFIG_MIPS_PB1200 ) ++ #include <asm/pb1200.h> ++#endif ++#if defined( CONFIG_MIPS_DB1200 ) ++ #include <asm/db1200.h> ++#endif ++#if defined( CONFIG_MIPS_FICMMP ) ++ #include <asm/ficmmp.h> ++#endif ++ ++#include <linux/i2c.h> ++#include <linux/i2c-algo-au1550.h> ++ ++ ++ ++static int ++pb1550_reg(struct i2c_client *client) ++{ ++ return 0; ++} ++ ++static int ++pb1550_unreg(struct i2c_client *client) ++{ ++ return 0; ++} ++ ++static void ++pb1550_inc_use(struct i2c_adapter *adap) ++{ ++#ifdef MODULE ++ MOD_INC_USE_COUNT; ++#endif ++} ++ ++static void ++pb1550_dec_use(struct i2c_adapter *adap) ++{ ++#ifdef MODULE ++ MOD_DEC_USE_COUNT; ++#endif ++} ++ ++static struct i2c_algo_au1550_data pb1550_i2c_info = { ++ SMBUS_PSC_BASE, 200, 200 ++}; ++ ++static struct i2c_adapter pb1550_board_adapter = { ++ name: "pb1550 adapter", ++ id: I2C_HW_AU1550_PSC, ++ algo: NULL, ++ algo_data: &pb1550_i2c_info, ++ inc_use: pb1550_inc_use, ++ dec_use: pb1550_dec_use, ++ client_register: pb1550_reg, ++ client_unregister: pb1550_unreg, ++ client_count: 0, ++}; ++ ++int __init ++i2c_pb1550_init(void) ++{ ++ /* This is where we would set up a 50MHz clock source ++ * and routing. On the Pb1550, the SMBus is PSC2, which ++ * uses a shared clock with USB. This has been already ++ * configured by Yamon as a 48MHz clock, close enough ++ * for our work. ++ */ ++ if (i2c_au1550_add_bus(&pb1550_board_adapter) < 0) ++ return -ENODEV; ++ ++ return 0; ++} ++ ++/* BIG hack to support the control interface on the Wolfson WM8731 ++ * audio codec on the Pb1550 board. We get an address and two data ++ * bytes to write, create an i2c message, and send it across the ++ * i2c transfer function. We do this here because we have access to ++ * the i2c adapter structure. ++ */ ++static struct i2c_msg wm_i2c_msg; /* We don't want this stuff on the stack */ ++static u8 i2cbuf[2]; ++ ++int ++pb1550_wm_codec_write(u8 addr, u8 reg, u8 val) ++{ ++ wm_i2c_msg.addr = addr; ++ wm_i2c_msg.flags = 0; ++ wm_i2c_msg.buf = i2cbuf; ++ wm_i2c_msg.len = 2; ++ i2cbuf[0] = reg; ++ i2cbuf[1] = val; ++ ++ return pb1550_board_adapter.algo->master_xfer(&pb1550_board_adapter, &wm_i2c_msg, 1); ++} ++ ++/* the next function is needed by DVB driver. */ ++int pb1550_i2c_xfer(struct i2c_msg msgs[], int num) ++{ ++ return pb1550_board_adapter.algo->master_xfer(&pb1550_board_adapter, msgs, num); ++} ++ ++EXPORT_SYMBOL(pb1550_wm_codec_write); ++EXPORT_SYMBOL(pb1550_i2c_xfer); ++ ++MODULE_AUTHOR("Dan Malek, Embedded Edge, LLC."); ++MODULE_DESCRIPTION("SMBus adapter Alchemy pb1550"); ++MODULE_LICENSE("GPL"); ++ ++int ++init_module(void) ++{ ++ return i2c_pb1550_init(); ++} ++ ++void ++cleanup_module(void) ++{ ++ i2c_au1550_del_bus(&pb1550_board_adapter); ++} +diff -Nur linux-2.4.30/drivers/i2c/i2c-core.c linux-2.4.30-mips/drivers/i2c/i2c-core.c +--- linux-2.4.30/drivers/i2c/i2c-core.c 2005-01-19 15:09:54.000000000 +0100 ++++ linux-2.4.30-mips/drivers/i2c/i2c-core.c 2004-11-29 18:47:16.000000000 +0100 +@@ -1280,6 +1280,9 @@ + #ifdef CONFIG_I2C_MAX1617 + extern int i2c_max1617_init(void); + #endif ++#ifdef CONFIG_I2C_ALGO_AU1550 ++ extern int i2c_pb1550_init(void); ++#endif + + #ifdef CONFIG_I2C_PROC + extern int sensors_init(void); +@@ -1335,6 +1338,10 @@ + i2c_max1617_init(); + #endif + ++#ifdef CONFIG_I2C_ALGO_AU1550 ++ i2c_pb1550_init(); ++#endif ++ + /* -------------- proc interface ---- */ + #ifdef CONFIG_I2C_PROC + sensors_init(); +diff -Nur linux-2.4.30/drivers/media/video/indycam.c linux-2.4.30-mips/drivers/media/video/indycam.c +--- linux-2.4.30/drivers/media/video/indycam.c 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/media/video/indycam.c 2004-12-09 21:32:05.000000000 +0100 +@@ -50,13 +50,14 @@ + 0x80, /* INDYCAM_GAMMA */ + }; + +- int err = 0; + struct indycam *camera; + struct i2c_client *client; ++ int err = 0; + + client = kmalloc(sizeof(*client), GFP_KERNEL); +- if (!client) ++ if (!client) + return -ENOMEM; ++ + camera = kmalloc(sizeof(*camera), GFP_KERNEL); + if (!camera) { + err = -ENOMEM; +@@ -67,7 +68,7 @@ + client->adapter = adap; + client->addr = addr; + client->driver = &i2c_driver_indycam; +- strcpy(client->name, "IndyCam client"); ++ strcpy(client->name, "IndyCam client"); + camera->client = client; + + err = i2c_attach_client(client); +@@ -75,18 +76,18 @@ + goto out_free_camera; + + camera->version = i2c_smbus_read_byte_data(client, INDYCAM_VERSION); +- if (camera->version != CAMERA_VERSION_INDY && +- camera->version != CAMERA_VERSION_MOOSE) { ++ if ((camera->version != CAMERA_VERSION_INDY) && ++ (camera->version != CAMERA_VERSION_MOOSE)) { + err = -ENODEV; + goto out_detach_client; + } +- printk(KERN_INFO "Indycam v%d.%d detected.\n", ++ printk(KERN_INFO "IndyCam v%d.%d detected.\n", + INDYCAM_VERSION_MAJOR(camera->version), + INDYCAM_VERSION_MINOR(camera->version)); + + err = i2c_master_send(client, initseq, sizeof(initseq)); + if (err) +- printk(KERN_INFO "IndyCam initalization failed\n"); ++ printk(KERN_ERR "IndyCam initalization failed.\n"); + + MOD_INC_USE_COUNT; + return 0; +diff -Nur linux-2.4.30/drivers/media/video/vino.c linux-2.4.30-mips/drivers/media/video/vino.c +--- linux-2.4.30/drivers/media/video/vino.c 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/media/video/vino.c 2004-12-10 05:02:54.000000000 +0100 +@@ -5,6 +5,8 @@ + * License version 2 as published by the Free Software Foundation. + * + * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org> ++ * Copyright (C) 2004 Mikael Nousiainen <tmnousia@cc.hut.fi> ++ * + */ + + #include <linux/module.h> +@@ -37,13 +39,23 @@ + #define DEBUG(x...) + #endif + ++/* Channels (who could have guessed) */ ++#define VINO_CHAN_NONE 0 ++#define VINO_CHAN_A 1 ++#define VINO_CHAN_B 2 ++ + /* VINO video size */ + #define VINO_PAL_WIDTH 768 + #define VINO_PAL_HEIGHT 576 + #define VINO_NTSC_WIDTH 646 + #define VINO_NTSC_HEIGHT 486 + +-/* set this to some sensible values. note: VINO_MIN_WIDTH has to be 8*x */ ++/* Minimum value for Y-clipping (for smaller values the images ++ * will be corrupted) */ ++#define VINO_MIN_Y_CLIPPING 2 ++ ++/* Set these to some sensible values. ++ * Note: the picture width has to be divisible by 8 */ + #define VINO_MIN_WIDTH 32 + #define VINO_MIN_HEIGHT 32 + +@@ -64,9 +76,7 @@ + + struct vino_device { + struct video_device vdev; +-#define VINO_CHAN_A 1 +-#define VINO_CHAN_B 2 +- int chan; ++ int chan; /* VINO_CHAN_NONE, VINO_CHAN_A or VINO_CHAN_B */ + int alpha; + /* clipping... */ + unsigned int left, right, top, bottom; +@@ -106,7 +116,7 @@ + + struct vino_client { + struct i2c_client *driver; +- int owner; ++ int owner; /* VINO_CHAN_NONE, VINO_CHAN_A or VINO_CHAN_B */ + }; + + struct vino_video { +@@ -362,6 +372,7 @@ + static int dma_setup(struct vino_device *v) + { + u32 ctrl, intr; ++ int ofs; + struct sgi_vino_channel *ch; + + ch = (v->chan == VINO_CHAN_A) ? &vino->a : &vino->b; +@@ -377,14 +388,24 @@ + ch->line_size = v->line_size - 8; + /* set the alpha register */ + ch->alpha = v->alpha; +- /* set cliping registers */ +- ch->clip_start = VINO_CLIP_ODD(v->top) | VINO_CLIP_EVEN(v->top+1) | ++ /* Set the clipping registers, this is the constant source of fun :) ++ * Y clipping start has to be >= 2 and end has to be start + height/2 ++ * The values of top and bottom are even so dividing is not a problem ++ * ++ * The docs say that clipping values for the even field should be ++ * odd_end + something_to_skip_vertical_blanking + some_lines and ++ * even_start + height/2, though the image is good this way also ++ * ++ * TODO: for analog sources (SAA7191), the clipping values are a bit ++ * different and that case isn't yet handled ++ */ ++ ofs = VINO_MIN_Y_CLIPPING; /* Should depend on input source */ ++ ch->clip_start = VINO_CLIP_ODD(ofs + v->top / 2) | ++ VINO_CLIP_EVEN(ofs + v->top / 2 + 1) | + VINO_CLIP_X(v->left); +- ch->clip_end = VINO_CLIP_ODD(v->bottom) | VINO_CLIP_EVEN(v->bottom+1) | ++ ch->clip_end = VINO_CLIP_ODD(ofs + v->bottom / 2 - 1) | ++ VINO_CLIP_EVEN(ofs + v->bottom / 2) | + VINO_CLIP_X(v->right); +- /* FIXME: end-of-field bug workaround +- VINO_CLIP_X(VINO_PAL_WIDTH); +- */ + /* init the frame rate and norm (full frame rate only for now...) */ + ch->frame_rate = VINO_FRAMERT_RT(0x1fff) | + (get_capture_norm(v) == VIDEO_MODE_PAL ? +@@ -510,6 +531,7 @@ + static void vino_interrupt(int irq, void *dev_id, struct pt_regs *regs) + { + u32 intr, ctrl; ++ int a_eof, b_eof; + + spin_lock(&Vino->vino_lock); + ctrl = vino->control; +@@ -525,12 +547,14 @@ + vino->control = ctrl; + clear_eod(&Vino->chB); + } ++ a_eof = intr & VINO_INTSTAT_A_EOF; ++ b_eof = intr & VINO_INTSTAT_B_EOF; + vino->intr_status = ~intr; + spin_unlock(&Vino->vino_lock); +- /* FIXME: For now we are assuming that interrupt means that frame is +- * done. That's not true, but we can live with such brokeness for +- * a while ;-) */ +- field_done(&Vino->chA); ++ if (a_eof) ++ field_done(&Vino->chA); ++ if (b_eof) ++ field_done(&Vino->chB); + } + + static int vino_grab(struct vino_device *v, int frame) +diff -Nur linux-2.4.30/drivers/mtd/devices/docprobe.c linux-2.4.30-mips/drivers/mtd/devices/docprobe.c +--- linux-2.4.30/drivers/mtd/devices/docprobe.c 2003-06-13 16:51:34.000000000 +0200 ++++ linux-2.4.30-mips/drivers/mtd/devices/docprobe.c 2003-06-16 01:42:21.000000000 +0200 +@@ -89,10 +89,10 @@ + 0xe4000000, + #elif defined(CONFIG_MOMENCO_OCELOT) + 0x2f000000, +- 0xff000000, ++ 0xff000000, + #elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C) +- 0xff000000, +-##else ++ 0xff000000, ++#else + #warning Unknown architecture for DiskOnChip. No default probe locations defined + #endif + 0 }; +diff -Nur linux-2.4.30/drivers/mtd/devices/ms02-nv.c linux-2.4.30-mips/drivers/mtd/devices/ms02-nv.c +--- linux-2.4.30/drivers/mtd/devices/ms02-nv.c 2003-06-13 16:51:34.000000000 +0200 ++++ linux-2.4.30-mips/drivers/mtd/devices/ms02-nv.c 2004-07-30 12:22:40.000000000 +0200 +@@ -1,10 +1,10 @@ + /* +- * Copyright (c) 2001 Maciej W. Rozycki ++ * Copyright (c) 2001 Maciej W. Rozycki + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * as published by the Free Software Foundation; either version +- * 2 of the License, or (at your option) any later version. ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. + * + * $Id: ms02-nv.c,v 1.2 2003/01/24 14:05:17 dwmw2 Exp $ + */ +@@ -29,18 +29,18 @@ + + + static char version[] __initdata = +- "ms02-nv.c: v.1.0.0 13 Aug 2001 Maciej W. Rozycki.\n"; ++ "ms02-nv.c: v.1.0.0 13 Aug 2001 Maciej W. Rozycki.\n"; + +-MODULE_AUTHOR("Maciej W. Rozycki <macro@ds2.pg.gda.pl>"); ++MODULE_AUTHOR("Maciej W. Rozycki <macro@linux-mips.org>"); + MODULE_DESCRIPTION("DEC MS02-NV NVRAM module driver"); + MODULE_LICENSE("GPL"); + + + /* + * Addresses we probe for an MS02-NV at. Modules may be located +- * at any 8MB boundary within a 0MB up to 112MB range or at any 32MB +- * boundary within a 0MB up to 448MB range. We don't support a module +- * at 0MB, though. ++ * at any 8MiB boundary within a 0MiB up to 112MiB range or at any 32MiB ++ * boundary within a 0MiB up to 448MiB range. We don't support a module ++ * at 0MiB, though. + */ + static ulong ms02nv_addrs[] __initdata = { + 0x07000000, 0x06800000, 0x06000000, 0x05800000, 0x05000000, +@@ -130,7 +130,7 @@ + + int ret = -ENODEV; + +- /* The module decodes 8MB of address space. */ ++ /* The module decodes 8MiB of address space. */ + mod_res = kmalloc(sizeof(*mod_res), GFP_KERNEL); + if (!mod_res) + return -ENOMEM; +@@ -233,7 +233,7 @@ + goto err_out_csr_res; + } + +- printk(KERN_INFO "mtd%d: %s at 0x%08lx, size %uMB.\n", ++ printk(KERN_INFO "mtd%d: %s at 0x%08lx, size %uMiB.\n", + mtd->index, ms02nv_name, addr, size >> 20); + + mp->next = root_ms02nv_mtd; +@@ -293,12 +293,12 @@ + + switch (mips_machtype) { + case MACH_DS5000_200: +- csr = (volatile u32 *)KN02_CSR_ADDR; ++ csr = (volatile u32 *)KN02_CSR_BASE; + if (*csr & KN02_CSR_BNK32M) + stride = 2; + break; + case MACH_DS5000_2X0: +- case MACH_DS5000: ++ case MACH_DS5900: + csr = (volatile u32 *)KN03_MCR_BASE; + if (*csr & KN03_MCR_BNK32M) + stride = 2; +diff -Nur linux-2.4.30/drivers/mtd/devices/ms02-nv.h linux-2.4.30-mips/drivers/mtd/devices/ms02-nv.h +--- linux-2.4.30/drivers/mtd/devices/ms02-nv.h 2002-11-29 00:53:13.000000000 +0100 ++++ linux-2.4.30-mips/drivers/mtd/devices/ms02-nv.h 2004-07-30 12:22:40.000000000 +0200 +@@ -1,32 +1,96 @@ + /* +- * Copyright (c) 2001 Maciej W. Rozycki ++ * Copyright (c) 2001, 2003 Maciej W. Rozycki + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * as published by the Free Software Foundation; either version +- * 2 of the License, or (at your option) any later version. ++ * DEC MS02-NV (54-20948-01) battery backed-up NVRAM module for ++ * DECstation/DECsystem 5000/2x0 and DECsystem 5900 and 5900/260 ++ * systems. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ * ++ * $Id: ms02-nv.h,v 1.3 2003/08/19 09:25:36 dwmw2 Exp $ + */ + + #include <linux/ioport.h> + #include <linux/mtd/mtd.h> + ++/* ++ * Addresses are decoded as follows: ++ * ++ * 0x000000 - 0x3fffff SRAM ++ * 0x400000 - 0x7fffff CSR ++ * ++ * Within the SRAM area the following ranges are forced by the system ++ * firmware: ++ * ++ * 0x000000 - 0x0003ff diagnostic area, destroyed upon a reboot ++ * 0x000400 - ENDofRAM storage area, available to operating systems ++ * ++ * but we can't really use the available area right from 0x000400 as ++ * the first word is used by the firmware as a status flag passed ++ * from an operating system. If anything but the valid data magic ++ * ID value is found, the firmware considers the SRAM clean, i.e. ++ * containing no valid data, and disables the battery resulting in ++ * data being erased as soon as power is switched off. So the choice ++ * for the start address of the user-available is 0x001000 which is ++ * nicely page aligned. The area between 0x000404 and 0x000fff may ++ * be used by the driver for own needs. ++ * ++ * The diagnostic area defines two status words to be read by an ++ * operating system, a magic ID to distinguish a MS02-NV board from ++ * anything else and a status information providing results of tests ++ * as well as the size of SRAM available, which can be 1MiB or 2MiB ++ * (that's what the firmware handles; no idea if 2MiB modules ever ++ * existed). ++ * ++ * The firmware only handles the MS02-NV board if installed in the ++ * last (15th) slot, so for any other location the status information ++ * stored in the SRAM cannot be relied upon. But from the hardware ++ * point of view there is no problem using up to 14 such boards in a ++ * system -- only the 1st slot needs to be filled with a DRAM module. ++ * The MS02-NV board is ECC-protected, like other MS02 memory boards. ++ * ++ * The state of the battery as provided by the CSR is reflected on ++ * the two onboard LEDs. When facing the battery side of the board, ++ * with the LEDs at the top left and the battery at the bottom right ++ * (i.e. looking from the back side of the system box), their meaning ++ * is as follows (the system has to be powered on): ++ * ++ * left LED battery disable status: lit = enabled ++ * right LED battery condition status: lit = OK ++ */ ++ + /* MS02-NV iomem register offsets. */ + #define MS02NV_CSR 0x400000 /* control & status register */ + ++/* MS02-NV CSR status bits. */ ++#define MS02NV_CSR_BATT_OK 0x01 /* battery OK */ ++#define MS02NV_CSR_BATT_OFF 0x02 /* battery disabled */ ++ ++ + /* MS02-NV memory offsets. */ + #define MS02NV_DIAG 0x0003f8 /* diagnostic status */ + #define MS02NV_MAGIC 0x0003fc /* MS02-NV magic ID */ +-#define MS02NV_RAM 0x000400 /* general-purpose RAM start */ ++#define MS02NV_VALID 0x000400 /* valid data magic ID */ ++#define MS02NV_RAM 0x001000 /* user-exposed RAM start */ + +-/* MS02-NV diagnostic status constants. */ +-#define MS02NV_DIAG_SIZE_MASK 0xf0 /* RAM size mask */ +-#define MS02NV_DIAG_SIZE_SHIFT 0x10 /* RAM size shift (left) */ ++/* MS02-NV diagnostic status bits. */ ++#define MS02NV_DIAG_TEST 0x01 /* SRAM test done (?) */ ++#define MS02NV_DIAG_RO 0x02 /* SRAM r/o test done */ ++#define MS02NV_DIAG_RW 0x04 /* SRAM r/w test done */ ++#define MS02NV_DIAG_FAIL 0x08 /* SRAM test failed */ ++#define MS02NV_DIAG_SIZE_MASK 0xf0 /* SRAM size mask */ ++#define MS02NV_DIAG_SIZE_SHIFT 0x10 /* SRAM size shift (left) */ + + /* MS02-NV general constants. */ + #define MS02NV_ID 0x03021966 /* MS02-NV magic ID value */ ++#define MS02NV_VALID_ID 0xbd100248 /* valid data magic ID value */ + #define MS02NV_SLOT_SIZE 0x800000 /* size of the address space + decoded by the module */ + ++ + typedef volatile u32 ms02nv_uint; + + struct ms02nv_private { +diff -Nur linux-2.4.30/drivers/mtd/maps/Config.in linux-2.4.30-mips/drivers/mtd/maps/Config.in +--- linux-2.4.30/drivers/mtd/maps/Config.in 2003-06-13 16:51:34.000000000 +0200 ++++ linux-2.4.30-mips/drivers/mtd/maps/Config.in 2004-02-26 01:46:35.000000000 +0100 +@@ -51,11 +51,26 @@ + dep_tristate ' Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000 + dep_tristate ' Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500 + dep_tristate ' Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100 ++ dep_tristate ' Bosporus MTD support' CONFIG_MTD_BOSPORUS $CONFIG_MIPS_BOSPORUS ++ dep_tristate ' XXS1500 boot flash device' CONFIG_MTD_XXS1500 $CONFIG_MIPS_XXS1500 ++ dep_tristate ' MTX-1 flash device' CONFIG_MTD_MTX1 $CONFIG_MIPS_MTX1 + if [ "$CONFIG_MTD_PB1500" = "y" -o "$CONFIG_MTD_PB1500" = "m" \ + -o "$CONFIG_MTD_PB1100" = "y" -o "$CONFIG_MTD_PB1100" = "m" ]; then + bool ' Pb[15]00 boot flash device' CONFIG_MTD_PB1500_BOOT + bool ' Pb[15]00 user flash device (2nd 32MiB bank)' CONFIG_MTD_PB1500_USER + fi ++ tristate ' Db1x00 MTD support' CONFIG_MTD_DB1X00 ++ if [ "$CONFIG_MTD_DB1X00" = "y" -o "$CONFIG_MTD_DB1X00" = "m" ]; then ++ bool ' Db1x00 boot flash device' CONFIG_MTD_DB1X00_BOOT ++ bool ' Db1x00 user flash device (2nd bank)' CONFIG_MTD_DB1X00_USER ++ fi ++ tristate ' Pb1550 MTD support' CONFIG_MTD_PB1550 ++ if [ "$CONFIG_MTD_PB1550" = "y" -o "$CONFIG_MTD_PB1550" = "m" ]; then ++ bool ' Pb1550 Boot Flash' CONFIG_MTD_PB1550_BOOT ++ bool ' Pb1550 User Parameter Flash' CONFIG_MTD_PB1550_USER ++ fi ++ dep_tristate ' Hydrogen 3 MTD support' CONFIG_MTD_HYDROGEN3 $CONFIG_MIPS_HYDROGEN3 ++ dep_tristate ' Mirage MTD support' CONFIG_MTD_MIRAGE $CONFIG_MIPS_MIRAGE + dep_tristate ' Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS + if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then + hex ' Physical start address of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_START 0x8000000 +diff -Nur linux-2.4.30/drivers/mtd/maps/Makefile linux-2.4.30-mips/drivers/mtd/maps/Makefile +--- linux-2.4.30/drivers/mtd/maps/Makefile 2003-06-13 16:51:34.000000000 +0200 ++++ linux-2.4.30-mips/drivers/mtd/maps/Makefile 2004-02-26 01:46:35.000000000 +0100 +@@ -52,7 +52,13 @@ + obj-$(CONFIG_MTD_PB1000) += pb1xxx-flash.o + obj-$(CONFIG_MTD_PB1100) += pb1xxx-flash.o + obj-$(CONFIG_MTD_PB1500) += pb1xxx-flash.o ++obj-$(CONFIG_MTD_XXS1500) += xxs1500.o ++obj-$(CONFIG_MTD_MTX1) += mtx-1.o + obj-$(CONFIG_MTD_LASAT) += lasat.o ++obj-$(CONFIG_MTD_DB1X00) += db1x00-flash.o ++obj-$(CONFIG_MTD_PB1550) += pb1550-flash.o ++obj-$(CONFIG_MTD_HYDROGEN3) += hydrogen3-flash.o ++obj-$(CONFIG_MTD_BOSPORUS) += pb1xxx-flash.o + obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o + obj-$(CONFIG_MTD_EDB7312) += edb7312.o + obj-$(CONFIG_MTD_IMPA7) += impa7.o +@@ -61,5 +67,6 @@ + obj-$(CONFIG_MTD_UCLINUX) += uclinux.o + obj-$(CONFIG_MTD_NETtel) += nettel.o + obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o ++obj-$(CONFIG_MTD_MIRAGE) += mirage-flash.o + + include $(TOPDIR)/Rules.make +diff -Nur linux-2.4.30/drivers/mtd/maps/db1x00-flash.c linux-2.4.30-mips/drivers/mtd/maps/db1x00-flash.c +--- linux-2.4.30/drivers/mtd/maps/db1x00-flash.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/mtd/maps/db1x00-flash.c 2005-02-03 07:35:29.000000000 +0100 +@@ -0,0 +1,283 @@ ++/* ++ * Flash memory access on Alchemy Db1xxx boards ++ * ++ * (C) 2003 Pete Popov <ppopov@pacbell.net> ++ * ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/types.h> ++#include <linux/kernel.h> ++ ++#include <linux/mtd/mtd.h> ++#include <linux/mtd/map.h> ++#include <linux/mtd/partitions.h> ++ ++#include <asm/io.h> ++#include <asm/au1000.h> ++#include <asm/db1x00.h> ++ ++#ifdef DEBUG_RW ++#define DBG(x...) printk(x) ++#else ++#define DBG(x...) ++#endif ++ ++static unsigned long window_addr; ++static unsigned long window_size; ++static unsigned long flash_size; ++ ++__u8 physmap_read8(struct map_info *map, unsigned long ofs) ++{ ++ __u8 ret; ++ ret = __raw_readb(map->map_priv_1 + ofs); ++ DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u16 physmap_read16(struct map_info *map, unsigned long ofs) ++{ ++ __u16 ret; ++ ret = __raw_readw(map->map_priv_1 + ofs); ++ DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u32 physmap_read32(struct map_info *map, unsigned long ofs) ++{ ++ __u32 ret; ++ ret = __raw_readl(map->map_priv_1 + ofs); ++ DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) ++{ ++ DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to); ++ memcpy_fromio(to, map->map_priv_1 + from, len); ++} ++ ++void physmap_write8(struct map_info *map, __u8 d, unsigned long adr) ++{ ++ DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writeb(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write16(struct map_info *map, __u16 d, unsigned long adr) ++{ ++ DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writew(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write32(struct map_info *map, __u32 d, unsigned long adr) ++{ ++ DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writel(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) ++{ ++ DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from); ++ memcpy_toio(map->map_priv_1 + to, from, len); ++} ++ ++static struct map_info db1x00_map = { ++ name: "Db1x00 flash", ++ read8: physmap_read8, ++ read16: physmap_read16, ++ read32: physmap_read32, ++ copy_from: physmap_copy_from, ++ write8: physmap_write8, ++ write16: physmap_write16, ++ write32: physmap_write32, ++ copy_to: physmap_copy_to, ++}; ++ ++static unsigned char flash_buswidth = 4; ++ ++/* ++ * The Db1x boards support different flash densities. We setup ++ * the mtd_partition structures below for default of 64Mbit ++ * flash densities, and override the partitions sizes, if ++ * necessary, after we check the board status register. ++ */ ++ ++#ifdef DB1X00_BOTH_BANKS ++/* both banks will be used. Combine the first bank and the first ++ * part of the second bank together into a single jffs/jffs2 ++ * partition. ++ */ ++static struct mtd_partition db1x00_partitions[] = { ++ { ++ name: "User FS", ++ size: 0x1c00000, ++ offset: 0x0000000 ++ },{ ++ name: "yamon", ++ size: 0x0100000, ++ offset: MTDPART_OFS_APPEND, ++ mask_flags: MTD_WRITEABLE ++ },{ ++ name: "raw kernel", ++ size: (0x300000-0x40000), /* last 256KB is yamon env */ ++ offset: MTDPART_OFS_APPEND, ++ } ++}; ++#elif defined(DB1X00_BOOT_ONLY) ++static struct mtd_partition db1x00_partitions[] = { ++ { ++ name: "User FS", ++ size: 0x00c00000, ++ offset: 0x0000000 ++ },{ ++ name: "yamon", ++ size: 0x0100000, ++ offset: MTDPART_OFS_APPEND, ++ mask_flags: MTD_WRITEABLE ++ },{ ++ name: "raw kernel", ++ size: (0x300000-0x40000), /* last 256KB is yamon env */ ++ offset: MTDPART_OFS_APPEND, ++ } ++}; ++#elif defined(DB1X00_USER_ONLY) ++static struct mtd_partition db1x00_partitions[] = { ++ { ++ name: "User FS", ++ size: 0x0e00000, ++ offset: 0x0000000 ++ },{ ++ name: "raw kernel", ++ size: MTDPART_SIZ_FULL, ++ offset: MTDPART_OFS_APPEND, ++ } ++}; ++#else ++#error MTD_DB1X00 define combo error /* should never happen */ ++#endif ++ ++ ++#define NB_OF(x) (sizeof(x)/sizeof(x[0])) ++ ++static struct mtd_partition *parsed_parts; ++static struct mtd_info *mymtd; ++ ++/* ++ * Probe the flash density and setup window address and size ++ * based on user CONFIG options. There are times when we don't ++ * want the MTD driver to be probing the boot or user flash, ++ * so having the option to enable only one bank is important. ++ */ ++int setup_flash_params() ++{ ++ switch ((bcsr->status >> 14) & 0x3) { ++ case 0: /* 64Mbit devices */ ++ flash_size = 0x800000; /* 8MB per part */ ++#if defined(DB1X00_BOTH_BANKS) ++ window_addr = 0x1E000000; ++ window_size = 0x2000000; ++#elif defined(DB1X00_BOOT_ONLY) ++ window_addr = 0x1F000000; ++ window_size = 0x1000000; ++#else /* USER ONLY */ ++ window_addr = 0x1E000000; ++ window_size = 0x1000000; ++#endif ++ break; ++ case 1: ++ /* 128 Mbit devices */ ++ flash_size = 0x1000000; /* 16MB per part */ ++#if defined(DB1X00_BOTH_BANKS) ++ window_addr = 0x1C000000; ++ window_size = 0x4000000; ++ /* USERFS from 0x1C00 0000 to 0x1FC0 0000 */ ++ db1x00_partitions[0].size = 0x3C00000; ++#elif defined(DB1X00_BOOT_ONLY) ++ window_addr = 0x1E000000; ++ window_size = 0x2000000; ++ /* USERFS from 0x1E00 0000 to 0x1FC0 0000 */ ++ db1x00_partitions[0].size = 0x1C00000; ++#else /* USER ONLY */ ++ window_addr = 0x1C000000; ++ window_size = 0x2000000; ++ /* USERFS from 0x1C00 0000 to 0x1DE00000 */ ++ db1x00_partitions[0].size = 0x1DE0000; ++#endif ++ break; ++ case 2: ++ /* 256 Mbit devices */ ++ flash_size = 0x4000000; /* 64MB per part */ ++#if defined(DB1X00_BOTH_BANKS) ++ return 1; ++#elif defined(DB1X00_BOOT_ONLY) ++ /* Boot ROM flash bank only; no user bank */ ++ window_addr = 0x1C000000; ++ window_size = 0x4000000; ++ /* USERFS from 0x1C00 0000 to 0x1FC00000 */ ++ db1x00_partitions[0].size = 0x3C00000; ++#else /* USER ONLY */ ++ return 1; ++#endif ++ break; ++ default: ++ return 1; ++ } ++ return 0; ++} ++ ++int __init db1x00_mtd_init(void) ++{ ++ struct mtd_partition *parts; ++ int nb_parts = 0; ++ char *part_type; ++ ++ /* Default flash buswidth */ ++ db1x00_map.buswidth = flash_buswidth; ++ ++ if (setup_flash_params()) ++ return -ENXIO; ++ ++ /* ++ * Static partition definition selection ++ */ ++ part_type = "static"; ++ parts = db1x00_partitions; ++ nb_parts = NB_OF(db1x00_partitions); ++ db1x00_map.size = window_size; ++ ++ /* ++ * Now let's probe for the actual flash. Do it here since ++ * specific machine settings might have been set above. ++ */ ++ printk(KERN_NOTICE "Db1xxx flash: probing %d-bit flash bus\n", ++ db1x00_map.buswidth*8); ++ db1x00_map.map_priv_1 = ++ (unsigned long)ioremap(window_addr, window_size); ++ mymtd = do_map_probe("cfi_probe", &db1x00_map); ++ if (!mymtd) return -ENXIO; ++ mymtd->module = THIS_MODULE; ++ ++ add_mtd_partitions(mymtd, parts, nb_parts); ++ return 0; ++} ++ ++static void __exit db1x00_mtd_cleanup(void) ++{ ++ if (mymtd) { ++ del_mtd_partitions(mymtd); ++ map_destroy(mymtd); ++ if (parsed_parts) ++ kfree(parsed_parts); ++ } ++} ++ ++module_init(db1x00_mtd_init); ++module_exit(db1x00_mtd_cleanup); ++ ++MODULE_AUTHOR("Pete Popov"); ++MODULE_DESCRIPTION("Db1x00 mtd map driver"); ++MODULE_LICENSE("GPL"); +diff -Nur linux-2.4.30/drivers/mtd/maps/hydrogen3-flash.c linux-2.4.30-mips/drivers/mtd/maps/hydrogen3-flash.c +--- linux-2.4.30/drivers/mtd/maps/hydrogen3-flash.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/mtd/maps/hydrogen3-flash.c 2004-01-10 23:40:18.000000000 +0100 +@@ -0,0 +1,189 @@ ++/* ++ * Flash memory access on Alchemy HydrogenIII boards ++ * ++ * (C) 2003 Pete Popov <ppopov@pacbell.net> ++ * ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/types.h> ++#include <linux/kernel.h> ++ ++#include <linux/mtd/mtd.h> ++#include <linux/mtd/map.h> ++#include <linux/mtd/partitions.h> ++ ++#include <asm/io.h> ++#include <asm/au1000.h> ++ ++#ifdef DEBUG_RW ++#define DBG(x...) printk(x) ++#else ++#define DBG(x...) ++#endif ++ ++#define WINDOW_ADDR 0x1E000000 ++#define WINDOW_SIZE 0x02000000 ++ ++ ++__u8 physmap_read8(struct map_info *map, unsigned long ofs) ++{ ++ __u8 ret; ++ ret = __raw_readb(map->map_priv_1 + ofs); ++ DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u16 physmap_read16(struct map_info *map, unsigned long ofs) ++{ ++ __u16 ret; ++ ret = __raw_readw(map->map_priv_1 + ofs); ++ DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u32 physmap_read32(struct map_info *map, unsigned long ofs) ++{ ++ __u32 ret; ++ ret = __raw_readl(map->map_priv_1 + ofs); ++ DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) ++{ ++ DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to); ++ memcpy_fromio(to, map->map_priv_1 + from, len); ++} ++ ++void physmap_write8(struct map_info *map, __u8 d, unsigned long adr) ++{ ++ DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writeb(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write16(struct map_info *map, __u16 d, unsigned long adr) ++{ ++ DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writew(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write32(struct map_info *map, __u32 d, unsigned long adr) ++{ ++ DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writel(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) ++{ ++ DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from); ++ memcpy_toio(map->map_priv_1 + to, from, len); ++} ++ ++static struct map_info hydrogen3_map = { ++ name: "HydrogenIII flash", ++ read8: physmap_read8, ++ read16: physmap_read16, ++ read32: physmap_read32, ++ copy_from: physmap_copy_from, ++ write8: physmap_write8, ++ write16: physmap_write16, ++ write32: physmap_write32, ++ copy_to: physmap_copy_to, ++}; ++ ++static unsigned char flash_buswidth = 4; ++ ++/* MTDPART_OFS_APPEND is vastly preferred to any attempt at statically lining ++ * up the offsets. */ ++static struct mtd_partition hydrogen3_partitions[] = { ++ { ++ name: "User FS", ++ size: 0x1c00000, ++ offset: 0x0000000 ++ },{ ++ name: "yamon", ++ size: 0x0100000, ++ offset: MTDPART_OFS_APPEND, ++ mask_flags: MTD_WRITEABLE ++ },{ ++ name: "raw kernel", ++ size: 0x02c0000, ++ offset: MTDPART_OFS_APPEND ++ } ++}; ++ ++#define NB_OF(x) (sizeof(x)/sizeof(x[0])) ++ ++static struct mtd_partition *parsed_parts; ++static struct mtd_info *mymtd; ++ ++int __init hydrogen3_mtd_init(void) ++{ ++ struct mtd_partition *parts; ++ int nb_parts = 0; ++ char *part_type; ++ ++ /* Default flash buswidth */ ++ hydrogen3_map.buswidth = flash_buswidth; ++ ++ /* ++ * Static partition definition selection ++ */ ++ part_type = "static"; ++ parts = hydrogen3_partitions; ++ nb_parts = NB_OF(hydrogen3_partitions); ++ hydrogen3_map.size = WINDOW_SIZE; ++ ++ /* ++ * Now let's probe for the actual flash. Do it here since ++ * specific machine settings might have been set above. ++ */ ++ printk(KERN_NOTICE "HydrogenIII flash: probing %d-bit flash bus\n", ++ hydrogen3_map.buswidth*8); ++ hydrogen3_map.map_priv_1 = ++ (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE); ++ mymtd = do_map_probe("cfi_probe", &hydrogen3_map); ++ if (!mymtd) return -ENXIO; ++ mymtd->module = THIS_MODULE; ++ ++ add_mtd_partitions(mymtd, parts, nb_parts); ++ return 0; ++} ++ ++static void __exit hydrogen3_mtd_cleanup(void) ++{ ++ if (mymtd) { ++ del_mtd_partitions(mymtd); ++ map_destroy(mymtd); ++ if (parsed_parts) ++ kfree(parsed_parts); ++ } ++} ++ ++/*#ifndef MODULE ++ ++static int __init _bootflashonly(char *str) ++{ ++ bootflashonly = simple_strtol(str, NULL, 0); ++ return 1; ++} ++ ++ ++__setup("bootflashonly=", _bootflashonly); ++ ++#endif*/ ++ ++ ++module_init(hydrogen3_mtd_init); ++module_exit(hydrogen3_mtd_cleanup); ++ ++MODULE_PARM(bootflashonly, "i"); ++MODULE_PARM_DESC(bootflashonly, "1=use \"boot flash only\""); ++MODULE_AUTHOR("Pete Popov"); ++MODULE_DESCRIPTION("HydrogenIII mtd map driver"); ++MODULE_LICENSE("GPL"); +diff -Nur linux-2.4.30/drivers/mtd/maps/lasat.c linux-2.4.30-mips/drivers/mtd/maps/lasat.c +--- linux-2.4.30/drivers/mtd/maps/lasat.c 2003-06-13 16:51:34.000000000 +0200 ++++ linux-2.4.30-mips/drivers/mtd/maps/lasat.c 2003-08-18 04:59:02.000000000 +0200 +@@ -1,15 +1,6 @@ + /* + * Flash device on lasat 100 and 200 boards + * +- * Presumably (C) 2002 Brian Murphy <brian@murphy.dk> or whoever he +- * works for. +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License version +- * 2 as published by the Free Software Foundation. +- * +- * $Id: lasat.c,v 1.1 2003/01/24 14:26:38 dwmw2 Exp $ +- * + */ + + #include <linux/module.h> +@@ -21,7 +12,6 @@ + #include <linux/mtd/partitions.h> + #include <linux/config.h> + #include <asm/lasat/lasat.h> +-#include <asm/lasat/lasat_mtd.h> + + static struct mtd_info *mymtd; + +@@ -69,30 +59,33 @@ + } + + static struct map_info sp_map = { +- .name = "SP flash", +- .buswidth = 4, +- .read8 = sp_read8, +- .read16 = sp_read16, +- .read32 = sp_read32, +- .copy_from = sp_copy_from, +- .write8 = sp_write8, +- .write16 = sp_write16, +- .write32 = sp_write32, +- .copy_to = sp_copy_to ++ name: "SP flash", ++ buswidth: 4, ++ read8: sp_read8, ++ read16: sp_read16, ++ read32: sp_read32, ++ copy_from: sp_copy_from, ++ write8: sp_write8, ++ write16: sp_write16, ++ write32: sp_write32, ++ copy_to: sp_copy_to + }; + + static struct mtd_partition partition_info[LASAT_MTD_LAST]; +-static char *lasat_mtd_partnames[] = {"Bootloader", "Service", "Normal", "Filesystem", "Config"}; ++static char *lasat_mtd_partnames[] = {"Bootloader", "Service", "Normal", "Config", "Filesystem"}; + + static int __init init_sp(void) + { + int i; ++ int nparts = 0; + /* this does not play well with the old flash code which + * protects and uprotects the flash when necessary */ + printk(KERN_NOTICE "Unprotecting flash\n"); + *lasat_misc->flash_wp_reg |= 1 << lasat_misc->flash_wp_bit; + +- sp_map.map_priv_1 = lasat_flash_partition_start(LASAT_MTD_BOOTLOADER); ++ sp_map.map_priv_1 = ioremap_nocache( ++ lasat_flash_partition_start(LASAT_MTD_BOOTLOADER), ++ lasat_board_info.li_flash_size); + sp_map.size = lasat_board_info.li_flash_size; + + printk(KERN_NOTICE "sp flash device: %lx at %lx\n", +@@ -109,12 +102,15 @@ + + for (i=0; i < LASAT_MTD_LAST; i++) { + size = lasat_flash_partition_size(i); +- partition_info[i].size = size; +- partition_info[i].offset = offset; +- offset += size; ++ if (size != 0) { ++ nparts++; ++ partition_info[i].size = size; ++ partition_info[i].offset = offset; ++ offset += size; ++ } + } + +- add_mtd_partitions( mymtd, partition_info, LASAT_MTD_LAST ); ++ add_mtd_partitions( mymtd, partition_info, nparts ); + return 0; + } + +@@ -124,11 +120,11 @@ + static void __exit cleanup_sp(void) + { + if (mymtd) { +- del_mtd_partitions(mymtd); +- map_destroy(mymtd); ++ del_mtd_partitions(mymtd); ++ map_destroy(mymtd); + } + if (sp_map.map_priv_1) { +- sp_map.map_priv_1 = 0; ++ sp_map.map_priv_1 = 0; + } + } + +diff -Nur linux-2.4.30/drivers/mtd/maps/mirage-flash.c linux-2.4.30-mips/drivers/mtd/maps/mirage-flash.c +--- linux-2.4.30/drivers/mtd/maps/mirage-flash.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/mtd/maps/mirage-flash.c 2003-12-22 04:37:22.000000000 +0100 +@@ -0,0 +1,194 @@ ++/* ++ * Flash memory access on AMD Mirage board. ++ * ++ * (C) 2003 Embedded Edge ++ * based on mirage-flash.c: ++ * (C) 2003 Pete Popov <ppopov@pacbell.net> ++ * ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/types.h> ++#include <linux/kernel.h> ++ ++#include <linux/mtd/mtd.h> ++#include <linux/mtd/map.h> ++#include <linux/mtd/partitions.h> ++ ++#include <asm/io.h> ++#include <asm/au1000.h> ++//#include <asm/mirage.h> ++ ++#ifdef DEBUG_RW ++#define DBG(x...) printk(x) ++#else ++#define DBG(x...) ++#endif ++ ++static unsigned long window_addr; ++static unsigned long window_size; ++static unsigned long flash_size; ++ ++__u8 physmap_read8(struct map_info *map, unsigned long ofs) ++{ ++ __u8 ret; ++ ret = __raw_readb(map->map_priv_1 + ofs); ++ DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u16 physmap_read16(struct map_info *map, unsigned long ofs) ++{ ++ __u16 ret; ++ ret = __raw_readw(map->map_priv_1 + ofs); ++ DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u32 physmap_read32(struct map_info *map, unsigned long ofs) ++{ ++ __u32 ret; ++ ret = __raw_readl(map->map_priv_1 + ofs); ++ DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) ++{ ++ DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to); ++ memcpy_fromio(to, map->map_priv_1 + from, len); ++} ++ ++void physmap_write8(struct map_info *map, __u8 d, unsigned long adr) ++{ ++ DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writeb(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write16(struct map_info *map, __u16 d, unsigned long adr) ++{ ++ DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writew(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write32(struct map_info *map, __u32 d, unsigned long adr) ++{ ++ DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writel(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) ++{ ++ DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from); ++ memcpy_toio(map->map_priv_1 + to, from, len); ++} ++ ++static struct map_info mirage_map = { ++ name: "Mirage flash", ++ read8: physmap_read8, ++ read16: physmap_read16, ++ read32: physmap_read32, ++ copy_from: physmap_copy_from, ++ write8: physmap_write8, ++ write16: physmap_write16, ++ write32: physmap_write32, ++ copy_to: physmap_copy_to, ++}; ++ ++static unsigned char flash_buswidth = 4; ++ ++static struct mtd_partition mirage_partitions[] = { ++ { ++ name: "User FS", ++ size: 0x1c00000, ++ offset: 0x0000000 ++ },{ ++ name: "yamon", ++ size: 0x0100000, ++ offset: MTDPART_OFS_APPEND, ++ mask_flags: MTD_WRITEABLE ++ },{ ++ name: "raw kernel", ++ size: (0x300000-0x40000), /* last 256KB is yamon env */ ++ offset: MTDPART_OFS_APPEND, ++ } ++}; ++ ++#define NB_OF(x) (sizeof(x)/sizeof(x[0])) ++ ++static struct mtd_partition *parsed_parts; ++static struct mtd_info *mymtd; ++ ++/* ++ * Probe the flash density and setup window address and size ++ * based on user CONFIG options. There are times when we don't ++ * want the MTD driver to be probing the boot or user flash, ++ * so having the option to enable only one bank is important. ++ */ ++int setup_flash_params() ++{ ++ flash_size = 0x4000000; /* 64MB per part */ ++ /* Boot ROM flash bank only; no user bank */ ++ window_addr = 0x1C000000; ++ window_size = 0x4000000; ++ /* USERFS from 0x1C00 0000 to 0x1FC00000 */ ++ mirage_partitions[0].size = 0x3C00000; ++ return 0; ++} ++ ++int __init mirage_mtd_init(void) ++{ ++ struct mtd_partition *parts; ++ int nb_parts = 0; ++ char *part_type; ++ ++ /* Default flash buswidth */ ++ mirage_map.buswidth = flash_buswidth; ++ ++ if (setup_flash_params()) ++ return -ENXIO; ++ ++ /* ++ * Static partition definition selection ++ */ ++ part_type = "static"; ++ parts = mirage_partitions; ++ nb_parts = NB_OF(mirage_partitions); ++ mirage_map.size = window_size; ++ ++ /* ++ * Now let's probe for the actual flash. Do it here since ++ * specific machine settings might have been set above. ++ */ ++ printk(KERN_NOTICE "Mirage flash: probing %d-bit flash bus\n", ++ mirage_map.buswidth*8); ++ mirage_map.map_priv_1 = ++ (unsigned long)ioremap(window_addr, window_size); ++ mymtd = do_map_probe("cfi_probe", &mirage_map); ++ if (!mymtd) return -ENXIO; ++ mymtd->module = THIS_MODULE; ++ ++ add_mtd_partitions(mymtd, parts, nb_parts); ++ return 0; ++} ++ ++static void __exit mirage_mtd_cleanup(void) ++{ ++ if (mymtd) { ++ del_mtd_partitions(mymtd); ++ map_destroy(mymtd); ++ if (parsed_parts) ++ kfree(parsed_parts); ++ } ++} ++ ++module_init(mirage_mtd_init); ++module_exit(mirage_mtd_cleanup); ++ ++MODULE_AUTHOR("Embedded Edge"); ++MODULE_DESCRIPTION("Mirage mtd map driver"); ++MODULE_LICENSE("GPL"); +diff -Nur linux-2.4.30/drivers/mtd/maps/mtx-1.c linux-2.4.30-mips/drivers/mtd/maps/mtx-1.c +--- linux-2.4.30/drivers/mtd/maps/mtx-1.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/mtd/maps/mtx-1.c 2003-06-27 02:04:35.000000000 +0200 +@@ -0,0 +1,181 @@ ++/* ++ * Flash memory access on 4G Systems MTX-1 board ++ * ++ * (C) 2003 Pete Popov <ppopov@mvista.com> ++ * Bruno Randolf <bruno.randolf@4g-systems.de> ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/types.h> ++#include <linux/kernel.h> ++ ++#include <linux/mtd/mtd.h> ++#include <linux/mtd/map.h> ++#include <linux/mtd/partitions.h> ++ ++#include <asm/io.h> ++#include <asm/au1000.h> ++ ++#ifdef DEBUG_RW ++#define DBG(x...) printk(x) ++#else ++#define DBG(x...) ++#endif ++ ++#ifdef CONFIG_MIPS_MTX1 ++#define WINDOW_ADDR 0x1E000000 ++#define WINDOW_SIZE 0x2000000 ++#endif ++ ++__u8 physmap_read8(struct map_info *map, unsigned long ofs) ++{ ++ __u8 ret; ++ ret = __raw_readb(map->map_priv_1 + ofs); ++ DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u16 physmap_read16(struct map_info *map, unsigned long ofs) ++{ ++ __u16 ret; ++ ret = __raw_readw(map->map_priv_1 + ofs); ++ DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u32 physmap_read32(struct map_info *map, unsigned long ofs) ++{ ++ __u32 ret; ++ ret = __raw_readl(map->map_priv_1 + ofs); ++ DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) ++{ ++ DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to); ++ memcpy_fromio(to, map->map_priv_1 + from, len); ++} ++ ++void physmap_write8(struct map_info *map, __u8 d, unsigned long adr) ++{ ++ DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writeb(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write16(struct map_info *map, __u16 d, unsigned long adr) ++{ ++ DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writew(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write32(struct map_info *map, __u32 d, unsigned long adr) ++{ ++ DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writel(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) ++{ ++ DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from); ++ memcpy_toio(map->map_priv_1 + to, from, len); ++} ++ ++ ++ ++static struct map_info mtx1_map = { ++ name: "MTX-1 flash", ++ read8: physmap_read8, ++ read16: physmap_read16, ++ read32: physmap_read32, ++ copy_from: physmap_copy_from, ++ write8: physmap_write8, ++ write16: physmap_write16, ++ write32: physmap_write32, ++ copy_to: physmap_copy_to, ++}; ++ ++ ++static unsigned long flash_size = 0x01000000; ++static unsigned char flash_buswidth = 4; ++static struct mtd_partition mtx1_partitions[] = { ++ { ++ name: "user fs", ++ size: 0x1c00000, ++ offset: 0, ++ },{ ++ name: "yamon", ++ size: 0x0100000, ++ offset: MTDPART_OFS_APPEND, ++ mask_flags: MTD_WRITEABLE ++ },{ ++ name: "raw kernel", ++ size: 0x02c0000, ++ offset: MTDPART_OFS_APPEND, ++ },{ ++ name: "yamon env vars", ++ size: 0x0040000, ++ offset: MTDPART_OFS_APPEND, ++ mask_flags: MTD_WRITEABLE ++ } ++}; ++ ++ ++#define NB_OF(x) (sizeof(x)/sizeof(x[0])) ++ ++static struct mtd_partition *parsed_parts; ++static struct mtd_info *mymtd; ++ ++int __init mtx1_mtd_init(void) ++{ ++ struct mtd_partition *parts; ++ int nb_parts = 0; ++ char *part_type; ++ ++ /* Default flash buswidth */ ++ mtx1_map.buswidth = flash_buswidth; ++ ++ /* ++ * Static partition definition selection ++ */ ++ part_type = "static"; ++ parts = mtx1_partitions; ++ nb_parts = NB_OF(mtx1_partitions); ++ mtx1_map.size = flash_size; ++ ++ /* ++ * Now let's probe for the actual flash. Do it here since ++ * specific machine settings might have been set above. ++ */ ++ printk(KERN_NOTICE "MTX-1 flash: probing %d-bit flash bus\n", ++ mtx1_map.buswidth*8); ++ mtx1_map.map_priv_1 = ++ (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE); ++ mymtd = do_map_probe("cfi_probe", &mtx1_map); ++ if (!mymtd) return -ENXIO; ++ mymtd->module = THIS_MODULE; ++ ++ add_mtd_partitions(mymtd, parts, nb_parts); ++ return 0; ++} ++ ++static void __exit mtx1_mtd_cleanup(void) ++{ ++ if (mymtd) { ++ del_mtd_partitions(mymtd); ++ map_destroy(mymtd); ++ if (parsed_parts) ++ kfree(parsed_parts); ++ } ++} ++ ++module_init(mtx1_mtd_init); ++module_exit(mtx1_mtd_cleanup); ++ ++MODULE_AUTHOR("Pete Popov"); ++MODULE_DESCRIPTION("MTX-1 CFI map driver"); ++MODULE_LICENSE("GPL"); +diff -Nur linux-2.4.30/drivers/mtd/maps/pb1550-flash.c linux-2.4.30-mips/drivers/mtd/maps/pb1550-flash.c +--- linux-2.4.30/drivers/mtd/maps/pb1550-flash.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/mtd/maps/pb1550-flash.c 2004-02-26 01:48:48.000000000 +0100 +@@ -0,0 +1,270 @@ ++/* ++ * Flash memory access on Alchemy Pb1550 board ++ * ++ * (C) 2004 Embedded Edge, LLC, based on pb1550-flash.c: ++ * (C) 2003 Pete Popov <ppopov@pacbell.net> ++ * ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/types.h> ++#include <linux/kernel.h> ++ ++#include <linux/mtd/mtd.h> ++#include <linux/mtd/map.h> ++#include <linux/mtd/partitions.h> ++ ++#include <asm/io.h> ++#include <asm/au1000.h> ++#include <asm/pb1550.h> ++ ++#ifdef DEBUG_RW ++#define DBG(x...) printk(x) ++#else ++#define DBG(x...) ++#endif ++ ++static unsigned long window_addr; ++static unsigned long window_size; ++ ++__u8 physmap_read8(struct map_info *map, unsigned long ofs) ++{ ++ __u8 ret; ++ ret = __raw_readb(map->map_priv_1 + ofs); ++ DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u16 physmap_read16(struct map_info *map, unsigned long ofs) ++{ ++ __u16 ret; ++ ret = __raw_readw(map->map_priv_1 + ofs); ++ DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u32 physmap_read32(struct map_info *map, unsigned long ofs) ++{ ++ __u32 ret; ++ ret = __raw_readl(map->map_priv_1 + ofs); ++ DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) ++{ ++ DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to); ++ memcpy_fromio(to, map->map_priv_1 + from, len); ++} ++ ++void physmap_write8(struct map_info *map, __u8 d, unsigned long adr) ++{ ++ DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writeb(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write16(struct map_info *map, __u16 d, unsigned long adr) ++{ ++ DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writew(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write32(struct map_info *map, __u32 d, unsigned long adr) ++{ ++ DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writel(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) ++{ ++ DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from); ++ memcpy_toio(map->map_priv_1 + to, from, len); ++} ++ ++static struct map_info pb1550_map = { ++ name: "Pb1550 flash", ++ read8: physmap_read8, ++ read16: physmap_read16, ++ read32: physmap_read32, ++ copy_from: physmap_copy_from, ++ write8: physmap_write8, ++ write16: physmap_write16, ++ write32: physmap_write32, ++ copy_to: physmap_copy_to, ++}; ++ ++static unsigned char flash_buswidth = 4; ++ ++/* ++ * Support only 64MB NOR Flash parts ++ */ ++ ++#ifdef PB1550_BOTH_BANKS ++/* both banks will be used. Combine the first bank and the first ++ * part of the second bank together into a single jffs/jffs2 ++ * partition. ++ */ ++static struct mtd_partition pb1550_partitions[] = { ++ /* assume boot[2:0]:swap is '0000' or '1000', which translates to: ++ * 1C00 0000 1FFF FFFF CE0 64MB Boot NOR Flash ++ * 1800 0000 1BFF FFFF CE0 64MB Param NOR Flash ++ */ ++ { ++ name: "User FS", ++ size: (0x1FC00000 - 0x18000000), ++ offset: 0x0000000 ++ },{ ++ name: "yamon", ++ size: 0x0100000, ++ offset: MTDPART_OFS_APPEND, ++ mask_flags: MTD_WRITEABLE ++ },{ ++ name: "raw kernel", ++ size: (0x300000 - 0x40000), /* last 256KB is yamon env */ ++ offset: MTDPART_OFS_APPEND, ++ } ++}; ++#elif defined(PB1550_BOOT_ONLY) ++static struct mtd_partition pb1550_partitions[] = { ++ /* assume boot[2:0]:swap is '0000' or '1000', which translates to: ++ * 1C00 0000 1FFF FFFF CE0 64MB Boot NOR Flash ++ */ ++ { ++ name: "User FS", ++ size: 0x03c00000, ++ offset: 0x0000000 ++ },{ ++ name: "yamon", ++ size: 0x0100000, ++ offset: MTDPART_OFS_APPEND, ++ mask_flags: MTD_WRITEABLE ++ },{ ++ name: "raw kernel", ++ size: (0x300000-0x40000), /* last 256KB is yamon env */ ++ offset: MTDPART_OFS_APPEND, ++ } ++}; ++#elif defined(PB1550_USER_ONLY) ++static struct mtd_partition pb1550_partitions[] = { ++ /* assume boot[2:0]:swap is '0000' or '1000', which translates to: ++ * 1800 0000 1BFF FFFF CE0 64MB Param NOR Flash ++ */ ++ { ++ name: "User FS", ++ size: (0x4000000 - 0x200000), /* reserve 2MB for raw kernel */ ++ offset: 0x0000000 ++ },{ ++ name: "raw kernel", ++ size: MTDPART_SIZ_FULL, ++ offset: MTDPART_OFS_APPEND, ++ } ++}; ++#else ++#error MTD_PB1550 define combo error /* should never happen */ ++#endif ++ ++#define NB_OF(x) (sizeof(x)/sizeof(x[0])) ++ ++static struct mtd_partition *parsed_parts; ++static struct mtd_info *mymtd; ++ ++/* ++ * Probe the flash density and setup window address and size ++ * based on user CONFIG options. There are times when we don't ++ * want the MTD driver to be probing the boot or user flash, ++ * so having the option to enable only one bank is important. ++ */ ++int setup_flash_params() ++{ ++ u16 boot_swapboot; ++ boot_swapboot = (au_readl(MEM_STSTAT) & (0x7<<1)) | ++ ((bcsr->status >> 6) & 0x1); ++ printk("Pb1550 MTD: boot:swap %d\n", boot_swapboot); ++ ++ switch (boot_swapboot) { ++ case 0: /* 512Mbit devices, both enabled */ ++ case 1: ++ case 8: ++ case 9: ++#if defined(PB1550_BOTH_BANKS) ++ window_addr = 0x18000000; ++ window_size = 0x8000000; ++#elif defined(PB1550_BOOT_ONLY) ++ window_addr = 0x1C000000; ++ window_size = 0x4000000; ++#else /* USER ONLY */ ++ window_addr = 0x1E000000; ++ window_size = 0x1000000; ++#endif ++ break; ++ case 0xC: ++ case 0xD: ++ case 0xE: ++ case 0xF: ++ /* 64 MB Boot NOR Flash is disabled */ ++ /* and the start address is moved to 0x0C00000 */ ++ window_addr = 0x0C000000; ++ window_size = 0x4000000; ++ default: ++ printk("Pb1550 MTD: unsupported boot:swap setting\n"); ++ return 1; ++ } ++ return 0; ++} ++ ++int __init pb1550_mtd_init(void) ++{ ++ struct mtd_partition *parts; ++ int nb_parts = 0; ++ char *part_type; ++ ++ /* Default flash buswidth */ ++ pb1550_map.buswidth = flash_buswidth; ++ ++ if (setup_flash_params()) ++ return -ENXIO; ++ ++ /* ++ * Static partition definition selection ++ */ ++ part_type = "static"; ++ parts = pb1550_partitions; ++ nb_parts = NB_OF(pb1550_partitions); ++ pb1550_map.size = window_size; ++ ++ /* ++ * Now let's probe for the actual flash. Do it here since ++ * specific machine settings might have been set above. ++ */ ++ printk(KERN_NOTICE "Pb1550 flash: probing %d-bit flash bus\n", ++ pb1550_map.buswidth*8); ++ pb1550_map.map_priv_1 = ++ (unsigned long)ioremap(window_addr, window_size); ++ mymtd = do_map_probe("cfi_probe", &pb1550_map); ++ if (!mymtd) return -ENXIO; ++ mymtd->module = THIS_MODULE; ++ ++ add_mtd_partitions(mymtd, parts, nb_parts); ++ return 0; ++} ++ ++static void __exit pb1550_mtd_cleanup(void) ++{ ++ if (mymtd) { ++ del_mtd_partitions(mymtd); ++ map_destroy(mymtd); ++ if (parsed_parts) ++ kfree(parsed_parts); ++ } ++} ++ ++module_init(pb1550_mtd_init); ++module_exit(pb1550_mtd_cleanup); ++ ++MODULE_AUTHOR("Embedded Edge, LLC"); ++MODULE_DESCRIPTION("Pb1550 mtd map driver"); ++MODULE_LICENSE("GPL"); +diff -Nur linux-2.4.30/drivers/mtd/maps/pb1xxx-flash.c linux-2.4.30-mips/drivers/mtd/maps/pb1xxx-flash.c +--- linux-2.4.30/drivers/mtd/maps/pb1xxx-flash.c 2003-06-13 16:51:34.000000000 +0200 ++++ linux-2.4.30-mips/drivers/mtd/maps/pb1xxx-flash.c 2003-05-19 08:27:22.000000000 +0200 +@@ -192,6 +192,34 @@ + #else + #error MTD_PB1500 define combo error /* should never happen */ + #endif ++#elif defined(CONFIG_MTD_BOSPORUS) ++static unsigned char flash_buswidth = 2; ++static unsigned long flash_size = 0x02000000; ++#define WINDOW_ADDR 0x1F000000 ++#define WINDOW_SIZE 0x2000000 ++static struct mtd_partition pb1xxx_partitions[] = { ++ { ++ name: "User FS", ++ size: 0x00400000, ++ offset: 0x00000000, ++ },{ ++ name: "Yamon-2", ++ size: 0x00100000, ++ offset: 0x00400000, ++ },{ ++ name: "Root FS", ++ size: 0x00700000, ++ offset: 0x00500000, ++ },{ ++ name: "Yamon-1", ++ size: 0x00100000, ++ offset: 0x00C00000, ++ },{ ++ name: "Kernel", ++ size: 0x00300000, ++ offset: 0x00D00000, ++ } ++}; + #else + #error Unsupported board + #endif +diff -Nur linux-2.4.30/drivers/mtd/maps/xxs1500.c linux-2.4.30-mips/drivers/mtd/maps/xxs1500.c +--- linux-2.4.30/drivers/mtd/maps/xxs1500.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/mtd/maps/xxs1500.c 2003-08-02 04:06:01.000000000 +0200 +@@ -0,0 +1,186 @@ ++/* ++ * Flash memory access on MyCable XXS1500 board ++ * ++ * (C) 2003 Pete Popov <ppopov@mvista.com> ++ * ++ * $Id: xxs1500.c,v 1.1.2.2 2003/08/02 02:06:01 ppopov Exp $ ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/types.h> ++#include <linux/kernel.h> ++ ++#include <linux/mtd/mtd.h> ++#include <linux/mtd/map.h> ++#include <linux/mtd/partitions.h> ++ ++#include <asm/io.h> ++#include <asm/au1000.h> ++ ++#ifdef DEBUG_RW ++#define DBG(x...) printk(x) ++#else ++#define DBG(x...) ++#endif ++ ++#ifdef CONFIG_MIPS_XXS1500 ++#define WINDOW_ADDR 0x1F000000 ++#define WINDOW_SIZE 0x1000000 ++#endif ++ ++__u8 physmap_read8(struct map_info *map, unsigned long ofs) ++{ ++ __u8 ret; ++ ret = __raw_readb(map->map_priv_1 + ofs); ++ DBG("read8 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u16 physmap_read16(struct map_info *map, unsigned long ofs) ++{ ++ __u16 ret; ++ ret = __raw_readw(map->map_priv_1 + ofs); ++ DBG("read16 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++__u32 physmap_read32(struct map_info *map, unsigned long ofs) ++{ ++ __u32 ret; ++ ret = __raw_readl(map->map_priv_1 + ofs); ++ DBG("read32 from %x, %x\n", (unsigned)(map->map_priv_1 + ofs), ret); ++ return ret; ++} ++ ++void physmap_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) ++{ ++ DBG("physmap_copy from %x to %x\n", (unsigned)from, (unsigned)to); ++ memcpy_fromio(to, map->map_priv_1 + from, len); ++} ++ ++void physmap_write8(struct map_info *map, __u8 d, unsigned long adr) ++{ ++ DBG("write8 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writeb(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write16(struct map_info *map, __u16 d, unsigned long adr) ++{ ++ DBG("write16 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writew(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_write32(struct map_info *map, __u32 d, unsigned long adr) ++{ ++ DBG("write32 at %x, %x\n", (unsigned)(map->map_priv_1 + adr), d); ++ __raw_writel(d, map->map_priv_1 + adr); ++ mb(); ++} ++ ++void physmap_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len) ++{ ++ DBG("physmap_copy_to %x from %x\n", (unsigned)to, (unsigned)from); ++ memcpy_toio(map->map_priv_1 + to, from, len); ++} ++ ++ ++ ++static struct map_info xxs1500_map = { ++ name: "XXS1500 flash", ++ read8: physmap_read8, ++ read16: physmap_read16, ++ read32: physmap_read32, ++ copy_from: physmap_copy_from, ++ write8: physmap_write8, ++ write16: physmap_write16, ++ write32: physmap_write32, ++ copy_to: physmap_copy_to, ++}; ++ ++ ++static unsigned long flash_size = 0x00800000; ++static unsigned char flash_buswidth = 4; ++static struct mtd_partition xxs1500_partitions[] = { ++ { ++ name: "kernel image", ++ size: 0x00200000, ++ offset: 0, ++ },{ ++ name: "user fs 0", ++ size: (0x00C00000-0x200000), ++ offset: MTDPART_OFS_APPEND, ++ },{ ++ name: "yamon", ++ size: 0x00100000, ++ offset: MTDPART_OFS_APPEND, ++ mask_flags: MTD_WRITEABLE ++ },{ ++ name: "user fs 1", ++ size: 0x2c0000, ++ offset: MTDPART_OFS_APPEND, ++ },{ ++ name: "yamon env vars", ++ size: 0x040000, ++ offset: MTDPART_OFS_APPEND, ++ mask_flags: MTD_WRITEABLE ++ } ++}; ++ ++ ++#define NB_OF(x) (sizeof(x)/sizeof(x[0])) ++ ++static struct mtd_partition *parsed_parts; ++static struct mtd_info *mymtd; ++ ++int __init xxs1500_mtd_init(void) ++{ ++ struct mtd_partition *parts; ++ int nb_parts = 0; ++ char *part_type; ++ ++ /* Default flash buswidth */ ++ xxs1500_map.buswidth = flash_buswidth; ++ ++ /* ++ * Static partition definition selection ++ */ ++ part_type = "static"; ++ parts = xxs1500_partitions; ++ nb_parts = NB_OF(xxs1500_partitions); ++ xxs1500_map.size = flash_size; ++ ++ /* ++ * Now let's probe for the actual flash. Do it here since ++ * specific machine settings might have been set above. ++ */ ++ printk(KERN_NOTICE "XXS1500 flash: probing %d-bit flash bus\n", ++ xxs1500_map.buswidth*8); ++ xxs1500_map.map_priv_1 = ++ (unsigned long)ioremap(WINDOW_ADDR, WINDOW_SIZE); ++ mymtd = do_map_probe("cfi_probe", &xxs1500_map); ++ if (!mymtd) return -ENXIO; ++ mymtd->module = THIS_MODULE; ++ ++ add_mtd_partitions(mymtd, parts, nb_parts); ++ return 0; ++} ++ ++static void __exit xxs1500_mtd_cleanup(void) ++{ ++ if (mymtd) { ++ del_mtd_partitions(mymtd); ++ map_destroy(mymtd); ++ if (parsed_parts) ++ kfree(parsed_parts); ++ } ++} ++ ++module_init(xxs1500_mtd_init); ++module_exit(xxs1500_mtd_cleanup); ++ ++MODULE_AUTHOR("Pete Popov"); ++MODULE_DESCRIPTION("XXS1500 CFI map driver"); ++MODULE_LICENSE("GPL"); +diff -Nur linux-2.4.30/drivers/net/defxx.c linux-2.4.30-mips/drivers/net/defxx.c +--- linux-2.4.30/drivers/net/defxx.c 2004-11-17 12:54:21.000000000 +0100 ++++ linux-2.4.30-mips/drivers/net/defxx.c 2004-11-19 01:28:39.000000000 +0100 +@@ -10,24 +10,18 @@ + * + * Abstract: + * A Linux device driver supporting the Digital Equipment Corporation +- * FDDI EISA and PCI controller families. Supported adapters include: ++ * FDDI TURBOchannel, EISA and PCI controller families. Supported ++ * adapters include: + * +- * DEC FDDIcontroller/EISA (DEFEA) +- * DEC FDDIcontroller/PCI (DEFPA) ++ * DEC FDDIcontroller/TURBOchannel (DEFTA) ++ * DEC FDDIcontroller/EISA (DEFEA) ++ * DEC FDDIcontroller/PCI (DEFPA) + * +- * Maintainers: +- * LVS Lawrence V. Stefani +- * +- * Contact: +- * The author may be reached at: ++ * The original author: ++ * LVS Lawrence V. Stefani <lstefani@yahoo.com> + * +- * Inet: stefani@lkg.dec.com +- * (NOTE! this address no longer works -jgarzik) +- * +- * Mail: Digital Equipment Corporation +- * 550 King Street +- * M/S: LKG1-3/M07 +- * Littleton, MA 01460 ++ * Maintainers: ++ * macro Maciej W. Rozycki <macro@linux-mips.org> + * + * Credits: + * I'd like to thank Patricia Cross for helping me get started with +@@ -197,16 +191,16 @@ + * Sep 2000 tjeerd Fix leak on unload, cosmetic code cleanup + * Feb 2001 Skb allocation fixes + * Feb 2001 davej PCI enable cleanups. ++ * 04 Aug 2003 macro Converted to the DMA API. ++ * 14 Aug 2004 macro Fix device names reported. ++ * 26 Sep 2004 macro TURBOchannel support. + */ + + /* Include files */ + + #include <linux/module.h> +- + #include <linux/kernel.h> +-#include <linux/sched.h> + #include <linux/string.h> +-#include <linux/ptrace.h> + #include <linux/errno.h> + #include <linux/ioport.h> + #include <linux/slab.h> +@@ -215,19 +209,33 @@ + #include <linux/delay.h> + #include <linux/init.h> + #include <linux/netdevice.h> ++#include <linux/fddidevice.h> ++#include <linux/skbuff.h> ++ + #include <asm/byteorder.h> + #include <asm/bitops.h> + #include <asm/io.h> + +-#include <linux/fddidevice.h> +-#include <linux/skbuff.h> ++#ifdef CONFIG_TC ++#include <asm/dec/tc.h> ++#else ++static int search_tc_card(const char *name) { return -ENODEV; } ++static void claim_tc_card(int slot) { } ++static void release_tc_card(int slot) { } ++static unsigned long get_tc_base_addr(int slot) { return 0; } ++static unsigned long get_tc_irq_nr(int slot) { return -1; } ++#endif + + #include "defxx.h" + +-/* Version information string - should be updated prior to each new release!!! */ ++/* Version information string should be updated prior to each new release! */ ++#define DRV_NAME "defxx" ++#define DRV_VERSION "v1.07T" ++#define DRV_RELDATE "2004/09/26" + + static char version[] __devinitdata = +- "defxx.c:v1.05e 2001/02/03 Lawrence V. Stefani and others\n"; ++ DRV_NAME ": " DRV_VERSION " " DRV_RELDATE ++ " Lawrence V. Stefani and others\n"; + + #define DYNAMIC_BUFFERS 1 + +@@ -243,7 +251,7 @@ + static void dfx_bus_init(struct net_device *dev); + static void dfx_bus_config_check(DFX_board_t *bp); + +-static int dfx_driver_init(struct net_device *dev); ++static int dfx_driver_init(struct net_device *dev, const char *print_name); + static int dfx_adap_init(DFX_board_t *bp, int get_buffers); + + static int dfx_open(struct net_device *dev); +@@ -337,48 +345,84 @@ + int offset, + u8 data + ) ++{ ++ if (bp->bus_type == DFX_BUS_TYPE_TC) ++ { ++ volatile u8 *addr = (void *)(bp->base_addr + offset); + ++ *addr = data; ++ mb(); ++ } ++ else + { + u16 port = bp->base_addr + offset; + + outb(data, port); + } ++} + + static inline void dfx_port_read_byte( + DFX_board_t *bp, + int offset, + u8 *data + ) ++{ ++ if (bp->bus_type == DFX_BUS_TYPE_TC) ++ { ++ volatile u8 *addr = (void *)(bp->base_addr + offset); + ++ mb(); ++ *data = *addr; ++ } ++ else + { + u16 port = bp->base_addr + offset; + + *data = inb(port); + } ++} + + static inline void dfx_port_write_long( + DFX_board_t *bp, + int offset, + u32 data + ) ++{ ++ if (bp->bus_type == DFX_BUS_TYPE_TC) ++ { ++ volatile u32 *addr = (void *)(bp->base_addr + offset); + ++ *addr = data; ++ mb(); ++ } ++ else + { + u16 port = bp->base_addr + offset; + + outl(data, port); + } ++} + + static inline void dfx_port_read_long( + DFX_board_t *bp, + int offset, + u32 *data + ) ++{ ++ if (bp->bus_type == DFX_BUS_TYPE_TC) ++ { ++ volatile u32 *addr = (void *)(bp->base_addr + offset); + ++ mb(); ++ *data = *addr; ++ } ++ else + { + u16 port = bp->base_addr + offset; + + *data = inl(port); + } ++} + + + /* +@@ -393,8 +437,9 @@ + * Condition code + * + * Arguments: +- * pdev - pointer to pci device information (NULL for EISA) +- * ioaddr - pointer to port (NULL for PCI) ++ * pdev - pointer to pci device information (NULL for EISA or TURBOchannel) ++ * bus_type - bus type (one of DFX_BUS_TYPE_*) ++ * handle - bus-specific data: slot (TC), pointer to port (EISA), NULL (PCI) + * + * Functional Description: + * +@@ -410,54 +455,68 @@ + * initialized and the board resources are read and stored in + * the device structure. + */ +-static int __devinit dfx_init_one_pci_or_eisa(struct pci_dev *pdev, long ioaddr) ++static int __devinit dfx_init_one_pci_or_eisa(struct pci_dev *pdev, u32 bus_type, long handle) + { ++ static int version_disp; ++ char *print_name = DRV_NAME; + struct net_device *dev; + DFX_board_t *bp; /* board pointer */ ++ long ioaddr; /* pointer to port */ ++ unsigned long len; /* resource length */ ++ int alloc_size; /* total buffer size used */ + int err; + +-#ifndef MODULE +- static int version_disp; +- +- if (!version_disp) /* display version info if adapter is found */ +- { ++ if (!version_disp) { /* display version info if adapter is found */ + version_disp = 1; /* set display flag to TRUE so that */ + printk(version); /* we only display this string ONCE */ + } +-#endif + +- /* +- * init_fddidev() allocates a device structure with private data, clears the device structure and private data, +- * and calls fddi_setup() and register_netdev(). Not much left to do for us here. +- */ +- dev = init_fddidev(NULL, sizeof(*bp)); ++ if (pdev != NULL) ++ print_name = pdev->slot_name; ++ ++ dev = alloc_fddidev(sizeof(*bp)); + if (!dev) { +- printk (KERN_ERR "defxx: unable to allocate fddidev, aborting\n"); ++ printk(KERN_ERR "%s: unable to allocate fddidev, aborting\n", ++ print_name); + return -ENOMEM; + } + + /* Enable PCI device. */ +- if (pdev != NULL) { ++ if (bus_type == DFX_BUS_TYPE_PCI) { + err = pci_enable_device (pdev); + if (err) goto err_out; + ioaddr = pci_resource_start (pdev, 1); + } + + SET_MODULE_OWNER(dev); ++ SET_NETDEV_DEV(dev, &pdev->dev); + + bp = dev->priv; + +- if (!request_region (ioaddr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN, dev->name)) { +- printk (KERN_ERR "%s: Cannot reserve I/O resource 0x%x @ 0x%lx, aborting\n", +- dev->name, PFI_K_CSR_IO_LEN, ioaddr); ++ if (bus_type == DFX_BUS_TYPE_TC) { ++ /* TURBOchannel board */ ++ bp->slot = handle; ++ claim_tc_card(bp->slot); ++ ioaddr = get_tc_base_addr(handle) + PI_TC_K_CSR_OFFSET; ++ len = PI_TC_K_CSR_LEN; ++ } else if (bus_type == DFX_BUS_TYPE_EISA) { ++ /* EISA board */ ++ ioaddr = handle; ++ len = PI_ESIC_K_CSR_IO_LEN; ++ } else ++ /* PCI board */ ++ len = PFI_K_CSR_IO_LEN; ++ dev->base_addr = ioaddr; /* save port (I/O) base address */ ++ ++ if (!request_region(ioaddr, len, print_name)) { ++ printk(KERN_ERR "%s: Cannot reserve I/O resource " ++ "0x%lx @ 0x%lx, aborting\n", print_name, len, ioaddr); + err = -EBUSY; + goto err_out; + } + + /* Initialize new device structure */ + +- dev->base_addr = ioaddr; /* save port (I/O) base address */ +- + dev->get_stats = dfx_ctl_get_stats; + dev->open = dfx_open; + dev->stop = dfx_close; +@@ -465,37 +524,54 @@ + dev->set_multicast_list = dfx_ctl_set_multicast_list; + dev->set_mac_address = dfx_ctl_set_mac_address; + +- if (pdev == NULL) { +- /* EISA board */ +- bp->bus_type = DFX_BUS_TYPE_EISA; ++ bp->bus_type = bus_type; ++ if (bus_type == DFX_BUS_TYPE_TC || bus_type == DFX_BUS_TYPE_EISA) { ++ /* TURBOchannel or EISA board */ + bp->next = root_dfx_eisa_dev; + root_dfx_eisa_dev = dev; + } else { + /* PCI board */ +- bp->bus_type = DFX_BUS_TYPE_PCI; + bp->pci_dev = pdev; + pci_set_drvdata (pdev, dev); + pci_set_master (pdev); + } + +- if (dfx_driver_init(dev) != DFX_K_SUCCESS) { ++ ++ if (dfx_driver_init(dev, print_name) != DFX_K_SUCCESS) { + err = -ENODEV; + goto err_out_region; + } + ++ err = register_netdev(dev); ++ if (err) ++ goto err_out_kfree; ++ ++ printk("%s: registered as %s\n", print_name, dev->name); + return 0; + ++err_out_kfree: ++ alloc_size = sizeof(PI_DESCR_BLOCK) + ++ PI_CMD_REQ_K_SIZE_MAX + PI_CMD_RSP_K_SIZE_MAX + ++#ifndef DYNAMIC_BUFFERS ++ (bp->rcv_bufs_to_post * PI_RCV_DATA_K_SIZE_MAX) + ++#endif ++ sizeof(PI_CONSUMER_BLOCK) + ++ (PI_ALIGN_K_DESC_BLK - 1); ++ if (bp->kmalloced) ++ pci_free_consistent(pdev, alloc_size, ++ bp->kmalloced, bp->kmalloced_dma); + err_out_region: +- release_region(ioaddr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN); ++ release_region(ioaddr, len); + err_out: +- unregister_netdev(dev); +- kfree(dev); ++ if (bp->bus_type == DFX_BUS_TYPE_TC) ++ release_tc_card(bp->slot); ++ free_netdev(dev); + return err; + } + + static int __devinit dfx_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) + { +- return dfx_init_one_pci_or_eisa(pdev, 0); ++ return dfx_init_one_pci_or_eisa(pdev, DFX_BUS_TYPE_PCI, 0); + } + + static int __init dfx_eisa_init(void) +@@ -507,6 +583,7 @@ + + DBG_printk("In dfx_eisa_init...\n"); + ++#ifdef CONFIG_EISA + /* Scan for FDDI EISA controllers */ + + for (i=0; i < DFX_MAX_EISA_SLOTS; i++) /* only scan for up to 16 EISA slots */ +@@ -517,9 +594,27 @@ + { + port = (i << 12); /* recalc base addr */ + +- if (dfx_init_one_pci_or_eisa(NULL, port) == 0) rc = 0; ++ if (dfx_init_one_pci_or_eisa(NULL, DFX_BUS_TYPE_EISA, port) == 0) rc = 0; + } + } ++#endif ++ return rc; ++} ++ ++static int __init dfx_tc_init(void) ++{ ++ int rc = -ENODEV; ++ int slot; /* TC slot number */ ++ ++ DBG_printk("In dfx_tc_init...\n"); ++ ++ /* Scan for FDDI TC controllers */ ++ while ((slot = search_tc_card("PMAF-F")) >= 0) { ++ if (dfx_init_one_pci_or_eisa(NULL, DFX_BUS_TYPE_TC, slot) == 0) ++ rc = 0; ++ else ++ break; ++ } + return rc; + } + +@@ -583,8 +678,9 @@ + + /* Initialize adapter based on bus type */ + +- if (bp->bus_type == DFX_BUS_TYPE_EISA) +- { ++ if (bp->bus_type == DFX_BUS_TYPE_TC) { ++ dev->irq = get_tc_irq_nr(bp->slot); ++ } else if (bp->bus_type == DFX_BUS_TYPE_EISA) { + /* Get the interrupt level from the ESIC chip */ + + dfx_port_read_byte(bp, PI_ESIC_K_IO_CONFIG_STAT_0, &val); +@@ -766,6 +862,7 @@ + * + * Arguments: + * dev - pointer to device information ++ * print_name - printable device name + * + * Functional Description: + * This function allocates additional resources such as the host memory +@@ -780,20 +877,21 @@ + * or read adapter MAC address + * + * Assumptions: +- * Memory allocated from kmalloc() call is physically contiguous, locked +- * memory whose physical address equals its virtual address. ++ * Memory allocated from pci_alloc_consistent() call is physically ++ * contiguous, locked memory. + * + * Side Effects: + * Adapter is reset and should be in DMA_UNAVAILABLE state before + * returning from this routine. + */ + +-static int __devinit dfx_driver_init(struct net_device *dev) ++static int __devinit dfx_driver_init(struct net_device *dev, ++ const char *print_name) + { + DFX_board_t *bp = dev->priv; + int alloc_size; /* total buffer size needed */ + char *top_v, *curr_v; /* virtual addrs into memory block */ +- u32 top_p, curr_p; /* physical addrs into memory block */ ++ dma_addr_t top_p, curr_p; /* physical addrs into memory block */ + u32 data; /* host data register value */ + + DBG_printk("In dfx_driver_init...\n"); +@@ -837,26 +935,20 @@ + + /* Read the factory MAC address from the adapter then save it */ + +- if (dfx_hw_port_ctrl_req(bp, +- PI_PCTRL_M_MLA, +- PI_PDATA_A_MLA_K_LO, +- 0, +- &data) != DFX_K_SUCCESS) +- { +- printk("%s: Could not read adapter factory MAC address!\n", dev->name); ++ if (dfx_hw_port_ctrl_req(bp, PI_PCTRL_M_MLA, PI_PDATA_A_MLA_K_LO, 0, ++ &data) != DFX_K_SUCCESS) { ++ printk("%s: Could not read adapter factory MAC address!\n", ++ print_name); + return(DFX_K_FAILURE); +- } ++ } + memcpy(&bp->factory_mac_addr[0], &data, sizeof(u32)); + +- if (dfx_hw_port_ctrl_req(bp, +- PI_PCTRL_M_MLA, +- PI_PDATA_A_MLA_K_HI, +- 0, +- &data) != DFX_K_SUCCESS) +- { +- printk("%s: Could not read adapter factory MAC address!\n", dev->name); ++ if (dfx_hw_port_ctrl_req(bp, PI_PCTRL_M_MLA, PI_PDATA_A_MLA_K_HI, 0, ++ &data) != DFX_K_SUCCESS) { ++ printk("%s: Could not read adapter factory MAC address!\n", ++ print_name); + return(DFX_K_FAILURE); +- } ++ } + memcpy(&bp->factory_mac_addr[4], &data, sizeof(u16)); + + /* +@@ -867,28 +959,27 @@ + */ + + memcpy(dev->dev_addr, bp->factory_mac_addr, FDDI_K_ALEN); +- if (bp->bus_type == DFX_BUS_TYPE_EISA) +- printk("%s: DEFEA at I/O addr = 0x%lX, IRQ = %d, Hardware addr = %02X-%02X-%02X-%02X-%02X-%02X\n", +- dev->name, +- dev->base_addr, +- dev->irq, +- dev->dev_addr[0], +- dev->dev_addr[1], +- dev->dev_addr[2], +- dev->dev_addr[3], +- dev->dev_addr[4], +- dev->dev_addr[5]); ++ if (bp->bus_type == DFX_BUS_TYPE_TC) ++ printk("%s: DEFTA at addr = 0x%lX, IRQ = %d, " ++ "Hardware addr = %02X-%02X-%02X-%02X-%02X-%02X\n", ++ print_name, dev->base_addr, dev->irq, ++ dev->dev_addr[0], dev->dev_addr[1], ++ dev->dev_addr[2], dev->dev_addr[3], ++ dev->dev_addr[4], dev->dev_addr[5]); ++ else if (bp->bus_type == DFX_BUS_TYPE_EISA) ++ printk("%s: DEFEA at I/O addr = 0x%lX, IRQ = %d, " ++ "Hardware addr = %02X-%02X-%02X-%02X-%02X-%02X\n", ++ print_name, dev->base_addr, dev->irq, ++ dev->dev_addr[0], dev->dev_addr[1], ++ dev->dev_addr[2], dev->dev_addr[3], ++ dev->dev_addr[4], dev->dev_addr[5]); + else +- printk("%s: DEFPA at I/O addr = 0x%lX, IRQ = %d, Hardware addr = %02X-%02X-%02X-%02X-%02X-%02X\n", +- dev->name, +- dev->base_addr, +- dev->irq, +- dev->dev_addr[0], +- dev->dev_addr[1], +- dev->dev_addr[2], +- dev->dev_addr[3], +- dev->dev_addr[4], +- dev->dev_addr[5]); ++ printk("%s: DEFPA at I/O addr = 0x%lX, IRQ = %d, " ++ "Hardware addr = %02X-%02X-%02X-%02X-%02X-%02X\n", ++ print_name, dev->base_addr, dev->irq, ++ dev->dev_addr[0], dev->dev_addr[1], ++ dev->dev_addr[2], dev->dev_addr[3], ++ dev->dev_addr[4], dev->dev_addr[5]); + + /* + * Get memory for descriptor block, consumer block, and other buffers +@@ -903,14 +994,15 @@ + #endif + sizeof(PI_CONSUMER_BLOCK) + + (PI_ALIGN_K_DESC_BLK - 1); +- bp->kmalloced = top_v = (char *) kmalloc(alloc_size, GFP_KERNEL); +- if (top_v == NULL) +- { +- printk("%s: Could not allocate memory for host buffers and structures!\n", dev->name); ++ bp->kmalloced = top_v = pci_alloc_consistent(bp->pci_dev, alloc_size, ++ &bp->kmalloced_dma); ++ if (top_v == NULL) { ++ printk("%s: Could not allocate memory for host buffers " ++ "and structures!\n", print_name); + return(DFX_K_FAILURE); +- } ++ } + memset(top_v, 0, alloc_size); /* zero out memory before continuing */ +- top_p = virt_to_bus(top_v); /* get physical address of buffer */ ++ top_p = bp->kmalloced_dma; /* get physical address of buffer */ + + /* + * To guarantee the 8K alignment required for the descriptor block, 8K - 1 +@@ -924,7 +1016,7 @@ + * for allocating the needed memory. + */ + +- curr_p = (u32) (ALIGN(top_p, PI_ALIGN_K_DESC_BLK)); ++ curr_p = ALIGN(top_p, PI_ALIGN_K_DESC_BLK); + curr_v = top_v + (curr_p - top_p); + + /* Reserve space for descriptor block */ +@@ -965,14 +1057,20 @@ + + /* Display virtual and physical addresses if debug driver */ + +- DBG_printk("%s: Descriptor block virt = %0lX, phys = %0X\n", dev->name, (long)bp->descr_block_virt, bp->descr_block_phys); +- DBG_printk("%s: Command Request buffer virt = %0lX, phys = %0X\n", dev->name, (long)bp->cmd_req_virt, bp->cmd_req_phys); +- DBG_printk("%s: Command Response buffer virt = %0lX, phys = %0X\n", dev->name, (long)bp->cmd_rsp_virt, bp->cmd_rsp_phys); +- DBG_printk("%s: Receive buffer block virt = %0lX, phys = %0X\n", dev->name, (long)bp->rcv_block_virt, bp->rcv_block_phys); +- DBG_printk("%s: Consumer block virt = %0lX, phys = %0X\n", dev->name, (long)bp->cons_block_virt, bp->cons_block_phys); ++ DBG_printk("%s: Descriptor block virt = %0lX, phys = %0X\n", ++ print_name, ++ (long)bp->descr_block_virt, bp->descr_block_phys); ++ DBG_printk("%s: Command Request buffer virt = %0lX, phys = %0X\n", ++ print_name, (long)bp->cmd_req_virt, bp->cmd_req_phys); ++ DBG_printk("%s: Command Response buffer virt = %0lX, phys = %0X\n", ++ print_name, (long)bp->cmd_rsp_virt, bp->cmd_rsp_phys); ++ DBG_printk("%s: Receive buffer block virt = %0lX, phys = %0X\n", ++ print_name, (long)bp->rcv_block_virt, bp->rcv_block_phys); ++ DBG_printk("%s: Consumer block virt = %0lX, phys = %0X\n", ++ print_name, (long)bp->cons_block_virt, bp->cons_block_phys); + + return(DFX_K_SUCCESS); +- } ++} + + + /* +@@ -1218,7 +1316,9 @@ + + /* Register IRQ - support shared interrupts by passing device ptr */ + +- ret = request_irq(dev->irq, (void *)dfx_interrupt, SA_SHIRQ, dev->name, dev); ++ ret = request_irq(dev->irq, (void *)dfx_interrupt, ++ (bp->bus_type == DFX_BUS_TYPE_TC) ? 0 : SA_SHIRQ, ++ dev->name, dev); + if (ret) { + printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq); + return ret; +@@ -1737,7 +1837,7 @@ + dfx_port_write_long(bp, PFI_K_REG_MODE_CTRL, + (PFI_MODE_M_PDQ_INT_ENB + PFI_MODE_M_DMA_ENB)); + } +- else ++ else if (bp->bus_type == DFX_BUS_TYPE_EISA) + { + /* Disable interrupts at the ESIC */ + +@@ -1755,6 +1855,13 @@ + tmp |= PI_CONFIG_STAT_0_M_INT_ENB; + dfx_port_write_byte(bp, PI_ESIC_K_IO_CONFIG_STAT_0, tmp); + } ++ else { ++ /* TC doesn't share interrupts so no need to disable them */ ++ ++ /* Call interrupt service routine for this adapter */ ++ ++ dfx_int_common(dev); ++ } + + spin_unlock(&bp->lock); + } +@@ -2663,12 +2770,12 @@ + + static void my_skb_align(struct sk_buff *skb, int n) + { +- u32 x=(u32)skb->data; /* We only want the low bits .. */ +- u32 v; ++ unsigned long x = (unsigned long)skb->data; ++ unsigned long v; + +- v=(x+n-1)&~(n-1); /* Where we want to be */ ++ v = ALIGN(x, n); /* Where we want to be */ + +- skb_reserve(skb, v-x); ++ skb_reserve(skb, v - x); + } + + +@@ -2745,7 +2852,10 @@ + */ + + my_skb_align(newskb, 128); +- bp->descr_block_virt->rcv_data[i+j].long_1 = virt_to_bus(newskb->data); ++ bp->descr_block_virt->rcv_data[i + j].long_1 = ++ (u32)pci_map_single(bp->pci_dev, newskb->data, ++ NEW_SKB_SIZE, ++ PCI_DMA_FROMDEVICE); + /* + * p_rcv_buff_va is only used inside the + * kernel so we put the skb pointer here. +@@ -2859,9 +2969,17 @@ + + my_skb_align(newskb, 128); + skb = (struct sk_buff *)bp->p_rcv_buff_va[entry]; ++ pci_unmap_single(bp->pci_dev, ++ bp->descr_block_virt->rcv_data[entry].long_1, ++ NEW_SKB_SIZE, ++ PCI_DMA_FROMDEVICE); + skb_reserve(skb, RCV_BUFF_K_PADDING); + bp->p_rcv_buff_va[entry] = (char *)newskb; +- bp->descr_block_virt->rcv_data[entry].long_1 = virt_to_bus(newskb->data); ++ bp->descr_block_virt->rcv_data[entry].long_1 = ++ (u32)pci_map_single(bp->pci_dev, ++ newskb->data, ++ NEW_SKB_SIZE, ++ PCI_DMA_FROMDEVICE); + } else + skb = NULL; + } else +@@ -2934,7 +3052,7 @@ + * is contained in a single physically contiguous buffer + * in which the virtual address of the start of packet + * (skb->data) can be converted to a physical address +- * by using virt_to_bus(). ++ * by using pci_map_single(). + * + * Since the adapter architecture requires a three byte + * packet request header to prepend the start of packet, +@@ -3082,12 +3200,13 @@ + * skb->data. + * 6. The physical address of the start of packet + * can be determined from the virtual address +- * by using virt_to_bus() and is only 32-bits ++ * by using pci_map_single() and is only 32-bits + * wide. + */ + + p_xmt_descr->long_0 = (u32) (PI_XMT_DESCR_M_SOP | PI_XMT_DESCR_M_EOP | ((skb->len) << PI_XMT_DESCR_V_SEG_LEN)); +- p_xmt_descr->long_1 = (u32) virt_to_bus(skb->data); ++ p_xmt_descr->long_1 = (u32)pci_map_single(bp->pci_dev, skb->data, ++ skb->len, PCI_DMA_TODEVICE); + + /* + * Verify that descriptor is actually available +@@ -3171,6 +3290,7 @@ + { + XMT_DRIVER_DESCR *p_xmt_drv_descr; /* ptr to transmit driver descriptor */ + PI_TYPE_2_CONSUMER *p_type_2_cons; /* ptr to rcv/xmt consumer block register */ ++ u8 comp; /* local transmit completion index */ + int freed = 0; /* buffers freed */ + + /* Service all consumed transmit frames */ +@@ -3188,7 +3308,11 @@ + bp->xmt_total_bytes += p_xmt_drv_descr->p_skb->len; + + /* Return skb to operating system */ +- ++ comp = bp->rcv_xmt_reg.index.xmt_comp; ++ pci_unmap_single(bp->pci_dev, ++ bp->descr_block_virt->xmt_data[comp].long_1, ++ p_xmt_drv_descr->p_skb->len, ++ PCI_DMA_TODEVICE); + dev_kfree_skb_irq(p_xmt_drv_descr->p_skb); + + /* +@@ -3297,6 +3421,7 @@ + { + u32 prod_cons; /* rcv/xmt consumer block longword */ + XMT_DRIVER_DESCR *p_xmt_drv_descr; /* ptr to transmit driver descriptor */ ++ u8 comp; /* local transmit completion index */ + + /* Flush all outstanding transmit frames */ + +@@ -3307,7 +3432,11 @@ + p_xmt_drv_descr = &(bp->xmt_drv_descr_blk[bp->rcv_xmt_reg.index.xmt_comp]); + + /* Return skb to operating system */ +- ++ comp = bp->rcv_xmt_reg.index.xmt_comp; ++ pci_unmap_single(bp->pci_dev, ++ bp->descr_block_virt->xmt_data[comp].long_1, ++ p_xmt_drv_descr->p_skb->len, ++ PCI_DMA_TODEVICE); + dev_kfree_skb(p_xmt_drv_descr->p_skb); + + /* Increment transmit error counter */ +@@ -3337,12 +3466,36 @@ + + static void __devexit dfx_remove_one_pci_or_eisa(struct pci_dev *pdev, struct net_device *dev) + { +- DFX_board_t *bp = dev->priv; ++ DFX_board_t *bp = dev->priv; ++ unsigned long len; /* resource length */ ++ int alloc_size; /* total buffer size used */ + ++ if (bp->bus_type == DFX_BUS_TYPE_TC) { ++ /* TURBOchannel board */ ++ len = PI_TC_K_CSR_LEN; ++ } else if (bp->bus_type == DFX_BUS_TYPE_EISA) { ++ /* EISA board */ ++ len = PI_ESIC_K_CSR_IO_LEN; ++ } else { ++ len = PFI_K_CSR_IO_LEN; ++ } + unregister_netdev(dev); +- release_region(dev->base_addr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN ); +- if (bp->kmalloced) kfree(bp->kmalloced); +- kfree(dev); ++ release_region(dev->base_addr, len); ++ ++ if (bp->bus_type == DFX_BUS_TYPE_TC) ++ release_tc_card(bp->slot); ++ ++ alloc_size = sizeof(PI_DESCR_BLOCK) + ++ PI_CMD_REQ_K_SIZE_MAX + PI_CMD_RSP_K_SIZE_MAX + ++#ifndef DYNAMIC_BUFFERS ++ (bp->rcv_bufs_to_post * PI_RCV_DATA_K_SIZE_MAX) + ++#endif ++ sizeof(PI_CONSUMER_BLOCK) + ++ (PI_ALIGN_K_DESC_BLK - 1); ++ if (bp->kmalloced) ++ pci_free_consistent(pdev, alloc_size, bp->kmalloced, ++ bp->kmalloced_dma); ++ free_netdev(dev); + } + + static void __devexit dfx_remove_one (struct pci_dev *pdev) +@@ -3353,21 +3506,22 @@ + pci_set_drvdata(pdev, NULL); + } + +-static struct pci_device_id dfx_pci_tbl[] __devinitdata = { ++static struct pci_device_id dfx_pci_tbl[] = { + { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_FDDI, PCI_ANY_ID, PCI_ANY_ID, }, + { 0, } + }; + MODULE_DEVICE_TABLE(pci, dfx_pci_tbl); + + static struct pci_driver dfx_driver = { +- name: "defxx", +- probe: dfx_init_one, +- remove: __devexit_p(dfx_remove_one), +- id_table: dfx_pci_tbl, ++ .name = "defxx", ++ .probe = dfx_init_one, ++ .remove = __devexit_p(dfx_remove_one), ++ .id_table = dfx_pci_tbl, + }; + + static int dfx_have_pci; + static int dfx_have_eisa; ++static int dfx_have_tc; + + + static void __exit dfx_eisa_cleanup(void) +@@ -3388,12 +3542,7 @@ + + static int __init dfx_init(void) + { +- int rc_pci, rc_eisa; +- +-/* when a module, this is printed whether or not devices are found in probe */ +-#ifdef MODULE +- printk(version); +-#endif ++ int rc_pci, rc_eisa, rc_tc; + + rc_pci = pci_module_init(&dfx_driver); + if (rc_pci >= 0) dfx_have_pci = 1; +@@ -3401,20 +3550,27 @@ + rc_eisa = dfx_eisa_init(); + if (rc_eisa >= 0) dfx_have_eisa = 1; + +- return ((rc_eisa < 0) ? 0 : rc_eisa) + ((rc_pci < 0) ? 0 : rc_pci); ++ rc_tc = dfx_tc_init(); ++ if (rc_tc >= 0) dfx_have_tc = 1; ++ ++ return ((rc_tc < 0) ? 0 : rc_tc) + ++ ((rc_eisa < 0) ? 0 : rc_eisa) + ++ ((rc_pci < 0) ? 0 : rc_pci); + } + + static void __exit dfx_cleanup(void) + { + if (dfx_have_pci) + pci_unregister_driver(&dfx_driver); +- if (dfx_have_eisa) ++ if (dfx_have_eisa || dfx_have_tc) + dfx_eisa_cleanup(); +- + } + + module_init(dfx_init); + module_exit(dfx_cleanup); ++MODULE_AUTHOR("Lawrence V. Stefani"); ++MODULE_DESCRIPTION("DEC FDDIcontroller EISA/PCI (DEFEA/DEFPA) driver " ++ DRV_VERSION " " DRV_RELDATE); + MODULE_LICENSE("GPL"); + + +diff -Nur linux-2.4.30/drivers/net/defxx.h linux-2.4.30-mips/drivers/net/defxx.h +--- linux-2.4.30/drivers/net/defxx.h 2001-02-13 22:15:05.000000000 +0100 ++++ linux-2.4.30-mips/drivers/net/defxx.h 2004-10-03 20:06:48.000000000 +0200 +@@ -12,17 +12,11 @@ + * Contains all definitions specified by port specification and required + * by the defxx.c driver. + * +- * Maintainers: +- * LVS Lawrence V. Stefani +- * +- * Contact: +- * The author may be reached at: ++ * The original author: ++ * LVS Lawrence V. Stefani <lstefani@yahoo.com> + * +- * Inet: stefani@lkg.dec.com +- * Mail: Digital Equipment Corporation +- * 550 King Street +- * M/S: LKG1-3/M07 +- * Littleton, MA 01460 ++ * Maintainers: ++ * macro Maciej W. Rozycki <macro@linux-mips.org> + * + * Modification History: + * Date Name Description +@@ -30,6 +24,7 @@ + * 09-Sep-96 LVS Added group_prom field. Moved read/write I/O + * macros to DEFXX.C. + * 12-Sep-96 LVS Removed packet request header pointers. ++ * 04 Aug 2003 macro Converted to the DMA API. + */ + + #ifndef _DEFXX_H_ +@@ -1467,6 +1462,11 @@ + + #endif /* #ifndef BIG_ENDIAN */ + ++/* Define TC PDQ CSR offset and length */ ++ ++#define PI_TC_K_CSR_OFFSET 0x100000 ++#define PI_TC_K_CSR_LEN 0x80 /* 128 bytes */ ++ + /* Define EISA controller register offsets */ + + #define PI_ESIC_K_BURST_HOLDOFF 0x040 +@@ -1634,6 +1634,7 @@ + + #define DFX_BUS_TYPE_PCI 0 /* type code for DEC FDDIcontroller/PCI */ + #define DFX_BUS_TYPE_EISA 1 /* type code for DEC FDDIcontroller/EISA */ ++#define DFX_BUS_TYPE_TC 2 /* type code for DEC FDDIcontroller/TURBOchannel */ + + #define DFX_FC_PRH2_PRH1_PRH0 0x54003820 /* Packet Request Header bytes + FC */ + #define DFX_PRH0_BYTE 0x20 /* Packet Request Header byte 0 */ +@@ -1704,17 +1705,19 @@ + { + /* Keep virtual and physical pointers to locked, physically contiguous memory */ + +- char *kmalloced; /* kfree this on unload */ ++ char *kmalloced; /* pci_free_consistent this on unload */ ++ dma_addr_t kmalloced_dma; ++ /* DMA handle for the above */ + PI_DESCR_BLOCK *descr_block_virt; /* PDQ descriptor block virt address */ +- u32 descr_block_phys; /* PDQ descriptor block phys address */ ++ dma_addr_t descr_block_phys; /* PDQ descriptor block phys address */ + PI_DMA_CMD_REQ *cmd_req_virt; /* Command request buffer virt address */ +- u32 cmd_req_phys; /* Command request buffer phys address */ ++ dma_addr_t cmd_req_phys; /* Command request buffer phys address */ + PI_DMA_CMD_RSP *cmd_rsp_virt; /* Command response buffer virt address */ +- u32 cmd_rsp_phys; /* Command response buffer phys address */ ++ dma_addr_t cmd_rsp_phys; /* Command response buffer phys address */ + char *rcv_block_virt; /* LLC host receive queue buf blk virt */ +- u32 rcv_block_phys; /* LLC host receive queue buf blk phys */ ++ dma_addr_t rcv_block_phys; /* LLC host receive queue buf blk phys */ + PI_CONSUMER_BLOCK *cons_block_virt; /* PDQ consumer block virt address */ +- u32 cons_block_phys; /* PDQ consumer block phys address */ ++ dma_addr_t cons_block_phys; /* PDQ consumer block phys address */ + + /* Keep local copies of Type 1 and Type 2 register data */ + +@@ -1758,8 +1761,9 @@ + + struct net_device *dev; /* pointer to device structure */ + struct net_device *next; +- u32 bus_type; /* bus type (0 == PCI, 1 == EISA) */ +- u16 base_addr; /* base I/O address (same as dev->base_addr) */ ++ u32 bus_type; /* bus type (0 == PCI, 1 == EISA, 2 == TC) */ ++ long base_addr; /* base I/O address (same as dev->base_addr) */ ++ int slot; /* TC slot number */ + struct pci_dev * pci_dev; + u32 full_duplex_enb; /* FDDI Full Duplex enable (1 == on, 2 == off) */ + u32 req_ttrt; /* requested TTRT value (in 80ns units) */ +diff -Nur linux-2.4.30/drivers/net/hamradio/hdlcdrv.c linux-2.4.30-mips/drivers/net/hamradio/hdlcdrv.c +--- linux-2.4.30/drivers/net/hamradio/hdlcdrv.c 2002-02-25 20:37:59.000000000 +0100 ++++ linux-2.4.30-mips/drivers/net/hamradio/hdlcdrv.c 2004-05-04 14:04:27.000000000 +0200 +@@ -587,6 +587,8 @@ + return -EINVAL; + s = (struct hdlcdrv_state *)dev->priv; + ++ netif_stop_queue(dev); ++ + if (s->ops && s->ops->close) + i = s->ops->close(dev); + if (s->skb) +diff -Nur linux-2.4.30/drivers/net/irda/au1k_ir.c linux-2.4.30-mips/drivers/net/irda/au1k_ir.c +--- linux-2.4.30/drivers/net/irda/au1k_ir.c 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/net/irda/au1k_ir.c 2005-02-03 07:35:29.000000000 +0100 +@@ -81,10 +81,6 @@ + + #define RUN_AT(x) (jiffies + (x)) + +-#if defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) +-static BCSR * const bcsr = (BCSR *)0xAE000000; +-#endif +- + static spinlock_t ir_lock = SPIN_LOCK_UNLOCKED; + + /* +diff -Nur linux-2.4.30/drivers/pci/pci.c linux-2.4.30-mips/drivers/pci/pci.c +--- linux-2.4.30/drivers/pci/pci.c 2004-11-17 12:54:21.000000000 +0100 ++++ linux-2.4.30-mips/drivers/pci/pci.c 2004-11-19 01:28:41.000000000 +0100 +@@ -1281,11 +1281,17 @@ + { + unsigned int buses; + unsigned short cr; ++ unsigned short bctl; + struct pci_bus *child; + int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS); + + pci_read_config_dword(dev, PCI_PRIMARY_BUS, &buses); + DBG("Scanning behind PCI bridge %s, config %06x, pass %d\n", dev->slot_name, buses & 0xffffff, pass); ++ /* Disable MasterAbortMode during probing to avoid reporting ++ of bus errors (in some architectures) */ ++ pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &bctl); ++ pci_write_config_word(dev, PCI_BRIDGE_CONTROL, ++ bctl & ~PCI_BRIDGE_CTL_MASTER_ABORT); + if ((buses & 0xffff00) && !pcibios_assign_all_busses()) { + /* + * Bus already configured by firmware, process it in the first +@@ -1351,6 +1357,7 @@ + pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max); + pci_write_config_word(dev, PCI_COMMAND, cr); + } ++ pci_write_config_word(dev, PCI_BRIDGE_CONTROL, bctl); + sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number); + return max; + } +diff -Nur linux-2.4.30/drivers/pcmcia/Config.in linux-2.4.30-mips/drivers/pcmcia/Config.in +--- linux-2.4.30/drivers/pcmcia/Config.in 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/pcmcia/Config.in 2004-02-22 06:21:34.000000000 +0100 +@@ -30,16 +30,14 @@ + dep_tristate ' M8xx support' CONFIG_PCMCIA_M8XX $CONFIG_PCMCIA + fi + if [ "$CONFIG_SOC_AU1X00" = "y" ]; then +- dep_tristate ' Au1x00 PCMCIA support' CONFIG_PCMCIA_AU1X00 $CONFIG_PCMCIA +- if [ "$CONFIG_PCMCIA_AU1X00" != "n" ]; then +- bool ' Pb1x00 board support' CONFIG_PCMCIA_PB1X00 +- bool ' Db1x00 board support' CONFIG_PCMCIA_DB1X00 +- bool ' XXS1500 board support' CONFIG_PCMCIA_XXS1500 +- fi ++ dep_tristate ' Au1x00 PCMCIA support' CONFIG_PCMCIA_AU1X00 $CONFIG_PCMCIA + fi + if [ "$CONFIG_SIBYTE_SB1xxx_SOC" = "y" ]; then + dep_bool ' SiByte PCMCIA support' CONFIG_PCMCIA_SIBYTE $CONFIG_PCMCIA $CONFIG_BLK_DEV_IDE_SIBYTE + fi ++ if [ "$CONFIG_VRC4171" = "y" -o "$CONFIG_VRC4171" = "m" ]; then ++ dep_tristate ' NEC VRC4171 Card Controllers support' CONFIG_PCMCIA_VRC4171 $CONFIG_PCMCIA ++ fi + if [ "$CONFIG_VRC4173" = "y" -o "$CONFIG_VRC4173" = "m" ]; then + dep_tristate ' NEC VRC4173 CARDU support' CONFIG_PCMCIA_VRC4173 $CONFIG_PCMCIA + fi +diff -Nur linux-2.4.30/drivers/pcmcia/Makefile linux-2.4.30-mips/drivers/pcmcia/Makefile +--- linux-2.4.30/drivers/pcmcia/Makefile 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/pcmcia/Makefile 2005-02-03 07:35:30.000000000 +0100 +@@ -61,9 +61,18 @@ + + obj-$(CONFIG_PCMCIA_AU1X00) += au1x00_ss.o + au1000_ss-objs-y := au1000_generic.o +-au1000_ss-objs-$(CONFIG_PCMCIA_PB1X00) += au1000_pb1x00.o +-au1000_ss-objs-$(CONFIG_PCMCIA_DB1X00) += au1000_db1x00.o +-au1000_ss-objs-$(CONFIG_PCMCIA_XXS1500) += au1000_xxs1500.o ++au1000_ss-objs-$(CONFIG_MIPS_PB1000) += au1000_pb1x00.o ++au1000_ss-objs-$(CONFIG_MIPS_PB1100) += au1000_pb1x00.o ++au1000_ss-objs-$(CONFIG_MIPS_PB1500) += au1000_pb1x00.o ++au1000_ss-objs-$(CONFIG_MIPS_PB1550) += au1000_pb1550.o ++au1000_ss-objs-$(CONFIG_MIPS_PB1200) += au1000_db1x00.o ++au1000_ss-objs-$(CONFIG_MIPS_DB1000) += au1000_db1x00.o ++au1000_ss-objs-$(CONFIG_MIPS_DB1100) += au1000_db1x00.o ++au1000_ss-objs-$(CONFIG_MIPS_DB1500) += au1000_db1x00.o ++au1000_ss-objs-$(CONFIG_MIPS_DB1550) += au1000_db1x00.o ++au1000_ss-objs-$(CONFIG_MIPS_DB1200) += au1000_db1x00.o ++au1000_ss-objs-$(CONFIG_MIPS_HYDROGEN3) += au1000_hydrogen3.o ++au1000_ss-objs-$(CONFIG_MIPS_XXS1500) += au1000_xxs1500.o + + obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o + obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o +@@ -89,6 +98,7 @@ + sa1100_cs-objs-$(CONFIG_SA1100_XP860) += sa1100_xp860.o sa1111_generic.o + sa1100_cs-objs-$(CONFIG_SA1100_YOPY) += sa1100_yopy.o + ++obj-$(CONFIG_PCMCIA_VRC4171) += vrc4171_card.o + obj-$(CONFIG_PCMCIA_VRC4173) += vrc4173_cardu.o + + include $(TOPDIR)/Rules.make +diff -Nur linux-2.4.30/drivers/pcmcia/au1000_db1x00.c linux-2.4.30-mips/drivers/pcmcia/au1000_db1x00.c +--- linux-2.4.30/drivers/pcmcia/au1000_db1x00.c 2005-01-19 15:09:57.000000000 +0100 ++++ linux-2.4.30-mips/drivers/pcmcia/au1000_db1x00.c 2005-02-03 07:35:30.000000000 +0100 +@@ -1,6 +1,6 @@ + /* + * +- * Alchemy Semi Db1x00 boards specific pcmcia routines. ++ * AMD Alchemy DUAL-SLOT Db1x00 boards' specific pcmcia routines. + * + * Copyright 2002 MontaVista Software Inc. + * Author: MontaVista Software, Inc. +@@ -54,9 +54,20 @@ + #include <asm/au1000.h> + #include <asm/au1000_pcmcia.h> + ++#if defined(CONFIG_MIPS_PB1200) ++#include <asm/pb1200.h> ++#elif defined(CONFIG_MIPS_DB1200) ++#include <asm/db1200.h> ++#else + #include <asm/db1x00.h> ++#endif + +-static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++#define PCMCIA_MAX_SOCK 1 ++#define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK+1) ++ ++/* VPP/VCC */ ++#define SET_VCC_VPP(VCC, VPP, SLOT)\ ++ ((((VCC)<<2) | ((VPP)<<0)) << ((SLOT)*8)) + + static int db1x00_pcmcia_init(struct pcmcia_init *init) + { +@@ -76,7 +87,7 @@ + db1x00_pcmcia_socket_state(unsigned sock, struct pcmcia_state *state) + { + u32 inserted; +- unsigned char vs; ++ u16 vs; + + if(sock > PCMCIA_MAX_SOCK) return -1; + +@@ -87,11 +98,11 @@ + + if (sock == 0) { + vs = bcsr->status & 0x3; +- inserted = !(bcsr->status & (1<<4)); ++ inserted = BOARD_CARD_INSERTED(0); + } + else { + vs = (bcsr->status & 0xC)>>2; +- inserted = !(bcsr->status & (1<<5)); ++ inserted = BOARD_CARD_INSERTED(1); + } + + DEBUG(KERN_DEBUG "db1x00 socket %d: inserted %d, vs %d\n", +@@ -144,16 +155,9 @@ + if(info->sock > PCMCIA_MAX_SOCK) return -1; + + if(info->sock == 0) +-#ifdef CONFIG_MIPS_DB1550 +- info->irq = AU1000_GPIO_3; ++ info->irq = BOARD_PC0_INT; + else +- info->irq = AU1000_GPIO_5; +-#else +- info->irq = AU1000_GPIO_2; +- else +- info->irq = AU1000_GPIO_5; +-#endif +- ++ info->irq = BOARD_PC1_INT; + return 0; + } + +diff -Nur linux-2.4.30/drivers/pcmcia/vrc4171_card.c linux-2.4.30-mips/drivers/pcmcia/vrc4171_card.c +--- linux-2.4.30/drivers/pcmcia/vrc4171_card.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/pcmcia/vrc4171_card.c 2004-01-19 16:54:58.000000000 +0100 +@@ -0,0 +1,886 @@ ++/* ++ * vrc4171_card.c, NEC VRC4171 Card Controller driver for Socket Services. ++ * ++ * Copyright (C) 2003 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/init.h> ++#include <linux/ioport.h> ++#include <linux/irq.h> ++#include <linux/module.h> ++#include <linux/spinlock.h> ++#include <linux/sched.h> ++#include <linux/types.h> ++ ++#include <asm/io.h> ++#include <asm/vr41xx/vrc4171.h> ++ ++#include <pcmcia/ss.h> ++ ++#include "i82365.h" ++ ++MODULE_DESCRIPTION("NEC VRC4171 Card Controllers driver for Socket Services"); ++MODULE_AUTHOR("Yoichi Yuasa <yuasa@hh.iij4u.or.jp>"); ++MODULE_LICENSE("GPL"); ++ ++#define CARD_MAX_SLOTS 2 ++#define CARD_SLOTA 0 ++#define CARD_SLOTB 1 ++#define CARD_SLOTB_OFFSET 0x40 ++ ++#define CARD_MEM_START 0x10000000 ++#define CARD_MEM_END 0x13ffffff ++#define CARD_MAX_MEM_OFFSET 0x3ffffff ++#define CARD_MAX_MEM_SPEED 1000 ++ ++#define CARD_CONTROLLER_INDEX 0x03e0 ++#define CARD_CONTROLLER_DATA 0x03e1 ++#define CARD_CONTROLLER_SIZE 2 ++ /* Power register */ ++ #define VPP_GET_VCC 0x01 ++ #define POWER_ENABLE 0x10 ++ #define CARD_VOLTAGE_SENSE 0x1f ++ #define VCC_3VORXV_CAPABLE 0x00 ++ #define VCC_XV_ONLY 0x01 ++ #define VCC_3V_CAPABLE 0x02 ++ #define VCC_5V_ONLY 0x03 ++ #define CARD_VOLTAGE_SELECT 0x2f ++ #define VCC_3V 0x01 ++ #define VCC_5V 0x00 ++ #define VCC_XV 0x02 ++ #define VCC_STATUS_3V 0x02 ++ #define VCC_STATUS_5V 0x01 ++ #define VCC_STATUS_XV 0x03 ++ #define GLOBAL_CONTROL 0x1e ++ #define EXWRBK 0x04 ++ #define IRQPM_EN 0x08 ++ #define CLRPMIRQ 0x10 ++ ++#define IO_MAX_MAPS 2 ++#define MEM_MAX_MAPS 5 ++ ++enum { ++ SLOTB_PROBE = 0, ++ SLOTB_NOPROBE_IO, ++ SLOTB_NOPROBE_MEM, ++ SLOTB_NOPROBE_ALL ++}; ++ ++typedef struct vrc4171_socket { ++ int noprobe; ++ void (*handler)(void *, unsigned int); ++ void *info; ++ socket_cap_t cap; ++ spinlock_t event_lock; ++ uint16_t events; ++ struct socket_info_t *pcmcia_socket; ++ struct tq_struct tq_task; ++ char name[24]; ++ int csc_irq; ++ int io_irq; ++} vrc4171_socket_t; ++ ++static vrc4171_socket_t vrc4171_sockets[CARD_MAX_SLOTS]; ++static int vrc4171_slotb = SLOTB_IS_NONE; ++static unsigned int vrc4171_irq; ++static uint16_t vrc4171_irq_mask = 0xdeb8; ++ ++extern struct socket_info_t *pcmcia_register_socket(int slot, ++ struct pccard_operations *vtable, ++ int use_bus_pm); ++extern void pcmcia_unregister_socket(struct socket_info_t *s); ++ ++static inline uint8_t exca_read_byte(int slot, uint8_t index) ++{ ++ if (slot == CARD_SLOTB) ++ index += CARD_SLOTB_OFFSET; ++ ++ outb(index, CARD_CONTROLLER_INDEX); ++ return inb(CARD_CONTROLLER_DATA); ++} ++ ++static inline uint16_t exca_read_word(int slot, uint8_t index) ++{ ++ uint16_t data; ++ ++ if (slot == CARD_SLOTB) ++ index += CARD_SLOTB_OFFSET; ++ ++ outb(index++, CARD_CONTROLLER_INDEX); ++ data = inb(CARD_CONTROLLER_DATA); ++ ++ outb(index, CARD_CONTROLLER_INDEX); ++ data |= ((uint16_t)inb(CARD_CONTROLLER_DATA)) << 8; ++ ++ return data; ++} ++ ++static inline uint8_t exca_write_byte(int slot, uint8_t index, uint8_t data) ++{ ++ if (slot == CARD_SLOTB) ++ index += CARD_SLOTB_OFFSET; ++ ++ outb(index, CARD_CONTROLLER_INDEX); ++ outb(data, CARD_CONTROLLER_DATA); ++ ++ return data; ++} ++ ++static inline uint16_t exca_write_word(int slot, uint8_t index, uint16_t data) ++{ ++ if (slot == CARD_SLOTB) ++ index += CARD_SLOTB_OFFSET; ++ ++ outb(index++, CARD_CONTROLLER_INDEX); ++ outb(data, CARD_CONTROLLER_DATA); ++ ++ outb(index, CARD_CONTROLLER_INDEX); ++ outb((uint8_t)(data >> 8), CARD_CONTROLLER_DATA); ++ ++ return data; ++} ++ ++static inline int search_nonuse_irq(void) ++{ ++ int i; ++ ++ for (i = 0; i < 16; i++) { ++ if (vrc4171_irq_mask & (1 << i)) { ++ vrc4171_irq_mask &= ~(1 << i); ++ return i; ++ } ++ } ++ ++ return -1; ++} ++ ++static int pccard_init(unsigned int slot) ++{ ++ vrc4171_socket_t *socket = &vrc4171_sockets[slot]; ++ ++ socket->cap.features |= SS_CAP_PCCARD | SS_CAP_PAGE_REGS; ++ socket->cap.irq_mask = 0; ++ socket->cap.pci_irq = vrc4171_irq; ++ socket->cap.map_size = 0x1000; ++ socket->events = 0; ++ spin_lock_init(socket->event_lock); ++ socket->csc_irq = search_nonuse_irq(); ++ socket->io_irq = search_nonuse_irq(); ++ ++ return 0; ++} ++ ++static int pccard_suspend(unsigned int slot) ++{ ++ return -EINVAL; ++} ++ ++static int pccard_register_callback(unsigned int slot, ++ void (*handler)(void *, unsigned int), ++ void *info) ++{ ++ vrc4171_socket_t *socket; ++ ++ if (slot >= CARD_MAX_SLOTS) ++ return -EINVAL; ++ ++ socket = &vrc4171_sockets[slot]; ++ ++ socket->handler = handler; ++ socket->info = info; ++ ++ if (handler) ++ MOD_INC_USE_COUNT; ++ else ++ MOD_DEC_USE_COUNT; ++ ++ return 0; ++} ++ ++static int pccard_inquire_socket(unsigned int slot, socket_cap_t *cap) ++{ ++ vrc4171_socket_t *socket; ++ ++ if (slot >= CARD_MAX_SLOTS || cap == NULL) ++ return -EINVAL; ++ ++ socket = &vrc4171_sockets[slot]; ++ ++ *cap = socket->cap; ++ ++ return 0; ++} ++ ++static int pccard_get_status(unsigned int slot, u_int *value) ++{ ++ uint8_t status, sense; ++ u_int val = 0; ++ ++ if (slot >= CARD_MAX_SLOTS || value == NULL) ++ return -EINVAL; ++ ++ status = exca_read_byte(slot, I365_STATUS); ++ if (exca_read_byte(slot, I365_INTCTL) & I365_PC_IOCARD) { ++ if (status & I365_CS_STSCHG) ++ val |= SS_STSCHG; ++ } else { ++ if (!(status & I365_CS_BVD1)) ++ val |= SS_BATDEAD; ++ else if ((status & (I365_CS_BVD1 | I365_CS_BVD2)) == I365_CS_BVD1) ++ val |= SS_BATWARN; ++ } ++ if ((status & I365_CS_DETECT) == I365_CS_DETECT) ++ val |= SS_DETECT; ++ if (status & I365_CS_WRPROT) ++ val |= SS_WRPROT; ++ if (status & I365_CS_READY) ++ val |= SS_READY; ++ if (status & I365_CS_POWERON) ++ val |= SS_POWERON; ++ ++ sense = exca_read_byte(slot, CARD_VOLTAGE_SENSE); ++ switch (sense) { ++ case VCC_3VORXV_CAPABLE: ++ val |= SS_3VCARD | SS_XVCARD; ++ break; ++ case VCC_XV_ONLY: ++ val |= SS_XVCARD; ++ break; ++ case VCC_3V_CAPABLE: ++ val |= SS_3VCARD; ++ break; ++ default: ++ /* 5V only */ ++ break; ++ } ++ ++ *value = val; ++ ++ return 0; ++} ++ ++static inline u_char get_Vcc_value(uint8_t voltage) ++{ ++ switch (voltage) { ++ case VCC_STATUS_3V: ++ return 33; ++ case VCC_STATUS_5V: ++ return 50; ++ default: ++ break; ++ } ++ ++ return 0; ++} ++ ++static inline u_char get_Vpp_value(uint8_t power, u_char Vcc) ++{ ++ if ((power & 0x03) == 0x01 || (power & 0x03) == 0x02) ++ return Vcc; ++ ++ return 0; ++} ++ ++static int pccard_get_socket(unsigned int slot, socket_state_t *state) ++{ ++ vrc4171_socket_t *socket; ++ uint8_t power, voltage, control, cscint; ++ ++ if (slot >= CARD_MAX_SLOTS || state == NULL) ++ return -EINVAL; ++ ++ socket = &vrc4171_sockets[slot]; ++ ++ power = exca_read_byte(slot, I365_POWER); ++ voltage = exca_read_byte(slot, CARD_VOLTAGE_SELECT); ++ ++ state->Vcc = get_Vcc_value(voltage); ++ state->Vpp = get_Vpp_value(power, state->Vcc); ++ ++ state->flags = 0; ++ if (power & POWER_ENABLE) ++ state->flags |= SS_PWR_AUTO; ++ if (power & I365_PWR_OUT) ++ state->flags |= SS_OUTPUT_ENA; ++ ++ control = exca_read_byte(slot, I365_INTCTL); ++ if (control & I365_PC_IOCARD) ++ state->flags |= SS_IOCARD; ++ if (!(control & I365_PC_RESET)) ++ state->flags |= SS_RESET; ++ ++ cscint = exca_read_byte(slot, I365_CSCINT); ++ state->csc_mask = 0; ++ if (state->flags & SS_IOCARD) { ++ if (cscint & I365_CSC_STSCHG) ++ state->flags |= SS_STSCHG; ++ } else { ++ if (cscint & I365_CSC_BVD1) ++ state->csc_mask |= SS_BATDEAD; ++ if (cscint & I365_CSC_BVD2) ++ state->csc_mask |= SS_BATWARN; ++ } ++ if (cscint & I365_CSC_READY) ++ state->csc_mask |= SS_READY; ++ if (cscint & I365_CSC_DETECT) ++ state->csc_mask |= SS_DETECT; ++ ++ return 0; ++} ++ ++static inline uint8_t set_Vcc_value(u_char Vcc) ++{ ++ switch (Vcc) { ++ case 33: ++ return VCC_3V; ++ case 50: ++ return VCC_5V; ++ } ++ ++ /* Small voltage is chosen for safety. */ ++ return VCC_3V; ++} ++ ++static int pccard_set_socket(unsigned int slot, socket_state_t *state) ++{ ++ vrc4171_socket_t *socket; ++ uint8_t voltage, power, control, cscint; ++ ++ if (slot >= CARD_MAX_SLOTS || ++ (state->Vpp != state->Vcc && state->Vpp != 0) || ++ (state->Vcc != 50 && state->Vcc != 33 && state->Vcc != 0)) ++ return -EINVAL; ++ ++ socket = &vrc4171_sockets[slot]; ++ ++ spin_lock_irq(&socket->event_lock); ++ ++ voltage = set_Vcc_value(state->Vcc); ++ exca_write_byte(slot, CARD_VOLTAGE_SELECT, voltage); ++ ++ power = POWER_ENABLE; ++ if (state->Vpp == state->Vcc) ++ power |= VPP_GET_VCC; ++ if (state->flags & SS_OUTPUT_ENA) ++ power |= I365_PWR_OUT; ++ exca_write_byte(slot, I365_POWER, power); ++ ++ control = 0; ++ if (state->io_irq != 0) ++ control |= socket->io_irq; ++ if (state->flags & SS_IOCARD) ++ control |= I365_PC_IOCARD; ++ if (state->flags & SS_RESET) ++ control &= ~I365_PC_RESET; ++ else ++ control |= I365_PC_RESET; ++ exca_write_byte(slot, I365_INTCTL, control); ++ ++ cscint = 0; ++ exca_write_byte(slot, I365_CSCINT, cscint); ++ exca_read_byte(slot, I365_CSC); /* clear CardStatus change */ ++ if (state->csc_mask != 0) ++ cscint |= socket->csc_irq << 8; ++ if (state->flags & SS_IOCARD) { ++ if (state->csc_mask & SS_STSCHG) ++ cscint |= I365_CSC_STSCHG; ++ } else { ++ if (state->csc_mask & SS_BATDEAD) ++ cscint |= I365_CSC_BVD1; ++ if (state->csc_mask & SS_BATWARN) ++ cscint |= I365_CSC_BVD2; ++ } ++ if (state->csc_mask & SS_READY) ++ cscint |= I365_CSC_READY; ++ if (state->csc_mask & SS_DETECT) ++ cscint |= I365_CSC_DETECT; ++ exca_write_byte(slot, I365_CSCINT, cscint); ++ ++ spin_unlock_irq(&socket->event_lock); ++ ++ return 0; ++} ++ ++static int pccard_get_io_map(unsigned int slot, struct pccard_io_map *io) ++{ ++ vrc4171_socket_t *socket; ++ uint8_t ioctl, addrwin; ++ u_char map; ++ ++ if (slot >= CARD_MAX_SLOTS || io == NULL || ++ io->map >= IO_MAX_MAPS) ++ return -EINVAL; ++ ++ socket = &vrc4171_sockets[slot]; ++ map = io->map; ++ ++ io->start = exca_read_word(slot, I365_IO(map)+I365_W_START); ++ io->stop = exca_read_word(slot, I365_IO(map)+I365_W_STOP); ++ ++ ioctl = exca_read_byte(slot, I365_IOCTL); ++ if (io->flags & I365_IOCTL_WAIT(map)) ++ io->speed = 1; ++ else ++ io->speed = 0; ++ ++ io->flags = 0; ++ if (ioctl & I365_IOCTL_16BIT(map)) ++ io->flags |= MAP_16BIT; ++ if (ioctl & I365_IOCTL_IOCS16(map)) ++ io->flags |= MAP_AUTOSZ; ++ if (ioctl & I365_IOCTL_0WS(map)) ++ io->flags |= MAP_0WS; ++ ++ addrwin = exca_read_byte(slot, I365_ADDRWIN); ++ if (addrwin & I365_ENA_IO(map)) ++ io->flags |= MAP_ACTIVE; ++ ++ return 0; ++} ++ ++static int pccard_set_io_map(unsigned int slot, struct pccard_io_map *io) ++{ ++ vrc4171_socket_t *socket; ++ uint8_t ioctl, addrwin; ++ u_char map; ++ ++ if (slot >= CARD_MAX_SLOTS || ++ io == NULL || io->map >= IO_MAX_MAPS || ++ io->start > 0xffff || io->stop > 0xffff || io->start > io->stop) ++ return -EINVAL; ++ ++ socket = &vrc4171_sockets[slot]; ++ map = io->map; ++ ++ addrwin = exca_read_byte(slot, I365_ADDRWIN); ++ if (addrwin & I365_ENA_IO(map)) { ++ addrwin &= ~I365_ENA_IO(map); ++ exca_write_byte(slot, I365_ADDRWIN, addrwin); ++ } ++ ++ exca_write_word(slot, I365_IO(map)+I365_W_START, io->start); ++ exca_write_word(slot, I365_IO(map)+I365_W_STOP, io->stop); ++ ++ ioctl = 0; ++ if (io->speed > 0) ++ ioctl |= I365_IOCTL_WAIT(map); ++ if (io->flags & MAP_16BIT) ++ ioctl |= I365_IOCTL_16BIT(map); ++ if (io->flags & MAP_AUTOSZ) ++ ioctl |= I365_IOCTL_IOCS16(map); ++ if (io->flags & MAP_0WS) ++ ioctl |= I365_IOCTL_0WS(map); ++ exca_write_byte(slot, I365_IOCTL, ioctl); ++ ++ if (io->flags & MAP_ACTIVE) { ++ addrwin |= I365_ENA_IO(map); ++ exca_write_byte(slot, I365_ADDRWIN, addrwin); ++ } ++ ++ return 0; ++} ++ ++static int pccard_get_mem_map(unsigned int slot, struct pccard_mem_map *mem) ++{ ++ vrc4171_socket_t *socket; ++ uint8_t addrwin; ++ u_long start, stop; ++ u_int offset; ++ u_char map; ++ ++ if (slot >= CARD_MAX_SLOTS || mem == NULL || mem->map >= MEM_MAX_MAPS) ++ return -EINVAL; ++ ++ socket = &vrc4171_sockets[slot]; ++ map = mem->map; ++ ++ mem->flags = 0; ++ mem->speed = 0; ++ ++ addrwin = exca_read_byte(slot, I365_ADDRWIN); ++ if (addrwin & I365_ENA_MEM(map)) ++ mem->flags |= MAP_ACTIVE; ++ ++ start = exca_read_word(slot, I365_MEM(map)+I365_W_START); ++ if (start & I365_MEM_16BIT) ++ mem->flags |= MAP_16BIT; ++ mem->sys_start = (start & 0x3fffUL) << 12; ++ ++ stop = exca_read_word(slot, I365_MEM(map)+I365_W_STOP); ++ if (start & I365_MEM_WS0) ++ mem->speed += 1; ++ if (start & I365_MEM_WS1) ++ mem->speed += 2; ++ mem->sys_stop = ((stop & 0x3fffUL) << 12) + 0xfffUL; ++ ++ offset = exca_read_word(slot, I365_MEM(map)+I365_W_OFF); ++ if (offset & I365_MEM_REG) ++ mem->flags |= MAP_ATTRIB; ++ if (offset & I365_MEM_WRPROT) ++ mem->flags |= MAP_WRPROT; ++ mem->card_start = (offset & 0x3fffUL) << 12; ++ ++ mem->sys_start += CARD_MEM_START; ++ mem->sys_stop += CARD_MEM_START; ++ ++ return 0; ++} ++ ++static int pccard_set_mem_map(unsigned int slot, struct pccard_mem_map *mem) ++{ ++ vrc4171_socket_t *socket; ++ uint16_t start, stop, offset; ++ uint8_t addrwin; ++ u_char map; ++ ++ if (slot >= CARD_MAX_SLOTS || ++ mem == NULL || mem->map >= MEM_MAX_MAPS || ++ mem->sys_start < CARD_MEM_START || mem->sys_start > CARD_MEM_END || ++ mem->sys_stop < CARD_MEM_START || mem->sys_stop > CARD_MEM_END || ++ mem->sys_start > mem->sys_stop || ++ mem->card_start > CARD_MAX_MEM_OFFSET || ++ mem->speed > CARD_MAX_MEM_SPEED) ++ return -EINVAL; ++ ++ socket = &vrc4171_sockets[slot]; ++ map = mem->map; ++ ++ addrwin = exca_read_byte(slot, I365_ADDRWIN); ++ if (addrwin & I365_ENA_MEM(map)) { ++ addrwin &= ~I365_ENA_MEM(map); ++ exca_write_byte(slot, I365_ADDRWIN, addrwin); ++ } ++ ++ start = (mem->sys_start >> 12) & 0x3fff; ++ if (mem->flags & MAP_16BIT) ++ start |= I365_MEM_16BIT; ++ exca_write_word(slot, I365_MEM(map)+I365_W_START, start); ++ ++ stop = (mem->sys_stop >> 12) & 0x3fff; ++ switch (mem->speed) { ++ case 0: ++ break; ++ case 1: ++ stop |= I365_MEM_WS0; ++ break; ++ case 2: ++ stop |= I365_MEM_WS1; ++ break; ++ default: ++ stop |= I365_MEM_WS0 | I365_MEM_WS1; ++ break; ++ } ++ exca_write_word(slot, I365_MEM(map)+I365_W_STOP, stop); ++ ++ offset = (mem->card_start >> 12) & 0x3fff; ++ if (mem->flags & MAP_ATTRIB) ++ offset |= I365_MEM_REG; ++ if (mem->flags & MAP_WRPROT) ++ offset |= I365_MEM_WRPROT; ++ exca_write_word(slot, I365_MEM(map)+I365_W_OFF, offset); ++ ++ if (mem->flags & MAP_ACTIVE) { ++ addrwin |= I365_ENA_MEM(map); ++ exca_write_byte(slot, I365_ADDRWIN, addrwin); ++ } ++ ++ return 0; ++} ++ ++static void pccard_proc_setup(unsigned int slot, struct proc_dir_entry *base) ++{ ++} ++ ++static struct pccard_operations vrc4171_pccard_operations = { ++ .init = pccard_init, ++ .suspend = pccard_suspend, ++ .register_callback = pccard_register_callback, ++ .inquire_socket = pccard_inquire_socket, ++ .get_status = pccard_get_status, ++ .get_socket = pccard_get_socket, ++ .set_socket = pccard_set_socket, ++ .get_io_map = pccard_get_io_map, ++ .set_io_map = pccard_set_io_map, ++ .get_mem_map = pccard_get_mem_map, ++ .set_mem_map = pccard_set_mem_map, ++ .proc_setup = pccard_proc_setup, ++}; ++ ++static void pccard_bh(void *data) ++{ ++ vrc4171_socket_t *socket = (vrc4171_socket_t *)data; ++ uint16_t events; ++ ++ spin_lock_irq(&socket->event_lock); ++ events = socket->events; ++ socket->events = 0; ++ spin_unlock_irq(&socket->event_lock); ++ ++ if (socket->handler) ++ socket->handler(socket->info, events); ++} ++ ++static inline uint16_t get_events(int slot) ++{ ++ uint16_t events = 0; ++ uint8_t status, csc; ++ ++ status = exca_read_byte(slot, I365_STATUS); ++ csc = exca_read_byte(slot, I365_CSC); ++ ++ if (exca_read_byte(slot, I365_INTCTL) & I365_PC_IOCARD) { ++ if ((csc & I365_CSC_STSCHG) && (status & I365_CS_STSCHG)) ++ events |= SS_STSCHG; ++ } else { ++ if (csc & (I365_CSC_BVD1 | I365_CSC_BVD2)) { ++ if (!(status & I365_CS_BVD1)) ++ events |= SS_BATDEAD; ++ else if ((status & (I365_CS_BVD1 | I365_CS_BVD2)) == I365_CS_BVD1) ++ events |= SS_BATWARN; ++ } ++ } ++ if ((csc & I365_CSC_READY) && (status & I365_CS_READY)) ++ events |= SS_READY; ++ if ((csc & I365_CSC_DETECT) && ((status & I365_CS_DETECT) == I365_CS_DETECT)) ++ events |= SS_DETECT; ++ ++ return events; ++} ++ ++static void pccard_status_change(int slot, vrc4171_socket_t *socket) ++{ ++ uint16_t events; ++ ++ socket->tq_task.routine = pccard_bh; ++ socket->tq_task.data = socket; ++ ++ events = get_events(slot); ++ if (events) { ++ spin_lock(&socket->event_lock); ++ socket->events |= events; ++ spin_unlock(&socket->event_lock); ++ schedule_task(&socket->tq_task); ++ } ++} ++ ++static void pccard_interrupt(int irq, void *dev_id, struct pt_regs *regs) ++{ ++ vrc4171_socket_t *socket; ++ uint16_t status; ++ ++ status = vrc4171_get_irq_status(); ++ if (status & IRQ_A) { ++ socket = &vrc4171_sockets[CARD_SLOTA]; ++ if (socket->noprobe == SLOTB_PROBE) { ++ if (status & (1 << socket->csc_irq)) ++ pccard_status_change(CARD_SLOTA, socket); ++ } ++ } ++ ++ if (status & IRQ_B) { ++ socket = &vrc4171_sockets[CARD_SLOTB]; ++ if (socket->noprobe == SLOTB_PROBE) { ++ if (status & (1 << socket->csc_irq)) ++ pccard_status_change(CARD_SLOTB, socket); ++ } ++ } ++} ++ ++static inline void reserve_using_irq(int slot) ++{ ++ unsigned int irq; ++ ++ irq = exca_read_byte(slot, I365_INTCTL); ++ irq &= 0x0f; ++ vrc4171_irq_mask &= ~(1 << irq); ++ ++ irq = exca_read_byte(slot, I365_CSCINT); ++ irq = (irq & 0xf0) >> 4; ++ vrc4171_irq_mask &= ~(1 << irq); ++} ++ ++static int __devinit vrc4171_add_socket(int slot) ++{ ++ vrc4171_socket_t *socket; ++ ++ if (slot >= CARD_MAX_SLOTS) ++ return -EINVAL; ++ ++ socket = &vrc4171_sockets[slot]; ++ if (socket->noprobe != SLOTB_PROBE) { ++ uint8_t addrwin; ++ ++ switch (socket->noprobe) { ++ case SLOTB_NOPROBE_MEM: ++ addrwin = exca_read_byte(slot, I365_ADDRWIN); ++ addrwin &= 0x1f; ++ exca_write_byte(slot, I365_ADDRWIN, addrwin); ++ break; ++ case SLOTB_NOPROBE_IO: ++ addrwin = exca_read_byte(slot, I365_ADDRWIN); ++ addrwin &= 0xc0; ++ exca_write_byte(slot, I365_ADDRWIN, addrwin); ++ break; ++ default: ++ break; ++ } ++ ++ reserve_using_irq(slot); ++ ++ return 0; ++ } ++ ++ sprintf(socket->name, "NEC VRC4171 Card Slot %1c", 'A' + slot); ++ ++ socket->pcmcia_socket = pcmcia_register_socket(slot, &vrc4171_pccard_operations, 1); ++ if (socket->pcmcia_socket == NULL) ++ return -ENOMEM; ++ ++ exca_write_byte(slot, I365_ADDRWIN, 0); ++ ++ exca_write_byte(slot, GLOBAL_CONTROL, 0); ++ ++ return 0; ++} ++ ++static void vrc4171_remove_socket(int slot) ++{ ++ vrc4171_socket_t *socket; ++ ++ if (slot >= CARD_MAX_SLOTS) ++ return; ++ ++ socket = &vrc4171_sockets[slot]; ++ ++ if (socket->pcmcia_socket != NULL) { ++ pcmcia_unregister_socket(socket->pcmcia_socket); ++ socket->pcmcia_socket = NULL; ++ } ++} ++ ++static int __devinit vrc4171_card_setup(char *options) ++{ ++ if (options == NULL || *options == '\0') ++ return 0; ++ ++ if (strncmp(options, "irq:", 4) == 0) { ++ int irq; ++ options += 4; ++ irq = simple_strtoul(options, &options, 0); ++ if (irq >= 0 && irq < NR_IRQS) ++ vrc4171_irq = irq; ++ ++ if (*options != ',') ++ return 0; ++ options++; ++ } ++ ++ if (strncmp(options, "slota:", 6) == 0) { ++ options += 6; ++ if (*options != '\0') { ++ if (strncmp(options, "noprobe", 7) == 0) { ++ vrc4171_sockets[CARD_SLOTA].noprobe = 1; ++ options += 7; ++ } ++ ++ if (*options != ',') ++ return 0; ++ options++; ++ } else ++ return 0; ++ ++ } ++ ++ if (strncmp(options, "slotb:", 6) == 0) { ++ options += 6; ++ if (*options != '\0') { ++ if (strncmp(options, "pccard", 6) == 0) { ++ vrc4171_slotb = SLOTB_IS_PCCARD; ++ options += 6; ++ } else if (strncmp(options, "cf", 2) == 0) { ++ vrc4171_slotb = SLOTB_IS_CF; ++ options += 2; ++ } else if (strncmp(options, "flashrom", 8) == 0) { ++ vrc4171_slotb = SLOTB_IS_FLASHROM; ++ options += 8; ++ } else if (strncmp(options, "none", 4) == 0) { ++ vrc4171_slotb = SLOTB_IS_NONE; ++ options += 4; ++ } ++ ++ if (*options != ',') ++ return 0; ++ options++; ++ ++ if ( strncmp(options, "memnoprobe", 10) == 0) ++ vrc4171_sockets[CARD_SLOTB].noprobe = SLOTB_NOPROBE_MEM; ++ if ( strncmp(options, "ionoprobe", 9) == 0) ++ vrc4171_sockets[CARD_SLOTB].noprobe = SLOTB_NOPROBE_IO; ++ if ( strncmp(options, "noprobe", 7) == 0) ++ vrc4171_sockets[CARD_SLOTB].noprobe = SLOTB_NOPROBE_ALL; ++ } ++ } ++ ++ return 0; ++} ++ ++__setup("vrc4171_card=", vrc4171_card_setup); ++ ++static int __devinit vrc4171_card_init(void) ++{ ++ int retval, slot; ++ ++ vrc4171_set_multifunction_pin(vrc4171_slotb); ++ ++ if (request_region(CARD_CONTROLLER_INDEX, CARD_CONTROLLER_SIZE, ++ "NEC VRC4171 Card Controller") == NULL) ++ return -EBUSY; ++ ++ for (slot = 0; slot < CARD_MAX_SLOTS; slot++) { ++ if (slot == CARD_SLOTB && vrc4171_slotb == SLOTB_IS_NONE) ++ break; ++ ++ retval = vrc4171_add_socket(slot); ++ if (retval != 0) ++ return retval; ++ } ++ ++ retval = request_irq(vrc4171_irq, pccard_interrupt, SA_SHIRQ, ++ "NEC VRC4171 Card Controller", vrc4171_sockets); ++ if (retval < 0) { ++ for (slot = 0; slot < CARD_MAX_SLOTS; slot++) ++ vrc4171_remove_socket(slot); ++ ++ return retval; ++ } ++ ++ printk(KERN_INFO "NEC VRC4171 Card Controller, connected to IRQ %d\n", vrc4171_irq); ++ ++ return 0; ++} ++ ++static void __devexit vrc4171_card_exit(void) ++{ ++ int slot; ++ ++ for (slot = 0; slot < CARD_MAX_SLOTS; slot++) ++ vrc4171_remove_socket(slot); ++ ++ release_region(CARD_CONTROLLER_INDEX, CARD_CONTROLLER_SIZE); ++} ++ ++module_init(vrc4171_card_init); ++module_exit(vrc4171_card_exit); +diff -Nur linux-2.4.30/drivers/scsi/NCR53C9x.h linux-2.4.30-mips/drivers/scsi/NCR53C9x.h +--- linux-2.4.30/drivers/scsi/NCR53C9x.h 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/scsi/NCR53C9x.h 2003-12-15 19:19:51.000000000 +0100 +@@ -144,12 +144,7 @@ + + #ifndef MULTIPLE_PAD_SIZES + +-#ifdef CONFIG_CPU_HAS_WB +-#include <asm/wbflush.h> +-#define esp_write(__reg, __val) do{(__reg) = (__val); wbflush();} while(0) +-#else +-#define esp_write(__reg, __val) ((__reg) = (__val)) +-#endif ++#define esp_write(__reg, __val) do{(__reg) = (__val); iob();} while(0) + #define esp_read(__reg) (__reg) + + struct ESP_regs { +diff -Nur linux-2.4.30/drivers/sound/au1550_i2s.c linux-2.4.30-mips/drivers/sound/au1550_i2s.c +--- linux-2.4.30/drivers/sound/au1550_i2s.c 2005-01-19 15:10:04.000000000 +0100 ++++ linux-2.4.30-mips/drivers/sound/au1550_i2s.c 2005-02-08 08:07:50.000000000 +0100 +@@ -41,6 +41,7 @@ + * 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ ++ + #include <linux/version.h> + #include <linux/module.h> + #include <linux/string.h> +@@ -62,7 +63,45 @@ + #include <asm/uaccess.h> + #include <asm/hardirq.h> + #include <asm/au1000.h> ++ ++#if defined(CONFIG_SOC_AU1550) + #include <asm/pb1550.h> ++#endif ++ ++#if defined(CONFIG_MIPS_PB1200) ++#define WM8731 ++#define WM_MODE_USB ++#include <asm/pb1200.h> ++#endif ++ ++#if defined(CONFIG_MIPS_FICMMP) ++#define WM8721 ++#define WM_MODE_NORMAL ++#include <asm/ficmmp.h> ++#endif ++ ++ ++#define WM_VOLUME_MIN 47 ++#define WM_VOLUME_SCALE 80 ++ ++#if defined(WM8731) ++ /* OSS interface to the wm i2s.. */ ++ #define CODEC_NAME "Wolfson WM8731 I2S" ++ #define WM_I2S_STEREO_MASK (SOUND_MASK_PCM | SOUND_MASK_LINE) ++ #define WM_I2S_SUPPORTED_MASK (WM_I2S_STEREO_MASK | SOUND_MASK_MIC) ++ #define WM_I2S_RECORD_MASK (SOUND_MASK_MIC | SOUND_MASK_LINE1 | SOUND_MASK_LINE) ++#elif defined(WM8721) ++ #define CODEC_NAME "Wolfson WM8721 I2S" ++ #define WM_I2S_STEREO_MASK (SOUND_MASK_PCM) ++ #define WM_I2S_SUPPORTED_MASK (WM_I2S_STEREO_MASK) ++ #define WM_I2S_RECORD_MASK (0) ++#endif ++ ++ ++#define supported_mixer(FOO) ((FOO >= 0) && \ ++ (FOO < SOUND_MIXER_NRDEVICES) && \ ++ WM_I2S_SUPPORTED_MASK & (1<<FOO) ) ++ + #include <asm/au1xxx_psc.h> + #include <asm/au1xxx_dbdma.h> + +@@ -98,13 +137,51 @@ + * 0 = no VRA, 1 = use VRA if codec supports it + * The framework is here, but we currently force no VRA. + */ ++#if defined(CONFIG_MIPS_PB1200) | defined(CONFIG_MIPS_PB1550) + static int vra = 0; ++#elif defined(CONFIG_MIPS_FICMMP) ++static int vra = 1; ++#endif ++ ++#define WM_REG_L_HEADPHONE_OUT 0x02 ++#define WM_REG_R_HEADPHONE_OUT 0x03 ++#define WM_REG_ANALOGUE_AUDIO_PATH_CTRL 0x04 ++#define WM_REG_DIGITAL_AUDIO_PATH_CTRL 0x05 ++#define WM_REG_POWER_DOWN_CTRL 0x06 ++#define WM_REG_DIGITAL_AUDIO_IF 0x07 ++#define WM_REG_SAMPLING_CONTROL 0x08 ++#define WM_REG_ACTIVE_CTRL 0x09 ++#define WM_REG_RESET 0x0F ++#define WM_SC_SR_96000 (0x7<<2) ++#define WM_SC_SR_88200 (0xF<<2) ++#define WM_SC_SR_48000 (0x0<<2) ++#define WM_SC_SR_44100 (0x8<<2) ++#define WM_SC_SR_32000 (0x6<<2) ++#define WM_SC_SR_8018 (0x9<<2) ++#define WM_SC_SR_8000 (0x1<<2) ++#define WM_SC_MODE_USB 1 ++#define WM_SC_MODE_NORMAL 0 ++#define WM_SC_BOSR_250FS (0<<1) ++#define WM_SC_BOSR_272FS (1<<1) ++#define WM_SC_BOSR_256FS (0<<1) ++#define WM_SC_BOSR_128FS (0<<1) ++#define WM_SC_BOSR_384FS (1<<1) ++#define WM_SC_BOSR_192FS (1<<1) ++ ++#define WS_64FS 31 ++#define WS_96FS 47 ++#define WS_128FS 63 ++#define WS_192FS 95 ++ ++#define MIN_Q_COUNT 2 ++ + MODULE_PARM(vra, "i"); + MODULE_PARM_DESC(vra, "if 1 use VRA if codec supports it"); + + static struct au1550_state { + /* soundcore stuff */ + int dev_audio; ++ int dev_mixer; + + spinlock_t lock; + struct semaphore open_sem; +@@ -114,6 +191,11 @@ + int no_vra; + volatile psc_i2s_t *psc_addr; + ++ int level_line; ++ int level_mic; ++ int level_left; ++ int level_right; ++ + struct dmabuf { + u32 dmanr; + unsigned sample_rate; +@@ -195,60 +277,224 @@ + } + } + +-/* Just a place holder. The Wolfson codec is a write only device, +- * so we would have to keep a local copy of the data. +- */ +-#if 0 +-static u8 +-rdcodec(u8 addr) +-{ +- return 0 /* data */; +-} +-#endif +- +- + static void +-wrcodec(u8 ctlreg, u8 val) ++wrcodec(u8 ctlreg, u16 val) + { + int rcnt; + extern int pb1550_wm_codec_write(u8 addr, u8 reg, u8 val); +- + /* The codec is a write only device, with a 16-bit control/data + * word. Although it is written as two bytes on the I2C, the + * format is actually 7 bits of register and 9 bits of data. + * The ls bit of the first byte is the ms bit of the data. + */ + rcnt = 0; +- while ((pb1550_wm_codec_write((0x36 >> 1), ctlreg, val) != 1) +- && (rcnt < 50)) { ++ while ((pb1550_wm_codec_write((0x36 >> 1), ++ (ctlreg << 1) | ((val >> 8) & 0x01), ++ (u8) (val & 0x00FF)) != 1) && ++ (rcnt < 50)) { + rcnt++; +-#if 0 +- printk("Codec write retry %02x %02x\n", ctlreg, val); +-#endif + } ++ ++ au1550_delay(10); ++} ++ ++static int ++au1550_open_mixdev(struct inode *inode, struct file *file) ++{ ++ file->private_data = &au1550_state; ++ return 0; ++} ++ ++static int ++au1550_release_mixdev(struct inode *inode, struct file *file) ++{ ++ return 0; ++} ++ ++static int wm_i2s_read_mixer(struct au1550_state *s, int oss_channel) ++{ ++ int ret = 0; ++ ++ if (WM_I2S_STEREO_MASK & (1 << oss_channel)) { ++ /* nice stereo mixers .. */ ++ ++ ret = s->level_left | (s->level_right << 8); ++ } else if (oss_channel == SOUND_MIXER_MIC) { ++ ret = 0; ++ /* TODO: Implement read mixer for input/output codecs */ ++ } ++ ++ return ret; + } + ++static void wm_i2s_write_mixer(struct au1550_state *s, int oss_channel, unsigned int left, unsigned int right) ++{ ++ if (WM_I2S_STEREO_MASK & (1 << oss_channel)) { ++ /* stereo mixers */ ++ s->level_left = left; ++ s->level_right = right; ++ ++ right = (right * WM_VOLUME_SCALE) / 100; ++ left = (left * WM_VOLUME_SCALE) / 100; ++ if (right > WM_VOLUME_SCALE) ++ right = WM_VOLUME_SCALE; ++ if (left > WM_VOLUME_SCALE) ++ left = WM_VOLUME_SCALE; ++ ++ right += WM_VOLUME_MIN; ++ left += WM_VOLUME_MIN; ++ ++ wrcodec(WM_REG_L_HEADPHONE_OUT, left); ++ wrcodec(WM_REG_R_HEADPHONE_OUT, right); ++ ++ }else if (oss_channel == SOUND_MIXER_MIC) { ++ /* TODO: implement write mixer for input/output codecs */ ++ } ++} ++ ++/* a thin wrapper for write_mixer */ ++static void wm_i2s_set_mixer(struct au1550_state *s, unsigned int oss_mixer, unsigned int val ) ++{ ++ unsigned int left,right; ++ ++ /* cleanse input a little */ ++ right = ((val >> 8) & 0xff) ; ++ left = (val & 0xff) ; ++ ++ if (right > 100) right = 100; ++ if (left > 100) left = 100; ++ ++ wm_i2s_write_mixer(s, oss_mixer, left, right); ++} ++ ++static int ++au1550_ioctl_mixdev(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) ++{ ++ struct au1550_state *s = (struct au1550_state *)file->private_data; ++ ++ int i, val = 0; ++ ++ if (cmd == SOUND_MIXER_INFO) { ++ mixer_info info; ++ strncpy(info.id, CODEC_NAME, sizeof(info.id)); ++ strncpy(info.name, CODEC_NAME, sizeof(info.name)); ++ info.modify_counter = 0; ++ if (copy_to_user((void *)arg, &info, sizeof(info))) ++ return -EFAULT; ++ return 0; ++ } ++ if (cmd == SOUND_OLD_MIXER_INFO) { ++ _old_mixer_info info; ++ strncpy(info.id, CODEC_NAME, sizeof(info.id)); ++ strncpy(info.name, CODEC_NAME, sizeof(info.name)); ++ if (copy_to_user((void *)arg, &info, sizeof(info))) ++ return -EFAULT; ++ return 0; ++ } ++ ++ if (_IOC_TYPE(cmd) != 'M' || _SIOC_SIZE(cmd) != sizeof(int)) ++ return -EINVAL; ++ ++ if (cmd == OSS_GETVERSION) ++ return put_user(SOUND_VERSION, (int *)arg); ++ ++ if (_SIOC_DIR(cmd) == _SIOC_READ) { ++ switch (_IOC_NR(cmd)) { ++ case SOUND_MIXER_RECSRC: /* give them the current record src */ ++ val = 0; ++ /* ++ if (!codec->recmask_io) { ++ val = 0; ++ } else { ++ val = codec->recmask_io(codec, 1, 0); ++ }*/ ++ break; ++ ++ case SOUND_MIXER_DEVMASK: /* give them the supported mixers */ ++ val = WM_I2S_SUPPORTED_MASK; ++ break; ++ ++ case SOUND_MIXER_RECMASK: ++ /* Arg contains a bit for each supported recording ++ * source */ ++ val = WM_I2S_RECORD_MASK; ++ break; ++ ++ case SOUND_MIXER_STEREODEVS: ++ /* Mixer channels supporting stereo */ ++ val = WM_I2S_STEREO_MASK; ++ break; ++ ++ case SOUND_MIXER_CAPS: ++ val = SOUND_CAP_EXCL_INPUT; ++ break; ++ ++ default: /* read a specific mixer */ ++ i = _IOC_NR(cmd); ++ ++ if (!supported_mixer(i)) ++ return -EINVAL; ++ ++ val = wm_i2s_read_mixer(s, i); ++ break; ++ } ++ return put_user(val, (int *)arg); ++ } ++ ++ if (_SIOC_DIR(cmd) == (_SIOC_WRITE|_SIOC_READ)) { ++ if (get_user(val, (int *)arg)) ++ return -EFAULT; ++ ++ switch (_IOC_NR(cmd)) { ++ case SOUND_MIXER_RECSRC: ++ /* Arg contains a bit for each recording source */ ++ if (!WM_I2S_RECORD_MASK) ++ return -EINVAL; ++ if (!val) ++ return 0; ++ if (!(val &= WM_I2S_RECORD_MASK)) ++ return -EINVAL; ++ ++ return 0; ++ default: /* write a specific mixer */ ++ i = _IOC_NR(cmd); ++ ++ if (!supported_mixer(i)) ++ return -EINVAL; ++ ++ wm_i2s_set_mixer(s, i, val); ++ ++ return 0; ++ } ++} ++ return -EINVAL; ++} ++ ++static loff_t ++au1550_llseek(struct file *file, loff_t offset, int origin) ++{ ++ return -ESPIPE; ++} ++ ++static /*const */ struct file_operations au1550_mixer_fops = { ++ owner:THIS_MODULE, ++ llseek:au1550_llseek, ++ ioctl:au1550_ioctl_mixdev, ++ open:au1550_open_mixdev, ++ release:au1550_release_mixdev, ++}; ++ + void +-codec_init(void) ++codec_init(struct au1550_state *s) + { +- wrcodec(0x1e, 0x00); /* Reset */ +- au1550_delay(200); +- wrcodec(0x0c, 0x00); /* Power up everything */ +- au1550_delay(10); +- wrcodec(0x12, 0x00); /* Deactivate codec */ +- au1550_delay(10); +- wrcodec(0x08, 0x10); /* Select DAC outputs to line out */ +- au1550_delay(10); +- wrcodec(0x0a, 0x00); /* Disable output mute */ +- au1550_delay(10); +- wrcodec(0x05, 0x70); /* lower output volume on headphone */ +- au1550_delay(10); +- wrcodec(0x0e, 0x02); /* Set slave, 16-bit, I2S modes */ +- au1550_delay(10); +- wrcodec(0x10, 0x01); /* 12MHz (USB), 250fs */ +- au1550_delay(10); +- wrcodec(0x12, 0x01); /* Activate codec */ +- au1550_delay(10); ++ wrcodec(WM_REG_RESET, 0x00); /* Reset */ ++ wrcodec(WM_REG_POWER_DOWN_CTRL, 0x00); /* Power up everything */ ++ wrcodec(WM_REG_ACTIVE_CTRL, 0x00); /* Deactivate codec */ ++ wrcodec(WM_REG_ANALOGUE_AUDIO_PATH_CTRL, 0x10); /* Select DAC outputs to line out */ ++ wrcodec(WM_REG_DIGITAL_AUDIO_PATH_CTRL, 0x00); /* Disable output mute */ ++ wm_i2s_write_mixer(s, SOUND_MIXER_PCM, 74, 74); ++ wrcodec(WM_REG_DIGITAL_AUDIO_IF, 0x02); /* Set slave, 16-bit, I2S modes */ ++ wrcodec(WM_REG_ACTIVE_CTRL, 0x01); /* Activate codec */ + } + + /* stop the ADC before calling */ +@@ -256,27 +502,16 @@ + set_adc_rate(struct au1550_state *s, unsigned rate) + { + struct dmabuf *adc = &s->dma_adc; +- struct dmabuf *dac = &s->dma_dac; + +- if (s->no_vra) { +- /* calc SRC factor +- */ ++ #if defined(WM_MODE_USB) + adc->src_factor = (((SAMP_RATE*2) / rate) + 1) >> 1; + adc->sample_rate = SAMP_RATE / adc->src_factor; + return; +- } ++ #else ++ //TODO: Need code for normal mode ++ #endif + + adc->src_factor = 1; +- +- +-#if 0 +- rate = rate > SAMP_RATE ? SAMP_RATE : rate; +- +- wrcodec(0, 0); /* I don't yet know what to write here if we vra */ +- +- adc->sample_rate = rate; +- dac->sample_rate = rate; +-#endif + } + + /* stop the DAC before calling */ +@@ -284,26 +519,89 @@ + set_dac_rate(struct au1550_state *s, unsigned rate) + { + struct dmabuf *dac = &s->dma_dac; +- struct dmabuf *adc = &s->dma_adc; + +- if (s->no_vra) { +- /* calc SRC factor +- */ +- dac->src_factor = (((SAMP_RATE*2) / rate) + 1) >> 1; +- dac->sample_rate = SAMP_RATE / dac->src_factor; +- return; ++ u16 sr, ws, div, bosr, mode; ++ volatile psc_i2s_t* ip = (volatile psc_i2s_t *)I2S_PSC_BASE; ++ u32 cfg; ++ ++ #if defined(CONFIG_MIPS_FICMMP) ++ rate = ficmmp_set_i2s_sample_rate(rate); ++ #endif ++ ++ switch(rate) ++ { ++ case 96000: ++ sr = WM_SC_SR_96000; ++ ws = WS_64FS; ++ div = PSC_I2SCFG_DIV2; ++ break; ++ case 88200: ++ sr = WM_SC_SR_88200; ++ ws = WS_64FS; ++ div = PSC_I2SCFG_DIV2; ++ break; ++ case 44100: ++ sr = WM_SC_SR_44100; ++ ws = WS_128FS; ++ div = PSC_I2SCFG_DIV2; ++ break; ++ case 48000: ++ sr = WM_SC_SR_48000; ++ ws = WS_128FS; ++ div = PSC_I2SCFG_DIV2; ++ break; ++ case 32000: ++ sr = WM_SC_SR_32000; ++ ws = WS_96FS; ++ div = PSC_I2SCFG_DIV4; ++ break; ++ case 8018: ++ sr = WM_SC_SR_8018; ++ ws = WS_128FS; ++ div = PSC_I2SCFG_DIV2; ++ break; ++ case 8000: ++ default: ++ sr = WM_SC_SR_8000; ++ ws = WS_96FS; ++ div = PSC_I2SCFG_DIV16; ++ break; + } + ++ #if defined(WM_MODE_USB) ++ mode = WM_SC_MODE_USB; ++ #else ++ mode = WM_SC_MODE_NORMAL; ++ #endif ++ ++ bosr = 0; ++ + dac->src_factor = 1; ++ dac->sample_rate = rate; + +-#if 0 +- rate = rate > SAMP_RATE ? SAMP_RATE : rate; ++ /* Deactivate codec */ ++ wrcodec(WM_REG_ACTIVE_CTRL, 0x00); + +- wrcodec(0, 0); /* I don't yet know what to write here if we vra */ ++ /* Disable I2S controller */ ++ ip->psc_i2scfg &= ~PSC_I2SCFG_DE_ENABLE; ++ /* Wait for device disabled */ ++ while ((ip->psc_i2sstat & PSC_I2SSTAT_DR) == 1); ++ ++ cfg = ip->psc_i2scfg; ++ /* Clear WS and DIVIDER values */ ++ cfg &= ~(PSC_I2SCFG_WS_MASK | PSC_I2SCFG_DIV_MASK); ++ cfg |= PSC_I2SCFG_WS(ws) | div; ++ /* Reconfigure and enable */ ++ ip->psc_i2scfg = cfg | PSC_I2SCFG_DE_ENABLE; + +- adc->sample_rate = rate; +- dac->sample_rate = rate; +-#endif ++ /* Wait for device enabled */ ++ while ((ip->psc_i2sstat & PSC_I2SSTAT_DR) == 0); ++ ++ /* Set appropriate sampling rate */ ++ wrcodec(WM_REG_SAMPLING_CONTROL, bosr | mode | sr); ++ ++ /* Activate codec */ ++ wrcodec(WM_REG_ACTIVE_CTRL, 0x01); + } + + static void +@@ -354,8 +652,7 @@ + ip->psc_i2spcr = PSC_I2SPCR_RP; + au_sync(); + +- /* Wait for Receive Busy to show disabled. +- */ ++ /* Wait for Receive Busy to show disabled. */ + do { + stat = ip->psc_i2sstat; + au_sync(); +@@ -463,7 +760,6 @@ + if (db->num_channels == 1) + db->cnt_factor *= 2; + db->cnt_factor *= db->src_factor; +- + db->count = 0; + db->dma_qcount = 0; + db->nextIn = db->nextOut = db->rawbuf; +@@ -546,12 +842,13 @@ + if (i2s_stat & (PSC_I2SSTAT_TF | PSC_I2SSTAT_TR | PSC_I2SSTAT_TF)) + dbg("I2S status = 0x%08x", i2s_stat); + #endif ++ + db->dma_qcount--; + + if (db->count >= db->fragsize) { +- if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, +- db->fragsize) == 0) { +- err("qcount < 2 and no ring room!"); ++ if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, db->fragsize) == 0) ++ { ++ err("qcount < MIN_Q_COUNT and no ring room!"); + } + db->nextOut += db->fragsize; + if (db->nextOut >= db->rawbuf + db->dmasize) +@@ -606,65 +903,43 @@ + + } + +-static loff_t +-au1550_llseek(struct file *file, loff_t offset, int origin) +-{ +- return -ESPIPE; +-} +- +- +-#if 0 +-static int +-au1550_open_mixdev(struct inode *inode, struct file *file) +-{ +- file->private_data = &au1550_state; +- return 0; +-} +- +-static int +-au1550_release_mixdev(struct inode *inode, struct file *file) +-{ +- return 0; +-} +- +-static int +-mixdev_ioctl(struct ac97_codec *codec, unsigned int cmd, +- unsigned long arg) +-{ +- return codec->mixer_ioctl(codec, cmd, arg); +-} +- +-static int +-au1550_ioctl_mixdev(struct inode *inode, struct file *file, +- unsigned int cmd, unsigned long arg) +-{ +- struct au1550_state *s = (struct au1550_state *)file->private_data; +- struct ac97_codec *codec = s->codec; +- +- return mixdev_ioctl(codec, cmd, arg); +-} +- +-static /*const */ struct file_operations au1550_mixer_fops = { +- owner:THIS_MODULE, +- llseek:au1550_llseek, +- ioctl:au1550_ioctl_mixdev, +- open:au1550_open_mixdev, +- release:au1550_release_mixdev, +-}; +-#endif +- + static int + drain_dac(struct au1550_state *s, int nonblock) + { + unsigned long flags; + int count, tmo; + ++ struct dmabuf *db = &s->dma_dac; ++ ++ //DPRINTF(); + if (s->dma_dac.mapped || !s->dma_dac.ready || s->dma_dac.stopped) + return 0; + + for (;;) { + spin_lock_irqsave(&s->lock, flags); +- count = s->dma_dac.count; ++ count = db->count; ++ ++ /* Pad the ddma buffer with zeros if the amount remaining ++ * is not a multiple of fragsize */ ++ if(count % db->fragsize != 0) ++ { ++ int pad = db->fragsize - (count % db->fragsize); ++ char* bufptr = db->nextIn; ++ char* bufend = db->rawbuf + db->dmasize; ++ ++ if((bufend - bufptr) < pad) ++ printk("Error! ddma padding is bigger than available ring space!\n"); ++ else ++ { ++ memset((void*)bufptr, 0, pad); ++ count += pad; ++ db->nextIn += pad; ++ db->count += pad; ++ if (db->dma_qcount == 0) ++ start_dac(s); ++ db->dma_qcount++; ++ } ++ } + spin_unlock_irqrestore(&s->lock, flags); + if (count <= 0) + break; +@@ -672,9 +947,9 @@ + break; + if (nonblock) + return -EBUSY; +- tmo = 1000 * count / (s->no_vra ? +- SAMP_RATE : s->dma_dac.sample_rate); ++ tmo = 1000 * count / s->dma_dac.sample_rate; + tmo /= s->dma_dac.dma_bytes_per_sample; ++ + au1550_delay(tmo); + } + if (signal_pending(current)) +@@ -698,8 +973,7 @@ + * If interpolating (no VRA), duplicate every audio frame src_factor times. + */ + static int +-translate_from_user(struct dmabuf *db, char* dmabuf, char* userbuf, +- int dmacount) ++translate_from_user(struct dmabuf *db, char* dmabuf, char* userbuf, int dmacount) + { + int sample, i; + int interp_bytes_per_sample; +@@ -737,11 +1011,12 @@ + + /* duplicate every audio frame src_factor times + */ +- for (i = 0; i < db->src_factor; i++) ++ for (i = 0; i < db->src_factor; i++) { + memcpy(dmabuf, dmasample, db->dma_bytes_per_sample); ++ dmabuf += interp_bytes_per_sample; ++ } + + userbuf += db->user_bytes_per_sample; +- dmabuf += interp_bytes_per_sample; + } + + return num_samples * interp_bytes_per_sample; +@@ -996,15 +1271,14 @@ + * on the dma queue. If the queue count reaches zero, + * we know the dma has stopped. + */ +- while ((db->dma_qcount < 2) && (db->count >= db->fragsize)) { ++ while ((db->dma_qcount < MIN_Q_COUNT) && (db->count >= db->fragsize)) { + if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, + db->fragsize) == 0) { +- err("qcount < 2 and no ring room!"); ++ err("qcount < MIN_Q_COUNT and no ring room!"); + } + db->nextOut += db->fragsize; + if (db->nextOut >= db->rawbuf + db->dmasize) + db->nextOut -= db->dmasize; +- db->count -= db->fragsize; + db->total_bytes += db->dma_fragsize; + if (db->dma_qcount == 0) + start_dac(s); +@@ -1017,7 +1291,6 @@ + buffer += usercnt; + ret += usercnt; + } /* while (count > 0) */ +- + out: + up(&s->sem); + out2: +@@ -1371,9 +1644,6 @@ + s->dma_dac.cnt_factor; + abinfo.fragstotal = s->dma_dac.numfrag; + abinfo.fragments = abinfo.bytes >> s->dma_dac.fragshift; +-#ifdef AU1000_VERBOSE_DEBUG +- dbg("bytes=%d, fragments=%d", abinfo.bytes, abinfo.fragments); +-#endif + return copy_to_user((void *) arg, &abinfo, + sizeof(abinfo)) ? -EFAULT : 0; + +@@ -1536,13 +1806,9 @@ + case SNDCTL_DSP_SETSYNCRO: + case SOUND_PCM_READ_FILTER: + return -EINVAL; ++ default: break; + } +- +-#if 0 +- return mixdev_ioctl(s->codec, cmd, arg); +-#else + return 0; +-#endif + } + + +@@ -1664,15 +1930,15 @@ + MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com"); + MODULE_DESCRIPTION("Au1550 Audio Driver"); + ++#if defined(WM_MODE_USB) + /* Set up an internal clock for the PSC3. This will then get + * driven out of the Au1550 as the master. + */ + static void + intclk_setup(void) + { +- uint clk, rate, stat; +- +- /* Wire up Freq4 as a clock for the PSC3. ++ uint clk, rate; ++ /* Wire up Freq4 as a clock for the PSC. + * We know SMBus uses Freq3. + * By making changes to this rate, plus the word strobe + * size, we can make fine adjustments to the actual data rate. +@@ -1700,11 +1966,17 @@ + */ + clk = au_readl(SYS_CLKSRC); + au_sync(); ++#if defined(CONFIG_SOC_AU1550) + clk &= ~0x01f00000; + clk |= (6 << 22); ++#elif defined(CONFIG_SOC_AU1200) ++ clk &= ~0x3e000000; ++ clk |= (6 << 27); ++#endif + au_writel(clk, SYS_CLKSRC); + au_sync(); + } ++#endif + + static int __devinit + au1550_probe(void) +@@ -1724,6 +1996,11 @@ + init_MUTEX(&s->open_sem); + spin_lock_init(&s->lock); + ++ /* CPLD Mux for I2s */ ++ ++#if defined(CONFIG_MIPS_PB1200) ++ bcsr->resets |= BCSR_RESETS_PCS1MUX; ++#endif + + s->psc_addr = (volatile psc_i2s_t *)I2S_PSC_BASE; + ip = s->psc_addr; +@@ -1765,9 +2042,8 @@ + + if ((s->dev_audio = register_sound_dsp(&au1550_audio_fops, -1)) < 0) + goto err_dev1; +-#if 0 +- if ((s->codec->dev_mixer = +- register_sound_mixer(&au1550_mixer_fops, -1)) < 0) ++#if 1 ++ if ((s->dev_mixer = register_sound_mixer(&au1550_mixer_fops, -1)) < 0) + goto err_dev2; + #endif + +@@ -1777,7 +2053,6 @@ + proc_au1550_dump, NULL); + #endif /* AU1550_DEBUG */ + +- intclk_setup(); + + /* The GPIO for the appropriate PSC was configured by the + * board specific start up. +@@ -1786,7 +2061,12 @@ + */ + ip->psc_ctrl = PSC_CTRL_DISABLE; /* Disable PSC */ + au_sync(); ++#if defined(WM_MODE_USB) ++ intclk_setup(); + ip->psc_sel = (PSC_SEL_CLK_INTCLK | PSC_SEL_PS_I2SMODE); ++#else ++ ip->psc_sel = (PSC_SEL_CLK_EXTCLK | PSC_SEL_PS_I2SMODE); ++#endif + au_sync(); + + /* Enable PSC +@@ -1806,42 +2086,18 @@ + * Actual I2S mode (first bit delayed by one clock). + * Master mode (We provide the clock from the PSC). + */ +- val = PSC_I2SCFG_SET_LEN(16); +-#ifdef TRY_441KHz +- /* This really should be 250, but it appears that all of the +- * PLLs, dividers and so on in the chain shift it. That's the +- * problem with sourceing the clock instead of letting the very +- * stable codec provide it. But, the PSC doesn't appear to want +- * to work in slave mode, so this is what we get. It's not +- * studio quality timing, but it's good enough for listening +- * to mp3s. +- */ +- val |= PSC_I2SCFG_SET_WS(252); +-#else +- val |= PSC_I2SCFG_SET_WS(250); +-#endif +- val |= PSC_I2SCFG_RT_FIFO8 | PSC_I2SCFG_TT_FIFO8 | \ ++ ++ val = PSC_I2SCFG_SET_LEN(16) | PSC_I2SCFG_WS(WS_128FS) | PSC_I2SCFG_RT_FIFO8 | PSC_I2SCFG_TT_FIFO8 | \ + PSC_I2SCFG_BI | PSC_I2SCFG_XM; + +- ip->psc_i2scfg = val; +- au_sync(); +- val |= PSC_I2SCFG_DE_ENABLE; +- ip->psc_i2scfg = val; +- au_sync(); ++ ip->psc_i2scfg = val | PSC_I2SCFG_DE_ENABLE; + +- /* Wait for Device ready. +- */ +- do { +- val = ip->psc_i2sstat; +- au_sync(); +- } while ((val & PSC_I2SSTAT_DR) == 0); ++ set_dac_rate(s, 8000); //Set default rate + +- val = ip->psc_i2scfg; +- au_sync(); ++ codec_init(s); + +- codec_init(); ++ s->no_vra = vra ? 0 : 1; + +- s->no_vra = 1; + if (s->no_vra) + info("no VRA, interpolating and decimating"); + +@@ -1866,6 +2122,8 @@ + err_dev2: + unregister_sound_dsp(s->dev_audio); + #endif ++ err_dev2: ++ unregister_sound_dsp(s->dev_audio); + err_dev1: + au1xxx_dbdma_chan_free(s->dma_adc.dmanr); + err_dma2: +diff -Nur linux-2.4.30/drivers/sound/au1550_psc.c linux-2.4.30-mips/drivers/sound/au1550_psc.c +--- linux-2.4.30/drivers/sound/au1550_psc.c 2005-01-19 15:10:04.000000000 +0100 ++++ linux-2.4.30-mips/drivers/sound/au1550_psc.c 2005-01-30 09:01:28.000000000 +0100 +@@ -30,6 +30,7 @@ + * 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ ++ + #include <linux/version.h> + #include <linux/module.h> + #include <linux/string.h> +@@ -63,6 +64,14 @@ + #include <asm/db1x00.h> + #endif + ++#ifdef CONFIG_MIPS_PB1200 ++#include <asm/pb1200.h> ++#endif ++ ++#ifdef CONFIG_MIPS_DB1200 ++#include <asm/db1200.h> ++#endif ++ + #undef OSS_DOCUMENTED_MIXER_SEMANTICS + + #define AU1550_MODULE_NAME "Au1550 psc audio" +@@ -521,7 +530,14 @@ + spin_unlock_irqrestore(&s->lock, flags); + } + +- ++/* ++ NOTE: The xmit slots cannot be changed on the fly when in full-duplex ++ because the AC'97 block must be stopped/started. When using this driver ++ in full-duplex (in & out at the same time), the DMA engine will stop if ++ you disable the block. ++ TODO: change implementation to properly restart adc/dac after setting ++ xmit slots. ++*/ + static void + set_xmit_slots(int num_channels) + { +@@ -565,6 +581,14 @@ + } while ((stat & PSC_AC97STAT_DR) == 0); + } + ++/* ++ NOTE: The recv slots cannot be changed on the fly when in full-duplex ++ because the AC'97 block must be stopped/started. When using this driver ++ in full-duplex (in & out at the same time), the DMA engine will stop if ++ you disable the block. ++ TODO: change implementation to properly restart adc/dac after setting ++ recv slots. ++*/ + static void + set_recv_slots(int num_channels) + { +@@ -608,7 +632,6 @@ + + spin_lock_irqsave(&s->lock, flags); + +- set_xmit_slots(db->num_channels); + au_writel(PSC_AC97PCR_TC, PSC_AC97PCR); + au_sync(); + au_writel(PSC_AC97PCR_TS, PSC_AC97PCR); +@@ -640,7 +663,6 @@ + db->nextIn -= db->dmasize; + } + +- set_recv_slots(db->num_channels); + au1xxx_dbdma_start(db->dmanr); + au_writel(PSC_AC97PCR_RC, PSC_AC97PCR); + au_sync(); +@@ -752,12 +774,16 @@ + if (ac97c_stat & (AC97C_XU | AC97C_XO | AC97C_TE)) + dbg("AC97C status = 0x%08x", ac97c_stat); + #endif ++ /* There is a possiblity that we are getting 1 interrupt for ++ multiple descriptors. Use ddma api to find out how many ++ completed. ++ */ + db->dma_qcount--; + + if (db->count >= db->fragsize) { + if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, + db->fragsize) == 0) { +- err("qcount < 2 and no ring room!"); ++ err("qcount < 2 and no ring room1!"); + } + db->nextOut += db->fragsize; + if (db->nextOut >= db->rawbuf + db->dmasize) +@@ -941,11 +967,12 @@ + + /* duplicate every audio frame src_factor times + */ +- for (i = 0; i < db->src_factor; i++) ++ for (i = 0; i < db->src_factor; i++) { + memcpy(dmabuf, dmasample, db->dma_bytes_per_sample); ++ dmabuf += interp_bytes_per_sample; ++ } + + userbuf += db->user_bytes_per_sample; +- dmabuf += interp_bytes_per_sample; + } + + return num_samples * interp_bytes_per_sample; +@@ -1203,7 +1230,7 @@ + while ((db->dma_qcount < 2) && (db->count >= db->fragsize)) { + if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, + db->fragsize) == 0) { +- err("qcount < 2 and no ring room!"); ++ err("qcount < 2 and no ring room!0"); + } + db->nextOut += db->fragsize; + if (db->nextOut >= db->rawbuf + db->dmasize) +@@ -1481,6 +1508,7 @@ + return -EINVAL; + stop_adc(s); + s->dma_adc.num_channels = val; ++ set_recv_slots(val); + if ((ret = prog_dmabuf_adc(s))) + return ret; + } +@@ -1538,6 +1566,7 @@ + } + + s->dma_dac.num_channels = val; ++ set_xmit_slots(val); + if ((ret = prog_dmabuf_dac(s))) + return ret; + } +@@ -1832,10 +1861,8 @@ + down(&s->open_sem); + } + +- stop_dac(s); +- stop_adc(s); +- + if (file->f_mode & FMODE_READ) { ++ stop_adc(s); + s->dma_adc.ossfragshift = s->dma_adc.ossmaxfrags = + s->dma_adc.subdivision = s->dma_adc.total_bytes = 0; + s->dma_adc.num_channels = 1; +@@ -1846,6 +1873,7 @@ + } + + if (file->f_mode & FMODE_WRITE) { ++ stop_dac(s); + s->dma_dac.ossfragshift = s->dma_dac.ossmaxfrags = + s->dma_dac.subdivision = s->dma_dac.total_bytes = 0; + s->dma_dac.num_channels = 1; +@@ -2091,6 +2119,9 @@ + ac97_read_proc, &s->codec); + #endif + ++ set_xmit_slots(1); ++ set_recv_slots(1); ++ + return 0; + + err_dev3: +diff -Nur linux-2.4.30/drivers/tc/lk201.c linux-2.4.30-mips/drivers/tc/lk201.c +--- linux-2.4.30/drivers/tc/lk201.c 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/tc/lk201.c 2004-09-28 02:53:04.000000000 +0200 +@@ -5,7 +5,7 @@ + * for more details. + * + * Copyright (C) 1999-2002 Harald Koerfgen <hkoerfg@web.de> +- * Copyright (C) 2001, 2002, 2003 Maciej W. Rozycki <macro@ds2.pg.gda.pl> ++ * Copyright (C) 2001, 2002, 2003, 2004 Maciej W. Rozycki + */ + + #include <linux/config.h> +@@ -23,8 +23,8 @@ + #include <asm/keyboard.h> + #include <asm/dec/tc.h> + #include <asm/dec/machtype.h> ++#include <asm/dec/serial.h> + +-#include "zs.h" + #include "lk201.h" + + /* +@@ -55,19 +55,20 @@ + unsigned char kbd_sysrq_key = -1; + #endif + +-#define KEYB_LINE 3 ++#define KEYB_LINE_ZS 3 ++#define KEYB_LINE_DZ 0 + +-static int __init lk201_init(struct dec_serial *); +-static void __init lk201_info(struct dec_serial *); +-static void lk201_kbd_rx_char(unsigned char, unsigned char); ++static int __init lk201_init(void *); ++static void __init lk201_info(void *); ++static void lk201_rx_char(unsigned char, unsigned char); + +-struct zs_hook lk201_kbdhook = { ++static struct dec_serial_hook lk201_hook = { + .init_channel = lk201_init, + .init_info = lk201_info, + .rx_char = NULL, + .poll_rx_char = NULL, + .poll_tx_char = NULL, +- .cflags = B4800 | CS8 | CSTOPB | CLOCAL ++ .cflags = B4800 | CS8 | CSTOPB | CLOCAL, + }; + + /* +@@ -93,28 +94,28 @@ + LK_CMD_ENB_BELL, LK_PARAM_VOLUME(4), + }; + +-static struct dec_serial* lk201kbd_info; ++static void *lk201_handle; + +-static int lk201_send(struct dec_serial *info, unsigned char ch) ++static int lk201_send(unsigned char ch) + { +- if (info->hook->poll_tx_char(info, ch)) { ++ if (lk201_hook.poll_tx_char(lk201_handle, ch)) { + printk(KERN_ERR "lk201: transmit timeout\n"); + return -EIO; + } + return 0; + } + +-static inline int lk201_get_id(struct dec_serial *info) ++static inline int lk201_get_id(void) + { +- return lk201_send(info, LK_CMD_REQ_ID); ++ return lk201_send(LK_CMD_REQ_ID); + } + +-static int lk201_reset(struct dec_serial *info) ++static int lk201_reset(void) + { + int i, r; + + for (i = 0; i < sizeof(lk201_reset_string); i++) { +- r = lk201_send(info, lk201_reset_string[i]); ++ r = lk201_send(lk201_reset_string[i]); + if (r < 0) + return r; + } +@@ -203,24 +204,26 @@ + + static int write_kbd_rate(struct kbd_repeat *rep) + { +- struct dec_serial* info = lk201kbd_info; + int delay, rate; + int i; + + delay = rep->delay / 5; + rate = rep->rate; + for (i = 0; i < 4; i++) { +- if (info->hook->poll_tx_char(info, LK_CMD_RPT_RATE(i))) ++ if (lk201_hook.poll_tx_char(lk201_handle, ++ LK_CMD_RPT_RATE(i))) + return 1; +- if (info->hook->poll_tx_char(info, LK_PARAM_DELAY(delay))) ++ if (lk201_hook.poll_tx_char(lk201_handle, ++ LK_PARAM_DELAY(delay))) + return 1; +- if (info->hook->poll_tx_char(info, LK_PARAM_RATE(rate))) ++ if (lk201_hook.poll_tx_char(lk201_handle, ++ LK_PARAM_RATE(rate))) + return 1; + } + return 0; + } + +-static int lk201kbd_rate(struct kbd_repeat *rep) ++static int lk201_kbd_rate(struct kbd_repeat *rep) + { + if (rep == NULL) + return -EINVAL; +@@ -237,10 +240,8 @@ + return 0; + } + +-static void lk201kd_mksound(unsigned int hz, unsigned int ticks) ++static void lk201_kd_mksound(unsigned int hz, unsigned int ticks) + { +- struct dec_serial* info = lk201kbd_info; +- + if (!ticks) + return; + +@@ -253,20 +254,19 @@ + ticks = 7; + ticks = 7 - ticks; + +- if (info->hook->poll_tx_char(info, LK_CMD_ENB_BELL)) ++ if (lk201_hook.poll_tx_char(lk201_handle, LK_CMD_ENB_BELL)) + return; +- if (info->hook->poll_tx_char(info, LK_PARAM_VOLUME(ticks))) ++ if (lk201_hook.poll_tx_char(lk201_handle, LK_PARAM_VOLUME(ticks))) + return; +- if (info->hook->poll_tx_char(info, LK_CMD_BELL)) ++ if (lk201_hook.poll_tx_char(lk201_handle, LK_CMD_BELL)) + return; + } + + void kbd_leds(unsigned char leds) + { +- struct dec_serial* info = lk201kbd_info; + unsigned char l = 0; + +- if (!info) /* FIXME */ ++ if (!lk201_handle) /* FIXME */ + return; + + /* FIXME -- Only Hold and Lock LEDs for now. --macro */ +@@ -275,13 +275,13 @@ + if (leds & LED_CAP) + l |= LK_LED_LOCK; + +- if (info->hook->poll_tx_char(info, LK_CMD_LEDS_ON)) ++ if (lk201_hook.poll_tx_char(lk201_handle, LK_CMD_LEDS_ON)) + return; +- if (info->hook->poll_tx_char(info, LK_PARAM_LED_MASK(l))) ++ if (lk201_hook.poll_tx_char(lk201_handle, LK_PARAM_LED_MASK(l))) + return; +- if (info->hook->poll_tx_char(info, LK_CMD_LEDS_OFF)) ++ if (lk201_hook.poll_tx_char(lk201_handle, LK_CMD_LEDS_OFF)) + return; +- if (info->hook->poll_tx_char(info, LK_PARAM_LED_MASK(~l))) ++ if (lk201_hook.poll_tx_char(lk201_handle, LK_PARAM_LED_MASK(~l))) + return; + } + +@@ -307,7 +307,7 @@ + return 0x80; + } + +-static void lk201_kbd_rx_char(unsigned char ch, unsigned char stat) ++static void lk201_rx_char(unsigned char ch, unsigned char fl) + { + static unsigned char id[6]; + static int id_i; +@@ -316,9 +316,8 @@ + static int prev_scancode; + unsigned char c = scancodeRemap[ch]; + +- if (stat && stat != TTY_OVERRUN) { +- printk(KERN_ERR "lk201: keyboard receive error: 0x%02x\n", +- stat); ++ if (fl != TTY_NORMAL && fl != TTY_OVERRUN) { ++ printk(KERN_ERR "lk201: keyboard receive error: 0x%02x\n", fl); + return; + } + +@@ -335,7 +334,7 @@ + /* OK, the power-up concluded. */ + lk201_report(id); + if (id[2] == LK_STAT_PWRUP_OK) +- lk201_get_id(lk201kbd_info); ++ lk201_get_id(); + else { + id_i = 0; + printk(KERN_ERR "lk201: keyboard power-up " +@@ -345,7 +344,7 @@ + /* We got the ID; report it and start operation. */ + id_i = 0; + lk201_id(id); +- lk201_reset(lk201kbd_info); ++ lk201_reset(); + } + return; + } +@@ -398,29 +397,28 @@ + tasklet_schedule(&keyboard_tasklet); + } + +-static void __init lk201_info(struct dec_serial *info) ++static void __init lk201_info(void *handle) + { + } + +-static int __init lk201_init(struct dec_serial *info) ++static int __init lk201_init(void *handle) + { + /* First install handlers. */ +- lk201kbd_info = info; +- kbd_rate = lk201kbd_rate; +- kd_mksound = lk201kd_mksound; ++ lk201_handle = handle; ++ kbd_rate = lk201_kbd_rate; ++ kd_mksound = lk201_kd_mksound; + +- info->hook->rx_char = lk201_kbd_rx_char; ++ lk201_hook.rx_char = lk201_rx_char; + + /* Then just issue a reset -- the handlers will do the rest. */ +- lk201_send(info, LK_CMD_POWER_UP); ++ lk201_send(LK_CMD_POWER_UP); + + return 0; + } + + void __init kbd_init_hw(void) + { +- extern int register_zs_hook(unsigned int, struct zs_hook *); +- extern int unregister_zs_hook(unsigned int); ++ int keyb_line; + + /* Maxine uses LK501 at the Access.Bus. */ + if (!LK_IFACE) +@@ -428,19 +426,15 @@ + + printk(KERN_INFO "lk201: DECstation LK keyboard driver v0.05.\n"); + +- if (LK_IFACE_ZS) { +- /* +- * kbd_init_hw() is being called before +- * rs_init() so just register the kbd hook +- * and let zs_init do the rest :-) +- */ +- if(!register_zs_hook(KEYB_LINE, &lk201_kbdhook)) +- unregister_zs_hook(KEYB_LINE); +- } else { +- /* +- * TODO: modify dz.c to allow similar hooks +- * for LK201 handling on DS2100, DS3100, and DS5000/200 +- */ +- printk(KERN_ERR "lk201: support for DZ11 not yet ready.\n"); +- } ++ /* ++ * kbd_init_hw() is being called before ++ * rs_init() so just register the kbd hook ++ * and let zs_init do the rest :-) ++ */ ++ if (LK_IFACE_ZS) ++ keyb_line = KEYB_LINE_ZS; ++ else ++ keyb_line = KEYB_LINE_DZ; ++ if (!register_dec_serial_hook(keyb_line, &lk201_hook)) ++ unregister_dec_serial_hook(keyb_line); + } +diff -Nur linux-2.4.30/drivers/tc/zs.c linux-2.4.30-mips/drivers/tc/zs.c +--- linux-2.4.30/drivers/tc/zs.c 2005-01-19 15:10:05.000000000 +0100 ++++ linux-2.4.30-mips/drivers/tc/zs.c 2004-12-27 05:13:50.000000000 +0100 +@@ -68,6 +68,8 @@ + #include <asm/bitops.h> + #include <asm/uaccess.h> + #include <asm/bootinfo.h> ++#include <asm/dec/serial.h> ++ + #ifdef CONFIG_DECSTATION + #include <asm/dec/interrupts.h> + #include <asm/dec/machtype.h> +@@ -160,8 +162,8 @@ + #ifdef CONFIG_SERIAL_DEC_CONSOLE + static struct console sercons; + #endif +-#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) \ +- && !defined(MODULE) ++#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ ++ !defined(MODULE) + static unsigned long break_pressed; /* break, really ... */ + #endif + +@@ -196,7 +198,6 @@ + /* + * Debugging. + */ +-#undef SERIAL_DEBUG_INTR + #undef SERIAL_DEBUG_OPEN + #undef SERIAL_DEBUG_FLOW + #undef SERIAL_DEBUG_THROTTLE +@@ -221,10 +222,6 @@ + static struct termios *serial_termios[NUM_CHANNELS]; + static struct termios *serial_termios_locked[NUM_CHANNELS]; + +-#ifndef MIN +-#define MIN(a,b) ((a) < (b) ? (a) : (b)) +-#endif +- + /* + * tmp_buf is used as a temporary buffer by serial_write. We need to + * lock it in case the copy_from_user blocks while swapping in a page, +@@ -386,8 +383,6 @@ + * ----------------------------------------------------------------------- + */ + +-static int tty_break; /* Set whenever BREAK condition is detected. */ +- + /* + * This routine is used by the interrupt handler to schedule + * processing in the software interrupt portion of the driver. +@@ -414,20 +409,15 @@ + if (!tty && (!info->hook || !info->hook->rx_char)) + continue; + +- if (tty_break) { +- tty_break = 0; +-#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && !defined(MODULE) +- if (info->line == sercons.index) { +- if (!break_pressed) { +- break_pressed = jiffies; +- goto ignore_char; +- } +- break_pressed = 0; +- } +-#endif ++ flag = TTY_NORMAL; ++ if (info->tty_break) { ++ info->tty_break = 0; + flag = TTY_BREAK; + if (info->flags & ZILOG_SAK) + do_SAK(tty); ++ /* Ignore the null char got when BREAK is removed. */ ++ if (ch == 0) ++ continue; + } else { + if (stat & Rx_OVR) { + flag = TTY_OVERRUN; +@@ -435,20 +425,22 @@ + flag = TTY_FRAME; + } else if (stat & PAR_ERR) { + flag = TTY_PARITY; +- } else +- flag = 0; +- if (flag) ++ } ++ if (flag != TTY_NORMAL) + /* reset the error indication */ + write_zsreg(info->zs_channel, R0, ERR_RES); + } + +-#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && !defined(MODULE) ++#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ ++ !defined(MODULE) + if (break_pressed && info->line == sercons.index) { +- if (ch != 0 && +- time_before(jiffies, break_pressed + HZ*5)) { ++ /* Ignore the null char got when BREAK is removed. */ ++ if (ch == 0) ++ continue; ++ if (time_before(jiffies, break_pressed + HZ * 5)) { + handle_sysrq(ch, regs, NULL, NULL); + break_pressed = 0; +- goto ignore_char; ++ continue; + } + break_pressed = 0; + } +@@ -459,23 +451,7 @@ + return; + } + +- if (tty->flip.count >= TTY_FLIPBUF_SIZE) { +- static int flip_buf_ovf; +- ++flip_buf_ovf; +- continue; +- } +- tty->flip.count++; +- { +- static int flip_max_cnt; +- if (flip_max_cnt < tty->flip.count) +- flip_max_cnt = tty->flip.count; +- } +- +- *tty->flip.flag_buf_ptr++ = flag; +- *tty->flip.char_buf_ptr++ = ch; +-#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && !defined(MODULE) +- ignore_char: +-#endif ++ tty_insert_flip_char(tty, ch, flag); + } + if (tty) + tty_flip_buffer_push(tty); +@@ -517,11 +493,15 @@ + /* Get status from Read Register 0 */ + stat = read_zsreg(info->zs_channel, R0); + +- if (stat & BRK_ABRT) { +-#ifdef SERIAL_DEBUG_INTR +- printk("handling break...."); ++ if ((stat & BRK_ABRT) && !(info->read_reg_zero & BRK_ABRT)) { ++#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ ++ !defined(MODULE) ++ if (info->line == sercons.index) { ++ if (!break_pressed) ++ break_pressed = jiffies; ++ } else + #endif +- tty_break = 1; ++ info->tty_break = 1; + } + + if (info->zs_channel != info->zs_chan_a) { +@@ -957,7 +937,7 @@ + save_flags(flags); + while (1) { + cli(); +- c = MIN(count, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1, ++ c = min(count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1, + SERIAL_XMIT_SIZE - info->xmit_head)); + if (c <= 0) + break; +@@ -965,7 +945,7 @@ + if (from_user) { + down(&tmp_buf_sem); + copy_from_user(tmp_buf, buf, c); +- c = MIN(c, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1, ++ c = min(c, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1, + SERIAL_XMIT_SIZE - info->xmit_head)); + memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c); + up(&tmp_buf_sem); +@@ -1282,46 +1262,48 @@ + } + + switch (cmd) { +- case TIOCMGET: +- error = verify_area(VERIFY_WRITE, (void *) arg, +- sizeof(unsigned int)); +- if (error) +- return error; +- return get_modem_info(info, (unsigned int *) arg); +- case TIOCMBIS: +- case TIOCMBIC: +- case TIOCMSET: +- return set_modem_info(info, cmd, (unsigned int *) arg); +- case TIOCGSERIAL: +- error = verify_area(VERIFY_WRITE, (void *) arg, +- sizeof(struct serial_struct)); +- if (error) +- return error; +- return get_serial_info(info, +- (struct serial_struct *) arg); +- case TIOCSSERIAL: +- return set_serial_info(info, +- (struct serial_struct *) arg); +- case TIOCSERGETLSR: /* Get line status register */ +- error = verify_area(VERIFY_WRITE, (void *) arg, +- sizeof(unsigned int)); +- if (error) +- return error; +- else +- return get_lsr_info(info, (unsigned int *) arg); ++ case TIOCMGET: ++ error = verify_area(VERIFY_WRITE, (void *)arg, ++ sizeof(unsigned int)); ++ if (error) ++ return error; ++ return get_modem_info(info, (unsigned int *)arg); + +- case TIOCSERGSTRUCT: +- error = verify_area(VERIFY_WRITE, (void *) arg, +- sizeof(struct dec_serial)); +- if (error) +- return error; +- copy_from_user((struct dec_serial *) arg, +- info, sizeof(struct dec_serial)); +- return 0; ++ case TIOCMBIS: ++ case TIOCMBIC: ++ case TIOCMSET: ++ return set_modem_info(info, cmd, (unsigned int *)arg); + +- default: +- return -ENOIOCTLCMD; +- } ++ case TIOCGSERIAL: ++ error = verify_area(VERIFY_WRITE, (void *)arg, ++ sizeof(struct serial_struct)); ++ if (error) ++ return error; ++ return get_serial_info(info, (struct serial_struct *)arg); ++ ++ case TIOCSSERIAL: ++ return set_serial_info(info, (struct serial_struct *)arg); ++ ++ case TIOCSERGETLSR: /* Get line status register */ ++ error = verify_area(VERIFY_WRITE, (void *)arg, ++ sizeof(unsigned int)); ++ if (error) ++ return error; ++ else ++ return get_lsr_info(info, (unsigned int *)arg); ++ ++ case TIOCSERGSTRUCT: ++ error = verify_area(VERIFY_WRITE, (void *)arg, ++ sizeof(struct dec_serial)); ++ if (error) ++ return error; ++ copy_from_user((struct dec_serial *)arg, info, ++ sizeof(struct dec_serial)); ++ return 0; ++ ++ default: ++ return -ENOIOCTLCMD; ++ } + return 0; + } + +@@ -1446,7 +1428,8 @@ + static void rs_wait_until_sent(struct tty_struct *tty, int timeout) + { + struct dec_serial *info = (struct dec_serial *) tty->driver_data; +- unsigned long orig_jiffies, char_time; ++ unsigned long orig_jiffies; ++ int char_time; + + if (serial_paranoia_check(info, tty->device, "rs_wait_until_sent")) + return; +@@ -1462,7 +1445,7 @@ + if (char_time == 0) + char_time = 1; + if (timeout) +- char_time = MIN(char_time, timeout); ++ char_time = min(char_time, timeout); + while ((read_zsreg(info->zs_channel, 1) & Tx_BUF_EMP) == 0) { + current->state = TASK_INTERRUPTIBLE; + schedule_timeout(char_time); +@@ -1714,7 +1697,7 @@ + + static void __init show_serial_version(void) + { +- printk("DECstation Z8530 serial driver version 0.08\n"); ++ printk("DECstation Z8530 serial driver version 0.09\n"); + } + + /* Initialize Z8530s zs_channels +@@ -1994,8 +1977,9 @@ + * polling I/O routines + */ + static int +-zs_poll_tx_char(struct dec_serial *info, unsigned char ch) ++zs_poll_tx_char(void *handle, unsigned char ch) + { ++ struct dec_serial *info = handle; + struct dec_zschannel *chan = info->zs_channel; + int ret; + +@@ -2017,8 +2001,9 @@ + } + + static int +-zs_poll_rx_char(struct dec_serial *info) ++zs_poll_rx_char(void *handle) + { ++ struct dec_serial *info = handle; + struct dec_zschannel *chan = info->zs_channel; + int ret; + +@@ -2038,12 +2023,13 @@ + return -ENODEV; + } + +-unsigned int register_zs_hook(unsigned int channel, struct zs_hook *hook) ++int register_zs_hook(unsigned int channel, struct dec_serial_hook *hook) + { + struct dec_serial *info = &zs_soft[channel]; + + if (info->hook) { +- printk(__FUNCTION__": line %d has already a hook registered\n", channel); ++ printk("%s: line %d has already a hook registered\n", ++ __FUNCTION__, channel); + + return 0; + } else { +@@ -2055,7 +2041,7 @@ + } + } + +-unsigned int unregister_zs_hook(unsigned int channel) ++int unregister_zs_hook(unsigned int channel) + { + struct dec_serial *info = &zs_soft[channel]; + +@@ -2063,8 +2049,8 @@ + info->hook = NULL; + return 1; + } else { +- printk(__FUNCTION__": trying to unregister hook on line %d," +- " but none is registered\n", channel); ++ printk("%s: trying to unregister hook on line %d," ++ " but none is registered\n", __FUNCTION__, channel); + return 0; + } + } +@@ -2319,22 +2305,23 @@ + write_zsreg(chan, 9, nine); + } + +-static int kgdbhook_init_channel(struct dec_serial* info) ++static int kgdbhook_init_channel(void *handle) + { + return 0; + } + +-static void kgdbhook_init_info(struct dec_serial* info) ++static void kgdbhook_init_info(void *handle) + { + } + +-static void kgdbhook_rx_char(struct dec_serial* info, +- unsigned char ch, unsigned char stat) ++static void kgdbhook_rx_char(void *handle, unsigned char ch, unsigned char fl) + { ++ struct dec_serial *info = handle; ++ ++ if (fl != TTY_NORMAL) ++ return; + if (ch == 0x03 || ch == '$') + breakpoint(); +- if (stat & (Rx_OVR|FRM_ERR|PAR_ERR)) +- write_zsreg(info->zs_channel, 0, ERR_RES); + } + + /* This sets up the serial port we're using, and turns on +@@ -2360,11 +2347,11 @@ + * for /dev/ttyb which is determined in setup_arch() from the + * boot command line flags. + */ +-struct zs_hook zs_kgdbhook = { +- init_channel : kgdbhook_init_channel, +- init_info : kgdbhook_init_info, +- cflags : B38400|CS8|CLOCAL, +- rx_char : kgdbhook_rx_char, ++struct dec_serial_hook zs_kgdbhook = { ++ .init_channel = kgdbhook_init_channel, ++ .init_info = kgdbhook_init_info, ++ .rx_char = kgdbhook_rx_char, ++ .cflags = B38400 | CS8 | CLOCAL, + } + + void __init zs_kgdb_hook(int tty_num) +diff -Nur linux-2.4.30/drivers/tc/zs.h linux-2.4.30-mips/drivers/tc/zs.h +--- linux-2.4.30/drivers/tc/zs.h 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/tc/zs.h 2004-07-01 15:28:54.000000000 +0200 +@@ -1,14 +1,18 @@ + /* +- * macserial.h: Definitions for the Macintosh Z8530 serial driver. ++ * drivers/tc/zs.h: Definitions for the DECstation Z85C30 serial driver. + * + * Adapted from drivers/sbus/char/sunserial.h by Paul Mackerras. ++ * Adapted from drivers/macintosh/macserial.h by Harald Koerfgen. + * + * Copyright (C) 1996 Paul Mackerras (Paul.Mackerras@cs.anu.edu.au) + * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) ++ * Copyright (C) 2004 Maciej W. Rozycki + */ + #ifndef _DECSERIAL_H + #define _DECSERIAL_H + ++#include <asm/dec/serial.h> ++ + #define NUM_ZSREGS 16 + + struct serial_struct { +@@ -89,63 +93,50 @@ + unsigned char curregs[NUM_ZSREGS]; + }; + +-struct dec_serial; +- +-struct zs_hook { +- int (*init_channel)(struct dec_serial* info); +- void (*init_info)(struct dec_serial* info); +- void (*rx_char)(unsigned char ch, unsigned char stat); +- int (*poll_rx_char)(struct dec_serial* info); +- int (*poll_tx_char)(struct dec_serial* info, +- unsigned char ch); +- unsigned cflags; +-}; +- + struct dec_serial { +- struct dec_serial *zs_next; /* For IRQ servicing chain */ +- struct dec_zschannel *zs_channel; /* Channel registers */ +- struct dec_zschannel *zs_chan_a; /* A side registers */ +- unsigned char read_reg_zero; +- +- char soft_carrier; /* Use soft carrier on this channel */ +- char break_abort; /* Is serial console in, so process brk/abrt */ +- struct zs_hook *hook; /* Hook on this channel */ +- char is_cons; /* Is this our console. */ +- unsigned char tx_active; /* character is being xmitted */ +- unsigned char tx_stopped; /* output is suspended */ +- +- /* We need to know the current clock divisor +- * to read the bps rate the chip has currently +- * loaded. ++ struct dec_serial *zs_next; /* For IRQ servicing chain. */ ++ struct dec_zschannel *zs_channel; /* Channel registers. */ ++ struct dec_zschannel *zs_chan_a; /* A side registers. */ ++ unsigned char read_reg_zero; ++ ++ struct dec_serial_hook *hook; /* Hook on this channel. */ ++ int tty_break; /* Set on BREAK condition. */ ++ int is_cons; /* Is this our console. */ ++ int tx_active; /* Char is being xmitted. */ ++ int tx_stopped; /* Output is suspended. */ ++ ++ /* ++ * We need to know the current clock divisor ++ * to read the bps rate the chip has currently loaded. + */ +- unsigned char clk_divisor; /* May be 1, 16, 32, or 64 */ +- int zs_baud; ++ int clk_divisor; /* May be 1, 16, 32, or 64. */ ++ int zs_baud; + +- char change_needed; ++ char change_needed; + + int magic; + int baud_base; + int port; + int irq; +- int flags; /* defined in tty.h */ +- int type; /* UART type */ ++ int flags; /* Defined in tty.h. */ ++ int type; /* UART type. */ + struct tty_struct *tty; + int read_status_mask; + int ignore_status_mask; + int timeout; + int xmit_fifo_size; + int custom_divisor; +- int x_char; /* xon/xoff character */ ++ int x_char; /* XON/XOFF character. */ + int close_delay; + unsigned short closing_wait; + unsigned short closing_wait2; + unsigned long event; + unsigned long last_active; + int line; +- int count; /* # of fd on device */ +- int blocked_open; /* # of blocked opens */ +- long session; /* Session of opening process */ +- long pgrp; /* pgrp of opening process */ ++ int count; /* # of fds on device. */ ++ int blocked_open; /* # of blocked opens. */ ++ long session; /* Sess of opening process. */ ++ long pgrp; /* Pgrp of opening process. */ + unsigned char *xmit_buf; + int xmit_head; + int xmit_tail; +diff -Nur linux-2.4.30/drivers/video/Config.in linux-2.4.30-mips/drivers/video/Config.in +--- linux-2.4.30/drivers/video/Config.in 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/video/Config.in 2005-02-11 22:16:44.000000000 +0100 +@@ -87,8 +87,8 @@ + if [ "$CONFIG_HP300" = "y" ]; then + define_bool CONFIG_FB_HP300 y + fi +- if [ "$ARCH" = "alpha" ]; then +- tristate ' TGA framebuffer support' CONFIG_FB_TGA ++ if [ "$ARCH" = "alpha" -o "$CONFIG_TC" = "y" ]; then ++ tristate ' TGA/SFB+ framebuffer support' CONFIG_FB_TGA + fi + if [ "$CONFIG_X86" = "y" ]; then + bool ' VESA VGA graphics console' CONFIG_FB_VESA +@@ -121,6 +121,17 @@ + hex ' Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000 + fi + fi ++ if [ "$CONFIG_SOC_AU1100" = "y" ]; then ++ bool ' Au1100 LCD Driver' CONFIG_FB_AU1100 ++ fi ++ ++ if [ "$CONFIG_SOC_AU1200" = "y" ]; then ++ bool ' Au1200 LCD Driver' CONFIG_FB_AU1200 ++ if [ "$CONFIG_FB_AU1200" = "y" ]; then ++ int ' Number of planes (1 to 4)' CONFIG_FB_AU1200_DEVS 1 ++ fi ++ fi ++ + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + if [ "$CONFIG_PCI" != "n" ]; then + tristate ' Matrox acceleration (EXPERIMENTAL)' CONFIG_FB_MATROX +@@ -178,9 +189,6 @@ + bool ' Use CRT on Pb1100 ' CONFIG_PB1500_CRT + bool ' Use TFT Panel on Pb1100 ' CONFIG_PB1500_TFT + fi +- if [ "$CONFIG_SOC_AU1100" = "y" ]; then +- bool ' Au1100 LCD Driver' CONFIG_FB_AU1100 +- fi + fi + fi + fi +diff -Nur linux-2.4.30/drivers/video/Makefile linux-2.4.30-mips/drivers/video/Makefile +--- linux-2.4.30/drivers/video/Makefile 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30-mips/drivers/video/Makefile 2005-02-11 22:16:44.000000000 +0100 +@@ -87,6 +87,7 @@ + obj-$(CONFIG_FB_MAXINE) += maxinefb.o + obj-$(CONFIG_FB_TX3912) += tx3912fb.o + obj-$(CONFIG_FB_AU1100) += au1100fb.o fbgen.o ++obj-$(CONFIG_FB_AU1200) += au1200fb.o fbgen.o + obj-$(CONFIG_FB_IT8181) += it8181fb.o fbgen.o + + subdir-$(CONFIG_STI_CONSOLE) += sti +diff -Nur linux-2.4.30/drivers/video/au1200fb.c linux-2.4.30-mips/drivers/video/au1200fb.c +--- linux-2.4.30/drivers/video/au1200fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/video/au1200fb.c 2005-03-13 09:04:16.000000000 +0100 +@@ -0,0 +1,1564 @@ ++/* ++ * BRIEF MODULE DESCRIPTION ++ * Au1200 LCD Driver. ++ * ++ * Copyright 2004 AMD ++ * Author: AMD ++ * ++ * Based on: ++ * linux/drivers/video/skeletonfb.c -- Skeleton for a frame buffer device ++ * Created 28 Dec 1997 by Geert Uytterhoeven ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#include <linux/module.h> ++#include <linux/kernel.h> ++#include <linux/errno.h> ++#include <linux/string.h> ++#include <linux/mm.h> ++#include <linux/tty.h> ++#include <linux/slab.h> ++#include <linux/delay.h> ++#include <linux/fb.h> ++#include <linux/init.h> ++#include <asm/uaccess.h> ++ ++#include <asm/au1000.h> ++#include <asm/au1xxx_gpio.h> ++#include "au1200fb.h" ++ ++#include <video/fbcon.h> ++#include <video/fbcon-cfb16.h> ++#include <video/fbcon-cfb32.h> ++#define CMAPSIZE 16 ++ ++#define AU1200_LCD_GET_WINENABLE 1 ++#define AU1200_LCD_SET_WINENABLE 2 ++#define AU1200_LCD_GET_WINLOCATION 3 ++#define AU1200_LCD_SET_WINLOCATION 4 ++#define AU1200_LCD_GET_WINSIZE 5 ++#define AU1200_LCD_SET_WINSIZE 6 ++#define AU1200_LCD_GET_BACKCOLOR 7 ++#define AU1200_LCD_SET_BACKCOLOR 8 ++#define AU1200_LCD_GET_COLORKEY 9 ++#define AU1200_LCD_SET_COLORKEY 10 ++#define AU1200_LCD_GET_PANEL 11 ++#define AU1200_LCD_SET_PANEL 12 ++ ++typedef struct au1200_lcd_getset_t ++{ ++ unsigned int subcmd; ++ union { ++ struct { ++ int enable; ++ } winenable; ++ struct { ++ int x, y; ++ } winlocation; ++ struct { ++ int hsz, vsz; ++ } winsize; ++ struct { ++ unsigned int color; ++ } backcolor; ++ struct { ++ unsigned int key; ++ unsigned int mask; ++ } colorkey; ++ struct { ++ int panel; ++ char desc[80]; ++ } panel; ++ }; ++} au1200_lcd_getset_t; ++ ++AU1200_LCD *lcd = (AU1200_LCD *)AU1200_LCD_ADDR; ++static int window_index = 0; /* default is zero */ ++static int panel_index = -1; /* default is call board_au1200fb_panel */ ++ ++struct window_settings ++{ ++ unsigned char name[64]; ++ uint32 mode_backcolor; ++ uint32 mode_colorkey; ++ uint32 mode_colorkeymsk; ++ struct ++ { ++ int xres; ++ int yres; ++ int xpos; ++ int ypos; ++ uint32 mode_winctrl1; /* winctrl1[FRM,CCO,PO,PIPE] */ ++ uint32 mode_winenable; ++ } w[4]; ++}; ++ ++struct panel_settings ++{ ++ unsigned char name[64]; ++ /* panel physical dimensions */ ++ uint32 Xres; ++ uint32 Yres; ++ /* panel timings */ ++ uint32 mode_screen; ++ uint32 mode_horztiming; ++ uint32 mode_verttiming; ++ uint32 mode_clkcontrol; ++ uint32 mode_pwmdiv; ++ uint32 mode_pwmhi; ++ uint32 mode_outmask; ++ uint32 mode_fifoctrl; ++ uint32 mode_toyclksrc; ++ uint32 mode_backlight; ++ uint32 mode_auxpll; ++ int (*device_init)(void); ++ int (*device_shutdown)(void); ++}; ++ ++#if defined(__BIG_ENDIAN) ++#define LCD_WINCTRL1_PO_16BPP LCD_WINCTRL1_PO_00 ++#else ++#define LCD_WINCTRL1_PO_16BPP LCD_WINCTRL1_PO_01 ++#endif ++ ++extern int board_au1200fb_panel (void); ++extern int board_au1200fb_panel_init (void); ++extern int board_au1200fb_panel_shutdown (void); ++ ++#if defined(CONFIG_FOCUS_ENHANCEMENTS) ++extern int board_au1200fb_focus_init_hdtv(void); ++extern int board_au1200fb_focus_init_component(void); ++extern int board_au1200fb_focus_init_cvsv(void); ++extern int board_au1200fb_focus_shutdown(void); ++#endif ++ ++/* ++ * Default window configurations ++ */ ++static struct window_settings windows[] = ++{ ++ { /* Index 0 */ ++ "0-FS gfx, 1-video, 2-ovly gfx, 3-ovly gfx", ++ /* mode_backcolor */ 0x006600ff, ++ /* mode_colorkey,msk*/ 0, 0, ++ { ++ { ++ /* xres, yres, xpos, ypos */ 0, 0, 0, 0, ++ /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565|LCD_WINCTRL1_PO_16BPP, ++ /* mode_winenable*/ LCD_WINENABLE_WEN0, ++ }, ++ { ++ /* xres, yres, xpos, ypos */ 0, 0, 0, 0, ++ /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565|LCD_WINCTRL1_PO_16BPP, ++ /* mode_winenable*/ 0, ++ }, ++ { ++ /* xres, yres, xpos, ypos */ 0, 0, 0, 0, ++ /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565|LCD_WINCTRL1_PO_16BPP|LCD_WINCTRL1_PIPE, ++ /* mode_winenable*/ 0, ++ }, ++ { ++ /* xres, yres, xpos, ypos */ 0, 0, 0, 0, ++ /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565|LCD_WINCTRL1_PO_16BPP|LCD_WINCTRL1_PIPE, ++ /* mode_winenable*/ 0, ++ }, ++ }, ++ }, ++ ++ { /* Index 1 */ ++ "0-FS gfx, 1-video, 2-ovly gfx, 3-ovly gfx", ++ /* mode_backcolor */ 0x006600ff, ++ /* mode_colorkey,msk*/ 0, 0, ++ { ++ { ++ /* xres, yres, xpos, ypos */ 320, 240, 5, 5, ++#if 0 ++ /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565|LCD_WINCTRL1_PO_16BPP, ++#endif ++ /* mode_winctrl1 */ LCD_WINCTRL1_FRM_24BPP|LCD_WINCTRL1_PO_00, ++ /* mode_winenable*/ LCD_WINENABLE_WEN0, ++ }, ++ { ++ /* xres, yres, xpos, ypos */ 0, 0, 0, 0, ++ /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565|LCD_WINCTRL1_PO_16BPP, ++ /* mode_winenable*/ 0, ++ }, ++ { ++ /* xres, yres, xpos, ypos */ 100, 100, 0, 0, ++ /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565|LCD_WINCTRL1_PO_16BPP|LCD_WINCTRL1_PIPE, ++ /* mode_winenable*/ 0/*LCD_WINENABLE_WEN2*/, ++ }, ++ { ++ /* xres, yres, xpos, ypos */ 200, 25, 0, 0, ++ /* mode_winctrl1 */ LCD_WINCTRL1_FRM_16BPP565|LCD_WINCTRL1_PO_16BPP|LCD_WINCTRL1_PIPE, ++ /* mode_winenable*/ 0, ++ }, ++ }, ++ }, ++ /* Need VGA 640 @ 24bpp, @ 32bpp */ ++ /* Need VGA 800 @ 24bpp, @ 32bpp */ ++ /* Need VGA 1024 @ 24bpp, @ 32bpp */ ++} ; ++ ++/* ++ * Controller configurations for various panels. ++ */ ++static struct panel_settings panels[] = ++{ ++ { /* Index 0: QVGA 320x240 H:33.3kHz V:110Hz */ ++ "VGA_320x240", ++ 320, 240, ++ /* mode_screen */ LCD_SCREEN_SX_N(320) | LCD_SCREEN_SY_N(240), ++ /* mode_horztiming */ 0x00c4623b, ++ /* mode_verttiming */ 0x00502814, ++ /* mode_clkcontrol */ 0x00020002, /* /4=24Mhz */ ++ /* mode_pwmdiv */ 0x00000000, ++ /* mode_pwmhi */ 0x00000000, ++ /* mode_outmask */ 0x00FFFFFF, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000004, /* 96MHz AUXPLL directly */ ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 8, /* 96MHz AUXPLL */ ++ /* device_init */ NULL, ++ /* device_shutdown */ NULL, ++ }, ++ ++ { /* Index 1: VGA 640x480 H:30.3kHz V:58Hz */ ++ "VGA_640x480", ++ 640, 480, ++ /* mode_screen */ 0x13f9df80, ++ /* mode_horztiming */ 0x003c5859, ++ /* mode_verttiming */ 0x00741201, ++ /* mode_clkcontrol */ 0x00020001, /* /4=24Mhz */ ++ /* mode_pwmdiv */ 0x00000000, ++ /* mode_pwmhi */ 0x00000000, ++ /* mode_outmask */ 0x00FFFFFF, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000004, /* AUXPLL directly */ ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 8, /* 96MHz AUXPLL */ ++ /* device_init */ NULL, ++ /* device_shutdown */ NULL, ++ }, ++ ++ { /* Index 2: SVGA 800x600 H:46.1kHz V:69Hz */ ++ "SVGA_800x600", ++ 800, 600, ++ /* mode_screen */ 0x18fa5780, ++ /* mode_horztiming */ 0x00dc7e77, ++ /* mode_verttiming */ 0x00584805, ++ /* mode_clkcontrol */ 0x00020000, /* /2=48Mhz */ ++ /* mode_pwmdiv */ 0x00000000, ++ /* mode_pwmhi */ 0x00000000, ++ /* mode_outmask */ 0x00FFFFFF, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000004, /* AUXPLL directly */ ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 8, /* 96MHz AUXPLL */ ++ /* device_init */ NULL, ++ /* device_shutdown */ NULL, ++ }, ++ ++ { /* Index 3: XVGA 1024x768 H:56.2kHz V:70Hz */ ++ "XVGA_1024x768", ++ 1024, 768, ++ /* mode_screen */ 0x1ffaff80, ++ /* mode_horztiming */ 0x007d0e57, ++ /* mode_verttiming */ 0x00740a01, ++ /* mode_clkcontrol */ 0x000A0000, /* /1 */ ++ /* mode_pwmdiv */ 0x00000000, ++ /* mode_pwmhi */ 0x00000000, ++ /* mode_outmask */ 0x00FFFFFF, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000004, /* AUXPLL directly */ ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 6, /* 72MHz AUXPLL */ ++ /* device_init */ NULL, ++ /* device_shutdown */ NULL, ++ }, ++ ++ { /* Index 4: XVGA 1280x1024 H:68.5kHz V:65Hz */ ++ "XVGA_1280x1024", ++ 1280, 1024, ++ /* mode_screen */ 0x27fbff80, ++ /* mode_horztiming */ 0x00cdb2c7, ++ /* mode_verttiming */ 0x00600002, ++ /* mode_clkcontrol */ 0x000A0000, /* /1 */ ++ /* mode_pwmdiv */ 0x00000000, ++ /* mode_pwmhi */ 0x00000000, ++ /* mode_outmask */ 0x00FFFFFF, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000004, /* AUXPLL directly */ ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 10, /* 120MHz AUXPLL */ ++ /* device_init */ NULL, ++ /* device_shutdown */ NULL, ++ }, ++ ++ { /* Index 5: Samsung 1024x768 TFT */ ++ "Samsung_1024x768_TFT", ++ 1024, 768, ++ /* mode_screen */ 0x1ffaff80, ++ /* mode_horztiming */ 0x018cc677, ++ /* mode_verttiming */ 0x00241217, ++ /* mode_clkcontrol */ 0x00000000, /* SCB 0x1 /4=24Mhz */ ++ /* mode_pwmdiv */ 0x8000063f, /* SCB 0x0 */ ++ /* mode_pwmhi */ 0x03400000, /* SCB 0x0 */ ++ /* mode_outmask */ 0x00fcfcfc, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000004, /* 96MHz AUXPLL directly */ ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 8, /* 96MHz AUXPLL */ ++ /* device_init */ board_au1200fb_panel_init, ++ /* device_shutdown */ board_au1200fb_panel_shutdown, ++ }, ++ ++ { /* Index 6: Toshiba 640x480 TFT */ ++ "Toshiba_640x480_TFT", ++ 640, 480, ++ /* mode_screen */ LCD_SCREEN_SX_N(640) | LCD_SCREEN_SY_N(480), ++ /* mode_horztiming */ LCD_HORZTIMING_HPW_N(96) | LCD_HORZTIMING_HND1_N(13) | LCD_HORZTIMING_HND2_N(51), ++ /* mode_verttiming */ LCD_VERTTIMING_VPW_N(2) | LCD_VERTTIMING_VND1_N(11) | LCD_VERTTIMING_VND2_N(32) , ++ /* mode_clkcontrol */ 0x00000000, /* /4=24Mhz */ ++ /* mode_pwmdiv */ 0x8000063f, ++ /* mode_pwmhi */ 0x03400000, ++ /* mode_outmask */ 0x00fcfcfc, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000004, /* 96MHz AUXPLL directly */ ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 8, /* 96MHz AUXPLL */ ++ /* device_init */ board_au1200fb_panel_init, ++ /* device_shutdown */ board_au1200fb_panel_shutdown, ++ }, ++ ++ { /* Index 7: Sharp 320x240 TFT */ ++ "Sharp_320x240_TFT", ++ 320, 240, ++ /* mode_screen */ LCD_SCREEN_SX_N(320) | LCD_SCREEN_SY_N(240), ++ /* mode_horztiming */ LCD_HORZTIMING_HPW_N(60) | LCD_HORZTIMING_HND1_N(13) | LCD_HORZTIMING_HND2_N(2), ++ /* mode_verttiming */ LCD_VERTTIMING_VPW_N(2) | LCD_VERTTIMING_VND1_N(2) | LCD_VERTTIMING_VND2_N(5) , ++ /* mode_clkcontrol */ LCD_CLKCONTROL_PCD_N(7), /* /16=6Mhz */ ++ /* mode_pwmdiv */ 0x8000063f, ++ /* mode_pwmhi */ 0x03400000, ++ /* mode_outmask */ 0x00fcfcfc, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000004, /* 96MHz AUXPLL directly */ ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 8, /* 96MHz AUXPLL */ ++ /* device_init */ board_au1200fb_panel_init, ++ /* device_shutdown */ board_au1200fb_panel_shutdown, ++ }, ++ { /* Index 8: Toppoly TD070WGCB2 7" 854x480 TFT */ ++ "Toppoly_TD070WGCB2", ++ 854, 480, ++ /* mode_screen */ LCD_SCREEN_SX_N(854) | LCD_SCREEN_SY_N(480), ++ /* mode_horztiming */ LCD_HORZTIMING_HND2_N(44) | LCD_HORZTIMING_HND1_N(44) | LCD_HORZTIMING_HPW_N(114), ++ /* mode_verttiming */ LCD_VERTTIMING_VND2_N(20) | LCD_VERTTIMING_VND1_N(21) | LCD_VERTTIMING_VPW_N(4), ++ /* mode_clkcontrol */ 0x00020001, /* /4=24Mhz */ ++ /* mode_pwmdiv */ 0x8000063f, ++ /* mode_pwmhi */ 0x03400000, ++ /* mode_outmask */ 0x00FCFCFC, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000004, /* AUXPLL directly */ ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 8, /* 96MHz AUXPLL */ ++ /* device_init */ board_au1200fb_panel_init, ++ /* device_shutdown */ board_au1200fb_panel_shutdown, ++ }, ++#if defined(CONFIG_FOCUS_ENHANCEMENTS) ++ { /* Index 9: Focus FS453 TV-Out 640x480 */ ++ "FS453_640x480 (Composite/S-Video)", ++ 640, 480, ++ /* mode_screen */ LCD_SCREEN_SX_N(640) | LCD_SCREEN_SY_N(480), ++ /* mode_horztiming */ LCD_HORZTIMING_HND2_N(143) | LCD_HORZTIMING_HND1_N(143) | LCD_HORZTIMING_HPW_N(10), ++ /* mode_verttiming */ LCD_VERTTIMING_VND2_N(30) | LCD_VERTTIMING_VND1_N(30) | LCD_VERTTIMING_VPW_N(5), ++ /* mode_clkcontrol */ 0x00480000 | (1<<17) | (1<<18), /* External Clock, 1:1 clock ratio */ ++ /* mode_pwmdiv */ 0x00000000, ++ /* mode_pwmhi */ 0x00000000, ++ /* mode_outmask */ 0x00FFFFFF, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000000, ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 8, /* 96MHz AUXPLL */ ++ /* device_init */ board_au1200fb_focus_init_cvsv, ++ /* device_shutdown */ board_au1200fb_focus_shutdown, ++ }, ++ ++ { /* Index 10: Focus FS453 TV-Out 640x480 */ ++ "FS453_640x480 (Component Video)", ++ 640, 480, ++ /* mode_screen */ LCD_SCREEN_SX_N(640) | LCD_SCREEN_SY_N(480), ++ /* mode_horztiming */ LCD_HORZTIMING_HND2_N(143) | LCD_HORZTIMING_HND1_N(143) | LCD_HORZTIMING_HPW_N(10), ++ /* mode_verttiming */ LCD_VERTTIMING_VND2_N(30) | LCD_VERTTIMING_VND1_N(30) | LCD_VERTTIMING_VPW_N(5), ++ /* mode_clkcontrol */ 0x00480000 | (1<<17) | (1<<18), /* External Clock, 1:1 clock ratio */ ++ /* mode_pwmdiv */ 0x00000000, ++ /* mode_pwmhi */ 0x00000000, ++ /* mode_outmask */ 0x00FFFFFF, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000000, ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 8, /* 96MHz AUXPLL */ ++ /* device_init */ board_au1200fb_focus_init_component, ++ /* device_shutdown */ board_au1200fb_focus_shutdown, ++ }, ++ ++ { /* Index 11: Focus FS453 TV-Out 640x480 */ ++ "FS453_640x480 (HDTV)", ++ 720, 480, ++ /* mode_screen */ LCD_SCREEN_SX_N(720) | LCD_SCREEN_SY_N(480), ++ /* mode_horztiming */ LCD_HORZTIMING_HND2_N(28) | LCD_HORZTIMING_HND1_N(46) | LCD_HORZTIMING_HPW_N(64), ++ /* mode_verttiming */ LCD_VERTTIMING_VND2_N(7) | LCD_VERTTIMING_VND1_N(31) | LCD_VERTTIMING_VPW_N(7), ++ /* mode_clkcontrol */ 0x00480000 | (1<<17) | (1<<18), /* External Clock, 1:1 clock ratio */ ++ /* mode_pwmdiv */ 0x00000000, ++ /* mode_pwmhi */ 0x00000000, ++ /* mode_outmask */ 0x00FFFFFF, ++ /* mode_fifoctrl */ 0x2f2f2f2f, ++ /* mode_toyclksrc */ 0x00000000, ++ /* mode_backlight */ 0x00000000, ++ /* mode_auxpll */ 8, /* 96MHz AUXPLL */ ++ /* device_init */ board_au1200fb_focus_init_hdtv, ++ /* device_shutdown */ board_au1200fb_focus_shutdown, ++ }, ++#endif ++}; ++ ++#define NUM_PANELS (sizeof(panels) / sizeof(struct panel_settings)) ++ ++static struct window_settings *win; ++static struct panel_settings *panel; ++ ++struct au1200fb_info { ++ struct fb_info_gen gen; ++ unsigned long fb_virt_start; ++ unsigned long fb_size; ++ unsigned long fb_phys; ++ int mmaped; ++ int nohwcursor; ++ int noblanking; ++ ++ struct { unsigned red, green, blue, pad; } palette[256]; ++ ++#if defined(FBCON_HAS_CFB16) ++ u16 fbcon_cmap16[16]; ++#endif ++#if defined(FBCON_HAS_CFB32) ++ u32 fbcon_cmap32[16]; ++#endif ++}; ++ ++ ++struct au1200fb_par { ++ struct fb_var_screeninfo var; ++ ++ int line_length; /* in bytes */ ++ int cmap_len; /* color-map length */ ++}; ++ ++#ifndef CONFIG_FB_AU1200_DEVS ++#define CONFIG_FB_AU1200_DEVS 1 ++#endif ++ ++static struct au1200fb_info fb_infos[CONFIG_FB_AU1200_DEVS]; ++static struct au1200fb_par fb_pars[CONFIG_FB_AU1200_DEVS]; ++static struct display disps[CONFIG_FB_AU1200_DEVS]; ++ ++int au1200fb_init(void); ++void au1200fb_setup(char *options, int *ints); ++static int au1200fb_mmap(struct fb_info *fb, struct file *file, ++ struct vm_area_struct *vma); ++static int au1200_blank(int blank_mode, struct fb_info_gen *info); ++static int au1200fb_ioctl(struct inode *inode, struct file *file, u_int cmd, ++ u_long arg, int con, struct fb_info *info); ++ ++void au1200_nocursor(struct display *p, int mode, int xx, int yy){}; ++ ++static int au1200_setlocation (int plane, int xpos, int ypos); ++static int au1200_setsize (int plane, int xres, int yres); ++static void au1200_setmode(int plane); ++static void au1200_setpanel (struct panel_settings *newpanel); ++ ++static struct fb_ops au1200fb_ops = { ++ owner: THIS_MODULE, ++ fb_get_fix: fbgen_get_fix, ++ fb_get_var: fbgen_get_var, ++ fb_set_var: fbgen_set_var, ++ fb_get_cmap: fbgen_get_cmap, ++ fb_set_cmap: fbgen_set_cmap, ++ fb_pan_display: fbgen_pan_display, ++ fb_ioctl: au1200fb_ioctl, ++ fb_mmap: au1200fb_mmap, ++}; ++ ++ ++static int ++winbpp (unsigned int winctrl1) ++{ ++ /* how many bytes of memory are needed for each pixel format */ ++ switch (winctrl1 & LCD_WINCTRL1_FRM) ++ { ++ case LCD_WINCTRL1_FRM_1BPP: return 1; break; ++ case LCD_WINCTRL1_FRM_2BPP: return 2; break; ++ case LCD_WINCTRL1_FRM_4BPP: return 4; break; ++ case LCD_WINCTRL1_FRM_8BPP: return 8; break; ++ case LCD_WINCTRL1_FRM_12BPP: return 16; break; ++ case LCD_WINCTRL1_FRM_16BPP655: return 16; break; ++ case LCD_WINCTRL1_FRM_16BPP565: return 16; break; ++ case LCD_WINCTRL1_FRM_16BPP556: return 16; break; ++ case LCD_WINCTRL1_FRM_16BPPI1555: return 16; break; ++ case LCD_WINCTRL1_FRM_16BPPI5551: return 16; break; ++ case LCD_WINCTRL1_FRM_16BPPA1555: return 16; break; ++ case LCD_WINCTRL1_FRM_16BPPA5551: return 16; break; ++ case LCD_WINCTRL1_FRM_24BPP: return 32; break; ++ case LCD_WINCTRL1_FRM_32BPP: return 32; break; ++ default: return 0; break; ++ } ++} ++ ++static int ++fbinfo2index (struct fb_info *fb_info) ++{ ++ int i; ++ for (i = 0; i < CONFIG_FB_AU1200_DEVS; ++i) ++ { ++ if (fb_info == (struct fb_info *)(&fb_infos[i])) ++ return i; ++ } ++ printk("au1200fb: ERROR: fbinfo2index failed!\n"); ++ return -1; ++} ++ ++static void au1200_detect(void) ++{ ++ /* ++ * This function should detect the current video mode settings ++ * and store it as the default video mode ++ * Yeh, well, we're not going to change any settings so we're ++ * always stuck with the default ... ++ */ ++} ++ ++static int au1200_encode_fix(struct fb_fix_screeninfo *fix, ++ const void *_par, struct fb_info_gen *_info) ++{ ++ struct au1200fb_info *info = (struct au1200fb_info *) _info; ++ struct au1200fb_par *par = (struct au1200fb_par *) _par; ++ int plane; ++ ++ plane = fbinfo2index(info); ++ ++ memset(fix, 0, sizeof(struct fb_fix_screeninfo)); ++ ++ fix->smem_start = info->fb_phys; ++ fix->smem_len = info->fb_size; ++ fix->type = FB_TYPE_PACKED_PIXELS; ++ fix->type_aux = 0; ++ fix->visual = (par->var.bits_per_pixel == 8) ? ++ FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR; ++ fix->ywrapstep = 0; ++ fix->xpanstep = 1; ++ fix->ypanstep = 1; ++ /* FIX!!!! why doesn't par->line_length work???? it does for au1100 */ ++ fix->line_length = fb_pars[plane].line_length; /*par->line_length;*/ ++ return 0; ++} ++ ++static void set_color_bitfields(struct fb_var_screeninfo *var, int plane) ++{ ++ if (var->bits_per_pixel == 8) ++ { ++ var->red.offset = 0; ++ var->red.length = 8; ++ var->green.offset = 0; ++ var->green.length = 8; ++ var->blue.offset = 0; ++ var->blue.length = 8; ++ var->transp.offset = 0; ++ var->transp.length = 0; ++ } ++ else ++ ++ if (var->bits_per_pixel == 16) ++ { ++ /* FIX!!! How does CCO affect this ? */ ++ /* FIX!!! Not exactly sure how many of these work with FB */ ++ switch (win->w[plane].mode_winctrl1 & LCD_WINCTRL1_FRM) ++ { ++ case LCD_WINCTRL1_FRM_16BPP655: ++ var->red.offset = 10; ++ var->red.length = 6; ++ var->green.offset = 5; ++ var->green.length = 5; ++ var->blue.offset = 0; ++ var->blue.length = 5; ++ var->transp.offset = 0; ++ var->transp.length = 0; ++ break; ++ ++ case LCD_WINCTRL1_FRM_16BPP565: ++ var->red.offset = 11; ++ var->red.length = 5; ++ var->green.offset = 5; ++ var->green.length = 6; ++ var->blue.offset = 0; ++ var->blue.length = 5; ++ var->transp.offset = 0; ++ var->transp.length = 0; ++ break; ++ ++ case LCD_WINCTRL1_FRM_16BPP556: ++ var->red.offset = 11; ++ var->red.length = 5; ++ var->green.offset = 6; ++ var->green.length = 5; ++ var->blue.offset = 0; ++ var->blue.length = 6; ++ var->transp.offset = 0; ++ var->transp.length = 0; ++ break; ++ ++ case LCD_WINCTRL1_FRM_16BPPI1555: ++ var->red.offset = 10; ++ var->red.length = 5; ++ var->green.offset = 5; ++ var->green.length = 5; ++ var->blue.offset = 0; ++ var->blue.length = 5; ++ var->transp.offset = 0; ++ var->transp.length = 0; ++ break; ++ ++ case LCD_WINCTRL1_FRM_16BPPI5551: ++ var->red.offset = 11; ++ var->red.length = 5; ++ var->green.offset = 6; ++ var->green.length = 5; ++ var->blue.offset = 1; ++ var->blue.length = 5; ++ var->transp.offset = 0; ++ var->transp.length = 0; ++ break; ++ ++ case LCD_WINCTRL1_FRM_16BPPA1555: ++ var->red.offset = 10; ++ var->red.length = 5; ++ var->green.offset = 5; ++ var->green.length = 5; ++ var->blue.offset = 0; ++ var->blue.length = 5; ++ var->transp.offset = 15; ++ var->transp.length = 1; ++ break; ++ ++ case LCD_WINCTRL1_FRM_16BPPA5551: ++ var->red.offset = 11; ++ var->red.length = 5; ++ var->green.offset = 6; ++ var->green.length = 5; ++ var->blue.offset = 1; ++ var->blue.length = 5; ++ var->transp.offset = 0; ++ var->transp.length = 1; ++ break; ++ ++ default: ++ printk("ERROR: Invalid PIXEL FORMAT!!!\n"); break; ++ } ++ } ++ else ++ ++ if (var->bits_per_pixel == 32) ++ { ++ switch (win->w[plane].mode_winctrl1 & LCD_WINCTRL1_FRM) ++ { ++ case LCD_WINCTRL1_FRM_24BPP: ++ var->red.offset = 16; ++ var->red.length = 8; ++ var->green.offset = 8; ++ var->green.length = 8; ++ var->blue.offset = 0; ++ var->blue.length = 8; ++ var->transp.offset = 0; ++ var->transp.length = 0; ++ break; ++ ++ case LCD_WINCTRL1_FRM_32BPP: ++ var->red.offset = 16; ++ var->red.length = 8; ++ var->green.offset = 8; ++ var->green.length = 8; ++ var->blue.offset = 0; ++ var->blue.length = 8; ++ var->transp.offset = 24; ++ var->transp.length = 8; ++ break; ++ } ++ } ++ var->red.msb_right = 0; ++ var->green.msb_right = 0; ++ var->blue.msb_right = 0; ++ var->transp.msb_right = 0; ++#if 0 ++printk("set_color_bitfields(a=%d, r=%d..%d, g=%d..%d, b=%d..%d)\n", ++ var->transp.offset, ++ var->red.offset+var->red.length-1, var->red.offset, ++ var->green.offset+var->green.length-1, var->green.offset, ++ var->blue.offset+var->blue.length-1, var->blue.offset); ++#endif ++} ++ ++static int au1200_decode_var(const struct fb_var_screeninfo *var, ++ void *_par, struct fb_info_gen *_info) ++{ ++ struct au1200fb_par *par = (struct au1200fb_par *)_par; ++ int plane, bpp; ++ ++ plane = fbinfo2index((struct fb_info *)_info); ++ ++ /* ++ * Don't allow setting any of these yet: xres and yres don't ++ * make sense for LCD panels. ++ */ ++ if (var->xres != win->w[plane].xres || ++ var->yres != win->w[plane].yres || ++ var->xres != win->w[plane].xres || ++ var->yres != win->w[plane].yres) { ++ return -EINVAL; ++ } ++ ++ bpp = winbpp(win->w[plane].mode_winctrl1); ++ if(var->bits_per_pixel != bpp) { ++ /* on au1200, window pixel format is independent of panel pixel */ ++ printk("WARNING: bits_per_pizel != panel->bpp\n"); ++ } ++ ++ memset(par, 0, sizeof(struct au1200fb_par)); ++ par->var = *var; ++ ++ /* FIX!!! */ ++ switch (var->bits_per_pixel) { ++ case 8: ++ par->var.bits_per_pixel = 8; ++ break; ++ case 16: ++ par->var.bits_per_pixel = 16; ++ break; ++ case 24: ++ case 32: ++ par->var.bits_per_pixel = 32; ++ break; ++ default: ++ printk("color depth %d bpp not supported\n", ++ var->bits_per_pixel); ++ return -EINVAL; ++ ++ } ++ set_color_bitfields(&par->var, plane); ++ /* FIX!!! what is this for 24/32bpp? */ ++ par->cmap_len = (par->var.bits_per_pixel == 8) ? 256 : 16; ++ return 0; ++} ++ ++static int au1200_encode_var(struct fb_var_screeninfo *var, ++ const void *par, struct fb_info_gen *_info) ++{ ++ *var = ((struct au1200fb_par *)par)->var; ++ return 0; ++} ++ ++static void ++au1200_get_par(void *_par, struct fb_info_gen *_info) ++{ ++ int index; ++ ++ index = fbinfo2index((struct fb_info *)_info); ++ *(struct au1200fb_par *)_par = fb_pars[index]; ++} ++ ++static void au1200_set_par(const void *par, struct fb_info_gen *info) ++{ ++ /* nothing to do: we don't change any settings */ ++} ++ ++static int au1200_getcolreg(unsigned regno, unsigned *red, unsigned *green, ++ unsigned *blue, unsigned *transp, ++ struct fb_info *info) ++{ ++ struct au1200fb_info* i = (struct au1200fb_info*)info; ++ ++ if (regno > 255) ++ return 1; ++ ++ *red = i->palette[regno].red; ++ *green = i->palette[regno].green; ++ *blue = i->palette[regno].blue; ++ *transp = 0; ++ ++ return 0; ++} ++ ++static int au1200_setcolreg(unsigned regno, unsigned red, unsigned green, ++ unsigned blue, unsigned transp, ++ struct fb_info *info) ++{ ++ struct au1200fb_info* i = (struct au1200fb_info *)info; ++ u32 rgbcol; ++ int plane, bpp; ++ ++ plane = fbinfo2index((struct fb_info *)info); ++ bpp = winbpp(win->w[plane].mode_winctrl1); ++ ++ if (regno > 255) ++ return 1; ++ ++ i->palette[regno].red = red; ++ i->palette[regno].green = green; ++ i->palette[regno].blue = blue; ++ ++ switch(bpp) { ++#ifdef FBCON_HAS_CFB8 ++ case 8: ++ red >>= 10; ++ green >>= 10; ++ blue >>= 10; ++ panel_reg->lcd_pallettebase[regno] = (blue&0x1f) | ++ ((green&0x3f)<<5) | ((red&0x1f)<<11); ++ break; ++#endif ++#ifdef FBCON_HAS_CFB16 ++/* FIX!!!! depends upon pixel format */ ++ case 16: ++ i->fbcon_cmap16[regno] = ++ ((red & 0xf800) >> 0) | ++ ((green & 0xfc00) >> 5) | ++ ((blue & 0xf800) >> 11); ++ break; ++#endif ++#ifdef FBCON_HAS_CFB32 ++ case 32: ++ i->fbcon_cmap32[regno] = ++ (((u32 )transp & 0xff00) << 16) | ++ (((u32 )red & 0xff00) << 8) | ++ (((u32 )green & 0xff00)) | ++ (((u32 )blue & 0xff00) >> 8); ++ break; ++#endif ++ default: ++ printk("unsupported au1200_setcolreg(%d)\n", bpp); ++ break; ++ } ++ ++ return 0; ++} ++ ++ ++static int au1200_blank(int blank_mode, struct fb_info_gen *_info) ++{ ++ struct au1200fb_info *fb_info = (struct au1200fb_info *)_info; ++ int plane; ++ ++ /* Short-circuit screen blanking */ ++ if (fb_info->noblanking) ++ return 0; ++ ++ plane = fbinfo2index((struct fb_info *)_info); ++ ++ switch (blank_mode) { ++ case VESA_NO_BLANKING: ++ /* printk("turn on panel\n"); */ ++ au1200_setpanel(panel); ++ break; ++ ++ case VESA_VSYNC_SUSPEND: ++ case VESA_HSYNC_SUSPEND: ++ case VESA_POWERDOWN: ++ /* printk("turn off panel\n"); */ ++ au1200_setpanel(NULL); ++ break; ++ default: ++ break; ++ ++ } ++ return 0; ++} ++ ++static void au1200_set_disp(const void *unused, struct display *disp, ++ struct fb_info_gen *info) ++{ ++ struct au1200fb_info *fb_info; ++ int plane; ++ ++ fb_info = (struct au1200fb_info *)info; ++ ++ disp->screen_base = (char *)fb_info->fb_virt_start; ++ ++ switch (disp->var.bits_per_pixel) { ++#ifdef FBCON_HAS_CFB8 ++ case 8: ++ disp->dispsw = &fbcon_cfb8; ++ if (fb_info->nohwcursor) ++ fbcon_cfb8.cursor = au1200_nocursor; ++ break; ++#endif ++#ifdef FBCON_HAS_CFB16 ++ case 16: ++ disp->dispsw = &fbcon_cfb16; ++ disp->dispsw_data = fb_info->fbcon_cmap16; ++ if (fb_info->nohwcursor) ++ fbcon_cfb16.cursor = au1200_nocursor; ++ break; ++#endif ++#ifdef FBCON_HAS_CFB32 ++ case 32: ++ disp->dispsw = &fbcon_cfb32; ++ disp->dispsw_data = fb_info->fbcon_cmap32; ++ if (fb_info->nohwcursor) ++ fbcon_cfb32.cursor = au1200_nocursor; ++ break; ++#endif ++ default: ++ disp->dispsw = &fbcon_dummy; ++ disp->dispsw_data = NULL; ++ break; ++ } ++} ++ ++static int ++au1200fb_mmap(struct fb_info *_fb, ++ struct file *file, ++ struct vm_area_struct *vma) ++{ ++ unsigned int len; ++ unsigned long start=0, off; ++ ++ struct au1200fb_info *fb_info = (struct au1200fb_info *)_fb; ++ ++ if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) { ++ return -EINVAL; ++ } ++ ++ start = fb_info->fb_phys & PAGE_MASK; ++ len = PAGE_ALIGN((start & ~PAGE_MASK) + fb_info->fb_size); ++ ++ off = vma->vm_pgoff << PAGE_SHIFT; ++ ++ if ((vma->vm_end - vma->vm_start + off) > len) { ++ return -EINVAL; ++ } ++ ++ off += start; ++ vma->vm_pgoff = off >> PAGE_SHIFT; ++ ++ pgprot_val(vma->vm_page_prot) &= ~_CACHE_MASK; ++ pgprot_val(vma->vm_page_prot) |= _CACHE_UNCACHED; ++ ++ /* This is an IO map - tell maydump to skip this VMA */ ++ vma->vm_flags |= VM_IO; ++ ++ if (io_remap_page_range(vma->vm_start, off, ++ vma->vm_end - vma->vm_start, ++ vma->vm_page_prot)) { ++ return -EAGAIN; ++ } ++ ++ fb_info->mmaped = 1; ++ return 0; ++} ++ ++int au1200_pan_display(const struct fb_var_screeninfo *var, ++ struct fb_info_gen *info) ++{ ++ return 0; ++} ++ ++ ++static int au1200fb_ioctl(struct inode *inode, struct file *file, u_int cmd, ++ u_long arg, int con, struct fb_info *info) ++{ ++ int plane; ++ ++ plane = fbinfo2index(info); ++ ++ /* printk("au1200fb: ioctl %d on plane %d\n", cmd, plane); */ ++ ++ if (cmd == 0x46FF) ++ { ++ au1200_lcd_getset_t iodata; ++ ++ if (copy_from_user(&iodata, (void *) arg, sizeof(au1200_lcd_getset_t))) ++ return -EFAULT; ++ ++ switch (iodata.subcmd) ++ { ++ case AU1200_LCD_GET_WINENABLE: ++ iodata.winenable.enable = (lcd->winenable & (1<<plane)) ? 1 : 0; ++ break; ++ case AU1200_LCD_SET_WINENABLE: ++ { ++ u32 winenable; ++ winenable = lcd->winenable; ++ winenable &= ~(1<<plane); ++ winenable |= (iodata.winenable.enable) ? (1<<plane) : 0; ++ lcd->winenable = winenable; ++ } ++ break; ++ case AU1200_LCD_GET_WINLOCATION: ++ iodata.winlocation.x = ++ (lcd->window[plane].winctrl0 & LCD_WINCTRL0_OX) >> 21; ++ iodata.winlocation.y = ++ (lcd->window[plane].winctrl0 & LCD_WINCTRL0_OY) >> 10; ++ break; ++ case AU1200_LCD_SET_WINLOCATION: ++ au1200_setlocation(plane, iodata.winlocation.x, iodata.winlocation.y); ++ break; ++ case AU1200_LCD_GET_WINSIZE: ++ iodata.winsize.hsz = ++ (lcd->window[plane].winctrl1 & LCD_WINCTRL1_SZX) >> 11; ++ iodata.winsize.vsz = ++ (lcd->window[plane].winctrl0 & LCD_WINCTRL1_SZY) >> 0; ++ break; ++ case AU1200_LCD_SET_WINSIZE: ++ au1200_setsize(plane, iodata.winsize.hsz, iodata.winsize.vsz); ++ break; ++ case AU1200_LCD_GET_BACKCOLOR: ++ iodata.backcolor.color = lcd->backcolor; ++ break; ++ case AU1200_LCD_SET_BACKCOLOR: ++ lcd->backcolor = iodata.backcolor.color; ++ break; ++ case AU1200_LCD_GET_COLORKEY: ++ iodata.colorkey.key = lcd->colorkey; ++ iodata.colorkey.mask = lcd->colorkeymsk; ++ break; ++ case AU1200_LCD_SET_COLORKEY: ++ lcd->colorkey = iodata.colorkey.key; ++ lcd->colorkeymsk = iodata.colorkey.mask; ++ break; ++ case AU1200_LCD_GET_PANEL: ++ iodata.panel.panel = panel_index; ++ break; ++ case AU1200_LCD_SET_PANEL: ++ if ((iodata.panel.panel >= 0) && (iodata.panel.panel < NUM_PANELS)) ++ { ++ struct panel_settings *newpanel; ++ panel_index = iodata.panel.panel; ++ newpanel = &panels[panel_index]; ++ au1200_setpanel(newpanel); ++ } ++ break; ++ } ++ ++ return copy_to_user((void *) arg, &iodata, sizeof(au1200_lcd_getset_t)) ? -EFAULT : 0; ++ } ++ ++ return -EINVAL; ++} ++ ++static struct fbgen_hwswitch au1200_switch = { ++ au1200_detect, ++ au1200_encode_fix, ++ au1200_decode_var, ++ au1200_encode_var, ++ au1200_get_par, ++ au1200_set_par, ++ au1200_getcolreg, ++ au1200_setcolreg, ++ au1200_pan_display, ++ au1200_blank, ++ au1200_set_disp ++}; ++ ++static void au1200_setpanel (struct panel_settings *newpanel) ++{ ++ /* ++ * Perform global setup/init of LCD controller ++ */ ++ uint32 winenable; ++ ++ /* Make sure all windows disabled */ ++ winenable = lcd->winenable; ++ lcd->winenable = 0; ++ ++ /* ++ * Ensure everything is disabled before reconfiguring ++ */ ++ if (lcd->screen & LCD_SCREEN_SEN) ++ { ++ /* Wait for vertical sync period */ ++ lcd->intstatus = LCD_INT_SS; ++ while ((lcd->intstatus & LCD_INT_SS) == 0) ++ ; ++ ++ lcd->screen &= ~LCD_SCREEN_SEN; /*disable the controller*/ ++ ++ do ++ { ++ lcd->intstatus = lcd->intstatus; /*clear interrupts*/ ++ } ++ /*wait for controller to shut down*/ ++ while ((lcd->intstatus & LCD_INT_SD) == 0); ++ ++ /* Call shutdown of current panel (if up) */ ++ /* this must occur last, because if an external clock is driving ++ the controller, the clock cannot be turned off before first ++ shutting down the controller. ++ */ ++ if (panel->device_shutdown != NULL) panel->device_shutdown(); ++ } ++ ++ /* Check if only needing to turn off panel */ ++ if (panel == NULL) return; ++ ++ panel = newpanel; ++ ++ printk("Panel(%s), %dx%d\n", panel->name, panel->Xres, panel->Yres); ++ ++ /* ++ * Setup clocking if internal LCD clock source (assumes sys_auxpll valid) ++ */ ++ if (!(panel->mode_clkcontrol & LCD_CLKCONTROL_EXT)) ++ { ++ uint32 sys_clksrc; ++ /* WARNING! This should really be a check since other peripherals can ++ be affected by changins sys_auxpll */ ++ au_writel(panel->mode_auxpll, SYS_AUXPLL); ++ sys_clksrc = au_readl(SYS_CLKSRC) & ~0x0000001f; ++ sys_clksrc |= panel->mode_toyclksrc; ++ au_writel(sys_clksrc, SYS_CLKSRC); ++ } ++ ++ /* ++ * Configure panel timings ++ */ ++ lcd->screen = panel->mode_screen; ++ lcd->horztiming = panel->mode_horztiming; ++ lcd->verttiming = panel->mode_verttiming; ++ lcd->clkcontrol = panel->mode_clkcontrol; ++ lcd->pwmdiv = panel->mode_pwmdiv; ++ lcd->pwmhi = panel->mode_pwmhi; ++ lcd->outmask = panel->mode_outmask; ++ lcd->fifoctrl = panel->mode_fifoctrl; ++ au_sync(); ++ ++ /* FIX!!! Check window settings to make sure still valid for new geometry */ ++ au1200_setlocation(0, win->w[0].xpos, win->w[0].ypos); ++ au1200_setlocation(1, win->w[1].xpos, win->w[1].ypos); ++ au1200_setlocation(2, win->w[2].xpos, win->w[2].ypos); ++ au1200_setlocation(3, win->w[3].xpos, win->w[3].ypos); ++ lcd->winenable = winenable; ++ ++ /* ++ * Re-enable screen now that it is configured ++ */ ++ lcd->screen |= LCD_SCREEN_SEN; ++ au_sync(); ++ ++ /* Call init of panel */ ++ if (panel->device_init != NULL) panel->device_init(); ++ ++#if 0 ++#define D(X) printk("%25s: %08X\n", #X, X) ++ D(lcd->screen); ++ D(lcd->horztiming); ++ D(lcd->verttiming); ++ D(lcd->clkcontrol); ++ D(lcd->pwmdiv); ++ D(lcd->pwmhi); ++ D(lcd->outmask); ++ D(lcd->fifoctrl); ++ D(lcd->window[0].winctrl0); ++ D(lcd->window[0].winctrl1); ++ D(lcd->window[0].winctrl2); ++ D(lcd->window[0].winbuf0); ++ D(lcd->window[0].winbuf1); ++ D(lcd->window[0].winbufctrl); ++ D(lcd->window[1].winctrl0); ++ D(lcd->window[1].winctrl1); ++ D(lcd->window[1].winctrl2); ++ D(lcd->window[1].winbuf0); ++ D(lcd->window[1].winbuf1); ++ D(lcd->window[1].winbufctrl); ++ D(lcd->window[2].winctrl0); ++ D(lcd->window[2].winctrl1); ++ D(lcd->window[2].winctrl2); ++ D(lcd->window[2].winbuf0); ++ D(lcd->window[2].winbuf1); ++ D(lcd->window[2].winbufctrl); ++ D(lcd->window[3].winctrl0); ++ D(lcd->window[3].winctrl1); ++ D(lcd->window[3].winctrl2); ++ D(lcd->window[3].winbuf0); ++ D(lcd->window[3].winbuf1); ++ D(lcd->window[3].winbufctrl); ++ D(lcd->winenable); ++ D(lcd->intenable); ++ D(lcd->intstatus); ++ D(lcd->backcolor); ++ D(lcd->winenable); ++ D(lcd->colorkey); ++ D(lcd->colorkeymsk); ++ D(lcd->hwc.cursorctrl); ++ D(lcd->hwc.cursorpos); ++ D(lcd->hwc.cursorcolor0); ++ D(lcd->hwc.cursorcolor1); ++ D(lcd->hwc.cursorcolor2); ++ D(lcd->hwc.cursorcolor3); ++#endif ++} ++ ++static int au1200_setsize (int plane, int xres, int yres) ++{ ++#if 0 ++ uint32 winctrl0, winctrl1, winenable; ++ int xsz, ysz; ++ ++ /* FIX!!! X*Y can not surpass allocated memory */ ++ ++ printk("setsize: x %d y %d\n", xres, yres); ++ winctrl1 = lcd->window[plane].winctrl1; ++ printk("org winctrl1 %08X\n", winctrl1); ++ winctrl1 &= ~(LCD_WINCTRL1_SZX | LCD_WINCTRL1_SZY); ++ ++ xres -= 1; ++ yres -= 1; ++ winctrl1 |= (xres << 11); ++ winctrl1 |= (yres << 0); ++ ++ printk("new winctrl1 %08X\n", winctrl1); ++ ++ /*winenable = lcd->winenable & (1 << plane); */ ++ /*lcd->winenable &= ~(1 << plane); */ ++ lcd->window[plane].winctrl1 = winctrl1; ++ /*lcd->winenable |= winenable; */ ++#endif ++ return 0; ++} ++ ++static int au1200_setlocation (int plane, int xpos, int ypos) ++{ ++ uint32 winctrl0, winctrl1, winenable, fb_offset = 0; ++ int xsz, ysz; ++ ++ /* FIX!!! NOT CHECKING FOR COMPLETE OFFSCREEN YET */ ++ ++ winctrl0 = lcd->window[plane].winctrl0; ++ winctrl1 = lcd->window[plane].winctrl1; ++ winctrl0 &= (LCD_WINCTRL0_A | LCD_WINCTRL0_AEN); ++ winctrl1 &= ~(LCD_WINCTRL1_SZX | LCD_WINCTRL1_SZY); ++ ++ /* Check for off-screen adjustments */ ++ xsz = win->w[plane].xres; ++ ysz = win->w[plane].yres; ++ if ((xpos + win->w[plane].xres) > panel->Xres) ++ { ++ /* Off-screen to the right */ ++ xsz = panel->Xres - xpos; /* off by 1 ??? */ ++ /*printk("off screen right\n");*/ ++ } ++ ++ if ((ypos + win->w[plane].yres) > panel->Yres) ++ { ++ /* Off-screen to the bottom */ ++ ysz = panel->Yres - ypos; /* off by 1 ??? */ ++ /*printk("off screen bottom\n");*/ ++ } ++ ++ if (xpos < 0) ++ { ++ /* Off-screen to the left */ ++ xsz = win->w[plane].xres + xpos; ++ fb_offset += (((0 - xpos) * winbpp(lcd->window[plane].winctrl1))/8); ++ xpos = 0; ++ /*printk("off screen left\n");*/ ++ } ++ ++ if (ypos < 0) ++ { ++ /* Off-screen to the top */ ++ ysz = win->w[plane].yres + ypos; ++ fb_offset += ((0 - ypos) * fb_pars[plane].line_length); ++ ypos = 0; ++ /*printk("off screen top\n");*/ ++ } ++ ++ /* record settings */ ++ win->w[plane].xpos = xpos; ++ win->w[plane].ypos = ypos; ++ ++ xsz -= 1; ++ ysz -= 1; ++ winctrl0 |= (xpos << 21); ++ winctrl0 |= (ypos << 10); ++ winctrl1 |= (xsz << 11); ++ winctrl1 |= (ysz << 0); ++ ++ /* Disable the window while making changes, then restore WINEN */ ++ winenable = lcd->winenable & (1 << plane); ++ lcd->winenable &= ~(1 << plane); ++ lcd->window[plane].winctrl0 = winctrl0; ++ lcd->window[plane].winctrl1 = winctrl1; ++ lcd->window[plane].winbuf0 = ++ lcd->window[plane].winbuf1 = fb_infos[plane].fb_phys + fb_offset; ++ lcd->window[plane].winbufctrl = 0; /* select winbuf0 */ ++ lcd->winenable |= winenable; ++ ++ return 0; ++} ++ ++static void au1200_setmode(int plane) ++{ ++ /* Window/plane setup */ ++ lcd->window[plane].winctrl1 = ( 0 ++ | LCD_WINCTRL1_PRI_N(plane) ++ | win->w[plane].mode_winctrl1 /* FRM,CCO,PO,PIPE */ ++ ) ; ++ ++ au1200_setlocation(plane, win->w[plane].xpos, win->w[plane].ypos); ++ ++ lcd->window[plane].winctrl2 = ( 0 ++ | LCD_WINCTRL2_CKMODE_00 ++ | LCD_WINCTRL2_DBM ++/* | LCD_WINCTRL2_RAM */ ++ | LCD_WINCTRL2_BX_N(fb_pars[plane].line_length) ++ | LCD_WINCTRL2_SCX_1 ++ | LCD_WINCTRL2_SCY_1 ++ ) ; ++ lcd->winenable |= win->w[plane].mode_winenable; ++ au_sync(); ++ ++} ++ ++static unsigned long ++au1200fb_alloc_fbmem (unsigned long size) ++{ ++ /* __get_free_pages() fulfills a max request of 2MB */ ++ /* do multiple requests to obtain large contigous mem */ ++#define MAX_GFP 0x00200000 ++ ++ unsigned long mem, amem, alloced = 0, allocsize; ++ ++ size += 0x1000; ++ allocsize = (size < MAX_GFP) ? size : MAX_GFP; ++ ++ /* Get first chunk */ ++ mem = (unsigned long ) ++ __get_free_pages(GFP_ATOMIC | GFP_DMA, get_order(allocsize)); ++ if (mem != 0) alloced = allocsize; ++ ++ /* Get remaining, contiguous chunks */ ++ while (alloced < size) ++ { ++ amem = (unsigned long ) ++ __get_free_pages(GFP_ATOMIC | GFP_DMA, get_order(allocsize)); ++ if (amem != 0) ++ alloced += allocsize; ++ ++ /* check for contiguous mem alloced */ ++ if ((amem == 0) || (amem + allocsize) != mem) ++ break; ++ else ++ mem = amem; ++ } ++ return mem; ++} ++ ++int __init au1200fb_init(void) ++{ ++ int num_panels = sizeof(panels)/sizeof(struct panel_settings); ++ struct au1200fb_info *fb_info; ++ struct display *disp; ++ struct au1200fb_par *par; ++ unsigned long page; ++ int plane, bpp; ++ ++ /* ++ * Get the panel information/display mode ++ */ ++ if (panel_index < 0) ++ panel_index = board_au1200fb_panel(); ++ if ((panel_index < 0) || (panel_index >= num_panels)) { ++ printk("ERROR: INVALID PANEL %d\n", panel_index); ++ return -EINVAL; ++ } ++ panel = &panels[panel_index]; ++ win = &windows[window_index]; ++ ++ printk("au1200fb: Panel %d %s\n", panel_index, panel->name); ++ printk("au1200fb: Win %d %s\n", window_index, win->name); ++ ++ /* Global setup/init */ ++ au1200_setpanel(panel); ++ lcd->intenable = 0; ++ lcd->intstatus = ~0; ++ lcd->backcolor = win->mode_backcolor; ++ lcd->winenable = 0; ++ ++ /* Setup Color Key - FIX!!! */ ++ lcd->colorkey = win->mode_colorkey; ++ lcd->colorkeymsk = win->mode_colorkeymsk; ++ ++ /* Setup HWCursor - FIX!!! Need to support this eventually */ ++ lcd->hwc.cursorctrl = 0; ++ lcd->hwc.cursorpos = 0; ++ lcd->hwc.cursorcolor0 = 0; ++ lcd->hwc.cursorcolor1 = 0; ++ lcd->hwc.cursorcolor2 = 0; ++ lcd->hwc.cursorcolor3 = 0; ++ ++ /* Register each plane as a frame buffer device */ ++ for (plane = 0; plane < CONFIG_FB_AU1200_DEVS; ++plane) ++ { ++ fb_info = &fb_infos[plane]; ++ disp = &disps[plane]; ++ par = &fb_pars[plane]; ++ ++ bpp = winbpp(win->w[plane].mode_winctrl1); ++ if (win->w[plane].xres == 0) ++ win->w[plane].xres = panel->Xres; ++ if (win->w[plane].yres == 0) ++ win->w[plane].yres = panel->Yres; ++ ++ par->var.xres = ++ par->var.xres_virtual = win->w[plane].xres; ++ par->var.yres = ++ par->var.yres_virtual = win->w[plane].yres; ++ par->var.bits_per_pixel = bpp; ++ par->line_length = win->w[plane].xres * bpp / 8; /* in bytes */ ++ /* ++ * Allocate LCD framebuffer from system memory ++ * Set page reserved so that mmap will work. This is necessary ++ * since we'll be remapping normal memory. ++ */ ++ fb_info->fb_size = (win->w[plane].xres * win->w[plane].yres * bpp) / 8; ++ fb_info->fb_virt_start = au1200fb_alloc_fbmem(fb_info->fb_size); ++ if (!fb_info->fb_virt_start) { ++ printk("Unable to allocate fb memory\n"); ++ return -ENOMEM; ++ } ++ fb_info->fb_phys = virt_to_bus((void *)fb_info->fb_virt_start); ++ for (page = fb_info->fb_virt_start; ++ page < PAGE_ALIGN(fb_info->fb_virt_start + fb_info->fb_size); ++ page += PAGE_SIZE) { ++ SetPageReserved(virt_to_page(page)); ++ } ++ /* Convert to kseg1 */ ++ fb_info->fb_virt_start = ++ (void *)((u32)fb_info->fb_virt_start | 0xA0000000); ++ /* FIX!!! may wish to avoid this to save startup time??? */ ++ memset((void *)fb_info->fb_virt_start, 0, fb_info->fb_size); ++ ++ fb_info->gen.parsize = sizeof(struct au1200fb_par); ++ fb_info->gen.fbhw = &au1200_switch; ++ strcpy(fb_info->gen.info.modename, "Au1200 LCD"); ++ fb_info->gen.info.changevar = NULL; ++ fb_info->gen.info.node = -1; ++ ++ fb_info->gen.info.fbops = &au1200fb_ops; ++ fb_info->gen.info.disp = disp; ++ fb_info->gen.info.switch_con = &fbgen_switch; ++ fb_info->gen.info.updatevar = &fbgen_update_var; ++ fb_info->gen.info.blank = &fbgen_blank; ++ fb_info->gen.info.flags = FBINFO_FLAG_DEFAULT; ++ ++ fb_info->nohwcursor = 1; ++ fb_info->noblanking = 1; ++ ++ /* This should give a reasonable default video mode */ ++ fbgen_get_var(&disp->var, -1, &fb_info->gen.info); ++ fbgen_do_set_var(&disp->var, 1, &fb_info->gen); ++ fbgen_set_disp(-1, &fb_info->gen); ++ fbgen_install_cmap(0, &fb_info->gen); ++ ++ /* Turn on plane */ ++ au1200_setmode(plane); ++ ++ if (register_framebuffer(&fb_info->gen.info) < 0) ++ return -EINVAL; ++ ++ printk(KERN_INFO "fb%d: %s plane %d @ %08X (%d x %d x %d)\n", ++ GET_FB_IDX(fb_info->gen.info.node), ++ fb_info->gen.info.modename, plane, fb_info->fb_phys, ++ win->w[plane].xres, win->w[plane].yres, bpp); ++ } ++ /* uncomment this if your driver cannot be unloaded */ ++ /* MOD_INC_USE_COUNT; */ ++ return 0; ++} ++ ++void au1200fb_setup(char *options, int *ints) ++{ ++ char* this_opt; ++ int i; ++ int num_panels = sizeof(panels)/sizeof(struct panel_settings); ++ ++ if (!options || !*options) ++ return; ++ ++ for(this_opt=strtok(options, ","); this_opt; ++ this_opt=strtok(NULL, ",")) { ++ if (!strncmp(this_opt, "panel:", 6)) { ++ int i; ++ long int li; ++ char *endptr; ++ this_opt += 6; ++ ++ /* Panel name can be name, "bs" for board-switch, or number/index */ ++ li = simple_strtol(this_opt, &endptr, 0); ++ if (*endptr == '\0') { ++ panel_index = (int)li; ++ } ++ else if (strcmp(this_opt, "bs") == 0) { ++ panel_index = board_au1200fb_panel(); ++ } ++ else ++ for (i=0; i<num_panels; i++) { ++ if (!strcmp(this_opt, panels[i].name)) { ++ panel_index = i; ++ break; ++ } ++ } ++ } ++ else if (!strncmp(this_opt, "nohwcursor", 10)) { ++ printk("nohwcursor\n"); ++ fb_infos[0].nohwcursor = 1; ++ } ++ } ++ ++ printk("au1200fb: Panel %d %s\n", panel_index, ++ panels[panel_index].name); ++} ++ ++ ++ ++#ifdef MODULE ++MODULE_LICENSE("GPL"); ++MODULE_DESCRIPTION("Au1200 LCD framebuffer driver"); ++ ++void au1200fb_cleanup(struct fb_info *info) ++{ ++ unregister_framebuffer(info); ++} ++ ++module_init(au1200fb_init); ++module_exit(au1200fb_cleanup); ++#endif /* MODULE */ ++ ++ +diff -Nur linux-2.4.30/drivers/video/au1200fb.h linux-2.4.30-mips/drivers/video/au1200fb.h +--- linux-2.4.30/drivers/video/au1200fb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/video/au1200fb.h 2005-02-11 22:16:44.000000000 +0100 +@@ -0,0 +1,288 @@ ++/* ++ * BRIEF MODULE DESCRIPTION ++ * Hardware definitions for the Au1200 LCD controller ++ * ++ * Copyright 2004 AMD ++ * Author: AMD ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#ifndef _AU1200LCD_H ++#define _AU1200LCD_H ++ ++/********************************************************************/ ++#define AU1200_LCD_ADDR 0xB5000000 ++ ++#define uint8 unsigned char ++#define uint32 unsigned int ++ ++typedef volatile struct ++{ ++ uint32 reserved0; ++ uint32 screen; ++ uint32 backcolor; ++ uint32 horztiming; ++ uint32 verttiming; ++ uint32 clkcontrol; ++ uint32 pwmdiv; ++ uint32 pwmhi; ++ uint32 reserved1; ++ uint32 winenable; ++ uint32 colorkey; ++ uint32 colorkeymsk; ++ struct ++ { ++ uint32 cursorctrl; ++ uint32 cursorpos; ++ uint32 cursorcolor0; ++ uint32 cursorcolor1; ++ uint32 cursorcolor2; ++ uint32 cursorcolor3; ++ } hwc; ++ uint32 intstatus; ++ uint32 intenable; ++ uint32 outmask; ++ uint32 fifoctrl; ++ uint32 reserved2[(0x0100-0x0058)/4]; ++ struct ++ { ++ uint32 winctrl0; ++ uint32 winctrl1; ++ uint32 winctrl2; ++ uint32 winbuf0; ++ uint32 winbuf1; ++ uint32 winbufctrl; ++ uint32 winreserved0; ++ uint32 winreserved1; ++ } window[4]; ++ ++ uint32 reserved3[(0x0400-0x0180)/4]; ++ ++ uint32 palette[(0x0800-0x0400)/4]; ++ ++ uint8 cursorpattern[256]; ++ ++} AU1200_LCD; ++ ++/* lcd_screen */ ++#define LCD_SCREEN_SEN (1<<31) ++#define LCD_SCREEN_SX (0x07FF<<19) ++#define LCD_SCREEN_SY (0x07FF<< 8) ++#define LCD_SCREEN_SWP (1<<7) ++#define LCD_SCREEN_SWD (1<<6) ++#define LCD_SCREEN_ST (7<<0) ++#define LCD_SCREEN_ST_TFT (0<<0) ++#define LCD_SCREEN_SX_N(WIDTH) ((WIDTH-1)<<19) ++#define LCD_SCREEN_SY_N(HEIGHT) ((HEIGHT-1)<<8) ++#define LCD_SCREEN_ST_CSTN (1<<0) ++#define LCD_SCREEN_ST_CDSTN (2<<0) ++#define LCD_SCREEN_ST_M8STN (3<<0) ++#define LCD_SCREEN_ST_M4STN (4<<0) ++ ++/* lcd_backcolor */ ++#define LCD_BACKCOLOR_SBGR (0xFF<<16) ++#define LCD_BACKCOLOR_SBGG (0xFF<<8) ++#define LCD_BACKCOLOR_SBGB (0xFF<<0) ++#define LCD_BACKCOLOR_SBGR_N(N) ((N)<<16) ++#define LCD_BACKCOLOR_SBGG_N(N) ((N)<<8) ++#define LCD_BACKCOLOR_SBGB_N(N) ((N)<<0) ++ ++/* lcd_winenable */ ++#define LCD_WINENABLE_WEN3 (1<<3) ++#define LCD_WINENABLE_WEN2 (1<<2) ++#define LCD_WINENABLE_WEN1 (1<<1) ++#define LCD_WINENABLE_WEN0 (1<<0) ++ ++/* lcd_colorkey */ ++#define LCD_COLORKEY_CKR (0xFF<<16) ++#define LCD_COLORKEY_CKG (0xFF<<8) ++#define LCD_COLORKEY_CKB (0xFF<<0) ++#define LCD_COLORKEY_CKR_N(N) ((N)<<16) ++#define LCD_COLORKEY_CKG_N(N) ((N)<<8) ++#define LCD_COLORKEY_CKB_N(N) ((N)<<0) ++ ++/* lcd_colorkeymsk */ ++#define LCD_COLORKEYMSK_CKMR (0xFF<<16) ++#define LCD_COLORKEYMSK_CKMG (0xFF<<8) ++#define LCD_COLORKEYMSK_CKMB (0xFF<<0) ++#define LCD_COLORKEYMSK_CKMR_N(N) ((N)<<16) ++#define LCD_COLORKEYMSK_CKMG_N(N) ((N)<<8) ++#define LCD_COLORKEYMSK_CKMB_N(N) ((N)<<0) ++ ++/* lcd windows control 0 */ ++#define LCD_WINCTRL0_OX (0x07FF<<21) ++#define LCD_WINCTRL0_OY (0x07FF<<10) ++#define LCD_WINCTRL0_A (0x00FF<<2) ++#define LCD_WINCTRL0_AEN (1<<1) ++#define LCD_WINCTRL0_OX_N(N) ((N)<<21) ++#define LCD_WINCTRL0_OY_N(N) ((N)<<10) ++#define LCD_WINCTRL0_A_N(N) ((N)<<2) ++ ++/* lcd windows control 1 */ ++#define LCD_WINCTRL1_PRI (3<<30) ++#define LCD_WINCTRL1_PIPE (1<<29) ++#define LCD_WINCTRL1_FRM (0xF<<25) ++#define LCD_WINCTRL1_CCO (1<<24) ++#define LCD_WINCTRL1_PO (3<<22) ++#define LCD_WINCTRL1_SZX (0x07FF<<11) ++#define LCD_WINCTRL1_SZY (0x07FF<<0) ++#define LCD_WINCTRL1_FRM_1BPP (0<<25) ++#define LCD_WINCTRL1_FRM_2BPP (1<<25) ++#define LCD_WINCTRL1_FRM_4BPP (2<<25) ++#define LCD_WINCTRL1_FRM_8BPP (3<<25) ++#define LCD_WINCTRL1_FRM_12BPP (4<<25) ++#define LCD_WINCTRL1_FRM_16BPP655 (5<<25) ++#define LCD_WINCTRL1_FRM_16BPP565 (6<<25) ++#define LCD_WINCTRL1_FRM_16BPP556 (7<<25) ++#define LCD_WINCTRL1_FRM_16BPPI1555 (8<<25) ++#define LCD_WINCTRL1_FRM_16BPPI5551 (9<<25) ++#define LCD_WINCTRL1_FRM_16BPPA1555 (10<<25) ++#define LCD_WINCTRL1_FRM_16BPPA5551 (11<<25) ++#define LCD_WINCTRL1_FRM_24BPP (12<<25) ++#define LCD_WINCTRL1_FRM_32BPP (13<<25) ++#define LCD_WINCTRL1_PRI_N(N) ((N)<<30) ++#define LCD_WINCTRL1_PO_00 (0<<22) ++#define LCD_WINCTRL1_PO_01 (1<<22) ++#define LCD_WINCTRL1_PO_10 (2<<22) ++#define LCD_WINCTRL1_PO_11 (3<<22) ++#define LCD_WINCTRL1_SZX_N(N) ((N-1)<<11) ++#define LCD_WINCTRL1_SZY_N(N) ((N-1)<<0) ++ ++/* lcd windows control 2 */ ++#define LCD_WINCTRL2_CKMODE (3<<24) ++#define LCD_WINCTRL2_DBM (1<<23) ++#define LCD_WINCTRL2_RAM (3<<21) ++#define LCD_WINCTRL2_BX (0x1FFF<<8) ++#define LCD_WINCTRL2_SCX (0xF<<4) ++#define LCD_WINCTRL2_SCY (0xF<<0) ++#define LCD_WINCTRL2_CKMODE_00 (0<<24) ++#define LCD_WINCTRL2_CKMODE_01 (1<<24) ++#define LCD_WINCTRL2_CKMODE_10 (2<<24) ++#define LCD_WINCTRL2_CKMODE_11 (3<<24) ++#define LCD_WINCTRL2_RAM_NONE (0<<21) ++#define LCD_WINCTRL2_RAM_PALETTE (1<<21) ++#define LCD_WINCTRL2_RAM_GAMMA (2<<21) ++#define LCD_WINCTRL2_RAM_BUFFER (3<<21) ++#define LCD_WINCTRL2_BX_N(N) ((N)<<8) ++#define LCD_WINCTRL2_SCX_1 (0<<4) ++#define LCD_WINCTRL2_SCX_2 (1<<4) ++#define LCD_WINCTRL2_SCX_4 (2<<4) ++#define LCD_WINCTRL2_SCY_1 (0<<0) ++#define LCD_WINCTRL2_SCY_2 (1<<0) ++#define LCD_WINCTRL2_SCY_4 (2<<0) ++ ++/* lcd windows buffer control */ ++#define LCD_WINBUFCTRL_DB (1<<1) ++#define LCD_WINBUFCTRL_DBN (1<<0) ++ ++/* lcd_intstatus, lcd_intenable */ ++#define LCD_INT_IFO (0xF<<14) ++#define LCD_INT_IFU (0xF<<10) ++#define LCD_INT_OFO (1<<9) ++#define LCD_INT_OFU (1<<8) ++#define LCD_INT_WAIT (1<<3) ++#define LCD_INT_SD (1<<2) ++#define LCD_INT_SA (1<<1) ++#define LCD_INT_SS (1<<0) ++ ++/* lcd_horztiming */ ++#define LCD_HORZTIMING_HND2 (0x1FF<<18) ++#define LCD_HORZTIMING_HND1 (0x1FF<<9) ++#define LCD_HORZTIMING_HPW (0x1FF<<0) ++#define LCD_HORZTIMING_HND2_N(N)(((N)-1)<<18) ++#define LCD_HORZTIMING_HND1_N(N)(((N)-1)<<9) ++#define LCD_HORZTIMING_HPW_N(N) (((N)-1)<<0) ++ ++/* lcd_verttiming */ ++#define LCD_VERTTIMING_VND2 (0x1FF<<18) ++#define LCD_VERTTIMING_VND1 (0x1FF<<9) ++#define LCD_VERTTIMING_VPW (0x1FF<<0) ++#define LCD_VERTTIMING_VND2_N(N)(((N)-1)<<18) ++#define LCD_VERTTIMING_VND1_N(N)(((N)-1)<<9) ++#define LCD_VERTTIMING_VPW_N(N) (((N)-1)<<0) ++ ++/* lcd_clkcontrol */ ++#define LCD_CLKCONTROL_EXT (1<<22) ++#define LCD_CLKCONTROL_DELAY (3<<20) ++#define LCD_CLKCONTROL_CDD (1<<19) ++#define LCD_CLKCONTROL_IB (1<<18) ++#define LCD_CLKCONTROL_IC (1<<17) ++#define LCD_CLKCONTROL_IH (1<<16) ++#define LCD_CLKCONTROL_IV (1<<15) ++#define LCD_CLKCONTROL_BF (0x1F<<10) ++#define LCD_CLKCONTROL_PCD (0x3FF<<0) ++#define LCD_CLKCONTROL_BF_N(N) (((N)-1)<<10) ++#define LCD_CLKCONTROL_PCD_N(N) ((N)<<0) ++ ++/* lcd_pwmdiv */ ++#define LCD_PWMDIV_EN (1<<31) ++#define LCD_PWMDIV_PWMDIV (0x1FFFF<<0) ++#define LCD_PWMDIV_PWMDIV_N(N) ((N)<<0) ++ ++/* lcd_pwmhi */ ++#define LCD_PWMHI_PWMHI1 (0xFFFF<<16) ++#define LCD_PWMHI_PWMHI0 (0xFFFF<<0) ++#define LCD_PWMHI_PWMHI1_N(N) ((N)<<16) ++#define LCD_PWMHI_PWMHI0_N(N) ((N)<<0) ++ ++/* lcd_hwccon */ ++#define LCD_HWCCON_EN (1<<0) ++ ++/* lcd_cursorpos */ ++#define LCD_CURSORPOS_HWCXOFF (0x1F<<27) ++#define LCD_CURSORPOS_HWCXPOS (0x07FF<<16) ++#define LCD_CURSORPOS_HWCYOFF (0x1F<<11) ++#define LCD_CURSORPOS_HWCYPOS (0x07FF<<0) ++#define LCD_CURSORPOS_HWCXOFF_N(N) ((N)<<27) ++#define LCD_CURSORPOS_HWCXPOS_N(N) ((N)<<16) ++#define LCD_CURSORPOS_HWCYOFF_N(N) ((N)<<11) ++#define LCD_CURSORPOS_HWCYPOS_N(N) ((N)<<0) ++ ++/* lcd_cursorcolor */ ++#define LCD_CURSORCOLOR_HWCA (0xFF<<24) ++#define LCD_CURSORCOLOR_HWCR (0xFF<<16) ++#define LCD_CURSORCOLOR_HWCG (0xFF<<8) ++#define LCD_CURSORCOLOR_HWCB (0xFF<<0) ++#define LCD_CURSORCOLOR_HWCA_N(N) ((N)<<24) ++#define LCD_CURSORCOLOR_HWCR_N(N) ((N)<<16) ++#define LCD_CURSORCOLOR_HWCG_N(N) ((N)<<8) ++#define LCD_CURSORCOLOR_HWCB_N(N) ((N)<<0) ++ ++/* lcd_fifoctrl */ ++#define LCD_FIFOCTRL_F3IF (1<<29) ++#define LCD_FIFOCTRL_F3REQ (0x1F<<24) ++#define LCD_FIFOCTRL_F2IF (1<<29) ++#define LCD_FIFOCTRL_F2REQ (0x1F<<16) ++#define LCD_FIFOCTRL_F1IF (1<<29) ++#define LCD_FIFOCTRL_F1REQ (0x1F<<8) ++#define LCD_FIFOCTRL_F0IF (1<<29) ++#define LCD_FIFOCTRL_F0REQ (0x1F<<0) ++#define LCD_FIFOCTRL_F3REQ_N(N) ((N-1)<<24) ++#define LCD_FIFOCTRL_F2REQ_N(N) ((N-1)<<16) ++#define LCD_FIFOCTRL_F1REQ_N(N) ((N-1)<<8) ++#define LCD_FIFOCTRL_F0REQ_N(N) ((N-1)<<0) ++ ++/* lcd_outmask */ ++#define LCD_OUTMASK_MASK (0x00FFFFFF) ++ ++/********************************************************************/ ++#endif /* _AU1200LCD_H */ +diff -Nur linux-2.4.30/drivers/video/fbmem.c linux-2.4.30-mips/drivers/video/fbmem.c +--- linux-2.4.30/drivers/video/fbmem.c 2005-01-19 15:10:09.000000000 +0100 ++++ linux-2.4.30-mips/drivers/video/fbmem.c 2005-02-11 22:16:44.000000000 +0100 +@@ -139,6 +139,8 @@ + extern int e1356fb_setup(char*); + extern int au1100fb_init(void); + extern int au1100fb_setup(char*); ++extern int au1200fb_init(void); ++extern int au1200fb_setup(char*); + extern int pvr2fb_init(void); + extern int pvr2fb_setup(char*); + extern int sstfb_init(void); +@@ -331,6 +333,9 @@ + #ifdef CONFIG_FB_AU1100 + { "au1100fb", au1100fb_init, au1100fb_setup }, + #endif ++#ifdef CONFIG_FB_AU1200 ++ { "au1200fb", au1200fb_init, au1200fb_setup }, ++#endif + #ifdef CONFIG_FB_IT8181 + { "it8181fb", it8181fb_init, it8181fb_setup }, + #endif +diff -Nur linux-2.4.30/drivers/video/ims332.h linux-2.4.30-mips/drivers/video/ims332.h +--- linux-2.4.30/drivers/video/ims332.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/drivers/video/ims332.h 2003-12-22 17:02:20.000000000 +0100 +@@ -0,0 +1,275 @@ ++/* ++ * linux/drivers/video/ims332.h ++ * ++ * Copyright 2003 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de> ++ * ++ * This file is subject to the terms and conditions of the GNU General ++ * Public License. See the file COPYING in the main directory of this ++ * archive for more details. ++ */ ++#include <linux/types.h> ++ ++/* ++ * IMS332 16-bit wide, 128-bit aligned registers. ++ */ ++struct _ims332_reg { ++ volatile u16 r; ++ u16 pad[7]; ++}; ++ ++struct _ims332_regs { ++#define IMS332_BOOT_PLL_MUTLIPLIER 0x00001f ++#define IMS332_BOOT_CLOCK_SOURCE_SEL 0x000020 ++#define IMS332_BOOT_ADDRESS_ALIGNMENT 0x000040 ++#define IMS332_BOOT_WRITE_ZERO 0xffff80 ++ struct _ims332_reg boot; ++ struct _ims332_reg pad0[0x020 - 0x000]; ++ struct _ims332_reg half_sync; ++ struct _ims332_reg back_porch; ++ struct _ims332_reg display; ++ struct _ims332_reg short_display; ++ struct _ims332_reg broad_pulse; ++ struct _ims332_reg vsync; ++ struct _ims332_reg vpre_equalise; ++ struct _ims332_reg vpost_equalise; ++ struct _ims332_reg vblank; ++ struct _ims332_reg vdisplay; ++ struct _ims332_reg line_time; ++ struct _ims332_reg line_start; ++ struct _ims332_reg mem_init; ++ struct _ims332_reg transfer_delay; ++ struct _ims332_reg pad1[0x03f - 0x02e]; ++ struct _ims332_reg pixel_address_mask; ++ struct _ims332_reg pad2[0x05f - 0x040]; ++ ++#define IMS332_CTRL_A_BOOT_ENABLE_VTG 0x000001 ++#define IMS332_CTRL_A_SCREEN_FORMAT 0x000002 ++#define IMS332_CTRL_A_INTERLACED_STANDARD 0x000004 ++#define IMS332_CTRL_A_OPERATING_MODE 0x000008 ++#define IMS332_CTRL_A_FRAME_FLYBACK_PATTERN 0x000010 ++#define IMS332_CTRL_A_DIGITAL_SYNC_FORMAT 0x000020 ++#define IMS332_CTRL_A_ANALOGUE_VIDEO_FORMAT 0x000040 ++#define IMS332_CTRL_A_BLANK_LEVEL 0x000080 ++#define IMS332_CTRL_A_BLANK_IO 0x000100 ++#define IMS332_CTRL_A_BLANK_FUNCTION_SWITCH 0x000200 ++#define IMS332_CTRL_A_FORCE_BLANKING 0x000400 ++#define IMS332_CTRL_A_TURN_OFF_BLANKING 0x000800 ++#define IMS332_CTRL_A_VRAM_ADDRESS_INCREMENT 0x003000 ++#define IMS332_CTRL_A_TURN_OFF_DMA 0x004000 ++#define IMS332_CTRL_A_SYNC_DELAY 0x038000 ++#define IMS332_CTRL_A_PIXEL_PORT_INTERLEAVING 0x040000 ++#define IMS332_CTRL_A_DELAYED_SAMPLING 0x080000 ++#define IMS332_CTRL_A_BITS_PER_PIXEL 0x700000 ++#define IMS332_CTRL_A_CURSOR_DISABLE 0x800000 ++ struct _ims332_reg config_control_a; ++ struct _ims332_reg pad3[0x06f - 0x060]; ++ ++#define IMS332_CTRL_B_WRITE_ZERO 0xffffff ++ struct _ims332_reg config_control_b; ++ struct _ims332_reg pad4[0x07f - 0x070]; ++ struct _ims332_reg screen_top; ++ struct _ims332_reg pad5[0x0a0 - 0x080]; ++ /* cursor color palette, 3 entries, reg no. 0xa1 - 0xa3 */ ++ struct _ims332_reg cursor_color_palette0; ++ struct _ims332_reg cursor_color_palette1; ++ struct _ims332_reg cursor_color_palette2; ++ struct _ims332_reg pad6[0x0bf - 0x0a3]; ++ struct _ims332_reg rgb_frame_checksum0; ++ struct _ims332_reg rgb_frame_checksum1; ++ struct _ims332_reg rgb_frame_checksum2; ++ struct _ims332_reg pad7[0x0c6 - 0x0c2]; ++ struct _ims332_reg cursor_start; ++ struct _ims332_reg pad8[0x0ff - 0x0c7]; ++ /* color palette, 256 entries of form 0x00BBGGRR, reg no. 0x100 - 0x1ff */ ++ struct _ims332_reg color_palette[0x1ff - 0x0ff]; ++ /* hardware cursor bitmap, reg no. 0x200 - 0x3ff */ ++ struct _ims332_reg cursor_ram[0x3ff - 0x1ff]; ++}; ++ ++/* ++ * In the functions below we use some weird looking helper variables to ++ * access most members of this struct, otherwise the compiler splits ++ * the read/write in two byte accesses. ++ */ ++struct ims332_regs { ++ struct _ims332_regs rw; ++ char pad0[0x80000 - sizeof (struct _ims332_regs)]; ++ struct _ims332_regs r; ++ char pad1[0xa0000 - (sizeof (struct _ims332_regs) + 0x80000)]; ++ struct _ims332_regs w; ++} __attribute__((packed)); ++ ++static inline void ims332_control_reg_bits(struct ims332_regs *regs, u32 mask, ++ u32 val) ++{ ++ volatile u16 *ctr = &(regs->r.config_control_a.r); ++ volatile u16 *ctw = &(regs->w.config_control_a.r); ++ u32 ctrl; ++ ++ mb(); ++ ctrl = *ctr; ++ rmb(); ++ ctrl |= ((regs->rw.boot.r << 8) & 0x00ff0000); ++ ctrl |= val & mask; ++ ctrl &= ~(~val & mask); ++ wmb(); ++ regs->rw.boot.r = (ctrl >> 8) & 0xff00; ++ wmb(); ++ *ctw = ctrl & 0xffff; ++} ++ ++/* FIXME: This is maxinefb specific. */ ++static inline void ims332_bootstrap(struct ims332_regs *regs) ++{ ++ volatile u16 *ctw = &(regs->w.config_control_a.r); ++ u32 ctrl = IMS332_CTRL_A_BOOT_ENABLE_VTG | IMS332_CTRL_A_TURN_OFF_DMA; ++ ++ /* bootstrap sequence */ ++ mb(); ++ regs->rw.boot.r = 0; ++ wmb(); ++ *ctw = 0; ++ ++ /* init control A register */ ++ wmb(); ++ regs->rw.boot.r = (ctrl >> 8) & 0xff00; ++ wmb(); ++ *ctw = ctrl & 0xffff; ++} ++ ++static inline void ims332_blank_screen(struct ims332_regs *regs, int blank) ++{ ++ ims332_control_reg_bits(regs, IMS332_CTRL_A_FORCE_BLANKING, ++ blank ? IMS332_CTRL_A_FORCE_BLANKING : 0); ++} ++ ++static inline void ims332_set_color_depth(struct ims332_regs *regs, u32 depth) ++{ ++ u32 dp; ++ u32 mask = (IMS332_CTRL_A_PIXEL_PORT_INTERLEAVING ++ | IMS332_CTRL_A_DELAYED_SAMPLING ++ | IMS332_CTRL_A_BITS_PER_PIXEL); ++ ++ switch (depth) { ++ case 1: dp = 0 << 20; break; ++ case 2: dp = 1 << 20; break; ++ case 4: dp = 2 << 20; break; ++ case 8: dp = 3 << 20; break; ++ case 15: dp = (4 << 20) | IMS332_CTRL_A_PIXEL_PORT_INTERLEAVING; break; ++ case 16: dp = (5 << 20) | IMS332_CTRL_A_PIXEL_PORT_INTERLEAVING; break; ++ default: return; ++ } ++ ims332_control_reg_bits(regs, mask, dp); ++ ++ if (depth <= 8) { ++ volatile u16 *pmask = &(regs->w.pixel_address_mask.r); ++ u32 dm = (1 << depth) - 1; ++ ++ wmb(); ++ regs->rw.boot.r = dm << 8; ++ wmb(); ++ *pmask = dm << 8 | dm; ++ } ++} ++ ++static inline void ims332_set_screen_top(struct ims332_regs *regs, u16 top) ++{ ++ volatile u16 *st = &(regs->w.screen_top.r); ++ ++ mb(); ++ *st = top & 0xffff; ++} ++ ++static inline void ims332_enable_cursor(struct ims332_regs *regs, int on) ++{ ++ ims332_control_reg_bits(regs, IMS332_CTRL_A_CURSOR_DISABLE, ++ on ? 0 : IMS332_CTRL_A_CURSOR_DISABLE); ++} ++ ++static inline void ims332_position_cursor(struct ims332_regs *regs, ++ u16 x, u16 y) ++{ ++ volatile u16 *cp = &(regs->w.cursor_start.r); ++ u32 val = ((x & 0xfff) << 12) | (y & 0xfff); ++ ++ if (x > 2303 || y > 2303) ++ return; ++ ++ mb(); ++ regs->rw.boot.r = (val >> 8) & 0xff00; ++ wmb(); ++ *cp = val & 0xffff; ++} ++ ++static inline void ims332_set_font(struct ims332_regs *regs, u8 fgc, ++ u16 width, u16 height) ++{ ++ volatile u16 *cp0 = &(regs->w.cursor_color_palette0.r); ++ int i; ++ ++ mb(); ++ for (i = 0; i < 0x200; i++) { ++ volatile u16 *cram = &(regs->w.cursor_ram[i].r); ++ ++ if (height << 6 <= i << 3) ++ *cram = 0x0000; ++ else if (width <= i % 8 << 3) ++ *cram = 0x0000; ++ else if (((width >> 3) & 0xffff) > i % 8) ++ *cram = 0x5555; ++ else ++ *cram = 0x5555 & ~(0xffff << (width % 8 << 1)); ++ wmb(); ++ } ++ regs->rw.boot.r = fgc << 8; ++ wmb(); ++ *cp0 = fgc << 8 | fgc; ++} ++ ++static inline void ims332_read_cmap(struct ims332_regs *regs, u8 reg, ++ u8* red, u8* green, u8* blue) ++{ ++ volatile u16 *rptr = &(regs->r.color_palette[reg].r); ++ u16 val; ++ ++ mb(); ++ val = *rptr; ++ *red = val & 0xff; ++ *green = (val >> 8) & 0xff; ++ rmb(); ++ *blue = (regs->rw.boot.r >> 8) & 0xff; ++} ++ ++static inline void ims332_write_cmap(struct ims332_regs *regs, u8 reg, ++ u8 red, u8 green, u8 blue) ++{ ++ volatile u16 *wptr = &(regs->w.color_palette[reg].r); ++ ++ mb(); ++ regs->rw.boot.r = blue << 8; ++ wmb(); ++ *wptr = (green << 8) + red; ++} ++ ++static inline void ims332_dump_regs(struct ims332_regs *regs) ++{ ++ int i; ++ ++ printk(__FUNCTION__); ++ ims332_control_reg_bits(regs, IMS332_CTRL_A_BOOT_ENABLE_VTG, 0); ++ for (i = 0; i < 0x100; i++) { ++ volatile u16 *cpad = (u16 *)((char *)(®s->r) + sizeof(struct _ims332_reg) * i); ++ u32 val; ++ ++ val = *cpad; ++ rmb(); ++ val |= regs->rw.boot.r << 8; ++ rmb(); ++ if (! (i % 8)) ++ printk("\n%02x:", i); ++ printk(" %06x", val); ++ } ++ ims332_control_reg_bits(regs, IMS332_CTRL_A_BOOT_ENABLE_VTG, ++ IMS332_CTRL_A_BOOT_ENABLE_VTG); ++ printk("\n"); ++} +diff -Nur linux-2.4.30/drivers/video/maxinefb.h linux-2.4.30-mips/drivers/video/maxinefb.h +--- linux-2.4.30/drivers/video/maxinefb.h 2003-08-25 13:44:42.000000000 +0200 ++++ linux-2.4.30-mips/drivers/video/maxinefb.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,38 +0,0 @@ +-/* +- * linux/drivers/video/maxinefb.h +- * +- * DECstation 5000/xx onboard framebuffer support, Copyright (C) 1999 by +- * Michael Engel <engel@unix-ag.org> and Karsten Merker <merker@guug.de> +- * This file is subject to the terms and conditions of the GNU General +- * Public License. See the file COPYING in the main directory of this +- * archive for more details. +- */ +- +-#include <asm/addrspace.h> +- +-/* +- * IMS332 video controller register base address +- */ +-#define MAXINEFB_IMS332_ADDRESS KSEG1ADDR(0x1c140000) +- +-/* +- * Begin of DECstation 5000/xx onboard framebuffer memory, default resolution +- * is 1024x768x8 +- */ +-#define DS5000_xx_ONBOARD_FBMEM_START KSEG1ADDR(0x0a000000) +- +-/* +- * The IMS 332 video controller used in the DECstation 5000/xx series +- * uses 32 bits wide registers; the following defines declare the +- * register numbers, to get the real offset, these have to be multiplied +- * by four. +- */ +- +-#define IMS332_REG_CURSOR_RAM 0x200 /* hardware cursor bitmap */ +- +-/* +- * The color palette entries have the form 0x00BBGGRR +- */ +-#define IMS332_REG_COLOR_PALETTE 0x100 /* color palette, 256 entries */ +-#define IMS332_REG_CURSOR_COLOR_PALETTE 0x0a1 /* cursor color palette, */ +- /* 3 entries */ +diff -Nur linux-2.4.30/drivers/video/newport_con.c linux-2.4.30-mips/drivers/video/newport_con.c +--- linux-2.4.30/drivers/video/newport_con.c 2003-08-25 13:44:42.000000000 +0200 ++++ linux-2.4.30-mips/drivers/video/newport_con.c 2004-09-23 15:32:29.000000000 +0200 +@@ -22,6 +22,7 @@ + #include <linux/module.h> + #include <linux/slab.h> + ++#include <asm/io.h> + #include <asm/uaccess.h> + #include <asm/system.h> + #include <asm/page.h> +@@ -77,7 +78,7 @@ + static inline void newport_render_background(int xstart, int ystart, + int xend, int yend, int ci) + { +- newport_wait(); ++ newport_wait(npregs); + npregs->set.wrmask = 0xffffffff; + npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK | + NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX +@@ -94,7 +95,7 @@ + unsigned short i; + + for (i = 0; i < 16; i++) { +- newport_bfwait(); ++ newport_bfwait(npregs); + newport_cmap_setaddr(npregs, color_table[i]); + newport_cmap_setrgb(npregs, + default_red[i], +@@ -107,7 +108,7 @@ + unsigned long i; + + for (i = 0; i < LINUX_LOGO_COLORS; i++) { +- newport_bfwait(); ++ newport_bfwait(npregs); + newport_cmap_setaddr(npregs, i + 0x20); + newport_cmap_setrgb(npregs, + linux_logo_red[i], +@@ -115,13 +116,13 @@ + linux_logo_blue[i]); + } + +- newport_wait(); ++ newport_wait(npregs); + npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK | + NPORT_DMODE0_CHOST); + + npregs->set.xystarti = ((newport_xsize - LOGO_W) << 16) | (0); + npregs->set.xyendi = ((newport_xsize - 1) << 16); +- newport_wait(); ++ newport_wait(npregs); + + for (i = 0; i < LOGO_W * LOGO_H; i++) + npregs->go.hostrw0 = linux_logo[i] << 24; +@@ -133,7 +134,7 @@ + if (logo_active) + return; + +- newport_wait(); ++ newport_wait(npregs); + npregs->set.wrmask = 0xffffffff; + npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK | + NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX +@@ -155,7 +156,7 @@ + unsigned short treg; + int i; + +- newport_wait(); ++ newport_wait(npregs); + treg = newport_vc2_get(npregs, VC2_IREG_CONTROL); + newport_vc2_set(npregs, VC2_IREG_CONTROL, + (treg | VC2_CTRL_EVIDEO)); +@@ -165,7 +166,7 @@ + npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM | + NPORT_DMODE_W2 | VC2_PROTOCOL); + for (i = 0; i < 128; i++) { +- newport_bfwait(); ++ newport_bfwait(npregs); + if (i == 92 || i == 94) + npregs->set.dcbdata0.byshort.s1 = 0xff00; + else +@@ -205,7 +206,7 @@ + npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM | + NPORT_DMODE_W2 | VC2_PROTOCOL); + for (i = 0; i < 128; i++) { +- newport_bfwait(); ++ newport_bfwait(npregs); + linetable[i] = npregs->set.dcbdata0.byshort.s1; + } + +@@ -216,12 +217,12 @@ + npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM | + NPORT_DMODE_W2 | VC2_PROTOCOL); + do { +- newport_bfwait(); ++ newport_bfwait(npregs); + treg = npregs->set.dcbdata0.byshort.s1; + if ((treg & 1) == 0) + cols += (treg >> 7) & 0xfe; + if ((treg & 0x80) == 0) { +- newport_bfwait(); ++ newport_bfwait(npregs); + treg = npregs->set.dcbdata0.byshort.s1; + } + } while ((treg & 0x8000) == 0); +@@ -291,16 +292,16 @@ + + if (!sgi_gfxaddr) + return NULL; +- npregs = (struct newport_regs *) (KSEG1 + sgi_gfxaddr); ++ npregs = (struct newport_regs *) /* ioremap cannot fail */ ++ ioremap(sgi_gfxaddr, sizeof(struct newport_regs)); + npregs->cset.config = NPORT_CFG_GD0; + +- if (newport_wait()) { +- return NULL; +- } ++ if (newport_wait(npregs)) ++ goto out_unmap; + + npregs->set.xstarti = TESTVAL; + if (npregs->set._xstart.word != XSTI_TO_FXSTART(TESTVAL)) +- return NULL; ++ goto out_unmap; + + for (i = 0; i < MAX_NR_CONSOLES; i++) + font_data[i] = FONT_DATA; +@@ -310,6 +311,10 @@ + newport_get_screensize(); + + return "SGI Newport"; ++ ++out_unmap: ++ iounmap((void *)npregs); ++ return NULL; + } + + static void newport_init(struct vc_data *vc, int init) +@@ -363,7 +368,7 @@ + (charattr & 0xf0) >> 4); + + /* Set the color and drawing mode. */ +- newport_wait(); ++ newport_wait(npregs); + npregs->set.colori = charattr & 0xf; + npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK | + NPORT_DMODE0_STOPX | NPORT_DMODE0_ZPENAB | +@@ -372,7 +377,7 @@ + /* Set coordinates for bitmap operation. */ + npregs->set.xystarti = (xpos << 16) | ((ypos + topscan) & 0x3ff); + npregs->set.xyendi = ((xpos + 7) << 16); +- newport_wait(); ++ newport_wait(npregs); + + /* Go, baby, go... */ + RENDER(npregs, p); +@@ -396,7 +401,7 @@ + xpos + ((count - 1) << 3), ypos, + (charattr & 0xf0) >> 4); + +- newport_wait(); ++ newport_wait(npregs); + + /* Set the color and drawing mode. */ + npregs->set.colori = charattr & 0xf; +@@ -407,7 +412,7 @@ + for (i = 0; i < count; i++, xpos += 8) { + p = &font_data[vc->vc_num][(scr_readw(s++) & 0xff) << 4]; + +- newport_wait(); ++ newport_wait(npregs); + + /* Set coordinates for bitmap operation. */ + npregs->set.xystarti = +@@ -689,7 +694,7 @@ + xe = xs; + xs = tmp; + } +- newport_wait(); ++ newport_wait(npregs); + npregs->set.drawmode0 = (NPORT_DMODE0_S2S | NPORT_DMODE0_BLOCK | + NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX + | NPORT_DMODE0_STOPY); +@@ -706,35 +711,35 @@ + #define DUMMY (void *) newport_dummy + + const struct consw newport_con = { +- con_startup: newport_startup, +- con_init: newport_init, +- con_deinit: newport_deinit, +- con_clear: newport_clear, +- con_putc: newport_putc, +- con_putcs: newport_putcs, +- con_cursor: newport_cursor, +- con_scroll: newport_scroll, +- con_bmove: newport_bmove, +- con_switch: newport_switch, +- con_blank: newport_blank, +- con_font_op: newport_font_op, +- con_set_palette: newport_set_palette, +- con_scrolldelta: newport_scrolldelta, +- con_set_origin: DUMMY, +- con_save_screen: DUMMY ++ .con_startup = newport_startup, ++ .con_init = newport_init, ++ .con_deinit = newport_deinit, ++ .con_clear = newport_clear, ++ .con_putc = newport_putc, ++ .con_putcs = newport_putcs, ++ .con_cursor = newport_cursor, ++ .con_scroll = newport_scroll, ++ .con_bmove = newport_bmove, ++ .con_switch = newport_switch, ++ .con_blank = newport_blank, ++ .con_font_op = newport_font_op, ++ .con_set_palette = newport_set_palette, ++ .con_scrolldelta = newport_scrolldelta, ++ .con_set_origin = DUMMY, ++ .con_save_screen = DUMMY + }; + + #ifdef MODULE + static int __init newport_console_init(void) + { + take_over_console(&newport_con, 0, MAX_NR_CONSOLES - 1, 1); +- + return 0; + } + + static void __exit newport_console_exit(void) + { + give_up_console(&newport_con); ++ iounmap((void *)npregs); + } + + module_init(newport_console_init); +diff -Nur linux-2.4.30/drivers/video/tgafb.c linux-2.4.30-mips/drivers/video/tgafb.c +--- linux-2.4.30/drivers/video/tgafb.c 2001-11-14 23:52:20.000000000 +0100 ++++ linux-2.4.30-mips/drivers/video/tgafb.c 2004-10-30 01:15:02.000000000 +0200 +@@ -45,6 +45,15 @@ + #include <linux/console.h> + #include <asm/io.h> + ++#ifdef CONFIG_TC ++#include <asm/dec/tc.h> ++#else ++static int search_tc_card(const char *) { return -1; } ++static void claim_tc_card(int) { } ++static void release_tc_card(int) { } ++static unsigned long get_tc_base_addr(int) { return 0; } ++#endif ++ + #include <video/fbcon.h> + #include <video/fbcon-cfb8.h> + #include <video/fbcon-cfb32.h> +@@ -84,10 +93,10 @@ + }; + + static unsigned int deep_presets[4] = { +- 0x00014000, +- 0x0001440d, ++ 0x00004000, ++ 0x0000440d, + 0xffffffff, +- 0x0001441d ++ 0x0000441d + }; + + static unsigned int rasterop_presets[4] = { +@@ -131,6 +140,13 @@ + 0, + FB_VMODE_NONINTERLACED + }}, ++ { "1280x1024-72", { /* mode #0 of PMAGD boards */ ++ 1280, 1024, 1280, 1024, 0, 0, 0, 0, ++ {0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0}, ++ 0, 0, -1, -1, FB_ACCELF_TEXT, 7692, 232, 32, 34, 3, 160, 3, ++ FB_SYNC_ON_GREEN, ++ FB_VMODE_NONINTERLACED ++ }}, + { "800x600-56", { + 800, 600, 800, 600, 0, 0, 0, 0, + {0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0}, +@@ -488,7 +504,8 @@ + continue; + + mb(); +- TGA_WRITE_REG(deep_presets[fb_info.tga_type], TGA_DEEP_REG); ++ TGA_WRITE_REG(deep_presets[fb_info.tga_type] | ++ (par->sync_on_green ? 0x0 : 0x00010000), TGA_DEEP_REG); + while (TGA_READ_REG(TGA_CMD_STAT_REG) & 1) /* wait for not busy */ + continue; + mb(); +@@ -548,7 +565,7 @@ + BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_0, 0x40); + BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_1, 0x08); + BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_2, +- (par->sync_on_green ? 0x80 : 0x40)); ++ (par->sync_on_green ? 0xc0 : 0x40)); + + BT463_WRITE(BT463_REG_ACC, BT463_READ_MASK_0, 0xff); + BT463_WRITE(BT463_REG_ACC, BT463_READ_MASK_1, 0xff); +@@ -921,19 +938,34 @@ + int __init tgafb_init(void) + { + struct pci_dev *pdev; ++ int slot; + + pdev = pci_find_device(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TGA, NULL); + if (!pdev) ++ slot = search_tc_card("PMAGD"); ++ if (!pdev && slot < 0) + return -ENXIO; + + /* divine board type */ + +- fb_info.tga_mem_base = (unsigned long)ioremap(pdev->resource[0].start, 0); +- fb_info.tga_type = (readl(fb_info.tga_mem_base) >> 12) & 0x0f; +- fb_info.tga_regs_base = fb_info.tga_mem_base + TGA_REGS_OFFSET; +- fb_info.tga_fb_base = (fb_info.tga_mem_base ++ if (pdev) { ++ fb_info.tga_mem_base = (unsigned long)ioremap(pdev->resource[0].start, ++ 0); ++ fb_info.tga_type = (readl(fb_info.tga_mem_base) >> 12) & 0x0f; ++ fb_info.tga_regs_base = fb_info.tga_mem_base + TGA_REGS_OFFSET; ++ fb_info.tga_fb_base = (fb_info.tga_mem_base + + fb_offset_presets[fb_info.tga_type]); +- pci_read_config_byte(pdev, PCI_REVISION_ID, &fb_info.tga_chip_rev); ++ pci_read_config_byte(pdev, PCI_REVISION_ID, &fb_info.tga_chip_rev); ++ ++ } else { ++ claim_tc_card(slot); ++ fb_info.tga_mem_base = get_tc_base_addr(slot); ++ fb_info.tga_type = (readl(fb_info.tga_mem_base) >> 12) & 0x0f; /* ? */ ++ fb_info.tga_regs_base = fb_info.tga_mem_base + TGA_REGS_OFFSET; ++ fb_info.tga_fb_base = (fb_info.tga_mem_base ++ + fb_offset_presets[fb_info.tga_type]); ++ fb_info.tga_chip_rev = TGA_READ_REG(TGA_START_REG) & 0xff; ++ } + + /* setup framebuffer */ + +@@ -950,40 +982,62 @@ + fb_info.gen.fbhw = &tgafb_hwswitch; + fb_info.gen.fbhw->detect(); + +- printk (KERN_INFO "tgafb: DC21030 [TGA] detected, rev=0x%02x\n", fb_info.tga_chip_rev); +- printk (KERN_INFO "tgafb: at PCI bus %d, device %d, function %d\n", +- pdev->bus->number, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); ++ if (pdev) { ++ printk (KERN_INFO "tgafb: DC21030 [TGA] detected, rev=0x%02x\n", ++ fb_info.tga_chip_rev); ++ printk (KERN_INFO "tgafb: at PCI bus %d, device %d, function %d\n", ++ pdev->bus->number, ++ PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); ++ } else { ++ printk (KERN_INFO "tgafb: SFB+ detected, rev=0x%02x\n", ++ fb_info.tga_chip_rev); ++ } + + switch (fb_info.tga_type) + { + case TGA_TYPE_8PLANE: +- strcpy (fb_info.gen.info.modename,"Digital ZLXp-E1"); ++ if (pdev) ++ strcpy (fb_info.gen.info.modename,"Digital ZLXp-E1"); ++ else ++ strcpy (fb_info.gen.info.modename,"Digital ZLX-E1"); + break; + + case TGA_TYPE_24PLANE: +- strcpy (fb_info.gen.info.modename,"Digital ZLXp-E2"); ++ if (pdev) ++ strcpy (fb_info.gen.info.modename,"Digital ZLXp-E2"); ++ else ++ strcpy (fb_info.gen.info.modename,"Digital ZLX-E2"); + break; + + case TGA_TYPE_24PLUSZ: +- strcpy (fb_info.gen.info.modename,"Digital ZLXp-E3"); ++ if (pdev) ++ strcpy (fb_info.gen.info.modename,"Digital ZLXp-E3"); ++ else ++ strcpy (fb_info.gen.info.modename,"Digital ZLX-E3"); + break; + } + + /* This should give a reasonable default video mode */ + + if (!default_var_valid) { +- default_var = tgafb_predefined[0].var; ++ if (pdev) ++ default_var = tgafb_predefined[0].var; ++ else ++ default_var = tgafb_predefined[1].var; + } + fbgen_get_var(&disp.var, -1, &fb_info.gen.info); + disp.var.activate = FB_ACTIVATE_NOW; + fbgen_do_set_var(&disp.var, 1, &fb_info.gen); + fbgen_set_disp(-1, &fb_info.gen); + fbgen_install_cmap(0, &fb_info.gen); +- if (register_framebuffer(&fb_info.gen.info) < 0) ++ if (register_framebuffer(&fb_info.gen.info) < 0) { ++ if (slot >= 0) ++ release_tc_card(slot); + return -EINVAL; +- printk(KERN_INFO "fb%d: %s frame buffer device at 0x%lx\n", ++ } ++ printk(KERN_INFO "fb%d: %s frame buffer device at 0x%llx\n", + GET_FB_IDX(fb_info.gen.info.node), fb_info.gen.info.modename, +- pdev->resource[0].start); ++ fb_info.tga_mem_base); + return 0; + } + +diff -Nur linux-2.4.30/drivers/video/tgafb.h linux-2.4.30-mips/drivers/video/tgafb.h +--- linux-2.4.30/drivers/video/tgafb.h 2000-04-12 18:47:28.000000000 +0200 ++++ linux-2.4.30-mips/drivers/video/tgafb.h 2004-10-30 01:15:02.000000000 +0200 +@@ -36,6 +36,7 @@ + #define TGA_RASTEROP_REG 0x0034 + #define TGA_PIXELSHIFT_REG 0x0038 + #define TGA_DEEP_REG 0x0050 ++#define TGA_START_REG 0x0054 + #define TGA_PIXELMASK_REG 0x005c + #define TGA_CURSOR_BASE_REG 0x0060 + #define TGA_HORIZ_REG 0x0064 +diff -Nur linux-2.4.30/fs/binfmt_elf.c linux-2.4.30-mips/fs/binfmt_elf.c +--- linux-2.4.30/fs/binfmt_elf.c 2005-04-04 03:42:20.000000000 +0200 ++++ linux-2.4.30-mips/fs/binfmt_elf.c 2005-04-05 21:09:57.000000000 +0200 +@@ -660,6 +660,9 @@ + bprm->argc++; + } + } ++ } else { ++ /* Executables without an interpreter also need a personality */ ++ SET_PERSONALITY(elf_ex, ibcs2_interpreter); + } + + /* Flush all traces of the currently running executable */ +@@ -1211,7 +1214,11 @@ + elf.e_entry = 0; + elf.e_phoff = sizeof(elf); + elf.e_shoff = 0; ++#ifdef ELF_CORE_EFLAGS ++ elf.e_flags = ELF_CORE_EFLAGS; ++#else + elf.e_flags = 0; ++#endif + elf.e_ehsize = sizeof(elf); + elf.e_phentsize = sizeof(struct elf_phdr); + elf.e_phnum = segs+1; /* Include notes */ +diff -Nur linux-2.4.30/fs/partitions/sgi.c linux-2.4.30-mips/fs/partitions/sgi.c +--- linux-2.4.30/fs/partitions/sgi.c 2001-10-02 05:03:26.000000000 +0200 ++++ linux-2.4.30-mips/fs/partitions/sgi.c 2004-08-11 22:30:07.000000000 +0200 +@@ -17,6 +17,11 @@ + #include "check.h" + #include "sgi.h" + ++#if CONFIG_BLK_DEV_MD ++extern void md_autodetect_dev(kdev_t dev); ++#endif ++ ++ + int sgi_partition(struct gendisk *hd, struct block_device *bdev, unsigned long first_sector, int current_minor) + { + int i, csum, magic; +@@ -77,6 +82,10 @@ + if(!blocks) + continue; + add_gd_partition(hd, current_minor, start, blocks); ++#ifdef CONFIG_BLK_DEV_MD ++ if (be32_to_cpu(p->type) == LINUX_RAID_PARTITION) ++ md_autodetect_dev(MKDEV(hd->major, current_minor)); ++#endif + current_minor++; + } + printk("\n"); +diff -Nur linux-2.4.30/fs/proc/array.c linux-2.4.30-mips/fs/proc/array.c +--- linux-2.4.30/fs/proc/array.c 2005-01-19 15:10:11.000000000 +0100 ++++ linux-2.4.30-mips/fs/proc/array.c 2004-11-29 18:47:18.000000000 +0100 +@@ -368,15 +368,15 @@ + task->cmin_flt, + task->maj_flt, + task->cmaj_flt, +- task->times.tms_utime, +- task->times.tms_stime, +- task->times.tms_cutime, +- task->times.tms_cstime, ++ hz_to_std(task->times.tms_utime), ++ hz_to_std(task->times.tms_stime), ++ hz_to_std(task->times.tms_cutime), ++ hz_to_std(task->times.tms_cstime), + priority, + nice, + 0UL /* removed */, + task->it_real_value, +- task->start_time, ++ hz_to_std(task->start_time), + vsize, + mm ? mm->rss : 0, /* you might want to shift this left 3 */ + task->rlim[RLIMIT_RSS].rlim_cur, +@@ -615,14 +615,14 @@ + + len = sprintf(buffer, + "cpu %lu %lu\n", +- task->times.tms_utime, +- task->times.tms_stime); ++ hz_to_std(task->times.tms_utime), ++ hz_to_std(task->times.tms_stime)); + + for (i = 0 ; i < smp_num_cpus; i++) + len += sprintf(buffer + len, "cpu%d %lu %lu\n", + i, +- task->per_cpu_utime[cpu_logical_map(i)], +- task->per_cpu_stime[cpu_logical_map(i)]); ++ hz_to_std(task->per_cpu_utime[cpu_logical_map(i)]), ++ hz_to_std(task->per_cpu_stime[cpu_logical_map(i)])); + + return len; + } +diff -Nur linux-2.4.30/fs/proc/proc_misc.c linux-2.4.30-mips/fs/proc/proc_misc.c +--- linux-2.4.30/fs/proc/proc_misc.c 2004-08-08 01:26:06.000000000 +0200 ++++ linux-2.4.30-mips/fs/proc/proc_misc.c 2004-08-14 20:39:01.000000000 +0200 +@@ -308,16 +308,16 @@ + { + int i, len = 0; + extern unsigned long total_forks; +- unsigned long jif = jiffies; ++ unsigned long jif = hz_to_std(jiffies); + unsigned int sum = 0, user = 0, nice = 0, system = 0; + int major, disk; + + for (i = 0 ; i < smp_num_cpus; i++) { + int cpu = cpu_logical_map(i), j; + +- user += kstat.per_cpu_user[cpu]; +- nice += kstat.per_cpu_nice[cpu]; +- system += kstat.per_cpu_system[cpu]; ++ user += hz_to_std(kstat.per_cpu_user[cpu]); ++ nice += hz_to_std(kstat.per_cpu_nice[cpu]); ++ system += hz_to_std(kstat.per_cpu_system[cpu]); + #if !defined(CONFIG_ARCH_S390) + for (j = 0 ; j < NR_IRQS ; j++) + sum += kstat.irqs[cpu][j]; +@@ -331,10 +331,10 @@ + proc_sprintf(page, &off, &len, + "cpu%d %u %u %u %lu\n", + i, +- kstat.per_cpu_user[cpu_logical_map(i)], +- kstat.per_cpu_nice[cpu_logical_map(i)], +- kstat.per_cpu_system[cpu_logical_map(i)], +- jif - ( kstat.per_cpu_user[cpu_logical_map(i)] \ ++ hz_to_std(kstat.per_cpu_user[cpu_logical_map(i)]), ++ hz_to_std(kstat.per_cpu_nice[cpu_logical_map(i)]), ++ hz_to_std(kstat.per_cpu_system[cpu_logical_map(i)]), ++ jif - hz_to_std( kstat.per_cpu_user[cpu_logical_map(i)] \ + + kstat.per_cpu_nice[cpu_logical_map(i)] \ + + kstat.per_cpu_system[cpu_logical_map(i)])); + proc_sprintf(page, &off, &len, +diff -Nur linux-2.4.30/include/asm-alpha/param.h linux-2.4.30-mips/include/asm-alpha/param.h +--- linux-2.4.30/include/asm-alpha/param.h 2000-11-08 08:37:31.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-alpha/param.h 2000-11-28 04:59:03.000000000 +0100 +@@ -13,6 +13,9 @@ + # else + # define HZ 1200 + # endif ++#ifdef __KERNEL__ ++# define hz_to_std(a) (a) ++#endif + #endif + + #define EXEC_PAGESIZE 8192 +diff -Nur linux-2.4.30/include/asm-i386/param.h linux-2.4.30-mips/include/asm-i386/param.h +--- linux-2.4.30/include/asm-i386/param.h 2000-10-27 20:04:43.000000000 +0200 ++++ linux-2.4.30-mips/include/asm-i386/param.h 2000-11-23 03:00:55.000000000 +0100 +@@ -3,6 +3,9 @@ + + #ifndef HZ + #define HZ 100 ++#ifdef __KERNEL__ ++#define hz_to_std(a) (a) ++#endif + #endif + + #define EXEC_PAGESIZE 4096 +diff -Nur linux-2.4.30/include/asm-ia64/param.h linux-2.4.30-mips/include/asm-ia64/param.h +--- linux-2.4.30/include/asm-ia64/param.h 2004-04-14 15:05:40.000000000 +0200 ++++ linux-2.4.30-mips/include/asm-ia64/param.h 2004-04-16 05:14:20.000000000 +0200 +@@ -7,9 +7,15 @@ + * Based on <asm-i386/param.h>. + * + * Modified 1998, 1999, 2002-2003 +- * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co ++ * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co + */ + ++#include <linux/config.h> ++ ++#ifdef __KERNEL__ ++#define hz_to_std(a) (a) ++#endif ++ + #define EXEC_PAGESIZE 65536 + + #ifndef NGROUPS +diff -Nur linux-2.4.30/include/asm-m68k/param.h linux-2.4.30-mips/include/asm-m68k/param.h +--- linux-2.4.30/include/asm-m68k/param.h 2001-01-04 22:00:55.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-m68k/param.h 2001-01-11 05:02:45.000000000 +0100 +@@ -3,6 +3,9 @@ + + #ifndef HZ + #define HZ 100 ++#ifdef __KERNEL__ ++#define hz_to_std(a) (a) ++#endif + #endif + + #define EXEC_PAGESIZE 8192 +diff -Nur linux-2.4.30/include/asm-mips/au1000.h linux-2.4.30-mips/include/asm-mips/au1000.h +--- linux-2.4.30/include/asm-mips/au1000.h 2005-01-19 15:10:11.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/au1000.h 2005-01-30 09:01:28.000000000 +0100 +@@ -160,28 +160,356 @@ + #define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5) + #endif + +-/* SDRAM Controller */ ++/* ++ * SDRAM Register Offsets ++ */ + #if defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1100) +-#define MEM_SDMODE0 0xB4000000 +-#define MEM_SDMODE1 0xB4000004 +-#define MEM_SDMODE2 0xB4000008 +- +-#define MEM_SDADDR0 0xB400000C +-#define MEM_SDADDR1 0xB4000010 +-#define MEM_SDADDR2 0xB4000014 +- +-#define MEM_SDREFCFG 0xB4000018 +-#define MEM_SDPRECMD 0xB400001C +-#define MEM_SDAUTOREF 0xB4000020 +- +-#define MEM_SDWRMD0 0xB4000024 +-#define MEM_SDWRMD1 0xB4000028 +-#define MEM_SDWRMD2 0xB400002C ++#define MEM_SDMODE0 (0x0000) ++#define MEM_SDMODE1 (0x0004) ++#define MEM_SDMODE2 (0x0008) ++#define MEM_SDADDR0 (0x000C) ++#define MEM_SDADDR1 (0x0010) ++#define MEM_SDADDR2 (0x0014) ++#define MEM_SDREFCFG (0x0018) ++#define MEM_SDPRECMD (0x001C) ++#define MEM_SDAUTOREF (0x0020) ++#define MEM_SDWRMD0 (0x0024) ++#define MEM_SDWRMD1 (0x0028) ++#define MEM_SDWRMD2 (0x002C) ++#define MEM_SDSLEEP (0x0030) ++#define MEM_SDSMCKE (0x0034) ++ ++#ifndef ASSEMBLER ++/*typedef volatile struct ++{ ++ uint32 sdmode0; ++ uint32 sdmode1; ++ uint32 sdmode2; ++ uint32 sdaddr0; ++ uint32 sdaddr1; ++ uint32 sdaddr2; ++ uint32 sdrefcfg; ++ uint32 sdautoref; ++ uint32 sdwrmd0; ++ uint32 sdwrmd1; ++ uint32 sdwrmd2; ++ uint32 sdsleep; ++ uint32 sdsmcke; ++ ++} AU1X00_SDRAM;*/ ++#endif ++ ++/* ++ * MEM_SDMODE register content definitions ++ */ ++#define MEM_SDMODE_F (1<<22) ++#define MEM_SDMODE_SR (1<<21) ++#define MEM_SDMODE_BS (1<<20) ++#define MEM_SDMODE_RS (3<<18) ++#define MEM_SDMODE_CS (7<<15) ++#define MEM_SDMODE_TRAS (15<<11) ++#define MEM_SDMODE_TMRD (3<<9) ++#define MEM_SDMODE_TWR (3<<7) ++#define MEM_SDMODE_TRP (3<<5) ++#define MEM_SDMODE_TRCD (3<<3) ++#define MEM_SDMODE_TCL (7<<0) ++ ++#define MEM_SDMODE_BS_2Bank (0<<20) ++#define MEM_SDMODE_BS_4Bank (1<<20) ++#define MEM_SDMODE_RS_11Row (0<<18) ++#define MEM_SDMODE_RS_12Row (1<<18) ++#define MEM_SDMODE_RS_13Row (2<<18) ++#define MEM_SDMODE_RS_N(N) ((N)<<18) ++#define MEM_SDMODE_CS_7Col (0<<15) ++#define MEM_SDMODE_CS_8Col (1<<15) ++#define MEM_SDMODE_CS_9Col (2<<15) ++#define MEM_SDMODE_CS_10Col (3<<15) ++#define MEM_SDMODE_CS_11Col (4<<15) ++#define MEM_SDMODE_CS_N(N) ((N)<<15) ++#define MEM_SDMODE_TRAS_N(N) ((N)<<11) ++#define MEM_SDMODE_TMRD_N(N) ((N)<<9) ++#define MEM_SDMODE_TWR_N(N) ((N)<<7) ++#define MEM_SDMODE_TRP_N(N) ((N)<<5) ++#define MEM_SDMODE_TRCD_N(N) ((N)<<3) ++#define MEM_SDMODE_TCL_N(N) ((N)<<0) ++ ++/* ++ * MEM_SDADDR register contents definitions ++ */ ++#define MEM_SDADDR_E (1<<20) ++#define MEM_SDADDR_CSBA (0x03FF<<10) ++#define MEM_SDADDR_CSMASK (0x03FF<<0) ++#define MEM_SDADDR_CSBA_N(N) ((N)&(0x03FF<<22)>>12) ++#define MEM_SDADDR_CSMASK_N(N) ((N)&(0x03FF<<22)>>22) ++ ++/* ++ * MEM_SDREFCFG register content definitions ++ */ ++#define MEM_SDREFCFG_TRC (15<<28) ++#define MEM_SDREFCFG_TRPM (3<<26) ++#define MEM_SDREFCFG_E (1<<25) ++#define MEM_SDREFCFG_RE (0x1ffffff<<0) ++#define MEM_SDREFCFG_TRC_N(N) ((N)<<MEM_SDREFCFG_TRC) ++#define MEM_SDREFCFG_TRPM_N(N) ((N)<<MEM_SDREFCFG_TRPM) ++#define MEM_SDREFCFG_REF_N(N) (N) ++#endif ++ ++/***********************************************************************/ ++ ++/* ++ * Au1550 SDRAM Register Offsets ++ */ ++ ++/***********************************************************************/ ++ ++#if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) ++#define MEM_SDMODE0 (0x0800) ++#define MEM_SDMODE1 (0x0808) ++#define MEM_SDMODE2 (0x0810) ++#define MEM_SDADDR0 (0x0820) ++#define MEM_SDADDR1 (0x0828) ++#define MEM_SDADDR2 (0x0830) ++#define MEM_SDCONFIGA (0x0840) ++#define MEM_SDCONFIGB (0x0848) ++#define MEM_SDSTAT (0x0850) ++#define MEM_SDERRADDR (0x0858) ++#define MEM_SDSTRIDE0 (0x0860) ++#define MEM_SDSTRIDE1 (0x0868) ++#define MEM_SDSTRIDE2 (0x0870) ++#define MEM_SDWRMD0 (0x0880) ++#define MEM_SDWRMD1 (0x0888) ++#define MEM_SDWRMD2 (0x0890) ++#define MEM_SDPRECMD (0x08C0) ++#define MEM_SDAUTOREF (0x08C8) ++#define MEM_SDSREF (0x08D0) ++#define MEM_SDSLEEP MEM_SDSREF ++ ++#ifndef ASSEMBLER ++/*typedef volatile struct ++{ ++ uint32 sdmode0; ++ uint32 reserved0; ++ uint32 sdmode1; ++ uint32 reserved1; ++ uint32 sdmode2; ++ uint32 reserved2[3]; ++ uint32 sdaddr0; ++ uint32 reserved3; ++ uint32 sdaddr1; ++ uint32 reserved4; ++ uint32 sdaddr2; ++ uint32 reserved5[3]; ++ uint32 sdconfiga; ++ uint32 reserved6; ++ uint32 sdconfigb; ++ uint32 reserved7; ++ uint32 sdstat; ++ uint32 reserved8; ++ uint32 sderraddr; ++ uint32 reserved9; ++ uint32 sdstride0; ++ uint32 reserved10; ++ uint32 sdstride1; ++ uint32 reserved11; ++ uint32 sdstride2; ++ uint32 reserved12[3]; ++ uint32 sdwrmd0; ++ uint32 reserved13; ++ uint32 sdwrmd1; ++ uint32 reserved14; ++ uint32 sdwrmd2; ++ uint32 reserved15[11]; ++ uint32 sdprecmd; ++ uint32 reserved16; ++ uint32 sdautoref; ++ uint32 reserved17; ++ uint32 sdsref; ++ ++} AU1550_SDRAM;*/ ++#endif ++#endif ++ ++/* ++ * Physical base addresses for integrated peripherals ++ */ ++ ++#ifdef CONFIG_SOC_AU1000 ++#define MEM_PHYS_ADDR 0x14000000 ++#define STATIC_MEM_PHYS_ADDR 0x14001000 ++#define DMA0_PHYS_ADDR 0x14002000 ++#define DMA1_PHYS_ADDR 0x14002100 ++#define DMA2_PHYS_ADDR 0x14002200 ++#define DMA3_PHYS_ADDR 0x14002300 ++#define DMA4_PHYS_ADDR 0x14002400 ++#define DMA5_PHYS_ADDR 0x14002500 ++#define DMA6_PHYS_ADDR 0x14002600 ++#define DMA7_PHYS_ADDR 0x14002700 ++#define IC0_PHYS_ADDR 0x10400000 ++#define IC1_PHYS_ADDR 0x11800000 ++#define AC97_PHYS_ADDR 0x10000000 ++#define USBH_PHYS_ADDR 0x10100000 ++#define USBD_PHYS_ADDR 0x10200000 ++#define IRDA_PHYS_ADDR 0x10300000 ++#define MAC0_PHYS_ADDR 0x10500000 ++#define MAC1_PHYS_ADDR 0x10510000 ++#define MACEN_PHYS_ADDR 0x10520000 ++#define MACDMA0_PHYS_ADDR 0x14004000 ++#define MACDMA1_PHYS_ADDR 0x14004200 ++#define I2S_PHYS_ADDR 0x11000000 ++#define UART0_PHYS_ADDR 0x11100000 ++#define UART1_PHYS_ADDR 0x11200000 ++#define UART2_PHYS_ADDR 0x11300000 ++#define UART3_PHYS_ADDR 0x11400000 ++#define SSI0_PHYS_ADDR 0x11600000 ++#define SSI1_PHYS_ADDR 0x11680000 ++#define SYS_PHYS_ADDR 0x11900000 ++#define PCMCIA_IO_PHYS_ADDR 0xF00000000 ++#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000 ++#define PCMCIA_MEM_PHYS_ADDR 0xF80000000 ++#endif ++ ++/********************************************************************/ + +-#define MEM_SDSLEEP 0xB4000030 +-#define MEM_SDSMCKE 0xB4000034 ++#ifdef CONFIG_SOC_AU1500 ++#define MEM_PHYS_ADDR 0x14000000 ++#define STATIC_MEM_PHYS_ADDR 0x14001000 ++#define DMA0_PHYS_ADDR 0x14002000 ++#define DMA1_PHYS_ADDR 0x14002100 ++#define DMA2_PHYS_ADDR 0x14002200 ++#define DMA3_PHYS_ADDR 0x14002300 ++#define DMA4_PHYS_ADDR 0x14002400 ++#define DMA5_PHYS_ADDR 0x14002500 ++#define DMA6_PHYS_ADDR 0x14002600 ++#define DMA7_PHYS_ADDR 0x14002700 ++#define IC0_PHYS_ADDR 0x10400000 ++#define IC1_PHYS_ADDR 0x11800000 ++#define AC97_PHYS_ADDR 0x10000000 ++#define USBH_PHYS_ADDR 0x10100000 ++#define USBD_PHYS_ADDR 0x10200000 ++#define PCI_PHYS_ADDR 0x14005000 ++#define MAC0_PHYS_ADDR 0x11500000 ++#define MAC1_PHYS_ADDR 0x11510000 ++#define MACEN_PHYS_ADDR 0x11520000 ++#define MACDMA0_PHYS_ADDR 0x14004000 ++#define MACDMA1_PHYS_ADDR 0x14004200 ++#define I2S_PHYS_ADDR 0x11000000 ++#define UART0_PHYS_ADDR 0x11100000 ++#define UART3_PHYS_ADDR 0x11400000 ++#define GPIO2_PHYS_ADDR 0x11700000 ++#define SYS_PHYS_ADDR 0x11900000 ++#define PCI_MEM_PHYS_ADDR 0x400000000 ++#define PCI_IO_PHYS_ADDR 0x500000000 ++#define PCI_CONFIG0_PHYS_ADDR 0x600000000 ++#define PCI_CONFIG1_PHYS_ADDR 0x680000000 ++#define PCMCIA_IO_PHYS_ADDR 0xF00000000 ++#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000 ++#define PCMCIA_MEM_PHYS_ADDR 0xF80000000 + #endif + ++/********************************************************************/ ++ ++#ifdef CONFIG_SOC_AU1100 ++#define MEM_PHYS_ADDR 0x14000000 ++#define STATIC_MEM_PHYS_ADDR 0x14001000 ++#define DMA0_PHYS_ADDR 0x14002000 ++#define DMA1_PHYS_ADDR 0x14002100 ++#define DMA2_PHYS_ADDR 0x14002200 ++#define DMA3_PHYS_ADDR 0x14002300 ++#define DMA4_PHYS_ADDR 0x14002400 ++#define DMA5_PHYS_ADDR 0x14002500 ++#define DMA6_PHYS_ADDR 0x14002600 ++#define DMA7_PHYS_ADDR 0x14002700 ++#define IC0_PHYS_ADDR 0x10400000 ++#define SD0_PHYS_ADDR 0x10600000 ++#define SD1_PHYS_ADDR 0x10680000 ++#define IC1_PHYS_ADDR 0x11800000 ++#define AC97_PHYS_ADDR 0x10000000 ++#define USBH_PHYS_ADDR 0x10100000 ++#define USBD_PHYS_ADDR 0x10200000 ++#define IRDA_PHYS_ADDR 0x10300000 ++#define MAC0_PHYS_ADDR 0x10500000 ++#define MACEN_PHYS_ADDR 0x10520000 ++#define MACDMA0_PHYS_ADDR 0x14004000 ++#define MACDMA1_PHYS_ADDR 0x14004200 ++#define I2S_PHYS_ADDR 0x11000000 ++#define UART0_PHYS_ADDR 0x11100000 ++#define UART1_PHYS_ADDR 0x11200000 ++#define UART3_PHYS_ADDR 0x11400000 ++#define SSI0_PHYS_ADDR 0x11600000 ++#define SSI1_PHYS_ADDR 0x11680000 ++#define GPIO2_PHYS_ADDR 0x11700000 ++#define SYS_PHYS_ADDR 0x11900000 ++#define LCD_PHYS_ADDR 0x15000000 ++#define PCMCIA_IO_PHYS_ADDR 0xF00000000 ++#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000 ++#define PCMCIA_MEM_PHYS_ADDR 0xF80000000 ++#endif ++ ++/***********************************************************************/ ++ ++#ifdef CONFIG_SOC_AU1550 ++#define MEM_PHYS_ADDR 0x14000000 ++#define STATIC_MEM_PHYS_ADDR 0x14001000 ++#define IC0_PHYS_ADDR 0x10400000 ++#define IC1_PHYS_ADDR 0x11800000 ++#define USBH_PHYS_ADDR 0x14020000 ++#define USBD_PHYS_ADDR 0x10200000 ++#define PCI_PHYS_ADDR 0x14005000 ++#define MAC0_PHYS_ADDR 0x10500000 ++#define MAC1_PHYS_ADDR 0x10510000 ++#define MACEN_PHYS_ADDR 0x10520000 ++#define MACDMA0_PHYS_ADDR 0x14004000 ++#define MACDMA1_PHYS_ADDR 0x14004200 ++#define UART0_PHYS_ADDR 0x11100000 ++#define UART1_PHYS_ADDR 0x11200000 ++#define UART3_PHYS_ADDR 0x11400000 ++#define GPIO2_PHYS_ADDR 0x11700000 ++#define SYS_PHYS_ADDR 0x11900000 ++#define DDMA_PHYS_ADDR 0x14002000 ++#define PE_PHYS_ADDR 0x14008000 ++#define PSC0_PHYS_ADDR 0x11A00000 ++#define PSC1_PHYS_ADDR 0x11B00000 ++#define PSC2_PHYS_ADDR 0x10A00000 ++#define PSC3_PHYS_ADDR 0x10B00000 ++#define PCI_MEM_PHYS_ADDR 0x400000000 ++#define PCI_IO_PHYS_ADDR 0x500000000 ++#define PCI_CONFIG0_PHYS_ADDR 0x600000000 ++#define PCI_CONFIG1_PHYS_ADDR 0x680000000 ++#define PCMCIA_IO_PHYS_ADDR 0xF00000000 ++#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000 ++#define PCMCIA_MEM_PHYS_ADDR 0xF80000000 ++#endif ++ ++/***********************************************************************/ ++ ++#ifdef CONFIG_SOC_AU1200 ++#define MEM_PHYS_ADDR 0x14000000 ++#define STATIC_MEM_PHYS_ADDR 0x14001000 ++#define AES_PHYS_ADDR 0x10300000 ++#define CIM_PHYS_ADDR 0x14004000 ++#define IC0_PHYS_ADDR 0x10400000 ++#define IC1_PHYS_ADDR 0x11800000 ++#define USBM_PHYS_ADDR 0x14020000 ++#define USBH_PHYS_ADDR 0x14020100 ++#define UART0_PHYS_ADDR 0x11100000 ++#define UART1_PHYS_ADDR 0x11200000 ++#define GPIO2_PHYS_ADDR 0x11700000 ++#define SYS_PHYS_ADDR 0x11900000 ++#define DDMA_PHYS_ADDR 0x14002000 ++#define PSC0_PHYS_ADDR 0x11A00000 ++#define PSC1_PHYS_ADDR 0x11B00000 ++#define PCMCIA_IO_PHYS_ADDR 0xF00000000 ++#define PCMCIA_ATTR_PHYS_ADDR 0xF40000000 ++#define PCMCIA_MEM_PHYS_ADDR 0xF80000000 ++#define SD0_PHYS_ADDR 0x10600000 ++#define SD1_PHYS_ADDR 0x10680000 ++#define LCD_PHYS_ADDR 0x15000000 ++#define SWCNT_PHYS_ADDR 0x1110010C ++#define MAEFE_PHYS_ADDR 0x14012000 ++#define MAEBE_PHYS_ADDR 0x14010000 ++#endif ++ ++ + /* Static Bus Controller */ + #define MEM_STCFG0 0xB4001000 + #define MEM_STTIME0 0xB4001004 +@@ -367,7 +695,7 @@ + #define AU1000_MAC0_ENABLE 0xB0520000 + #define AU1000_MAC1_ENABLE 0xB0520004 + #define NUM_ETH_INTERFACES 2 +-#endif // CONFIG_SOC_AU1000 ++#endif /* CONFIG_SOC_AU1000 */ + + /* Au1500 */ + #ifdef CONFIG_SOC_AU1500 +@@ -438,7 +766,7 @@ + #define AU1500_MAC0_ENABLE 0xB1520000 + #define AU1500_MAC1_ENABLE 0xB1520004 + #define NUM_ETH_INTERFACES 2 +-#endif // CONFIG_SOC_AU1500 ++#endif /* CONFIG_SOC_AU1500 */ + + /* Au1100 */ + #ifdef CONFIG_SOC_AU1100 +@@ -483,6 +811,22 @@ + #define AU1000_GPIO_13 45 + #define AU1000_GPIO_14 46 + #define AU1000_GPIO_15 47 ++#define AU1000_GPIO_16 48 ++#define AU1000_GPIO_17 49 ++#define AU1000_GPIO_18 50 ++#define AU1000_GPIO_19 51 ++#define AU1000_GPIO_20 52 ++#define AU1000_GPIO_21 53 ++#define AU1000_GPIO_22 54 ++#define AU1000_GPIO_23 55 ++#define AU1000_GPIO_24 56 ++#define AU1000_GPIO_25 57 ++#define AU1000_GPIO_26 58 ++#define AU1000_GPIO_27 59 ++#define AU1000_GPIO_28 60 ++#define AU1000_GPIO_29 61 ++#define AU1000_GPIO_30 62 ++#define AU1000_GPIO_31 63 + + #define UART0_ADDR 0xB1100000 + #define UART1_ADDR 0xB1200000 +@@ -494,7 +838,7 @@ + #define AU1100_ETH0_BASE 0xB0500000 + #define AU1100_MAC0_ENABLE 0xB0520000 + #define NUM_ETH_INTERFACES 1 +-#endif // CONFIG_SOC_AU1100 ++#endif /* CONFIG_SOC_AU1100 */ + + #ifdef CONFIG_SOC_AU1550 + #define AU1550_UART0_INT 0 +@@ -511,14 +855,14 @@ + #define AU1550_PSC1_INT 11 + #define AU1550_PSC2_INT 12 + #define AU1550_PSC3_INT 13 +-#define AU1550_TOY_INT 14 +-#define AU1550_TOY_MATCH0_INT 15 +-#define AU1550_TOY_MATCH1_INT 16 +-#define AU1550_TOY_MATCH2_INT 17 +-#define AU1550_RTC_INT 18 +-#define AU1550_RTC_MATCH0_INT 19 +-#define AU1550_RTC_MATCH1_INT 20 +-#define AU1550_RTC_MATCH2_INT 21 ++#define AU1000_TOY_INT 14 ++#define AU1000_TOY_MATCH0_INT 15 ++#define AU1000_TOY_MATCH1_INT 16 ++#define AU1000_TOY_MATCH2_INT 17 ++#define AU1000_RTC_INT 18 ++#define AU1000_RTC_MATCH0_INT 19 ++#define AU1000_RTC_MATCH1_INT 20 ++#define AU1000_RTC_MATCH2_INT 21 + #define AU1550_NAND_INT 23 + #define AU1550_USB_DEV_REQ_INT 24 + #define AU1550_USB_DEV_SUS_INT 25 +@@ -573,7 +917,7 @@ + #define AU1550_MAC0_ENABLE 0xB0520000 + #define AU1550_MAC1_ENABLE 0xB0520004 + #define NUM_ETH_INTERFACES 2 +-#endif // CONFIG_SOC_AU1550 ++#endif /* CONFIG_SOC_AU1550 */ + + #ifdef CONFIG_SOC_AU1200 + #define AU1200_UART0_INT 0 +@@ -590,14 +934,14 @@ + #define AU1200_PSC1_INT 11 + #define AU1200_AES_INT 12 + #define AU1200_CAMERA_INT 13 +-#define AU1200_TOY_INT 14 +-#define AU1200_TOY_MATCH0_INT 15 +-#define AU1200_TOY_MATCH1_INT 16 +-#define AU1200_TOY_MATCH2_INT 17 +-#define AU1200_RTC_INT 18 +-#define AU1200_RTC_MATCH0_INT 19 +-#define AU1200_RTC_MATCH1_INT 20 +-#define AU1200_RTC_MATCH2_INT 21 ++#define AU1000_TOY_INT 14 ++#define AU1000_TOY_MATCH0_INT 15 ++#define AU1000_TOY_MATCH1_INT 16 ++#define AU1000_TOY_MATCH2_INT 17 ++#define AU1000_RTC_INT 18 ++#define AU1000_RTC_MATCH0_INT 19 ++#define AU1000_RTC_MATCH1_INT 20 ++#define AU1000_RTC_MATCH2_INT 21 + #define AU1200_NAND_INT 23 + #define AU1200_GPIO_204 24 + #define AU1200_GPIO_205 25 +@@ -605,6 +949,7 @@ + #define AU1200_GPIO_207 27 + #define AU1200_GPIO_208_215 28 // Logical OR of 208:215 + #define AU1200_USB_INT 29 ++#define AU1000_USB_HOST_INT AU1200_USB_INT + #define AU1200_LCD_INT 30 + #define AU1200_MAE_BOTH_INT 31 + #define AU1000_GPIO_0 32 +@@ -643,21 +988,36 @@ + #define UART0_ADDR 0xB1100000 + #define UART1_ADDR 0xB1200000 + +-#define USB_OHCI_BASE 0x14020000 // phys addr for ioremap +-#define USB_HOST_CONFIG 0xB4027ffc ++#define USB_UOC_BASE 0x14020020 ++#define USB_UOC_LEN 0x20 ++#define USB_OHCI_BASE 0x14020100 ++#define USB_OHCI_LEN 0x100 ++#define USB_EHCI_BASE 0x14020200 ++#define USB_EHCI_LEN 0x100 ++#define USB_UDC_BASE 0x14022000 ++#define USB_UDC_LEN 0x2000 ++#define USB_MSR_BASE 0xB4020000 ++#define USB_MSR_MCFG 4 ++#define USBMSRMCFG_OMEMEN 0 ++#define USBMSRMCFG_OBMEN 1 ++#define USBMSRMCFG_EMEMEN 2 ++#define USBMSRMCFG_EBMEN 3 ++#define USBMSRMCFG_DMEMEN 4 ++#define USBMSRMCFG_DBMEN 5 ++#define USBMSRMCFG_GMEMEN 6 ++#define USBMSRMCFG_OHCCLKEN 16 ++#define USBMSRMCFG_EHCCLKEN 17 ++#define USBMSRMCFG_UDCCLKEN 18 ++#define USBMSRMCFG_PHYPLLEN 19 ++#define USBMSRMCFG_RDCOMB 30 ++#define USBMSRMCFG_PFEN 31 + +-// these are here for prototyping on au1550 (do not exist on au1200) +-#define AU1200_ETH0_BASE 0xB0500000 +-#define AU1200_ETH1_BASE 0xB0510000 +-#define AU1200_MAC0_ENABLE 0xB0520000 +-#define AU1200_MAC1_ENABLE 0xB0520004 +-#define NUM_ETH_INTERFACES 2 +-#endif // CONFIG_SOC_AU1200 ++#endif /* CONFIG_SOC_AU1200 */ + + #define AU1000_LAST_INTC0_INT 31 ++#define AU1000_LAST_INTC1_INT 63 + #define AU1000_MAX_INTR 63 + +- + /* Programmable Counters 0 and 1 */ + #define SYS_BASE 0xB1900000 + #define SYS_COUNTER_CNTRL (SYS_BASE + 0x14) +@@ -728,6 +1088,8 @@ + #define I2S_CONTROL_D (1<<1) + #define I2S_CONTROL_CE (1<<0) + ++#ifndef CONFIG_SOC_AU1200 ++ + /* USB Host Controller */ + #define USB_OHCI_LEN 0x00100000 + +@@ -773,6 +1135,8 @@ + #define USBDEV_ENABLE (1<<1) + #define USBDEV_CE (1<<0) + ++#endif /* !CONFIG_SOC_AU1200 */ ++ + /* Ethernet Controllers */ + + /* 4 byte offsets from AU1000_ETH_BASE */ +@@ -1171,6 +1535,37 @@ + #define SYS_PF_PSC1_S1 (1 << 1) + #define SYS_PF_MUST_BE_SET ((1 << 5) | (1 << 2)) + ++/* Au1200 Only */ ++#ifdef CONFIG_SOC_AU1200 ++#define SYS_PINFUNC_DMA (1<<31) ++#define SYS_PINFUNC_S0A (1<<30) ++#define SYS_PINFUNC_S1A (1<<29) ++#define SYS_PINFUNC_LP0 (1<<28) ++#define SYS_PINFUNC_LP1 (1<<27) ++#define SYS_PINFUNC_LD16 (1<<26) ++#define SYS_PINFUNC_LD8 (1<<25) ++#define SYS_PINFUNC_LD1 (1<<24) ++#define SYS_PINFUNC_LD0 (1<<23) ++#define SYS_PINFUNC_P1A (3<<21) ++#define SYS_PINFUNC_P1B (1<<20) ++#define SYS_PINFUNC_FS3 (1<<19) ++#define SYS_PINFUNC_P0A (3<<17) ++#define SYS_PINFUNC_CS (1<<16) ++#define SYS_PINFUNC_CIM (1<<15) ++#define SYS_PINFUNC_P1C (1<<14) ++#define SYS_PINFUNC_U1T (1<<12) ++#define SYS_PINFUNC_U1R (1<<11) ++#define SYS_PINFUNC_EX1 (1<<10) ++#define SYS_PINFUNC_EX0 (1<<9) ++#define SYS_PINFUNC_U0R (1<<8) ++#define SYS_PINFUNC_MC (1<<7) ++#define SYS_PINFUNC_S0B (1<<6) ++#define SYS_PINFUNC_S0C (1<<5) ++#define SYS_PINFUNC_P0B (1<<4) ++#define SYS_PINFUNC_U0T (1<<3) ++#define SYS_PINFUNC_S1B (1<<2) ++#endif ++ + #define SYS_TRIOUTRD 0xB1900100 + #define SYS_TRIOUTCLR 0xB1900100 + #define SYS_OUTPUTRD 0xB1900108 +@@ -1298,7 +1693,6 @@ + #define SD1_XMIT_FIFO 0xB0680000 + #define SD1_RECV_FIFO 0xB0680004 + +- + #if defined (CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550) + /* Au1500 PCI Controller */ + #define Au1500_CFG_BASE 0xB4005000 // virtual, kseg0 addr +@@ -1388,9 +1782,60 @@ + + #endif + ++#ifndef _LANGUAGE_ASSEMBLY ++typedef volatile struct ++{ ++ /* 0x0000 */ u32 toytrim; ++ /* 0x0004 */ u32 toywrite; ++ /* 0x0008 */ u32 toymatch0; ++ /* 0x000C */ u32 toymatch1; ++ /* 0x0010 */ u32 toymatch2; ++ /* 0x0014 */ u32 cntrctrl; ++ /* 0x0018 */ u32 scratch0; ++ /* 0x001C */ u32 scratch1; ++ /* 0x0020 */ u32 freqctrl0; ++ /* 0x0024 */ u32 freqctrl1; ++ /* 0x0028 */ u32 clksrc; ++ /* 0x002C */ u32 pinfunc; ++ /* 0x0030 */ u32 reserved0; ++ /* 0x0034 */ u32 wakemsk; ++ /* 0x0038 */ u32 endian; ++ /* 0x003C */ u32 powerctrl; ++ /* 0x0040 */ u32 toyread; ++ /* 0x0044 */ u32 rtctrim; ++ /* 0x0048 */ u32 rtcwrite; ++ /* 0x004C */ u32 rtcmatch0; ++ /* 0x0050 */ u32 rtcmatch1; ++ /* 0x0054 */ u32 rtcmatch2; ++ /* 0x0058 */ u32 rtcread; ++ /* 0x005C */ u32 wakesrc; ++ /* 0x0060 */ u32 cpupll; ++ /* 0x0064 */ u32 auxpll; ++ /* 0x0068 */ u32 reserved1; ++ /* 0x006C */ u32 reserved2; ++ /* 0x0070 */ u32 reserved3; ++ /* 0x0074 */ u32 reserved4; ++ /* 0x0078 */ u32 slppwr; ++ /* 0x007C */ u32 sleep; ++ /* 0x0080 */ u32 reserved5[32]; ++ /* 0x0100 */ u32 trioutrd; ++#define trioutclr trioutrd ++ /* 0x0104 */ u32 reserved6; ++ /* 0x0108 */ u32 outputrd; ++#define outputset outputrd ++ /* 0x010C */ u32 outputclr; ++ /* 0x0110 */ u32 pinstaterd; ++#define pininputen pinstaterd ++ ++} AU1X00_SYS; ++ ++static AU1X00_SYS* const sys = (AU1X00_SYS *)SYS_BASE; ++ ++#endif + /* Processor information base on prid. + * Copied from PowerPC. + */ ++#ifndef _LANGUAGE_ASSEMBLY + struct cpu_spec { + /* CPU is matched via (PRID & prid_mask) == prid_value */ + unsigned int prid_mask; +@@ -1404,3 +1849,6 @@ + extern struct cpu_spec cpu_specs[]; + extern struct cpu_spec *cur_cpu_spec[]; + #endif ++ ++#endif ++ +diff -Nur linux-2.4.30/include/asm-mips/au1000_gpio.h linux-2.4.30-mips/include/asm-mips/au1000_gpio.h +--- linux-2.4.30/include/asm-mips/au1000_gpio.h 2002-11-29 00:53:15.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/au1000_gpio.h 2005-01-30 09:01:28.000000000 +0100 +@@ -30,6 +30,13 @@ + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++/* ++ * Revision history ++ * 01/31/02 0.01 Initial release. Steve Longerbeam, MontaVista ++ * 10/12/03 0.1 Added Au1100/Au1500, GPIO2, and bit operations. K.C. Nishio, AMD ++ * 08/05/04 0.11 Added Au1550 and Au1200. K.C. Nishio ++ */ ++ + #ifndef __AU1000_GPIO_H + #define __AU1000_GPIO_H + +@@ -44,13 +51,94 @@ + #define AU1000GPIO_TRISTATE _IOW (AU1000GPIO_IOC_MAGIC, 4, int) + #define AU1000GPIO_AVAIL_MASK _IOR (AU1000GPIO_IOC_MAGIC, 5, int) + ++// bit operations ++#define AU1000GPIO_BIT_READ _IOW (AU1000GPIO_IOC_MAGIC, 6, int) ++#define AU1000GPIO_BIT_SET _IOW (AU1000GPIO_IOC_MAGIC, 7, int) ++#define AU1000GPIO_BIT_CLEAR _IOW (AU1000GPIO_IOC_MAGIC, 8, int) ++#define AU1000GPIO_BIT_TRISTATE _IOW (AU1000GPIO_IOC_MAGIC, 9, int) ++#define AU1000GPIO_BIT_INIT _IOW (AU1000GPIO_IOC_MAGIC, 10, int) ++#define AU1000GPIO_BIT_TERM _IOW (AU1000GPIO_IOC_MAGIC, 11, int) ++ ++/* set this major numer same as the CRIS GPIO driver */ ++#define AU1X00_GPIO_MAJOR (120) ++ ++#define ENABLED_ZERO (0) ++#define ENABLED_ONE (1) ++#define ENABLED_10 (0x2) ++#define ENABLED_11 (0x3) ++#define ENABLED_111 (0x7) ++#define NOT_AVAIL (-1) ++#define AU1X00_MAX_PRIMARY_GPIO (32) ++ ++#define AU1000_GPIO_MINOR_MAX AU1X00_MAX_PRIMARY_GPIO ++/* Au1100, 1500, 1550 and 1200 have the secondary GPIO block */ ++#define AU1XX0_GPIO_MINOR_MAX (48) ++ ++#define AU1X00_GPIO_NAME "gpio" ++ ++/* GPIO pins which are not multiplexed */ ++#if defined(CONFIG_SOC_AU1000) ++ #define NATIVE_GPIOPIN ((1 << 15) | (1 << 8) | (1 << 7) | (1 << 1) | (1 << 0)) ++ #define NATIVE_GPIO2PIN (0) ++#elif defined(CONFIG_SOC_AU1100) ++ #define NATIVE_GPIOPIN ((1 << 23) | (1 << 22) | (1 << 21) | (1 << 20) | (1 << 19) | (1 << 18) | \ ++ (1 << 17) | (1 << 16) | (1 << 7) | (1 << 1) | (1 << 0)) ++ #define NATIVE_GPIO2PIN (0) ++#elif defined(CONFIG_SOC_AU1500) ++ #define NATIVE_GPIOPIN ((1 << 15) | (1 << 8) | (1 << 7) | (1 << 1) | (1 << 0)) ++ /* exclude the PCI reset output signal: GPIO[200], DMA_REQ2 and DMA_REQ3 */ ++ #define NATIVE_GPIO2PIN (0xfffe & ~((1 << 9) | (1 << 8))) ++#elif defined(CONFIG_SOC_AU1550) ++ #define NATIVE_GPIOPIN ((1 << 15) | (1 << 8) | (1 << 7) | (1 << 6) | (1 << 1) | (1 << 0)) ++ /* please refere Au1550 Data Book, chapter 15 */ ++ #define NATIVE_GPIO2PIN (1 << 5) ++#elif defined(CONFIG_SOC_AU1200) ++ #define NATIVE_GPIOPIN ((1 << 7) | (1 << 5)) ++ #define NATIVE_GPIO2PIN (0) ++#endif ++ ++/* minor as u32 */ ++#define MINOR_TO_GPIOPIN(minor) ((minor < AU1X00_MAX_PRIMARY_GPIO) ? minor : (minor - AU1X00_MAX_PRIMARY_GPIO)) ++#define IS_PRIMARY_GPIOPIN(minor) ((minor < AU1X00_MAX_PRIMARY_GPIO) ? 1 : 0) ++ ++/* ++ * pin to minor mapping. ++ * GPIO0-GPIO31, minor=0-31. ++ * GPIO200-GPIO215, minor=32-47. ++ */ ++typedef struct _au1x00_gpio_bit_ctl { ++ int direction; // The direction of this GPIO pin. 0: IN, 1: OUT. ++ int data; // Pin output when itized (0/1), or at the term. 0/1/-1 (tristate). ++} au1x00_gpio_bit_ctl; ++ ++typedef struct _au1x00_gpio_driver { ++ const char *driver_name; ++ const char *name; ++ int name_base; /* offset of printed name */ ++ short major; /* major device number */ ++ short minor_start; /* start of minor device number*/ ++ short num; /* number of devices */ ++} au1x00_gpio_driver; ++ + #ifdef __KERNEL__ +-extern u32 get_au1000_avail_gpio_mask(void); +-extern int au1000gpio_tristate(u32 data); +-extern int au1000gpio_in(u32 *data); +-extern int au1000gpio_set(u32 data); +-extern int au1000gpio_clear(u32 data); +-extern int au1000gpio_out(u32 data); ++extern u32 get_au1000_avail_gpio_mask(u32 *avail_gpio2); ++extern int au1000gpio_tristate(u32 minor, u32 data); ++extern int au1000gpio_in(u32 minor, u32 *data); ++extern int au1000gpio_set(u32 minor, u32 data); ++extern int au1000gpio_clear(u32 minor, u32 data); ++extern int au1000gpio_out(u32 minor, u32 data); ++extern int au1000gpio_bit_read(u32 minor, u32 *read_data); ++extern int au1000gpio_bit_set(u32 minor); ++extern int au1000gpio_bit_clear(u32 minor); ++extern int au1000gpio_bit_tristate(u32 minor); ++extern int check_minor_to_gpio(u32 minor); ++extern int au1000gpio_bit_init(u32 minor, au1x00_gpio_bit_ctl *bit_opt); ++extern int au1000gpio_bit_term(u32 minor, au1x00_gpio_bit_ctl *bit_opt); ++ ++extern void gpio_register_devfs (au1x00_gpio_driver *driver, unsigned int flags, unsigned minor); ++extern void gpio_unregister_devfs (au1x00_gpio_driver *driver, unsigned minor); ++extern int gpio_register_driver(au1x00_gpio_driver *driver); ++extern int gpio_unregister_driver(au1x00_gpio_driver *driver); + #endif + + #endif +diff -Nur linux-2.4.30/include/asm-mips/au1000_pcmcia.h linux-2.4.30-mips/include/asm-mips/au1000_pcmcia.h +--- linux-2.4.30/include/asm-mips/au1000_pcmcia.h 2005-01-19 15:10:11.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/au1000_pcmcia.h 2005-01-30 09:01:28.000000000 +0100 +@@ -38,16 +38,41 @@ + #define AU1X_SOCK0_PHYS_MEM 0xF80000000 + + /* pcmcia socket 1 needs external glue logic so the memory map +- * differs from board to board. ++ * differs from board to board. the general rule is that ++ * static bus address bit 26 should be used to decode socket 0 ++ * from socket 1. alas, some boards dont follow this... ++ * These really belong in a board-specific header file... + */ +-#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500) +-#define AU1X_SOCK1_IO 0xF08000000 +-#define AU1X_SOCK1_PHYS_ATTR 0xF48000000 +-#define AU1X_SOCK1_PHYS_MEM 0xF88000000 +-#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_DB1550) +-#define AU1X_SOCK1_IO 0xF04000000 +-#define AU1X_SOCK1_PHYS_ATTR 0xF44000000 +-#define AU1X_SOCK1_PHYS_MEM 0xF84000000 ++#ifdef CONFIG_MIPS_PB1000 ++#define SOCK1_DECODE (1<<27) ++#endif ++#ifdef CONFIG_MIPS_DB1000 ++#define SOCK1_DECODE (1<<26) ++#endif ++#ifdef CONFIG_MIPS_DB1500 ++#define SOCK1_DECODE (1<<26) ++#endif ++#ifdef CONFIG_MIPS_DB1100 ++#define SOCK1_DECODE (1<<26) ++#endif ++#ifdef CONFIG_MIPS_DB1550 ++#define SOCK1_DECODE (1<<26) ++#endif ++#ifdef CONFIG_MIPS_DB1200 ++#define SOCK1_DECODE (1<<26) ++#endif ++#ifdef CONFIG_MIPS_PB1550 ++#define SOCK1_DECODE (1<<26) ++#endif ++#ifdef CONFIG_MIPS_PB1200 ++#define SOCK1_DECODE (1<<26) ++#endif ++ ++/* The board has a second PCMCIA socket */ ++#ifdef SOCK1_DECODE ++#define AU1X_SOCK1_IO (0xF00000000|SOCK1_DECODE) ++#define AU1X_SOCK1_PHYS_ATTR (0xF40000000|SOCK1_DECODE) ++#define AU1X_SOCK1_PHYS_MEM (0xF80000000|SOCK1_DECODE) + #endif + + struct pcmcia_state { +diff -Nur linux-2.4.30/include/asm-mips/au1100_mmc.h linux-2.4.30-mips/include/asm-mips/au1100_mmc.h +--- linux-2.4.30/include/asm-mips/au1100_mmc.h 2005-01-19 15:10:11.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/au1100_mmc.h 2005-01-30 09:01:28.000000000 +0100 +@@ -39,16 +39,22 @@ + #define __ASM_AU1100_MMC_H + + +-#define NUM_AU1100_MMC_CONTROLLERS 2 +- +- +-#define AU1100_SD_IRQ 2 +- ++#if defined(CONFIG_SOC_AU1100) ++#define NUM_MMC_CONTROLLERS 2 ++#define AU1X_MMC_INT AU1100_SD_INT ++#endif ++ ++#if defined(CONFIG_SOC_AU1200) ++#define NUM_MMC_CONTROLLERS 2 ++#define AU1X_MMC_INT AU1200_SD_INT ++#endif + + #define SD0_BASE 0xB0600000 + #define SD1_BASE 0xB0680000 + + ++ ++ + /* + * Register offsets. + */ +@@ -201,5 +207,12 @@ + #define SD_CMD_RT_1B (0x00810000) + + ++/* support routines required on a platform-specific basis */ ++extern void mmc_card_inserted(int _n_, int *_res_); ++extern void mmc_card_writable(int _n_, int *_res_); ++extern void mmc_power_on(int _n_); ++extern void mmc_power_off(int _n_); ++ ++ + #endif /* __ASM_AU1100_MMC_H */ + +diff -Nur linux-2.4.30/include/asm-mips/au1xxx_dbdma.h linux-2.4.30-mips/include/asm-mips/au1xxx_dbdma.h +--- linux-2.4.30/include/asm-mips/au1xxx_dbdma.h 2005-01-19 15:10:11.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/au1xxx_dbdma.h 2005-01-30 09:01:28.000000000 +0100 +@@ -43,7 +43,7 @@ + #define DDMA_GLOBAL_BASE 0xb4003000 + #define DDMA_CHANNEL_BASE 0xb4002000 + +-typedef struct dbdma_global { ++typedef volatile struct dbdma_global { + u32 ddma_config; + u32 ddma_intstat; + u32 ddma_throttle; +@@ -60,7 +60,7 @@ + + /* The structure of a DMA Channel. + */ +-typedef struct au1xxx_dma_channel { ++typedef volatile struct au1xxx_dma_channel { + u32 ddma_cfg; /* See below */ + u32 ddma_desptr; /* 32-byte aligned pointer to descriptor */ + u32 ddma_statptr; /* word aligned pointer to status word */ +@@ -96,7 +96,7 @@ + /* "Standard" DDMA Descriptor. + * Must be 32-byte aligned. + */ +-typedef struct au1xxx_ddma_desc { ++typedef volatile struct au1xxx_ddma_desc { + u32 dscr_cmd0; /* See below */ + u32 dscr_cmd1; /* See below */ + u32 dscr_source0; /* source phys address */ +@@ -105,6 +105,12 @@ + u32 dscr_dest1; /* See below */ + u32 dscr_stat; /* completion status */ + u32 dscr_nxtptr; /* Next descriptor pointer (mostly) */ ++ /* First 32bytes are HW specific!!! ++ Lets have some SW data following.. make sure its 32bytes ++ */ ++ u32 sw_status; ++ u32 sw_context; ++ u32 sw_reserved[6]; + } au1x_ddma_desc_t; + + #define DSCR_CMD0_V (1 << 31) /* Descriptor valid */ +@@ -123,6 +129,8 @@ + #define DSCR_CMD0_CV (0x1 << 2) /* Clear Valid when done */ + #define DSCR_CMD0_ST_MASK (0x3 << 0) /* Status instruction */ + ++#define SW_STATUS_INUSE (1<<0) ++ + /* Command 0 device IDs. + */ + #ifdef CONFIG_SOC_AU1550 +@@ -169,8 +177,8 @@ + #define DSCR_CMD0_SDMS_RX0 9 + #define DSCR_CMD0_SDMS_TX1 10 + #define DSCR_CMD0_SDMS_RX1 11 +-#define DSCR_CMD0_AES_TX 12 +-#define DSCR_CMD0_AES_RX 13 ++#define DSCR_CMD0_AES_TX 13 ++#define DSCR_CMD0_AES_RX 12 + #define DSCR_CMD0_PSC0_TX 14 + #define DSCR_CMD0_PSC0_RX 15 + #define DSCR_CMD0_PSC1_TX 16 +@@ -189,6 +197,10 @@ + #define DSCR_CMD0_THROTTLE 30 + #define DSCR_CMD0_ALWAYS 31 + #define DSCR_NDEV_IDS 32 ++/* THis macro is used to find/create custom device types */ ++#define DSCR_DEV2CUSTOM_ID(x,d) (((((x)&0xFFFF)<<8)|0x32000000)|((d)&0xFF)) ++#define DSCR_CUSTOM2DEV_ID(x) ((x)&0xFF) ++ + + #define DSCR_CMD0_SID(x) (((x) & 0x1f) << 25) + #define DSCR_CMD0_DID(x) (((x) & 0x1f) << 20) +@@ -277,6 +289,43 @@ + */ + #define NUM_DBDMA_CHANS 16 + ++/* ++ * Ddma API definitions ++ * FIXME: may not fit to this header file ++ */ ++typedef struct dbdma_device_table { ++ u32 dev_id; ++ u32 dev_flags; ++ u32 dev_tsize; ++ u32 dev_devwidth; ++ u32 dev_physaddr; /* If FIFO */ ++ u32 dev_intlevel; ++ u32 dev_intpolarity; ++} dbdev_tab_t; ++ ++ ++typedef struct dbdma_chan_config { ++ spinlock_t lock; ++ ++ u32 chan_flags; ++ u32 chan_index; ++ dbdev_tab_t *chan_src; ++ dbdev_tab_t *chan_dest; ++ au1x_dma_chan_t *chan_ptr; ++ au1x_ddma_desc_t *chan_desc_base; ++ au1x_ddma_desc_t *get_ptr, *put_ptr, *cur_ptr; ++ void *chan_callparam; ++ void (*chan_callback)(int, void *, struct pt_regs *); ++} chan_tab_t; ++ ++#define DEV_FLAGS_INUSE (1 << 0) ++#define DEV_FLAGS_ANYUSE (1 << 1) ++#define DEV_FLAGS_OUT (1 << 2) ++#define DEV_FLAGS_IN (1 << 3) ++#define DEV_FLAGS_BURSTABLE (1 << 4) ++#define DEV_FLAGS_SYNC (1 << 5) ++/* end Ddma API definitions */ ++ + /* External functions for drivers to use. + */ + /* Use this to allocate a dbdma channel. The device ids are one of the +@@ -299,8 +348,8 @@ + + /* Put buffers on source/destination descriptors. + */ +-u32 au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes); +-u32 au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes); ++u32 _au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags); ++u32 _au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes, u32 flags); + + /* Get a buffer from the destination descriptor. + */ +@@ -314,5 +363,25 @@ + void au1xxx_dbdma_chan_free(u32 chanid); + void au1xxx_dbdma_dump(u32 chanid); + ++u32 au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr ); ++ ++u32 au1xxx_ddma_add_device( dbdev_tab_t *dev ); ++ ++/* ++ Some compatibilty macros -- ++ Needed to make changes to API without breaking existing drivers ++*/ ++#define au1xxx_dbdma_put_source(chanid,buf,nbytes)_au1xxx_dbdma_put_source(chanid, buf, nbytes, DDMA_FLAGS_IE) ++#define au1xxx_dbdma_put_source_flags(chanid,buf,nbytes,flags) _au1xxx_dbdma_put_source(chanid, buf, nbytes, flags) ++ ++#define au1xxx_dbdma_put_dest(chanid,buf,nbytes) _au1xxx_dbdma_put_dest(chanid, buf, nbytes, DDMA_FLAGS_IE) ++#define au1xxx_dbdma_put_dest_flags(chanid,buf,nbytes,flags) _au1xxx_dbdma_put_dest(chanid, buf, nbytes, flags) ++ ++/* ++ * Flags for the put_source/put_dest functions. ++ */ ++#define DDMA_FLAGS_IE (1<<0) ++#define DDMA_FLAGS_NOIE (1<<1) ++ + #endif /* _LANGUAGE_ASSEMBLY */ + #endif /* _AU1000_DBDMA_H_ */ +diff -Nur linux-2.4.30/include/asm-mips/au1xxx_gpio.h linux-2.4.30-mips/include/asm-mips/au1xxx_gpio.h +--- linux-2.4.30/include/asm-mips/au1xxx_gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/au1xxx_gpio.h 2005-01-30 09:01:28.000000000 +0100 +@@ -0,0 +1,22 @@ ++ ++ ++#ifndef __AU1XXX_GPIO_H ++#define __AU1XXX_GPIO_H ++ ++void au1xxx_gpio1_set_inputs(void); ++void au1xxx_gpio_tristate(int signal); ++void au1xxx_gpio_write(int signal, int value); ++int au1xxx_gpio_read(int signal); ++ ++typedef volatile struct ++{ ++ u32 dir; ++ u32 reserved; ++ u32 output; ++ u32 pinstate; ++ u32 inten; ++ u32 enable; ++ ++} AU1X00_GPIO2; ++ ++#endif //__AU1XXX_GPIO_H +diff -Nur linux-2.4.30/include/asm-mips/au1xxx_psc.h linux-2.4.30-mips/include/asm-mips/au1xxx_psc.h +--- linux-2.4.30/include/asm-mips/au1xxx_psc.h 2005-01-19 15:10:11.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/au1xxx_psc.h 2005-01-30 09:01:28.000000000 +0100 +@@ -41,6 +41,11 @@ + #define PSC3_BASE_ADDR 0xb0d00000 + #endif + ++#ifdef CONFIG_SOC_AU1200 ++#define PSC0_BASE_ADDR 0xb1a00000 ++#define PSC1_BASE_ADDR 0xb1b00000 ++#endif ++ + /* The PSC select and control registers are common to + * all protocols. + */ +@@ -226,6 +231,8 @@ + #define PSC_I2SCFG_DD_DISABLE (1 << 27) + #define PSC_I2SCFG_DE_ENABLE (1 << 26) + #define PSC_I2SCFG_SET_WS(x) (((((x) / 2) - 1) & 0x7f) << 16) ++#define PSC_I2SCFG_WS(n) ((n&0xFF)<<16) ++#define PSC_I2SCFG_WS_MASK (PSC_I2SCFG_WS(0x3F)) + #define PSC_I2SCFG_WI (1 << 15) + + #define PSC_I2SCFG_DIV_MASK (3 << 13) +diff -Nur linux-2.4.30/include/asm-mips/bootinfo.h linux-2.4.30-mips/include/asm-mips/bootinfo.h +--- linux-2.4.30/include/asm-mips/bootinfo.h 2004-02-18 14:36:32.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/bootinfo.h 2005-01-30 09:01:28.000000000 +0100 +@@ -180,6 +180,9 @@ + #define MACH_MTX1 7 /* 4G MTX-1 Au1500-based board */ + #define MACH_CSB250 8 /* Cogent Au1500 */ + #define MACH_PB1550 9 /* Au1550-based eval board */ ++#define MACH_PB1200 10 /* Au1200-based eval board */ ++#define MACH_DB1550 11 /* Au1550-based eval board */ ++#define MACH_DB1200 12 /* Au1200-based eval board */ + + /* + * Valid machtype for group NEC_VR41XX +diff -Nur linux-2.4.30/include/asm-mips/db1200.h linux-2.4.30-mips/include/asm-mips/db1200.h +--- linux-2.4.30/include/asm-mips/db1200.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/db1200.h 2005-01-30 09:02:45.000000000 +0100 +@@ -0,0 +1,214 @@ ++/* ++ * AMD Alchemy DB1200 Referrence Board ++ * Board Registers defines. ++ * ++ * ######################################################################## ++ * ++ * This program is free software; you can distribute it and/or modify it ++ * under the terms of the GNU General Public License (Version 2) as ++ * published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++ * ++ * ######################################################################## ++ * ++ * ++ */ ++#ifndef __ASM_DB1200_H ++#define __ASM_DB1200_H ++ ++#include <linux/types.h> ++ ++// This is defined in au1000.h with bogus value ++#undef AU1X00_EXTERNAL_INT ++ ++#define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX ++#define DBDMA_AC97_RX_CHAN DSCR_CMD0_PSC1_RX ++#define DBDMA_I2S_TX_CHAN DSCR_CMD0_PSC1_TX ++#define DBDMA_I2S_RX_CHAN DSCR_CMD0_PSC1_RX ++ ++/* SPI and SMB are muxed on the Pb1200 board. ++ Refer to board documentation. ++ */ ++#define SPI_PSC_BASE PSC0_BASE_ADDR ++#define SMBUS_PSC_BASE PSC0_BASE_ADDR ++/* AC97 and I2S are muxed on the Pb1200 board. ++ Refer to board documentation. ++ */ ++#define AC97_PSC_BASE PSC1_BASE_ADDR ++#define I2S_PSC_BASE PSC1_BASE_ADDR ++ ++#define BCSR_KSEG1_ADDR 0xB9800000 ++ ++typedef volatile struct ++{ ++ /*00*/ u16 whoami; ++ u16 reserved0; ++ /*04*/ u16 status; ++ u16 reserved1; ++ /*08*/ u16 switches; ++ u16 reserved2; ++ /*0C*/ u16 resets; ++ u16 reserved3; ++ ++ /*10*/ u16 pcmcia; ++ u16 reserved4; ++ /*14*/ u16 board; ++ u16 reserved5; ++ /*18*/ u16 disk_leds; ++ u16 reserved6; ++ /*1C*/ u16 system; ++ u16 reserved7; ++ ++ /*20*/ u16 intclr; ++ u16 reserved8; ++ /*24*/ u16 intset; ++ u16 reserved9; ++ /*28*/ u16 intclr_mask; ++ u16 reserved10; ++ /*2C*/ u16 intset_mask; ++ u16 reserved11; ++ ++ /*30*/ u16 sig_status; ++ u16 reserved12; ++ /*34*/ u16 int_status; ++ u16 reserved13; ++ /*38*/ u16 reserved14; ++ u16 reserved15; ++ /*3C*/ u16 reserved16; ++ u16 reserved17; ++ ++} BCSR; ++ ++static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++ ++/* ++ * Register bit definitions for the BCSRs ++ */ ++#define BCSR_WHOAMI_DCID 0x000F ++#define BCSR_WHOAMI_CPLD 0x00F0 ++#define BCSR_WHOAMI_BOARD 0x0F00 ++ ++#define BCSR_STATUS_PCMCIA0VS 0x0003 ++#define BCSR_STATUS_PCMCIA1VS 0x000C ++#define BCSR_STATUS_SWAPBOOT 0x0040 ++#define BCSR_STATUS_FLASHBUSY 0x0100 ++#define BCSR_STATUS_IDECBLID 0x0200 ++#define BCSR_STATUS_SD0WP 0x0400 ++#define BCSR_STATUS_U0RXD 0x1000 ++#define BCSR_STATUS_U1RXD 0x2000 ++ ++#define BCSR_SWITCHES_OCTAL 0x00FF ++#define BCSR_SWITCHES_DIP_1 0x0080 ++#define BCSR_SWITCHES_DIP_2 0x0040 ++#define BCSR_SWITCHES_DIP_3 0x0020 ++#define BCSR_SWITCHES_DIP_4 0x0010 ++#define BCSR_SWITCHES_DIP_5 0x0008 ++#define BCSR_SWITCHES_DIP_6 0x0004 ++#define BCSR_SWITCHES_DIP_7 0x0002 ++#define BCSR_SWITCHES_DIP_8 0x0001 ++#define BCSR_SWITCHES_ROTARY 0x0F00 ++ ++#define BCSR_RESETS_ETH 0x0001 ++#define BCSR_RESETS_CAMERA 0x0002 ++#define BCSR_RESETS_DC 0x0004 ++#define BCSR_RESETS_IDE 0x0008 ++#define BCSR_RESETS_TV 0x0010 ++/* not resets but in the same register */ ++#define BCSR_RESETS_PWMR1mUX 0x0800 ++#define BCSR_RESETS_PCS0MUX 0x1000 ++#define BCSR_RESETS_PCS1MUX 0x2000 ++#define BCSR_RESETS_SPISEL 0x4000 ++ ++#define BCSR_PCMCIA_PC0VPP 0x0003 ++#define BCSR_PCMCIA_PC0VCC 0x000C ++#define BCSR_PCMCIA_PC0DRVEN 0x0010 ++#define BCSR_PCMCIA_PC0RST 0x0080 ++#define BCSR_PCMCIA_PC1VPP 0x0300 ++#define BCSR_PCMCIA_PC1VCC 0x0C00 ++#define BCSR_PCMCIA_PC1DRVEN 0x1000 ++#define BCSR_PCMCIA_PC1RST 0x8000 ++ ++#define BCSR_BOARD_LCDVEE 0x0001 ++#define BCSR_BOARD_LCDVDD 0x0002 ++#define BCSR_BOARD_LCDBL 0x0004 ++#define BCSR_BOARD_CAMSNAP 0x0010 ++#define BCSR_BOARD_CAMPWR 0x0020 ++#define BCSR_BOARD_SD0PWR 0x0040 ++ ++#define BCSR_LEDS_DECIMALS 0x0003 ++#define BCSR_LEDS_LED0 0x0100 ++#define BCSR_LEDS_LED1 0x0200 ++#define BCSR_LEDS_LED2 0x0400 ++#define BCSR_LEDS_LED3 0x0800 ++ ++#define BCSR_SYSTEM_POWEROFF 0x4000 ++#define BCSR_SYSTEM_RESET 0x8000 ++ ++/* Bit positions for the different interrupt sources */ ++#define BCSR_INT_IDE 0x0001 ++#define BCSR_INT_ETH 0x0002 ++#define BCSR_INT_PC0 0x0004 ++#define BCSR_INT_PC0STSCHG 0x0008 ++#define BCSR_INT_PC1 0x0010 ++#define BCSR_INT_PC1STSCHG 0x0020 ++#define BCSR_INT_DC 0x0040 ++#define BCSR_INT_FLASHBUSY 0x0080 ++#define BCSR_INT_PC0INSERT 0x0100 ++#define BCSR_INT_PC0EJECT 0x0200 ++#define BCSR_INT_PC1INSERT 0x0400 ++#define BCSR_INT_PC1EJECT 0x0800 ++#define BCSR_INT_SD0INSERT 0x1000 ++#define BCSR_INT_SD0EJECT 0x2000 ++ ++#define AU1XXX_SMC91111_PHYS_ADDR (0x19000300) ++#define AU1XXX_SMC91111_IRQ DB1200_ETH_INT ++ ++#define AU1XXX_ATA_PHYS_ADDR (0x18800000) ++#define AU1XXX_ATA_PHYS_LEN (0x100) ++#define AU1XXX_ATA_REG_OFFSET (5) ++#define AU1XXX_ATA_INT DB1200_IDE_INT ++#define AU1XXX_ATA_DDMA_REQ DSCR_CMD0_DMA_REQ1; ++#define AU1XXX_ATA_RQSIZE 128 ++ ++#define NAND_PHYS_ADDR 0x20000000 ++ ++/* ++ * External Interrupts for Pb1200 as of 8/6/2004. ++ * Bit positions in the CPLD registers can be calculated by taking ++ * the interrupt define and subtracting the DB1200_INT_BEGIN value. ++ * *example: IDE bis pos is = 64 - 64 ++ ETH bit pos is = 65 - 64 ++ */ ++#define DB1200_INT_BEGIN (AU1000_LAST_INTC1_INT + 1) ++#define DB1200_IDE_INT (DB1200_INT_BEGIN + 0) ++#define DB1200_ETH_INT (DB1200_INT_BEGIN + 1) ++#define DB1200_PC0_INT (DB1200_INT_BEGIN + 2) ++#define DB1200_PC0_STSCHG_INT (DB1200_INT_BEGIN + 3) ++#define DB1200_PC1_INT (DB1200_INT_BEGIN + 4) ++#define DB1200_PC1_STSCHG_INT (DB1200_INT_BEGIN + 5) ++#define DB1200_DC_INT (DB1200_INT_BEGIN + 6) ++#define DB1200_FLASHBUSY_INT (DB1200_INT_BEGIN + 7) ++#define DB1200_PC0_INSERT_INT (DB1200_INT_BEGIN + 8) ++#define DB1200_PC0_EJECT_INT (DB1200_INT_BEGIN + 9) ++#define DB1200_PC1_INSERT_INT (DB1200_INT_BEGIN + 10) ++#define DB1200_PC1_EJECT_INT (DB1200_INT_BEGIN + 11) ++#define DB1200_SD0_INSERT_INT (DB1200_INT_BEGIN + 12) ++#define DB1200_SD0_EJECT_INT (DB1200_INT_BEGIN + 13) ++ ++#define DB1200_INT_END (DB1200_INT_BEGIN + 15) ++ ++/* For drivers/pcmcia/au1000_db1x00.c */ ++#define BOARD_PC0_INT DB1200_PC0_INT ++#define BOARD_PC1_INT DB1200_PC1_INT ++#define BOARD_CARD_INSERTED(SOCKET) bcsr->sig_status & (1<<(8+(2*SOCKET))) ++ ++#endif /* __ASM_DB1200_H */ ++ +diff -Nur linux-2.4.30/include/asm-mips/db1x00.h linux-2.4.30-mips/include/asm-mips/db1x00.h +--- linux-2.4.30/include/asm-mips/db1x00.h 2005-01-19 15:10:11.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/db1x00.h 2005-01-30 09:06:19.000000000 +0100 +@@ -1,5 +1,5 @@ + /* +- * AMD Alchemy DB1x00 Reference Boards ++ * AMD Alchemy DB1x00 Reference Boards (BUT NOT DB1200) + * + * Copyright 2001 MontaVista Software Inc. + * Author: MontaVista Software, Inc. +@@ -36,9 +36,18 @@ + #define AC97_PSC_BASE PSC1_BASE_ADDR + #define SMBUS_PSC_BASE PSC2_BASE_ADDR + #define I2S_PSC_BASE PSC3_BASE_ADDR ++#define NAND_CS 1 ++/* for drivers/pcmcia/au1000_db1x00.c */ ++#define BOARD_PC0_INT AU1000_GPIO_3 ++#define BOARD_PC1_INT AU1000_GPIO_5 ++#define BOARD_CARD_INSERTED(SOCKET) !(bcsr->status & (1<<(4+SOCKET))) + + #else + #define BCSR_KSEG1_ADDR 0xAE000000 ++/* for drivers/pcmcia/au1000_db1x00.c */ ++#define BOARD_PC0_INT AU1000_GPIO_2 ++#define BOARD_PC1_INT AU1000_GPIO_5 ++#define BOARD_CARD_INSERTED(SOCKET) !(bcsr->status & (1<<(4+SOCKET))) + #endif + + /* +@@ -66,6 +75,7 @@ + + } BCSR; + ++static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; + + /* + * Register/mask bit definitions for the BCSRs +@@ -130,14 +140,6 @@ + + #define BCSR_SWRESET_RESET 0x0080 + +-/* PCMCIA Db1x00 specific defines */ +-#define PCMCIA_MAX_SOCK 1 +-#define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK+1) +- +-/* VPP/VCC */ +-#define SET_VCC_VPP(VCC, VPP, SLOT)\ +- ((((VCC)<<2) | ((VPP)<<0)) << ((SLOT)*8)) +- + /* MTD CONFIG OPTIONS */ + #if defined(CONFIG_MTD_DB1X00_BOOT) && defined(CONFIG_MTD_DB1X00_USER) + #define DB1X00_BOTH_BANKS +@@ -147,48 +149,15 @@ + #define DB1X00_USER_ONLY + #endif + +-/* SD controller macros */ +-/* +- * Detect card. +- */ +-#define mmc_card_inserted(_n_, _res_) \ +- do { \ +- BCSR * const bcsr = (BCSR *)0xAE000000; \ +- unsigned long mmc_wp, board_specific; \ +- if ((_n_)) { \ +- mmc_wp = BCSR_BOARD_SD1_WP; \ +- } else { \ +- mmc_wp = BCSR_BOARD_SD0_WP; \ +- } \ +- board_specific = au_readl((unsigned long)(&bcsr->specific)); \ +- if (!(board_specific & mmc_wp)) {/* low means card present */ \ +- *(int *)(_res_) = 1; \ +- } else { \ +- *(int *)(_res_) = 0; \ +- } \ +- } while (0) +- ++#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) && defined(CONFIG_MIPS_DB1550) + /* +- * Apply power to card slot(s). ++ * Daughter card information. + */ +-#define mmc_power_on(_n_) \ +- do { \ +- BCSR * const bcsr = (BCSR *)0xAE000000; \ +- unsigned long mmc_pwr, mmc_wp, board_specific; \ +- if ((_n_)) { \ +- mmc_pwr = BCSR_BOARD_SD1_PWR; \ +- mmc_wp = BCSR_BOARD_SD1_WP; \ +- } else { \ +- mmc_pwr = BCSR_BOARD_SD0_PWR; \ +- mmc_wp = BCSR_BOARD_SD0_WP; \ +- } \ +- board_specific = au_readl((unsigned long)(&bcsr->specific)); \ +- if (!(board_specific & mmc_wp)) {/* low means card present */ \ +- board_specific |= mmc_pwr; \ +- au_writel(board_specific, (int)(&bcsr->specific)); \ +- au_sync(); \ +- } \ +- } while (0) ++#define DAUGHTER_CARD_IRQ (AU1000_GPIO_8) ++/* DC_IDE */ ++#define AU1XXX_ATA_PHYS_ADDR (0x0C000000) ++#define AU1XXX_ATA_REG_OFFSET (5) ++#endif /* CONFIG_MIPS_DB1550 */ + + #endif /* __ASM_DB1X00_H */ + +diff -Nur linux-2.4.30/include/asm-mips/ficmmp.h linux-2.4.30-mips/include/asm-mips/ficmmp.h +--- linux-2.4.30/include/asm-mips/ficmmp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/ficmmp.h 2005-01-30 09:01:28.000000000 +0100 +@@ -0,0 +1,156 @@ ++/* ++ * FIC MMP ++ * ++ * ######################################################################## ++ * ++ * This program is free software; you can distribute it and/or modify it ++ * under the terms of the GNU General Public License (Version 2) as ++ * published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++ * ++ * ######################################################################## ++ * ++ * ++ */ ++#ifndef __ASM_FICMMP_H ++#define __ASM_FICMMP_H ++ ++#include <linux/types.h> ++#include <asm/au1000.h> ++#include <asm/au1xxx_gpio.h> ++ ++// This is defined in au1000.h with bogus value ++#undef AU1X00_EXTERNAL_INT ++ ++#define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX ++#define DBDMA_AC97_RX_CHAN DSCR_CMD0_PSC1_RX ++#define DBDMA_I2S_TX_CHAN DSCR_CMD0_PSC1_TX ++#define DBDMA_I2S_RX_CHAN DSCR_CMD0_PSC1_RX ++/* SPI and SMB are muxed on the Pb1200 board. ++ Refer to board documentation. ++ */ ++#define SPI_PSC_BASE PSC0_BASE_ADDR ++#define SMBUS_PSC_BASE PSC0_BASE_ADDR ++/* AC97 and I2S are muxed on the Pb1200 board. ++ Refer to board documentation. ++ */ ++#define AC97_PSC_BASE PSC1_BASE_ADDR ++#define I2S_PSC_BASE PSC1_BASE_ADDR ++ ++ ++/* ++ * SMSC LAN91C111 ++ */ ++#define AU1XXX_SMC91111_PHYS_ADDR (0xAC000300) ++#define AU1XXX_SMC91111_IRQ AU1000_GPIO_5 ++ ++/* DC_IDE and DC_ETHERNET */ ++#define FICMMP_IDE_INT AU1000_GPIO_4 ++ ++#define AU1XXX_ATA_PHYS_ADDR (0x0C800000) ++#define AU1XXX_ATA_REG_OFFSET (5) ++/* ++#define AU1XXX_ATA_BASE (0x0C800000) ++#define AU1XXX_ATA_END (0x0CFFFFFF) ++#define AU1XXX_ATA_MEM_SIZE (AU1XXX_ATA_END - AU1XXX_ATA_BASE +1) ++ ++#define AU1XXX_ATA_REG_OFFSET (5) ++*/ ++/* VPP/VCC */ ++#define SET_VCC_VPP(VCC, VPP, SLOT)\ ++ ((((VCC)<<2) | ((VPP)<<0)) << ((SLOT)*8)) ++ ++ ++#define FICMMP_CONFIG_BASE 0xAD000000 ++#define FICMMP_CONFIG_ENABLE 13 ++ ++#define FICMMP_CONFIG_I2SFREQ(N) (N<<0) ++#define FICMMP_CONFIG_I2SXTAL0 (1<<0) ++#define FICMMP_CONFIG_I2SXTAL1 (1<<1) ++#define FICMMP_CONFIG_I2SXTAL2 (1<<2) ++#define FICMMP_CONFIG_I2SXTAL3 (1<<3) ++#define FICMMP_CONFIG_ADV1 (1<<4) ++#define FICMMP_CONFIG_IDERST (1<<5) ++#define FICMMP_CONFIG_LCMEN (1<<6) ++#define FICMMP_CONFIG_CAMPWDN (1<<7) ++#define FICMMP_CONFIG_USBPWREN (1<<8) ++#define FICMMP_CONFIG_LCMPWREN (1<<9) ++#define FICMMP_CONFIG_TVOUTPWREN (1<<10) ++#define FICMMP_CONFIG_RS232PWREN (1<<11) ++#define FICMMP_CONFIG_LCMDATAOUT (1<<12) ++#define FICMMP_CONFIG_TVODATAOUT (1<<13) ++#define FICMMP_CONFIG_ADV3 (1<<14) ++#define FICMMP_CONFIG_ADV4 (1<<15) ++ ++#define I2S_FREQ_8_192 (0x0) ++#define I2S_FREQ_11_2896 (0x1) ++#define I2S_FREQ_12_288 (0x2) ++#define I2S_FREQ_24_576 (0x3) ++//#define I2S_FREQ_12_288 (0x4) ++#define I2S_FREQ_16_9344 (0x5) ++#define I2S_FREQ_18_432 (0x6) ++#define I2S_FREQ_36_864 (0x7) ++#define I2S_FREQ_16_384 (0x8) ++#define I2S_FREQ_22_5792 (0x9) ++//#define I2S_FREQ_24_576 (0x10) ++#define I2S_FREQ_49_152 (0x11) ++//#define I2S_FREQ_24_576 (0x12) ++#define I2S_FREQ_33_8688 (0x13) ++//#define I2S_FREQ_36_864 (0x14) ++#define I2S_FREQ_73_728 (0x15) ++ ++#define FICMMP_IDE_PWR 9 ++#define FICMMP_FOCUS_RST 2 ++ ++static __inline void ficmmp_config_set(u16 bits) ++{ ++ extern u16 ficmmp_config; ++ //printk("set_config: %X, Old: %X, New: %X\n", bits, ficmmp_config, ficmmp_config | bits); ++ ficmmp_config |= bits; ++ *((u16*)FICMMP_CONFIG_BASE) = ficmmp_config; ++} ++ ++static __inline void ficmmp_config_clear(u16 bits) ++{ ++ extern u16 ficmmp_config; ++// printk("clear_config: %X, Old: %X, New: %X\n", bits, ficmmp_config, ficmmp_config & ~bits); ++ ficmmp_config &= ~bits; ++ *((u16*)FICMMP_CONFIG_BASE) = ficmmp_config; ++} ++ ++static __inline void ficmmp_config_init(void) ++{ ++ au1xxx_gpio_write(FICMMP_CONFIG_ENABLE, 0); //Enable configuration latch ++ ficmmp_config_set(FICMMP_CONFIG_LCMDATAOUT | FICMMP_CONFIG_TVODATAOUT | FICMMP_CONFIG_IDERST); //Disable display data buffers ++ ficmmp_config_set(FICMMP_CONFIG_I2SFREQ(I2S_FREQ_36_864)); ++} ++ ++static __inline u32 ficmmp_set_i2s_sample_rate(u32 rate) ++{ ++ u32 freq; ++ ++ switch(rate) ++ { ++ case 88200: ++ case 44100: ++ case 8018: freq = I2S_FREQ_11_2896; break; ++ case 48000: ++ case 32000: //freq = I2S_FREQ_18_432; break; ++ case 8000: freq = I2S_FREQ_12_288; break; ++ default: freq = I2S_FREQ_12_288; rate = 8000; ++ } ++ ficmmp_config_clear(FICMMP_CONFIG_I2SFREQ(0xF)); ++ ficmmp_config_set(FICMMP_CONFIG_I2SFREQ(freq)); ++ return rate; ++} ++ ++#endif /* __ASM_FICMMP_H */ ++ +diff -Nur linux-2.4.30/include/asm-mips/hazards.h linux-2.4.30-mips/include/asm-mips/hazards.h +--- linux-2.4.30/include/asm-mips/hazards.h 2004-02-18 14:36:32.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/hazards.h 2004-11-25 23:18:38.000000000 +0100 +@@ -3,7 +3,7 @@ + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * +- * Copyright (C) 2003 Ralf Baechle ++ * Copyright (C) 2003, 2004 Ralf Baechle + */ + #ifndef _ASM_HAZARDS_H + #define _ASM_HAZARDS_H +@@ -12,38 +12,185 @@ + + #ifdef __ASSEMBLY__ + ++ .macro _ssnop ++ sll $0, $0, 1 ++ .endm ++ + /* + * RM9000 hazards. When the JTLB is updated by tlbwi or tlbwr, a subsequent + * use of the JTLB for instructions should not occur for 4 cpu cycles and use + * for data translations should not occur for 3 cpu cycles. + */ + #ifdef CONFIG_CPU_RM9000 +-#define rm9000_tlb_hazard \ ++ ++#define mtc0_tlbw_hazard \ ++ .set push; \ ++ .set mips32; \ ++ _ssnop; _ssnop; _ssnop; _ssnop; \ ++ .set pop ++ ++#define tlbw_eret_hazard \ + .set push; \ + .set mips32; \ +- ssnop; ssnop; ssnop; ssnop; \ ++ _ssnop; _ssnop; _ssnop; _ssnop; \ + .set pop ++ + #else +-#define rm9000_tlb_hazard ++ ++/* ++ * The taken branch will result in a two cycle penalty for the two killed ++ * instructions on R4000 / R4400. Other processors only have a single cycle ++ * hazard so this is nice trick to have an optimal code for a range of ++ * processors. ++ */ ++#define mtc0_tlbw_hazard \ ++ b . + 8 ++#define tlbw_eret_hazard + #endif + ++/* ++ * mtc0->mfc0 hazard ++ * The 24K has a 2 cycle mtc0/mfc0 execution hazard. ++ * It is a MIPS32R2 processor so ehb will clear the hazard. ++ */ ++ ++#ifdef CONFIG_CPU_MIPSR2 ++/* ++ * Use a macro for ehb unless explicit support for MIPSR2 is enabled ++ */ ++ .macro ehb ++ sll $0, $0, 3 ++ .endm ++ ++#define irq_enable_hazard \ ++ ehb # irq_enable_hazard ++ ++#define irq_disable_hazard \ ++ ehb # irq_disable_hazard ++ + #else + ++#define irq_enable_hazard ++#define irq_disable_hazard ++ ++#endif ++ ++#else /* __ASSEMBLY__ */ ++ + /* + * RM9000 hazards. When the JTLB is updated by tlbwi or tlbwr, a subsequent + * use of the JTLB for instructions should not occur for 4 cpu cycles and use + * for data translations should not occur for 3 cpu cycles. + */ + #ifdef CONFIG_CPU_RM9000 +-#define rm9000_tlb_hazard() \ ++ ++#define mtc0_tlbw_hazard() \ + __asm__ __volatile__( \ + ".set\tmips32\n\t" \ +- "ssnop; ssnop; ssnop; ssnop\n\t" \ ++ "_ssnop; _ssnop; _ssnop; _ssnop\n\t" \ ++ ".set\tmips0") ++ ++#define tlbw_use_hazard() \ ++ __asm__ __volatile__( \ ++ ".set\tmips32\n\t" \ ++ "_ssnop; _ssnop; _ssnop; _ssnop\n\t" \ + ".set\tmips0") + #else +-#define rm9000_tlb_hazard() do { } while (0) ++ ++/* ++ * Overkill warning ... ++ */ ++#define mtc0_tlbw_hazard() \ ++ __asm__ __volatile__( \ ++ ".set noreorder\n\t" \ ++ "nop; nop; nop; nop; nop; nop;\n\t" \ ++ ".set reorder\n\t") ++ ++#define tlbw_use_hazard() \ ++ __asm__ __volatile__( \ ++ ".set noreorder\n\t" \ ++ "nop; nop; nop; nop; nop; nop;\n\t" \ ++ ".set reorder\n\t") ++ + #endif + ++/* ++ * mtc0->mfc0 hazard ++ * The 24K has a 2 cycle mtc0/mfc0 execution hazard. ++ * It is a MIPS32R2 processor so ehb will clear the hazard. ++ */ ++ ++#ifdef CONFIG_CPU_MIPSR2 ++/* ++ * Use a macro for ehb unless explicit support for MIPSR2 is enabled ++ */ ++__asm__( ++ " .macro ehb \n\t" ++ " sll $0, $0, 3 \n\t" ++ " .endm \n\t" ++ " \n\t" ++ " .macro\tirq_enable_hazard \n\t" ++ " ehb \n\t" ++ " .endm \n\t" ++ " \n\t" ++ " .macro\tirq_disable_hazard \n\t" ++ " ehb \n\t" ++ " .endm"); ++ ++#define irq_enable_hazard() \ ++ __asm__ __volatile__( \ ++ "ehb\t\t\t\t# irq_enable_hazard") ++ ++#define irq_disable_hazard() \ ++ __asm__ __volatile__( \ ++ "ehb\t\t\t\t# irq_disable_hazard") ++ ++#elif defined(CONFIG_CPU_R10000) ++ ++/* ++ * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer. ++ */ ++ ++__asm__( ++ " .macro\tirq_enable_hazard \n\t" ++ " .endm \n\t" ++ " \n\t" ++ " .macro\tirq_disable_hazard \n\t" ++ " .endm"); ++ ++#define irq_enable_hazard() do { } while (0) ++#define irq_disable_hazard() do { } while (0) ++ ++#else ++ ++/* ++ * Default for classic MIPS processors. Assume worst case hazards but don't ++ * care about the irq_enable_hazard - sooner or later the hardware will ++ * enable it and we don't care when exactly. ++ */ ++ ++__asm__( ++ " .macro _ssnop \n\t" ++ " sll $0, $2, 1 \n\t" ++ " .endm \n\t" ++ " \n\t" ++ " # \n\t" ++ " # There is a hazard but we do not care \n\t" ++ " # \n\t" ++ " .macro\tirq_enable_hazard \n\t" ++ " .endm \n\t" ++ " \n\t" ++ " .macro\tirq_disable_hazard \n\t" ++ " _ssnop; _ssnop; _ssnop \n\t" ++ " .endm"); ++ ++#define irq_enable_hazard() do { } while (0) ++#define irq_disable_hazard() \ ++ __asm__ __volatile__( \ ++ "_ssnop; _ssnop; _ssnop;\t\t# irq_disable_hazard") ++ + #endif + ++#endif /* __ASSEMBLY__ */ ++ + #endif /* _ASM_HAZARDS_H */ +diff -Nur linux-2.4.30/include/asm-mips/mipsregs.h linux-2.4.30-mips/include/asm-mips/mipsregs.h +--- linux-2.4.30/include/asm-mips/mipsregs.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/mipsregs.h 2005-02-06 22:24:22.000000000 +0100 +@@ -757,10 +757,18 @@ + #define read_c0_config1() __read_32bit_c0_register($16, 1) + #define read_c0_config2() __read_32bit_c0_register($16, 2) + #define read_c0_config3() __read_32bit_c0_register($16, 3) ++#define read_c0_config4() __read_32bit_c0_register($16, 4) ++#define read_c0_config5() __read_32bit_c0_register($16, 5) ++#define read_c0_config6() __read_32bit_c0_register($16, 6) ++#define read_c0_config7() __read_32bit_c0_register($16, 7) + #define write_c0_config(val) __write_32bit_c0_register($16, 0, val) + #define write_c0_config1(val) __write_32bit_c0_register($16, 1, val) + #define write_c0_config2(val) __write_32bit_c0_register($16, 2, val) + #define write_c0_config3(val) __write_32bit_c0_register($16, 3, val) ++#define write_c0_config4(val) __write_32bit_c0_register($16, 4, val) ++#define write_c0_config5(val) __write_32bit_c0_register($16, 5, val) ++#define write_c0_config6(val) __write_32bit_c0_register($16, 6, val) ++#define write_c0_config7(val) __write_32bit_c0_register($16, 7, val) + + /* + * The WatchLo register. There may be upto 8 of them. +@@ -874,42 +882,34 @@ + */ + static inline void tlb_probe(void) + { +- rm9000_tlb_hazard(); + __asm__ __volatile__( + ".set noreorder\n\t" + "tlbp\n\t" + ".set reorder"); +- rm9000_tlb_hazard(); + } + + static inline void tlb_read(void) + { +- rm9000_tlb_hazard(); + __asm__ __volatile__( + ".set noreorder\n\t" + "tlbr\n\t" + ".set reorder"); +- rm9000_tlb_hazard(); + } + + static inline void tlb_write_indexed(void) + { +- rm9000_tlb_hazard(); + __asm__ __volatile__( + ".set noreorder\n\t" + "tlbwi\n\t" + ".set reorder"); +- rm9000_tlb_hazard(); + } + + static inline void tlb_write_random(void) + { +- rm9000_tlb_hazard(); + __asm__ __volatile__( + ".set noreorder\n\t" + "tlbwr\n\t" + ".set reorder"); +- rm9000_tlb_hazard(); + } + + /* +diff -Nur linux-2.4.30/include/asm-mips/mmu_context.h linux-2.4.30-mips/include/asm-mips/mmu_context.h +--- linux-2.4.30/include/asm-mips/mmu_context.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/mmu_context.h 2004-11-22 14:38:29.000000000 +0100 +@@ -27,7 +27,7 @@ + #define TLBMISS_HANDLER_SETUP_PGD(pgd) \ + pgd_current[smp_processor_id()] = (unsigned long)(pgd) + #define TLBMISS_HANDLER_SETUP() \ +- write_c0_context((unsigned long) smp_processor_id() << (23 + 3)); \ ++ write_c0_context((unsigned long) smp_processor_id() << 23); \ + TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir) + extern unsigned long pgd_current[]; + +diff -Nur linux-2.4.30/include/asm-mips/pb1100.h linux-2.4.30-mips/include/asm-mips/pb1100.h +--- linux-2.4.30/include/asm-mips/pb1100.h 2003-08-25 13:44:44.000000000 +0200 ++++ linux-2.4.30-mips/include/asm-mips/pb1100.h 2005-01-30 09:10:29.000000000 +0100 +@@ -1,5 +1,5 @@ + /* +- * Alchemy Semi PB1100 Referrence Board ++ * AMD Alchemy PB1100 Reference Boards + * + * Copyright 2001 MontaVista Software Inc. + * Author: MontaVista Software, Inc. +@@ -27,55 +27,108 @@ + #ifndef __ASM_PB1100_H + #define __ASM_PB1100_H + +-#define PB1100_IDENT 0xAE000000 +-#define BOARD_STATUS_REG 0xAE000004 +- #define PB1100_ROM_SEL (1<<15) +- #define PB1100_ROM_SIZ (1<<14) +- #define PB1100_SWAP_BOOT (1<<13) +- #define PB1100_FLASH_WP (1<<12) +- #define PB1100_ROM_H_STS (1<<11) +- #define PB1100_ROM_L_STS (1<<10) +- #define PB1100_FLASH_H_STS (1<<9) +- #define PB1100_FLASH_L_STS (1<<8) +- #define PB1100_SRAM_SIZ (1<<7) +- #define PB1100_TSC_BUSY (1<<6) +- #define PB1100_PCMCIA_VS_MASK (3<<4) +- #define PB1100_RS232_CD (1<<3) +- #define PB1100_RS232_CTS (1<<2) +- #define PB1100_RS232_DSR (1<<1) +- #define PB1100_RS232_RI (1<<0) +- +-#define PB1100_IRDA_RS232 0xAE00000C +- #define PB1100_IRDA_FULL (0<<14) /* full power */ +- #define PB1100_IRDA_SHUTDOWN (1<<14) +- #define PB1100_IRDA_TT (2<<14) /* 2/3 power */ +- #define PB1100_IRDA_OT (3<<14) /* 1/3 power */ +- #define PB1100_IRDA_FIR (1<<13) +- +-#define PCMCIA_BOARD_REG 0xAE000010 +- #define PB1100_SD_WP1_RO (1<<15) /* read only */ +- #define PB1100_SD_WP0_RO (1<<14) /* read only */ +- #define PB1100_SD_PWR1 (1<<11) /* applies power to SD1 */ +- #define PB1100_SD_PWR0 (1<<10) /* applies power to SD0 */ +- #define PB1100_SEL_SD_CONN1 (1<<9) +- #define PB1100_SEL_SD_CONN0 (1<<8) +- #define PC_DEASSERT_RST (1<<7) +- #define PC_DRV_EN (1<<4) +- +-#define PB1100_G_CONTROL 0xAE000014 /* graphics control */ +- +-#define PB1100_RST_VDDI 0xAE00001C +- #define PB1100_SOFT_RESET (1<<15) /* clear to reset the board */ +- #define PB1100_VDDI_MASK (0x1F) ++#define BCSR_KSEG1_ADDR 0xAE000000 ++ ++/* ++ * Overlay data structure of the Pb1100 board registers. ++ * Registers located at physical 0E0000xx, KSEG1 0xAE0000xx ++ */ ++typedef volatile struct ++{ ++ /*00*/ unsigned short whoami; ++ unsigned short reserved0; ++ /*04*/ unsigned short status; ++ unsigned short reserved1; ++ /*08*/ unsigned short switches; ++ unsigned short reserved2; ++ /*0C*/ unsigned short resets; ++ unsigned short reserved3; ++ /*10*/ unsigned short pcmcia; ++ unsigned short reserved4; ++ /*14*/ unsigned short graphics; ++ unsigned short reserved5; ++ /*18*/ unsigned short leds; ++ unsigned short reserved6; ++ /*1C*/ unsigned short swreset; ++ unsigned short reserved7; ++ ++} BCSR; + +-#define PB1100_LEDS 0xAE000018 + +-/* 11:8 is 4 discreet LEDs. Clearing a bit illuminates the LED. +- * 7:0 is the LED Display's decimal points. ++/* ++ * Register/mask bit definitions for the BCSRs + */ +-#define PB1100_HEX_LED 0xAE000018 ++#define BCSR_WHOAMI_DCID 0x000F ++#define BCSR_WHOAMI_CPLD 0x00F0 ++#define BCSR_WHOAMI_BOARD 0x0F00 ++ ++#define BCSR_STATUS_RS232_RI 0x0001 ++#define BCSR_STATUS_RS232_DSR 0x0002 ++#define BCSR_STATUS_RS232_CTS 0x0004 ++#define BCSR_STATUS_RS232_CD 0x0008 ++#define BCSR_STATUS_PCMCIA_VS_MASK 0x0030 ++#define BCSR_STATUS_TSC_BUSY 0x0040 ++#define BCSR_STATUS_SRAM_SIZ 0x0080 ++#define BCSR_STATUS_FLASH_L_STS 0x0100 ++#define BCSR_STATUS_FLASH_H_STS 0x0200 ++#define BCSR_STATUS_ROM_H_STS 0x0400 ++#define BCSR_STATUS_ROM_L_STS 0x0800 ++#define BCSR_STATUS_FLASH_WP 0x1000 ++#define BCSR_STATUS_SWAP_BOOT 0x2000 ++#define BCSR_STATUS_ROM_SIZ 0x4000 ++#define BCSR_STATUS_ROM_SEL 0x8000 ++ ++#define BCSR_SWITCHES_DIP 0x00FF ++#define BCSR_SWITCHES_DIP_1 0x0080 ++#define BCSR_SWITCHES_DIP_2 0x0040 ++#define BCSR_SWITCHES_DIP_3 0x0020 ++#define BCSR_SWITCHES_DIP_4 0x0010 ++#define BCSR_SWITCHES_DIP_5 0x0008 ++#define BCSR_SWITCHES_DIP_6 0x0004 ++#define BCSR_SWITCHES_DIP_7 0x0002 ++#define BCSR_SWITCHES_DIP_8 0x0001 ++#define BCSR_SWITCHES_ROTARY 0x0F00 ++#define BCSR_SWITCHES_SDO_CL 0x8000 ++ ++#define BCSR_RESETS_PHY0 0x0001 ++#define BCSR_RESETS_PHY1 0x0002 ++#define BCSR_RESETS_DC 0x0004 ++#define BCSR_RESETS_RS232_RTS 0x0100 ++#define BCSR_RESETS_RS232_DTR 0x0200 ++#define BCSR_RESETS_FIR_SEL 0x2000 ++#define BCSR_RESETS_IRDA_MODE_MASK 0xC000 ++#define BCSR_RESETS_IRDA_MODE_FULL 0x0000 ++#define BCSR_RESETS_IRDA_MODE_OFF 0x4000 ++#define BCSR_RESETS_IRDA_MODE_2_3 0x8000 ++#define BCSR_RESETS_IRDA_MODE_1_3 0xC000 ++ ++#define BCSR_PCMCIA_PC0VPP 0x0003 ++#define BCSR_PCMCIA_PC0VCC 0x000C ++#define BCSR_PCMCIA_PC0_DR_VEN 0x0010 ++#define BCSR_PCMCIA_PC0RST 0x0080 ++#define BCSR_PCMCIA_SEL_SD_CON0 0x0100 ++#define BCSR_PCMCIA_SEL_SD_CON1 0x0200 ++#define BCSR_PCMCIA_SD0_PWR 0x0400 ++#define BCSR_PCMCIA_SD1_PWR 0x0800 ++#define BCSR_PCMCIA_SD0_WP 0x4000 ++#define BCSR_PCMCIA_SD1_WP 0x8000 ++ ++#define PB1100_G_CONTROL 0xAE000014 ++#define BCSR_GRAPHICS_GPX_SMPASS 0x0010 ++#define BCSR_GRAPHICS_GPX_BIG_ENDIAN 0x0020 ++#define BCSR_GRAPHICS_GPX_RST 0x0040 ++ ++#define BCSR_LEDS_DECIMALS 0x00FF ++#define BCSR_LEDS_LED0 0x0100 ++#define BCSR_LEDS_LED1 0x0200 ++#define BCSR_LEDS_LED2 0x0400 ++#define BCSR_LEDS_LED3 0x0800 ++ ++#define BCSR_SWRESET_RESET 0x0080 ++#define BCSR_VDDI_VDI 0x001F + +-/* PCMCIA PB1100 specific defines */ ++ ++ /* PCMCIA Pb1x00 specific defines */ + #define PCMCIA_MAX_SOCK 0 + #define PCMCIA_NUM_SOCKS (PCMCIA_MAX_SOCK+1) + +@@ -83,3 +136,4 @@ + #define SET_VCC_VPP(VCC, VPP) (((VCC)<<2) | ((VPP)<<0)) + + #endif /* __ASM_PB1100_H */ ++ +diff -Nur linux-2.4.30/include/asm-mips/pb1200.h linux-2.4.30-mips/include/asm-mips/pb1200.h +--- linux-2.4.30/include/asm-mips/pb1200.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/pb1200.h 2005-01-30 09:01:28.000000000 +0100 +@@ -0,0 +1,244 @@ ++/* ++ * AMD Alchemy PB1200 Referrence Board ++ * Board Registers defines. ++ * ++ * ######################################################################## ++ * ++ * This program is free software; you can distribute it and/or modify it ++ * under the terms of the GNU General Public License (Version 2) as ++ * published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++ * ++ * ######################################################################## ++ * ++ * ++ */ ++#ifndef __ASM_PB1200_H ++#define __ASM_PB1200_H ++ ++#include <linux/types.h> ++ ++// This is defined in au1000.h with bogus value ++#undef AU1X00_EXTERNAL_INT ++ ++#define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX ++#define DBDMA_AC97_RX_CHAN DSCR_CMD0_PSC1_RX ++#define DBDMA_I2S_TX_CHAN DSCR_CMD0_PSC1_TX ++#define DBDMA_I2S_RX_CHAN DSCR_CMD0_PSC1_RX ++ ++/* SPI and SMB are muxed on the Pb1200 board. ++ Refer to board documentation. ++ */ ++#define SPI_PSC_BASE PSC0_BASE_ADDR ++#define SMBUS_PSC_BASE PSC0_BASE_ADDR ++/* AC97 and I2S are muxed on the Pb1200 board. ++ Refer to board documentation. ++ */ ++#define AC97_PSC_BASE PSC1_BASE_ADDR ++#define I2S_PSC_BASE PSC1_BASE_ADDR ++ ++#define BCSR_KSEG1_ADDR 0xAD800000 ++ ++typedef volatile struct ++{ ++ /*00*/ u16 whoami; ++ u16 reserved0; ++ /*04*/ u16 status; ++ u16 reserved1; ++ /*08*/ u16 switches; ++ u16 reserved2; ++ /*0C*/ u16 resets; ++ u16 reserved3; ++ ++ /*10*/ u16 pcmcia; ++ u16 reserved4; ++ /*14*/ u16 board; ++ u16 reserved5; ++ /*18*/ u16 disk_leds; ++ u16 reserved6; ++ /*1C*/ u16 system; ++ u16 reserved7; ++ ++ /*20*/ u16 intclr; ++ u16 reserved8; ++ /*24*/ u16 intset; ++ u16 reserved9; ++ /*28*/ u16 intclr_mask; ++ u16 reserved10; ++ /*2C*/ u16 intset_mask; ++ u16 reserved11; ++ ++ /*30*/ u16 sig_status; ++ u16 reserved12; ++ /*34*/ u16 int_status; ++ u16 reserved13; ++ /*38*/ u16 reserved14; ++ u16 reserved15; ++ /*3C*/ u16 reserved16; ++ u16 reserved17; ++ ++} BCSR; ++ ++static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; ++ ++/* ++ * Register bit definitions for the BCSRs ++ */ ++#define BCSR_WHOAMI_DCID 0x000F ++#define BCSR_WHOAMI_CPLD 0x00F0 ++#define BCSR_WHOAMI_BOARD 0x0F00 ++ ++#define BCSR_STATUS_PCMCIA0VS 0x0003 ++#define BCSR_STATUS_PCMCIA1VS 0x000C ++#define BCSR_STATUS_SWAPBOOT 0x0040 ++#define BCSR_STATUS_FLASHBUSY 0x0100 ++#define BCSR_STATUS_IDECBLID 0x0200 ++#define BCSR_STATUS_SD0WP 0x0400 ++#define BCSR_STATUS_SD1WP 0x0800 ++#define BCSR_STATUS_U0RXD 0x1000 ++#define BCSR_STATUS_U1RXD 0x2000 ++ ++#define BCSR_SWITCHES_OCTAL 0x00FF ++#define BCSR_SWITCHES_DIP_1 0x0080 ++#define BCSR_SWITCHES_DIP_2 0x0040 ++#define BCSR_SWITCHES_DIP_3 0x0020 ++#define BCSR_SWITCHES_DIP_4 0x0010 ++#define BCSR_SWITCHES_DIP_5 0x0008 ++#define BCSR_SWITCHES_DIP_6 0x0004 ++#define BCSR_SWITCHES_DIP_7 0x0002 ++#define BCSR_SWITCHES_DIP_8 0x0001 ++#define BCSR_SWITCHES_ROTARY 0x0F00 ++ ++#define BCSR_RESETS_ETH 0x0001 ++#define BCSR_RESETS_CAMERA 0x0002 ++#define BCSR_RESETS_DC 0x0004 ++#define BCSR_RESETS_IDE 0x0008 ++/* not resets but in the same register */ ++#define BCSR_RESETS_WSCFSM 0x0800 ++#define BCSR_RESETS_PCS0MUX 0x1000 ++#define BCSR_RESETS_PCS1MUX 0x2000 ++#define BCSR_RESETS_SPISEL 0x4000 ++#define BCSR_RESETS_SD1MUX 0x8000 ++ ++#define BCSR_PCMCIA_PC0VPP 0x0003 ++#define BCSR_PCMCIA_PC0VCC 0x000C ++#define BCSR_PCMCIA_PC0DRVEN 0x0010 ++#define BCSR_PCMCIA_PC0RST 0x0080 ++#define BCSR_PCMCIA_PC1VPP 0x0300 ++#define BCSR_PCMCIA_PC1VCC 0x0C00 ++#define BCSR_PCMCIA_PC1DRVEN 0x1000 ++#define BCSR_PCMCIA_PC1RST 0x8000 ++ ++#define BCSR_BOARD_LCDVEE 0x0001 ++#define BCSR_BOARD_LCDVDD 0x0002 ++#define BCSR_BOARD_LCDBL 0x0004 ++#define BCSR_BOARD_CAMSNAP 0x0010 ++#define BCSR_BOARD_CAMPWR 0x0020 ++#define BCSR_BOARD_SD0PWR 0x0040 ++#define BCSR_BOARD_SD1PWR 0x0080 ++ ++#define BCSR_LEDS_DECIMALS 0x00FF ++#define BCSR_LEDS_LED0 0x0100 ++#define BCSR_LEDS_LED1 0x0200 ++#define BCSR_LEDS_LED2 0x0400 ++#define BCSR_LEDS_LED3 0x0800 ++ ++#define BCSR_SYSTEM_VDDI 0x001F ++#define BCSR_SYSTEM_POWEROFF 0x4000 ++#define BCSR_SYSTEM_RESET 0x8000 ++ ++/* Bit positions for the different interrupt sources */ ++#define BCSR_INT_IDE 0x0001 ++#define BCSR_INT_ETH 0x0002 ++#define BCSR_INT_PC0 0x0004 ++#define BCSR_INT_PC0STSCHG 0x0008 ++#define BCSR_INT_PC1 0x0010 ++#define BCSR_INT_PC1STSCHG 0x0020 ++#define BCSR_INT_DC 0x0040 ++#define BCSR_INT_FLASHBUSY 0x0080 ++#define BCSR_INT_PC0INSERT 0x0100 ++#define BCSR_INT_PC0EJECT 0x0200 ++#define BCSR_INT_PC1INSERT 0x0400 ++#define BCSR_INT_PC1EJECT 0x0800 ++#define BCSR_INT_SD0INSERT 0x1000 ++#define BCSR_INT_SD0EJECT 0x2000 ++#define BCSR_INT_SD1INSERT 0x4000 ++#define BCSR_INT_SD1EJECT 0x8000 ++ ++#define AU1XXX_SMC91111_PHYS_ADDR (0x0D000300) ++#define AU1XXX_SMC91111_IRQ PB1200_ETH_INT ++ ++#define AU1XXX_ATA_PHYS_ADDR (0x0C800000) ++#define AU1XXX_ATA_PHYS_LEN (0x100) ++#define AU1XXX_ATA_REG_OFFSET (5) ++#define AU1XXX_ATA_INT PB1200_IDE_INT ++#define AU1XXX_ATA_DDMA_REQ DSCR_CMD0_DMA_REQ1; ++#define AU1XXX_ATA_RQSIZE 128 ++ ++#define NAND_PHYS_ADDR 0x1C000000 ++ ++/* Timing values as described in databook, * ns value stripped of ++ * lower 2 bits. ++ * These defines are here rather than an SOC1200 generic file because ++ * the parts chosen on another board may be different and may require ++ * different timings. ++ */ ++#define NAND_T_H (18 >> 2) ++#define NAND_T_PUL (30 >> 2) ++#define NAND_T_SU (30 >> 2) ++#define NAND_T_WH (30 >> 2) ++ ++/* Bitfield shift amounts */ ++#define NAND_T_H_SHIFT 0 ++#define NAND_T_PUL_SHIFT 4 ++#define NAND_T_SU_SHIFT 8 ++#define NAND_T_WH_SHIFT 12 ++ ++#define NAND_TIMING ((NAND_T_H & 0xF) << NAND_T_H_SHIFT) | \ ++ ((NAND_T_PUL & 0xF) << NAND_T_PUL_SHIFT) | \ ++ ((NAND_T_SU & 0xF) << NAND_T_SU_SHIFT) | \ ++ ((NAND_T_WH & 0xF) << NAND_T_WH_SHIFT) ++ ++ ++/* ++ * External Interrupts for Pb1200 as of 8/6/2004. ++ * Bit positions in the CPLD registers can be calculated by taking ++ * the interrupt define and subtracting the PB1200_INT_BEGIN value. ++ * *example: IDE bis pos is = 64 - 64 ++ ETH bit pos is = 65 - 64 ++ */ ++#define PB1200_INT_BEGIN (AU1000_LAST_INTC1_INT + 1) ++#define PB1200_IDE_INT (PB1200_INT_BEGIN + 0) ++#define PB1200_ETH_INT (PB1200_INT_BEGIN + 1) ++#define PB1200_PC0_INT (PB1200_INT_BEGIN + 2) ++#define PB1200_PC0_STSCHG_INT (PB1200_INT_BEGIN + 3) ++#define PB1200_PC1_INT (PB1200_INT_BEGIN + 4) ++#define PB1200_PC1_STSCHG_INT (PB1200_INT_BEGIN + 5) ++#define PB1200_DC_INT (PB1200_INT_BEGIN + 6) ++#define PB1200_FLASHBUSY_INT (PB1200_INT_BEGIN + 7) ++#define PB1200_PC0_INSERT_INT (PB1200_INT_BEGIN + 8) ++#define PB1200_PC0_EJECT_INT (PB1200_INT_BEGIN + 9) ++#define PB1200_PC1_INSERT_INT (PB1200_INT_BEGIN + 10) ++#define PB1200_PC1_EJECT_INT (PB1200_INT_BEGIN + 11) ++#define PB1200_SD0_INSERT_INT (PB1200_INT_BEGIN + 12) ++#define PB1200_SD0_EJECT_INT (PB1200_INT_BEGIN + 13) ++#define PB1200_SD1_INSERT_INT (PB1200_INT_BEGIN + 14) ++#define PB1200_SD1_EJECT_INT (PB1200_INT_BEGIN + 15) ++ ++#define PB1200_INT_END (PB1200_INT_BEGIN + 15) ++ ++/* For drivers/pcmcia/au1000_db1x00.c */ ++#define BOARD_PC0_INT PB1200_PC0_INT ++#define BOARD_PC1_INT PB1200_PC1_INT ++#define BOARD_CARD_INSERTED(SOCKET) bcsr->sig_status & (1<<(8+(2*SOCKET))) ++ ++#endif /* __ASM_PB1200_H */ ++ +diff -Nur linux-2.4.30/include/asm-mips/pb1550.h linux-2.4.30-mips/include/asm-mips/pb1550.h +--- linux-2.4.30/include/asm-mips/pb1550.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/pb1550.h 2005-01-30 09:01:28.000000000 +0100 +@@ -30,13 +30,11 @@ + + #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX + #define DBDMA_AC97_RX_CHAN DSCR_CMD0_PSC1_RX +-#define DBDMA_I2S_TX_CHAN DSCR_CMD0_PSC3_TX +-#define DBDMA_I2S_RX_CHAN DSCR_CMD0_PSC3_RX +- + #define SPI_PSC_BASE PSC0_BASE_ADDR + #define AC97_PSC_BASE PSC1_BASE_ADDR + #define SMBUS_PSC_BASE PSC2_BASE_ADDR + #define I2S_PSC_BASE PSC3_BASE_ADDR ++#define NAND_CS 1 + + #define BCSR_PHYS_ADDR 0xAF000000 + +@@ -160,9 +158,23 @@ + #define NAND_T_SU_SHIFT 8 + #define NAND_T_WH_SHIFT 12 + +-#define NAND_TIMING ((NAND_T_H & 0xF) << NAND_T_H_SHIFT) | \ +- ((NAND_T_PUL & 0xF) << NAND_T_PUL_SHIFT) | \ +- ((NAND_T_SU & 0xF) << NAND_T_SU_SHIFT) | \ +- ((NAND_T_WH & 0xF) << NAND_T_WH_SHIFT) ++#define NAND_TIMING ((NAND_T_H & 0xF) << NAND_T_H_SHIFT) | \ ++ ((NAND_T_PUL & 0xF) << NAND_T_PUL_SHIFT) | \ ++ ((NAND_T_SU & 0xF) << NAND_T_SU_SHIFT) | \ ++ ((NAND_T_WH & 0xF) << NAND_T_WH_SHIFT) ++ ++/* ++ * Daughter card information. ++ */ ++#define DAUGHTER_CARD_BASE (0xAC000000) ++#define DAUGHTER_CARD_MEM_SIZE (0xADFFFFFF - DAUGHTER_CARD_BASE + 1) ++#define DAUGHTER_CARD_IRQ (AU1000_GPIO_3) ++ ++/* DC_IDE and DC_ETHERNET */ ++#define AU1XXX_ATA_PHYS_ADDR (0x0C000000) ++#define AU1XXX_ATA_REG_OFFSET (5) ++ ++#define AU1XXX_SMC91111_PHYS_ADDR (0x0C000300) ++#define AU1XXX_SMC91111_IRQ AU1000_GPIO_3 + + #endif /* __ASM_PB1550_H */ +diff -Nur linux-2.4.30/include/asm-mips/tx4927/tx4927.h linux-2.4.30-mips/include/asm-mips/tx4927/tx4927.h +--- linux-2.4.30/include/asm-mips/tx4927/tx4927.h 2003-08-25 13:44:44.000000000 +0200 ++++ linux-2.4.30-mips/include/asm-mips/tx4927/tx4927.h 2004-11-22 19:02:10.000000000 +0100 +@@ -88,8 +88,8 @@ + + + /* TX4927 Configuration registers (64-bit registers) */ +-#define TX4927_CONFIG_BASE 0xe300 +-#define TX4927_CONFIG_CCFG 0xe300 ++#define TX4927_CONFIG_BASE 0xe000 ++#define TX4927_CONFIG_CCFG 0xe000 + #define TX4927_CONFIG_CCFG_RESERVED_42_63 BM_63_42 + #define TX4927_CONFIG_CCFG_WDRST BM_41_41 + #define TX4927_CONFIG_CCFG_WDREXEN BM_40_40 +@@ -124,14 +124,14 @@ + #define TX4927_CONFIG_CCFG_ENDIAN BM_02_02 + #define TX4927_CONFIG_CCFG_ARMODE BM_01_01 + #define TX4927_CONFIG_CCFG_ACEHOLD BM_00_00 +-#define TX4927_CONFIG_REVID 0xe308 ++#define TX4927_CONFIG_REVID 0xe008 + #define TX4927_CONFIG_REVID_RESERVED_32_63 BM_32_63 + #define TX4927_CONFIG_REVID_PCODE BM_16_31 + #define TX4927_CONFIG_REVID_MJERREV BM_12_15 + #define TX4927_CONFIG_REVID_MINEREV BM_08_11 + #define TX4927_CONFIG_REVID_MJREV BM_04_07 + #define TX4927_CONFIG_REVID_MINREV BM_00_03 +-#define TX4927_CONFIG_PCFG 0xe310 ++#define TX4927_CONFIG_PCFG 0xe010 + #define TX4927_CONFIG_PCFG_RESERVED_57_63 BM_57_63 + #define TX4927_CONFIG_PCFG_DRVDATA BM_56_56 + #define TX4927_CONFIG_PCFG_DRVCB BM_55_55 +@@ -197,10 +197,10 @@ + #define TX4927_CONFIG_PCFG_DMASEL0_SIO1 BM_00_00 + #define TX4927_CONFIG_PCFG_DMASEL0_ACLC0 BM_01_01 + #define TX4927_CONFIG_PCFG_DMASEL0_ACLC2 BM_00_01 +-#define TX4927_CONFIG_TOEA 0xe318 ++#define TX4927_CONFIG_TOEA 0xe018 + #define TX4927_CONFIG_TOEA_RESERVED_36_63 BM_36_63 + #define TX4927_CONFIG_TOEA_TOEA BM_00_35 +-#define TX4927_CONFIG_CLKCTR 0xe320 ++#define TX4927_CONFIG_CLKCTR 0xe020 + #define TX4927_CONFIG_CLKCTR_RESERVED_26_63 BM_26_63 + #define TX4927_CONFIG_CLKCTR_ACLCKD BM_25_25 + #define TX4927_CONFIG_CLKCTR_PIOCKD BM_24_24 +@@ -223,7 +223,7 @@ + #define TX4927_CONFIG_CLKCTR_TM2RST BM_02_02 + #define TX4927_CONFIG_CLKCTR_SIO0RST BM_01_01 + #define TX4927_CONFIG_CLKCTR_SIO1RST BM_00_00 +-#define TX4927_CONFIG_GARBC 0xe330 ++#define TX4927_CONFIG_GARBC 0xe030 + #define TX4927_CONFIG_GARBC_RESERVED_10_63 BM_10_63 + #define TX4927_CONFIG_GARBC_SET_09 BM_09_09 + #define TX4927_CONFIG_GARBC_ARBMD BM_08_08 +@@ -243,7 +243,7 @@ + #define TX4927_CONFIG_GARBC_PRIORITY_H3_PDMAC BM_00_00 + #define TX4927_CONFIG_GARBC_PRIORITY_H3_DMAC BM_01_01 + #define TX4927_CONFIG_GARBC_PRIORITY_H3_BAD_VALUE BM_00_01 +-#define TX4927_CONFIG_RAMP 0xe348 ++#define TX4927_CONFIG_RAMP 0xe048 + #define TX4927_CONFIG_RAMP_RESERVED_20_63 BM_20_63 + #define TX4927_CONFIG_RAMP_RAMP BM_00_19 + #define TX4927_CONFIG_LIMIT 0xefff +@@ -456,7 +456,7 @@ + #define TX4927_ACLC_ACINTSTS 0xf710 + #define TX4927_ACLC_ACINTMSTS 0xf714 + #define TX4927_ACLC_ACINTEN 0xf718 +-#define TX4927_ACLC_ACINTDIS 0xfR71c ++#define TX4927_ACLC_ACINTDIS 0xf71c + #define TX4927_ACLC_ACSEMAPH 0xf720 + #define TX4927_ACLC_ACGPIDAT 0xf740 + #define TX4927_ACLC_ACGPODAT 0xf744 +diff -Nur linux-2.4.30/include/asm-mips/unistd.h linux-2.4.30-mips/include/asm-mips/unistd.h +--- linux-2.4.30/include/asm-mips/unistd.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips/unistd.h 2004-11-24 21:30:06.000000000 +0100 +@@ -760,7 +760,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + /* +@@ -788,7 +788,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #define _syscall2(type,name,atype,a,btype,b) \ +@@ -813,7 +813,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #define _syscall3(type,name,atype,a,btype,b,ctype,c) \ +@@ -839,7 +839,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #define _syscall4(type,name,atype,a,btype,b,ctype,c,dtype,d) \ +@@ -865,7 +865,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #if (_MIPS_SIM == _MIPS_SIM_ABI32) +@@ -902,7 +902,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ +@@ -935,7 +935,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */ +@@ -966,7 +966,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ +@@ -995,7 +995,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ +diff -Nur linux-2.4.30/include/asm-mips64/hazards.h linux-2.4.30-mips/include/asm-mips64/hazards.h +--- linux-2.4.30/include/asm-mips64/hazards.h 2004-02-18 14:36:32.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips64/hazards.h 2004-11-25 23:18:38.000000000 +0100 +@@ -3,7 +3,7 @@ + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * +- * Copyright (C) 2003 Ralf Baechle ++ * Copyright (C) 2003, 2004 Ralf Baechle + */ + #ifndef _ASM_HAZARDS_H + #define _ASM_HAZARDS_H +@@ -12,37 +12,185 @@ + + #ifdef __ASSEMBLY__ + ++ .macro _ssnop ++ sll $0, $0, 1 ++ .endm ++ + /* + * RM9000 hazards. When the JTLB is updated by tlbwi or tlbwr, a subsequent + * use of the JTLB for instructions should not occur for 4 cpu cycles and use + * for data translations should not occur for 3 cpu cycles. + */ + #ifdef CONFIG_CPU_RM9000 +-#define rm9000_tlb_hazard \ ++ ++#define mtc0_tlbw_hazard \ ++ .set push; \ ++ .set mips32; \ ++ _ssnop; _ssnop; _ssnop; _ssnop; \ ++ .set pop ++ ++#define tlbw_eret_hazard \ ++ .set push; \ + .set mips32; \ +- ssnop; ssnop; ssnop; ssnop; \ +- .set mips0 ++ _ssnop; _ssnop; _ssnop; _ssnop; \ ++ .set pop ++ + #else +-#define rm9000_tlb_hazard ++ ++/* ++ * The taken branch will result in a two cycle penalty for the two killed ++ * instructions on R4000 / R4400. Other processors only have a single cycle ++ * hazard so this is nice trick to have an optimal code for a range of ++ * processors. ++ */ ++#define mtc0_tlbw_hazard \ ++ b . + 8 ++#define tlbw_eret_hazard + #endif + ++/* ++ * mtc0->mfc0 hazard ++ * The 24K has a 2 cycle mtc0/mfc0 execution hazard. ++ * It is a MIPS32R2 processor so ehb will clear the hazard. ++ */ ++ ++#ifdef CONFIG_CPU_MIPSR2 ++/* ++ * Use a macro for ehb unless explicit support for MIPSR2 is enabled ++ */ ++ .macro ehb ++ sll $0, $0, 3 ++ .endm ++ ++#define irq_enable_hazard \ ++ ehb # irq_enable_hazard ++ ++#define irq_disable_hazard \ ++ ehb # irq_disable_hazard ++ + #else + ++#define irq_enable_hazard ++#define irq_disable_hazard ++ ++#endif ++ ++#else /* __ASSEMBLY__ */ ++ + /* + * RM9000 hazards. When the JTLB is updated by tlbwi or tlbwr, a subsequent + * use of the JTLB for instructions should not occur for 4 cpu cycles and use + * for data translations should not occur for 3 cpu cycles. + */ + #ifdef CONFIG_CPU_RM9000 +-#define rm9000_tlb_hazard() \ ++ ++#define mtc0_tlbw_hazard() \ ++ __asm__ __volatile__( \ ++ ".set\tmips32\n\t" \ ++ "_ssnop; _ssnop; _ssnop; _ssnop\n\t" \ ++ ".set\tmips0") ++ ++#define tlbw_use_hazard() \ + __asm__ __volatile__( \ + ".set\tmips32\n\t" \ +- "ssnop; ssnop; ssnop; ssnop\n\t" \ ++ "_ssnop; _ssnop; _ssnop; _ssnop\n\t" \ + ".set\tmips0") + #else +-#define rm9000_tlb_hazard() do { } while (0) ++ ++/* ++ * Overkill warning ... ++ */ ++#define mtc0_tlbw_hazard() \ ++ __asm__ __volatile__( \ ++ ".set noreorder\n\t" \ ++ "nop; nop; nop; nop; nop; nop;\n\t" \ ++ ".set reorder\n\t") ++ ++#define tlbw_use_hazard() \ ++ __asm__ __volatile__( \ ++ ".set noreorder\n\t" \ ++ "nop; nop; nop; nop; nop; nop;\n\t" \ ++ ".set reorder\n\t") ++ + #endif + ++/* ++ * mtc0->mfc0 hazard ++ * The 24K has a 2 cycle mtc0/mfc0 execution hazard. ++ * It is a MIPS32R2 processor so ehb will clear the hazard. ++ */ ++ ++#ifdef CONFIG_CPU_MIPSR2 ++/* ++ * Use a macro for ehb unless explicit support for MIPSR2 is enabled ++ */ ++__asm__( ++ " .macro ehb \n\t" ++ " sll $0, $0, 3 \n\t" ++ " .endm \n\t" ++ " \n\t" ++ " .macro\tirq_enable_hazard \n\t" ++ " ehb \n\t" ++ " .endm \n\t" ++ " \n\t" ++ " .macro\tirq_disable_hazard \n\t" ++ " ehb \n\t" ++ " .endm"); ++ ++#define irq_enable_hazard() \ ++ __asm__ __volatile__( \ ++ "ehb\t\t\t\t# irq_enable_hazard") ++ ++#define irq_disable_hazard() \ ++ __asm__ __volatile__( \ ++ "ehb\t\t\t\t# irq_disable_hazard") ++ ++#elif defined(CONFIG_CPU_R10000) ++ ++/* ++ * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer. ++ */ ++ ++__asm__( ++ " .macro\tirq_enable_hazard \n\t" ++ " .endm \n\t" ++ " \n\t" ++ " .macro\tirq_disable_hazard \n\t" ++ " .endm"); ++ ++#define irq_enable_hazard() do { } while (0) ++#define irq_disable_hazard() do { } while (0) ++ ++#else ++ ++/* ++ * Default for classic MIPS processors. Assume worst case hazards but don't ++ * care about the irq_enable_hazard - sooner or later the hardware will ++ * enable it and we don't care when exactly. ++ */ ++ ++__asm__( ++ " .macro _ssnop \n\t" ++ " sll $0, $2, 1 \n\t" ++ " .endm \n\t" ++ " \n\t" ++ " # \n\t" ++ " # There is a hazard but we do not care \n\t" ++ " # \n\t" ++ " .macro\tirq_enable_hazard \n\t" ++ " .endm \n\t" ++ " \n\t" ++ " .macro\tirq_disable_hazard \n\t" ++ " _ssnop; _ssnop; _ssnop \n\t" ++ " .endm"); ++ ++#define irq_enable_hazard() do { } while (0) ++#define irq_disable_hazard() \ ++ __asm__ __volatile__( \ ++ "_ssnop; _ssnop; _ssnop;\t\t# irq_disable_hazard") ++ + #endif + ++#endif /* __ASSEMBLY__ */ ++ + #endif /* _ASM_HAZARDS_H */ +diff -Nur linux-2.4.30/include/asm-mips64/mipsregs.h linux-2.4.30-mips/include/asm-mips64/mipsregs.h +--- linux-2.4.30/include/asm-mips64/mipsregs.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips64/mipsregs.h 2005-02-06 22:24:22.000000000 +0100 +@@ -757,10 +757,18 @@ + #define read_c0_config1() __read_32bit_c0_register($16, 1) + #define read_c0_config2() __read_32bit_c0_register($16, 2) + #define read_c0_config3() __read_32bit_c0_register($16, 3) ++#define read_c0_config4() __read_32bit_c0_register($16, 4) ++#define read_c0_config5() __read_32bit_c0_register($16, 5) ++#define read_c0_config6() __read_32bit_c0_register($16, 6) ++#define read_c0_config7() __read_32bit_c0_register($16, 7) + #define write_c0_config(val) __write_32bit_c0_register($16, 0, val) + #define write_c0_config1(val) __write_32bit_c0_register($16, 1, val) + #define write_c0_config2(val) __write_32bit_c0_register($16, 2, val) + #define write_c0_config3(val) __write_32bit_c0_register($16, 3, val) ++#define write_c0_config4(val) __write_32bit_c0_register($16, 4, val) ++#define write_c0_config5(val) __write_32bit_c0_register($16, 5, val) ++#define write_c0_config6(val) __write_32bit_c0_register($16, 6, val) ++#define write_c0_config7(val) __write_32bit_c0_register($16, 7, val) + + /* + * The WatchLo register. There may be upto 8 of them. +@@ -856,42 +864,34 @@ + */ + static inline void tlb_probe(void) + { +- rm9000_tlb_hazard(); + __asm__ __volatile__( + ".set noreorder\n\t" + "tlbp\n\t" + ".set reorder"); +- rm9000_tlb_hazard(); + } + + static inline void tlb_read(void) + { +- rm9000_tlb_hazard(); + __asm__ __volatile__( + ".set noreorder\n\t" + "tlbr\n\t" + ".set reorder"); +- rm9000_tlb_hazard(); + } + + static inline void tlb_write_indexed(void) + { +- rm9000_tlb_hazard(); + __asm__ __volatile__( + ".set noreorder\n\t" + "tlbwi\n\t" + ".set reorder"); +- rm9000_tlb_hazard(); + } + + static inline void tlb_write_random(void) + { +- rm9000_tlb_hazard(); + __asm__ __volatile__( + ".set noreorder\n\t" + "tlbwr\n\t" + ".set reorder"); +- rm9000_tlb_hazard(); + } + + /* +diff -Nur linux-2.4.30/include/asm-mips64/unistd.h linux-2.4.30-mips/include/asm-mips64/unistd.h +--- linux-2.4.30/include/asm-mips64/unistd.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-mips64/unistd.h 2004-11-24 21:30:06.000000000 +0100 +@@ -760,7 +760,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + /* +@@ -788,7 +788,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #define _syscall2(type,name,atype,a,btype,b) \ +@@ -813,7 +813,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #define _syscall3(type,name,atype,a,btype,b,ctype,c) \ +@@ -839,7 +839,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #define _syscall4(type,name,atype,a,btype,b,ctype,c,dtype,d) \ +@@ -865,7 +865,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #if (_MIPS_SIM == _MIPS_SIM_ABI32) +@@ -902,7 +902,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ +@@ -935,7 +935,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */ +@@ -966,7 +966,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ +@@ -995,7 +995,7 @@ + if (__a3 == 0) \ + return (type) __v0; \ + errno = __v0; \ +- return -1; \ ++ return (type)-1; \ + } + + #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ +diff -Nur linux-2.4.30/include/asm-ppc/param.h linux-2.4.30-mips/include/asm-ppc/param.h +--- linux-2.4.30/include/asm-ppc/param.h 2003-06-13 16:51:38.000000000 +0200 ++++ linux-2.4.30-mips/include/asm-ppc/param.h 2003-07-05 05:23:46.000000000 +0200 +@@ -3,6 +3,9 @@ + + #ifndef HZ + #define HZ 100 ++#ifdef __KERNEL__ ++#define hz_to_std(a) (a) ++#endif + #endif + + #define EXEC_PAGESIZE 4096 +diff -Nur linux-2.4.30/include/asm-s390/param.h linux-2.4.30-mips/include/asm-s390/param.h +--- linux-2.4.30/include/asm-s390/param.h 2001-02-13 23:13:44.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-s390/param.h 2001-03-09 21:34:48.000000000 +0100 +@@ -11,6 +11,9 @@ + + #ifndef HZ + #define HZ 100 ++#ifdef __KERNEL__ ++#define hz_to_std(a) (a) ++#endif + #endif + + #define EXEC_PAGESIZE 4096 +diff -Nur linux-2.4.30/include/asm-sh/param.h linux-2.4.30-mips/include/asm-sh/param.h +--- linux-2.4.30/include/asm-sh/param.h 2001-01-04 22:19:13.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-sh/param.h 2001-01-11 05:02:45.000000000 +0100 +@@ -3,6 +3,9 @@ + + #ifndef HZ + #define HZ 100 ++#ifdef __KERNEL__ ++#define hz_to_std(a) (a) ++#endif + #endif + + #define EXEC_PAGESIZE 4096 +diff -Nur linux-2.4.30/include/asm-sparc/param.h linux-2.4.30-mips/include/asm-sparc/param.h +--- linux-2.4.30/include/asm-sparc/param.h 2000-10-30 23:34:12.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-sparc/param.h 2000-11-23 03:00:56.000000000 +0100 +@@ -4,6 +4,9 @@ + + #ifndef HZ + #define HZ 100 ++#ifdef __KERNEL__ ++#define hz_to_std(a) (a) ++#endif + #endif + + #define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */ +diff -Nur linux-2.4.30/include/asm-sparc64/param.h linux-2.4.30-mips/include/asm-sparc64/param.h +--- linux-2.4.30/include/asm-sparc64/param.h 2000-10-30 23:34:12.000000000 +0100 ++++ linux-2.4.30-mips/include/asm-sparc64/param.h 2000-11-23 03:00:56.000000000 +0100 +@@ -4,6 +4,9 @@ + + #ifndef HZ + #define HZ 100 ++#ifdef __KERNEL__ ++#define hz_to_std(a) (a) ++#endif + #endif + + #define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */ +diff -Nur linux-2.4.30/include/linux/i2c-algo-au1550.h linux-2.4.30-mips/include/linux/i2c-algo-au1550.h +--- linux-2.4.30/include/linux/i2c-algo-au1550.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30-mips/include/linux/i2c-algo-au1550.h 2004-07-07 02:38:02.000000000 +0200 +@@ -0,0 +1,31 @@ ++/* ++ * Copyright (C) 2004 Embedded Edge, LLC <dan@embeddededge.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++#ifndef I2C_ALGO_AU1550_H ++#define I2C_ALGO_AU1550_H 1 ++ ++struct i2c_algo_au1550_data { ++ u32 psc_base; ++ int xfer_timeout; ++ int ack_timeout; ++}; ++ ++int i2c_au1550_add_bus(struct i2c_adapter *); ++int i2c_au1550_del_bus(struct i2c_adapter *); ++ ++#endif /* I2C_ALGO_AU1550_H */ +diff -Nur linux-2.4.30/include/linux/i2c-id.h linux-2.4.30-mips/include/linux/i2c-id.h +--- linux-2.4.30/include/linux/i2c-id.h 2004-02-18 14:36:32.000000000 +0100 ++++ linux-2.4.30-mips/include/linux/i2c-id.h 2004-07-07 02:38:02.000000000 +0200 +@@ -156,6 +156,8 @@ + + #define I2C_ALGO_SGI 0x130000 /* SGI algorithm */ + ++#define I2C_ALGO_AU1550 0x140000 /* Alchemy Au1550 PSC */ ++ + #define I2C_ALGO_EXP 0x800000 /* experimental */ + + #define I2C_ALGO_MASK 0xff0000 /* Mask for algorithms */ +@@ -204,6 +206,9 @@ + #define I2C_HW_SGI_VINO 0x00 + #define I2C_HW_SGI_MACE 0x01 + ++/* --- Au1550 PSC adapters */ ++#define I2C_HW_AU1550_PSC 0x00 ++ + /* --- SMBus only adapters */ + #define I2C_HW_SMBUS_PIIX4 0x00 + #define I2C_HW_SMBUS_ALI15X3 0x01 +diff -Nur linux-2.4.30/include/linux/sched.h linux-2.4.30-mips/include/linux/sched.h +--- linux-2.4.30/include/linux/sched.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux-2.4.30-mips/include/linux/sched.h 2004-11-29 18:47:18.000000000 +0100 +@@ -617,6 +617,10 @@ + extern int in_group_p(gid_t); + extern int in_egroup_p(gid_t); + ++extern ATTRIB_NORET void cpu_idle(void); ++ ++extern void release_task(struct task_struct * p); ++ + extern void proc_caches_init(void); + extern void flush_signals(struct task_struct *); + extern void flush_signal_handlers(struct task_struct *); +diff -Nur linux-2.4.30/include/linux/serial.h linux-2.4.30-mips/include/linux/serial.h +--- linux-2.4.30/include/linux/serial.h 2002-08-03 02:39:45.000000000 +0200 ++++ linux-2.4.30-mips/include/linux/serial.h 2004-07-31 02:17:57.000000000 +0200 +@@ -75,7 +75,8 @@ + #define PORT_16654 11 + #define PORT_16850 12 + #define PORT_RSA 13 /* RSA-DV II/S card */ +-#define PORT_MAX 13 ++#define PORT_SB1250 14 ++#define PORT_MAX 14 + + #define SERIAL_IO_PORT 0 + #define SERIAL_IO_HUB6 1 +diff -Nur linux-2.4.30/include/linux/swap.h linux-2.4.30-mips/include/linux/swap.h +--- linux-2.4.30/include/linux/swap.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux-2.4.30-mips/include/linux/swap.h 2004-11-29 18:47:18.000000000 +0100 +@@ -1,6 +1,12 @@ + #ifndef _LINUX_SWAP_H + #define _LINUX_SWAP_H + ++#include <linux/config.h> ++ ++#define MAX_SWAPFILES 32 ++ ++#ifdef __KERNEL__ ++ + #include <linux/spinlock.h> + #include <asm/page.h> + +@@ -8,8 +14,6 @@ + #define SWAP_FLAG_PRIO_MASK 0x7fff + #define SWAP_FLAG_PRIO_SHIFT 0 + +-#define MAX_SWAPFILES 32 +- + /* + * Magic header for a swap area. The first part of the union is + * what the swap magic looks like for the old (limited to 128MB) +@@ -39,8 +43,6 @@ + } info; + }; + +-#ifdef __KERNEL__ +- + /* + * Max bad pages in the new format.. + */ +diff -Nur linux-2.4.30/include/video/newport.h linux-2.4.30-mips/include/video/newport.h +--- linux-2.4.30/include/video/newport.h 2001-04-12 21:20:31.000000000 +0200 ++++ linux-2.4.30-mips/include/video/newport.h 2004-09-23 15:32:29.000000000 +0200 +@@ -291,8 +291,6 @@ + unsigned int _unused2[0x1ef]; + struct newport_cregs cgo; + }; +-extern struct newport_regs *npregs; +- + + typedef struct { + unsigned int drawmode1; +@@ -450,38 +448,26 @@ + + /* Miscellaneous NEWPORT routines. */ + #define BUSY_TIMEOUT 100000 +-static __inline__ int newport_wait(void) ++static __inline__ int newport_wait(struct newport_regs *regs) + { +- int i = 0; ++ int t = BUSY_TIMEOUT; + +- while(i < BUSY_TIMEOUT) +- if(!(npregs->cset.status & NPORT_STAT_GBUSY)) ++ while (t--) ++ if (!(regs->cset.status & NPORT_STAT_GBUSY)) + break; +- if(i == BUSY_TIMEOUT) +- return 1; +- return 0; ++ return !t; + } + +-static __inline__ int newport_bfwait(void) ++static __inline__ int newport_bfwait(struct newport_regs *regs) + { +- int i = 0; ++ int t = BUSY_TIMEOUT; + +- while(i < BUSY_TIMEOUT) +- if(!(npregs->cset.status & NPORT_STAT_BBUSY)) ++ while (t--) ++ if(!(regs->cset.status & NPORT_STAT_BBUSY)) + break; +- if(i == BUSY_TIMEOUT) +- return 1; +- return 0; ++ return !t; + } + +-/* newport.c and cons_newport.c routines */ +-extern struct graphics_ops *newport_probe (int, const char **); +- +-void newport_save (void *); +-void newport_restore (void *); +-void newport_reset (void); +-int newport_ioctl (int card, int cmd, unsigned long arg); +- + /* + * DCBMODE register defines: + */ +@@ -564,7 +550,7 @@ + { + rex->set.dcbmode = DCB_XMAP0 | XM9_CRS_FIFO_AVAIL | + DCB_DATAWIDTH_1 | R_DCB_XMAP9_PROTOCOL; +- newport_bfwait (); ++ newport_bfwait (rex); + + while ((rex->set.dcbdata0.bybytes.b3 & 3) != XM9_FIFO_EMPTY) + ; +diff -Nur linux-2.4.30/init/main.c linux-2.4.30-mips/init/main.c +--- linux-2.4.30/init/main.c 2004-11-17 12:54:22.000000000 +0100 ++++ linux-2.4.30-mips/init/main.c 2004-11-19 01:28:52.000000000 +0100 +@@ -296,7 +296,6 @@ + + + extern void setup_arch(char **); +-extern void cpu_idle(void); + + unsigned long wait_init_idle; + +diff -Nur linux-2.4.30/kernel/exit.c linux-2.4.30-mips/kernel/exit.c +--- linux-2.4.30/kernel/exit.c 2002-11-29 00:53:15.000000000 +0100 ++++ linux-2.4.30-mips/kernel/exit.c 2003-01-11 18:53:18.000000000 +0100 +@@ -26,7 +26,7 @@ + + int getrusage(struct task_struct *, int, struct rusage *); + +-static void release_task(struct task_struct * p) ++void release_task(struct task_struct * p) + { + if (p != current) { + #ifdef CONFIG_SMP +diff -Nur linux-2.4.30/kernel/signal.c linux-2.4.30-mips/kernel/signal.c +--- linux-2.4.30/kernel/signal.c 2004-02-18 14:36:32.000000000 +0100 ++++ linux-2.4.30-mips/kernel/signal.c 2004-01-20 16:10:34.000000000 +0100 +@@ -14,6 +14,7 @@ + #include <linux/init.h> + #include <linux/sched.h> + ++#include <asm/param.h> + #include <asm/uaccess.h> + + /* +@@ -28,6 +29,14 @@ + #define SIG_SLAB_DEBUG 0 + #endif + ++#define DEBUG_SIG 0 ++ ++#if DEBUG_SIG ++#define SIG_SLAB_DEBUG (SLAB_DEBUG_FREE | SLAB_RED_ZONE /* | SLAB_POISON */) ++#else ++#define SIG_SLAB_DEBUG 0 ++#endif ++ + static kmem_cache_t *sigqueue_cachep; + + atomic_t nr_queued_signals; +@@ -270,6 +279,11 @@ + signal_pending(current)); + #endif + ++#if DEBUG_SIG ++printk("SIG dequeue (%s:%d): %d ", current->comm, current->pid, ++ signal_pending(current)); ++#endif ++ + sig = next_signal(current, mask); + if (sig) { + if (current->notifier) { +@@ -293,6 +307,10 @@ + printk(" %d -> %d\n", signal_pending(current), sig); + #endif + ++#if DEBUG_SIG ++printk(" %d -> %d\n", signal_pending(current), sig); ++#endif ++ + return sig; + } + +@@ -540,6 +558,11 @@ + printk("SIG queue (%s:%d): %d ", t->comm, t->pid, sig); + #endif + ++ ++#if DEBUG_SIG ++printk("SIG queue (%s:%d): %d ", t->comm, t->pid, sig); ++#endif ++ + ret = -EINVAL; + if (sig < 0 || sig > _NSIG) + goto out_nolock; +@@ -778,8 +801,8 @@ + info.si_uid = tsk->uid; + + /* FIXME: find out whether or not this is supposed to be c*time. */ +- info.si_utime = tsk->times.tms_utime; +- info.si_stime = tsk->times.tms_stime; ++ info.si_utime = hz_to_std(tsk->times.tms_utime); ++ info.si_stime = hz_to_std(tsk->times.tms_stime); + + status = tsk->exit_code & 0x7f; + why = SI_KERNEL; /* shouldn't happen */ +diff -Nur linux-2.4.30/kernel/sys.c linux-2.4.30-mips/kernel/sys.c +--- linux-2.4.30/kernel/sys.c 2003-11-28 19:26:21.000000000 +0100 ++++ linux-2.4.30-mips/kernel/sys.c 2003-11-17 02:07:47.000000000 +0100 +@@ -801,16 +801,23 @@ + + asmlinkage long sys_times(struct tms * tbuf) + { ++ struct tms temp; ++ + /* + * In the SMP world we might just be unlucky and have one of + * the times increment as we use it. Since the value is an + * atomically safe type this is just fine. Conceptually its + * as if the syscall took an instant longer to occur. + */ +- if (tbuf) +- if (copy_to_user(tbuf, ¤t->times, sizeof(struct tms))) ++ if (tbuf) { ++ temp.tms_utime = hz_to_std(current->times.tms_utime); ++ temp.tms_stime = hz_to_std(current->times.tms_stime); ++ temp.tms_cutime = hz_to_std(current->times.tms_cutime); ++ temp.tms_cstime = hz_to_std(current->times.tms_cstime); ++ if (copy_to_user(tbuf, &temp, sizeof(struct tms))) + return -EFAULT; +- return jiffies; ++ } ++ return hz_to_std(jiffies); + } + + /* +diff -Nur linux-2.4.30/lib/Makefile linux-2.4.30-mips/lib/Makefile +--- linux-2.4.30/lib/Makefile 2004-04-14 15:05:40.000000000 +0200 ++++ linux-2.4.30-mips/lib/Makefile 2004-04-16 05:14:21.000000000 +0200 +@@ -27,6 +27,7 @@ + subdir-$(CONFIG_ZLIB_INFLATE) += zlib_inflate + subdir-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate + ++-include $(TOPDIR)/arch/$(ARCH)/Makefile.lib + include $(TOPDIR)/drivers/net/Makefile.lib + include $(TOPDIR)/drivers/usb/Makefile.lib + include $(TOPDIR)/drivers/bluetooth/Makefile.lib diff --git a/recipes/linux/linux-wrt-2.4.30/001-Makefile b/recipes/linux/linux-wrt-2.4.30/001-Makefile new file mode 100644 index 0000000000..d01051f844 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/001-Makefile @@ -0,0 +1,43 @@ +--- ../../../kernel/linux-mips-cvs/Makefile 2005-01-20 03:19:21.000000000 +0100 ++++ linux-2.4.29.new/Makefile 2005-03-15 01:15:27.441095231 +0100 +@@ -17,9 +17,9 @@ + FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu + + HOSTCC = gcc +-HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer ++HOSTCFLAGS = -Wall -Wstrict-prototypes -Os -fomit-frame-pointer + +-CROSS_COMPILE = ++CROSS_COMPILE= + + # + # Include the make variables (CC, etc...) +@@ -91,8 +91,18 @@ + + CPPFLAGS := -D__KERNEL__ -I$(HPATH) + +-CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ ++CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -Os \ + -fno-strict-aliasing -fno-common ++ ++ ++# Turn on -pg to instrument the kernel with calls to mcount(). ++# Unfortunately, gcc won't allow -pg without frame pointers. ++ifdef CONFIG_MCOUNT ++ CFLAGS += -pg ++ CFLAGS_KERNEL += -pg ++ CONFIG_FRAME_POINTER = 1 ++endif ++ + ifndef CONFIG_FRAME_POINTER + CFLAGS += -fomit-frame-pointer + endif +@@ -501,7 +511,7 @@ + ifdef CONFIG_MODVERSIONS + $(MAKE) update-modverfile + endif +- scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend ++ (find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print | xargs -r scripts/mkdep -- ) > .hdepend + scripts/mkdep -- init/*.c > .depend + + ifdef CONFIG_MODVERSIONS diff --git a/recipes/linux/linux-wrt-2.4.30/002-Rules_make b/recipes/linux/linux-wrt-2.4.30/002-Rules_make new file mode 100644 index 0000000000..485d9a5051 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/002-Rules_make @@ -0,0 +1,18 @@ +--- linux-mips-cvs/Rules.make 2003-08-13 17:39:03.000000000 +0200 ++++ linux-broadcom/Rules.make 2005-01-31 13:13:14.000000000 +0100 +@@ -176,7 +176,14 @@ + _modinst__: dummy + ifneq "$(strip $(ALL_MOBJS))" "" + mkdir -p $(MODLIB)/kernel/$(MOD_DESTDIR) +- cp $(sort $(ALL_MOBJS)) $(MODLIB)/kernel/$(MOD_DESTDIR) ++ @#cp $(sort $(ALL_MOBJS)) $(MODLIB)/kernel/$(MOD_DESTDIR) ++ for f in $(ALL_MOBJS) ; do \ ++ $(OBJCOPY) -R __ksymtab -R .comment -R .note -x \ ++ `$(NM) $$f | cut -f3- -d' ' | sed -n \ ++ -e 's/__module_parm_\(.*\)/-K \1/p' \ ++ -e 's/__ks..tab_\(.*\)/-K \1/p'` \ ++ $$f $(MODLIB)/kernel/$(MOD_DESTDIR)$(MOD_TARGET)$$f ; \ ++ done + endif + + .PHONY: modules_install diff --git a/recipes/linux/linux-wrt-2.4.30/003-arch_mips_Makefile b/recipes/linux/linux-wrt-2.4.30/003-arch_mips_Makefile new file mode 100644 index 0000000000..8e4c4f5918 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/003-arch_mips_Makefile @@ -0,0 +1,42 @@ +--- linux-mips-cvs/arch/mips/Makefile 2005-01-31 12:59:28.000000000 +0100 ++++ linux-broadcom/arch/mips/Makefile 2005-01-31 13:13:14.000000000 +0100 +@@ -47,9 +47,9 @@ + GCCFLAGS += -G 0 -mno-abicalls -fno-pic -pipe + GCCFLAGS += $(call check_gcc, -finline-limit=100000,) + LINKFLAGS += -G 0 -static -n +-MODFLAGS += -mlong-calls ++MODFLAGS += -mlong-calls -fno-common + +-ifdef CONFIG_DEBUG_INFO ++ifdef CONFIG_REMOTE_DEBUG + GCCFLAGS += -g + ifdef CONFIG_SB1XXX_CORELIS + GCCFLAGS += -mno-sched-prolog -fno-omit-frame-pointer +@@ -174,6 +174,7 @@ + endif + + AFLAGS += $(GCCFLAGS) ++ASFLAGS += $(GCCFLAGS) + CFLAGS += $(GCCFLAGS) + + LD += -m $(ld-emul) +@@ -727,6 +728,19 @@ + endif + + # ++# Broadcom BCM947XX variants ++# ++ifdef CONFIG_BCM947XX ++LIBS += arch/mips/brcm-boards/generic/brcm.o arch/mips/brcm-boards/bcm947xx/bcm947xx.o ++SUBDIRS += arch/mips/brcm-boards/generic arch/mips/brcm-boards/bcm947xx ++LOADADDR := 0x80001000 ++ ++zImage: vmlinux ++ $(MAKE) -C arch/$(ARCH)/brcm-boards/bcm947xx/compressed ++export LOADADDR ++endif ++ ++# + # Choosing incompatible machines durings configuration will result in + # error messages during linking. Select a default linkscript if + # none has been choosen above. diff --git a/recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in b/recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in new file mode 100644 index 0000000000..16c6766eec --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/005-arch_mips_config-shared_in @@ -0,0 +1,56 @@ +--- ../../../kernel/linux-mips-cvs/arch/mips/config-shared.in 2005-01-31 12:59:28.000000000 +0100 ++++ linux-2.4.29/arch/mips/config-shared.in 2005-03-12 19:51:22.474214917 +0100 +@@ -208,6 +208,14 @@ + fi + define_bool CONFIG_MIPS_RTC y + fi ++dep_bool 'Support for Broadcom MIPS-based boards' CONFIG_MIPS_BRCM $CONFIG_EXPERIMENTAL ++dep_bool 'Support for Broadcom BCM947XX' CONFIG_BCM947XX $CONFIG_MIPS_BRCM ++if [ "$CONFIG_BCM947XX" = "y" ] ; then ++ bool ' Support for Broadcom BCM4710' CONFIG_BCM4710 ++ bool ' Support for Broadcom BCM4310' CONFIG_BCM4310 ++ bool ' Support for Broadcom BCM4704' CONFIG_BCM4704 ++ bool ' Support for Broadcom BCM5365' CONFIG_BCM5365 ++fi + bool 'Support for SNI RM200 PCI' CONFIG_SNI_RM200_PCI + bool 'Support for TANBAC TB0226 (Mbase)' CONFIG_TANBAC_TB0226 + bool 'Support for TANBAC TB0229 (VR4131DIMM)' CONFIG_TANBAC_TB0229 +@@ -229,6 +237,11 @@ + define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n + + # ++# Provide an option for a default kernel command line ++# ++string 'Default kernel command string' CONFIG_CMDLINE "" ++ ++# + # Select some configuration options automatically based on user selections. + # + if [ "$CONFIG_ACER_PICA_61" = "y" ]; then +@@ -554,6 +567,13 @@ + define_bool CONFIG_SWAP_IO_SPACE_L y + define_bool CONFIG_BOOT_ELF32 y + fi ++if [ "$CONFIG_BCM947XX" = "y" ] ; then ++ define_bool CONFIG_PCI y ++ define_bool CONFIG_NONCOHERENT_IO y ++ define_bool CONFIG_NEW_TIME_C y ++ define_bool CONFIG_NEW_IRQ y ++ define_bool CONFIG_HND y ++fi + if [ "$CONFIG_SNI_RM200_PCI" = "y" ]; then + define_bool CONFIG_ARC32 y + define_bool CONFIG_ARC_MEMORY y +@@ -1039,7 +1059,11 @@ + + bool 'Are you using a crosscompiler' CONFIG_CROSSCOMPILE + bool 'Enable run-time debugging' CONFIG_RUNTIME_DEBUG +-bool 'Remote GDB kernel debugging' CONFIG_KGDB ++if [ "$CONFIG_BCM947XX" = "y" ] ; then ++ bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG ++else ++ bool 'Remote GDB kernel debugging' CONFIG_KGDB ++fi + dep_bool ' Console output to GDB' CONFIG_GDB_CONSOLE $CONFIG_KGDB + if [ "$CONFIG_KGDB" = "y" ]; then + define_bool CONFIG_DEBUG_INFO y diff --git a/recipes/linux/linux-wrt-2.4.30/007-arch_mips_kernel_cpu-probe_c b/recipes/linux/linux-wrt-2.4.30/007-arch_mips_kernel_cpu-probe_c new file mode 100644 index 0000000000..d0d8acf9c4 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/007-arch_mips_kernel_cpu-probe_c @@ -0,0 +1,121 @@ +--- linux-mips-cvs/arch/mips/kernel/cpu-probe.c 2005-01-31 12:59:30.000000000 +0100 ++++ linux-broadcom/arch/mips/kernel/cpu-probe.c 2005-01-31 13:13:14.000000000 +0100 +@@ -175,7 +175,7 @@ + + static inline void cpu_probe_legacy(struct cpuinfo_mips *c) + { +- switch (c->processor_id & 0xff00) { ++ switch (c->processor_id & PRID_IMP_MASK) { + case PRID_IMP_R2000: + c->cputype = CPU_R2000; + c->isa_level = MIPS_CPU_ISA_I; +@@ -185,7 +185,7 @@ + c->tlbsize = 64; + break; + case PRID_IMP_R3000: +- if ((c->processor_id & 0xff) == PRID_REV_R3000A) ++ if ((c->processor_id & PRID_REV_MASK) == PRID_REV_R3000A) + if (cpu_has_confreg()) + c->cputype = CPU_R3081E; + else +@@ -200,12 +200,12 @@ + break; + case PRID_IMP_R4000: + if (read_c0_config() & CONF_SC) { +- if ((c->processor_id & 0xff) >= PRID_REV_R4400) ++ if ((c->processor_id & PRID_REV_MASK) >= PRID_REV_R4400) + c->cputype = CPU_R4400PC; + else + c->cputype = CPU_R4000PC; + } else { +- if ((c->processor_id & 0xff) >= PRID_REV_R4400) ++ if ((c->processor_id & PRID_REV_MASK) >= PRID_REV_R4400) + c->cputype = CPU_R4400SC; + else + c->cputype = CPU_R4000SC; +@@ -451,7 +451,7 @@ + static inline void cpu_probe_mips(struct cpuinfo_mips *c) + { + decode_config1(c); +- switch (c->processor_id & 0xff00) { ++ switch (c->processor_id & PRID_IMP_MASK) { + case PRID_IMP_4KC: + c->cputype = CPU_4KC; + c->isa_level = MIPS_CPU_ISA_M32; +@@ -492,10 +492,10 @@ + { + decode_config1(c); + c->options |= MIPS_CPU_PREFETCH; +- switch (c->processor_id & 0xff00) { ++ switch (c->processor_id & PRID_IMP_MASK) { + case PRID_IMP_AU1_REV1: + case PRID_IMP_AU1_REV2: +- switch ((c->processor_id >> 24) & 0xff) { ++ switch ((c->processor_id >> 24) & PRID_REV_MASK) { + case 0: + c->cputype = CPU_AU1000; + break; +@@ -523,10 +523,34 @@ + } + } + ++static inline void cpu_probe_broadcom(struct cpuinfo_mips *c) ++{ ++ decode_config1(c); ++ c->options |= MIPS_CPU_PREFETCH; ++ switch (c->processor_id & PRID_IMP_MASK) { ++ case PRID_IMP_BCM4710: ++ c->cputype = CPU_BCM4710; ++ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX | ++ MIPS_CPU_4KTLB | MIPS_CPU_COUNTER; ++ c->scache.flags = MIPS_CACHE_NOT_PRESENT; ++ break; ++ case PRID_IMP_4KC: ++ case PRID_IMP_BCM3302: ++ c->cputype = CPU_BCM3302; ++ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX | ++ MIPS_CPU_4KTLB | MIPS_CPU_COUNTER; ++ c->scache.flags = MIPS_CACHE_NOT_PRESENT; ++ break; ++ default: ++ c->cputype = CPU_UNKNOWN; ++ break; ++ } ++} ++ + static inline void cpu_probe_sibyte(struct cpuinfo_mips *c) + { + decode_config1(c); +- switch (c->processor_id & 0xff00) { ++ switch (c->processor_id & PRID_IMP_MASK) { + case PRID_IMP_SB1: + c->cputype = CPU_SB1; + c->isa_level = MIPS_CPU_ISA_M64; +@@ -548,7 +572,7 @@ + static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c) + { + decode_config1(c); +- switch (c->processor_id & 0xff00) { ++ switch (c->processor_id & PRID_IMP_MASK) { + case PRID_IMP_SR71000: + c->cputype = CPU_SR71000; + c->isa_level = MIPS_CPU_ISA_M64; +@@ -573,7 +597,7 @@ + c->cputype = CPU_UNKNOWN; + + c->processor_id = read_c0_prid(); +- switch (c->processor_id & 0xff0000) { ++ switch (c->processor_id & PRID_COMP_MASK) { + + case PRID_COMP_LEGACY: + cpu_probe_legacy(c); +@@ -584,6 +608,9 @@ + case PRID_COMP_ALCHEMY: + cpu_probe_alchemy(c); + break; ++ case PRID_COMP_BROADCOM: ++ cpu_probe_broadcom(c); ++ break; + case PRID_COMP_SIBYTE: + cpu_probe_sibyte(c); + break; diff --git a/recipes/linux/linux-wrt-2.4.30/009-arch_mips_kernel_head_S b/recipes/linux/linux-wrt-2.4.30/009-arch_mips_kernel_head_S new file mode 100644 index 0000000000..d31c55e5cf --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/009-arch_mips_kernel_head_S @@ -0,0 +1,24 @@ +--- linux-mips-cvs/arch/mips/kernel/head.S 2004-11-22 14:38:23.000000000 +0100 ++++ linux-broadcom/arch/mips/kernel/head.S 2005-01-31 13:13:14.000000000 +0100 +@@ -28,12 +28,20 @@ + #include <asm/mipsregs.h> + #include <asm/stackframe.h> + ++#ifdef CONFIG_BCM4710 ++#undef eret ++#define eret nop; nop; eret ++#endif ++ + .text ++ j kernel_entry ++ nop ++ + /* + * Reserved space for exception handlers. + * Necessary for machines which link their kernels at KSEG0. + */ +- .fill 0x400 ++ .fill 0x3f4 + + /* The following two symbols are used for kernel profiling. */ + EXPORT(stext) diff --git a/recipes/linux/linux-wrt-2.4.30/010-arch_mips_kernel_proc_c b/recipes/linux/linux-wrt-2.4.30/010-arch_mips_kernel_proc_c new file mode 100644 index 0000000000..9db525850f --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/010-arch_mips_kernel_proc_c @@ -0,0 +1,14 @@ +--- linux-mips-cvs/arch/mips/kernel/proc.c 2004-07-07 20:19:37.000000000 +0200 ++++ linux-broadcom/arch/mips/kernel/proc.c 2005-01-31 13:58:35.000000000 +0100 +@@ -78,9 +78,10 @@ + [CPU_AU1550] "Au1550", + [CPU_24K] "MIPS 24K", + [CPU_AU1200] "Au1200", ++ [CPU_BCM4710] "BCM4710", ++ [CPU_BCM3302] "BCM3302", + }; + +- + static int show_cpuinfo(struct seq_file *m, void *v) + { + unsigned int version = current_cpu_data.processor_id; diff --git a/recipes/linux/linux-wrt-2.4.30/011-arch_mips_kernel_setup_c b/recipes/linux/linux-wrt-2.4.30/011-arch_mips_kernel_setup_c new file mode 100644 index 0000000000..ef6dfe7717 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/011-arch_mips_kernel_setup_c @@ -0,0 +1,22 @@ +--- linux-mips-cvs/arch/mips/kernel/setup.c 2005-01-13 22:15:57.000000000 +0100 ++++ linux-broadcom/arch/mips/kernel/setup.c 2005-01-31 13:13:14.000000000 +0100 +@@ -493,6 +493,7 @@ + void swarm_setup(void); + void hp_setup(void); + void au1x00_setup(void); ++ void brcm_setup(void); + void frame_info_init(void); + + frame_info_init(); +@@ -691,6 +692,11 @@ + pmc_yosemite_setup(); + break; + #endif ++#if defined(CONFIG_BCM4710) || defined(CONFIG_BCM4310) ++ case MACH_GROUP_BRCM: ++ brcm_setup(); ++ break; ++#endif + default: + panic("Unsupported architecture"); + } diff --git a/recipes/linux/linux-wrt-2.4.30/012-arch_mips_kernel_traps_c b/recipes/linux/linux-wrt-2.4.30/012-arch_mips_kernel_traps_c new file mode 100644 index 0000000000..6612dba5d7 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/012-arch_mips_kernel_traps_c @@ -0,0 +1,31 @@ +--- linux-mips-cvs/arch/mips/kernel/traps.c 2004-11-22 14:38:23.000000000 +0100 ++++ linux-broadcom/arch/mips/kernel/traps.c 2005-01-31 13:13:14.000000000 +0100 +@@ -919,6 +919,7 @@ + void __init trap_init(void) + { + extern char except_vec1_generic; ++ extern char except_vec2_generic; + extern char except_vec3_generic, except_vec3_r4000; + extern char except_vec_ejtag_debug; + extern char except_vec4; +@@ -926,6 +927,7 @@ + + /* Copy the generic exception handler code to it's final destination. */ + memcpy((void *)(KSEG0 + 0x80), &except_vec1_generic, 0x80); ++ memcpy((void *)(KSEG0 + 0x100), &except_vec2_generic, 0x80); + + /* + * Setup default vectors +@@ -984,6 +986,12 @@ + set_except_vector(13, handle_tr); + set_except_vector(22, handle_mdmx); + ++ if (current_cpu_data.cputype == CPU_SB1) { ++ /* Enable timer interrupt and scd mapped interrupt */ ++ clear_c0_status(0xf000); ++ set_c0_status(0xc00); ++ } ++ + if (cpu_has_fpu && !cpu_has_nofpuex) + set_except_vector(15, handle_fpe); + diff --git a/recipes/linux/linux-wrt-2.4.30/017-arch_mips_pci_Makefile b/recipes/linux/linux-wrt-2.4.30/017-arch_mips_pci_Makefile new file mode 100644 index 0000000000..fed1336150 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/017-arch_mips_pci_Makefile @@ -0,0 +1,12 @@ +--- linux-mips-cvs/arch/mips/pci/Makefile 2004-07-31 02:12:38.000000000 +0200 ++++ linux-broadcom/arch/mips/pci/Makefile 2005-01-31 13:13:14.000000000 +0100 +@@ -13,7 +13,9 @@ + obj-$(CONFIG_MIPS_MSC) += ops-msc.o + obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o + obj-$(CONFIG_SNI_RM200_PCI) += ops-sni.o ++ifndef CONFIG_BCM947XX + obj-y += pci.o ++endif + obj-$(CONFIG_PCI_AUTO) += pci_auto.o + + include $(TOPDIR)/Rules.make diff --git a/recipes/linux/linux-wrt-2.4.30/018_drivers_char_mem_c b/recipes/linux/linux-wrt-2.4.30/018_drivers_char_mem_c new file mode 100644 index 0000000000..0f67710fd3 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/018_drivers_char_mem_c @@ -0,0 +1,12 @@ +--- linux-mips-cvs/drivers/char/mem.c 2004-08-14 20:38:49.000000000 +0200 ++++ linux-broadcom/drivers/char/mem.c 2005-01-31 13:13:14.000000000 +0100 +@@ -713,7 +713,8 @@ + {1, "mem", S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops}, + {2, "kmem", S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops}, + {3, "null", S_IRUGO | S_IWUGO, &null_fops}, +-#if defined(CONFIG_ISA) || !defined(__mc68000__) ++#if defined(CONFIG_ISA) || !defined(__mc68000__) || \ ++ defined(CONFIG_BCM94702_CPCI) + {4, "port", S_IRUSR | S_IWUSR | S_IRGRP, &port_fops}, + #endif + {5, "zero", S_IRUGO | S_IWUGO, &zero_fops}, diff --git a/recipes/linux/linux-wrt-2.4.30/019-drivers_char_serial_c b/recipes/linux/linux-wrt-2.4.30/019-drivers_char_serial_c new file mode 100644 index 0000000000..56d3fe663e --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/019-drivers_char_serial_c @@ -0,0 +1,37 @@ +--- linux-mips-cvs/drivers/char/serial.c 2004-12-27 05:13:43.000000000 +0100 ++++ linux-broadcom/drivers/char/serial.c 2005-01-31 13:13:14.000000000 +0100 +@@ -444,6 +444,10 @@ + return inb(info->port+1); + #endif + case SERIAL_IO_MEM: ++#ifdef CONFIG_BCM4310 ++ readb((unsigned long) info->iomem_base + ++ (UART_SCR<<info->iomem_reg_shift)); ++#endif + return readb((unsigned long) info->iomem_base + + (offset<<info->iomem_reg_shift)); + default: +@@ -464,6 +468,9 @@ + case SERIAL_IO_MEM: + writeb(value, (unsigned long) info->iomem_base + + (offset<<info->iomem_reg_shift)); ++#ifdef CONFIG_BCM4704 ++ *((volatile unsigned int *) KSEG1ADDR(0x18000000)); ++#endif + break; + default: + outb(value, info->port+offset); +@@ -5996,6 +6003,13 @@ + * Divisor, bytesize and parity + */ + state = rs_table + co->index; ++ /* ++ * Safe guard: state structure must have been initialized ++ */ ++ if (state->iomem_base == NULL) { ++ printk("!unable to setup serial console!\n"); ++ return -1; ++ } + if (doflow) + state->flags |= ASYNC_CONS_FLOW; + info = &async_sercons; diff --git a/recipes/linux/linux-wrt-2.4.30/020-drivers_mtd-jumbo b/recipes/linux/linux-wrt-2.4.30/020-drivers_mtd-jumbo new file mode 100644 index 0000000000..5425f6b0ea --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/020-drivers_mtd-jumbo @@ -0,0 +1,105 @@ +diff -Nur linux-mips-cvs/drivers/mtd/chips/Config.in linux-broadcom/drivers/mtd/chips/Config.in +--- linux-mips-cvs/drivers/mtd/chips/Config.in 2003-02-26 01:53:49.000000000 +0100 ++++ linux-broadcom/drivers/mtd/chips/Config.in 2005-01-31 13:13:14.000000000 +0100 +@@ -45,6 +45,7 @@ + dep_tristate ' Support for Intel/Sharp flash chips' CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_GEN_PROBE + dep_tristate ' Support for AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE + dep_tristate ' Support for ST (Advanced Architecture) flash chips' CONFIG_MTD_CFI_STAA $CONFIG_MTD_GEN_PROBE ++dep_tristate ' Support for SST flash chips' CONFIG_MTD_CFI_SSTSTD $CONFIG_MTD_GEN_PROBE + + dep_tristate ' Support for RAM chips in bus mapping' CONFIG_MTD_RAM $CONFIG_MTD + dep_tristate ' Support for ROM chips in bus mapping' CONFIG_MTD_ROM $CONFIG_MTD +diff -Nur linux-mips-cvs/drivers/mtd/chips/Makefile linux-broadcom/drivers/mtd/chips/Makefile +--- linux-mips-cvs/drivers/mtd/chips/Makefile 2003-07-05 05:23:38.000000000 +0200 ++++ linux-broadcom/drivers/mtd/chips/Makefile 2005-01-31 13:13:14.000000000 +0100 +@@ -18,6 +18,7 @@ + obj-$(CONFIG_MTD_AMDSTD) += amd_flash.o + obj-$(CONFIG_MTD_CFI) += cfi_probe.o + obj-$(CONFIG_MTD_CFI_STAA) += cfi_cmdset_0020.o ++obj-$(CONFIG_MTD_CFI_SSTSTD) += cfi_cmdset_0701.o + obj-$(CONFIG_MTD_CFI_AMDSTD) += cfi_cmdset_0002.o + obj-$(CONFIG_MTD_CFI_INTELEXT) += cfi_cmdset_0001.o + obj-$(CONFIG_MTD_GEN_PROBE) += gen_probe.o +diff -Nur linux-mips-cvs/drivers/mtd/chips/cfi_probe.c linux-broadcom/drivers/mtd/chips/cfi_probe.c +--- linux-mips-cvs/drivers/mtd/chips/cfi_probe.c 2003-02-26 01:53:49.000000000 +0100 ++++ linux-broadcom/drivers/mtd/chips/cfi_probe.c 2005-01-31 13:13:14.000000000 +0100 +@@ -67,8 +67,15 @@ + cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL); + cfi_send_gen_cmd(0x98, 0x55, base, map, cfi, cfi->device_type, NULL); + +- if (!qry_present(map,base,cfi)) +- return 0; ++ if (!qry_present(map,base,cfi)) { ++ /* rather broken SST cfi probe (requires SST unlock) */ ++ cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL); ++ cfi_send_gen_cmd(0xAA, 0x5555, base, map, cfi, cfi->device_type, NULL); ++ cfi_send_gen_cmd(0x55, 0x2AAA, base, map, cfi, cfi->device_type, NULL); ++ cfi_send_gen_cmd(0x98, 0x5555, base, map, cfi, cfi->device_type, NULL); ++ if (!qry_present(map,base,cfi)) ++ return 0; ++ } + + if (!cfi->numchips) { + /* This is the first time we're called. Set up the CFI +diff -Nur linux-mips-cvs/drivers/mtd/chips/gen_probe.c linux-broadcom/drivers/mtd/chips/gen_probe.c +--- linux-mips-cvs/drivers/mtd/chips/gen_probe.c 2003-08-13 19:19:18.000000000 +0200 ++++ linux-broadcom/drivers/mtd/chips/gen_probe.c 2005-01-31 13:13:14.000000000 +0100 +@@ -332,9 +332,13 @@ + return cfi_cmdset_0002(map, primary); + #endif + #ifdef CONFIG_MTD_CFI_STAA +- case 0x0020: ++ case 0x0020: + return cfi_cmdset_0020(map, primary); + #endif ++#ifdef CONFIG_MTD_CFI_SSTSTD ++ case 0x0701: ++ return cfi_cmdset_0701(map, primary); ++#endif + } + + return cfi_cmdset_unknown(map, primary); +diff -Nur linux-mips-cvs/drivers/mtd/devices/Config.in linux-broadcom/drivers/mtd/devices/Config.in +--- linux-mips-cvs/drivers/mtd/devices/Config.in 2003-02-26 01:53:49.000000000 +0100 ++++ linux-broadcom/drivers/mtd/devices/Config.in 2005-01-31 13:13:14.000000000 +0100 +@@ -5,6 +5,7 @@ + mainmenu_option next_comment + + comment 'Self-contained MTD device drivers' ++bool ' Broadcom Chipcommon Serial Flash support' CONFIG_MTD_SFLASH + dep_tristate ' Ramix PMC551 PCI Mezzanine RAM card support' CONFIG_MTD_PMC551 $CONFIG_MTD $CONFIG_PCI + if [ "$CONFIG_MTD_PMC551" = "y" -o "$CONFIG_MTD_PMC551" = "m" ]; then + bool ' PMC551 256M DRAM Bugfix' CONFIG_MTD_PMC551_BUGFIX +diff -Nur linux-mips-cvs/drivers/mtd/devices/Makefile linux-broadcom/drivers/mtd/devices/Makefile +--- linux-mips-cvs/drivers/mtd/devices/Makefile 2002-03-30 09:15:50.000000000 +0100 ++++ linux-broadcom/drivers/mtd/devices/Makefile 2005-01-31 13:13:14.000000000 +0100 +@@ -12,6 +12,7 @@ + # here where previously there was none. We now have to ensure that + # doc200[01].o are linked before docprobe.o + ++obj-$(CONFIG_MTD_SFLASH) += sflash.o + obj-$(CONFIG_MTD_DOC1000) += doc1000.o + obj-$(CONFIG_MTD_DOC2000) += doc2000.o + obj-$(CONFIG_MTD_DOC2001) += doc2001.o +diff -Nur linux-mips-cvs/drivers/mtd/maps/Config.in linux-broadcom/drivers/mtd/maps/Config.in +--- linux-mips-cvs/drivers/mtd/maps/Config.in 2004-02-26 01:46:35.000000000 +0100 ++++ linux-broadcom/drivers/mtd/maps/Config.in 2005-01-31 13:13:14.000000000 +0100 +@@ -48,6 +48,7 @@ + fi + + if [ "$CONFIG_MIPS" = "y" ]; then ++ dep_tristate ' CFI Flash device mapped on Broadcom BCM947XX boards' CONFIG_MTD_BCM947XX $CONFIG_MTD_CFI + dep_tristate ' Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000 + dep_tristate ' Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500 + dep_tristate ' Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100 +diff -Nur linux-mips-cvs/drivers/mtd/maps/Makefile linux-broadcom/drivers/mtd/maps/Makefile +--- linux-mips-cvs/drivers/mtd/maps/Makefile 2004-02-26 01:46:35.000000000 +0100 ++++ linux-broadcom/drivers/mtd/maps/Makefile 2005-01-31 13:13:14.000000000 +0100 +@@ -10,6 +10,7 @@ + endif + + # Chip mappings ++obj-$(CONFIG_MTD_BCM947XX) += bcm947xx-flash.o + obj-$(CONFIG_MTD_CDB89712) += cdb89712.o + obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o + obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o diff --git a/recipes/linux/linux-wrt-2.4.30/021-drivers_net_Config_in-hnd b/recipes/linux/linux-wrt-2.4.30/021-drivers_net_Config_in-hnd new file mode 100644 index 0000000000..580d616ce8 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/021-drivers_net_Config_in-hnd @@ -0,0 +1,10 @@ +--- linux-mips-cvs/drivers/net/Config.in 2004-11-07 18:13:42.000000000 +0100 ++++ linux-broadcom/drivers/net/Config.in 2005-01-31 13:13:14.000000000 +0100 +@@ -2,6 +2,7 @@ + # Network device configuration + # + ++source drivers/net/hnd/Config.in + source drivers/net/arcnet/Config.in + + tristate 'Dummy net driver support' CONFIG_DUMMY diff --git a/recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile b/recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile new file mode 100644 index 0000000000..8340c9565b --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/022-drivers_net_Makefile @@ -0,0 +1,48 @@ +--- ../../../kernel/linux-mips-cvs/drivers/net/Makefile 2004-08-14 20:38:51.000000000 +0200 ++++ linux/drivers/net/Makefile 2005-03-16 12:45:24.523263597 +0100 +@@ -21,6 +21,16 @@ + list-multi := rcpci.o + rcpci-objs := rcpci45.o rclanmtl.o + ++subdir-m += diag ++ ++ifeq ($(CONFIG_HW_QOS),y) ++subdir-m += port_based_qos ++else ++ ifeq ($(CONFIG_PERFORMANCE),y) ++ subdir-m += port_based_qos ++ endif ++endif ++ + ifeq ($(CONFIG_TULIP),y) + obj-y += tulip/tulip.o + endif +@@ -265,6 +275,28 @@ + endif + endif + ++# ++# Broadcom HND devices ++# ++ifdef CONFIG_HND ++subdir-$(CONFIG_HND) += hnd ++endif ++ifdef CONFIG_ET ++subdir-$(CONFIG_ET) += et ++endif ++ifdef CONFIG_WL ++subdir-$(CONFIG_WL) += wl ++endif ++ifeq ($(CONFIG_HND),y) ++ obj-y += hnd/hnd.o ++endif ++ifeq ($(CONFIG_ET),y) ++ obj-y += et/et.o ++endif ++ifeq ($(CONFIG_WL),y) ++ obj-y += wl/wl.o ++endif ++ + include $(TOPDIR)/Rules.make + + clean: diff --git a/recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile b/recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile new file mode 100644 index 0000000000..996e30a9b1 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/023-drivers_parport_Makefile @@ -0,0 +1,10 @@ +--- ../../../kernel/linux-mips-cvs/drivers/parport/Makefile 2004-08-14 20:38:53.000000000 +0200 ++++ linux-2.4.29/drivers/parport/Makefile 2005-03-21 13:57:53.338746517 +0100 +@@ -22,6 +22,7 @@ + + obj-$(CONFIG_PARPORT) += parport.o + obj-$(CONFIG_PARPORT_PC) += parport_pc.o ++obj-$(CONFIG_PARPORT_SPLINK) += parport_splink.o + obj-$(CONFIG_PARPORT_PC_PCMCIA) += parport_cs.o + obj-$(CONFIG_PARPORT_AMIGA) += parport_amiga.o + obj-$(CONFIG_PARPORT_MFC3) += parport_mfc3.o diff --git a/recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in b/recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in new file mode 100644 index 0000000000..1b43798558 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/024-drivers_parport_Config_in @@ -0,0 +1,10 @@ +--- ../../../kernel/linux-mips-cvs/drivers/parport/Config.in 2004-02-20 02:22:18.000000000 +0100 ++++ linux-2.4.29/drivers/parport/Config.in 2005-03-21 13:59:33.958193664 +0100 +@@ -11,6 +11,7 @@ + tristate 'Parallel port support' CONFIG_PARPORT + if [ "$CONFIG_PARPORT" != "n" ]; then + dep_tristate ' PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT ++ dep_tristate ' Asus WL500g parallel port' CONFIG_PARPORT_SPLINK $CONFIG_PARPORT + if [ "$CONFIG_PARPORT_PC" != "n" -a "$CONFIG_SERIAL" != "n" ]; then + if [ "$CONFIG_SERIAL" = "m" ]; then + define_tristate CONFIG_PARPORT_PC_CML1 m diff --git a/recipes/linux/linux-wrt-2.4.30/028-drivers_pcmcia_Makefile b/recipes/linux/linux-wrt-2.4.30/028-drivers_pcmcia_Makefile new file mode 100644 index 0000000000..df843e9d8a --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/028-drivers_pcmcia_Makefile @@ -0,0 +1,23 @@ +diff -Nur linux-mips-cvs/drivers/pcmcia/Makefile linux-broadcom/drivers/pcmcia/Makefile +--- linux-mips-cvs/drivers/pcmcia/Makefile 2004-04-16 23:05:25.000000000 +0200 ++++ linux-broadcom/drivers/pcmcia/Makefile 2005-01-31 13:13:14.000000000 +0100 +@@ -72,6 +72,10 @@ + au1000_ss-objs-$(CONFIG_MIPS_HYDROGEN3) += au1000_hydrogen3.o + au1000_ss-objs-$(CONFIG_MIPS_XXS1500) += au1000_xxs1500.o + ++obj-$(CONFIG_PCMCIA_BCM4710) += bcm4710_ss.o ++bcm4710_ss-objs := bcm4710_generic.o ++bcm4710_ss-objs += bcm4710_pcmcia.o ++ + obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o + obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o + obj-$(CONFIG_PCMCIA_SIBYTE) += sibyte_generic.o +@@ -110,5 +114,8 @@ + au1x00_ss.o: $(au1000_ss-objs-y) + $(LD) -r -o $@ $(au1000_ss-objs-y) + ++bcm4710_ss.o: $(bcm4710_ss-objs) ++ $(LD) -r -o $@ $(bcm4710_ss-objs) ++ + yenta_socket.o: $(yenta_socket-objs) + $(LD) $(LD_RFLAG) -r -o $@ $(yenta_socket-objs) diff --git a/recipes/linux/linux-wrt-2.4.30/029-arch_mips_mm_c-r4k_c b/recipes/linux/linux-wrt-2.4.30/029-arch_mips_mm_c-r4k_c new file mode 100644 index 0000000000..9ec2862c4d --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/029-arch_mips_mm_c-r4k_c @@ -0,0 +1,37 @@ +--- linux-mips-cvs/arch/mips/mm/c-r4k.c 2004-11-03 17:43:07.000000000 +0100 ++++ linux-cache/arch/mips/mm/c-r4k.c 2005-03-06 23:39:53.000000000 +0100 +@@ -1031,9 +1031,34 @@ + c->options |= MIPS_CPU_SUBSET_CACHES; + } + ++#if defined(CONFIG_BCM4310) ++static void __init _change_cachability(u32 cm) ++{ ++ struct cpuinfo_mips *c = ¤t_cpu_data; ++ ++ change_c0_config(CONF_CM_CMASK, cm); ++ if ((c->processor_id & (PRID_COMP_MASK | PRID_IMP_MASK)) == ++ (PRID_COMP_BROADCOM | PRID_IMP_BCM3302)) { ++ cm = read_c0_diag(); ++ /* Enable icache */ ++ cm |= (1 << 31); ++ /* Enable dcache */ ++ cm |= (1 << 30); ++ write_c0_diag(cm); ++ } ++} ++ ++static void (*change_cachability)(u32); ++#endif ++ + static inline void coherency_setup(void) + { ++#if defined(CONFIG_BCM4310) ++ change_cachability = (void (*)(u32)) KSEG1ADDR((unsigned long)(_change_cachability)); ++ change_cachability(CONF_CM_DEFAULT); ++#else + change_c0_config(CONF_CM_CMASK, CONF_CM_DEFAULT); ++#endif + + /* + * c0_status.cu=0 specifies that updates by the sc instruction use diff --git a/recipes/linux/linux-wrt-2.4.30/031-include_asm-mips_bootinfo_h b/recipes/linux/linux-wrt-2.4.30/031-include_asm-mips_bootinfo_h new file mode 100644 index 0000000000..c15471e75b --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/031-include_asm-mips_bootinfo_h @@ -0,0 +1,26 @@ +--- linux-mips-cvs/include/asm-mips/bootinfo.h 2005-01-31 12:59:49.000000000 +0100 ++++ linux-broadcom/include/asm-mips/bootinfo.h 2005-01-31 13:13:14.000000000 +0100 +@@ -37,6 +37,7 @@ + #define MACH_GROUP_HP_LJ 20 /* Hewlett Packard LaserJet */ + #define MACH_GROUP_LASAT 21 + #define MACH_GROUP_TITAN 22 /* PMC-Sierra Titan */ ++#define MACH_GROUP_BRCM 23 /* Broadcom */ + + /* + * Valid machtype values for group unknown (low order halfword of mips_machtype) +@@ -197,6 +198,15 @@ + #define MACH_TANBAC_TB0229 7 /* TANBAC TB0229 (VR4131DIMM) */ + + /* ++ * Valid machtypes for group Broadcom ++ */ ++#define MACH_BCM93725 0 ++#define MACH_BCM93725_VJ 1 ++#define MACH_BCM93730 2 ++#define MACH_BCM947XX 3 ++#define MACH_BCM933XX 4 ++ ++/* + * Valid machtype for group TITAN + */ + #define MACH_TITAN_YOSEMITE 1 /* PMC-Sierra Yosemite */ diff --git a/recipes/linux/linux-wrt-2.4.30/033-include_asm-mips_cpu_h b/recipes/linux/linux-wrt-2.4.30/033-include_asm-mips_cpu_h new file mode 100644 index 0000000000..98157a572b --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/033-include_asm-mips_cpu_h @@ -0,0 +1,50 @@ +--- linux-mips-cvs/include/asm-mips/cpu.h 2004-07-07 20:19:37.000000000 +0200 ++++ linux-broadcom/include/asm-mips/cpu.h 2005-01-31 13:13:14.000000000 +0100 +@@ -22,6 +22,11 @@ + spec. + */ + ++#define PRID_COPT_MASK 0xff000000 ++#define PRID_COMP_MASK 0x00ff0000 ++#define PRID_IMP_MASK 0x0000ff00 ++#define PRID_REV_MASK 0x000000ff ++ + #define PRID_COMP_LEGACY 0x000000 + #define PRID_COMP_MIPS 0x010000 + #define PRID_COMP_BROADCOM 0x020000 +@@ -58,6 +63,7 @@ + #define PRID_IMP_RM7000 0x2700 + #define PRID_IMP_NEVADA 0x2800 /* RM5260 ??? */ + #define PRID_IMP_RM9000 0x3400 ++#define PRID_IMP_BCM4710 0x4000 + #define PRID_IMP_R5432 0x5400 + #define PRID_IMP_R5500 0x5500 + #define PRID_IMP_4KC 0x8000 +@@ -66,10 +72,16 @@ + #define PRID_IMP_4KEC 0x8400 + #define PRID_IMP_4KSC 0x8600 + #define PRID_IMP_25KF 0x8800 ++#define PRID_IMP_BCM3302 0x9000 ++#define PRID_IMP_BCM3303 0x9100 + #define PRID_IMP_24K 0x9300 + + #define PRID_IMP_UNKNOWN 0xff00 + ++#define BCM330X(id) \ ++ (((id & (PRID_COMP_MASK | PRID_IMP_MASK)) == (PRID_COMP_BROADCOM | PRID_IMP_BCM3302)) \ ++ || ((id & (PRID_COMP_MASK | PRID_IMP_MASK)) == (PRID_COMP_BROADCOM | PRID_IMP_BCM3303))) ++ + /* + * These are the PRID's for when 23:16 == PRID_COMP_SIBYTE + */ +@@ -174,7 +186,9 @@ + #define CPU_AU1550 57 + #define CPU_24K 58 + #define CPU_AU1200 59 +-#define CPU_LAST 59 ++#define CPU_BCM4710 60 ++#define CPU_BCM3302 61 ++#define CPU_LAST 61 + + /* + * ISA Level encodings diff --git a/recipes/linux/linux-wrt-2.4.30/036-include_asm-mips_serial_h b/recipes/linux/linux-wrt-2.4.30/036-include_asm-mips_serial_h new file mode 100644 index 0000000000..b241ff7030 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/036-include_asm-mips_serial_h @@ -0,0 +1,24 @@ +--- linux-mips-cvs/include/asm-mips/serial.h 2004-08-20 00:33:33.000000000 +0200 ++++ linux-broadcom/include/asm-mips/serial.h 2005-01-31 13:13:14.000000000 +0100 +@@ -223,6 +223,13 @@ + #define TXX927_SERIAL_PORT_DEFNS + #endif + ++#ifdef CONFIG_BCM947XX ++/* reserve 4 ports to be configured at runtime */ ++#define BCM947XX_SERIAL_PORT_DEFNS { 0, }, { 0, }, { 0, }, { 0, }, ++#else ++#define BCM947XX_SERIAL_PORT_DEFNS ++#endif ++ + #ifdef CONFIG_HAVE_STD_PC_SERIAL_PORT + #define STD_SERIAL_PORT_DEFNS \ + /* UART CLK PORT IRQ FLAGS */ \ +@@ -470,6 +477,7 @@ + #define SERIAL_PORT_DFNS \ + ATLAS_SERIAL_PORT_DEFNS \ + AU1000_SERIAL_PORT_DEFNS \ ++ BCM947XX_SERIAL_PORT_DEFNS \ + COBALT_SERIAL_PORT_DEFNS \ + DDB5477_SERIAL_PORT_DEFNS \ + EV96100_SERIAL_PORT_DEFNS \ diff --git a/recipes/linux/linux-wrt-2.4.30/037-init_do_mounts_c b/recipes/linux/linux-wrt-2.4.30/037-init_do_mounts_c new file mode 100644 index 0000000000..205677b25f --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/037-init_do_mounts_c @@ -0,0 +1,16 @@ +--- linux-mips-cvs/init/do_mounts.c 2005-01-20 03:19:24.000000000 +0100 ++++ linux-broadcom/init/do_mounts.c 2005-01-31 13:13:14.000000000 +0100 +@@ -253,7 +253,13 @@ + { "ftlb", 0x2c08 }, + { "ftlc", 0x2c10 }, + { "ftld", 0x2c18 }, ++#if defined(CONFIG_MTD_BLOCK) || defined(CONFIG_MTD_BLOCK_RO) + { "mtdblock", 0x1f00 }, ++ { "mtdblock0",0x1f00 }, ++ { "mtdblock1",0x1f01 }, ++ { "mtdblock2",0x1f02 }, ++ { "mtdblock3",0x1f03 }, ++#endif + { "nb", 0x2b00 }, + { NULL, 0 } + }; diff --git a/recipes/linux/linux-wrt-2.4.30/100-gcc3-mtune b/recipes/linux/linux-wrt-2.4.30/100-gcc3-mtune new file mode 100644 index 0000000000..0f5a7017e9 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/100-gcc3-mtune @@ -0,0 +1,28 @@ +--- linux-mips-cvs-21012005/arch/mips/Makefile 2004-11-18 05:16:52.000000000 +0100 ++++ linux-broadcom/arch/mips/Makefile 2005-01-24 02:56:02.000000000 +0100 +@@ -71,13 +74,13 @@ + set_gccflags = $(shell \ + while :; do \ + cpu=$(1); isa=-$(2); \ +- for gcc_opt in -march= -mcpu=; do \ ++ for gcc_opt in -march= -mtune=; do \ + $(CC) $$gcc_opt$$cpu $$isa -S -o /dev/null \ + -xc /dev/null > /dev/null 2>&1 && \ + break 2; \ + done; \ + cpu=$(3); isa=-$(4); \ +- for gcc_opt in -march= -mcpu=; do \ ++ for gcc_opt in -march= -mtune=; do \ + $(CC) $$gcc_opt$$cpu $$isa -S -o /dev/null \ + -xc /dev/null > /dev/null 2>&1 && \ + break 2; \ +@@ -92,7 +95,7 @@ + fi; \ + gas_abi=-Wa,-32; gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \ + while :; do \ +- for gas_opt in -Wa,-march= -Wa,-mcpu=; do \ ++ for gas_opt in -Wa,-march= -Wa,-mtune=; do \ + $(CC) $$gas_abi $$gas_opt$$cpu $$gas_isa -Wa,-Z -c \ + -o /dev/null -xassembler /dev/null > /dev/null 2>&1 && \ + break 2; \ + diff --git a/recipes/linux/linux-wrt-2.4.30/200-include_linux_netdevice_h.patch b/recipes/linux/linux-wrt-2.4.30/200-include_linux_netdevice_h.patch new file mode 100644 index 0000000000..5e758f0ed9 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/200-include_linux_netdevice_h.patch @@ -0,0 +1,28 @@ +--- linux-mips-cvs-21012005/include/linux/netdevice.h 2004-11-19 01:28:51.000000000 +0100 ++++ linux-broadcom/include/linux/netdevice.h 2005-01-26 19:51:37.000000000 +0100 +@@ -297,7 +297,10 @@ + * See <net/iw_handler.h> for details. Jean II */ + struct iw_handler_def * wireless_handlers; + ++#ifndef CONFIG_BCM4710 + struct ethtool_ops *ethtool_ops; ++#endif ++ + + /* + * This marks the end of the "visible" part of the structure. All +@@ -353,7 +356,14 @@ + struct Qdisc *qdisc; + struct Qdisc *qdisc_sleeping; + struct Qdisc *qdisc_ingress; ++ /* ++ * this is needed for the wlan driver binary blob from linksys ++ */ ++#ifdef CONFIG_BCM4710 ++ struct Qdisc *qdisc_list; ++#else + struct list_head qdisc_list; ++#endif + unsigned long tx_queue_len; /* Max frames per queue allowed */ + + /* hard_start_xmit synchronizer */ diff --git a/recipes/linux/linux-wrt-2.4.30/201-include_linux_skbuff_h.patch b/recipes/linux/linux-wrt-2.4.30/201-include_linux_skbuff_h.patch new file mode 100644 index 0000000000..628eaeac4f --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/201-include_linux_skbuff_h.patch @@ -0,0 +1,24 @@ +--- linux-mips-cvs-21012005/include/linux/skbuff.h 2005-01-31 12:56:47.000000000 +0100 ++++ linux-broadcom/include/linux/skbuff.h 2005-01-31 12:55:24.000000000 +0100 +@@ -135,10 +135,6 @@ + struct sock *sk; /* Socket we are owned by */ + struct timeval stamp; /* Time we arrived */ + struct net_device *dev; /* Device we arrived on/are leaving by */ +- struct net_device *real_dev; /* For support of point to point protocols +- (e.g. 802.3ad) over bonding, we must save the +- physical device that got the packet before +- replacing skb->dev with the virtual device. */ + + /* Transport layer header */ + union +@@ -219,6 +215,10 @@ + #ifdef CONFIG_NET_SCHED + __u32 tc_index; /* traffic control index */ + #endif ++ struct net_device *real_dev; /* For support of point to point protocols ++ (e.g. 802.3ad) over bonding, we must save the ++ physical device that got the packet before ++ replacing skb->dev with the virtual device. */ + }; + + #ifdef __KERNEL__ diff --git a/recipes/linux/linux-wrt-2.4.30/202-net_core_Makefile.patch b/recipes/linux/linux-wrt-2.4.30/202-net_core_Makefile.patch new file mode 100644 index 0000000000..8abeccce73 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/202-net_core_Makefile.patch @@ -0,0 +1,28 @@ +--- linux-mips-cvs-21012005/net/core/Makefile 2004-11-19 01:28:53.000000000 +0100 ++++ linux-broadcom/net/core/Makefile 2005-01-26 15:56:36.000000000 +0100 +@@ -9,7 +9,11 @@ + + O_TARGET := core.o + ++ifeq ($(CONFIG_BCM4710),y) ++export-objs := netfilter.o profile.o neighbour.o ++else + export-objs := netfilter.o profile.o ethtool.o neighbour.o ++endif + + obj-y := sock.o skbuff.o iovec.o datagram.o scm.o + +@@ -21,8 +25,13 @@ + + obj-$(CONFIG_FILTER) += filter.o + ++ifeq ($(CONFIG_BCM4710),y) ++obj-$(CONFIG_NET) += dev.o dev_mcast.o dst.o neighbour.o \ ++ rtnetlink.o utils.o ++else + obj-$(CONFIG_NET) += dev.o ethtool.o dev_mcast.o dst.o neighbour.o \ + rtnetlink.o utils.o ++endif + + obj-$(CONFIG_NETFILTER) += netfilter.o + obj-$(CONFIG_NET_DIVERT) += dv.o diff --git a/recipes/linux/linux-wrt-2.4.30/203-net_core_dev_c.patch b/recipes/linux/linux-wrt-2.4.30/203-net_core_dev_c.patch new file mode 100644 index 0000000000..8ce40f8794 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/203-net_core_dev_c.patch @@ -0,0 +1,28 @@ +--- linux-2.4.30/net/core/dev.c 2005-04-04 05:42:20.000000000 +0400 ++++ linux/net/core/dev.c 2005-05-10 14:49:27.809927172 +0400 +@@ -2216,6 +2220,9 @@ + cmd == SIOCBONDSLAVEINFOQUERY || + cmd == SIOCBONDINFOQUERY || + cmd == SIOCBONDCHANGEACTIVE || ++#ifdef CONFIG_BCM4710 ++ cmd == SIOCETHTOOL || ++#endif + cmd == SIOCGMIIPHY || + cmd == SIOCGMIIREG || + cmd == SIOCSMIIREG || +@@ -2312,6 +2319,7 @@ + return ret; + + case SIOCETHTOOL: ++#ifndef CONFIG_BCM4710 + dev_load(ifr.ifr_name); + rtnl_lock(); + ret = dev_ethtool(&ifr); +@@ -2324,6 +2332,7 @@ + ret = -EFAULT; + } + return ret; ++#endif + + /* + * These ioctl calls: diff --git a/recipes/linux/linux-wrt-2.4.30/204-net_sched_sched_api_c.patch b/recipes/linux/linux-wrt-2.4.30/204-net_sched_sched_api_c.patch new file mode 100644 index 0000000000..1f2371e504 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/204-net_sched_sched_api_c.patch @@ -0,0 +1,119 @@ +--- linux-2.4.30/net/sched/sch_api.c 2004-11-17 12:54:22.000000000 +0100 ++++ linux-2.4.30-wl/net/sched/sch_api.c 2005-04-24 18:56:03.000000000 +0200 +@@ -194,11 +194,12 @@ + { + struct Qdisc *q; + +- list_for_each_entry(q, &dev->qdisc_list, list) { ++ for (q = dev->qdisc_list; q; q = q->next) { + if (q->handle == handle) + return q; + } + return NULL; ++ + } + + struct Qdisc *qdisc_leaf(struct Qdisc *p, u32 classid) +@@ -371,8 +372,6 @@ + unsigned long cl = cops->get(parent, classid); + if (cl) { + err = cops->graft(parent, cl, new, old); +- if (new) +- new->parent = classid; + cops->put(parent, cl); + } + } +@@ -427,7 +426,6 @@ + + memset(sch, 0, size); + +- INIT_LIST_HEAD(&sch->list); + skb_queue_head_init(&sch->q); + + if (handle == TC_H_INGRESS) +@@ -453,7 +451,8 @@ + + if (!ops->init || (err = ops->init(sch, tca[TCA_OPTIONS-1])) == 0) { + write_lock(&qdisc_tree_lock); +- list_add_tail(&sch->list, &dev->qdisc_list); ++ sch->next = dev->qdisc_list; ++ dev->qdisc_list = sch; + write_unlock(&qdisc_tree_lock); + #ifdef CONFIG_NET_ESTIMATOR + if (tca[TCA_RATE-1]) +@@ -808,19 +807,16 @@ + if (idx > s_idx) + s_q_idx = 0; + read_lock(&qdisc_tree_lock); +- q_idx = 0; +- list_for_each_entry(q, &dev->qdisc_list, list) { +- if (q_idx < s_q_idx) { +- q_idx++; +- continue; +- } +- if (tc_fill_qdisc(skb, q, q->parent, NETLINK_CB(cb->skb).pid, +- cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWQDISC) <= 0) { +- read_unlock(&qdisc_tree_lock); +- goto done; +- } +- q_idx++; +- } ++ for (q = dev->qdisc_list, q_idx = 0; q; ++ q = q->next, q_idx++) { ++ if (q_idx < s_q_idx) ++ continue; ++ if (tc_fill_qdisc(skb, q, 0, NETLINK_CB(cb->skb).pid, ++ cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWQDISC) <= 0) { ++ read_unlock(&qdisc_tree_lock); ++ goto done; ++ } ++ } + read_unlock(&qdisc_tree_lock); + } + +@@ -1033,27 +1029,24 @@ + t = 0; + + read_lock(&qdisc_tree_lock); +- list_for_each_entry(q, &dev->qdisc_list, list) { +- if (t < s_t || !q->ops->cl_ops || +- (tcm->tcm_parent && +- TC_H_MAJ(tcm->tcm_parent) != q->handle)) { +- t++; +- continue; +- } +- if (t > s_t) +- memset(&cb->args[1], 0, sizeof(cb->args)-sizeof(cb->args[0])); +- arg.w.fn = qdisc_class_dump; +- arg.skb = skb; +- arg.cb = cb; +- arg.w.stop = 0; +- arg.w.skip = cb->args[1]; +- arg.w.count = 0; +- q->ops->cl_ops->walk(q, &arg.w); +- cb->args[1] = arg.w.count; +- if (arg.w.stop) +- break; +- t++; +- } ++ for (q=dev->qdisc_list, t=0; q; q = q->next, t++) { ++ if (t < s_t) continue; ++ if (!q->ops->cl_ops) continue; ++ if (tcm->tcm_parent && TC_H_MAJ(tcm->tcm_parent) != q->handle) ++ continue; ++ if (t > s_t) ++ memset(&cb->args[1], 0, sizeof(cb->args)-sizeof(cb->args[0])); ++ arg.w.fn = qdisc_class_dump; ++ arg.skb = skb; ++ arg.cb = cb; ++ arg.w.stop = 0; ++ arg.w.skip = cb->args[1]; ++ arg.w.count = 0; ++ q->ops->cl_ops->walk(q, &arg.w); ++ cb->args[1] = arg.w.count; ++ if (arg.w.stop) ++ break; ++ } + read_unlock(&qdisc_tree_lock); + + cb->args[0] = t; diff --git a/recipes/linux/linux-wrt-2.4.30/205-net_sched_sched_generic_c.patch b/recipes/linux/linux-wrt-2.4.30/205-net_sched_sched_generic_c.patch new file mode 100644 index 0000000000..9de11d38ed --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/205-net_sched_sched_generic_c.patch @@ -0,0 +1,64 @@ +--- linux-2.4.30/net/sched/sch_generic.c 2004-11-17 12:54:22.000000000 +0100 ++++ linux-2.4.30-wl/net/sched/sch_generic.c 2005-04-24 18:09:38.000000000 +0200 +@@ -392,7 +392,6 @@ + return NULL; + memset(sch, 0, size); + +- INIT_LIST_HEAD(&sch->list); + skb_queue_head_init(&sch->q); + sch->ops = ops; + sch->enqueue = ops->enqueue; +@@ -422,11 +421,22 @@ + void qdisc_destroy(struct Qdisc *qdisc) + { + struct Qdisc_ops *ops = qdisc->ops; ++ struct net_device *dev; + + if (qdisc->flags&TCQ_F_BUILTIN || + !atomic_dec_and_test(&qdisc->refcnt)) + return; +- list_del(&qdisc->list); ++ ++ dev = qdisc->dev; ++ if (dev) { ++ struct Qdisc *q, **qp; ++ for (qp = &qdisc->dev->qdisc_list; (q=*qp) != NULL; qp = &q->next) { ++ if (q == qdisc) { ++ *qp = q->next; ++ break; ++ } ++ } ++ } + #ifdef CONFIG_NET_ESTIMATOR + qdisc_kill_estimator(&qdisc->stats); + #endif +@@ -455,9 +465,9 @@ + return; + } + write_lock(&qdisc_tree_lock); +- list_add_tail(&qdisc->list, &dev->qdisc_list); ++ qdisc->next = dev->qdisc_list; ++ dev->qdisc_list = qdisc; + write_unlock(&qdisc_tree_lock); +- + } else { + qdisc = &noqueue_qdisc; + } +@@ -501,7 +511,7 @@ + dev->qdisc = &noop_qdisc; + spin_unlock_bh(&dev->queue_lock); + dev->qdisc_sleeping = &noop_qdisc; +- INIT_LIST_HEAD(&dev->qdisc_list); ++ dev->qdisc_list = NULL; + write_unlock(&qdisc_tree_lock); + + dev_watchdog_init(dev); +@@ -523,7 +533,7 @@ + qdisc_destroy(qdisc); + } + #endif +- BUG_TRAP(list_empty(&dev->qdisc_list)); ++ BUG_TRAP(dev->qdisc_list == NULL); + BUG_TRAP(!timer_pending(&dev->watchdog_timer)); + spin_unlock_bh(&dev->queue_lock); + write_unlock(&qdisc_tree_lock); diff --git a/recipes/linux/linux-wrt-2.4.30/206-include_net_pkt_sched_h.patch b/recipes/linux/linux-wrt-2.4.30/206-include_net_pkt_sched_h.patch new file mode 100644 index 0000000000..f6bd0143ad --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/206-include_net_pkt_sched_h.patch @@ -0,0 +1,25 @@ +--- linux-2.4.30/include/net/pkt_sched.h 2004-11-17 12:54:22.000000000 +0100 ++++ linux-2.4.30-wl/include/net/pkt_sched.h 2005-04-24 18:32:48.000000000 +0200 +@@ -59,7 +59,7 @@ + int (*enqueue)(struct sk_buff *, struct Qdisc *); + struct sk_buff * (*dequeue)(struct Qdisc *); + int (*requeue)(struct sk_buff *, struct Qdisc *); +- unsigned int (*drop)(struct Qdisc *); ++ int (*drop)(struct Qdisc *); + + int (*init)(struct Qdisc *, struct rtattr *arg); + void (*reset)(struct Qdisc *); +@@ -80,12 +80,11 @@ + #define TCQ_F_THROTTLED 2 + #define TCQ_F_INGRESS 4 + struct Qdisc_ops *ops; ++ struct Qdisc *next; + u32 handle; +- u32 parent; + atomic_t refcnt; + struct sk_buff_head q; + struct net_device *dev; +- struct list_head list; + + struct tc_stats stats; + int (*reshape_fail)(struct sk_buff *skb, struct Qdisc *q); diff --git a/recipes/linux/linux-wrt-2.4.30/207-hfsplus-fix b/recipes/linux/linux-wrt-2.4.30/207-hfsplus-fix new file mode 100644 index 0000000000..695a2d36b5 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/207-hfsplus-fix @@ -0,0 +1,23 @@ +diff -urN linux-2.4.30.old/fs/hfsplus/super.c linux-2.4.30.dev/fs/hfsplus/super.c +--- linux-2.4.30.old/fs/hfsplus/super.c 2003-08-25 13:44:43.000000000 +0200 ++++ linux-2.4.30.dev/fs/hfsplus/super.c 2005-04-27 19:54:40.000000000 +0200 +@@ -240,8 +240,7 @@ + if (!(*flags & MS_RDONLY)) { + struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr; + +- if ((vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_INCNSTNT)) || +- !(vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_UNMNT))) { ++ if (!(vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_UNMNT))) { + printk("HFS+-fs warning: Filesystem was not cleanly unmounted, " + "running fsck.hfsplus is recommended. leaving read-only.\n"); + sb->s_flags |= MS_RDONLY; +@@ -343,8 +342,7 @@ + /* Set up operations so we can load metadata */ + sb->s_op = &hfsplus_sops; + +- if ((vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_INCNSTNT)) || +- !(vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_UNMNT))) { ++ if (!(vhdr->attributes & cpu_to_be32(HFSPLUS_VOL_UNMNT))) { + if (!silent) + printk("HFS+-fs warning: Filesystem was not cleanly unmounted, " + "running fsck.hfsplus is recommended. mounting read-only.\n"); diff --git a/recipes/linux/linux-wrt-2.4.30/208-gcc-3.4-fix b/recipes/linux/linux-wrt-2.4.30/208-gcc-3.4-fix new file mode 100644 index 0000000000..782a9ce6fa --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/208-gcc-3.4-fix @@ -0,0 +1,10 @@ +--- linux-2.4.30.old/arch/mips/ld.script.in 2005-04-28 23:22:23.513764016 +0400 ++++ linux-2.4.30/arch/mips/ld.script.in 2005-04-28 23:22:36.329673152 +0400 +@@ -9,6 +9,7 @@ + { + _ftext = . ; + *(.text) ++ *(.fixup) + *(.rodata) + *(.rodata.*) + *(.rodata1) diff --git a/recipes/linux/linux-wrt-2.4.30/300-squashfs2.1 b/recipes/linux/linux-wrt-2.4.30/300-squashfs2.1 new file mode 100644 index 0000000000..762b5a4dea --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/300-squashfs2.1 @@ -0,0 +1,2454 @@ +diff --new-file -ur linux-2.4.28/fs/Config.in linux-2.4.28-squashfs2.1-r2/fs/Config.in +--- linux-2.4.28/fs/Config.in 2004-11-17 11:54:21.000000000 +0000 ++++ linux-2.4.28-squashfs2.1-r2/fs/Config.in 2004-12-02 02:14:05.000000000 +0000 +@@ -51,6 +51,7 @@ + int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0 + fi + tristate 'Compressed ROM file system support' CONFIG_CRAMFS ++tristate 'Squashed file system support' CONFIG_SQUASHFS + bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS + define_bool CONFIG_RAMFS y + +diff --new-file -ur linux-2.4.28/fs/Makefile linux-2.4.28-squashfs2.1-r2/fs/Makefile +--- linux-2.4.28/fs/Makefile 2004-02-18 13:36:31.000000000 +0000 ++++ linux-2.4.28-squashfs2.1-r2/fs/Makefile 2004-12-02 02:14:05.000000000 +0000 +@@ -65,6 +65,7 @@ + subdir-$(CONFIG_DEVPTS_FS) += devpts + subdir-$(CONFIG_SUN_OPENPROMFS) += openpromfs + subdir-$(CONFIG_BEFS_FS) += befs ++subdir-$(CONFIG_SQUASHFS) += squashfs + subdir-$(CONFIG_JFS_FS) += jfs + subdir-$(CONFIG_XFS_FS) += xfs + +diff --new-file -ur linux-2.4.28/fs/squashfs/inode.c linux-2.4.28-squashfs2.1-r2/fs/squashfs/inode.c +--- linux-2.4.28/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.28-squashfs2.1-r2/fs/squashfs/inode.c 2004-12-15 10:13:06.000000000 +0000 +@@ -0,0 +1,1677 @@ ++/* ++ * Squashfs - a compressed read only filesystem for Linux ++ * ++ * Copyright (c) 2002, 2003, 2004 Phillip Lougher <plougher@users.sourceforge.net> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2, ++ * or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * Squashfs - a compressed read only filesystem for Linux ++ * ++ * inode.c ++ */ ++ ++#define SQUASHFS_1_0_COMPATIBILITY ++ ++#include <linux/types.h> ++#include <linux/squashfs_fs.h> ++#include <linux/module.h> ++#include <linux/errno.h> ++#include <linux/slab.h> ++#include <linux/fs.h> ++#include <linux/locks.h> ++#include <linux/init.h> ++#include <linux/dcache.h> ++#include <asm/uaccess.h> ++#include <linux/wait.h> ++#include <asm/semaphore.h> ++#include <linux/zlib.h> ++#include <linux/blkdev.h> ++#include <linux/vmalloc.h> ++ ++#ifdef SQUASHFS_TRACE ++#define TRACE(s, args...) printk(KERN_NOTICE "SQUASHFS: "s, ## args) ++#else ++#define TRACE(s, args...) {} ++#endif ++ ++#define ERROR(s, args...) printk(KERN_ERR "SQUASHFS error: "s, ## args) ++ ++#define SERROR(s, args...) if(!silent) printk(KERN_ERR "SQUASHFS error: "s, ## args) ++#define WARNING(s, args...) printk(KERN_WARNING "SQUASHFS: "s, ## args) ++ ++static struct super_block *squashfs_read_super(struct super_block *, void *, int); ++static void squashfs_put_super(struct super_block *); ++static int squashfs_statfs(struct super_block *, struct statfs *); ++static int squashfs_symlink_readpage(struct file *file, struct page *page); ++static int squashfs_readpage(struct file *file, struct page *page); ++static int squashfs_readpage4K(struct file *file, struct page *page); ++static int squashfs_readdir(struct file *, void *, filldir_t); ++static struct dentry *squashfs_lookup(struct inode *, struct dentry *); ++static unsigned int read_data(struct super_block *s, char *buffer, ++ unsigned int index, unsigned int length, unsigned int *next_index); ++static int squashfs_get_cached_block(struct super_block *s, char *buffer, ++ unsigned int block, unsigned int offset, int length, ++ unsigned int *next_block, unsigned int *next_offset); ++static struct inode *squashfs_iget(struct super_block *s, squashfs_inode inode); ++static unsigned int read_blocklist(struct inode *inode, int index, int readahead_blks, ++ char *block_list, unsigned short **block_p, unsigned int *bsize); ++static void squashfs_put_super(struct super_block *s); ++ ++#ifdef SQUASHFS_1_0_COMPATIBILITY ++static int squashfs_readpage_lessthan4K(struct file *file, struct page *page); ++static struct inode *squashfs_iget_1(struct super_block *s, squashfs_inode inode); ++static unsigned int read_blocklist_1(struct inode *inode, int index, int readahead_blks, ++ char *block_list, unsigned short **block_p, unsigned int *bsize); ++#endif ++ ++DECLARE_MUTEX(read_data_mutex); ++ ++static z_stream stream; ++ ++static DECLARE_FSTYPE_DEV(squashfs_fs_type, "squashfs", squashfs_read_super); ++ ++static unsigned char squashfs_filetype_table[] = { ++ DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK ++}; ++ ++static struct super_operations squashfs_ops = { ++ statfs: squashfs_statfs, ++ put_super: squashfs_put_super, ++}; ++ ++static struct address_space_operations squashfs_symlink_aops = { ++ readpage: squashfs_symlink_readpage ++}; ++ ++static struct address_space_operations squashfs_aops = { ++ readpage: squashfs_readpage ++}; ++ ++static struct address_space_operations squashfs_aops_4K = { ++ readpage: squashfs_readpage4K ++}; ++ ++#ifdef SQUASHFS_1_0_COMPATIBILITY ++static struct address_space_operations squashfs_aops_lessthan4K = { ++ readpage: squashfs_readpage_lessthan4K ++}; ++#endif ++ ++static struct file_operations squashfs_dir_ops = { ++ read: generic_read_dir, ++ readdir: squashfs_readdir ++}; ++ ++static struct inode_operations squashfs_dir_inode_ops = { ++ lookup: squashfs_lookup ++}; ++ ++ ++static struct buffer_head *get_block_length(struct super_block *s, int *cur_index, int *offset, int *c_byte) ++{ ++ squashfs_sb_info *msBlk = &s->u.squashfs_sb; ++ unsigned short temp; ++ struct buffer_head *bh; ++ ++ if(!(bh = sb_bread(s, *cur_index))) ++ return NULL; ++ ++ if(msBlk->devblksize - *offset == 1) { ++ if(msBlk->swap) ++ ((unsigned char *) &temp)[1] = *((unsigned char *) (bh->b_data + *offset)); ++ else ++ ((unsigned char *) &temp)[0] = *((unsigned char *) (bh->b_data + *offset)); ++ brelse(bh); ++ if(!(bh = sb_bread(s, ++(*cur_index)))) ++ return NULL; ++ if(msBlk->swap) ++ ((unsigned char *) &temp)[0] = *((unsigned char *) bh->b_data); ++ else ++ ((unsigned char *) &temp)[1] = *((unsigned char *) bh->b_data); ++ *c_byte = temp; ++ *offset = 1; ++ } ++ else { ++ if(msBlk->swap) { ++ unsigned short temp; ++ ((unsigned char *) &temp)[1] = *((unsigned char *) (bh->b_data + *offset)); ++ ((unsigned char *) &temp)[0] = *((unsigned char *) (bh->b_data + *offset + 1)); ++ *c_byte = temp; ++ } else ++ *c_byte = *((unsigned short *) (bh->b_data + *offset)); ++ *offset += 2; ++ } ++ if(SQUASHFS_CHECK_DATA(msBlk->sBlk.flags)) { ++ if(*offset == msBlk->devblksize) { ++ brelse(bh); ++ if(!(bh = sb_bread(s, ++(*cur_index)))) ++ return NULL; ++ offset = 0; ++ } ++ if(*((unsigned char *) (bh->b_data + *offset)) != SQUASHFS_MARKER_BYTE) { ++ ERROR("Metadata block marker corrupt @ %x\n", *cur_index); ++ brelse(bh); ++ return NULL; ++ } ++ *offset ++; ++ } ++ ++ return bh; ++} ++ ++ ++static unsigned int read_data(struct super_block *s, char *buffer, ++ unsigned int index, unsigned int length, unsigned int *next_index) ++{ ++ squashfs_sb_info *msBlk = &s->u.squashfs_sb; ++ struct buffer_head *bh[((SQUASHFS_FILE_MAX_SIZE - 1) >> msBlk->devblksize_log2) + 2]; ++ unsigned int offset = index & ((1 << msBlk->devblksize_log2) - 1); ++ unsigned int cur_index = index >> msBlk->devblksize_log2; ++ int bytes, avail_bytes, b = 0, k; ++ char *c_buffer; ++ unsigned int compressed; ++ unsigned int c_byte = length; ++ ++ if(c_byte) { ++ bytes = msBlk->devblksize - offset; ++ compressed = SQUASHFS_COMPRESSED_BLOCK(c_byte); ++ c_buffer = compressed ? msBlk->read_data : buffer; ++ c_byte = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte); ++ ++ TRACE("Block @ 0x%x, %scompressed size %d\n", index, compressed ? "" : "un", (unsigned int) c_byte); ++ ++ if(!(bh[0] = sb_getblk(s, cur_index))) ++ goto block_release; ++ for(b = 1; bytes < c_byte; b++) { ++ if(!(bh[b] = sb_getblk(s, ++cur_index))) ++ goto block_release; ++ bytes += msBlk->devblksize; ++ } ++ ll_rw_block(READ, b, bh); ++ } else { ++ if(!(bh[0] = get_block_length(s, &cur_index, &offset, &c_byte))) ++ goto read_failure; ++ ++ bytes = msBlk->devblksize - offset; ++ compressed = SQUASHFS_COMPRESSED(c_byte); ++ c_buffer = compressed ? msBlk->read_data : buffer; ++ c_byte = SQUASHFS_COMPRESSED_SIZE(c_byte); ++ ++ TRACE("Block @ 0x%x, %scompressed size %d\n", index, compressed ? "" : "un", (unsigned int) c_byte); ++ ++ for(b = 1; bytes < c_byte; b++) { ++ if(!(bh[b] = sb_getblk(s, ++cur_index))) ++ goto block_release; ++ bytes += msBlk->devblksize; ++ } ++ ll_rw_block(READ, b - 1, bh + 1); ++ } ++ ++ if(compressed) ++ down(&read_data_mutex); ++ ++ for(bytes = 0, k = 0; k < b; k++) { ++ avail_bytes = (c_byte - bytes) > (msBlk->devblksize - offset) ? msBlk->devblksize - offset : c_byte - bytes; ++ wait_on_buffer(bh[k]); ++ memcpy(c_buffer + bytes, bh[k]->b_data + offset, avail_bytes); ++ bytes += avail_bytes; ++ offset = 0; ++ brelse(bh[k]); ++ } ++ ++ /* ++ * uncompress block ++ */ ++ if(compressed) { ++ int zlib_err; ++ ++ stream.next_in = c_buffer; ++ stream.avail_in = c_byte; ++ stream.next_out = buffer; ++ stream.avail_out = msBlk->read_size; ++ if(((zlib_err = zlib_inflateInit(&stream)) != Z_OK) || ++ ((zlib_err = zlib_inflate(&stream, Z_FINISH)) != Z_STREAM_END) || ++ ((zlib_err = zlib_inflateEnd(&stream)) != Z_OK)) { ++ ERROR("zlib_fs returned unexpected result 0x%x\n", zlib_err); ++ bytes = 0; ++ } else ++ bytes = stream.total_out; ++ up(&read_data_mutex); ++ } ++ ++ if(next_index) ++ *next_index = index + c_byte + (length ? 0 : (SQUASHFS_CHECK_DATA(msBlk->sBlk.flags) ? 3 : 2)); ++ ++ return bytes; ++ ++block_release: ++ while(--b >= 0) brelse(bh[b]); ++ ++read_failure: ++ ERROR("sb_bread failed reading block 0x%x\n", cur_index); ++ return 0; ++} ++static int squashfs_get_cached_block(struct super_block *s, char *buffer, ++ unsigned int block, unsigned int offset, int length, ++ unsigned int *next_block, unsigned int *next_offset) ++{ ++ squashfs_sb_info *msBlk = &s->u.squashfs_sb; ++ int n, i, bytes, return_length = length; ++ unsigned int next_index; ++ ++ TRACE("Entered squashfs_get_cached_block [%x:%x]\n", block, offset); ++ ++ for(;;) { ++ for(i = 0; i < SQUASHFS_CACHED_BLKS; i++) ++ if(msBlk->block_cache[i].block == block) ++ break; ++ ++ down(&msBlk->block_cache_mutex); ++ if(i == SQUASHFS_CACHED_BLKS) { ++ /* read inode header block */ ++ for(i = msBlk->next_cache, n = SQUASHFS_CACHED_BLKS; n ; n --, i = (i + 1) % SQUASHFS_CACHED_BLKS) ++ if(msBlk->block_cache[i].block != SQUASHFS_USED_BLK) ++ break; ++ if(n == 0) { ++ up(&msBlk->block_cache_mutex); ++ sleep_on(&msBlk->waitq); ++ continue; ++ } ++ msBlk->next_cache = (i + 1) % SQUASHFS_CACHED_BLKS; ++ ++ if(msBlk->block_cache[i].block == SQUASHFS_INVALID_BLK) { ++ if(!(msBlk->block_cache[i].data = (unsigned char *) ++ kmalloc(SQUASHFS_METADATA_SIZE, GFP_KERNEL))) { ++ ERROR("Failed to allocate cache block\n"); ++ up(&msBlk->block_cache_mutex); ++ return 0; ++ } ++ } ++ ++ msBlk->block_cache[i].block = SQUASHFS_USED_BLK; ++ up(&msBlk->block_cache_mutex); ++ if(!(msBlk->block_cache[i].length = read_data(s, msBlk->block_cache[i].data, block, 0, ++ &next_index))) { ++ ERROR("Unable to read cache block [%x:%x]\n", block, offset); ++ return 0; ++ } ++ down(&msBlk->block_cache_mutex); ++ wake_up(&msBlk->waitq); ++ msBlk->block_cache[i].block = block; ++ msBlk->block_cache[i].next_index = next_index; ++ TRACE("Read cache block [%x:%x]\n", block, offset); ++ } ++ ++ if(msBlk->block_cache[i].block != block) { ++ up(&msBlk->block_cache_mutex); ++ continue; ++ } ++ ++ if((bytes = msBlk->block_cache[i].length - offset) >= length) { ++ if(buffer) ++ memcpy(buffer, msBlk->block_cache[i].data + offset, length); ++ if(msBlk->block_cache[i].length - offset == length) { ++ *next_block = msBlk->block_cache[i].next_index; ++ *next_offset = 0; ++ } else { ++ *next_block = block; ++ *next_offset = offset + length; ++ } ++ ++ up(&msBlk->block_cache_mutex); ++ return return_length; ++ } else { ++ if(buffer) { ++ memcpy(buffer, msBlk->block_cache[i].data + offset, bytes); ++ buffer += bytes; ++ } ++ block = msBlk->block_cache[i].next_index; ++ up(&msBlk->block_cache_mutex); ++ length -= bytes; ++ offset = 0; ++ } ++ } ++} ++ ++ ++static int get_fragment_location(struct super_block *s, unsigned int fragment, unsigned int *fragment_start_block, unsigned int *fragment_size) ++{ ++ squashfs_sb_info *msBlk = &s->u.squashfs_sb; ++ unsigned int start_block = msBlk->fragment_index[SQUASHFS_FRAGMENT_INDEX(fragment)]; ++ int offset = SQUASHFS_FRAGMENT_INDEX_OFFSET(fragment); ++ squashfs_fragment_entry fragment_entry; ++ ++ if(msBlk->swap) { ++ squashfs_fragment_entry sfragment_entry; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sfragment_entry, start_block, offset, ++ sizeof(sfragment_entry), &start_block, &offset)) ++ return 0; ++ SQUASHFS_SWAP_FRAGMENT_ENTRY(&fragment_entry, &sfragment_entry); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &fragment_entry, start_block, offset, ++ sizeof(fragment_entry), &start_block, &offset)) ++ return 0; ++ ++ *fragment_start_block = fragment_entry.start_block; ++ *fragment_size = fragment_entry.size; ++ ++ return 1; ++} ++ ++ ++void release_cached_fragment(squashfs_sb_info *msBlk, struct squashfs_fragment_cache *fragment) ++{ ++ down(&msBlk->fragment_mutex); ++ fragment->locked --; ++ wake_up(&msBlk->fragment_wait_queue); ++ up(&msBlk->fragment_mutex); ++} ++ ++ ++struct squashfs_fragment_cache *get_cached_fragment(struct super_block *s, unsigned int start_block, int length) ++{ ++ int i, n; ++ squashfs_sb_info *msBlk = &s->u.squashfs_sb; ++ ++ for(;;) { ++ down(&msBlk->fragment_mutex); ++ for(i = 0; i < SQUASHFS_CACHED_FRAGMENTS && msBlk->fragment[i].block != start_block; i++); ++ if(i == SQUASHFS_CACHED_FRAGMENTS) { ++ for(i = msBlk->next_fragment, n = SQUASHFS_CACHED_FRAGMENTS; ++ n && msBlk->fragment[i].locked; n--, i = (i + 1) % SQUASHFS_CACHED_FRAGMENTS); ++ ++ if(n == 0) { ++ up(&msBlk->fragment_mutex); ++ sleep_on(&msBlk->fragment_wait_queue); ++ continue; ++ } ++ msBlk->next_fragment = (msBlk->next_fragment + 1) % SQUASHFS_CACHED_FRAGMENTS; ++ ++ if(msBlk->fragment[i].data == NULL) ++ if(!(msBlk->fragment[i].data = (unsigned char *) ++ kmalloc(SQUASHFS_FILE_MAX_SIZE, GFP_KERNEL))) { ++ ERROR("Failed to allocate fragment cache block\n"); ++ up(&msBlk->fragment_mutex); ++ return NULL; ++ } ++ ++ msBlk->fragment[i].block = SQUASHFS_INVALID_BLK; ++ msBlk->fragment[i].locked = 1; ++ up(&msBlk->fragment_mutex); ++ if(!(msBlk->fragment[i].length = read_data(s, msBlk->fragment[i].data, start_block, length, ++ NULL))) { ++ ERROR("Unable to read fragment cache block [%x]\n", start_block); ++ msBlk->fragment[i].locked = 0; ++ return NULL; ++ } ++ msBlk->fragment[i].block = start_block; ++ TRACE("New fragment %d, start block %d, locked %d\n", i, msBlk->fragment[i].block, msBlk->fragment[i].locked); ++ return &msBlk->fragment[i]; ++ } ++ ++ msBlk->fragment[i].locked ++; ++ up(&msBlk->fragment_mutex); ++ ++ TRACE("Got fragment %d, start block %d, locked %d\n", i, msBlk->fragment[i].block, msBlk->fragment[i].locked); ++ return &msBlk->fragment[i]; ++ } ++} ++ ++ ++#ifdef SQUASHFS_1_0_COMPATIBILITY ++static struct inode *squashfs_iget_1(struct super_block *s, squashfs_inode inode) ++{ ++ struct inode *i = new_inode(s); ++ squashfs_sb_info *msBlk = &s->u.squashfs_sb; ++ squashfs_super_block *sBlk = &msBlk->sBlk; ++ unsigned int block = SQUASHFS_INODE_BLK(inode) + sBlk->inode_table_start; ++ unsigned int offset = SQUASHFS_INODE_OFFSET(inode); ++ unsigned int next_block, next_offset; ++ squashfs_base_inode_header_1 inodeb; ++ ++ TRACE("Entered squashfs_iget_1\n"); ++ ++ if(msBlk->swap) { ++ squashfs_base_inode_header_1 sinodeb; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodeb, block, offset, ++ sizeof(sinodeb), &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_BASE_INODE_HEADER_1(&inodeb, &sinodeb, sizeof(sinodeb)); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodeb, block, offset, ++ sizeof(inodeb), &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->i_nlink = 1; ++ ++ i->i_mtime = sBlk->mkfs_time; ++ i->i_atime = sBlk->mkfs_time; ++ i->i_ctime = sBlk->mkfs_time; ++ ++ if(inodeb.inode_type != SQUASHFS_IPC_TYPE) ++ i->i_uid = msBlk->uid[((inodeb.inode_type - 1) / SQUASHFS_TYPES) * 16 + inodeb.uid]; ++ i->i_ino = SQUASHFS_MK_VFS_INODE(block - sBlk->inode_table_start, offset); ++ ++ i->i_mode = inodeb.mode; ++ ++ switch(inodeb.inode_type == SQUASHFS_IPC_TYPE ? SQUASHFS_IPC_TYPE : (inodeb.inode_type - 1) % SQUASHFS_TYPES + 1) { ++ case SQUASHFS_FILE_TYPE: { ++ squashfs_reg_inode_header_1 inodep; ++ ++ if(msBlk->swap) { ++ squashfs_reg_inode_header_1 sinodep; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodep, block, offset, sizeof(sinodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_REG_INODE_HEADER_1(&inodep, &sinodep); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodep, block, offset, sizeof(inodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->i_size = inodep.file_size; ++ i->i_fop = &generic_ro_fops; ++ if(sBlk->block_size > 4096) ++ i->i_data.a_ops = &squashfs_aops; ++ else if(sBlk->block_size == 4096) ++ i->i_data.a_ops = &squashfs_aops_4K; ++ else ++ i->i_data.a_ops = &squashfs_aops_lessthan4K; ++ i->i_mode |= S_IFREG; ++ i->i_mtime = inodep.mtime; ++ i->i_atime = inodep.mtime; ++ i->i_ctime = inodep.mtime; ++ i->i_blocks = ((i->i_size - 1) >> 9) + 1; ++ i->i_blksize = PAGE_CACHE_SIZE; ++ i->u.squashfs_i.u.s1.fragment_start_block = SQUASHFS_INVALID_BLK; ++ i->u.squashfs_i.u.s1.fragment_offset = 0; ++ i->u.squashfs_i.start_block = inodep.start_block; ++ i->u.squashfs_i.block_list_start = next_block; ++ i->u.squashfs_i.offset = next_offset; ++ TRACE("File inode %x:%x, start_block %x, block_list_start %x, offset %x\n", ++ SQUASHFS_INODE_BLK(inode), offset, inodep.start_block, next_block, next_offset); ++ break; ++ } ++ case SQUASHFS_DIR_TYPE: { ++ squashfs_dir_inode_header_1 inodep; ++ ++ if(msBlk->swap) { ++ squashfs_dir_inode_header_1 sinodep; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodep, block, offset, sizeof(sinodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_DIR_INODE_HEADER_1(&inodep, &sinodep); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodep, block, offset, sizeof(inodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->i_size = inodep.file_size; ++ i->i_op = &squashfs_dir_inode_ops; ++ i->i_fop = &squashfs_dir_ops; ++ i->i_mode |= S_IFDIR; ++ i->i_mtime = inodep.mtime; ++ i->i_atime = inodep.mtime; ++ i->i_ctime = inodep.mtime; ++ i->u.squashfs_i.start_block = inodep.start_block; ++ i->u.squashfs_i.offset = inodep.offset; ++ i->u.squashfs_i.u.s2.directory_index_count = 0; ++ TRACE("Directory inode %x:%x, start_block %x, offset %x\n", SQUASHFS_INODE_BLK(inode), offset, ++ inodep.start_block, inodep.offset); ++ break; ++ } ++ case SQUASHFS_SYMLINK_TYPE: { ++ squashfs_symlink_inode_header_1 inodep; ++ ++ if(msBlk->swap) { ++ squashfs_symlink_inode_header_1 sinodep; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodep, block, offset, sizeof(sinodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_SYMLINK_INODE_HEADER_1(&inodep, &sinodep); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodep, block, offset, sizeof(inodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->i_size = inodep.symlink_size; ++ i->i_op = &page_symlink_inode_operations; ++ i->i_data.a_ops = &squashfs_symlink_aops; ++ i->i_mode |= S_IFLNK; ++ i->u.squashfs_i.start_block = next_block; ++ i->u.squashfs_i.offset = next_offset; ++ TRACE("Symbolic link inode %x:%x, start_block %x, offset %x\n", ++ SQUASHFS_INODE_BLK(inode), offset, next_block, next_offset); ++ break; ++ } ++ case SQUASHFS_BLKDEV_TYPE: ++ case SQUASHFS_CHRDEV_TYPE: { ++ squashfs_dev_inode_header_1 inodep; ++ ++ if(msBlk->swap) { ++ squashfs_dev_inode_header_1 sinodep; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodep, block, offset, sizeof(sinodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_DEV_INODE_HEADER_1(&inodep, &sinodep); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodep, block, offset, sizeof(inodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->i_size = 0; ++ i->i_mode |= (inodeb.inode_type == SQUASHFS_CHRDEV_TYPE) ? S_IFCHR : S_IFBLK; ++ init_special_inode(i, i->i_mode, inodep.rdev); ++ TRACE("Device inode %x:%x, rdev %x\n", SQUASHFS_INODE_BLK(inode), offset, inodep.rdev); ++ break; ++ } ++ case SQUASHFS_IPC_TYPE: { ++ squashfs_ipc_inode_header_1 inodep; ++ ++ if(msBlk->swap) { ++ squashfs_ipc_inode_header_1 sinodep; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodep, block, offset, sizeof(sinodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_IPC_INODE_HEADER_1(&inodep, &sinodep); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodep, block, offset, sizeof(inodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->i_size = 0; ++ i->i_mode |= (inodep.type == SQUASHFS_FIFO_TYPE) ? S_IFIFO : S_IFSOCK; ++ i->i_uid = msBlk->uid[inodep.offset * 16 + inodeb.uid]; ++ init_special_inode(i, i->i_mode, 0); ++ break; ++ } ++ default: ++ ERROR("Unknown inode type %d in squashfs_iget!\n", inodeb.inode_type); ++ goto failed_read1; ++ } ++ ++ if(inodeb.guid == 15) ++ i->i_gid = i->i_uid; ++ else ++ i->i_gid = msBlk->guid[inodeb.guid]; ++ ++ insert_inode_hash(i); ++ return i; ++ ++failed_read: ++ ERROR("Unable to read inode [%x:%x]\n", block, offset); ++ ++failed_read1: ++ return NULL; ++} ++#endif ++ ++ ++static struct inode *squashfs_iget(struct super_block *s, squashfs_inode inode) ++{ ++ struct inode *i = new_inode(s); ++ squashfs_sb_info *msBlk = &s->u.squashfs_sb; ++ squashfs_super_block *sBlk = &msBlk->sBlk; ++ unsigned int block = SQUASHFS_INODE_BLK(inode) + sBlk->inode_table_start; ++ unsigned int offset = SQUASHFS_INODE_OFFSET(inode); ++ unsigned int next_block, next_offset; ++ squashfs_base_inode_header inodeb; ++ ++ TRACE("Entered squashfs_iget\n"); ++ ++ if(msBlk->swap) { ++ squashfs_base_inode_header sinodeb; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodeb, block, offset, ++ sizeof(sinodeb), &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_BASE_INODE_HEADER(&inodeb, &sinodeb, sizeof(sinodeb)); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodeb, block, offset, ++ sizeof(inodeb), &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->i_nlink = 1; ++ ++ i->i_mtime = sBlk->mkfs_time; ++ i->i_atime = sBlk->mkfs_time; ++ i->i_ctime = sBlk->mkfs_time; ++ ++ i->i_uid = msBlk->uid[inodeb.uid]; ++ i->i_ino = SQUASHFS_MK_VFS_INODE(block - sBlk->inode_table_start, offset); ++ ++ i->i_mode = inodeb.mode; ++ ++ switch(inodeb.inode_type) { ++ case SQUASHFS_FILE_TYPE: { ++ squashfs_reg_inode_header inodep; ++ ++ if(msBlk->swap) { ++ squashfs_reg_inode_header sinodep; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodep, block, offset, sizeof(sinodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_REG_INODE_HEADER(&inodep, &sinodep); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodep, block, offset, sizeof(inodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->u.squashfs_i.u.s1.fragment_start_block = SQUASHFS_INVALID_BLK; ++ if(inodep.fragment != SQUASHFS_INVALID_BLK && !get_fragment_location(s, inodep.fragment, ++ &i->u.squashfs_i.u.s1.fragment_start_block, &i->u.squashfs_i.u.s1.fragment_size)) ++ goto failed_read; ++ ++ i->u.squashfs_i.u.s1.fragment_offset = inodep.offset; ++ i->i_size = inodep.file_size; ++ i->i_fop = &generic_ro_fops; ++ if(sBlk->block_size > 4096) ++ i->i_data.a_ops = &squashfs_aops; ++ else ++ i->i_data.a_ops = &squashfs_aops_4K; ++ i->i_mode |= S_IFREG; ++ i->i_mtime = inodep.mtime; ++ i->i_atime = inodep.mtime; ++ i->i_ctime = inodep.mtime; ++ i->i_blocks = ((i->i_size - 1) >> 9) + 1; ++ i->i_blksize = PAGE_CACHE_SIZE; ++ i->u.squashfs_i.start_block = inodep.start_block; ++ i->u.squashfs_i.block_list_start = next_block; ++ i->u.squashfs_i.offset = next_offset; ++ TRACE("File inode %x:%x, start_block %x, block_list_start %x, offset %x fragment_index %x fragment_offset %x\n", ++ SQUASHFS_INODE_BLK(inode), offset, inodep.start_block, next_block, next_offset, inodep.fragment, inodep.offset); ++ break; ++ } ++ case SQUASHFS_DIR_TYPE: { ++ squashfs_dir_inode_header inodep; ++ ++ if(msBlk->swap) { ++ squashfs_dir_inode_header sinodep; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodep, block, offset, sizeof(sinodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_DIR_INODE_HEADER(&inodep, &sinodep); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodep, block, offset, sizeof(inodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->i_size = inodep.file_size; ++ i->i_op = &squashfs_dir_inode_ops; ++ i->i_fop = &squashfs_dir_ops; ++ i->i_mode |= S_IFDIR; ++ i->i_mtime = inodep.mtime; ++ i->i_atime = inodep.mtime; ++ i->i_ctime = inodep.mtime; ++ i->u.squashfs_i.start_block = inodep.start_block; ++ i->u.squashfs_i.offset = inodep.offset; ++ i->u.squashfs_i.u.s2.directory_index_count = 0; ++ TRACE("Directory inode %x:%x, start_block %x, offset %x\n", SQUASHFS_INODE_BLK(inode), offset, ++ inodep.start_block, inodep.offset); ++ break; ++ } ++ case SQUASHFS_LDIR_TYPE: { ++ squashfs_ldir_inode_header inodep; ++ ++ if(msBlk->swap) { ++ squashfs_ldir_inode_header sinodep; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodep, block, offset, sizeof(sinodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_LDIR_INODE_HEADER(&inodep, &sinodep); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodep, block, offset, sizeof(inodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->i_size = inodep.file_size; ++ i->i_op = &squashfs_dir_inode_ops; ++ i->i_fop = &squashfs_dir_ops; ++ i->i_mode |= S_IFDIR; ++ i->i_mtime = inodep.mtime; ++ i->i_atime = inodep.mtime; ++ i->i_ctime = inodep.mtime; ++ i->u.squashfs_i.start_block = inodep.start_block; ++ i->u.squashfs_i.offset = inodep.offset; ++ i->u.squashfs_i.u.s2.directory_index_start = next_block; ++ i->u.squashfs_i.u.s2.directory_index_offset = next_offset; ++ i->u.squashfs_i.u.s2.directory_index_count = inodep.i_count; ++ TRACE("Long directory inode %x:%x, start_block %x, offset %x\n", SQUASHFS_INODE_BLK(inode), offset, ++ inodep.start_block, inodep.offset); ++ break; ++ } ++ case SQUASHFS_SYMLINK_TYPE: { ++ squashfs_symlink_inode_header inodep; ++ ++ if(msBlk->swap) { ++ squashfs_symlink_inode_header sinodep; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodep, block, offset, sizeof(sinodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_SYMLINK_INODE_HEADER(&inodep, &sinodep); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodep, block, offset, sizeof(inodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->i_size = inodep.symlink_size; ++ i->i_op = &page_symlink_inode_operations; ++ i->i_data.a_ops = &squashfs_symlink_aops; ++ i->i_mode |= S_IFLNK; ++ i->u.squashfs_i.start_block = next_block; ++ i->u.squashfs_i.offset = next_offset; ++ TRACE("Symbolic link inode %x:%x, start_block %x, offset %x\n", ++ SQUASHFS_INODE_BLK(inode), offset, next_block, next_offset); ++ break; ++ } ++ case SQUASHFS_BLKDEV_TYPE: ++ case SQUASHFS_CHRDEV_TYPE: { ++ squashfs_dev_inode_header inodep; ++ ++ if(msBlk->swap) { ++ squashfs_dev_inode_header sinodep; ++ ++ if(!squashfs_get_cached_block(s, (char *) &sinodep, block, offset, sizeof(sinodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ SQUASHFS_SWAP_DEV_INODE_HEADER(&inodep, &sinodep); ++ } else ++ if(!squashfs_get_cached_block(s, (char *) &inodep, block, offset, sizeof(inodep), ++ &next_block, &next_offset)) ++ goto failed_read; ++ ++ i->i_size = 0; ++ i->i_mode |= (inodeb.inode_type == SQUASHFS_CHRDEV_TYPE) ? S_IFCHR : S_IFBLK; ++ init_special_inode(i, i->i_mode, inodep.rdev); ++ TRACE("Device inode %x:%x, rdev %x\n", SQUASHFS_INODE_BLK(inode), offset, inodep.rdev); ++ break; ++ } ++ case SQUASHFS_FIFO_TYPE: ++ case SQUASHFS_SOCKET_TYPE: { ++ i->i_size = 0; ++ i->i_mode |= (inodeb.inode_type == SQUASHFS_FIFO_TYPE) ? S_IFIFO : S_IFSOCK; ++ init_special_inode(i, i->i_mode, 0); ++ break; ++ } ++ default: ++ ERROR("Unknown inode type %d in squashfs_iget!\n", inodeb.inode_type); ++ goto failed_read1; ++ } ++ ++ if(inodeb.guid == SQUASHFS_GUIDS) ++ i->i_gid = i->i_uid; ++ else ++ i->i_gid = msBlk->guid[inodeb.guid]; ++ ++ insert_inode_hash(i); ++ return i; ++ ++failed_read: ++ ERROR("Unable to read inode [%x:%x]\n", block, offset); ++ ++failed_read1: ++ return NULL; ++} ++ ++ ++static struct super_block *squashfs_read_super(struct super_block *s, ++ void *data, int silent) ++{ ++ kdev_t dev = s->s_dev; ++ squashfs_sb_info *msBlk = &s->u.squashfs_sb; ++ squashfs_super_block *sBlk = &msBlk->sBlk; ++ int i; ++ ++ TRACE("Entered squashfs_read_superblock\n"); ++ ++ msBlk->devblksize = get_hardsect_size(dev); ++ if(msBlk->devblksize < BLOCK_SIZE) ++ msBlk->devblksize = BLOCK_SIZE; ++ msBlk->devblksize_log2 = ffz(~msBlk->devblksize); ++ set_blocksize(dev, msBlk->devblksize); ++ s->s_blocksize = msBlk->devblksize; ++ s->s_blocksize_bits = msBlk->devblksize_log2; ++ ++ init_MUTEX(&msBlk->read_page_mutex); ++ init_MUTEX(&msBlk->block_cache_mutex); ++ init_MUTEX(&msBlk->fragment_mutex); ++ ++ init_waitqueue_head(&msBlk->waitq); ++ init_waitqueue_head(&msBlk->fragment_wait_queue); ++ ++ if(!read_data(s, (char *) sBlk, SQUASHFS_START, sizeof(squashfs_super_block) | SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) { ++ SERROR("unable to read superblock\n"); ++ goto failed_mount; ++ } ++ ++ /* Check it is a SQUASHFS superblock */ ++ msBlk->swap = 0; ++ if((s->s_magic = sBlk->s_magic) != SQUASHFS_MAGIC) { ++ if(sBlk->s_magic == SQUASHFS_MAGIC_SWAP) { ++ squashfs_super_block sblk; ++ WARNING("Mounting a different endian SQUASHFS filesystem on %s\n", bdevname(dev)); ++ SQUASHFS_SWAP_SUPER_BLOCK(&sblk, sBlk); ++ memcpy(sBlk, &sblk, sizeof(squashfs_super_block)); ++ msBlk->swap = 1; ++ } else { ++ SERROR("Can't find a SQUASHFS superblock on %s\n", bdevname(dev)); ++ goto failed_mount; ++ } ++ } ++ ++ /* Check the MAJOR & MINOR versions */ ++#ifdef SQUASHFS_1_0_COMPATIBILITY ++ if((sBlk->s_major != 1) && (sBlk->s_major != 2 || sBlk->s_minor > SQUASHFS_MINOR)) { ++ SERROR("Major/Minor mismatch, filesystem is (%d:%d), I support (1 : x) or (2 : <= %d)\n", ++ sBlk->s_major, sBlk->s_minor, SQUASHFS_MINOR); ++ goto failed_mount; ++ } ++ if(sBlk->s_major == 1) ++ sBlk->block_size = sBlk->block_size_1; ++#else ++ if(sBlk->s_major != SQUASHFS_MAJOR || sBlk->s_minor > SQUASHFS_MINOR) { ++ SERROR("Major/Minor mismatch, filesystem is (%d:%d), I support (%d: <= %d)\n", ++ sBlk->s_major, sBlk->s_minor, SQUASHFS_MAJOR, SQUASHFS_MINOR); ++ goto failed_mount; ++ } ++#endif ++ ++ TRACE("Found valid superblock on %s\n", bdevname(dev)); ++ TRACE("Inodes are %scompressed\n", SQUASHFS_UNCOMPRESSED_INODES(sBlk->flags) ? "un" : ""); ++ TRACE("Data is %scompressed\n", SQUASHFS_UNCOMPRESSED_DATA(sBlk->flags) ? "un" : ""); ++ TRACE("Check data is %s present in the filesystem\n", SQUASHFS_CHECK_DATA(sBlk->flags) ? "" : "not"); ++ TRACE("Filesystem size %d bytes\n", sBlk->bytes_used); ++ TRACE("Block size %d\n", sBlk->block_size); ++ TRACE("Number of inodes %d\n", sBlk->inodes); ++ if(sBlk->s_major > 1) ++ TRACE("Number of fragments %d\n", sBlk->fragments); ++ TRACE("Number of uids %d\n", sBlk->no_uids); ++ TRACE("Number of gids %d\n", sBlk->no_guids); ++ TRACE("sBlk->inode_table_start %x\n", sBlk->inode_table_start); ++ TRACE("sBlk->directory_table_start %x\n", sBlk->directory_table_start); ++ if(sBlk->s_major > 1) ++ TRACE("sBlk->fragment_table_start %x\n", sBlk->fragment_table_start); ++ TRACE("sBlk->uid_start %x\n", sBlk->uid_start); ++ ++ s->s_flags |= MS_RDONLY; ++ s->s_op = &squashfs_ops; ++ ++ /* Init inode_table block pointer array */ ++ if(!(msBlk->block_cache = (squashfs_cache *) kmalloc(sizeof(squashfs_cache) * SQUASHFS_CACHED_BLKS, GFP_KERNEL))) { ++ ERROR("Failed to allocate block cache\n"); ++ goto failed_mount; ++ } ++ ++ for(i = 0; i < SQUASHFS_CACHED_BLKS; i++) ++ msBlk->block_cache[i].block = SQUASHFS_INVALID_BLK; ++ ++ msBlk->next_cache = 0; ++ ++ /* Allocate read_data block */ ++ msBlk->read_size = (sBlk->block_size < SQUASHFS_METADATA_SIZE) ? SQUASHFS_METADATA_SIZE : sBlk->block_size; ++ if(!(msBlk->read_data = (char *) kmalloc(msBlk->read_size, GFP_KERNEL))) { ++ ERROR("Failed to allocate read_data block\n"); ++ goto failed_mount1; ++ } ++ ++ /* Allocate read_page block */ ++ if(sBlk->block_size > PAGE_CACHE_SIZE) { ++ if(!(msBlk->read_page = (char *) kmalloc(sBlk->block_size, GFP_KERNEL))) { ++ ERROR("Failed to allocate read_page block\n"); ++ goto failed_mount2; ++ } ++ } else ++ msBlk->read_page = NULL; ++ ++ /* Allocate uid and gid tables */ ++ if(!(msBlk->uid = (squashfs_uid *) kmalloc((sBlk->no_uids + ++ sBlk->no_guids) * sizeof(squashfs_uid), GFP_KERNEL))) { ++ ERROR("Failed to allocate uid/gid table\n"); ++ goto failed_mount3; ++ } ++ msBlk->guid = msBlk->uid + sBlk->no_uids; ++ ++ if(msBlk->swap) { ++ squashfs_uid suid[sBlk->no_uids + sBlk->no_guids]; ++ ++ if(!read_data(s, (char *) &suid, sBlk->uid_start, ((sBlk->no_uids + sBlk->no_guids) * ++ sizeof(squashfs_uid)) | SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) { ++ SERROR("unable to read uid/gid table\n"); ++ goto failed_mount4; ++ } ++ SQUASHFS_SWAP_DATA(msBlk->uid, suid, (sBlk->no_uids + sBlk->no_guids), (sizeof(squashfs_uid) * 8)); ++ } else ++ if(!read_data(s, (char *) msBlk->uid, sBlk->uid_start, ((sBlk->no_uids + sBlk->no_guids) * ++ sizeof(squashfs_uid)) | SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) { ++ SERROR("unable to read uid/gid table\n"); ++ goto failed_mount4; ++ } ++ ++ ++#ifdef SQUASHFS_1_0_COMPATIBILITY ++ if(sBlk->s_major == 1) { ++ msBlk->iget = squashfs_iget_1; ++ msBlk->read_blocklist = read_blocklist_1; ++ msBlk->fragment = NULL; ++ msBlk->fragment_index = NULL; ++ goto allocate_root; ++ } ++#endif ++ msBlk->iget = squashfs_iget; ++ msBlk->read_blocklist = read_blocklist; ++ ++ if(!(msBlk->fragment = (struct squashfs_fragment_cache *) kmalloc(sizeof(struct squashfs_fragment_cache) * SQUASHFS_CACHED_FRAGMENTS, GFP_KERNEL))) { ++ ERROR("Failed to allocate fragment block cache\n"); ++ goto failed_mount4; ++ } ++ ++ for(i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) { ++ msBlk->fragment[i].locked = 0; ++ msBlk->fragment[i].block = SQUASHFS_INVALID_BLK; ++ msBlk->fragment[i].data = NULL; ++ } ++ ++ msBlk->next_fragment = 0; ++ ++ /* Allocate fragment index table */ ++ if(!(msBlk->fragment_index = (squashfs_fragment_index *) kmalloc(SQUASHFS_FRAGMENT_INDEX_BYTES(sBlk->fragments), GFP_KERNEL))) { ++ ERROR("Failed to allocate uid/gid table\n"); ++ goto failed_mount5; ++ } ++ ++ if(SQUASHFS_FRAGMENT_INDEX_BYTES(sBlk->fragments) && ++ !read_data(s, (char *) msBlk->fragment_index, sBlk->fragment_table_start, ++ SQUASHFS_FRAGMENT_INDEX_BYTES(sBlk->fragments) | SQUASHFS_COMPRESSED_BIT_BLOCK, NULL)) { ++ SERROR("unable to read fragment index table\n"); ++ goto failed_mount6; ++ } ++ ++ if(msBlk->swap) { ++ int i; ++ squashfs_fragment_index fragment; ++ ++ for(i = 0; i < SQUASHFS_FRAGMENT_INDEXES(sBlk->fragments); i++) { ++ SQUASHFS_SWAP_FRAGMENT_INDEXES((&fragment), &msBlk->fragment_index[i], 1); ++ msBlk->fragment_index[i] = fragment; ++ } ++ } ++ ++#ifdef SQUASHFS_1_0_COMPATIBILITY ++allocate_root: ++#endif ++ if(!(s->s_root = d_alloc_root((msBlk->iget)(s, sBlk->root_inode)))) { ++ ERROR("Root inode create failed\n"); ++ goto failed_mount5; ++ } ++ ++ TRACE("Leaving squashfs_read_super\n"); ++ return s; ++ ++failed_mount6: ++ kfree(msBlk->fragment_index); ++failed_mount5: ++ kfree(msBlk->fragment); ++failed_mount4: ++ kfree(msBlk->uid); ++failed_mount3: ++ kfree(msBlk->read_page); ++failed_mount2: ++ kfree(msBlk->read_data); ++failed_mount1: ++ kfree(msBlk->block_cache); ++failed_mount: ++ return NULL; ++} ++ ++ ++static int squashfs_statfs(struct super_block *s, struct statfs *buf) ++{ ++ squashfs_super_block *sBlk = &s->u.squashfs_sb.sBlk; ++ ++ TRACE("Entered squashfs_statfs\n"); ++ buf->f_type = SQUASHFS_MAGIC; ++ buf->f_bsize = sBlk->block_size; ++ buf->f_blocks = ((sBlk->bytes_used - 1) >> sBlk->block_log) + 1; ++ buf->f_bfree = buf->f_bavail = 0; ++ buf->f_files = sBlk->inodes; ++ buf->f_ffree = 0; ++ buf->f_namelen = SQUASHFS_NAME_LEN; ++ return 0; ++} ++ ++ ++static int squashfs_symlink_readpage(struct file *file, struct page *page) ++{ ++ struct inode *inode = page->mapping->host; ++ int index = page->index << PAGE_CACHE_SHIFT, length, bytes; ++ unsigned int block = inode->u.squashfs_i.start_block; ++ int offset = inode->u.squashfs_i.offset; ++ void *pageaddr = kmap(page); ++ ++ TRACE("Entered squashfs_symlink_readpage, page index %x, start block %x, offset %x\n", ++ (unsigned int) page->index, inode->u.squashfs_i.start_block, inode->u.squashfs_i.offset); ++ ++ for(length = 0; length < index; length += bytes) { ++ if(!(bytes = squashfs_get_cached_block(inode->i_sb, NULL, block, offset, ++ PAGE_CACHE_SIZE, &block, &offset))) { ++ ERROR("Unable to read symbolic link [%x:%x]\n", block, offset); ++ goto skip_read; ++ } ++ } ++ ++ if(length != index) { ++ ERROR("(squashfs_symlink_readpage) length != index\n"); ++ bytes = 0; ++ goto skip_read; ++ } ++ ++ bytes = (inode->i_size - length) > PAGE_CACHE_SIZE ? PAGE_CACHE_SIZE : inode->i_size - length; ++ if(!(bytes = squashfs_get_cached_block(inode->i_sb, pageaddr, block, offset, bytes, &block, &offset))) ++ ERROR("Unable to read symbolic link [%x:%x]\n", block, offset); ++ ++skip_read: ++ memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes); ++ kunmap(page); ++ flush_dcache_page(page); ++ SetPageUptodate(page); ++ UnlockPage(page); ++ ++ return 0; ++} ++ ++ ++#define SIZE 256 ++ ++#ifdef SQUASHFS_1_0_COMPATIBILITY ++static unsigned int read_blocklist_1(struct inode *inode, int index, int readahead_blks, ++ char *block_list, unsigned short **block_p, unsigned int *bsize) ++{ ++ squashfs_sb_info *msBlk = &inode->i_sb->u.squashfs_sb; ++ unsigned short *block_listp; ++ int i = 0; ++ int block_ptr = inode->u.squashfs_i.block_list_start; ++ int offset = inode->u.squashfs_i.offset; ++ unsigned int block = inode->u.squashfs_i.start_block; ++ ++ for(;;) { ++ int blocks = (index + readahead_blks - i); ++ if(blocks > (SIZE >> 1)) { ++ if((index - i) <= (SIZE >> 1)) ++ blocks = index - i; ++ else ++ blocks = SIZE >> 1; ++ } ++ ++ if(msBlk->swap) { ++ unsigned char sblock_list[SIZE]; ++ if(!squashfs_get_cached_block(inode->i_sb, (char *) sblock_list, block_ptr, offset, blocks << 1, &block_ptr, &offset)) { ++ ERROR("Unable to read block list [%d:%x]\n", block_ptr, offset); ++ return 0; ++ } ++ SQUASHFS_SWAP_SHORTS(((unsigned short *)block_list), ((unsigned short *)sblock_list), blocks); ++ } else ++ if(!squashfs_get_cached_block(inode->i_sb, (char *) block_list, block_ptr, offset, blocks << 1, &block_ptr, &offset)) { ++ ERROR("Unable to read block list [%d:%x]\n", block_ptr, offset); ++ return 0; ++ } ++ for(block_listp = (unsigned short *) block_list; i < index && blocks; i ++, block_listp ++, blocks --) ++ block += SQUASHFS_COMPRESSED_SIZE(*block_listp); ++ if(blocks >= readahead_blks) ++ break; ++ } ++ ++ if(bsize) ++ *bsize = SQUASHFS_COMPRESSED_SIZE(*block_listp) | (!SQUASHFS_COMPRESSED(*block_listp) ? SQUASHFS_COMPRESSED_BIT_BLOCK : 0); ++ else ++ *block_p = block_listp; ++ return block; ++} ++#endif ++ ++ ++ ++static unsigned int read_blocklist(struct inode *inode, int index, int readahead_blks, ++ char *block_list, unsigned short **block_p, unsigned int *bsize) ++{ ++ squashfs_sb_info *msBlk = &inode->i_sb->u.squashfs_sb; ++ unsigned int *block_listp; ++ int i = 0; ++ int block_ptr = inode->u.squashfs_i.block_list_start; ++ int offset = inode->u.squashfs_i.offset; ++ unsigned int block = inode->u.squashfs_i.start_block; ++ ++ for(;;) { ++ int blocks = (index + readahead_blks - i); ++ if(blocks > (SIZE >> 2)) { ++ if((index - i) <= (SIZE >> 2)) ++ blocks = index - i; ++ else ++ blocks = SIZE >> 2; ++ } ++ ++ if(msBlk->swap) { ++ unsigned char sblock_list[SIZE]; ++ if(!squashfs_get_cached_block(inode->i_sb, (char *) sblock_list, block_ptr, offset, blocks << 2, &block_ptr, &offset)) { ++ ERROR("Unable to read block list [%d:%x]\n", block_ptr, offset); ++ return 0; ++ } ++ SQUASHFS_SWAP_INTS(((unsigned int *)block_list), ((unsigned int *)sblock_list), blocks); ++ } else ++ if(!squashfs_get_cached_block(inode->i_sb, (char *) block_list, block_ptr, offset, blocks << 2, &block_ptr, &offset)) { ++ ERROR("Unable to read block list [%d:%x]\n", block_ptr, offset); ++ return 0; ++ } ++ for(block_listp = (unsigned int *) block_list; i < index && blocks; i ++, block_listp ++, blocks --) ++ block += SQUASHFS_COMPRESSED_SIZE_BLOCK(*block_listp); ++ if(blocks >= readahead_blks) ++ break; ++ } ++ ++ *bsize = *block_listp; ++ return block; ++} ++ ++ ++static int squashfs_readpage(struct file *file, struct page *page) ++{ ++ struct inode *inode = page->mapping->host; ++ squashfs_sb_info *msBlk = &inode->i_sb->u.squashfs_sb; ++ squashfs_super_block *sBlk = &msBlk->sBlk; ++ unsigned char block_list[SIZE]; ++ unsigned int bsize, block, i = 0, bytes = 0, byte_offset = 0; ++ int index = page->index >> (sBlk->block_log - PAGE_CACHE_SHIFT); ++ void *pageaddr = kmap(page); ++ struct squashfs_fragment_cache *fragment = NULL; ++ char *data_ptr = msBlk->read_page; ++ ++ int mask = (1 << (sBlk->block_log - PAGE_CACHE_SHIFT)) - 1; ++ int start_index = page->index & ~mask; ++ int end_index = start_index | mask; ++ ++ TRACE("Entered squashfs_readpage, page index %x, start block %x\n", (unsigned int) page->index, ++ inode->u.squashfs_i.start_block); ++ ++ if(page->index >= ((inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT)) { ++ goto skip_read; ++ } ++ ++ if(inode->u.squashfs_i.u.s1.fragment_start_block == SQUASHFS_INVALID_BLK || index < (inode->i_size >> sBlk->block_log)) { ++ if((block = (msBlk->read_blocklist)(inode, index, 1, block_list, NULL, &bsize)) == 0) ++ goto skip_read; ++ ++ down(&msBlk->read_page_mutex); ++ if(!(bytes = read_data(inode->i_sb, msBlk->read_page, block, bsize, NULL))) { ++ ERROR("Unable to read page, block %x, size %x\n", block, bsize); ++ up(&msBlk->read_page_mutex); ++ goto skip_read; ++ } ++ } else { ++ if((fragment = get_cached_fragment(inode->i_sb, inode->u.squashfs_i.u.s1.fragment_start_block, inode->u.squashfs_i.u.s1.fragment_size)) == NULL) { ++ ERROR("Unable to read page, block %x, size %x\n", inode->u.squashfs_i.u.s1.fragment_start_block, (int) inode->u.squashfs_i.u.s1.fragment_size); ++ goto skip_read; ++ } ++ bytes = inode->u.squashfs_i.u.s1.fragment_offset + (inode->i_size & (sBlk->block_size - 1)); ++ byte_offset = inode->u.squashfs_i.u.s1.fragment_offset; ++ data_ptr = fragment->data; ++ } ++ ++ for(i = start_index; i <= end_index && byte_offset < bytes; i++, byte_offset += PAGE_CACHE_SIZE) { ++ struct page *push_page; ++ int available_bytes = (bytes - byte_offset) > PAGE_CACHE_SIZE ? PAGE_CACHE_SIZE : bytes - byte_offset; ++ ++ TRACE("bytes %d, i %d, byte_offset %d, available_bytes %d\n", bytes, i, byte_offset, available_bytes); ++ ++ if(i == page->index) { ++ memcpy(pageaddr, data_ptr + byte_offset, available_bytes); ++ memset(pageaddr + available_bytes, 0, PAGE_CACHE_SIZE - available_bytes); ++ kunmap(page); ++ flush_dcache_page(page); ++ SetPageUptodate(page); ++ UnlockPage(page); ++ } else if((push_page = grab_cache_page_nowait(page->mapping, i))) { ++ void *pageaddr = kmap(push_page); ++ memcpy(pageaddr, data_ptr + byte_offset, available_bytes); ++ memset(pageaddr + available_bytes, 0, PAGE_CACHE_SIZE - available_bytes); ++ kunmap(push_page); ++ flush_dcache_page(push_page); ++ SetPageUptodate(push_page); ++ UnlockPage(push_page); ++ page_cache_release(push_page); ++ } ++ } ++ ++ if(inode->u.squashfs_i.u.s1.fragment_start_block == SQUASHFS_INVALID_BLK || index < (inode->i_size >> sBlk->block_log)) ++ up(&msBlk->read_page_mutex); ++ else ++ release_cached_fragment(msBlk, fragment); ++ ++ return 0; ++ ++skip_read: ++ memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes); ++ kunmap(page); ++ flush_dcache_page(page); ++ SetPageUptodate(page); ++ UnlockPage(page); ++ ++ return 0; ++} ++ ++ ++static int squashfs_readpage4K(struct file *file, struct page *page) ++{ ++ struct inode *inode = page->mapping->host; ++ squashfs_sb_info *msBlk = &inode->i_sb->u.squashfs_sb; ++ squashfs_super_block *sBlk = &msBlk->sBlk; ++ unsigned char block_list[SIZE]; ++ unsigned int bsize, block, bytes = 0; ++ void *pageaddr = kmap(page); ++ ++ TRACE("Entered squashfs_readpage4K, page index %x, start block %x\n", (unsigned int) page->index, ++ inode->u.squashfs_i.start_block); ++ ++ if(page->index >= ((inode->i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT)) { ++ goto skip_read; ++ } ++ ++ if(inode->u.squashfs_i.u.s1.fragment_start_block == SQUASHFS_INVALID_BLK || page->index < (inode->i_size >> sBlk->block_log)) { ++ block = (msBlk->read_blocklist)(inode, page->index, 1, block_list, NULL, &bsize); ++ ++ if(!(bytes = read_data(inode->i_sb, pageaddr, block, bsize, NULL))) ++ ERROR("Unable to read page, block %x, size %x\n", block, bsize); ++ } else { ++ struct squashfs_fragment_cache *fragment; ++ ++ if((fragment = get_cached_fragment(inode->i_sb, inode->u.squashfs_i.u.s1.fragment_start_block, inode->u.squashfs_i.u.s1.fragment_size)) == NULL) ++ ERROR("Unable to read page, block %x, size %x\n", inode->u.squashfs_i.u.s1.fragment_start_block, (int) inode->u.squashfs_i.u.s1.fragment_size); ++ else { ++ bytes = inode->i_size & (sBlk->block_size - 1); ++ memcpy(pageaddr, fragment->data + inode->u.squashfs_i.u.s1.fragment_offset, bytes); ++ release_cached_fragment(msBlk, fragment); ++ } ++ } ++ ++skip_read: ++ memset(pageaddr + bytes, 0, PAGE_CACHE_SIZE - bytes); ++ kunmap(page); ++ flush_dcache_page(page); ++ SetPageUptodate(page); ++ UnlockPage(page); ++ ++ return 0; ++} ++ ++ ++#ifdef SQUASHFS_1_0_COMPATIBILITY ++static int squashfs_readpage_lessthan4K(struct file *file, struct page *page) ++{ ++ struct inode *inode = page->mapping->host; ++ squashfs_sb_info *msBlk = &inode->i_sb->u.squashfs_sb; ++ squashfs_super_block *sBlk = &msBlk->sBlk; ++ unsigned char block_list[SIZE]; ++ unsigned short *block_listp, block, bytes = 0; ++ int index = page->index << (PAGE_CACHE_SHIFT - sBlk->block_log); ++ int file_blocks = ((inode->i_size - 1) >> sBlk->block_log) + 1; ++ int readahead_blks = 1 << (PAGE_CACHE_SHIFT - sBlk->block_log); ++ void *pageaddr = kmap(page); ++ ++ int i_end = index + (1 << (PAGE_CACHE_SHIFT - sBlk->block_log)); ++ int byte; ++ ++ TRACE("Entered squashfs_readpage_lessthan4K, page index %x, start block %x\n", (unsigned int) page->index, ++ inode->u.squashfs_i.start_block); ++ ++ block = read_blocklist_1(inode, index, readahead_blks, block_list, &block_listp, NULL); ++ ++ if(i_end > file_blocks) ++ i_end = file_blocks; ++ ++ while(index < i_end) { ++ int c_byte = !SQUASHFS_COMPRESSED(*block_listp) ? SQUASHFS_COMPRESSED_SIZE(*block_listp) | SQUASHFS_COMPRESSED_BIT_BLOCK : *block_listp; ++ if(!(byte = read_data(inode->i_sb, pageaddr, block, c_byte, NULL))) { ++ ERROR("Unable to read page, block %x, size %x\n", block, *block_listp); ++ goto skip_read; ++ } ++ block += SQUASHFS_COMPRESSED_SIZE(*block_listp); ++ pageaddr += byte; ++ bytes += byte; ++ index ++; ++ block_listp ++; ++ } ++ ++skip_read: ++ memset(pageaddr, 0, PAGE_CACHE_SIZE - bytes); ++ kunmap(page); ++ flush_dcache_page(page); ++ SetPageUptodate(page); ++ UnlockPage(page); ++ ++ return 0; ++} ++#endif ++ ++ ++static int get_dir_index_using_offset(struct super_block *s, unsigned int *next_block, ++ unsigned int *next_offset, unsigned int index_start, unsigned int index_offset, ++ int i_count, long long f_pos) ++{ ++ squashfs_sb_info *msBlk = &s->u.squashfs_sb; ++ squashfs_super_block *sBlk = &msBlk->sBlk; ++ int i, length = 0; ++ squashfs_dir_index index; ++ ++ TRACE("Entered get_dir_index_using_offset, i_count %d, f_pos %d\n", i_count, (unsigned int) f_pos); ++ ++ if(f_pos == 0) ++ return 0; ++ ++ for(i = 0; i < i_count; i++) { ++ if(msBlk->swap) { ++ squashfs_dir_index sindex; ++ squashfs_get_cached_block(s, (char *) &sindex, index_start, index_offset, ++ sizeof(sindex), &index_start, &index_offset); ++ SQUASHFS_SWAP_DIR_INDEX(&index, &sindex); ++ } else ++ squashfs_get_cached_block(s, (char *) &index, index_start, index_offset, ++ sizeof(index), &index_start, &index_offset); ++ ++ if(index.index > f_pos) ++ break; ++ ++ squashfs_get_cached_block(s, NULL, index_start, index_offset, ++ index.size + 1, &index_start, &index_offset); ++ ++ length = index.index; ++ *next_block = index.start_block + sBlk->directory_table_start; ++ } ++ ++ *next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE; ++ return length; ++} ++ ++ ++static int get_dir_index_using_name(struct super_block *s, unsigned int *next_block, ++ unsigned int *next_offset, unsigned int index_start, unsigned int index_offset, ++ int i_count, const char *name, int size) ++{ ++ squashfs_sb_info *msBlk = &s->u.squashfs_sb; ++ squashfs_super_block *sBlk = &msBlk->sBlk; ++ int i, length = 0; ++ char buffer[sizeof(squashfs_dir_index) + SQUASHFS_NAME_LEN + 1]; ++ squashfs_dir_index *index = (squashfs_dir_index *) buffer; ++ char str[SQUASHFS_NAME_LEN + 1]; ++ ++ TRACE("Entered get_dir_index_using_name, i_count %d\n", i_count); ++ ++ strncpy(str, name, size); ++ str[size] = '\0'; ++ ++ for(i = 0; i < i_count; i++) { ++ if(msBlk->swap) { ++ squashfs_dir_index sindex; ++ squashfs_get_cached_block(s, (char *) &sindex, index_start, index_offset, ++ sizeof(sindex), &index_start, &index_offset); ++ SQUASHFS_SWAP_DIR_INDEX(index, &sindex); ++ } else ++ squashfs_get_cached_block(s, (char *) index, index_start, index_offset, ++ sizeof(squashfs_dir_index), &index_start, &index_offset); ++ ++ squashfs_get_cached_block(s, index->name, index_start, index_offset, ++ index->size + 1, &index_start, &index_offset); ++ ++ index->name[index->size + 1] = '\0'; ++ ++ if(strcmp(index->name, str) > 0) ++ break; ++ ++ length = index->index; ++ *next_block = index->start_block + sBlk->directory_table_start; ++ } ++ ++ *next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE; ++ return length; ++} ++ ++ ++static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir) ++{ ++ struct inode *i = file->f_dentry->d_inode; ++ squashfs_sb_info *msBlk = &i->i_sb->u.squashfs_sb; ++ squashfs_super_block *sBlk = &msBlk->sBlk; ++ int next_block = i->u.squashfs_i.start_block + sBlk->directory_table_start, next_offset = ++ i->u.squashfs_i.offset, length = 0, dirs_read = 0, dir_count; ++ squashfs_dir_header dirh; ++ char buffer[sizeof(squashfs_dir_entry) + SQUASHFS_NAME_LEN + 1]; ++ squashfs_dir_entry *dire = (squashfs_dir_entry *) buffer; ++ ++ TRACE("Entered squashfs_readdir [%x:%x]\n", next_block, next_offset); ++ ++ length = get_dir_index_using_offset(i->i_sb, &next_block, &next_offset, i->u.squashfs_i.u.s2.directory_index_start, ++ i->u.squashfs_i.u.s2.directory_index_offset, i->u.squashfs_i.u.s2.directory_index_count, file->f_pos); ++ ++ while(length < i->i_size) { ++ /* read directory header */ ++ if(msBlk->swap) { ++ squashfs_dir_header sdirh; ++ if(!squashfs_get_cached_block(i->i_sb, (char *) &sdirh, next_block, ++ next_offset, sizeof(sdirh), &next_block, &next_offset)) ++ goto failed_read; ++ length += sizeof(sdirh); ++ SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh); ++ } else { ++ if(!squashfs_get_cached_block(i->i_sb, (char *) &dirh, next_block, ++ next_offset, sizeof(dirh), &next_block, &next_offset)) ++ goto failed_read; ++ length += sizeof(dirh); ++ } ++ ++ dir_count = dirh.count + 1; ++ while(dir_count--) { ++ if(msBlk->swap) { ++ squashfs_dir_entry sdire; ++ if(!squashfs_get_cached_block(i->i_sb, (char *) &sdire, next_block, ++ next_offset, sizeof(sdire), &next_block, &next_offset)) ++ goto failed_read; ++ length += sizeof(sdire); ++ SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire); ++ } else { ++ if(!squashfs_get_cached_block(i->i_sb, (char *) dire, next_block, ++ next_offset, sizeof(*dire), &next_block, &next_offset)) ++ goto failed_read; ++ length += sizeof(*dire); ++ } ++ ++ if(!squashfs_get_cached_block(i->i_sb, dire->name, next_block, ++ next_offset, dire->size + 1, &next_block, &next_offset)) ++ goto failed_read; ++ length += dire->size + 1; ++ ++ if(file->f_pos >= length) ++ continue; ++ ++ dire->name[dire->size + 1] = '\0'; ++ ++ TRACE("Calling filldir(%x, %s, %d, %d, %x:%x, %d)\n", (unsigned int) dirent, ++ dire->name, dire->size + 1, (int) file->f_pos, ++ dirh.start_block, dire->offset, squashfs_filetype_table[dire->type]); ++ ++ if(filldir(dirent, dire->name, dire->size + 1, file->f_pos, SQUASHFS_MK_VFS_INODE(dirh.start_block, ++ dire->offset), squashfs_filetype_table[dire->type]) < 0) { ++ TRACE("Filldir returned less than 0\n"); ++ return dirs_read; ++ } ++ ++ file->f_pos = length; ++ dirs_read ++; ++ } ++ } ++ ++ return dirs_read; ++ ++failed_read: ++ ERROR("Unable to read directory block [%x:%x]\n", next_block, next_offset); ++ return 0; ++} ++ ++ ++static struct dentry *squashfs_lookup(struct inode *i, struct dentry *dentry) ++{ ++ const char *name =dentry->d_name.name; ++ int len = dentry->d_name.len; ++ struct inode *inode = NULL; ++ squashfs_sb_info *msBlk = &i->i_sb->u.squashfs_sb; ++ squashfs_super_block *sBlk = &msBlk->sBlk; ++ int next_block = i->u.squashfs_i.start_block + sBlk->directory_table_start, next_offset = ++ i->u.squashfs_i.offset, length = 0, dir_count; ++ squashfs_dir_header dirh; ++ char buffer[sizeof(squashfs_dir_entry) + SQUASHFS_NAME_LEN]; ++ squashfs_dir_entry *dire = (squashfs_dir_entry *) buffer; ++ int squashfs_2_1 = sBlk->s_major == 2 && sBlk->s_minor == 1; ++ ++ TRACE("Entered squashfs_lookup [%x:%x]\n", next_block, next_offset); ++ ++ length = get_dir_index_using_name(i->i_sb, &next_block, &next_offset, i->u.squashfs_i.u.s2.directory_index_start, ++ i->u.squashfs_i.u.s2.directory_index_offset, i->u.squashfs_i.u.s2.directory_index_count, name, len); ++ ++ while(length < i->i_size) { ++ /* read directory header */ ++ if(msBlk->swap) { ++ squashfs_dir_header sdirh; ++ if(!squashfs_get_cached_block(i->i_sb, (char *) &sdirh, next_block, next_offset, ++ sizeof(sdirh), &next_block, &next_offset)) ++ goto failed_read; ++ length += sizeof(sdirh); ++ SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh); ++ } else { ++ if(!squashfs_get_cached_block(i->i_sb, (char *) &dirh, next_block, next_offset, ++ sizeof(dirh), &next_block, &next_offset)) ++ goto failed_read; ++ length += sizeof(dirh); ++ } ++ ++ dir_count = dirh.count + 1; ++ while(dir_count--) { ++ if(msBlk->swap) { ++ squashfs_dir_entry sdire; ++ if(!squashfs_get_cached_block(i->i_sb, (char *) &sdire, ++ next_block,next_offset, sizeof(sdire), &next_block, &next_offset)) ++ goto failed_read; ++ length += sizeof(sdire); ++ SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire); ++ } else { ++ if(!squashfs_get_cached_block(i->i_sb, (char *) dire, ++ next_block,next_offset, sizeof(*dire), &next_block, &next_offset)) ++ goto failed_read; ++ length += sizeof(*dire); ++ } ++ ++ if(!squashfs_get_cached_block(i->i_sb, dire->name, ++ next_block, next_offset, dire->size + 1, &next_block, &next_offset)) ++ goto failed_read; ++ length += dire->size + 1; ++ ++ if(squashfs_2_1 && name[0] < dire->name[0]) ++ goto exit_loop; ++ ++ if((len == dire->size + 1) && !strncmp(name, dire->name, len)) { ++ squashfs_inode ino = SQUASHFS_MKINODE(dirh.start_block, dire->offset); ++ ++ TRACE("calling squashfs_iget for directory entry %s, inode %x:%x\n", ++ name, dirh.start_block, dire->offset); ++ ++ inode = (msBlk->iget)(i->i_sb, ino); ++ ++ goto exit_loop; ++ } ++ } ++ } ++ ++exit_loop: ++ d_add(dentry, inode); ++ return ERR_PTR(0); ++ ++failed_read: ++ ERROR("Unable to read directory block [%x:%x]\n", next_block, next_offset); ++ goto exit_loop; ++} ++ ++ ++static void squashfs_put_super(struct super_block *s) ++{ ++ int i; ++ ++ squashfs_sb_info *sbi = (squashfs_sb_info *) &s->u.squashfs_sb; ++ if(sbi->block_cache) { ++ for(i = 0; i < SQUASHFS_CACHED_BLKS; i++) ++ if(sbi->block_cache[i].block != SQUASHFS_INVALID_BLK) ++ kfree(sbi->block_cache[i].data); ++ kfree(sbi->block_cache); ++ } ++ if(sbi->read_data) kfree(sbi->read_data); ++ if(sbi->read_page) kfree(sbi->read_page); ++ if(sbi->uid) kfree(sbi->uid); ++ if(sbi->fragment) { ++ for(i = 0; i < SQUASHFS_CACHED_FRAGMENTS; i++) ++ if(sbi->fragment[i].data != NULL) ++ kfree(sbi->fragment[i].data); ++ kfree(sbi->fragment); ++ } ++ if(sbi->fragment_index) kfree(sbi->fragment_index); ++ sbi->block_cache = NULL; ++ sbi->uid = NULL; ++ sbi->read_data = NULL; ++ sbi->read_page = NULL; ++ sbi->fragment = NULL; ++ sbi->fragment_index = NULL; ++} ++ ++ ++static int __init init_squashfs_fs(void) ++{ ++ ++ printk(KERN_INFO "Squashfs 2.1-r2 (released 2004/12/15) (C) 2002-2004 Phillip Lougher\n"); ++ ++ if(!(stream.workspace = (char *) vmalloc(zlib_inflate_workspacesize()))) { ++ ERROR("Failed to allocate zlib workspace\n"); ++ return -ENOMEM; ++ } ++ return register_filesystem(&squashfs_fs_type); ++} ++ ++ ++static void __exit exit_squashfs_fs(void) ++{ ++ vfree(stream.workspace); ++ unregister_filesystem(&squashfs_fs_type); ++} ++ ++ ++EXPORT_NO_SYMBOLS; ++ ++module_init(init_squashfs_fs); ++module_exit(exit_squashfs_fs); ++MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem"); ++MODULE_AUTHOR("Phillip Lougher <plougher@users.sourceforge.net>"); ++MODULE_LICENSE("GPL"); +diff --new-file -ur linux-2.4.28/fs/squashfs/Makefile linux-2.4.28-squashfs2.1-r2/fs/squashfs/Makefile +--- linux-2.4.28/fs/squashfs/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.28-squashfs2.1-r2/fs/squashfs/Makefile 2004-12-02 02:14:05.000000000 +0000 +@@ -0,0 +1,11 @@ ++# ++# Makefile for the linux squashfs routines. ++# ++ ++O_TARGET := squashfs.o ++ ++obj-y := inode.o ++ ++obj-m := $(O_TARGET) ++ ++include $(TOPDIR)/Rules.make +diff --new-file -ur linux-2.4.28/include/linux/fs.h linux-2.4.28-squashfs2.1-r2/include/linux/fs.h +--- linux-2.4.28/include/linux/fs.h 2004-11-17 11:54:22.000000000 +0000 ++++ linux-2.4.28-squashfs2.1-r2/include/linux/fs.h 2004-12-02 02:14:05.000000000 +0000 +@@ -324,6 +324,7 @@ + #include <linux/usbdev_fs_i.h> + #include <linux/jffs2_fs_i.h> + #include <linux/cramfs_fs_sb.h> ++#include <linux/squashfs_fs_i.h> + + /* + * Attribute flags. These should be or-ed together to figure out what +@@ -519,6 +520,7 @@ + struct socket socket_i; + struct usbdev_inode_info usbdev_i; + struct jffs2_inode_info jffs2_i; ++ struct squashfs_inode_info squashfs_i; + void *generic_ip; + } u; + }; +@@ -733,6 +735,7 @@ + #include <linux/usbdev_fs_sb.h> + #include <linux/cramfs_fs_sb.h> + #include <linux/jffs2_fs_sb.h> ++#include <linux/squashfs_fs_sb.h> + + extern struct list_head super_blocks; + extern spinlock_t sb_lock; +@@ -792,6 +795,7 @@ + struct usbdev_sb_info usbdevfs_sb; + struct jffs2_sb_info jffs2_sb; + struct cramfs_sb_info cramfs_sb; ++ struct squashfs_sb_info squashfs_sb; + void *generic_sbp; + } u; + /* +diff --new-file -ur linux-2.4.28/include/linux/squashfs_fs.h linux-2.4.28-squashfs2.1-r2/include/linux/squashfs_fs.h +--- linux-2.4.28/include/linux/squashfs_fs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.28-squashfs2.1-r2/include/linux/squashfs_fs.h 2004-12-02 02:52:36.000000000 +0000 +@@ -0,0 +1,512 @@ ++#ifndef SQUASHFS_FS ++#define SQUASHFS_FS ++/* ++ * Squashfs ++ * ++ * Copyright (c) 2002, 2003, 2004 Phillip Lougher <plougher@users.sourceforge.net> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2, ++ * or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * squashfs_fs.h ++ */ ++ ++#define SQUASHFS_MAJOR 2 ++#define SQUASHFS_MINOR 1 ++#define SQUASHFS_MAGIC 0x73717368 ++#define SQUASHFS_MAGIC_SWAP 0x68737173 ++#define SQUASHFS_START 0 ++ ++/* size of metadata (inode and directory) blocks */ ++#define SQUASHFS_METADATA_SIZE 8192 ++#define SQUASHFS_METADATA_LOG 13 ++ ++/* default size of data blocks */ ++#define SQUASHFS_FILE_SIZE 65536 ++#define SQUASHFS_FILE_LOG 16 ++ ++#define SQUASHFS_FILE_MAX_SIZE 65536 ++ ++/* Max number of uids and gids */ ++#define SQUASHFS_UIDS 256 ++#define SQUASHFS_GUIDS 255 ++ ++/* Max length of filename (not 255) */ ++#define SQUASHFS_NAME_LEN 256 ++ ++#define SQUASHFS_INVALID ((long long) 0xffffffffffff) ++#define SQUASHFS_INVALID_BLK ((long long) 0xffffffff) ++#define SQUASHFS_USED_BLK ((long long) 0xfffffffe) ++ ++/* Filesystem flags */ ++#define SQUASHFS_NOI 0 ++#define SQUASHFS_NOD 1 ++#define SQUASHFS_CHECK 2 ++#define SQUASHFS_NOF 3 ++#define SQUASHFS_NO_FRAG 4 ++#define SQUASHFS_ALWAYS_FRAG 5 ++#define SQUASHFS_DUPLICATE 6 ++#define SQUASHFS_BIT(flag, bit) ((flag >> bit) & 1) ++#define SQUASHFS_UNCOMPRESSED_INODES(flags) SQUASHFS_BIT(flags, SQUASHFS_NOI) ++#define SQUASHFS_UNCOMPRESSED_DATA(flags) SQUASHFS_BIT(flags, SQUASHFS_NOD) ++#define SQUASHFS_UNCOMPRESSED_FRAGMENTS(flags) SQUASHFS_BIT(flags, SQUASHFS_NOF) ++#define SQUASHFS_NO_FRAGMENTS(flags) SQUASHFS_BIT(flags, SQUASHFS_NO_FRAG) ++#define SQUASHFS_ALWAYS_FRAGMENTS(flags) SQUASHFS_BIT(flags, SQUASHFS_ALWAYS_FRAG) ++#define SQUASHFS_DUPLICATES(flags) SQUASHFS_BIT(flags, SQUASHFS_DUPLICATE) ++#define SQUASHFS_CHECK_DATA(flags) SQUASHFS_BIT(flags, SQUASHFS_CHECK) ++#define SQUASHFS_MKFLAGS(noi, nod, check_data, nof, no_frag, always_frag, duplicate_checking) (noi | (nod << 1) | (check_data << 2) | (nof << 3) | (no_frag << 4) | (always_frag << 5) | (duplicate_checking << 6)) ++ ++/* Max number of types and file types */ ++#define SQUASHFS_DIR_TYPE 1 ++#define SQUASHFS_FILE_TYPE 2 ++#define SQUASHFS_SYMLINK_TYPE 3 ++#define SQUASHFS_BLKDEV_TYPE 4 ++#define SQUASHFS_CHRDEV_TYPE 5 ++#define SQUASHFS_FIFO_TYPE 6 ++#define SQUASHFS_SOCKET_TYPE 7 ++#define SQUASHFS_LDIR_TYPE 8 ++ ++/* 1.0 filesystem type definitions */ ++#define SQUASHFS_TYPES 5 ++#define SQUASHFS_IPC_TYPE 0 ++ ++/* Flag whether block is compressed or uncompressed, bit is set if block is uncompressed */ ++#define SQUASHFS_COMPRESSED_BIT (1 << 15) ++#define SQUASHFS_COMPRESSED_SIZE(B) (((B) & ~SQUASHFS_COMPRESSED_BIT) ? \ ++ (B) & ~SQUASHFS_COMPRESSED_BIT : SQUASHFS_COMPRESSED_BIT) ++ ++#define SQUASHFS_COMPRESSED(B) (!((B) & SQUASHFS_COMPRESSED_BIT)) ++ ++#define SQUASHFS_COMPRESSED_BIT_BLOCK (1 << 24) ++#define SQUASHFS_COMPRESSED_SIZE_BLOCK(B) (((B) & ~SQUASHFS_COMPRESSED_BIT_BLOCK) ? \ ++ (B) & ~SQUASHFS_COMPRESSED_BIT_BLOCK : SQUASHFS_COMPRESSED_BIT_BLOCK) ++ ++#define SQUASHFS_COMPRESSED_BLOCK(B) (!((B) & SQUASHFS_COMPRESSED_BIT_BLOCK)) ++ ++/* ++ * Inode number ops. Inodes consist of a compressed block number, and an uncompressed ++ * offset within that block ++ */ ++#define SQUASHFS_INODE_BLK(a) ((unsigned int) ((a) >> 16)) ++#define SQUASHFS_INODE_OFFSET(a) ((unsigned int) ((a) & 0xffff)) ++#define SQUASHFS_MKINODE(A, B) ((squashfs_inode)(((squashfs_inode) (A) << 16)\ ++ + (B))) ++ ++/* Compute 32 bit VFS inode number from squashfs inode number */ ++#define SQUASHFS_MK_VFS_INODE(a, b) ((unsigned int) (((a) << 8) + ((b) >> 2) + 1)) ++ ++/* Translate between VFS mode and squashfs mode */ ++#define SQUASHFS_MODE(a) ((a) & 0xfff) ++ ++/* fragment and fragment table defines */ ++typedef unsigned int squashfs_fragment_index; ++#define SQUASHFS_FRAGMENT_BYTES(A) (A * sizeof(squashfs_fragment_entry)) ++#define SQUASHFS_FRAGMENT_INDEX(A) (SQUASHFS_FRAGMENT_BYTES(A) / SQUASHFS_METADATA_SIZE) ++#define SQUASHFS_FRAGMENT_INDEX_OFFSET(A) (SQUASHFS_FRAGMENT_BYTES(A) % SQUASHFS_METADATA_SIZE) ++#define SQUASHFS_FRAGMENT_INDEXES(A) ((SQUASHFS_FRAGMENT_BYTES(A) + SQUASHFS_METADATA_SIZE - 1) / SQUASHFS_METADATA_SIZE) ++#define SQUASHFS_FRAGMENT_INDEX_BYTES(A) (SQUASHFS_FRAGMENT_INDEXES(A) * sizeof(squashfs_fragment_index)) ++#define SQUASHFS_CACHED_FRAGMENTS 3 ++ ++/* cached data constants for filesystem */ ++#define SQUASHFS_CACHED_BLKS 8 ++ ++#define SQUASHFS_MAX_FILE_SIZE_LOG 32 ++#define SQUASHFS_MAX_FILE_SIZE ((long long) 1 << (SQUASHFS_MAX_FILE_SIZE_LOG - 1)) ++ ++#define SQUASHFS_MARKER_BYTE 0xff ++ ++ ++/* ++ * definitions for structures on disk ++ */ ++ ++typedef unsigned int squashfs_block; ++typedef long long squashfs_inode; ++ ++typedef unsigned int squashfs_uid; ++ ++typedef struct squashfs_super_block { ++ unsigned int s_magic; ++ unsigned int inodes; ++ unsigned int bytes_used; ++ unsigned int uid_start; ++ unsigned int guid_start; ++ unsigned int inode_table_start; ++ unsigned int directory_table_start; ++ unsigned int s_major:16; ++ unsigned int s_minor:16; ++ unsigned int block_size_1:16; ++ unsigned int block_log:16; ++ unsigned int flags:8; ++ unsigned int no_uids:8; ++ unsigned int no_guids:8; ++ unsigned int mkfs_time /* time of filesystem creation */; ++ squashfs_inode root_inode; ++ unsigned int block_size; ++ unsigned int fragments; ++ unsigned int fragment_table_start; ++} __attribute__ ((packed)) squashfs_super_block; ++ ++typedef struct { ++ unsigned int index:27; ++ unsigned int start_block:29; ++ unsigned char size; ++ unsigned char name[0]; ++} __attribute__ ((packed)) squashfs_dir_index; ++ ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:8; /* index into uid table */ ++ unsigned int guid:8; /* index into guid table */ ++} __attribute__ ((packed)) squashfs_base_inode_header; ++ ++typedef squashfs_base_inode_header squashfs_ipc_inode_header; ++ ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:8; /* index into uid table */ ++ unsigned int guid:8; /* index into guid table */ ++ unsigned short rdev; ++} __attribute__ ((packed)) squashfs_dev_inode_header; ++ ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:8; /* index into uid table */ ++ unsigned int guid:8; /* index into guid table */ ++ unsigned short symlink_size; ++ char symlink[0]; ++} __attribute__ ((packed)) squashfs_symlink_inode_header; ++ ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:8; /* index into uid table */ ++ unsigned int guid:8; /* index into guid table */ ++ unsigned int mtime; ++ squashfs_block start_block; ++ unsigned int fragment; ++ unsigned int offset; ++ unsigned int file_size:SQUASHFS_MAX_FILE_SIZE_LOG; ++ unsigned short block_list[0]; ++} __attribute__ ((packed)) squashfs_reg_inode_header; ++ ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:8; /* index into uid table */ ++ unsigned int guid:8; /* index into guid table */ ++ unsigned int file_size:19; ++ unsigned int offset:13; ++ unsigned int mtime; ++ unsigned int start_block:24; ++} __attribute__ ((packed)) squashfs_dir_inode_header; ++ ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:8; /* index into uid table */ ++ unsigned int guid:8; /* index into guid table */ ++ unsigned int file_size:27; ++ unsigned int offset:13; ++ unsigned int mtime; ++ unsigned int start_block:24; ++ unsigned int i_count:16; ++ squashfs_dir_index index[0]; ++} __attribute__ ((packed)) squashfs_ldir_inode_header; ++ ++typedef union { ++ squashfs_base_inode_header base; ++ squashfs_dev_inode_header dev; ++ squashfs_symlink_inode_header symlink; ++ squashfs_reg_inode_header reg; ++ squashfs_dir_inode_header dir; ++ squashfs_ldir_inode_header ldir; ++ squashfs_ipc_inode_header ipc; ++} squashfs_inode_header; ++ ++typedef struct { ++ unsigned int offset:13; ++ unsigned int type:3; ++ unsigned int size:8; ++ char name[0]; ++} __attribute__ ((packed)) squashfs_dir_entry; ++ ++typedef struct { ++ unsigned int count:8; ++ unsigned int start_block:24; ++} __attribute__ ((packed)) squashfs_dir_header; ++ ++typedef struct { ++ unsigned int start_block; ++ unsigned int size; ++} __attribute__ ((packed)) squashfs_fragment_entry; ++ ++extern int squashfs_uncompress_block(void *d, int dstlen, void *s, int srclen); ++extern int squashfs_uncompress_init(void); ++extern int squashfs_uncompress_exit(void); ++ ++/* ++ * macros to convert each packed bitfield structure from little endian to big ++ * endian and vice versa. These are needed when creating or using a filesystem on a ++ * machine with different byte ordering to the target architecture. ++ * ++ */ ++ ++#define SQUASHFS_SWAP_SUPER_BLOCK(s, d) {\ ++ SQUASHFS_MEMSET(s, d, sizeof(squashfs_super_block));\ ++ SQUASHFS_SWAP((s)->s_magic, d, 0, 32);\ ++ SQUASHFS_SWAP((s)->inodes, d, 32, 32);\ ++ SQUASHFS_SWAP((s)->bytes_used, d, 64, 32);\ ++ SQUASHFS_SWAP((s)->uid_start, d, 96, 32);\ ++ SQUASHFS_SWAP((s)->guid_start, d, 128, 32);\ ++ SQUASHFS_SWAP((s)->inode_table_start, d, 160, 32);\ ++ SQUASHFS_SWAP((s)->directory_table_start, d, 192, 32);\ ++ SQUASHFS_SWAP((s)->s_major, d, 224, 16);\ ++ SQUASHFS_SWAP((s)->s_minor, d, 240, 16);\ ++ SQUASHFS_SWAP((s)->block_size_1, d, 256, 16);\ ++ SQUASHFS_SWAP((s)->block_log, d, 272, 16);\ ++ SQUASHFS_SWAP((s)->flags, d, 288, 8);\ ++ SQUASHFS_SWAP((s)->no_uids, d, 296, 8);\ ++ SQUASHFS_SWAP((s)->no_guids, d, 304, 8);\ ++ SQUASHFS_SWAP((s)->mkfs_time, d, 312, 32);\ ++ SQUASHFS_SWAP((s)->root_inode, d, 344, 64);\ ++ SQUASHFS_SWAP((s)->block_size, d, 408, 32);\ ++ SQUASHFS_SWAP((s)->fragments, d, 440, 32);\ ++ SQUASHFS_SWAP((s)->fragment_table_start, d, 472, 32);\ ++} ++ ++#define SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, n) {\ ++ SQUASHFS_MEMSET(s, d, n);\ ++ SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\ ++ SQUASHFS_SWAP((s)->mode, d, 4, 12);\ ++ SQUASHFS_SWAP((s)->uid, d, 16, 8);\ ++ SQUASHFS_SWAP((s)->guid, d, 24, 8);\ ++} ++ ++#define SQUASHFS_SWAP_IPC_INODE_HEADER(s, d) SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_ipc_inode_header)) ++ ++#define SQUASHFS_SWAP_DEV_INODE_HEADER(s, d) {\ ++ SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_dev_inode_header));\ ++ SQUASHFS_SWAP((s)->rdev, d, 32, 16);\ ++} ++ ++#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER(s, d) {\ ++ SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_symlink_inode_header));\ ++ SQUASHFS_SWAP((s)->symlink_size, d, 32, 16);\ ++} ++ ++#define SQUASHFS_SWAP_REG_INODE_HEADER(s, d) {\ ++ SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_reg_inode_header));\ ++ SQUASHFS_SWAP((s)->mtime, d, 32, 32);\ ++ SQUASHFS_SWAP((s)->start_block, d, 64, 32);\ ++ SQUASHFS_SWAP((s)->fragment, d, 96, 32);\ ++ SQUASHFS_SWAP((s)->offset, d, 128, 32);\ ++ SQUASHFS_SWAP((s)->file_size, d, 160, SQUASHFS_MAX_FILE_SIZE_LOG);\ ++} ++ ++#define SQUASHFS_SWAP_DIR_INODE_HEADER(s, d) {\ ++ SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_dir_inode_header));\ ++ SQUASHFS_SWAP((s)->file_size, d, 32, 19);\ ++ SQUASHFS_SWAP((s)->offset, d, 51, 13);\ ++ SQUASHFS_SWAP((s)->mtime, d, 64, 32);\ ++ SQUASHFS_SWAP((s)->start_block, d, 96, 24);\ ++} ++ ++#define SQUASHFS_SWAP_LDIR_INODE_HEADER(s, d) {\ ++ SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_ldir_inode_header));\ ++ SQUASHFS_SWAP((s)->file_size, d, 32, 27);\ ++ SQUASHFS_SWAP((s)->offset, d, 59, 13);\ ++ SQUASHFS_SWAP((s)->mtime, d, 72, 32);\ ++ SQUASHFS_SWAP((s)->start_block, d, 104, 24);\ ++ SQUASHFS_SWAP((s)->i_count, d, 128, 16);\ ++} ++ ++#define SQUASHFS_SWAP_DIR_INDEX(s, d) {\ ++ SQUASHFS_MEMSET(s, d, sizeof(squashfs_dir_index));\ ++ SQUASHFS_SWAP((s)->index, d, 0, 27);\ ++ SQUASHFS_SWAP((s)->start_block, d, 27, 29);\ ++ SQUASHFS_SWAP((s)->size, d, 56, 8);\ ++} ++ ++#define SQUASHFS_SWAP_DIR_HEADER(s, d) {\ ++ SQUASHFS_MEMSET(s, d, sizeof(squashfs_dir_header));\ ++ SQUASHFS_SWAP((s)->count, d, 0, 8);\ ++ SQUASHFS_SWAP((s)->start_block, d, 8, 24);\ ++} ++ ++#define SQUASHFS_SWAP_DIR_ENTRY(s, d) {\ ++ SQUASHFS_MEMSET(s, d, sizeof(squashfs_dir_entry));\ ++ SQUASHFS_SWAP((s)->offset, d, 0, 13);\ ++ SQUASHFS_SWAP((s)->type, d, 13, 3);\ ++ SQUASHFS_SWAP((s)->size, d, 16, 8);\ ++} ++ ++#define SQUASHFS_SWAP_FRAGMENT_ENTRY(s, d) {\ ++ SQUASHFS_MEMSET(s, d, sizeof(squashfs_fragment_entry));\ ++ SQUASHFS_SWAP((s)->start_block, d, 0, 32);\ ++ SQUASHFS_SWAP((s)->size, d, 32, 32);\ ++} ++ ++#define SQUASHFS_SWAP_SHORTS(s, d, n) {\ ++ int entry;\ ++ int bit_position;\ ++ SQUASHFS_MEMSET(s, d, n * 2);\ ++ for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += 16)\ ++ SQUASHFS_SWAP(s[entry], d, bit_position, 16);\ ++} ++ ++#define SQUASHFS_SWAP_INTS(s, d, n) {\ ++ int entry;\ ++ int bit_position;\ ++ SQUASHFS_MEMSET(s, d, n * 4);\ ++ for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += 32)\ ++ SQUASHFS_SWAP(s[entry], d, bit_position, 32);\ ++} ++ ++#define SQUASHFS_SWAP_DATA(s, d, n, bits) {\ ++ int entry;\ ++ int bit_position;\ ++ SQUASHFS_MEMSET(s, d, n * bits / 8);\ ++ for(entry = 0, bit_position = 0; entry < n; entry++, bit_position += bits)\ ++ SQUASHFS_SWAP(s[entry], d, bit_position, bits);\ ++} ++ ++#define SQUASHFS_SWAP_FRAGMENT_INDEXES(s, d, n) SQUASHFS_SWAP_INTS(s, d, n) ++ ++#ifdef SQUASHFS_1_0_COMPATIBILITY ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:4; /* index into uid table */ ++ unsigned int guid:4; /* index into guid table */ ++} __attribute__ ((packed)) squashfs_base_inode_header_1; ++ ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:4; /* index into uid table */ ++ unsigned int guid:4; /* index into guid table */ ++ unsigned int type:4; ++ unsigned int offset:4; ++} __attribute__ ((packed)) squashfs_ipc_inode_header_1; ++ ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:4; /* index into uid table */ ++ unsigned int guid:4; /* index into guid table */ ++ unsigned short rdev; ++} __attribute__ ((packed)) squashfs_dev_inode_header_1; ++ ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:4; /* index into uid table */ ++ unsigned int guid:4; /* index into guid table */ ++ unsigned short symlink_size; ++ char symlink[0]; ++} __attribute__ ((packed)) squashfs_symlink_inode_header_1; ++ ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:4; /* index into uid table */ ++ unsigned int guid:4; /* index into guid table */ ++ unsigned int mtime; ++ squashfs_block start_block; ++ unsigned int file_size:SQUASHFS_MAX_FILE_SIZE_LOG; ++ unsigned short block_list[0]; ++} __attribute__ ((packed)) squashfs_reg_inode_header_1; ++ ++typedef struct { ++ unsigned int inode_type:4; ++ unsigned int mode:12; /* protection */ ++ unsigned int uid:4; /* index into uid table */ ++ unsigned int guid:4; /* index into guid table */ ++ unsigned int file_size:19; ++ unsigned int offset:13; ++ unsigned int mtime; ++ unsigned int start_block:24; ++} __attribute__ ((packed)) squashfs_dir_inode_header_1; ++ ++#define SQUASHFS_SWAP_BASE_INODE_HEADER_1(s, d, n) {\ ++ SQUASHFS_MEMSET(s, d, n);\ ++ SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\ ++ SQUASHFS_SWAP((s)->mode, d, 4, 12);\ ++ SQUASHFS_SWAP((s)->uid, d, 16, 4);\ ++ SQUASHFS_SWAP((s)->guid, d, 20, 4);\ ++} ++ ++#define SQUASHFS_SWAP_IPC_INODE_HEADER_1(s, d) {\ ++ SQUASHFS_SWAP_BASE_INODE_HEADER_1(s, d, sizeof(squashfs_ipc_inode_header_1));\ ++ SQUASHFS_SWAP((s)->type, d, 24, 4);\ ++ SQUASHFS_SWAP((s)->offset, d, 28, 4);\ ++} ++ ++#define SQUASHFS_SWAP_DEV_INODE_HEADER_1(s, d) {\ ++ SQUASHFS_SWAP_BASE_INODE_HEADER_1(s, d, sizeof(squashfs_dev_inode_header_1));\ ++ SQUASHFS_SWAP((s)->rdev, d, 24, 16);\ ++} ++ ++#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER_1(s, d) {\ ++ SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_symlink_inode_header_1));\ ++ SQUASHFS_SWAP((s)->symlink_size, d, 24, 16);\ ++} ++ ++#define SQUASHFS_SWAP_REG_INODE_HEADER_1(s, d) {\ ++ SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_reg_inode_header_1));\ ++ SQUASHFS_SWAP((s)->mtime, d, 24, 32);\ ++ SQUASHFS_SWAP((s)->start_block, d, 56, 32);\ ++ SQUASHFS_SWAP((s)->file_size, d, 88, SQUASHFS_MAX_FILE_SIZE_LOG);\ ++} ++ ++#define SQUASHFS_SWAP_DIR_INODE_HEADER_1(s, d) {\ ++ SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_dir_inode_header_1));\ ++ SQUASHFS_SWAP((s)->file_size, d, 24, 19);\ ++ SQUASHFS_SWAP((s)->offset, d, 43, 13);\ ++ SQUASHFS_SWAP((s)->mtime, d, 56, 32);\ ++ SQUASHFS_SWAP((s)->start_block, d, 88, 24);\ ++} ++#endif ++ ++#ifdef __KERNEL__ ++/* ++ * macros used to swap each structure entry, taking into account ++ * bitfields and different bitfield placing conventions on differing architectures ++ */ ++#include <asm/byteorder.h> ++#ifdef __BIG_ENDIAN ++ /* convert from little endian to big endian */ ++#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, tbits, b_pos) ++#else ++ /* convert from big endian to little endian */ ++#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, tbits, 64 - tbits - b_pos) ++#endif ++ ++#define _SQUASHFS_SWAP(value, p, pos, tbits, SHIFT) {\ ++ int bits;\ ++ int b_pos = pos % 8;\ ++ unsigned long long val = 0;\ ++ unsigned char *s = (unsigned char *)p + (pos / 8);\ ++ unsigned char *d = ((unsigned char *) &val) + 7;\ ++ for(bits = 0; bits < (tbits + b_pos); bits += 8) \ ++ *d-- = *s++;\ ++ value = (val >> (SHIFT))/* & ((1 << tbits) - 1)*/;\ ++} ++#define SQUASHFS_MEMSET(s, d, n) memset(s, 0, n); ++#endif ++#endif +diff --new-file -ur linux-2.4.28/include/linux/squashfs_fs_i.h linux-2.4.28-squashfs2.1-r2/include/linux/squashfs_fs_i.h +--- linux-2.4.28/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.28-squashfs2.1-r2/include/linux/squashfs_fs_i.h 2004-12-15 10:13:06.000000000 +0000 +@@ -0,0 +1,42 @@ ++#ifndef SQUASHFS_FS_I ++#define SQUASHFS_FS_I ++/* ++ * Squashfs ++ * ++ * Copyright (c) 2002, 2003, 2004 Phillip Lougher <plougher@users.sourceforge.net> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2, ++ * or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * squashfs_fs_i.h ++ */ ++ ++typedef struct squashfs_inode_info { ++ unsigned int start_block; ++ unsigned int block_list_start; ++ unsigned int offset; ++ union { ++ struct { ++ unsigned int fragment_start_block; ++ unsigned int fragment_size; ++ unsigned int fragment_offset; ++ } s1; ++ struct { ++ unsigned int directory_index_start; ++ unsigned int directory_index_offset; ++ unsigned int directory_index_count; ++ } s2; ++ } u; ++ } squashfs_inode_info; ++#endif +diff --new-file -ur linux-2.4.28/include/linux/squashfs_fs_sb.h linux-2.4.28-squashfs2.1-r2/include/linux/squashfs_fs_sb.h +--- linux-2.4.28/include/linux/squashfs_fs_sb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.28-squashfs2.1-r2/include/linux/squashfs_fs_sb.h 2004-12-02 02:52:36.000000000 +0000 +@@ -0,0 +1,65 @@ ++#ifndef SQUASHFS_FS_SB ++#define SQUASHFS_FS_SB ++/* ++ * Squashfs ++ * ++ * Copyright (c) 2002, 2003, 2004 Phillip Lougher <plougher@users.sourceforge.net> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2, ++ * or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * squashfs_fs_sb.h ++ */ ++ ++#include <linux/squashfs_fs.h> ++ ++typedef struct { ++ unsigned int block; ++ int length; ++ unsigned int next_index; ++ char *data; ++ } squashfs_cache; ++ ++struct squashfs_fragment_cache { ++ unsigned int block; ++ int length; ++ unsigned int locked; ++ char *data; ++ }; ++ ++typedef struct squashfs_sb_info { ++ squashfs_super_block sBlk; ++ int devblksize; ++ int devblksize_log2; ++ int swap; ++ squashfs_cache *block_cache; ++ struct squashfs_fragment_cache *fragment; ++ int next_cache; ++ int next_fragment; ++ squashfs_uid *uid; ++ squashfs_uid *guid; ++ squashfs_fragment_index *fragment_index; ++ unsigned int read_size; ++ char *read_data; ++ char *read_page; ++ struct semaphore read_page_mutex; ++ struct semaphore block_cache_mutex; ++ struct semaphore fragment_mutex; ++ wait_queue_head_t waitq; ++ wait_queue_head_t fragment_wait_queue; ++ struct inode *(*iget)(struct super_block *s, squashfs_inode inode); ++ unsigned int (*read_blocklist)(struct inode *inode, int index, int readahead_blks, ++ char *block_list, unsigned short **block_p, unsigned int *bsize); ++ } squashfs_sb_info; ++#endif +diff --new-file -ur linux-2.4.28/init/do_mounts.c linux-2.4.28-squashfs2.1-r2/init/do_mounts.c +--- linux-2.4.28/init/do_mounts.c 2003-11-28 18:26:21.000000000 +0000 ++++ linux-2.4.28-squashfs2.1-r2/init/do_mounts.c 2004-12-02 02:14:06.000000000 +0000 +@@ -15,6 +15,7 @@ + #include <linux/minix_fs.h> + #include <linux/ext2_fs.h> + #include <linux/romfs_fs.h> ++#include <linux/squashfs_fs.h> + #include <linux/cramfs_fs.h> + + #define BUILD_CRAMDISK +@@ -476,6 +477,7 @@ + * minix + * ext2 + * romfs ++ * squashfs + * cramfs + * gzip + */ +@@ -486,6 +488,7 @@ + struct minix_super_block *minixsb; + struct ext2_super_block *ext2sb; + struct romfs_super_block *romfsb; ++ struct squashfs_super_block *squashfsb; + struct cramfs_super *cramfsb; + int nblocks = -1; + unsigned char *buf; +@@ -497,6 +500,7 @@ + minixsb = (struct minix_super_block *) buf; + ext2sb = (struct ext2_super_block *) buf; + romfsb = (struct romfs_super_block *) buf; ++ squashfsb = (struct squashfs_super_block *) buf; + cramfsb = (struct cramfs_super *) buf; + memset(buf, 0xe5, size); + +@@ -535,6 +539,15 @@ + goto done; + } + ++ /* squashfs is at block zero too */ ++ if (squashfsb->s_magic == SQUASHFS_MAGIC) { ++ printk(KERN_NOTICE ++ "RAMDISK: squashfs filesystem found at block %d\n", ++ start_block); ++ nblocks = (squashfsb->bytes_used+BLOCK_SIZE-1)>>BLOCK_SIZE_BITS; ++ goto done; ++ } ++ + /* + * Read block 1 to test for minix and ext2 superblock + */ +diff --new-file -ur linux-2.4.28/lib/Config.in linux-2.4.28-squashfs2.1-r2/lib/Config.in +--- linux-2.4.28/lib/Config.in 2003-11-28 18:26:21.000000000 +0000 ++++ linux-2.4.28-squashfs2.1-r2/lib/Config.in 2004-12-02 02:14:06.000000000 +0000 +@@ -10,6 +10,7 @@ + # Do we need the compression support? + # + if [ "$CONFIG_CRAMFS" = "y" -o \ ++ "$CONFIG_SQUASHFS" = "y" -o \ + "$CONFIG_PPP_DEFLATE" = "y" -o \ + "$CONFIG_CRYPTO_DEFLATE" = "y" -o \ + "$CONFIG_JFFS2_FS" = "y" -o \ +@@ -17,6 +18,7 @@ + define_tristate CONFIG_ZLIB_INFLATE y + else + if [ "$CONFIG_CRAMFS" = "m" -o \ ++ "$CONFIG_SQUASHFS" = "m" -o \ + "$CONFIG_PPP_DEFLATE" = "m" -o \ + "$CONFIG_CRYPTO_DEFLATE" = "m" -o \ + "$CONFIG_JFFS2_FS" = "m" -o \ diff --git a/recipes/linux/linux-wrt-2.4.30/301-jffs-compression b/recipes/linux/linux-wrt-2.4.30/301-jffs-compression new file mode 100644 index 0000000000..56c5b3cbc0 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/301-jffs-compression @@ -0,0 +1,9119 @@ +diff -Nur linux-mips-cvs/Documentation/Configure.help linux-mips/Documentation/Configure.help +--- linux-mips-cvs/Documentation/Configure.help 2005-01-20 03:19:21.000000000 +0100 ++++ linux-mips/Documentation/Configure.help 2005-02-07 05:08:35.000000000 +0100 +@@ -17528,6 +17528,32 @@ + If reporting bugs, please try to have available a full dump of the + messages at debug level 1 while the misbehaviour was occurring. + ++ARMLIB compression support for BBC (EXPERIMENTAL) ++CONFIG_JFFS2_BBC_ARMLIB ++ This enables ARMLIB support for BBC. ++ ++LZO1X-* compression support for BBC (EXPERIMENTAL) ++CONFIG_JFFS2_BBC_LZO ++ This enables LZO1X-1 and LZO1X-999 support for BBC. (fast & good ++ compressor, beats ZLIB in everything) ++ ++LZARI compression support for BBC (EXPERIMENTAL) ++CONFIG_JFFS2_BBC_LZARI ++ This enables LempelZiv-Storer-Szymanski compression for BBC with ++ additional arithmetic coding (damn slow, but best compresor). ++ ++LZHD compression support for BBC (EXPERIMENTAL) ++CONFIG_JFFS2_BBC_LZHD ++ This enables LempelZiv-Storer-Szymanski compression for BBC with ++ additional dynamic Huffman coding (a little faster than LZARI, and ++ it's compression ratio is a little worse than LZARI's) ++ ++LZSS compression support for BBC (EXPERIMENTAL) ++CONFIG_JFFS2_BBC_LZSS ++ This enables simple LempelZiv-Storer-Szymanski compression for BBC ++ (faster than LZHD, and, and has a not-so-good compression ratio, ++ was included just for testing) ++ + JFFS stats available in /proc filesystem + CONFIG_JFFS_PROC_FS + Enabling this option will cause statistics from mounted JFFS file systems +diff -Nur linux-mips-cvs/fs/Config.in linux-mips/fs/Config.in +--- linux-mips-cvs/fs/Config.in 2004-11-19 01:28:47.000000000 +0100 ++++ linux-mips/fs/Config.in 2005-02-07 05:08:34.000000000 +0100 +@@ -50,6 +50,12 @@ + if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFIG_JFFS2_FS" = "m" ] ; then + int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0 + fi ++dep_mbool ' ARMLIB compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_ARMLIB $CONFIG_JFFS2_FS ++dep_mbool ' LZO1X-* compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZO $CONFIG_JFFS2_FS ++dep_mbool ' LZARI compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZARI $CONFIG_JFFS2_FS ++dep_mbool ' LZHD compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZHD $CONFIG_JFFS2_FS ++dep_mbool ' LZSS compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZSS $CONFIG_JFFS2_FS ++ + tristate 'Compressed ROM file system support' CONFIG_CRAMFS + bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS + define_bool CONFIG_RAMFS y +diff -Nur linux-mips-cvs/fs/jffs2/Config.in.bbc.inc linux-mips/fs/jffs2/Config.in.bbc.inc +--- linux-mips-cvs/fs/jffs2/Config.in.bbc.inc 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/Config.in.bbc.inc 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,5 @@ ++dep_mbool ' ARMLIB compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_ARMLIB $CONFIG_JFFS2_FS ++dep_mbool ' LZO1X-* compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZO $CONFIG_JFFS2_FS ++dep_mbool ' LZARI compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZARI $CONFIG_JFFS2_FS ++dep_mbool ' LZHD compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZHD $CONFIG_JFFS2_FS ++dep_mbool ' LZSS compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZSS $CONFIG_JFFS2_FS +diff -Nur linux-mips-cvs/fs/jffs2/Configure.help.bbc.inc linux-mips/fs/jffs2/Configure.help.bbc.inc +--- linux-mips-cvs/fs/jffs2/Configure.help.bbc.inc 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/Configure.help.bbc.inc 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,25 @@ ++ARMLIB compression support for BBC (EXPERIMENTAL) ++CONFIG_JFFS2_BBC_ARMLIB ++ This enables ARMLIB support for BBC. ++ ++LZO1X-* compression support for BBC (EXPERIMENTAL) ++CONFIG_JFFS2_BBC_LZO ++ This enables LZO1X-1 and LZO1X-999 support for BBC. (fast & good ++ compressor, beats ZLIB in everything) ++ ++LZARI compression support for BBC (EXPERIMENTAL) ++CONFIG_JFFS2_BBC_LZARI ++ This enables LempelZiv-Storer-Szymanski compression for BBC with ++ additional arithmetic coding (damn slow, but best compresor). ++ ++LZHD compression support for BBC (EXPERIMENTAL) ++CONFIG_JFFS2_BBC_LZHD ++ This enables LempelZiv-Storer-Szymanski compression for BBC with ++ additional dynamic Huffman coding (a little faster than LZARI, and ++ it's compression ratio is a little worse than LZARI's) ++ ++LZSS compression support for BBC (EXPERIMENTAL) ++CONFIG_JFFS2_BBC_LZSS ++ This enables simple LempelZiv-Storer-Szymanski compression for BBC ++ (faster than LZHD, and, and has a not-so-good compression ratio, ++ was included just for testing) +diff -Nur linux-mips-cvs/fs/jffs2/Kconfig.bbc.inc linux-mips/fs/jffs2/Kconfig.bbc.inc +--- linux-mips-cvs/fs/jffs2/Kconfig.bbc.inc 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/Kconfig.bbc.inc 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,40 @@ ++config JFFS2_BBC_ARMLIB ++ bool "ARMLIB compression support for BBC (EXPERIMENTAL)" ++ depends on JFFS2_FS && EXPERIMENTAL ++ default y ++ help ++ This enables ARMLIB support for BBC. ++ ++config JFFS2_BBC_LZO ++ bool "LZO1X-* compression support for BBC (EXPERIMENTAL)" ++ depends on JFFS2_FS && EXPERIMENTAL ++ default y ++ help ++ This enables LZO1X-1 and LZO1X-999 support for BBC. (fast & good ++ compressor) ++ ++config JFFS2_BBC_LZARI ++ bool "LZARI compression support for BBC (EXPERIMENTAL)" ++ depends on JFFS2_FS && EXPERIMENTAL ++ default y ++ help ++ This enables LempelZiv-Storer-Szymanski compression for BBC with ++ additional arithmetic coding (damn slow, but best compresor). ++ ++config JFFS2_BBC_LZHD ++ bool "LZHD compression support for BBC (EXPERIMENTAL)" ++ depends on JFFS2_FS && EXPERIMENTAL ++ default y ++ help ++ This enables LempelZiv-Storer-Szymanski compression for BBC with ++ additional dynamic Huffman coding (a little faster than LZARI, and ++ it's compression ratio is a little worse than LZARI's) ++ ++config JFFS2_BBC_LZSS ++ bool "LZSS compression support for BBC (EXPERIMENTAL)" ++ depends on JFFS2_FS && EXPERIMENTAL ++ default y ++ help ++ This enables simple LempelZiv-Storer-Szymanski compression for BBC ++ (faster than LZHD, and, and has a not-so-good compression ratio, ++ was included just for testing) +diff -Nur linux-mips-cvs/fs/jffs2/Makefile linux-mips/fs/jffs2/Makefile +--- linux-mips-cvs/fs/jffs2/Makefile 2003-08-13 19:19:25.000000000 +0200 ++++ linux-mips/fs/jffs2/Makefile 2005-02-07 05:08:34.000000000 +0100 +@@ -10,9 +10,23 @@ + # Note 2! The CFLAGS definitions are now in the main makefile... + + ++JFFS2_BBC_KERNEL_OBJS-y = jffs2_bbc_framework.o jffs2_bbc_fs.o ++ ++JFFS2_BBC_KERNEL_OBJS-$(CONFIG_JFFS2_BBC_ARMLIB) += jffs2_bbc_armlib_comp.o ++JFFS2_BBC_KERNEL_OBJS-$(CONFIG_JFFS2_BBC_LZO) += jffs2_bbc_lzo_comp.o ++JFFS2_BBC_KERNEL_OBJS-$(CONFIG_JFFS2_BBC_LZSS) += jffs2_bbc_lzss_comp.o ++JFFS2_BBC_KERNEL_OBJS-$(CONFIG_JFFS2_BBC_LZARI) += jffs2_bbc_lzari_comp.o ++JFFS2_BBC_KERNEL_OBJS-$(CONFIG_JFFS2_BBC_LZHD) += jffs2_bbc_lzhd_comp.o ++ ++JFFS2_BBC_KERNEL_OBJS := $(JFFS2_BBC_KERNEL_OBJS-y) ++ ++JFFS2_BBC_MKFS_OBJS = jffs2_bbc_mkfs.o jffs2_bbc_framework.o jffs2_bbc_armlib_comp.o jffs2_bbc_lzo_comp.o\ ++ jffs2_bbc_lzss_comp.o jffs2_bbc_lzari_comp.o jffs2_bbc_lzhd_comp.o ++ + COMPR_OBJS := compr.o compr_rubin.o compr_rtime.o pushpull.o \ + compr_zlib.o + JFFS2_OBJS := dir.o file.o ioctl.o nodelist.o malloc.o \ ++ $(JFFS2_BBC_KERNEL_OBJS) \ + read.o nodemgmt.o readinode.o super.o write.o scan.o gc.o \ + symlink.o build.o erase.o background.o + +diff -Nur linux-mips-cvs/fs/jffs2/Makefile.bbc.inc linux-mips/fs/jffs2/Makefile.bbc.inc +--- linux-mips-cvs/fs/jffs2/Makefile.bbc.inc 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/Makefile.bbc.inc 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,12 @@ ++JFFS2_BBC_KERNEL_OBJS-y = jffs2_bbc_framework.o jffs2_bbc_fs.o ++ ++JFFS2_BBC_KERNEL_OBJS-$(CONFIG_JFFS2_BBC_ARMLIB) += jffs2_bbc_armlib_comp.o ++JFFS2_BBC_KERNEL_OBJS-$(CONFIG_JFFS2_BBC_LZO) += jffs2_bbc_lzo_comp.o ++JFFS2_BBC_KERNEL_OBJS-$(CONFIG_JFFS2_BBC_LZSS) += jffs2_bbc_lzss_comp.o ++JFFS2_BBC_KERNEL_OBJS-$(CONFIG_JFFS2_BBC_LZARI) += jffs2_bbc_lzari_comp.o ++JFFS2_BBC_KERNEL_OBJS-$(CONFIG_JFFS2_BBC_LZHD) += jffs2_bbc_lzhd_comp.o ++ ++JFFS2_BBC_KERNEL_OBJS := $(JFFS2_BBC_KERNEL_OBJS-y) ++ ++JFFS2_BBC_MKFS_OBJS = jffs2_bbc_mkfs.o jffs2_bbc_framework.o jffs2_bbc_armlib_comp.o jffs2_bbc_lzo_comp.o\ ++ jffs2_bbc_lzss_comp.o jffs2_bbc_lzari_comp.o jffs2_bbc_lzhd_comp.o +diff -Nur linux-mips-cvs/fs/jffs2/compr_zlib.c linux-mips/fs/jffs2/compr_zlib.c +--- linux-mips-cvs/fs/jffs2/compr_zlib.c 2003-01-11 18:53:17.000000000 +0100 ++++ linux-mips/fs/jffs2/compr_zlib.c 2005-02-07 05:08:35.000000000 +0100 +@@ -85,7 +85,7 @@ + vfree(inflate_workspace); + } + +-int zlib_compress(unsigned char *data_in, unsigned char *cpage_out, ++int jffs2_zlib_compress2(unsigned char *data_in, unsigned char *cpage_out, + __u32 *sourcelen, __u32 *dstlen) + { + z_stream strm; +@@ -145,7 +145,7 @@ + return 0; + } + +-void zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, ++void jffs2_zlib_decompress2(unsigned char *data_in, unsigned char *cpage_out, + __u32 srclen, __u32 destlen) + { + z_stream strm; +@@ -175,3 +175,19 @@ + zlib_inflateEnd(&strm); + up(&inflate_sem); + } ++ ++extern int jffs2_zlib_compress(unsigned char *data_in, unsigned char *cpage_out, __u32 * sourcelen, __u32 * dstlen); ++extern void jffs2_zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, __u32 srclen, __u32 destlen); ++ ++int zlib_compress(unsigned char *data_in, unsigned char *cpage_out, ++ __u32 *sourcelen, __u32 *dstlen) ++{ ++ return jffs2_zlib_compress(data_in,cpage_out,sourcelen,dstlen); ++} ++ ++void zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, ++ __u32 srclen, __u32 destlen) ++{ ++ jffs2_zlib_decompress(data_in,cpage_out,srclen,destlen); ++} ++ +diff -Nur linux-mips-cvs/fs/jffs2/file.c linux-mips/fs/jffs2/file.c +--- linux-mips-cvs/fs/jffs2/file.c 2003-11-17 02:07:44.000000000 +0100 ++++ linux-mips/fs/jffs2/file.c 2005-02-07 05:08:35.000000000 +0100 +@@ -35,6 +35,7 @@ + * + */ + ++#include "jffs2_bbc_framework.h" /**BBC**/ + #include <linux/kernel.h> + #include <linux/mtd/compatmac.h> /* for min() */ + #include <linux/slab.h> +@@ -459,6 +460,7 @@ + + comprbuf = kmalloc(cdatalen, GFP_KERNEL); + if (comprbuf) { ++ jffs2_bbc_model_set_act_sb(c); /**BBC**/ + comprtype = jffs2_compress(page_address(pg)+ (file_ofs & (PAGE_CACHE_SIZE-1)), comprbuf, &datalen, &cdatalen); + } + if (comprtype == JFFS2_COMPR_NONE) { +diff -Nur linux-mips-cvs/fs/jffs2/gc.c linux-mips/fs/jffs2/gc.c +--- linux-mips-cvs/fs/jffs2/gc.c 2003-11-17 02:07:44.000000000 +0100 ++++ linux-mips/fs/jffs2/gc.c 2005-02-07 05:08:35.000000000 +0100 +@@ -35,6 +35,7 @@ + * + */ + ++#include "jffs2_bbc_framework.h" /**BBC**/ + #include <linux/kernel.h> + #include <linux/mtd/mtd.h> + #include <linux/slab.h> +@@ -651,6 +652,7 @@ + writebuf = pg_ptr + (offset & (PAGE_CACHE_SIZE -1)); + + if (comprbuf) { ++ jffs2_bbc_model_set_act_sb(c); /**BBC**/ + comprtype = jffs2_compress(writebuf, comprbuf, &datalen, &cdatalen); + } + if (comprtype) { +diff -Nur linux-mips-cvs/fs/jffs2/hpatch linux-mips/fs/jffs2/hpatch +--- linux-mips-cvs/fs/jffs2/hpatch 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/hpatch 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,191 @@ ++#!/usr/bin/perl ++# A patch-like utility ++# Designed for patching different version of jffs2 with the same hpatch file ++# ++# Copyright (C) 2004, Ferenc Havasi ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License ++# as published by the Free Software Foundation; either version 2 ++# of the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ ++$filename_tmp1="file1.tmp"; ++$filename_tmp2="file2.tmp"; ++ ++$filename_in=""; ++$filename_out=$filename_tmp1; ++$filename_cnt=0; ++ ++# Modes: ++# 0: expecting = ++# 1: normal_cmd ++# 2: skip until = ++# 3: expecting F (first state) ++$mode=3; ++ ++%rules = (); ++ ++sub file_end { ++ if (($mode!=2)&&($modified==1)) { ++ while (<SRC>) { ++ print DST $_; ++ } ++ close(SRC); ++ close(DST); ++ if ($cmd_name ne "") { $rules{"$cmd_name"}=1; } ++ $filename_result=$filename_out; ++ if ($filename_result ne $filename_in_save) { ++ open(RES,"<$filename_result") or die "Cannot open $filename_result.\n"; ++ open(DST,">$filename_in_save") or die "Cannot open $filename_in_save.\n"; ++ while (<RES>) { ++ print DST $_; ++ } ++ close(DST); ++ close(RES); ++ } ++ unlink($filename_tmp1) && unlink($filename_tmp2); ++ } ++ else { ++ close(SRC); ++ close(DST); ++ $filename_result=$filename_in; ++ if ($filename_result ne $filename_in_save) { ++ open(RES,"<$filename_result") or die "Cannot open $filename_result.\n"; ++ open(DST,">$filename_in_save") or die "Cannot open $filename_in_save.\n"; ++ while (<RES>) { ++ print DST $_; ++ } ++ close(DST); ++ close(RES); ++ } ++ unlink($filename_tmp1); ++ } ++ $modified=0; ++ foreach $rulename (keys %rules) { ++ if ($rules{"$rulename"}==0) { print(STDERR "On $filename_in_save error applying rule $rulename.\n"); } ++ } ++ %rules = (); ++} ++ ++if ($#ARGV<0) { ++ print ("usage: hpatch hpatch_file\n"); ++ exit; ++} ++ ++open(CMD,"<$ARGV[0]") or die "Cannot open $ARGV[0].\n"; ++$cmd_linenum=0; ++ ++while (chomp($cmd_line=<CMD>)) { ++ $cmd_linenum++; ++ if ($cmd_line eq "") {next;} ++ #$cmd_line =~ s/\#.*//; ++ $cmd_line =~ s/\ *$//; ++ if ($cmd_line eq "") {next;} ++ if ($cmd_line =~ /^F(.*)/) { ++ $tmp_filename_in=$1; ++ if ($mode!=3) { ++ file_end(); ++ } ++ $filename_in=$tmp_filename_in; ++ $filename_in_save=$filename_in; ++ open(SRC,"<$filename_in") or die "Cannot open $filename_in.\n"; ++ open(DST,">$filename_out") or die "Cannot open $filename_out.\n";; ++ $modified=0; ++ $mode=0; ++ next; ++ } ++ if ($mode==3) {die "error: F expression expected in line $cmd_linenum\n";} ++ if ($cmd_line =~ /^=(.*)/) { ++ $tmp_cmd_name=$1; ++ if (($mode!=2)&&($modified==1)) { ++ while (<SRC>) { ++ print DST $_; ++ } ++ close(SRC); ++ close(DST); ++ if (($cmd_name ne "")) {$rules{"$cmd_name"}=1;}; ++ $filename_cnt++; ++ if ($filename_cnt%2==1) { ++ $filename_in=$filename_tmp1; ++ $filename_out=$filename_tmp2; ++ } ++ else { ++ $filename_in=$filename_tmp2; ++ $filename_out=$filename_tmp1; ++ } ++ } ++ else { ++ close(SRC); ++ close(DST); ++ } ++ $mode=1; ++ $cmd_name=$tmp_cmd_name; ++ if (($cmd_name ne "")) { ++ if ($rules{"$cmd_name"}==1) { ++ $mode=2; ++ } ++ else { ++ $rules{"$cmd_name"}=0; ++ } ++ } ++ open(SRC,"<$filename_in") or die "Cannot open $filename_in.\n"; ++ open(DST,">$filename_out") or die "Cannot open $filename_out.\n"; ++ $modified=0; ++ next; ++ } ++ if ($mode == 0) {die "error: = expression expected in line $cmd_linenum\n";} ++ if ($mode == 2) {next;} ++ if ($cmd_line =~ /^!(.*)/) { ++ print "$1\n"; ++ $modified=1; ++ next; ++ } ++ if ($cmd_line =~ /^\?(.*)/) { ++ $search_str=$1; ++ $found=0; ++ while (<SRC>) { ++ print DST $_; ++ if (index($_,$search_str)>=0) {$found=1; last;} ++ } ++ if ($found==0) { $mode=2; } ++ next; ++ } ++ if ($cmd_line =~ /^\+(.*)/) { ++ print DST "$1\n"; ++ $modified=1; ++ next; ++ } ++ if ($cmd_line =~ /^\-(.*)/) { ++ $search_str=$1; ++ $found=0; ++ while (<SRC>) { ++ if (index($_,$search_str)>=0) {$saved_line=$_; $found=1; $modified=1; last;} ++ print DST $_; ++ } ++ if ($found==0) { $mode=2; } ++ next; ++ } ++ if ($cmd_line =~ /^i(.*)/) { ++ $filename_inc=$1; ++ open(INCSRC,"<$filename_inc") or die "Cannot open $filename_inc.\n"; ++ while (<INCSRC>) { ++ print DST $_; ++ } ++ next; ++ } ++ if ($cmd_line =~ /^I/) { ++ print DST $saved_line; ++ next; ++ } ++} ++file_end(); ++close(CMD); +diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_armlib_comp.c linux-mips/fs/jffs2/jffs2_bbc_armlib_comp.c +--- linux-mips-cvs/fs/jffs2/jffs2_bbc_armlib_comp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/jffs2_bbc_armlib_comp.c 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,2224 @@ ++/* ++ * JFFS2-BBC: armlib compressor plugin ++ * ++ * $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++ * ++ * Copyright (C) 2004, Ferenc Havasi & Tamas Gergely ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#include "jffs2_bbc_framework.h" ++ ++#ifdef __KERNEL__ ++#include <linux/string.h> ++#else ++#include <string.h> ++#endif ++ ++//ORIGIN: include/DataStructures/TypeDefs.h ++ ++/******************************************************************************* ++* FILE: TypeDefs.h ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++#ifndef TYPEDEFS_H ++#define TYPEDEFS_H ++ ++#pragma pack(4) ++ ++#ifndef bool ++#define bool char ++#define true 1 ++#define false 0 ++#endif ++ ++#ifndef u8 ++#define u8 unsigned char ++#endif ++#ifndef u16 ++#define u16 unsigned short ++#endif ++#ifndef u32 ++#define u32 unsigned long ++#endif ++#ifndef s8 ++#define s8 signed char ++#endif ++#ifndef s16 ++#define s16 signed short ++#endif ++#ifndef s32 ++#define s32 signed long ++#endif ++ ++typedef struct ++{ ++ u32 capacity; ++ u32 size; ++ u32 alloc_size; ++ void *ptr; ++} vector; ++ ++#define VECTOR_P_END(vct) ((void*)(((char*)((vct)->ptr)) + (vct)->size)) ++#define VECTOR_S_END(vct) ((void*)(((char*)((vct).ptr)) + (vct).size)) ++ ++static void vector_clear(vector *); ++#ifdef JFFS2_BBC_ARMLIB_MODELGEN ++static void vector_reset(vector *); ++static void vector_clr_ptr(vector *); ++static void vector_add_u8(vector *, u8); ++static void vector_add_u16(vector *, u16); ++static void vector_add_u32(vector *, u32); ++static void vector_add_s8(vector *, s8); ++static void vector_add_s16(vector *, s16); ++static void vector_add_s32(vector *, s32); ++static void vector_add_ptr(vector *, void *); ++static void vector_concat(vector *, vector *); ++#endif ++ ++#endif ++ ++//ORIGIN: include/DataStructures/DataTypes.h ++ ++/******************************************************************************* ++* FILE: DataTypes.h ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++#ifndef DATATYPES_H ++#define DATATYPES_H ++ ++//#include "DataStructures/TypeDefs.h" ++ ++typedef u16 THUMB_DataType; ++typedef u32 ARM_DataType; ++typedef u8 TokenType; ++typedef u8 PredictorType; ++typedef u8 *ProbDist; ++ ++typedef vector RawData; ++typedef vector RawBlocks; ++typedef vector TokenStream; ++typedef vector TokenBlocks; ++typedef vector LatType; ++ ++#define THUMB_DATA_LENGTH 16 ++#define ARM_DATA_LENGTH 32 ++#define TOKEN_LENGTH 8 ++#define TOKEN_MAXVALUE 0xff ++#define PREDICTOR_LENGTH 8 ++#define PREDICTOR_MAXVALUE 0xff ++ ++#endif ++ ++//ORIGIN: include/DataStructures/BitVector.h ++ ++/******************************************************************************* ++* FILE: BitVector.h ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++#ifndef BITVECTOR_H ++#define BITVECTOR_H ++ ++//#include "DataStructures/TypeDefs.h" ++ ++typedef vector BitBlocks; ++ ++#pragma pack(4) ++ ++typedef struct ++{ ++ u32 freebits; ++ u32 capacity; ++ u32 size; ++ u8 *base; ++ u8 *ptr; ++} BitVector; ++ ++#ifdef JFFS2_BBC_ARMLIB_MODELGEN ++static void bitblocks_clear(BitBlocks *); ++static void bitvector_clear(BitVector *); ++static void bitvector_W_reset(BitVector *); ++static void bitvector_W_add0(BitVector *); ++static void bitvector_W_add1(BitVector *); ++static void bitvector_W_concat_b(BitVector *, BitVector *); ++static void bitvector_W_concat_v(BitVector *, vector *); ++static void bitvector_W_flush(BitVector *); ++static void bitvector_R_reset(BitVector *); ++static u8 bitvector_R_get1(BitVector *); ++static u8 bitvector_R_get8(BitVector *); ++#endif ++ ++#define BITVECTOR_P_END(bv) ((void*)(((bv)->base)+((bv)->size))) ++#define BITVECTOR_S_END(bv) ((void*)( ((bv).base)+ ((bv).size))) ++#define BITVECTOR_SKIP(bv,num) ((bv)->ptr) += (num) ++ ++#endif ++ ++//ORIGIN: include/DataStructures/DecisionTree.h ++ ++/******************************************************************************* ++* FILE: DecisionTree.h ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++#ifndef DECISIONTREE_H ++#define DECISIONTREE_H ++ ++//#include "DataStructures/DataTypes.h" ++ ++#pragma pack(4) ++ ++#define TREENODETYPE_NULLNODE 0 ++#define TREENODETYPE_NODE_BINARY_EQ 1 ++#define TREENODETYPE_LEAF_P 2 ++#define TREENODETYPE_LEAF_C 3 ++#define TREENODETYPE_NODE_BINARY_LT 5 ++#define TREENODETYPE_IS_NODE(n) (((n) == TREENODETYPE_NODE_BINARY_EQ) || \ ++ ((n) == TREENODETYPE_NODE_BINARY_LT)) ++#define TREENODETYPE_IS_NODE_BINARY(n) (((n) == TREENODETYPE_NODE_BINARY_EQ) || \ ++ ((n) == TREENODETYPE_NODE_BINARY_LT)) ++ ++#define TREENODETYPE_IS_LEAF(n) (((n) == TREENODETYPE_LEAF_P) || \ ++ ((n) == TREENODETYPE_LEAF_C)) ++ ++ ++#define TREE_SUBTREE_RELATION_LEFT_EQ != ++#define TREE_SUBTREE_RELATION_RIGHT_EQ == ++#define TREE_SUBTREE_RELATION_LEFT_LT < ++#define TREE_SUBTREE_RELATION_RIGHT_LT >= ++ ++#define GET_NODE_PTR_TYPE(n) (((TreeNodeDummy*)(n))->type) ++ ++typedef struct ++{ ++ u8 type; ++} TreeNodeDummy; ++ ++typedef struct ++{ ++ u8 type; // [TREENODETYPE_NODE_BINARY] ++ u8 attribute; ++ PredictorType value; ++ void *left; ++ void *right; ++} TreeNodeBinary; ++ ++typedef struct ++{ ++ u8 type; // [TREENODETYPE_LEAF_P] ++ u16 pairs; ++ PredictorType *probabilities; ++} TreeLeafP; ++ ++typedef struct ++{ ++ u8 type; // [TREENODETYPE_LEAF_C] ++ PredictorType predicted_class; ++} TreeLeafC; ++ ++typedef struct ++{ ++ u32 high; ++ u32 low; ++ u32 max; ++} ProbabilityType; ++ ++ ++typedef struct ++{ ++ void *root; ++ u16 number_of_classes; ++ u16 number_of_predictors; ++ PredictorType *predictor_max_values; ++} DecisionTree; ++ ++#ifdef JFFS2_BBC_ARMLIB_MODELGEN ++static void decisiontree_delete(DecisionTree *); ++static void decisiontree_get_probability_for_token(void *, PredictorType *, TokenType, ProbabilityType *); ++static TokenType decisiontree_get_token_for_range(void *, PredictorType *, u32, u32, ProbabilityType *); ++#endif ++ ++#endif ++ ++//ORIGIN: include/DataStructures/PredictorTable.h ++ ++/******************************************************************************* ++* FILE: PredictorTable.h ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++#ifndef PREDICTORTABLE_H ++#define PREDICTORTABLE_H ++ ++//#include "DataStructures/TypeDefs.h" ++//#include "DataStructures/DataTypes.h" ++////#include "DataStructures/Filter.h" ++////#include "DataStructures/Converter.h" ++////#include "DataStructures/Manipulator.h" ++ ++#define NUMBER_OF_PREDICTORS_ARM 17 ++ ++#ifndef __KERNEL__ ++#define NUMBER_OF_PREDICTORS_TXT 2 ++#else ++#undef TXT_TOKENS ++#endif // __KERNEL__ ++ ++#ifdef TXT_TOKENS ++#define NUMBER_OF_PREDICTORS NUMBER_OF_PREDICTORS_TXT ++#define predictortable_reset predictortable_resetTXT ++#define predictortable_update predictortable_updateTXT ++#define predictortable_minvalue predictortable_minvalueTXT ++#define predictortable_maxvalue predictortable_maxvalueTXT ++#else ++#define NUMBER_OF_PREDICTORS NUMBER_OF_PREDICTORS_ARM ++#define predictortable_reset predictortable_resetARM ++#define predictortable_update predictortable_updateARM ++#define predictortable_minvalue predictortable_minvalueARM ++#define predictortable_maxvalue predictortable_maxvalueARM ++#endif ++ ++ ++#pragma pack(4) ++ ++typedef struct ++{ ++ PredictorType *predictors; ++} PredictorTable; ++ ++#ifdef JFFS2_BBC_ARMLIB_MODELGEN ++static void predictortable_clear(PredictorTable *); ++static void predictortable_free(PredictorTable *); ++static void predictortable_resetARM(PredictorTable *); ++static void predictortable_updateARM(PredictorTable *, TokenType); ++static PredictorType predictortable_minvalueARM(PredictorTable *, u32); ++static PredictorType predictortable_maxvalueARM(PredictorTable *, u32); ++#endif ++ ++#ifndef __KERNEL__ ++/* ++static void predictortable_resetTXT(PredictorTable *); ++static void predictortable_updateTXT(PredictorTable *, TokenType); ++static PredictorType predictortable_minvalueTXT(PredictorTable *, u32); ++static PredictorType predictortable_maxvalueTXT(PredictorTable *, u32); ++*/ ++#endif // __KERNEL__ ++ ++#endif ++ ++//ORIGIN: include/DataStructures/ipack_model.h ++ ++/******************************************************************************* ++* FILE: ipack_model.h ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++#ifndef IPACK_MODEL_H ++#define IPACK_MODEL_H ++ ++//#include "DataStructures/DataTypes.h" ++//#include "DataStructures/DecisionTree.h" ++//#include "DataStructures/PredictorTable.h" ++ ++#define PROBABILITY_SHIFT 12 ++#define PROBABILITY_MAX 0x00001000l ++ ++#define NUMBER_OF_TOKENS_ARM 16 ++#define NUMBER_OF_TOKENS_PER_INSTRUCTION_ARM 8 ++ ++#ifndef __KERNEL__ ++#define NUMBER_OF_TOKENS_TXT 256 ++#define NUMBER_OF_TOKENS_PER_INSTRUCTION_TXT 4 ++#else ++#undef TXT_TOKENS ++#endif // __KERNEL__ ++ ++#ifdef TXT_TOKENS ++#define NUMBER_OF_TOKENS NUMBER_OF_TOKENS_TXT ++#define NUMBER_OF_TOKENS_PER_INSTRUCTION NUMBER_OF_TOKENS_PER_INSTRUCTION_TXT ++#else ++#define NUMBER_OF_TOKENS NUMBER_OF_TOKENS_ARM ++#define NUMBER_OF_TOKENS_PER_INSTRUCTION NUMBER_OF_TOKENS_PER_INSTRUCTION_ARM ++#endif ++ ++#pragma pack(4) ++ ++/* ++ Data structure of an internal node of the tree ++*/ ++typedef struct ++{ ++ PredictorType *attribute_ptr; ++ u32 value; // PredictorType ++ void *right_child_ptr; ++} ipack_treenodeBin; ++/* ++ Data structure of a leaf with probabilities ++*/ ++typedef struct ++{ ++ u16 probabilities[0]; // PredictorType[0] ++} ipack_treeleafP; ++/* ++ Data structure of a leaf with class prediction ++*/ ++typedef struct ++{ ++ PredictorType predicted_class; // PredictorType ++} ipack_treeleafC; ++/* ++ Possible data structures of a tree node ++*/ ++typedef union ++{ ++ ipack_treenodeBin nodeBin; ++ ipack_treeleafP leafP; ++ ipack_treeleafC leafC; ++} ipack_node_data; ++/* ++ Tree node ++*/ ++typedef struct ++{ ++ u32 type; // u8 ++ ipack_node_data data; // ipack_node_data ++} ipack_nodetype; ++/* ++ Nullnode ++*/ ++typedef struct ++{ ++ u32 type; ++ u16 probabilities[NUMBER_OF_TOKENS]; ++} ipack_nullnode; ++/* ++ Model for ipack project ++*/ ++typedef struct ++{ ++ char ID[4]; // char[4] ++ char block_sign[4]; // only the first 2 are used! ++ void *tree_root_ptr; // void* ++ void *tree_code; // generated ARM code ++ PredictorType *predictors_ptr; // PredictorType* ++ ipack_nullnode nullnode; ++} ipack_model_type; ++ ++typedef struct ++{ ++ u32 high; ++ u32 low; ++} ipack_probability_type; ++ ++ ++static void ipack_model_get_probability_for_token(ipack_nodetype *, TokenType, ipack_probability_type *); ++static TokenType ipack_model_get_token_for_range(ipack_nodetype *, u32, u32, ipack_probability_type *); ++/*void ipack_model_predictortable_reset (PredictorType*); ++void ipack_model_predictortable_update (PredictorType*, TokenType);*/ ++ ++#ifndef __KERNEL__ ++/*static void ipack_model_printinfo(ipack_model_type *); ++static void ipack_dumpmodel(void *);*/ ++#endif ++ ++#endif ++ ++//ORIGIN: include/Builders/PredictorGenerator.h ++ ++/******************************************************************************* ++* FILE: PredictorGenerator.h ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++#ifndef PREDICTORGENERATOR_H ++#define PREDICTORGENERATOR_H ++ ++//#include "DataStructures.h" ++ ++#ifdef JFFS2_BBC_ARMLIB_MODELGEN ++static PredictorTable *predictorgenerator_generate(void); ++#endif ++ ++#endif ++ ++//ORIGIN: include/Builders/Coder.h ++ ++/******************************************************************************* ++* FILE: Coder.h ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++#ifndef CODER_H ++#define CODER_H ++ ++#define CODER_VALUEBITS 16 ++#define CODER_VALUEMAX 0x00010000l ++#define CODER_VALUE3RD 0x0000c000l ++#define CODER_VALUEHLF 0x00008000l ++#define CODER_VALUE1ST 0x00004000l ++ ++#endif ++ ++//ORIGIN: DataStructures/src/TypeDefs.c ++ ++/******************************************************************************* ++* FILE: TypeDefs.c ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++//#include "ipack_common.h" ++//#include "DataStructures/TypeDefs.h" ++#ifndef __KERNEL__ ++#include <memory.h> ++#endif ++ ++#define VECTOR_ALLOC_SIZE 0x00001000 ++ ++static void vector_clear(vector * vct) ++{ ++ if (vct->ptr) ++ jffs2_bbc_free(vct->ptr); ++ vct->capacity = 0; ++ vct->size = 0; ++ vct->ptr = 0; ++} ++ ++#ifdef JFFS2_BBC_ARMLIB_MODELGEN ++static void vector_extend(vector * vct) ++{ ++ void *tmp; ++ vct->capacity += vct->alloc_size; ++ tmp = jffs2_bbc_malloc(vct->capacity); ++ if (vct->ptr) { ++ memcpy(tmp, vct->ptr, vct->size); ++ jffs2_bbc_free(vct->ptr); ++ } ++ vct->ptr = tmp; ++} ++ ++static void vector_reset(vector * vct) ++{ ++ vct->capacity = 0; ++ vct->size = 0; ++ vct->alloc_size = VECTOR_ALLOC_SIZE; ++ vct->ptr = 0; ++} ++ ++static void vector_clr_ptr(vector * vct) ++{ ++ void **it; ++ void *end_it; ++ for (it = vct->ptr, end_it = (((char *) (vct->ptr)) + vct->size); it != end_it; it++) { ++ vector_clear(*it); ++ jffs2_bbc_free(*it); ++ } ++ if (vct->ptr) ++ jffs2_bbc_free(vct->ptr); ++ vct->capacity = 0; ++ vct->size = 0; ++ vct->ptr = 0; ++} ++ ++static void vector_add_u8(vector * vct, u8 val) ++{ ++ if ((vct->size) + sizeof(u8) > (vct->capacity)) { ++ vector_extend(vct); ++ } ++ *(u8 *) ((char *) (vct->ptr) + (vct->size)) = val; ++ vct->size += sizeof(u8); ++}; ++ ++static void vector_add_u16(vector * vct, u16 val) ++{ ++ if ((vct->size) + sizeof(u16) > (vct->capacity)) { ++ vector_extend(vct); ++ } ++ *(u16 *) ((char *) (vct->ptr) + (vct->size)) = val; ++ vct->size += sizeof(u16); ++}; ++ ++static void vector_add_u32(vector * vct, u32 val) ++{ ++ if ((vct->size) + sizeof(u32) > (vct->capacity)) { ++ vector_extend(vct); ++ } ++ *(u32 *) ((char *) (vct->ptr) + (vct->size)) = val; ++ vct->size += sizeof(u32); ++}; ++ ++static void vector_add_s8(vector * vct, s8 val) ++{ ++ if ((vct->size) + sizeof(s8) > (vct->capacity)) { ++ vector_extend(vct); ++ } ++ *(s8 *) ((char *) (vct->ptr) + (vct->size)) = val; ++ vct->size += sizeof(s8); ++}; ++ ++static void vector_add_s16(vector * vct, s16 val) ++{ ++ if ((vct->size) + sizeof(s16) > (vct->capacity)) { ++ vector_extend(vct); ++ } ++ *(s16 *) ((char *) (vct->ptr) + (vct->size)) = val; ++ vct->size += sizeof(s16); ++}; ++ ++static void vector_add_s32(vector * vct, s32 val) ++{ ++ if ((vct->size) + sizeof(s32) > (vct->capacity)) { ++ vector_extend(vct); ++ } ++ *(s32 *) ((char *) (vct->ptr) + (vct->size)) = val; ++ vct->size += sizeof(s32); ++}; ++ ++static void vector_add_ptr(vector * vct, void *ptr) ++{ ++ if ((vct->size) + sizeof(void *) > (vct->capacity)) { ++ vector_extend(vct); ++ } ++ *(void **) ((char *) (vct->ptr) + (vct->size)) = ptr; ++ vct->size += sizeof(void *); ++} ++ ++static void vector_concat(vector * lhs, vector * rhs) ++{ ++ void *tmp; ++ if (!(rhs->size)) { ++ return; ++ } ++ tmp = lhs->ptr; ++ lhs->capacity = (lhs->size) + (rhs->size); ++ lhs->ptr = jffs2_bbc_malloc(lhs->capacity); ++ if (tmp) { ++ memcpy(lhs->ptr, tmp, lhs->size); ++ jffs2_bbc_free(tmp); ++ } ++ memcpy((((u8 *) lhs->ptr) + lhs->size), rhs->ptr, rhs->size); ++ lhs->size += rhs->size; ++} ++ ++#endif ++ ++//ORIGIN: DataStructures/src/BitVector.c ++ ++/******************************************************************************* ++* FILE: BitVector.c ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++//#include "ipack_common.h" ++//#include "DataStructures/BitVector.h" ++#ifndef __KERNEL__ ++#include <memory.h> ++#endif ++ ++#define VECTOR_ALLOC_SIZE 0x00001000 ++ ++#ifdef JFFS2_BBC_ARMLIB_MODELGEN ++ ++static void bitblocks_clear(BitBlocks * this) ++{ ++ BitVector **it; ++ void *end_it; ++ for (it = this->ptr, end_it = VECTOR_P_END(this); it != end_it; it++) { ++ bitvector_clear(*it); ++ jffs2_bbc_free(*it); ++ } ++ jffs2_bbc_free(this->ptr); ++ this->ptr = 0; ++} ++ ++static void bitvector_clear(BitVector * this) ++{ ++ if (this->base) { ++ jffs2_bbc_free(this->base); ++ } ++ this->freebits = 0; ++ this->capacity = 0; ++ this->size = 0; ++ this->base = 0; ++ this->ptr = 0; ++} ++ ++static void bitvector_W_reset(BitVector * this) ++{ ++ this->freebits = 0; ++ this->capacity = 0; ++ this->size = 0; ++ this->base = 0; ++ this->ptr = 0; ++} ++ ++static void bitvector_W_add0(BitVector * this) ++{ ++ if (!(this->freebits)) { ++ if (this->size == this->capacity) { ++ void *tmp = this->base; ++ this->capacity += VECTOR_ALLOC_SIZE; ++ this->base = jffs2_bbc_malloc(this->capacity); ++ this->ptr = ((u8 *) (this->base)) + this->size; ++ memcpy(this->base, tmp, this->size); ++ jffs2_bbc_free(tmp); ++ } ++ else { ++ this->ptr++; ++ } ++ this->size++; ++ this->freebits = 7; ++ *(this->ptr) = 0x00; ++ } ++ else { ++ this->freebits--; ++ (*(this->ptr)) <<= 1; ++ } ++} ++ ++static void bitvector_W_add1(BitVector * this) ++{ ++ if (!(this->freebits)) { ++ if (this->size == this->capacity) { ++ void *tmp = this->base; ++ this->capacity += VECTOR_ALLOC_SIZE; ++ this->base = jffs2_bbc_malloc(this->capacity); ++ this->ptr = ((u8 *) (this->base)) + this->size; ++ memcpy(this->base, tmp, this->size); ++ jffs2_bbc_free(tmp); ++ } ++ else { ++ this->ptr++; ++ } ++ this->size++; ++ this->freebits = 7; ++ *(this->ptr) = 0x01; ++ } ++ else { ++ this->freebits--; ++ (*(this->ptr)) <<= 1; ++ (*(this->ptr)) |= 0x01; ++ } ++} ++ ++static void bitvector_W_concat_b(BitVector * lhs, BitVector * rhs) ++{ ++ void *tmp; ++ if (!(rhs->size)) { ++ return; ++ } ++ tmp = lhs->base; ++ lhs->capacity = ((((lhs->size) + (rhs->size) - 1) / VECTOR_ALLOC_SIZE) + 1) * VECTOR_ALLOC_SIZE; ++ lhs->base = jffs2_bbc_malloc(lhs->capacity); ++ if (tmp) { ++ memcpy(lhs->base, tmp, lhs->size); ++ jffs2_bbc_free(tmp); ++ } ++ memcpy((((u8 *) (lhs->base)) + lhs->size), rhs->base, rhs->size); ++ lhs->freebits = 0; ++ lhs->size += rhs->size; ++ lhs->ptr = ((u8 *) (lhs->base)) + lhs->size; ++} ++ ++static void bitvector_W_concat_v(BitVector * lhs, vector * rhs) ++{ ++ void *tmp; ++ if (!(rhs->size)) { ++ return; ++ } ++ tmp = lhs->base; ++ lhs->capacity = ((((lhs->size) + (rhs->size) - 1) / VECTOR_ALLOC_SIZE) + 1) * VECTOR_ALLOC_SIZE; ++ lhs->base = jffs2_bbc_malloc(lhs->capacity); ++ if (tmp) { ++ memcpy(lhs->base, tmp, lhs->size); ++ jffs2_bbc_free(tmp); ++ } ++ memcpy((((u8 *) (lhs->base)) + lhs->size), rhs->ptr, rhs->size); ++ lhs->freebits = 0; ++ lhs->size += rhs->size; ++ lhs->ptr = ((u8 *) (lhs->base)) + lhs->size; ++} ++ ++static void bitvector_W_flush(BitVector * this) ++{ ++ (*(this->ptr)) <<= this->freebits; ++ this->freebits = 0; ++} ++ ++static void bitvector_R_reset(BitVector * this) ++{ ++ this->freebits = 7; ++ this->ptr = this->base; ++} ++ ++static u8 bitvector_R_get1(BitVector * this) ++{ ++ u8 tmp = ((*(this->ptr)) >> this->freebits) & 0x01; ++ if (!(this->freebits)) { ++ this->freebits = 7; ++ this->ptr++; ++ } ++ else { ++ this->freebits--; ++ } ++ return tmp; ++} ++ ++static u8 bitvector_R_get8(BitVector * this) ++{ ++ u8 tmp = (*(this->ptr)); ++ this->ptr++; ++ return tmp; ++} ++ ++#endif ++ ++//ORIGIN: DataStructures/src/DecisionTree.c ++ ++/******************************************************************************* ++* FILE: DecisionTree.c ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++//#include "ipack_common.h" ++//#include "DataStructures/DecisionTree.h" ++ ++static void decisiontree_delete_node(void *root) ++{ ++ u8 tmp = GET_NODE_PTR_TYPE(root); ++ if (TREENODETYPE_IS_NODE_BINARY(tmp)) { ++ decisiontree_delete_node(((TreeNodeBinary *) root)->left); ++ decisiontree_delete_node(((TreeNodeBinary *) root)->right); ++ } ++ else if ((tmp) == TREENODETYPE_LEAF_P) { ++ if (((TreeLeafP *) root)->probabilities) { ++ jffs2_bbc_free(((TreeLeafP *) root)->probabilities); ++ } ++ } ++ else if ((tmp) == TREENODETYPE_LEAF_C) { ++ } ++ jffs2_bbc_free(root); ++} ++ ++#ifdef JFFS2_BBC_ARMLIB_MODELGEN ++ ++static void decisiontree_delete(DecisionTree * dt) ++{ ++ decisiontree_delete_node(dt->root); ++ jffs2_bbc_free(dt->predictor_max_values); ++} ++ ++static void decisiontree_get_probability_for_token(void *root, PredictorType * preds, TokenType token, ProbabilityType * prob) ++{ ++ void *tmp = root; ++ while (TREENODETYPE_IS_NODE(((TreeNodeBinary *) tmp)->type)) { ++ if (((TreeNodeBinary *) tmp)->type == TREENODETYPE_NODE_BINARY_EQ) { ++ if (preds[((TreeNodeBinary *) tmp)->attribute] TREE_SUBTREE_RELATION_LEFT_EQ((TreeNodeBinary *) tmp)->value) { ++ tmp = ((TreeNodeBinary *) tmp)->left; ++ } ++ else { ++ tmp = ((TreeNodeBinary *) tmp)->right; ++ } ++ } ++ else if (((TreeNodeBinary *) tmp)->type == TREENODETYPE_NODE_BINARY_LT) { ++ if (preds[((TreeNodeBinary *) tmp)->attribute] TREE_SUBTREE_RELATION_LEFT_LT((TreeNodeBinary *) tmp)->value) { ++ tmp = ((TreeNodeBinary *) tmp)->left; ++ } ++ else { ++ tmp = ((TreeNodeBinary *) tmp)->right; ++ } ++ } ++ } ++ prob->high = 0; ++ prob->low = 0; ++ prob->max = 0; ++ if (((TreeNodeBinary *) tmp)->type == TREENODETYPE_LEAF_P) { ++ u32 i; ++ u32 lngth = ((TreeLeafP *) tmp)->pairs << 1; ++ for (i = 0; i < lngth;) { ++ TokenType at = ((TreeLeafP *) tmp)->probabilities[i++]; ++ TokenType av = ((TreeLeafP *) tmp)->probabilities[i++]; ++ if (token > at) ++ prob->low += av; ++ if (token >= at) ++ prob->high += av; ++ prob->max += av; ++ } ++ } ++ else if (((TreeNodeBinary *) tmp)->type == TREENODETYPE_LEAF_C) { ++ if (((TreeLeafC *) tmp)->predicted_class == token) { ++ prob->high = TOKEN_MAXVALUE; ++ prob->max = TOKEN_MAXVALUE; ++ } ++ } ++} ++ ++static TokenType decisiontree_get_token_for_range(void *root, PredictorType * preds, u32 value, u32 range, ProbabilityType * prob) ++{ ++ void *tmp = root; ++ TokenType token = 0; ++ while (TREENODETYPE_IS_NODE(((TreeNodeBinary *) tmp)->type)) { ++ if (((TreeNodeBinary *) tmp)->type == TREENODETYPE_NODE_BINARY_EQ) { ++ if (preds[((TreeNodeBinary *) tmp)->attribute] TREE_SUBTREE_RELATION_LEFT_EQ((TreeNodeBinary *) tmp)->value) { ++ tmp = ((TreeNodeBinary *) tmp)->left; ++ } ++ else { ++ tmp = ((TreeNodeBinary *) tmp)->right; ++ } ++ } ++ else if (((TreeNodeBinary *) tmp)->type == TREENODETYPE_NODE_BINARY_LT) { ++ if (preds[((TreeNodeBinary *) tmp)->attribute] TREE_SUBTREE_RELATION_LEFT_LT((TreeNodeBinary *) tmp)->value) { ++ tmp = ((TreeNodeBinary *) tmp)->left; ++ } ++ else { ++ tmp = ((TreeNodeBinary *) tmp)->right; ++ } ++ } ++ } ++ prob->high = 0; ++ prob->low = 0; ++ prob->max = 0; ++ if (((TreeNodeBinary *) tmp)->type == TREENODETYPE_LEAF_P) { ++ u32 i; ++ u32 norm; ++ TokenType at = 0; ++ TokenType av; ++ u32 lngth = ((TreeLeafP *) tmp)->pairs << 1; ++ for (i = 0; i < lngth;) { ++ i++; ++ prob->max += ((TreeLeafP *) tmp)->probabilities[i++]; ++ } ++ norm = (value * prob->max - 1) / range; ++ for (i = 0; prob->high <= norm;) { ++ at = ((TreeLeafP *) tmp)->probabilities[i++]; ++ av = ((TreeLeafP *) tmp)->probabilities[i++]; ++ prob->high += av; ++ if (prob->high <= norm) ++ prob->low += av; ++ } ++ token = at; ++ } ++ else if (((TreeNodeBinary *) tmp)->type == TREENODETYPE_LEAF_C) { ++ token = ((TreeLeafC *) tmp)->predicted_class; ++ prob->high = TOKEN_MAXVALUE; ++ prob->max = TOKEN_MAXVALUE; ++ } ++ return token; ++} ++#endif ++ ++//ORIGIN: DataStructures/src/PredictorTable.c ++ ++/******************************************************************************* ++* FILE: PredictorTable.c ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++//#include "ipack_common.h" ++//#include "DataStructures/PredictorTable.h" ++ ++#ifdef JFFS2_BBC_ARMLIB_MODELGEN ++ ++static void predictortable_clear(PredictorTable * table) ++{ ++ table->predictors = 0; ++} ++ ++static void predictortable_free(PredictorTable * table) ++{ ++ if (table->predictors) { ++ jffs2_bbc_free(table->predictors); ++ table->predictors = 0; ++ } ++} ++ ++static void predictortable_resetARM(PredictorTable * table) ++{ ++ register PredictorType *ptr = table->predictors; ++ register PredictorType *end = ptr + NUMBER_OF_PREDICTORS_ARM; ++ while (ptr < end) { ++ *(ptr++) = 0; ++ } ++} ++ ++static void predictortable_updateARM(PredictorTable * table, TokenType token) ++{ ++ register PredictorType *ptr = table->predictors; ++ register u32 ndx = ptr[0] + 1; ++ ptr[ndx + 8] = ptr[ndx]; ++ ptr[ndx] = token; ++ if (ndx == 8) { ++ ptr[0] = 0; ++ } ++ else { ++ ++ptr[0]; ++ } ++} ++ ++static PredictorType predictortable_minvalueARM(PredictorTable * table, u32 index) ++{ ++ return 0; ++} ++ ++static PredictorType predictortable_maxvalueARM(PredictorTable * table, u32 index) ++{ ++ if (index == 0) { ++ return 7; ++ } ++ else { ++ return 15; ++ } ++} ++ ++#endif ++ ++#ifndef __KERNEL__ ++ ++/*static void predictortable_resetTXT(PredictorTable * table) ++{ ++ register PredictorType *ptr = table->predictors; ++ register PredictorType *end = ptr + NUMBER_OF_PREDICTORS_TXT; ++ while (ptr < end) { ++ *(ptr++) = 0; ++ } ++} ++ ++static void predictortable_updateTXT(PredictorTable * table, TokenType token) ++{ //TODO: modify ++ register PredictorType *ptr = table->predictors; ++// register u32 ndx; ++ ptr[0] = token; ++ if ((('a' <= token) && (token <= 'z')) || (('A' <= token) && (token <= 'Z'))) { ++ ++(ptr[1]); ++ } ++ else { ++ ptr[1] = 0; ++ } ++} ++ ++static PredictorType predictortable_minvalueTXT(PredictorTable * table, u32 index) ++{ ++ return 0; ++} ++ ++static PredictorType predictortable_maxvalueTXT(PredictorTable * table, u32 index) ++{ //TODO: modify ++ return 254; ++}*/ ++ ++#endif // __KERNEL__ ++ ++//ORIGIN: DataStructures/src/ipack_model.c ++ ++/******************************************************************************* ++* FILE: ipack_model.c ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++//#include "DataStructures/ipack_model.h" ++//#include "measuredef.h" ++//#include "ipack_common.h" ++ ++#ifdef __MEASURE_TIME_MODEL_GETPROB ++#define __MT_P_MAX 256 ++#define __MT_P_DIV 128 ++#define __MT_P_MIN 0 ++#endif ++ ++static void ipack_model_get_probability_for_token(ipack_nodetype * tmp, TokenType token, ipack_probability_type * prob) ++{ ++// register ipack_nodetype* tmp = model->tree_root_ptr; ++// register ipack_nodetype* tmp = root; ++ while (TREENODETYPE_IS_NODE(tmp->type)) { ++ if (tmp->type == TREENODETYPE_NODE_BINARY_EQ) { ++ if (*(tmp->data.nodeBin.attribute_ptr) TREE_SUBTREE_RELATION_LEFT_EQ tmp->data.nodeBin.value) { ++ ((char *) tmp) += sizeof(tmp->type) + sizeof(ipack_treenodeBin); ++ } ++ else { ++ tmp = tmp->data.nodeBin.right_child_ptr; ++ } ++ } ++ else if (tmp->type == TREENODETYPE_NODE_BINARY_LT) { ++ if (*(tmp->data.nodeBin.attribute_ptr) TREE_SUBTREE_RELATION_LEFT_LT tmp->data.nodeBin.value) { ++ ((char *) tmp) += sizeof(tmp->type) + sizeof(ipack_treenodeBin); ++ } ++ else { ++ tmp = tmp->data.nodeBin.right_child_ptr; ++ } ++ } ++ } ++ prob->high = 0; ++ prob->low = 0; ++// prob->max = 0; ++ if (tmp->type == TREENODETYPE_LEAF_P) { ++ if (token) { ++ prob->low = tmp->data.leafP.probabilities[token - 1]; ++ } ++ prob->high = tmp->data.leafP.probabilities[token]; ++// prob->max = tmp->data.leafP.probabilities[15]; ++ } ++ else if (tmp->type == TREENODETYPE_LEAF_C) { ++ if (tmp->data.leafC.predicted_class == token) { ++ prob->high = TOKEN_MAXVALUE; ++// prob->max = TOKEN_MAXVALUE; ++ } ++ } ++} ++ ++#ifndef IPACK_ARM_ASM ++ ++//return ipack_model_get_token_for_range2(tmp,value,range,prob); ++ ++static TokenType ipack_model_get_token_for_range(ipack_nodetype * tmp, u32 value, u32 range, ipack_probability_type * prob) ++{ ++// register ipack_nodetype* tmp = model->tree_root_ptr; ++// register ipack_nodetype* tmp = root; ++ register TokenType token = 0; ++ while (TREENODETYPE_IS_NODE(tmp->type)) { ++ if (tmp->type == TREENODETYPE_NODE_BINARY_EQ) { ++ if (*(tmp->data.nodeBin.attribute_ptr) TREE_SUBTREE_RELATION_LEFT_EQ tmp->data.nodeBin.value) { ++ ((char *) tmp) += sizeof(tmp->type) + sizeof(ipack_treenodeBin); ++ } ++ else { ++ tmp = tmp->data.nodeBin.right_child_ptr; ++ } ++ } ++ else if (tmp->type == TREENODETYPE_NODE_BINARY_LT) { ++ if (*(tmp->data.nodeBin.attribute_ptr) TREE_SUBTREE_RELATION_LEFT_LT tmp->data.nodeBin.value) { ++ ((char *) tmp) += sizeof(tmp->type) + sizeof(ipack_treenodeBin); ++ } ++ else { ++ tmp = tmp->data.nodeBin.right_child_ptr; ++ } ++ } ++ } ++ prob->high = 0; ++ prob->low = 0; ++// prob->max = 0; ++ if (tmp->type == TREENODETYPE_LEAF_P) { ++ u32 i; ++ u32 norm; ++// prob->max = tmp->data.leafP.probabilities[15]; ++/* norm = (value * prob->max -1)/range; ++ for(i = 0; i < 15; ++i) { ++ if(tmp->data.leafP.probabilities[i] > norm) { ++ break; ++ } ++ }*/ ++ norm = ((value << PROBABILITY_SHIFT) - 1); ++ for (i = 0; i < NUMBER_OF_TOKENS; ++i) { ++ if (range * tmp->data.leafP.probabilities[i] > norm) { ++ break; ++ } ++ } ++ token = (TokenType) i; ++ prob->high = tmp->data.leafP.probabilities[i]; ++ if (token) { ++ prob->low = tmp->data.leafP.probabilities[token - 1]; ++ } ++ } ++ else if (tmp->type == TREENODETYPE_LEAF_C) { ++ token = tmp->data.leafC.predicted_class; ++ prob->high = PROBABILITY_MAX; ++// prob->max = PROBABILITY_MAX; ++ } ++ return token; ++} ++#endif ++/* ++void ipack_model_predictortable_reset(PredictorType* ptr) ++{ ++// register PredictorType* ptr = model->predictors_ptr; ++// register PredictorType* ptr = preds; ++ register PredictorType* end = ptr + NUMBER_OF_PREDICTORS; ++ while(ptr < end) { ++ *(ptr++) = 0; ++ } ++} ++ ++void ipack_model_predictortable_update(PredictorType* ptr, TokenType token) ++{ ++// register PredictorType* ptr = model->predictors_ptr; ++// register PredictorType* ptr = preds; ++ register u32 ndx = ptr[0] + 1; ++ ptr[ndx + 8] = ptr[ndx]; ++ ptr[ndx] = token; ++ if(ndx == 8) { ++ ptr[0] = 0; ++ } else { ++ ++ ptr[0]; ++ } ++}*/ ++/****************************************************************************/ ++ ++#ifndef __KERNEL__ ++static void ipack_model_countpreds(void *ptr, ipack_nodetype * node, double *table, double val) ++{ ++ if ((node->type == TREENODETYPE_NODE_BINARY_EQ) || (node->type == TREENODETYPE_NODE_BINARY_LT)) { ++ table[(u32) (node->data.nodeBin.attribute_ptr) - (u32) (ptr)] += val; ++ ipack_model_countpreds(ptr, (void *) (((u8 *) (node)) + sizeof(node->type) + sizeof(ipack_treenodeBin)), table, val / 2); ++ ipack_model_countpreds(ptr, node->data.nodeBin.right_child_ptr, table, val / 2); ++ } ++ else { ++ } ++} ++ ++/*static void ipack_model_printinfo(ipack_model_type * model) ++{ ++ double *prcnt = jffs2_bbc_malloc(sizeof(double) * NUMBER_OF_PREDICTORS); ++ u32 i; ++ for (i = 0; i < NUMBER_OF_PREDICTORS; i++) { ++ prcnt[i] = 0.0; ++ } ++ ipack_model_countpreds(model->predictors_ptr, model->tree_root_ptr, prcnt, 100); ++ for (i = 0; i < NUMBER_OF_PREDICTORS; i++) { ++ jffs2_bbc_print3(" p[%3d] = %10.6lf\n", (int) i, prcnt[i]); ++ } ++ jffs2_bbc_free(prcnt); ++}*/ ++ ++static void ipack_dumpnode(unsigned char **ptr, FILE * file, char *prefs) ++{ ++ switch (*((*ptr)++)) { ++ u32 i; ++ u32 j; ++ u32 x; ++ u32 y; ++ case TREENODETYPE_NODE_BINARY_EQ: ++ x = *((*ptr)++); ++ y = *((*ptr)++); ++ fprintf(file, "%s+->\tBinary node: P[%u] equals %u\n", prefs, (unsigned int)x, (unsigned int)y); ++ for (j = 0; j < 4096 && prefs[j]; ++j); ++ prefs[j] = '\t'; ++ prefs[++j] = '|'; ++ ipack_dumpnode(ptr, file, prefs); ++ prefs[j--] = 0; ++ ipack_dumpnode(ptr, file, prefs); ++ prefs[j] = 0; ++ break; ++ case TREENODETYPE_NODE_BINARY_LT: ++ x = *((*ptr)++); ++ y = *((*ptr)++); ++ fprintf(file, "%s+->\tBinary node: P[%u] greater than %u\n", prefs, (unsigned int)x, (unsigned int)y); ++ for (j = 0; j < 4096 && prefs[j]; ++j); ++ prefs[j] = '\t'; ++ prefs[++j] = '|'; ++ ipack_dumpnode(ptr, file, prefs); ++ prefs[j--] = 0; ++ ipack_dumpnode(ptr, file, prefs); ++ prefs[j] = 0; ++ break; ++ case TREENODETYPE_LEAF_P: ++ x = *((*ptr)++); ++ fprintf(file, "%s+->\tLeaf: %u pairs\n", prefs, (unsigned int)x); ++ (*ptr) += (x << 1); ++ break; ++ case TREENODETYPE_LEAF_C: ++ x = *((*ptr)++); ++ fprintf(file, "%s+->\tLeaf: class %u\n", prefs, (unsigned int)x); ++ break; ++ default: ++ fprintf(file, "%s+->\tLeaf: nullnode\n", prefs); ++ } ++} ++ ++/*static void ipack_dumpmodel(void *model) ++{ ++ unsigned char *tmp_ptr = model; ++ FILE *file; ++ char C[4096]; ++ if ((file = fopen("DUMPED_MODEL", "wa"))) { ++ int i; ++ for (i = 0; i < 4096; C[i++] = 0); ++ tmp_ptr += 8; ++ tmp_ptr += sizeof(u32); ++ ipack_dumpnode(&tmp_ptr, file, C); ++ fclose(file); ++ } ++}*/ ++ ++#endif ++ ++//ORIGIN: Builders/src/PredictorGenerator.c ++ ++/******************************************************************************* ++* FILE: PredictorGenerator.c ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++//#include "ipack_common.h" ++//#include "Builders/PredictorGenerator.h" ++ ++#ifdef JFFS2_BBC_ARMLIB_MODELGEN ++static PredictorTable *predictorgenerator_generate( /*PredictorGeneratorSettings* settings */ ) ++{ ++ PredictorTable *ptr = jffs2_bbc_malloc(sizeof(PredictorTable)); ++ predictortable_clear(ptr); ++ ptr->predictors = jffs2_bbc_malloc(NUMBER_OF_PREDICTORS * sizeof(PredictorType)); ++ return ptr; ++} ++#endif ++ ++//ORIGIN: Builders/src/ipack_armlib_compressor.c ++ ++/******************************************************************************* ++* FILE: ipack_armlim_compressor.c ++* AUTHOR: Tamás Gergely ++* MODIFIED: $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*******************************************************************************/ ++ ++//#include "ipack_common.h" ++//#include "DataStructures.h" ++//#include "Builders/PredictorGenerator.h" ++//#include "Builders/Tokenizer.h" ++//#include "Builders/Coder.h" ++ ++#define EC_NO_ERROR 0 ++#define EC_NOT_IPMF_FILE -1 ++#define EC_NOT_IPMF_MODEL -2 ++#define EC_NOT_HG_BLOCK -3 ++#define EC_WRONG_INPUT_LENGTH -501 ++#define EC_CODER_WRONG_PROBABILITY 1 ++#define EC_CODER_WRONG_RANGE 2 ++#define EC_BUFFER_OVERFLOW 501 ++#define EC_BUFFER_UNDERFLOW 502 ++#define EC_UNKNOWN_TOKEN_TYPE 1001 ++#define EC_UNKNOWN_FILTER 1002 ++#define EC_UNKNOWN_CONVERTER 1003 ++#define EC_UNKNOWN_MANIPULATOR 1004 ++ ++/******************************************************************************* ++ ++ COMPRESSOR INIT FUNCTIONS ++ ++*******************************************************************************/ ++ ++#define ROUND_UP_TO_DWORD(val) ( ( (val) + 3 ) & 0xfffffffc ) ++ ++#ifndef __KERNEL__ ++int ipack_glb_endian_X; ++#endif ++ ++static int ipack_compressor_init_tree(unsigned char **ptr, ipack_model_type * model, ipack_nodetype * node, void *nullnode) ++{ ++ int retval = 0; ++ node->type = *((*ptr)++); ++ switch (node->type) { ++ u32 i; ++ u32 j; ++ u32 lngth; ++ u32 tmpret; ++ TokenType at; ++ u16 av; ++ case TREENODETYPE_NODE_BINARY_EQ: ++ case TREENODETYPE_NODE_BINARY_LT: ++ node->data.nodeBin.attribute_ptr = (model->predictors_ptr) + (*((*ptr)++)); ++ node->data.nodeBin.value = *((*ptr)++); ++ retval = sizeof(node->data.nodeBin); ++ retval += ipack_compressor_init_tree(ptr, model, (void *) ROUND_UP_TO_DWORD(((u32) node) + sizeof(node->type) + sizeof(node->data.nodeBin)), nullnode); ++ node->data.nodeBin.right_child_ptr = (void *) ROUND_UP_TO_DWORD(((u32) node) + retval + sizeof(node->type)); ++ retval += ipack_compressor_init_tree(ptr, model, node->data.nodeBin.right_child_ptr, nullnode); ++ break; ++ case TREENODETYPE_LEAF_P: ++ lngth = *((*ptr)++); ++ av = 0; ++ for (i = 0, j = 0; i < lngth; ++i) { ++ at = *((*ptr)++); ++ while (j < at) { ++ node->data.leafP.probabilities[j++] = av; ++ } ++ av += *((*ptr)++); ++ } ++ while (j < NUMBER_OF_TOKENS) { ++ node->data.leafP.probabilities[j++] = av; ++ } ++ for (i = 0; i < NUMBER_OF_TOKENS; ++i) { ++ node->data.leafP.probabilities[i] = ((node->data.leafP.probabilities[i] << PROBABILITY_SHIFT) / node->data.leafP.probabilities[NUMBER_OF_TOKENS - 1]); ++ } ++ retval = ROUND_UP_TO_DWORD(NUMBER_OF_TOKENS * sizeof(u16)); ++ break; ++ case TREENODETYPE_LEAF_C: ++ node->data.leafC.predicted_class = *((*ptr)++); ++ retval = sizeof(node->data.leafC); ++ retval = ROUND_UP_TO_DWORD(retval); ++ break; ++ default: ++ return 0; ++ } ++ return retval + sizeof(node->type); ++} ++ ++#define IPACK_TREE_CONVERT_REPLACE 0 ++#define IPACK_TREE_CONVERT_KEEP 1 ++ ++static void *ipack_tree_to_code(ipack_model_type * model, int *code_size); ++ ++static int ipack_armlib_convert_tree_to_code(ipack_model_type * model_img, int mode) ++{ ++#ifdef IPACK_TREE_TO_CODE ++ int tree_size; ++ ++ model_img->tree_code = ipack_tree_to_code(model_img, &tree_size); ++ jffs2_bbc_print2("Convertation done. Code size=%d\n", tree_size); ++ if (mode == IPACK_TREE_CONVERT_REPLACE) { ++ jffs2_bbc_print1("Freeing original tree.\n"); ++ jffs2_bbc_free(model_img->tree_root_ptr); ++ model_img->tree_root_ptr = NULL; ++ } ++#endif ++ return 0; ++} ++ ++ ++static int ipack_armlib_compressor_init(void **model) ++{ ++ int retval = EC_NO_ERROR; ++ unsigned char *tmp_ptr = *model; ++ u32 i; ++ ipack_model_type *model_img; ++ char tmp_c[2]; ++ ++ if (*(tmp_ptr++) != 'i') { ++ return EC_NOT_IPMF_FILE; ++ } ++ else if (*(tmp_ptr++) != 'P') { ++ return EC_NOT_IPMF_FILE; ++ } ++ else if (*(tmp_ptr++) != 'M') { ++ return EC_NOT_IPMF_FILE; ++ } ++ else if (*(tmp_ptr++) != 'F') { ++ return EC_NOT_IPMF_FILE; ++ } ++ tmp_c[0] = *(tmp_ptr++); ++ tmp_c[1] = *(tmp_ptr++); ++ tmp_ptr += 2; ++ ++ //model_img = jffs2_bbc_malloc(*((u32*)tmp_ptr)); ++ model_img = jffs2_bbc_malloc(sizeof(ipack_model_type) + ROUND_UP_TO_DWORD(NUMBER_OF_PREDICTORS)); ++ model_img->tree_root_ptr = jffs2_bbc_malloc(*((u32 *) tmp_ptr)); //it is smaller a little but, but... ++ ++ tmp_ptr += sizeof(u32); ++ ++ model_img->ID[0] = 'i'; ++ model_img->ID[1] = 'P'; ++ model_img->ID[2] = 'M'; ++ model_img->ID[3] = 'F'; ++ ++ model_img->block_sign[0] = tmp_c[0]; ++ model_img->block_sign[1] = tmp_c[1]; ++ ++ model_img->nullnode.type = TREENODETYPE_LEAF_P; ++ for (i = 0; i < NUMBER_OF_TOKENS; ++i) { ++ model_img->nullnode.probabilities[i] = 0; ++ } ++ model_img->predictors_ptr = (void *) (((u32) model_img) + sizeof(ipack_model_type)); ++ //model_img->tree_root_ptr = (void*)ROUND_UP_TO_DWORD(((u32)(model_img->predictors_ptr)) + NUMBER_OF_PREDICTORS);//ALIGN ++ ++ ipack_compressor_init_tree(&tmp_ptr, model_img, model_img->tree_root_ptr, &(model_img->nullnode)); ++ ++#ifdef IPACK_TREE_TO_CODE ++#ifdef IPACK_AUTO_TREE_TO_CODE ++ jffs2_bbc_print1("Automatically converting tree to ARM code...\n"); ++ ipack_armlib_convert_tree_to_code(model_img, IPACK_TREE_CONVERT_REPLACE); ++#else ++ model_img->tree_code = NULL; ++#endif ++#else ++ model_img->tree_code = NULL; ++#endif ++ ++ jffs2_bbc_free(*model); ++ *model = model_img; ++ return retval; ++} ++ ++/******************************************************************************* ++ ++ COMPRESSOR DEINIT FUNCTIONS ++ ++*******************************************************************************/ ++ ++ ++/* Descructor of compressor (model will be freed with jffs2_bbc_free() after it)*/ ++static void ipack_armlib_compressor_deinit(void) ++{ ++} ++ ++/******************************************************************************* ++ ++ COMPRESS FUNCTIONS ++ ++*******************************************************************************/ ++ ++static int writebits0(unsigned char **dest, u8 * freebits, u32 * opposite, unsigned char *end) ++{ ++ if (!(*freebits)) { ++ ++(*dest); ++ *freebits = 7; ++ **dest = 0x00; ++ } ++ else { ++ --(*freebits); ++ (**dest) <<= 1; ++ } ++ if ((*dest == end) && !(*freebits)) { ++ return EC_BUFFER_OVERFLOW; ++ } ++ while (*opposite) { ++ --(*opposite); ++ if (!(*freebits)) { ++ ++(*dest); ++ *freebits = 7; ++ **dest = 0x01; ++ } ++ else { ++ --(*freebits); ++ (**dest) <<= 1; ++ (**dest) |= 0x01; ++ } ++ if ((*dest == end) && !(*freebits)) { ++ return EC_BUFFER_OVERFLOW; ++ } ++ } ++ return 0; ++} ++ ++static int writebits1(unsigned char **dest, u8 * freebits, u32 * opposite, unsigned char *end) ++{ ++ if (!(*freebits)) { ++ ++(*dest); ++ *freebits = 7; ++ **dest = 0x01; ++ } ++ else { ++ --(*freebits); ++ (**dest) <<= 1; ++ (**dest) |= 0x01; ++ } ++ if ((*dest == end) && !(*freebits)) { ++ return EC_BUFFER_OVERFLOW; ++ } ++ while (*opposite) { ++ --(*opposite); ++ if (!(*freebits)) { ++ ++(*dest); ++ *freebits = 7; ++ **dest = 0x00; ++ } ++ else { ++ --(*freebits); ++ (**dest) <<= 1; ++ } ++ if ((*dest == end) && !(*freebits)) { ++ return EC_BUFFER_OVERFLOW; ++ } ++ } ++ return 0; ++} ++ ++ ++ ++ ++/* Compress block ++ * *dstlen bytes are allocated. ++ * if it is not enough write *sourcelen over to the processed amount of data ++ * returns non zero if fails ++ */ ++static int ipack_armlib_compress(void *model, unsigned char *input, unsigned char *output, unsigned long *sourcelen, unsigned long *dstlen) ++{ ++ register u32 coder_high = CODER_VALUEMAX - 1; ++ register u32 coder_low = 0; ++ u32 coder_opbits = 0; ++ u8 bitvector_freebits = 8; ++ unsigned char *bitvector_ptr = output; ++ unsigned char *bitvector_end = output + (*dstlen - 1); ++ ARM_DataType *tmpp; ++ TokenStream tmpv; ++ TokenType *it; ++ void *end_it; ++ ++ ipack_nodetype *treeroot = ((ipack_model_type *) model)->tree_root_ptr; ++ PredictorType *predctrs = ((ipack_model_type *) model)->predictors_ptr; ++ ++#ifdef IPACK_TREE_TO_CODE ++ void (*treefunc) (ipack_nodetype *, TokenType, ipack_probability_type *); ++ ++ treefunc = ((ipack_model_type *) model)->tree_code; ++ if (treefunc != NULL) ++ treefunc += 4; ++#endif ++ ++ if ((*sourcelen % 4) != 0) { ++ return EC_WRONG_INPUT_LENGTH; ++ } ++ if (*dstlen <= 4) { ++ return EC_BUFFER_OVERFLOW; ++ } ++ ++ if (((ipack_model_type *) model)->ID[0] != 'i') { ++ return EC_NOT_IPMF_MODEL; ++ } ++ else if (((ipack_model_type *) model)->ID[1] != 'P') { ++ return EC_NOT_IPMF_MODEL; ++ } ++ else if (((ipack_model_type *) model)->ID[2] != 'M') { ++ return EC_NOT_IPMF_MODEL; ++ } ++ else if (((ipack_model_type *) model)->ID[3] != 'F') { ++ return EC_NOT_IPMF_MODEL; ++ } ++#ifdef TXT_TOKENS ++ tmpv.capacity = (*sourcelen); ++#else ++ tmpv.capacity = (*sourcelen) << 1; ++#endif ++ tmpv.size = tmpv.capacity; ++ tmpv.ptr = jffs2_bbc_malloc(tmpv.size); ++ it = tmpv.ptr; ++ ++#ifndef __KERNEL__ ++ if (ipack_glb_endian_X) { ++ for (tmpp = (void *) input; (u32) tmpp < (u32) (input + *sourcelen); ++tmpp) { ++#ifdef TXT_TOKENS ++ *(it++) = (u8) ((*tmpp & 0xff000000) >> 24); ++ *(it++) = (u8) ((*tmpp & 0x00ff0000) >> 16); ++ *(it++) = (u8) ((*tmpp & 0x0000ff00) >> 8); ++ *(it++) = (u8) ((*tmpp & 0x000000ff)); ++#else ++ *(it++) = (u8) ((*tmpp & 0x0000f000) >> 12); ++ *(it++) = (u8) ((*tmpp & 0x0000000f)); ++ *(it++) = (u8) ((*tmpp & 0xf0000000) >> 28); ++ *(it++) = (u8) ((*tmpp & 0x000f0000) >> 16); ++ *(it++) = (u8) ((*tmpp & 0x00000f00) >> 8); ++ *(it++) = (u8) ((*tmpp & 0x00f00000) >> 20); ++ *(it++) = (u8) ((*tmpp & 0x0f000000) >> 24); ++ *(it++) = (u8) ((*tmpp & 0x000000f0) >> 4); ++#endif //TXT_TOKENS ++ } ++ } ++ else { ++#endif ++ for (tmpp = (void *) input; (u32) tmpp < (u32) (input + *sourcelen); ++tmpp) { ++#ifdef TXT_TOKENS ++ *(it++) = (u8) ((*tmpp & 0x000000ff)); ++ *(it++) = (u8) ((*tmpp & 0x0000ff00) >> 8); ++ *(it++) = (u8) ((*tmpp & 0x00ff0000) >> 16); ++ *(it++) = (u8) ((*tmpp & 0xff000000) >> 24); ++#else ++ *(it++) = (u8) ((*tmpp & 0x00f00000) >> 20); ++ *(it++) = (u8) ((*tmpp & 0x0f000000) >> 24); ++ *(it++) = (u8) ((*tmpp & 0x000000f0) >> 4); ++ *(it++) = (u8) ((*tmpp & 0x00000f00) >> 8); ++ *(it++) = (u8) ((*tmpp & 0x000f0000) >> 16); ++ *(it++) = (u8) ((*tmpp & 0x0000f000) >> 12); ++ *(it++) = (u8) ((*tmpp & 0x0000000f)); ++ *(it++) = (u8) ((*tmpp & 0xf0000000) >> 28); ++#endif //TXT_TOKENS ++ } ++#ifndef __KERNEL__ ++ } ++#endif ++/* ++ ENCODE ++*/ ++ { //predictor reset ++ register PredictorType *ptr = predctrs; ++ register PredictorType *end = ptr + NUMBER_OF_PREDICTORS; ++ while (ptr < end) { ++ *(ptr++) = 0; ++ } ++ } ++ ++ //*(bitvector_ptr++) = 'H'; ++ //*(bitvector_ptr++) = 'G'; ++ *(bitvector_ptr++) = ((ipack_model_type *) model)->block_sign[0]; ++ *(bitvector_ptr++) = ((ipack_model_type *) model)->block_sign[1]; ++ ++ *(bitvector_ptr++) = (unsigned char) (((*sourcelen) >> 8) & 0xff); ++ *(bitvector_ptr++) = (unsigned char) ((*sourcelen) & 0xff); ++ for (it = tmpv.ptr, end_it = VECTOR_S_END(tmpv); it != end_it; ++it) { ++ ipack_probability_type prob; ++ u32 range; ++ ++#ifdef IPACK_TREE_TO_CODE ++ if (treefunc != NULL) ++ (*treefunc) (treeroot, *it, &prob); ++ else ++ ipack_model_get_probability_for_token(treeroot, *it, &prob); ++#else ++ ipack_model_get_probability_for_token(treeroot, *it, &prob); ++#endif ++ ++ if (prob.high == prob.low) { ++ vector_clear(&tmpv); ++ return EC_CODER_WRONG_PROBABILITY; ++ } ++ range = coder_high - coder_low + 1; ++ coder_high = coder_low + ((range * prob.high) >> PROBABILITY_SHIFT) - 1; ++ coder_low += ((range * prob.low) >> PROBABILITY_SHIFT); ++ for (;;) { ++ if (coder_high < CODER_VALUEHLF) { ++ if (writebits0(&bitvector_ptr, &bitvector_freebits, &coder_opbits, bitvector_end)) { ++ vector_clear(&tmpv); ++ return EC_BUFFER_OVERFLOW; ++ } ++ } ++ else if (coder_low >= CODER_VALUEHLF) { ++ if (writebits1(&bitvector_ptr, &bitvector_freebits, &coder_opbits, bitvector_end)) { ++ vector_clear(&tmpv); ++ return EC_BUFFER_OVERFLOW; ++ } ++ coder_high -= CODER_VALUEHLF; ++ coder_low -= CODER_VALUEHLF; ++ } ++ else if ((CODER_VALUE1ST <= coder_low) && (coder_high < CODER_VALUE3RD)) { ++ ++coder_opbits; ++ coder_high -= CODER_VALUE1ST; ++ coder_low -= CODER_VALUE1ST; ++ } ++ else { ++ break; ++ } ++ coder_high <<= 1; ++ ++coder_high; ++ coder_low <<= 1; ++ if (coder_high < coder_low) { ++ vector_clear(&tmpv); ++ return EC_CODER_WRONG_RANGE; ++ } ++ } ++ { ++#ifdef TXT_TOKENS ++// register u32 ndx; ++ predctrs[0] = *it; ++ if ((('a' <= *it) && (*it <= 'z')) || (('A' <= *it) && (*it <= 'Z'))) { ++ ++(predctrs[1]); ++ } ++ else { ++ predctrs[1] = 0; ++ } ++#else ++ register u32 ndx = predctrs[0] + 1; ++ predctrs[ndx + 8] = predctrs[ndx]; ++ predctrs[ndx] = *it; ++ if (ndx == 8) { ++ predctrs[0] = 0; ++ } ++ else { ++ ++predctrs[0]; ++ } ++#endif ++ } ++ ++ } ++ vector_clear(&tmpv); ++ ++coder_opbits; ++ if (coder_low < CODER_VALUE1ST) { ++ if (writebits0(&bitvector_ptr, &bitvector_freebits, &coder_opbits, bitvector_end)) { ++ return EC_BUFFER_OVERFLOW; ++ } ++ } ++ else { ++ if (writebits1(&bitvector_ptr, &bitvector_freebits, &coder_opbits, bitvector_end)) { ++ return EC_BUFFER_OVERFLOW; ++ } ++ } ++ (*(bitvector_ptr)) <<= bitvector_freebits; ++ *dstlen = ((u32) bitvector_ptr - (u32) output + 1); ++ return EC_NO_ERROR; ++} ++ ++/******************************************************************************* ++ ++ DECOMPRESS FUNCTIONS ++ ++*******************************************************************************/ ++ ++typedef struct ++{ ++ u32 high; ++ u32 low; ++ u32 value; ++ u32 overread; ++} ipack_decompressor_values; ++ ++typedef struct ++{ ++ u8 freebits; ++ unsigned char *ptr; ++ unsigned char *end; ++} ipack_decompressor_bitvector; ++ ++static u8 ipack_bitvector_R_get1(ipack_decompressor_bitvector * bv) ++{ ++ u8 tmp; ++ if (bv->ptr == bv->end) { ++ bv->freebits = 0; ++ return 0; ++ } ++ tmp = (*(bv->ptr) >> bv->freebits) & 0x01; ++ if (!(bv->freebits)) { ++ bv->freebits = 7; ++ ++(bv->ptr); ++ } ++ else { ++ --(bv->freebits); ++ } ++ return tmp; ++} ++ ++/* Decompress block ++ * returns non zero if fails ++ */ ++static int ipack_armlib_decompress(void *model, unsigned char *input, unsigned char *output, unsigned long sourcelen, unsigned long dstlen) ++{ ++ ARM_DataType *data; ++ register u32 coder_high = CODER_VALUEMAX - 1; ++ register u32 coder_low = 0; ++ register u32 coder_value = 0; ++ u32 coder_overread = 0; ++ ipack_decompressor_bitvector bitvector; ++ u32 lngth; ++ u32 i; ++ u32 cntbytes; ++ TokenType tkns[8]; ++ TokenType *tptr; ++ ++ ipack_nodetype *treeroot = ((ipack_model_type *) model)->tree_root_ptr; ++ PredictorType *predctrs = ((ipack_model_type *) model)->predictors_ptr; ++ ++#ifdef IPACK_TREE_TO_CODE ++ TokenType(*treefunc) (ipack_nodetype *, u32, u32, ipack_probability_type *); ++ ++ treefunc = ((ipack_model_type *) model)->tree_code; ++#endif ++ ++ ++ if (((ipack_model_type *) model)->ID[0] != 'i') { ++ return EC_NOT_IPMF_MODEL; ++ } ++ else if (((ipack_model_type *) model)->ID[1] != 'P') { ++ return EC_NOT_IPMF_MODEL; ++ } ++ else if (((ipack_model_type *) model)->ID[2] != 'M') { ++ return EC_NOT_IPMF_MODEL; ++ } ++ else if (((ipack_model_type *) model)->ID[3] != 'F') { ++ return EC_NOT_IPMF_MODEL; ++ } ++ ++ bitvector.freebits = 7; ++ bitvector.ptr = input; ++ bitvector.end = input + sourcelen; ++ ++ /*if(*(bitvector.ptr++) != 'H') { ++ return EC_NOT_HG_BLOCK; ++ } else if(*(bitvector.ptr++) != 'G') { ++ return EC_NOT_HG_BLOCK; ++ } */ ++ bitvector.ptr++; ++ bitvector.ptr++; ++ ++ data = (void *) output; ++ cntbytes = *(bitvector.ptr++); ++ cntbytes <<= 8; ++ cntbytes += *(bitvector.ptr++); ++ ++ { //predictor reset ++ register PredictorType *ptr = predctrs; ++ register PredictorType *end = ptr + NUMBER_OF_PREDICTORS; ++ while (ptr < end) { ++ *(ptr++) = 0; ++ } ++ } ++ for (i = 0; i < CODER_VALUEBITS; ++i) { ++ coder_value <<= 1; ++ coder_value += ipack_bitvector_R_get1(&bitvector); ++ } ++ lngth = dstlen >> 2; ++ if (lngth > (cntbytes >> 2)) { ++ lngth = cntbytes >> 2; ++ } ++ for (i = 0; (i < lngth); ++i) { ++ TokenType itoken; ++ u32 j; ++ tptr = tkns; ++ for (j = 0; j < NUMBER_OF_TOKENS_PER_INSTRUCTION; ++j) { ++ ipack_probability_type prob; ++ u32 range = coder_high - coder_low + 1; ++ ++#ifdef IPACK_TREE_TO_CODE ++ if (treefunc != NULL) ++ itoken = (*treefunc) (treeroot, coder_value - coder_low + 1, range, &prob); ++ else ++#endif ++ itoken = ipack_model_get_token_for_range(treeroot, coder_value - coder_low + 1, range, &prob); ++ ++ ++ if (prob.high == prob.low) { ++ return EC_CODER_WRONG_PROBABILITY; ++ } ++ coder_high = coder_low + ((range * prob.high) >> PROBABILITY_SHIFT) - 1; ++ coder_low += ((range * prob.low) >> PROBABILITY_SHIFT); ++ for (;;) { ++ if (coder_high < CODER_VALUEHLF) { ++ } ++ else if (CODER_VALUEHLF <= coder_low) { ++ coder_value -= CODER_VALUEHLF; ++ coder_high -= CODER_VALUEHLF; ++ coder_low -= CODER_VALUEHLF; ++ } ++ else if ((CODER_VALUE1ST <= coder_low) && (coder_high < CODER_VALUE3RD)) { ++ coder_value -= CODER_VALUE1ST; ++ coder_high -= CODER_VALUE1ST; ++ coder_low -= CODER_VALUE1ST; ++ } ++ else { ++ break; ++ } ++ coder_low <<= 1; ++ coder_high <<= 1; ++ ++(coder_high); ++ coder_value <<= 1; ++ if (bitvector.ptr == bitvector.end) { ++ bitvector.freebits = 0; ++ } ++ coder_value += ((*(bitvector.ptr) >> bitvector.freebits) & 0x01); ++ if (bitvector.freebits) { ++ --bitvector.freebits; ++ } ++ else { ++ bitvector.freebits = 7; ++ ++bitvector.ptr; ++ } ++ if (coder_high < coder_low) { ++ return EC_CODER_WRONG_RANGE; ++ } ++ if ((bitvector.ptr == bitvector.end) && !(bitvector.freebits)) { ++ if ((coder_overread++) > CODER_VALUEBITS) { ++ return EC_BUFFER_UNDERFLOW; ++ } ++ } ++ } ++ { ++#ifdef TXT_TOKENS ++// register u32 ndx; ++ predctrs[0] = itoken; ++ if ((('a' <= itoken) && (itoken <= 'z')) || (('A' <= itoken) && (itoken <= 'Z'))) { ++ ++(predctrs[1]); ++ } ++ else { ++ predctrs[1] = 0; ++ } ++ ++#else ++ register u32 ndx = predctrs[0] + 1; ++ predctrs[ndx + 8] = predctrs[ndx]; ++ predctrs[ndx] = itoken; ++ if (ndx == 8) { ++ predctrs[0] = 0; ++ } ++ else { ++ ++predctrs[0]; ++ } ++#endif ++ } ++ ++ (*(tptr++)) = itoken; ++ } ++ tptr = tkns; ++#ifndef __KERNEL__ ++ if (ipack_glb_endian_X) { ++#ifdef TXT_TOKENS ++ (*data) = ((*tptr) << 24); ++ ++tptr; ++ (*data) |= ((*tptr) << 16); ++ ++tptr; ++ (*data) |= ((*tptr) << 8); ++ ++tptr; ++ (*data) |= (*tptr); ++ ++data; ++#else ++ (*data) = (((*tptr) & 0xf) << 12); ++ ++tptr; ++ (*data) |= ((*tptr) & 0xf); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 28); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 16); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 8); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 20); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 24); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 4); ++ ++data; ++#endif ++ } ++ else { ++#endif ++#ifdef TXT_TOKENS ++ (*data) = (*tptr); ++ ++tptr; ++ (*data) |= ((*tptr) << 8); ++ ++tptr; ++ (*data) |= ((*tptr) << 16); ++ ++tptr; ++ (*data) |= ((*tptr) << 24); ++ ++data; ++#else ++ (*data) = (((*tptr) & 0xf) << 20); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 24); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 4); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 8); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 16); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 12); ++ ++tptr; ++ (*data) |= ((*tptr) & 0xf); ++ ++tptr; ++ (*data) |= (((*tptr) & 0xf) << 28); ++ ++data; ++#endif ++#ifndef __KERNEL__ ++ } ++#endif ++ } ++ return EC_NO_ERROR; ++} ++ ++static int ipack_armlib_estimate(void *model, unsigned char *input, unsigned long sourcelen, unsigned long *dstlen, unsigned long *readtime, unsigned long *writetime) ++{ ++ int i, tmp, tmp2, max, maxi; ++ int cnt_cond[] = { 0, 0, 0, 0 }; ++ int cnt_inst[] = { 0, 0, 0, 0 }; ++ ++ // TODO: make a more precise estimation!!! ++ *readtime = JFFS2_BBC_ZLIB_READ_TIME * 6; ++ *writetime = JFFS2_BBC_ZLIB_WRITE_TIME * 2; ++ ++ if (sourcelen % 4 != 0) { ++ *dstlen = sourcelen; ++ return 0; ++ } ++ for (i = 0; i < sourcelen; i++, input++) { ++ tmp2 = tmp = *input; ++ tmp = ((tmp) & 0xf0) >> 4; ++ tmp2 = tmp2 & 0xf; ++ if (tmp == 14) ++ cnt_cond[i % 4]++; ++ if ((tmp2 == 2) || (tmp2 == 3)) ++ cnt_inst[i % 4]++; ++ } ++ maxi = -1; ++ max = -1; ++ for (i = 0; i < 4; i++) ++ if (max < cnt_cond[i]) { ++ max = cnt_cond[i]; ++ maxi = i; ++ } ++ /*jffs2_bbc_print("armlib_EST: %d/%d : %d/%d %d/%d %d/%d %d/%d", ++ cnt_cond[maxi],cnt_inst[maxi], ++ cnt_cond[0],cnt_inst[0], ++ cnt_cond[1],cnt_inst[1], ++ cnt_cond[2],cnt_inst[2], ++ cnt_cond[3],cnt_inst[3]); */ ++ ++ if (cnt_cond[maxi] < (sourcelen >> 4)) { ++ *dstlen = sourcelen; ++ } ++ else { ++ *dstlen = sourcelen / 3; ++ } ++ ++ return 0; ++} ++ ++static char *ipack_armlib_proc_info(void); ++static int ipack_armlib_proc_command(char *command); ++static void ipack_armlib_destroy_model(void **model); ++ ++struct jffs2_bbc_compressor_type jffs2_bbc_armlib = { ++ "armlib", ++ 0x464d5069, ++ {0, 0, 0, 0}, ++ NULL, // init ++ ipack_armlib_compressor_init, // init_model ++ ipack_armlib_destroy_model, // destroy_model ++ ipack_armlib_compressor_deinit, // deinit ++ ipack_armlib_compress, ++ ipack_armlib_estimate, ++ ipack_armlib_decompress, ++ ipack_armlib_proc_info, ++ ipack_armlib_proc_command ++}; ++ ++ ++static char *ipack_armlib_proc_info() ++{ ++#ifdef IPACK_TREE_TO_CODE ++#ifdef IPACK_AUTO_TREE_TO_CODE ++ return "automatic tree to code conversion"; ++#else ++ return "manual tree to code conversion possibility"; ++#endif ++#else ++ return "tree in memory version"; ++#endif ++} ++ ++static int ipack_armlib_proc_command(char *command) ++{ ++ struct jffs2_bbc_model_list_node *model; ++ ipack_model_type *armlib_model; ++ ++ if ((*command == 'g') || (*command == 'G')) { ++ jffs2_bbc_print1("Converting tree(s) to ARM code... (keeping original)\n"); ++ model = jffs2_bbc_armlib.models; ++ if (model == NULL) ++ jffs2_bbc_print1("no model found!\n"); ++ while (model != NULL) { ++ armlib_model = model->model; ++ if (armlib_model == NULL) { ++ jffs2_bbc_print1("Error: NULL model!\n"); ++ } ++ else { ++ ipack_armlib_convert_tree_to_code(armlib_model, IPACK_TREE_CONVERT_KEEP); ++ } ++ model = model->next_compr_model; ++ } ++ } ++ else if ((*command == 'r') || (*command == 'R')) { ++ jffs2_bbc_print1("Converting tree(s) to ARM code... (deleting original)\n"); ++ model = jffs2_bbc_armlib.models; ++ if (model == NULL) ++ jffs2_bbc_print1("no model found!\n"); ++ while (model != NULL) { ++ armlib_model = model->model; ++ if (armlib_model == NULL) { ++ jffs2_bbc_print1("Error: NULL model!\n"); ++ } ++ else { ++ //armlib_model->tree_code = ipack_tree_to_code(armlib_model, &tree_size); ++ //jffs2_bbc_print("Convertation done. Code size=%d\n",tree_size); ++ ipack_armlib_convert_tree_to_code(armlib_model, IPACK_TREE_CONVERT_REPLACE); ++ } ++ model = model->next_compr_model; ++ } ++ } ++ else if ((*command == 'c') || (*command == 'C')) { ++ jffs2_bbc_print1("Deleting ARM representation of the tree(s)...\n"); ++ model = jffs2_bbc_armlib.models; ++ if (model == NULL) ++ jffs2_bbc_print1("no model found!\n"); ++ while (model != NULL) { ++ armlib_model = model->model; ++ if (armlib_model == NULL) { ++ jffs2_bbc_print1("Error: NULL model!\n"); ++ } ++ else { ++ if (armlib_model->tree_code == NULL) { ++ jffs2_bbc_print1("already deleted.\n"); ++ } ++ else { ++ if (armlib_model->tree_root_ptr == NULL) { ++ jffs2_bbc_print1("cannot delete this ARM tree - original tree has deleted\n"); ++ } ++ else { ++ jffs2_bbc_print1("deleting..."); ++ jffs2_bbc_free(armlib_model->tree_code); ++ armlib_model->tree_code = NULL; ++ jffs2_bbc_print1("done.\n"); ++ } ++ } ++ } ++ model = model->next_compr_model; ++ } ++ } ++ else if (*command == '?') { ++ jffs2_bbc_print1("ARMLIB commands:\n"); ++ jffs2_bbc_print1(" g: convert TREEs to ARM code and keep the original\n"); ++ jffs2_bbc_print1(" r: convert TREEs to ARM code and remove the original\n"); ++ jffs2_bbc_print1(" c: delete the original TREEs - if there is any\n"); ++ } ++ else { ++ jffs2_bbc_print1("Unknown command.\n"); ++ } ++ return 0; ++} ++ ++static void ipack_armlib_destroy_model(void **model) ++{ ++ ipack_model_type *model_img; ++ ++ model_img = *model; ++ if (model_img == NULL) { ++ jffs2_bbc_print1("jffs2.bbc: armlib: NULL model at destoying model!\n"); ++ return; ++ } ++ if (model_img->tree_code != NULL) { ++ //jffs2_bbc_print1("jffs2.bbc: armlib: debug: freeing code...\n"); ++ jffs2_bbc_free(model_img->tree_code); ++ model_img->tree_code = NULL; ++ } ++ if (model_img->tree_root_ptr != NULL) { ++ //jffs2_bbc_print1("jffs2.bbc: armlib: debug: freeing tree...\n"); ++ jffs2_bbc_free(model_img->tree_root_ptr); ++ model_img->tree_root_ptr = NULL; ++ } ++ ++ jffs2_bbc_free(model_img); ++ *model = NULL; ++} ++ ++struct jffs2_bbc_compressor_type *jffs2_bbc_armlib_init(int mode) ++{ ++ if (jffs2_bbc_register_compressor(&jffs2_bbc_armlib) == 0) ++ return &jffs2_bbc_armlib; ++ else ++ return NULL; ++} ++ ++void jffs2_bbc_armlib_deinit(void) ++{ ++ jffs2_bbc_unregister_compressor(&jffs2_bbc_armlib); ++} ++ ++/*END OF ARMLIB*/ +diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_framework.c linux-mips/fs/jffs2/jffs2_bbc_framework.c +--- linux-mips-cvs/fs/jffs2/jffs2_bbc_framework.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/jffs2_bbc_framework.c 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,1324 @@ ++/* ++ * JFFS2-BBC: Compression Framework ++ * ++ * $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++ * ++ * Copyright (C) 2004, Ferenc Havasi ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++/* USE JFFS2_BBC_STANDALONE define if you don't want to compile without JFFS2 */ ++ ++//#define DEBUG_COMPRESSORS ++//#define DEBUG_SHOW_BLOCK_SIZES ++ ++#define JFFS2_BBC_STAT_BUFF_SIZE 8000 ++ ++#ifndef __KERNEL__ ++ ++#include <stdio.h> ++#include <malloc.h> ++typedef unsigned long uint32_t; ++ ++#else ++ ++#include <linux/kernel.h> ++#include <linux/slab.h> ++#include <linux/vmalloc.h> ++ ++#endif ++ ++#define JFFS2_BBC_ZLIB_BLOCK_SIGN_0 (120) ++#define JFFS2_BBC_ZLIB_BLOCK_SIGN_1 (94) ++ ++#define JFFS2_BBC_DUMMY_BLOCKSIGN_0 (0x54) ++#define JFFS2_BBC_DUMMY_BLOCKSIGN_1 (0x01) ++ ++#ifndef NULL ++#define NULL ((void*)(0)) ++#endif ++ ++#include "jffs2_bbc_framework.h" ++ ++/********************************************************************* ++ * Global data * ++ *********************************************************************/ ++ ++static int jffs2_bbc_compression_mode = JFFS2_BBC_ZLIB_MODE; ++static struct jffs2_bbc_compressor_type *jffs2_bbc_manual_compressor = NULL; ++static struct jffs2_bbc_compressor_type *jffs2_bbc_compressors = NULL; ++static struct jffs2_bbc_model_list_node *jffs2_bbc_model_list = NULL; ++static void *last_sb = NULL; /* previously activated sb */ ++ ++/********************************************************************* ++ * Compressor initialization * ++ *********************************************************************/ ++ ++#ifndef JFFS2_BBC_STANDALONE ++ ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_ARMLIB) ++struct jffs2_bbc_compressor_type *jffs2_bbc_armlib_init(void); ++void jffs2_bbc_armlib_deinit(void); ++#endif ++ ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZO) ++struct jffs2_bbc_compressor_type *jffs2_bbc_lzo_init(void); ++void jffs2_bbc_lzo_deinit(void); ++#endif ++ ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZSS) ++struct jffs2_bbc_compressor_type *jffs2_bbc_lzss_init(void); ++void jffs2_bbc_lzss_deinit(void); ++#endif ++ ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZARI) ++struct jffs2_bbc_compressor_type *jffs2_bbc_lzari_init(void); ++void jffs2_bbc_lzari_deinit(void); ++#endif ++ ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZHD) ++struct jffs2_bbc_compressor_type *jffs2_bbc_lzhd_init(void); ++void jffs2_bbc_lzhd_deinit(void); ++#endif ++ ++void jffs2_bbc_compressor_init() ++{ ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_ARMLIB) ++ jffs2_bbc_armlib_init(); ++#endif ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZO) ++ jffs2_bbc_lzo_init(); ++#endif ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZSS) ++ jffs2_bbc_lzss_init(); ++#endif ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZARI) ++ jffs2_bbc_lzari_init(); ++#endif ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZHD) ++ jffs2_bbc_lzhd_init(); ++#endif ++} ++ ++void jffs2_bbc_compressor_deinit() ++{ ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZHD) ++ jffs2_bbc_lzhd_deinit(); ++#endif ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZARI) ++ jffs2_bbc_lzari_deinit(); ++#endif ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZSS) ++ jffs2_bbc_lzss_deinit(); ++#endif ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_LZO) ++ jffs2_bbc_lzo_deinit(); ++#endif ++#if !defined(__KERNEL__) || defined(CONFIG_JFFS2_BBC_ARMLIB) ++ jffs2_bbc_armlib_deinit(); ++#endif ++} ++ ++#endif ++ ++#ifndef JFFS2_BBC_STANDALONE ++ ++/********************************************************************* ++ * ZLIB COMPRESSOR * ++ *********************************************************************/ ++ ++extern int jffs2_zlib_compress2(unsigned char *data_in, unsigned char *cpage_out, uint32_t * sourcelen, uint32_t * dstlen); ++extern void jffs2_zlib_decompress2(unsigned char *data_in, unsigned char *cpage_out, uint32_t srclen, uint32_t destlen); ++ ++static int jffs2_bbc_zlib_compress(void *model, unsigned char *input, unsigned char *output, unsigned long *sourcelen, unsigned long *dstlen) ++{ ++ return jffs2_zlib_compress2(input, output, sourcelen, dstlen); ++} ++ ++static int jffs2_bbc_zlib_decompress(void *model, unsigned char *input, unsigned char *output, unsigned long sourcelen, unsigned long dstlen) ++{ ++ jffs2_zlib_decompress2(input, output, sourcelen, dstlen); ++ return 0; ++} ++ ++static int jffs2_bbc_zlib_estimate(void *model, unsigned char *input, unsigned long sourcelen, unsigned long *dstlen, unsigned long *readtime, unsigned long *writetime) ++{ ++ *dstlen = sourcelen * 65 / 100; ++ *readtime = JFFS2_BBC_ZLIB_READ_TIME; ++ *writetime = JFFS2_BBC_ZLIB_WRITE_TIME; ++ return 0; ++} ++ ++static struct jffs2_bbc_compressor_type jffs2_bbc_zlib = { ++ "zlib", ++ 0, ++ {JFFS2_BBC_ZLIB_BLOCK_SIGN_0, JFFS2_BBC_ZLIB_BLOCK_SIGN_1, 0, 0}, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ jffs2_bbc_zlib_compress, ++ jffs2_bbc_zlib_estimate, ++ jffs2_bbc_zlib_decompress, ++ NULL, ++ NULL, ++ 1 ++}; ++ ++static struct jffs2_bbc_compressor_type *jffs2_bbc_original_compressor = &jffs2_bbc_zlib; ++ ++#endif ++ ++/********************************************************************* ++ * Compression mode handling * ++ *********************************************************************/ ++ ++int jffs2_bbc_get_compression_mode(void) ++{ ++ return jffs2_bbc_compression_mode; ++} ++ ++void jffs2_bbc_set_compression_mode(int mode) ++{ ++ jffs2_bbc_compression_mode = mode; ++} ++ ++void jffs2_bbc_set_manual_compressor(struct jffs2_bbc_compressor_type *c) ++{ ++ jffs2_bbc_manual_compressor = c; ++ jffs2_bbc_set_compression_mode(JFFS2_BBC_MANUAL_MODE); ++} ++ ++int jffs2_bbc_set_manual_compressor_by_name(char *name) ++{ ++ struct jffs2_bbc_compressor_type *l; ++ int i; ++ ++ l = jffs2_bbc_compressors; ++ while (l != NULL) { ++ for (i = 0; i < 1000; i++) { ++ if (l->name[i] == 0) { ++ jffs2_bbc_set_manual_compressor(l); ++ return 0; ++ } ++ else if (name[i] == 0) ++ i = 1000; ++ else if (name[i] != l->name[i]) ++ i = 1000; ++ } ++ l = l->next; ++ } ++ jffs2_bbc_set_manual_compressor(NULL); ++ return 1; ++} ++ ++static struct jffs2_bbc_compressor_type *jffs2_bbc_get_compressor_by_name(char *name) ++{ ++ struct jffs2_bbc_compressor_type *l; ++ int i; ++ ++#ifndef JFFS2_BBC_STANDALONE ++ l = jffs2_bbc_original_compressor; ++ for (i = 0; i < 1000; i++) { ++ if (l->name[i] == 0) { ++ return l; ++ } ++ else if (name[i] == 0) ++ i = 1000; ++ else if (name[i] != l->name[i]) ++ i = 1000; ++ } ++#endif ++ ++ l = jffs2_bbc_compressors; ++ while (l != NULL) { ++ for (i = 0; i < 1000; i++) { ++ if (l->name[i] == 0) { ++ return l; ++ } ++ else if (name[i] == 0) ++ i = 1000; ++ else if (name[i] != l->name[i]) ++ i = 1000; ++ } ++ l = l->next; ++ } ++ ++ return NULL; ++} ++ ++int jffs2_bbc_disable_compressor_by_name(char *name) ++{ ++ struct jffs2_bbc_compressor_type *l; ++ ++ l = jffs2_bbc_get_compressor_by_name(name); ++ if (l == NULL) return 1; ++ l->enabled = 0; ++ return 0; ++} ++ ++int jffs2_bbc_enable_compressor_by_name(char *name) ++{ ++ struct jffs2_bbc_compressor_type *l; ++ ++ l = jffs2_bbc_get_compressor_by_name(name); ++ if (l == NULL) return 1; ++ l->enabled = 1; ++ return 0; ++} ++ ++void jffs2_bbc_compressor_command_by_name(char *name_and_command) ++{ ++ struct jffs2_bbc_compressor_type *l; ++ int i; ++ ++ l = jffs2_bbc_compressors; ++ while (l != NULL) { ++ for (i = 0; i < 1000; i++) { ++ if (l->name[i] == 0) { ++ if (name_and_command[i] != ':') { ++ jffs2_bbc_print1("jffs2.bbc: ':' missing after compressor name\n"); ++ } ++ else { ++ if (l->proc_command != NULL) ++ l->proc_command(name_and_command + i + 1); ++ } ++ i = 1000; ++ return; ++ } ++ else if (name_and_command[i] == 0) { ++ i = 1000; ++ } ++ else if (name_and_command[i] != l->name[i]) { ++ i = 1000; ++ } ++ } ++ l = l->next; ++ } ++} ++ ++struct jffs2_bbc_compressor_type *jffs2_bbc_get_manual_compressor(void) ++{ ++ if (jffs2_bbc_get_compression_mode() != JFFS2_BBC_MANUAL_MODE) { ++ jffs2_bbc_manual_compressor = NULL; ++ } ++ return jffs2_bbc_manual_compressor; ++} ++ ++/********************************************************************* ++ * Compressor handling * ++ *********************************************************************/ ++ ++struct jffs2_bbc_compressor_type *jffs2_bbc_get_compressor_list(void) ++{ ++ return jffs2_bbc_compressors; ++} ++ ++struct jffs2_bbc_model_list_node *jffs2_bbc_get_model_list(void) ++{ ++ return jffs2_bbc_model_list; ++} ++ ++int jffs2_bbc_register_compressor(struct jffs2_bbc_compressor_type *c) ++{ ++ struct jffs2_bbc_compressor_type *l; ++ struct jffs2_bbc_model_list_node *l2; ++ int model_found = 0; ++ ++ l = jffs2_bbc_compressors; ++ /* Check for confilcts */ ++ while (l != NULL) { ++ c->name[15] = 0; ++ /*if (strcmp(c->name,l->name)==0) { ++ jffs2_bbc_print1("jffs2.bbc: compressor is already loaded."); ++ return -1; ++ } */ ++ if ((l->model_file_sign == c->model_file_sign) && (c->model_file_sign != 0)) { ++ jffs2_bbc_print1("jffs2.bbc: already used model file sign. fail."); ++ return -1; ++ } ++ l = l->next; ++ } ++ /* Search and initialize model */ ++ c->models = NULL; ++ c->mounted = 0; ++ if (c->init != NULL) { ++ if (c->init() != 0) { ++ jffs2_bbc_print2("jffs2.bbc: cannot initialize compressor %s.\n", c->name); ++ return -1; ++ } ++ } ++ if (c->model_file_sign != 0) { ++ l2 = jffs2_bbc_model_list; ++ while (1) { ++ if (l2 == NULL) ++ break; ++ if (c->model_file_sign == l2->sign) { ++ if (l2->compressor != NULL) { ++ jffs2_bbc_print2("jffs2.bbc: register for %s: BUG, model file already reserved!!!!\n", c->name); ++ } ++ else { ++ if (c->init_model(&(l2->model)) != 0) { ++ jffs2_bbc_print2("jffs2.bbc: cannot initialize compressor %s for a model", c->name); ++ } ++ else { ++ l2->compressor = c; ++ l2->next_compr_model = c->models; ++ c->models = l2; ++ c->mounted++; ++ model_found++; ++ } ++ } ++ } ++ l2 = l2->next_model; ++ } ++ /*if (model_found==0) { ++ jffs2_bbc_print2("jffs2.bbc: no macthing model file found for %s at this time (maybe later)\n",c->name); ++ } */ ++ } ++ /* Insert to the end of the compressor list */ ++ c->enabled = 1; ++ c->buffer = NULL; ++ c->buffer_size = 0; ++ c->stat_compr_orig = c->stat_compr_new = c->stat_decompr = 0; ++ c->next = NULL; ++ if (jffs2_bbc_compressors == NULL) { ++ jffs2_bbc_compressors = c; ++ } ++ else { ++ l = jffs2_bbc_compressors; ++ while (l->next != NULL) ++ l = l->next; ++ l->next = c; ++ } ++ return 0; ++} ++ ++int jffs2_bbc_unregister_compressor(struct jffs2_bbc_compressor_type *c) ++{ ++ struct jffs2_bbc_compressor_type *l; ++ struct jffs2_bbc_model_list_node *l2; ++ ++ if (c->mounted != 0) { ++ jffs2_bbc_print1("jffs2.bbc: Compressor is in use. Sorry."); ++ return -1; ++ } ++ if (jffs2_bbc_compressors == NULL) { ++ jffs2_bbc_print1("jffs2.bbc: unregister: empty list."); ++ return -1; ++ } ++ else if (jffs2_bbc_compressors == c) { ++ if (c->deinit != NULL) ++ c->deinit(); ++ jffs2_bbc_compressors = c->next; ++ } ++ else { ++ l = jffs2_bbc_compressors; ++ while (l->next != c) { ++ if (l->next == NULL) { ++ jffs2_bbc_print2("jffs2.bbc: unregister: cannot find compressor %s in the list.", c->name); ++ return -1; ++ } ++ l = l->next; ++ } ++ if (c->deinit != NULL) ++ c->deinit(); ++ l->next = c->next; ++ } ++ if (c->buffer != NULL) { ++ jffs2_bbc_free(c->buffer); ++ c->buffer = NULL; ++ c->buffer_size = 0; ++ } ++ ++ l2 = jffs2_bbc_model_list; ++ while (l2 != NULL) { ++ if (l2->compressor == c) { ++ jffs2_bbc_print1("jffs2.bbc: unregister: BUG: model found!!!"); ++ l2->compressor = NULL; ++ l2->next_compr_model = NULL; ++ } ++ l2 = l2->next_model; ++ } ++ ++ return 0; ++} ++ ++int jffs2_bbc_model_new(void *sb, int i_num, void *model) ++{ ++ struct jffs2_bbc_model_list_node *node; ++ struct jffs2_bbc_compressor_type *l; ++ char block_sign[2]; ++ ++ int sign; ++ ++ /* check for conflicts... */ ++ sign = *((int *) model); ++ block_sign[0] = *(((char *) model) + 4); ++ block_sign[1] = *(((char *) model) + 5); ++ node = jffs2_bbc_model_list; ++ while (node != NULL) { ++ if ((node->block_sign[0] == block_sign[0]) && (node->block_sign[1] == block_sign[1]) && (node->sb == sb)) { ++ //jffs2_bbc_print2("jffs2.bbc: model_new: model conflict (inode=%d)!\n",i_num); ++ return -1; ++ } ++ node = node->next_model; ++ } ++ ++ /* insertion */ ++ node = jffs2_bbc_malloc_small((long)sizeof(struct jffs2_bbc_model_list_node)); ++ node->sb = sb; ++ node->model = model; ++ node->sign = *((int *) model); ++ node->block_sign[0] = *(((char *) model) + 4); ++ node->block_sign[1] = *(((char *) model) + 5); ++ node->inode = i_num; ++ node->next_model = jffs2_bbc_model_list; ++ node->compressor = NULL; ++ node->stat_decompr = 0; ++ node->next_compr_model = NULL; ++ jffs2_bbc_model_list = node; ++ ++ /* search for matching compressor */ ++ l = jffs2_bbc_compressors; ++ while (l != NULL) { ++ if (l->model_file_sign == sign) { ++ //jffs2_bbc_print2("jffs2.bbc: compressor for model found: %s ",l->name); ++ if (l->init_model(&(node->model)) != 0) { ++ jffs2_bbc_print1("jffs2.bbc: cannot initialize compressor for a model"); ++ } ++ else { ++ l->mounted++; ++ node->compressor = l; ++ node->next_compr_model = l->models; ++ l->models = node; ++ } ++ break; ++ } ++ l = l->next; ++ } ++ return 0; ++} ++ ++static void jffs2_bbc_model_del_from_compressor(struct jffs2_bbc_model_list_node *node) ++{ ++ struct jffs2_bbc_model_list_node *l; ++ ++ if (node->model != NULL) { ++ if (node->compressor != NULL) { ++ if (node->compressor->destroy_model == NULL) { ++ jffs2_bbc_free(node->model); ++ node->model = NULL; ++ } ++ else { ++ node->compressor->destroy_model(&(node->model)); ++ if (node->model != NULL) ++ jffs2_bbc_print1("jffs2.bbc: warning: not NULL model after destroying!\n"); ++ } ++ } ++ } ++ ++ if (node->compressor == NULL) { ++ jffs2_bbc_print1("jffs2.bbc: jffs2_bbc_model_del_from_compressor: no compressor!\n"); ++ return; ++ } ++ l = node->compressor->models; ++ if (l == NULL) { ++ jffs2_bbc_print1("jffs2.bbc: jffs2_bbc_model_del_from_compressor error, models=NULL!\n"); ++ return; ++ } ++ if (l == node) { ++ node->compressor->models = node->next_compr_model; ++ node->compressor->mounted--; ++ return; ++ } ++ while (1) { ++ if (l->next_compr_model == node) { ++ l->next_compr_model = node->next_compr_model; ++ node->compressor->mounted--; ++ return; ++ } ++ l = l->next_compr_model; ++ if (l == NULL) { ++ jffs2_bbc_print1("jffs2.bbc: jffs2_bbc_model_del_from_compressor: not found\n"); ++ return; ++ } ++ } ++} ++ ++void jffs2_bbc_model_del(void *sb) ++{ ++ struct jffs2_bbc_model_list_node *l, *l2; ++ ++ l = jffs2_bbc_model_list; ++ if (l == NULL) ++ return; ++ if (l->sb == sb) { ++ jffs2_bbc_model_list = l->next_model; ++ jffs2_bbc_model_del_from_compressor(l); ++ jffs2_bbc_free_small(l); ++ jffs2_bbc_model_del(sb); ++ return; ++ } ++ while (1) { ++ if (l->next_model == NULL) { ++ break; ++ } ++ if (l->next_model->sb == sb) { ++ l2 = l->next_model; ++ l->next_model = l->next_model->next_model; ++ jffs2_bbc_model_del_from_compressor(l2); ++ jffs2_bbc_free_small(l2); ++ jffs2_bbc_model_del(sb); ++ return; ++ } ++ l = l->next_model; ++ } ++ last_sb = NULL; ++} ++ ++void jffs2_bbc_model_set_act_sb(void *sb) ++{ ++ last_sb = sb; ++} ++ ++void *jffs2_bbc_model_get_act_sb(void) ++{ ++ return last_sb; ++} ++ ++void *jffs2_bbc_model_get_newest(struct jffs2_bbc_compressor_type *compressor) ++{ ++ struct jffs2_bbc_model_list_node *m, *best_m; ++ int max_sign, sign; ++ ++ if (compressor == NULL) { ++ jffs2_bbc_print1("jffs2.bbc: jffs2_bbc_model_get: NULL!!\n"); ++ return NULL; ++ } ++ ++ best_m = NULL; ++ max_sign = -1; ++ m = compressor->models; ++ while (m != NULL) { ++ if (m->sb == last_sb) { ++ sign = (int) (m->block_sign[0]) * 256 + (int) (m->block_sign[1]); ++ if (sign > max_sign) { ++ max_sign = sign; ++ best_m = m; ++ } ++ } ++ m = m->next_compr_model; ++ } ++ if (best_m != NULL) ++ return best_m->model; ++ else ++ return NULL; ++} ++ ++/********************************************************************* ++ * Statistics * ++ *********************************************************************/ ++ ++static char *jffs2_bbc_stat_buff = NULL; ++ ++char *jffs2_bbc_get_model_stats(void) ++{ ++ char *b; ++ struct jffs2_bbc_model_list_node *m; ++ struct jffs2_bbc_compressor_type *c; ++ ++ if (jffs2_bbc_stat_buff == NULL) ++ jffs2_bbc_stat_buff = jffs2_bbc_malloc(8000); ++ ++ b = jffs2_bbc_stat_buff; ++ ++ b += sprintf(b, "Loaded compressors:"); ++ c = jffs2_bbc_compressors; ++ while (c != NULL) { ++ b += sprintf(b, "\n %s (%d) ", c->name, c->enabled); ++ if (c->model_file_sign != 0) { ++ b += sprintf(b, "m_sign=%d ", c->model_file_sign); ++ b += sprintf(b, "models="); ++ m = c->models; ++ while (m != NULL) { ++ b += sprintf(b, "(inode=%d)", m->inode); ++ m = m->next_compr_model; ++ } ++ } ++ else { ++ b += sprintf(b, "b_sign=(%d,%d) nomodel", (int) (c->block_sign[0]), (int) (c->block_sign[1])); ++ } ++ if (c->proc_info != NULL) { ++ b += sprintf(b, "\n %s", c->proc_info()); ++ } ++ c = c->next; ++ } ++ ++ m = jffs2_bbc_model_list; ++ ++ if (m == NULL) { ++ b += sprintf(b, "\nPresent models: NONE\n"); ++ } ++ else { ++ b += sprintf(b, "\nPresent models:\n"); ++ while (m != NULL) { ++ b += sprintf(b, " b_sign=(%d,%d),inode=%d,decompr=%d", (int) (m->block_sign[0]), (int) (m->block_sign[1]), m->inode, m->stat_decompr); ++ if (m->compressor == NULL) ++ b += sprintf(b, ",compressor=NULL\n"); ++ else ++ b += sprintf(b, ",compressor=%s\n", m->compressor->name); ++ m = m->next_model; ++ } ++ } ++ ++ return jffs2_bbc_stat_buff; ++} ++ ++/********************************************************************* ++ * Memory handling, debug * ++ *********************************************************************/ ++ ++static int jffs2_bbc_mem_counter = 0; ++ ++#ifdef __KERNEL__ ++ ++void *jffs2_bbc_malloc(long size) ++{ ++ void *addr = vmalloc(size); ++ if (addr != NULL) ++ jffs2_bbc_mem_counter++; ++ else { ++ jffs2_bbc_print2("DEBUG: not enough memory (%ld)\n", size); ++ } ++ return addr; ++} ++ ++void jffs2_bbc_free(void *addr) ++{ ++ jffs2_bbc_mem_counter--; ++ vfree(addr); ++} ++ ++void *jffs2_bbc_malloc_small(long size) ++{ ++ void *addr; ++ addr = kmalloc(size, 0); ++ if (addr != NULL) ++ jffs2_bbc_mem_counter++; ++ return addr; ++} ++ ++void jffs2_bbc_free_small(void *addr) ++{ ++ jffs2_bbc_mem_counter--; ++ kfree(addr); ++} ++ ++#else ++ ++void *jffs2_bbc_malloc(long size) ++{ ++ void *addr = malloc(size); ++ if (addr != NULL) ++ jffs2_bbc_mem_counter++; ++ return addr; ++} ++ ++void jffs2_bbc_free(void *addr) ++{ ++ jffs2_bbc_mem_counter--; ++ free(addr); ++} ++ ++void *jffs2_bbc_malloc_small(long size) ++{ ++ return jffs2_bbc_malloc(size); ++} ++ ++void jffs2_bbc_free_small(void *addr) ++{ ++ jffs2_bbc_free(addr); ++} ++ ++#endif ++ ++int jffs2_bbc_test_memory_counter(int verbose) ++{ ++ if (verbose > 0) { ++ jffs2_bbc_print2("jffs2.bbc: mem_counter=%d!\n", jffs2_bbc_mem_counter); ++ } ++ return jffs2_bbc_mem_counter; ++} ++ ++int jffs2_bbc_get_memory_counter(void) ++{ ++ return jffs2_bbc_mem_counter; ++} ++ ++static char mem_stat[200]; ++ ++char *jffs2_bbc_get_mem_stats(void) ++{ ++ sprintf(mem_stat, "Memcounter=%d\n", jffs2_bbc_mem_counter); ++ return mem_stat; ++} ++ ++void jffs2_bbc_print_flush(void) ++{ ++#ifdef __KERNEL__ ++ return; ++#else ++ fflush(stdout); ++ fflush(stderr); ++#endif ++} ++ ++/********************************************************************* ++ * FRAMEWORK - ZLIB REPLACEMENT * ++ *********************************************************************/ ++ ++#ifndef JFFS2_BBC_STANDALONE ++ ++/* Temorary buffers */ ++static char stat_str[JFFS2_BBC_STAT_BUFF_SIZE]; ++static int tmp_buffer_size = 0; ++static char *tmp_buffer = NULL; ++ ++/* Statistic - used by /proc/jffs2_bbc and mkfs.jffs2 */ ++char *jffs2_bbc_get_compr_stats(void) ++{ ++ struct jffs2_bbc_compressor_type *l; ++ char *s = stat_str; ++ ++ s += sprintf(s, "Compression statistics:\n"); ++ l = jffs2_bbc_original_compressor; ++ //s += sprintf(s, " zlib: compr=%d/%d decompr=%d\n", stat_zlib_compr_new, stat_zlib_compr_orig, stat_zlib_decompr); ++ s += sprintf(s, " %s: compr=%d/%d decompr=%d\n", l->name, l->stat_compr_new, l->stat_compr_orig, l->stat_decompr); ++ l = jffs2_bbc_get_compressor_list(); ++ while (l != NULL) { ++ s += sprintf(s, " %s: compr=%d/%d decompr=%d\n", l->name, l->stat_compr_new, l->stat_compr_orig, l->stat_decompr); ++ l = l->next; ++ } ++ return stat_str; ++} ++ ++static void jffs2_bbc_buffer_fill(unsigned char *buff, int size) ++{ ++ for (; size > 0; size--, buff++) ++ *buff = 255; ++} ++ ++ ++static int jffs2_bbc_update_compr_buf(unsigned long size) ++{ ++ struct jffs2_bbc_compressor_type *l; ++ ++ if (size < 5000) ++ size = 5000; ++ if (tmp_buffer == NULL) { ++ tmp_buffer = jffs2_bbc_malloc(size); ++ jffs2_bbc_buffer_fill(tmp_buffer, size); ++ tmp_buffer_size = size; ++ } ++ else if (tmp_buffer_size < size) { ++ jffs2_bbc_free(tmp_buffer); ++ tmp_buffer = jffs2_bbc_malloc(size); ++ jffs2_bbc_buffer_fill(tmp_buffer, size); ++ tmp_buffer_size = size; ++ } ++ l = jffs2_bbc_get_compressor_list(); ++ while (l != NULL) { ++ if (l->buffer == NULL) { ++ l->buffer_size = size; ++ l->buffer = jffs2_bbc_malloc(size); ++ jffs2_bbc_buffer_fill(l->buffer, size); ++ } ++ else if (l->buffer_size < size) { ++ jffs2_bbc_free(l->buffer); ++ l->buffer_size = size; ++ l->buffer = jffs2_bbc_malloc(size); ++ jffs2_bbc_buffer_fill(l->buffer, size); ++ } ++ l = l->next; ++ } ++ return 0; ++} ++ ++#ifdef DEBUG_COMPRESSORS ++ ++static unsigned char *debug_tmp_buff = NULL; ++static long debug_orig_srclen = -1; ++static long debug_orig_dstlen = -1; ++static int debug_mem_counter = -1; ++ ++ ++void debug_before_compress(struct jffs2_bbc_compressor_type *c, void *model, unsigned char *input, unsigned char *output, long *sourcelen, long *dstlen) ++{ ++ ++ debug_orig_srclen = *sourcelen; // for buffer overflow test ++ debug_orig_dstlen = *dstlen; // for buffer overflow test ++ output[debug_orig_dstlen + 1] = 255; ++ ++ debug_mem_counter = jffs2_bbc_get_memory_counter(); // for memory guard ++} ++ ++void debug_after_compress(struct jffs2_bbc_compressor_type *c, int back, void *model, unsigned char *input, unsigned char *output, long *sourcelen, long *dstlen) ++{ ++ long dst_len = *dstlen; ++ long src_len = *sourcelen; ++ int i; ++ ++ // Memory guard ++ if (debug_mem_counter != jffs2_bbc_get_memory_counter()) { ++ jffs2_bbc_print4("!!!!!!!! %s error: possible COMPRESSOR MEMORY LEAK: %d->%d\n", c->name, debug_mem_counter, jffs2_bbc_get_memory_counter()); ++ debug_mem_counter = jffs2_bbc_get_memory_counter(); ++ } ++ ++ // Buffer overflow test ++ if (output[debug_orig_dstlen + 1] != 255) { ++ jffs2_bbc_print7("!!!!!!!! %s error: BUFFER OVERFLOW !!!!!!!!!!!! b[%d]=%d (srclen=%d dstlen=%d, back=%d)\n", c->name, (int) (debug_orig_dstlen + 1), (int) (output[debug_orig_dstlen + 1]), (int) (debug_orig_srclen), (int) (*dstlen), back); ++ } ++ ++ // Decompression check ++ if (back == 0) { ++ if (debug_tmp_buff == NULL) ++ debug_tmp_buff = jffs2_bbc_malloc(17000); ++ for (i = 0; i < src_len; i++) debug_tmp_buff[i] = 0xf6; ++ c->decompress(model, output, debug_tmp_buff, dst_len, src_len); ++ // Memory guard for decompressor ++ if (debug_mem_counter != jffs2_bbc_get_memory_counter()) { ++ jffs2_bbc_print4("!!!!!!!! %s error: possible DECOMPRESSOR MEMORY LEAK: %d->%d\n", c->name, debug_mem_counter, jffs2_bbc_get_memory_counter()); ++ debug_mem_counter = jffs2_bbc_get_memory_counter(); ++ } ++ ++ for (i = 0; i < src_len; i++) ++ if (input[i] != debug_tmp_buff[i]) { ++ jffs2_bbc_print7("!!!!!!!! %s error: BLOCK DECOMPRESSED BADLY (first bad: %d in %d: %d!=%d (compressed size=%d)) !!!!!!!!!!!!\n", c->name, i, src_len, (int)input[i], (int)debug_tmp_buff[i], dst_len); ++ break; ++ } ++ return; ++ } ++ ++ // Return value test ++ //jffs2_bbc_print3("!!!!!!!! %s error: %d !!!!!!!!!!!!\n", c->name, back); ++} ++ ++#endif ++ ++int jffs2_zlib_compress(unsigned char *data_in, unsigned char *cpage_out, uint32_t * sourcelen, uint32_t * dstlen) ++{ ++ struct jffs2_bbc_compressor_type *c; ++ int back, back_zlib, mode, min, i, i2; ++ long tmp = 0, tmp_read_time = 1000, tmp_write_time = 1000, orig_src, orig_dest, src, dest; ++ struct jffs2_bbc_model_list_node *m; ++ void *sb; ++ unsigned char *tmp_p = NULL; ++ ++ sb = jffs2_bbc_model_get_act_sb(); ++ ++ orig_src = *sourcelen; ++ orig_dest = *dstlen; ++ ++ mode = jffs2_bbc_get_compression_mode(); ++ ++ if (mode == JFFS2_BBC_DUMMY_MODE) { ++ i=0; i2=0; ++ if (*dstlen>2) { ++ cpage_out[i++]=JFFS2_BBC_DUMMY_BLOCKSIGN_0; ++ cpage_out[i++]=JFFS2_BBC_DUMMY_BLOCKSIGN_1; ++ i2=i; ++ } ++ for (;((i < *dstlen) && (i < (*sourcelen)+i2));i++) { ++ cpage_out[i] = data_in[i-i2]; ++ } ++ *sourcelen=i-i2; ++ *dstlen=i; ++ return 0; ++ } ++ ++ if (mode == JFFS2_BBC_ZLIB_MODE) { ++ /*if (!jffs2_bbc_original_compressor->enabled) { ++ jffs2_bbc_print2("jffs2.bbc: WARNING: ZLIB mode but %s disabled! Enabling for this procedure...\n",jffs2_bbc_original_compressor->name); ++ }*/ ++ back = jffs2_bbc_original_compressor->compress(NULL, data_in, cpage_out, sourcelen, dstlen); ++ jffs2_bbc_original_compressor->stat_compr_orig += *sourcelen; ++ jffs2_bbc_original_compressor->stat_compr_new += *dstlen; ++ return back; ++ } ++ ++ jffs2_bbc_update_compr_buf(orig_dest); ++ ++ if (mode == JFFS2_BBC_SIZE_MODE) { ++ // Testing all compressors ++ if (!jffs2_bbc_original_compressor->enabled) { ++ min = -1; ++ } ++ else { ++ back_zlib = jffs2_bbc_original_compressor->compress(NULL, data_in, cpage_out, sourcelen, dstlen); ++ min = *dstlen; ++ } ++ c = jffs2_bbc_get_compressor_list(); ++ while (c != NULL) { ++ c->buffer_cnt = -1; ++ if (c->enabled == 0) { ++ c = c->next; ++ continue; ++ } ++ if (c->model_file_sign == 0) { ++ src = orig_src; ++ dest = orig_dest; ++#ifdef DEBUG_COMPRESSORS ++ debug_before_compress(c, NULL, data_in, c->buffer, &src, &dest); ++#endif ++ back = c->compress(NULL, data_in, c->buffer, &src, &dest); ++#ifdef DEBUG_COMPRESSORS ++ debug_after_compress(c, back, NULL, data_in, c->buffer, &src, &dest); ++#endif ++ if (back == 0) { ++ c->buffer_cnt = dest; ++ if ((min < 0) || (min > dest)) ++ min = dest; ++ } ++ } ++ else { ++ m = c->models; ++ while (m != NULL) { ++ src = orig_src; ++ dest = orig_dest; ++ if (m->sb == sb) { ++ if (c->buffer_cnt == -1) { ++#ifdef DEBUG_COMPRESSORS ++ debug_before_compress(c, m->model, data_in, c->buffer, (long *) (&src), (long *) (&dest)); ++#endif ++ back = c->compress(m->model, data_in, c->buffer, (long *) (&src), (long *) (&dest)); ++#ifdef DEBUG_COMPRESSORS ++ debug_after_compress(c, back, m->model, data_in, c->buffer, (long *) (&src), (long *) (&dest)); ++#endif ++ if (back == 0) { ++ c->buffer_cnt = dest; ++ if ((min < 0) || (min > dest)) ++ min = dest; ++ } ++ } ++ else { ++#ifdef DEBUG_COMPRESSORS ++ debug_before_compress(c, m->model, data_in, tmp_buffer, &src, &dest); ++#endif ++ back = c->compress(m->model, data_in, tmp_buffer, &src, &dest); ++#ifdef DEBUG_COMPRESSORS ++ debug_after_compress(c, back, m->model, data_in, tmp_buffer, &src, &dest); ++#endif ++ if (back == 0) { ++ if (c->buffer_cnt > dest) { ++ c->buffer_cnt = dest; ++ tmp_p = c->buffer; ++ c->buffer = tmp_buffer; ++ tmp_buffer = tmp_p; ++ if ((min < 0) || (min > dest)) ++ min = dest; ++ } ++ } ++ } ++ } ++ m = m->next_compr_model; ++ } ++ } ++ c = c->next; ++ } ++ //Finding the best and copy its result ++ ++#ifdef DEBUG_SHOW_BLOCK_SIZES ++ jffs2_bbc_print1("\n"); ++ if (jffs2_bbc_original_compressor->enabled) { ++ if (min == *dstlen) { ++ jffs2_bbc_print3("%s:%d* ", jffs2_bbc_original_compressor->name, (int) (*dstlen)); ++ } ++ else { ++ jffs2_bbc_print3("%s:%d ", jffs2_bbc_original_compressor->name, (int) (*dstlen)); ++ } ++ } ++ c = jffs2_bbc_get_compressor_list(); ++ while (c != NULL) { ++ if (c->enabled == 0) { ++ c = c->next; ++ continue; ++ } ++ if (c->buffer_cnt == min) ++ jffs2_bbc_print3("%s:%d* ", c->name, c->buffer_cnt); ++ else ++ jffs2_bbc_print3("%s:%d ", c->name, c->buffer_cnt); ++ c = c->next; ++ } ++#endif ++ ++ if (min == -1) { ++ return -1; // none of compressors work (maybe too short output buffer) ++ } ++ ++ if (jffs2_bbc_original_compressor->enabled) { ++ if (min == *dstlen) { ++ jffs2_bbc_original_compressor->stat_compr_orig += *sourcelen; ++ jffs2_bbc_original_compressor->stat_compr_new += *dstlen; ++ return back_zlib; ++ } ++ } ++ ++ c = jffs2_bbc_get_compressor_list(); ++ while (c != NULL) { ++ if (c->enabled == 0) { ++ c = c->next; ++ continue; ++ } ++ if (c->buffer_cnt == min) { ++ *dstlen = c->buffer_cnt; ++ *sourcelen = orig_src; ++ for (i = 0; i < *dstlen; i++) { ++ cpage_out[i] = c->buffer[i]; ++ } ++ c->stat_compr_orig += *sourcelen; ++ c->stat_compr_new += *dstlen; ++ return 0; ++ } ++ c = c->next; ++ } ++ jffs2_bbc_print1("jffs2.bbc: compr (full): BUG!!!\n"); ++ return 0; ++ } ++ ++ if ((mode == JFFS2_BBC_FASTR_MODE)||(mode == JFFS2_BBC_FASTW_MODE)||(mode == JFFS2_BBC_FASTS_MODE)) { ++ // Estimating all compressors ++ if (jffs2_bbc_original_compressor->enabled) { ++ back = jffs2_bbc_original_compressor->estimate(NULL, data_in, *sourcelen, &tmp, &tmp_read_time, &tmp_write_time); ++ } ++ else { ++ tmp = -1; ++ tmp_read_time = -1; ++ tmp_write_time = -1; ++ } ++ if (mode == JFFS2_BBC_FASTR_MODE) tmp = tmp_read_time; ++ if (mode == JFFS2_BBC_FASTW_MODE) tmp = tmp_write_time; ++ min = tmp; ++ c = jffs2_bbc_get_compressor_list(); ++ while (c != NULL) { ++ src = orig_src; ++ dest = orig_dest; ++ c->buffer_cnt = -1; ++ if (c->enabled == 0) { ++ c = c->next; ++ continue; ++ } ++ if ((c->model_file_sign == 0) || (jffs2_bbc_model_get_newest(c) != NULL)) { ++ back = c->estimate(jffs2_bbc_model_get_newest(c), data_in, src, &dest, &tmp_read_time, &tmp_write_time); ++ if (mode == JFFS2_BBC_FASTR_MODE) dest = tmp_read_time; ++ if (mode == JFFS2_BBC_FASTW_MODE) dest = tmp_write_time; ++ if (back == 0) { ++ c->buffer_cnt = dest; ++ if ((min < 0) || (min > dest)) ++ min = dest; ++ } ++ else { ++ c->buffer_cnt = -1; ++ } ++ } ++ c = c->next; ++ } ++ // Finding the best and compress with it ++ if (min == -1) { ++ return -1; ++ } ++ if (jffs2_bbc_original_compressor->enabled) { ++ if (min == tmp) { ++ back = jffs2_bbc_original_compressor->compress(NULL, data_in, cpage_out, sourcelen, dstlen); ++ jffs2_bbc_original_compressor->stat_compr_orig += *sourcelen; ++ jffs2_bbc_original_compressor->stat_compr_new += *dstlen; ++ return back; ++ } ++ } ++ c = jffs2_bbc_get_compressor_list(); ++ while (c != NULL) { ++ if (c->enabled == 0) { ++ c = c->next; ++ continue; ++ } ++ if (c->buffer_cnt == min) { ++ back = c->compress(jffs2_bbc_model_get_newest(c), data_in, cpage_out, (unsigned long*)sourcelen, (unsigned long*)dstlen); ++ if ((back == 0) && (*dstlen < orig_dest) && (*dstlen > 4)) { ++ c->stat_compr_orig += *sourcelen; ++ c->stat_compr_new += *dstlen; ++ } ++ else { // fallback will always be available ++ *sourcelen = orig_src; ++ *dstlen = orig_dest; ++ back = jffs2_bbc_original_compressor->compress(NULL, data_in, cpage_out, sourcelen, dstlen); ++ jffs2_bbc_original_compressor->stat_compr_orig += *sourcelen; ++ jffs2_bbc_original_compressor->stat_compr_new += *dstlen; ++ return back; ++ } ++ return 0; ++ } ++ c = c->next; ++ } ++ jffs2_bbc_print1("jffs2.bbc: compress (fastX mode): BUG!!!\n"); ++ return 0; ++ } ++ ++ if (mode == JFFS2_BBC_MANUAL_MODE) { ++ c = jffs2_bbc_get_manual_compressor(); ++ if (c != NULL) { ++ if (c->model_file_sign == 0) { ++ src = orig_src; ++ dest = orig_dest; ++ back = c->compress(NULL, data_in, cpage_out, &src, &dest); ++ if (back == 0) { ++ *dstlen = dest; ++ *sourcelen = src; ++ c->stat_compr_orig += *sourcelen; ++ c->stat_compr_new += *dstlen; ++ return 0; ++ } ++ } ++ else { ++ c->buffer_cnt = -1; ++ m = c->models; ++ min = -1; ++ while (m != NULL) { ++ src = orig_src; ++ dest = orig_dest; ++ if (m->sb == sb) { ++ if (min == -1) { ++ back = c->compress(m->model, data_in, cpage_out, (unsigned long*)sourcelen, (unsigned long*)dstlen); ++ if ((back == 0) && (*dstlen < orig_dest) && (*dstlen > 4)) { ++ min = dest; ++ tmp_p = cpage_out; ++ } ++ } ++ else { ++ back = c->compress(m->model, data_in, tmp_buffer, &src, &dest); ++ if ((back == 0) && (dest < orig_dest) && (dest > 4)) { ++ if (c->buffer_cnt > dest) { ++ if (min > dest) { ++ min = dest; ++ tmp_p = tmp_buffer; ++ } ++ } ++ } ++ } ++ } ++ m = m->next_compr_model; ++ } ++ if (min != -1) { ++ if (tmp_p != cpage_out) { ++ for (i = 0; i < min; i++) ++ cpage_out[i] = tmp_p[i]; ++ *sourcelen = orig_src; ++ *dstlen = min; ++ } ++ c->stat_compr_orig += *sourcelen; ++ c->stat_compr_new += *dstlen; ++ return 0; ++ } ++ } ++ } ++ /*else { ++ jffs2_bbc_print1("iPack: manual mode without selected compressor!\n"); ++ } */ ++ ++ /*if (!jffs2_bbc_original_compressor->enabled) { ++ jffs2_bbc_print2("jffs2.bbc: WARNING: %s must be enabled! Enabling for this procedure...\n",jffs2_bbc_original_compressor->name); ++ }*/ ++ back = jffs2_bbc_original_compressor->compress(NULL, data_in, cpage_out, sourcelen, dstlen); ++ jffs2_bbc_original_compressor->stat_compr_orig += *sourcelen; ++ jffs2_bbc_original_compressor->stat_compr_new += *dstlen; ++ return back; ++ ++ ++ } ++ ++ jffs2_bbc_print1("jffs2.bbc: compress: unimlemented compress mode!!!\n"); ++ return 0; ++} ++ ++void jffs2_zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, uint32_t srclen, uint32_t destlen) ++{ ++ struct jffs2_bbc_model_list_node *m; ++ struct jffs2_bbc_compressor_type *c; ++ char d[2]; ++ void *sb; ++ int i; ++ ++ /* If the input too small... */ ++ if (destlen<=2) { ++ cpage_out[0]=data_in[0]; ++ if (destlen==2) cpage_out[1]=data_in[1]; ++ return; ++ } ++ ++ sb = jffs2_bbc_model_get_act_sb(); ++ d[0] = *(data_in); ++ d[1] = *(data_in + 1); ++ ++ d[0] &= 0x7f; // Variants support... ++ ++ /* Search for model based decompressors... */ ++ m = jffs2_bbc_get_model_list(); ++ while (m != NULL) { ++ if ((d[0] == m->block_sign[0]) && (d[1] == m->block_sign[1]) && (sb == m->sb)) { ++ if (m->compressor == NULL) { ++ jffs2_bbc_print3("jffs2.bbc: decompressor for block_sign (%d,%d) not loaded!\n", (int) (d[0]), (int) (d[1])); ++ } ++ else { ++ m->compressor->decompress(m->model, data_in, cpage_out, srclen, destlen); ++ m->compressor->stat_decompr++; ++ m->stat_decompr++; ++ } ++ return; ++ } ++ m = m->next_model; ++ } ++ /* Is it ZLIB? */ ++ if ((((int) d[0]) == (int)(jffs2_bbc_original_compressor->block_sign[0])) && (((int) d[1]) == (int)(jffs2_bbc_original_compressor->block_sign[1]))) { ++ jffs2_bbc_original_compressor->decompress(NULL, data_in, cpage_out, srclen, destlen); ++ jffs2_bbc_original_compressor->stat_decompr++; ++ return; ++ } ++ /* Search for non model based decompressors... */ ++ c = jffs2_bbc_get_compressor_list(); ++ while (c != NULL) { ++ if (c->model_file_sign == 0) { ++ if (((int) (d[0]) == (int) (c->block_sign[0])) && ((int) (d[1]) == (int) (c->block_sign[1]))) { ++ c->decompress(NULL, data_in, cpage_out, srclen, destlen); ++ c->stat_decompr++; ++ return; ++ } ++ } ++ c = c->next; ++ } ++ /* Is it DUMMY? */ ++ if ((((int) d[0]) == JFFS2_BBC_DUMMY_BLOCKSIGN_0) && (((int) d[1]) == JFFS2_BBC_DUMMY_BLOCKSIGN_1)) { ++ for (i=0;i<destlen;i++) { ++ cpage_out[i]=data_in[i+2]; ++ } ++ return; ++ } ++ /* No matching decompressor found... */ ++ jffs2_bbc_print4("jffs2.bbc: cannot find model for decompress: bsign=(%d,%d),sb=%d. Using zlib.\n", (int) d[0], (int) d[1], (int) sb); ++ jffs2_bbc_original_compressor->decompress(NULL, data_in, cpage_out, srclen, destlen); ++ jffs2_bbc_original_compressor->stat_decompr++; ++} ++ ++#endif +diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_framework.h linux-mips/fs/jffs2/jffs2_bbc_framework.h +--- linux-mips-cvs/fs/jffs2/jffs2_bbc_framework.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/jffs2_bbc_framework.h 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,202 @@ ++/* ++ * JFFS2-BBC: Compression Framework - headers ++ * ++ * $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++ * ++ * Copyright (C) 2004, Ferenc Havasi ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#ifndef __JFFS2_BBC_FRAMEWORK_H__ ++ ++#define __JFFS2_BBC_FRAMEWORK_H__ ++ ++#define JFFS2_BBC_VERSION "0.54.3" ++ ++#define JFFS2_BBC_CONFIG_FILE "bbc.conf" ++ ++/********************************************************************* ++ * Compression mode handling * ++ *********************************************************************/ ++ ++#define JFFS2_BBC_ZLIB_MODE 1 ++#define JFFS2_BBC_SIZE_MODE 2 ++#define JFFS2_BBC_FASTR_MODE 3 ++#define JFFS2_BBC_FASTW_MODE 4 ++#define JFFS2_BBC_FASTS_MODE 5 ++#define JFFS2_BBC_MANUAL_MODE 6 ++#define JFFS2_BBC_DUMMY_MODE 7 ++ ++int jffs2_bbc_get_compression_mode(void); ++void jffs2_bbc_set_compression_mode(int mode); ++ ++/********************************************************************* ++ * Read/write speed unit * ++ * everything is relative to the speed of zlib * ++ * bigger number means slower speed! * ++ *********************************************************************/ ++ ++#define JFFS2_BBC_ZLIB_READ_TIME 10000 ++#define JFFS2_BBC_ZLIB_WRITE_TIME 10000 ++ ++/********************************************************************* ++ * Compressor handling * ++ *********************************************************************/ ++ ++struct jffs2_bbc_compressor_type ++{ ++ char name[16]; ++ int model_file_sign; /* 0 for no model file needed */ ++ char block_sign[4]; /* only nomodel compressors, and only the first 2 _bytes are used! */ ++ int (*init)(void); ++ int (*init_model)(void **model); ++ void (*destroy_model)(void **model); ++ void (*deinit)(void); ++ /* Compress block ++ * *dstlen bytes are allocated. ++ * if it is not enough write *sourcelen over to the processed amount of data ++ * returns non zero if fails ++ */ ++ int (*compress)(void *model, unsigned char *input, unsigned char *output, unsigned long *sourcelen, unsigned long *dstlen); ++ int (*estimate)(void *model, unsigned char *input, unsigned long sourcelen, ++ unsigned long *dstlen, unsigned long *readtime, unsigned long *writetime); ++ /* Decompress block ++ * returns non zero if fails ++ */ ++ int (*decompress)(void *model, unsigned char *input, unsigned char *output, unsigned long sourcelen, unsigned long dstlen); ++ char *(*proc_info)(void); ++ int (*proc_command)(char *command); ++ int enabled; /* filled by BBC */ ++ int mounted; /* filled by BBC */ ++ void *models; /* filled by BBC */ ++ char *buffer; /* filled by BBC */ ++ int buffer_size; /* filled by BBC */ ++ int buffer_cnt; /* filled by BBC */ ++ int buffer_tmp; /* filled by BBC */ ++ int stat_compr_orig; /* filled by BBC */ ++ int stat_compr_new; /* filled by BBC */ ++ int stat_decompr; /* filled by BBC */ ++ struct jffs2_bbc_compressor_type *next; /* filled by BBC */ ++}; ++ ++/* It sets the compression mode to JFFS2_BBC_MANUAL_MODE */ ++ ++void jffs2_bbc_set_manual_compressor(struct jffs2_bbc_compressor_type *c); /* NULL = ZLIB */ ++int jffs2_bbc_set_manual_compressor_by_name(char *name); ++int jffs2_bbc_disable_compressor_by_name(char *name); ++int jffs2_bbc_enable_compressor_by_name(char *name); ++void jffs2_bbc_compressor_command_by_name(char *name_and_command); ++ ++/* If the compression mode is JFFS2_BCC_MANUAL_MODE the manually setted ++ compressor can be get using it. Otherwise it returns with NULL. */ ++ ++struct jffs2_bbc_compressor_type *jffs2_bbc_get_manual_compressor(void); ++ ++struct jffs2_bbc_model_list_node ++{ ++ void *sb; /* FS idendifier (JFFS2_SB_INFO(sb) at this moment) */ ++ void *model; /* model data */ ++ int sign; /* sign of the model (first 4 bytes) */ ++ char block_sign[4]; /* block sign - only the first 2 bytes are used! */ ++ int inode; /* inode number of the model file */ ++ int stat_decompr; ++ struct jffs2_bbc_compressor_type *compressor; ++ struct jffs2_bbc_model_list_node *next_model; ++ struct jffs2_bbc_model_list_node *next_compr_model; ++}; ++ ++struct jffs2_bbc_compressor_type *jffs2_bbc_get_compressor_list(void); ++struct jffs2_bbc_model_list_node *jffs2_bbc_get_model_list(void); ++ ++int jffs2_bbc_register_compressor(struct jffs2_bbc_compressor_type *c); ++int jffs2_bbc_unregister_compressor(struct jffs2_bbc_compressor_type *c); ++ ++int jffs2_bbc_model_new(void *sb, int i_num, void *model); ++void jffs2_bbc_model_del(void *sb); ++void jffs2_bbc_model_set_act_sb(void *sb); ++void *jffs2_bbc_model_get_act_sb(void); ++void *jffs2_bbc_model_get_newest(struct jffs2_bbc_compressor_type *compressor); ++ ++/********************************************************************* ++ * Compressor init function * ++ *********************************************************************/ ++ ++void jffs2_bbc_compressor_init(void); ++void jffs2_bbc_compressor_deinit(void); ++ ++/********************************************************************* ++ * Statistics * ++ *********************************************************************/ ++ ++char *jffs2_bbc_get_compr_stats(void); ++char *jffs2_bbc_get_model_stats(void); ++ ++/********************************************************************* ++ * Other * ++ *********************************************************************/ ++ ++ ++void jffs2_bbc_print_flush(void); ++ ++#ifdef __KERNEL__ ++#include <linux/kernel.h> ++#define jffs2_bbc_print1(a) printk(a) ++#define jffs2_bbc_print2(a,b) printk(a,b) ++#define jffs2_bbc_print3(a,b,c) printk(a,b,c) ++#define jffs2_bbc_print4(a,b,c,d) printk(a,b,c,d) ++#define jffs2_bbc_print5(a,b,c,d,e) printk(a,b,c,d,e) ++#define jffs2_bbc_print6(a,b,c,d,e,f) printk(a,b,c,d,e,f) ++#define jffs2_bbc_print7(a,b,c,d,e,f,g) printk(a,b,c,d,e,f,g) ++#define jffs2_bbc_print8(a,b,c,d,e,f,g,h) printk(a,b,c,d,e,f,g,h) ++#define jffs2_bbc_print9(a,b,c,d,e,f,g,h,i) printk(a,b,c,d,e,f,g,h,i) ++#else ++#include <stdio.h> ++#define jffs2_bbc_print1(a) fprintf(stderr,a) ++#define jffs2_bbc_print2(a,b) fprintf(stderr,a,b) ++#define jffs2_bbc_print3(a,b,c) fprintf(stderr,a,b,c) ++#define jffs2_bbc_print4(a,b,c,d) fprintf(stderr,a,b,c,d) ++#define jffs2_bbc_print5(a,b,c,d,e) fprintf(stderr,a,b,c,d,e) ++#define jffs2_bbc_print6(a,b,c,d,e,f) fprintf(stderr,a,b,c,d,e,f) ++#define jffs2_bbc_print7(a,b,c,d,e,f,g) fprintf(stderr,a,b,c,d,e,f,g) ++#define jffs2_bbc_print8(a,b,c,d,e,f,g,h) fprintf(stderr,a,b,c,d,e,f,g,h) ++#define jffs2_bbc_print9(a,b,c,d,e,f,g,h,i) fprintf(stderr,a,b,c,d,e,f,g,h,i) ++#endif ++ ++/* Handle endianness */ ++#ifndef __KERNEL__ ++ ++#define ENDIAN_HOST_AND_TARGET_SAME 0 ++#define ENDIAN_HOST_AND_TARGET_DIFFERENT 1 ++ ++extern int jffs2_bbc_glb_endian_X; ++ ++#endif ++ ++/* Allocating more than one page (tip. 4096 byte) */ ++void *jffs2_bbc_malloc(long size); ++void jffs2_bbc_free(void *addr); ++ ++/* Allocating less than one page (tip. 4096 byte) */ ++void *jffs2_bbc_malloc_small(long size); ++void jffs2_bbc_free_small(void *addr); ++ ++/* Memory guarding */ ++int jffs2_bbc_test_memory_counter(int verbose); ++char *jffs2_bbc_get_mem_stats(void); ++int jffs2_bbc_get_memory_counter(void); ++ ++#endif +diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_fs.c linux-mips/fs/jffs2/jffs2_bbc_fs.c +--- linux-mips-cvs/fs/jffs2/jffs2_bbc_fs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/jffs2_bbc_fs.c 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,331 @@ ++/* ++ * JFFS2-BBC: File System Extension for Linux Kernel ++ * ++ * $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++ * ++ * Copyright (C) 2004, Ferenc Havasi ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/fs.h> ++#include <linux/jffs2.h> ++#include <linux/proc_fs.h> ++#include <linux/version.h> ++ ++#include "nodelist.h" ++ ++#include "jffs2_bbc_framework.h" ++ ++struct jffs2_bbc_fs_sb_list { ++ struct super_block *sb; ++ struct jffs2_bbc_fs_sb_list *next; ++}; ++ ++static struct jffs2_bbc_fs_sb_list *sb_list = NULL; ++ ++void jffs2_bbc_proc_init(void); ++void jffs2_bbc_proc_deinit(void); ++ ++void jffs2_bbc_load_model(void *sb_par) { ++ struct jffs2_sb_info *c; ++ //struct jffs2_inode_info *f; ++ struct dentry *config_dentry,*model_dentry; ++ struct qstr config_name,model_name; ++ struct file *config_file,*model_file; ++ char *buff=NULL,*model_buff; ++ int config_size,model_size; ++ int i,prev_i; ++ struct super_block *sb; ++ struct jffs2_bbc_fs_sb_list *sb_l; ++ ++ sb = sb_par; ++ sb_l = jffs2_bbc_malloc_small(sizeof(struct jffs2_bbc_fs_sb_list)); ++ sb_l->sb = sb; ++ sb_l->next = sb_list; ++ sb_list = sb_l; ++ config_name.name = JFFS2_BBC_CONFIG_FILE; ++ config_name.len = strlen(config_name.name); ++ config_name.hash = full_name_hash(config_name.name,config_name.len); ++ config_dentry = d_alloc(sb->s_root,&config_name); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) ++ sb->s_root->d_inode->i_op->lookup(sb->s_root->d_inode,config_dentry); ++#else ++ sb->s_root->d_inode->i_op->lookup(sb->s_root->d_inode,config_dentry,NULL); ++#endif ++ ++ if (config_dentry->d_inode != NULL) { ++ config_size = config_dentry->d_inode->i_size; ++ //printk("config_file_size=%d\n",config_size); ++ if (config_size > 0) { ++ buff = jffs2_bbc_malloc(config_size+1); ++ config_file = dentry_open(config_dentry,NULL,O_RDONLY); ++ kernel_read(config_file,0,buff,config_size); ++ buff[config_size] = 0; ++ for (prev_i = i = 0 ; i < config_size+1 ; i++) { ++ if (buff[i] == '\n') buff[i]=0; ++ if (buff[i] == 0) { ++ if (prev_i != i) { ++ if ((buff[prev_i] == '-') && (buff[prev_i+1] == 0)) break; ++ printk("reading model file %s... ",buff+prev_i); ++ model_name.name = buff+prev_i; ++ model_name.len = strlen(buff+prev_i); ++ model_name.hash = full_name_hash(model_name.name,model_name.len); ++ model_dentry = d_alloc(sb->s_root,&model_name); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) ++ sb->s_root->d_inode->i_op->lookup(sb->s_root->d_inode,model_dentry); ++#else ++ sb->s_root->d_inode->i_op->lookup(sb->s_root->d_inode,model_dentry,NULL); ++#endif ++ if (model_dentry->d_inode != NULL) { ++ c = JFFS2_SB_INFO(model_dentry->d_inode->i_sb); ++ //f = JFFS2_INODE_INFO(model_dentry->d_inode); ++ model_size = model_dentry->d_inode->i_size; ++ model_buff = jffs2_bbc_malloc(model_size); ++ model_file = dentry_open(model_dentry,NULL,O_RDONLY); ++ kernel_read(model_file,0,model_buff,model_size); ++ if (jffs2_bbc_model_new(c,model_dentry->d_inode->i_ino,model_buff) != 0) { ++ printk("already loaded.\n"); ++ jffs2_bbc_free(model_buff); ++ } ++ else { ++ printk("done (%d bytes readed from inode %d).\n",model_size,(int)(model_dentry->d_inode->i_ino)); ++ } ++ } ++ else { ++ printk("not found.\n"); ++ } ++ dput(model_dentry); ++ } ++ prev_i = i+1; ++ } ++ } ++ } ++ } ++ dput(config_dentry); ++ if (buff != NULL) jffs2_bbc_free(buff); ++} ++ ++void jffs2_bbc_unload_model(void *sb_par) ++{ ++ struct jffs2_sb_info *c; ++ struct super_block *sb = sb_par; ++ struct jffs2_bbc_fs_sb_list *sb_l,*sb_l2; ++ int done = 0; ++ ++ c = JFFS2_SB_INFO(sb); ++ jffs2_bbc_model_del(c); ++ if (sb_list == NULL) printk("jffs2.bbc: error! NULL sb list!\n"); ++ else { ++ if (sb_list->sb == sb) { ++ jffs2_bbc_free_small(sb_list); ++ sb_list = NULL; ++ done = 1; ++ } ++ else { ++ sb_l = sb_list; ++ while (sb_l->next != NULL) { ++ if (sb_l->next->sb == sb) { ++ sb_l2 = sb_l->next->next; ++ jffs2_bbc_free_small(sb_l->next); ++ sb_l->next = sb_l2; ++ done = 1; ++ } ++ sb_l = sb_l->next; ++ } ++ ++ } ++ if (done == 0) { ++ printk("jffs2.bbc: cannot delete sb from sblist!\n"); ++ } ++ } ++} ++ ++static int jffs2_bbc_get_mounted(void) { ++ struct jffs2_bbc_fs_sb_list *sb_l; ++ int num = 0; ++ ++ sb_l = sb_list; ++ while (sb_l != NULL) { ++ num++; ++ sb_l = sb_l->next; ++ } ++ return num; ++ ++} ++ ++int jffs2_bbc_proc_read(char *buf, char **start, off_t offset, int count, int *eof, void *data) ++{ ++ int len = 0, mode; ++ ++ mode = jffs2_bbc_get_compression_mode(); ++ len += sprintf(buf + len, "BBC version: %s\n", JFFS2_BBC_VERSION); ++ len += sprintf(buf+len,"Mounted jffs2 filesystems: %d\n",jffs2_bbc_get_mounted()); ++ //len += sprintf(buf+len,"actual model file inode: %d\n",jffs2_bbc_model_get_inum()); ++ len += sprintf(buf + len, "Compression mode: "); ++ if (mode == JFFS2_BBC_ZLIB_MODE) ++ len += sprintf(buf + len, "ZLIB mode"); ++ else if (mode == JFFS2_BBC_SIZE_MODE) ++ len += sprintf(buf + len, "SIZE mode"); ++ else if (mode == JFFS2_BBC_FASTR_MODE) ++ len += sprintf(buf + len, "FASTR mode"); ++ else if (mode == JFFS2_BBC_FASTW_MODE) ++ len += sprintf(buf + len, "FASTW mode"); ++ else if (mode == JFFS2_BBC_FASTS_MODE) ++ len += sprintf(buf + len, "FASTS mode"); ++ else if (mode == JFFS2_BBC_DUMMY_MODE) ++ len += sprintf(buf + len, "DUMMY mode"); ++ else if (mode == JFFS2_BBC_MANUAL_MODE) { ++ len += sprintf(buf + len, "MANUAL mode ("); ++ if (jffs2_bbc_get_manual_compressor() != NULL) ++ len += sprintf(buf + len, "%s)", jffs2_bbc_get_manual_compressor()->name); ++ else ++ len += sprintf(buf + len, "ZLIB)"); ++ } ++ else ++ len += sprintf(buf + len, "unknown mode"); ++ len += sprintf(buf + len, "\n"); ++ len += sprintf(buf + len, "%s", jffs2_bbc_get_compr_stats()); ++ len += sprintf(buf + len, "%s", jffs2_bbc_get_model_stats()); ++ len += sprintf(buf + len, "%s", jffs2_bbc_get_mem_stats()); ++ *eof = 1; ++ return len; ++} ++ ++int jffs2_bbc_proc_write(struct file *file, const char *buffer_orig, unsigned long count, void *data) ++{ ++ char *buffer; ++ int i; ++ struct jffs2_bbc_fs_sb_list *sb_l; ++ ++ if (buffer_orig == NULL) return 0; ++ ++ buffer = jffs2_bbc_malloc(count+2); ++ for (i=0;i<count;i++) buffer[i]=buffer_orig[i]; ++ buffer[count] = 0; ++ if ((*buffer == 'z') || (*buffer == 'Z')) { ++ jffs2_bbc_set_compression_mode(JFFS2_BBC_ZLIB_MODE); ++ jffs2_bbc_print1("jffs2.bbc: ZLIB compression mode activated.\n"); ++ jffs2_bbc_free(buffer); ++ return count; ++ } ++ else if ((*buffer == 's') || (*buffer == 'S')) { ++ jffs2_bbc_set_compression_mode(JFFS2_BBC_SIZE_MODE); ++ jffs2_bbc_print1("jffs2.bbc: SIZE compression mode activated.\n"); ++ jffs2_bbc_free(buffer); ++ return count; ++ } ++ else if ((*buffer == 'd') || (*buffer == 'D')) { ++ jffs2_bbc_set_compression_mode(JFFS2_BBC_DUMMY_MODE); ++ jffs2_bbc_print1("jffs2.bbc: DUMMY compression mode activated.\n"); ++ jffs2_bbc_free(buffer); ++ return count; ++ } ++ else if (((*buffer == 'm') || (*buffer == 'M')) && (count >= 3) && (buffer[1] == ':')) { ++ jffs2_bbc_print1("jffs2.bbc: activating MANUAL mode.\n"); ++ jffs2_bbc_set_manual_compressor_by_name(buffer + 2); ++ jffs2_bbc_free(buffer); ++ return count; ++ } ++ else if (((*buffer == '0')) && (count >= 3) && (buffer[1] == ':')) { ++ jffs2_bbc_print1("jffs2.bbc: disabling a compressor... "); ++ if (jffs2_bbc_disable_compressor_by_name(buffer + 2) == 0) { ++ jffs2_bbc_print1("done.\n"); ++ } ++ else { ++ jffs2_bbc_print1("not found.\n"); ++ } ++ jffs2_bbc_free(buffer); ++ return count; ++ } ++ else if (((*buffer == '1')) && (count >= 3) && (buffer[1] == ':')) { ++ jffs2_bbc_print1("jffs2.bbc: enabling a compressor... "); ++ if (jffs2_bbc_enable_compressor_by_name(buffer + 2) == 0) { ++ jffs2_bbc_print1("done.\n"); ++ } ++ else { ++ jffs2_bbc_print1("not found.\n"); ++ } ++ jffs2_bbc_free(buffer); ++ return count; ++ } ++ else if (((*buffer == 'c') || (*buffer == 'C')) && (count >= 3) && (buffer[1] == ':')) { ++ jffs2_bbc_compressor_command_by_name(buffer + 2); ++ jffs2_bbc_free(buffer); ++ return count; ++ } ++ else if ((*buffer == 'r') || (*buffer == 'R')) { ++ jffs2_bbc_print1("jffs2.bbc: reloading model files:\n"); ++ sb_l = sb_list; ++ while (sb_l != NULL) { ++ jffs2_bbc_unload_model(sb_l->sb); ++ jffs2_bbc_load_model(sb_l->sb); ++ sb_l = sb_l->next; ++ } ++ jffs2_bbc_free(buffer); ++ return count; ++ } ++ else if (((buffer[0] == 'f') || (buffer[0] == 'F'))&&((buffer[1] == 'r') || (buffer[1] == 'R'))) { ++ jffs2_bbc_set_compression_mode(JFFS2_BBC_FASTR_MODE); ++ jffs2_bbc_print1("jffs2.bbc: FASTR compression mode activated.\n"); ++ jffs2_bbc_free(buffer); ++ return count; ++ } ++ else if (((buffer[0] == 'f') || (buffer[0] == 'F'))&&((buffer[1] == 'w') || (buffer[1] == 'W'))) { ++ jffs2_bbc_set_compression_mode(JFFS2_BBC_FASTW_MODE); ++ jffs2_bbc_print1("jffs2.bbc: FASTW compression mode activated.\n"); ++ jffs2_bbc_free(buffer); ++ return count; ++ } ++ else if (((buffer[0] == 'f') || (buffer[0] == 'F'))&&((buffer[1] == 's') || (buffer[1] == 'S'))) { ++ jffs2_bbc_set_compression_mode(JFFS2_BBC_FASTS_MODE); ++ jffs2_bbc_print1("jffs2.bbc: FASTS compression mode activated.\n"); ++ jffs2_bbc_free(buffer); ++ return count; ++ } ++ ++ jffs2_bbc_print1("jffs2.bbc: unkown command. Valid commands are:\n" ++ " z = switch to ZLIB compression mode\n" ++ " s = switch to SIZE compression mode\n" ++ " d = switch to DUMMY compression mode\n" ++ " fr = switch to FASTR compression mode\n" ++ " fw = switch to FASTW compression mode\n" ++ " fs = switch to FASTS compression mode\n" ++ " r = reread model files from actual file system\n" ++ " m:compressor_name = switch to MANUAL compression mode\n" ++ " 0:compressor_name = disable a compressor\n" ++ " 1:compressor_name = enable a compressor\n" ++ " c:compressor_name:command = enable a compressor\n"); ++ jffs2_bbc_free(buffer); ++ return count; ++} ++ ++void jffs2_bbc_proc_init() ++{ ++ struct proc_dir_entry *res = create_proc_entry("jffs2_bbc", 0, NULL); ++ jffs2_bbc_compressor_init(); ++ if (res) { ++ res->read_proc = jffs2_bbc_proc_read; ++ res->write_proc = jffs2_bbc_proc_write; ++ } ++} ++ ++void jffs2_bbc_proc_deinit() ++{ ++ jffs2_bbc_compressor_deinit(); ++ remove_proc_entry("jffs2_bbc", NULL); ++} +diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_fs.h linux-mips/fs/jffs2/jffs2_bbc_fs.h +--- linux-mips-cvs/fs/jffs2/jffs2_bbc_fs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/jffs2_bbc_fs.h 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,30 @@ ++/* ++ * JFFS2 BBC: File System Extension for Linux Kernel - headers ++ * ++ * $Id: 301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++ * ++ * Copyright (C) 2004, Ferenc Havasi ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++extern int jffs2_bbc_inode_not_found; ++ ++void jffs2_bbc_load_model(void *sb); ++void jffs2_bbc_unload_model(void *sb); ++ ++void jffs2_bbc_proc_init(void); ++void jffs2_bbc_proc_deinit(void); +diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzari_comp.c linux-mips/fs/jffs2/jffs2_bbc_lzari_comp.c +--- linux-mips-cvs/fs/jffs2/jffs2_bbc_lzari_comp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/jffs2_bbc_lzari_comp.c 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,788 @@ ++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ ++ ++/* ++ jffs2_bbc_lzari_comp.c -- Lempel-Ziv-Arithmetic coding compression module for jffs2 ++ Copyright (C) 2004 Patrik Kluba ++ Based on the LZARI source included in LDS (lossless datacompression sources) ++ Block-compression and bitstream modifications by Patrik Kluba ++ $Header: /openwrt/openwrt/package/linux/kernel-patches/301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*/ ++ ++/* ++Original copyright follows: ++ ++************************************************************** ++ LZARI.C -- A Data Compression Program ++ (tab = 4 spaces) ++************************************************************** ++ 4/7/1989 Haruhiko Okumura ++ Use, distribute, and modify this program freely. ++ Please send me your improved versions. ++ PC-VAN SCIENCE ++ NIFTY-Serve PAF01022 ++ CompuServe 74050,1022 ++************************************************************** ++ ++LZARI.C (c)1989 by Haruyasu Yoshizaki, Haruhiko Okumura, and Kenji Rikitake. ++All rights reserved. Permission granted for non-commercial use. ++ ++*/ ++ ++/* ++ ++ 2004-02-18 pajko <pajko(AT)halom(DOT)u-szeged(DOT)hu> ++ Removed unused variables and fixed no return value ++ ++ 2004-02-16 pajko <pajko(AT)halom(DOT)u-szeged(DOT)hu> ++ Initial release ++ ++*/ ++ ++/* lzari.c */ ++ ++#define N 4096 /* size of ring buffer */ ++#define F 60 /* upper limit for match_length */ ++#define THRESHOLD 2 /* encode string into position and length ++ if match_length is greater than this */ ++#define NIL N /* index for root of binary search trees */ ++ ++static unsigned char ++ text_buf[N + F - 1]; /* ring buffer of size N, ++ with extra F-1 bytes to facilitate string comparison */ ++static unsigned long match_position, match_length, /* of longest match. These are ++ set by the InsertNode() procedure. */ ++ lson[N + 1], rson[N + 257], dad[N + 1]; /* left & right children & ++ parents -- These constitute binary search trees. */ ++ ++static void InitTree(void) /* Initialize trees */ ++{ ++ unsigned long i; ++ ++ /* For i = 0 to N - 1, rson[i] and lson[i] will be the right and ++ left children of node i. These nodes need not be initialized. ++ Also, dad[i] is the parent of node i. These are initialized to ++ NIL (= N), which stands for 'not used.' ++ For i = 0 to 255, rson[N + i + 1] is the root of the tree ++ for strings that begin with character i. These are initialized ++ to NIL. Note there are 256 trees. */ ++ ++ for (i = N + 1; i <= N + 256; i++) rson[i] = NIL; /* root */ ++ for (i = 0; i < N; i++) dad[i] = NIL; /* node */ ++} ++ ++static void InsertNode(unsigned long r) ++ /* Inserts string of length F, text_buf[r..r+F-1], into one of the ++ trees (text_buf[r]'th tree) and returns the longest-match position ++ and length via the global variables match_position and match_length. ++ If match_length = F, then removes the old node in favor of the new ++ one, because the old one will be deleted sooner. ++ Note r plays double role, as tree node and position in buffer. */ ++{ ++ unsigned long i, p, temp; ++ unsigned char *key; ++ signed long cmp; ++ ++ cmp = 1; key = &text_buf[r]; p = N + 1 + key[0]; ++ rson[r] = lson[r] = NIL; match_length = 0; ++ for ( ; ; ) { ++ if (cmp >= 0) { ++ if (rson[p] != NIL) p = rson[p]; ++ else { rson[p] = r; dad[r] = p; return; } ++ } else { ++ if (lson[p] != NIL) p = lson[p]; ++ else { lson[p] = r; dad[r] = p; return; } ++ } ++ for (i = 1; i < F; i++) ++ if ((cmp = key[i] - text_buf[p + i]) != 0) break; ++ if (i > THRESHOLD) { ++ if (i > match_length) { ++ match_position = (r - p) & (N - 1); ++ if ((match_length = i) >= F) break; ++ } else if (i == match_length) { ++ if ((temp = (r - p) & (N - 1)) < match_position) ++ match_position = temp; ++ } ++ } ++ } ++ dad[r] = dad[p]; lson[r] = lson[p]; rson[r] = rson[p]; ++ dad[lson[p]] = r; dad[rson[p]] = r; ++ if (rson[dad[p]] == p) rson[dad[p]] = r; ++ else lson[dad[p]] = r; ++ dad[p] = NIL; /* remove p */ ++} ++ ++static void DeleteNode(unsigned long p) /* Delete node p from tree */ ++{ ++ unsigned long q; ++ ++ if (dad[p] == NIL) return; /* not in tree */ ++ if (rson[p] == NIL) q = lson[p]; ++ else if (lson[p] == NIL) q = rson[p]; ++ else { ++ q = lson[p]; ++ if (rson[q] != NIL) { ++ do { q = rson[q]; } while (rson[q] != NIL); ++ rson[dad[q]] = lson[q]; dad[lson[q]] = dad[q]; ++ lson[q] = lson[p]; dad[lson[p]] = q; ++ } ++ rson[q] = rson[p]; dad[rson[p]] = q; ++ } ++ dad[q] = dad[p]; ++ if (rson[dad[p]] == p) rson[dad[p]] = q; ++ else lson[dad[p]] = q; ++ dad[p] = NIL; ++} ++ ++/********** Arithmetic Compression **********/ ++ ++/* If you are not familiar with arithmetic compression, you should read ++ I. E. Witten, R. M. Neal, and J. G. Cleary, ++ Communications of the ACM, Vol. 30, pp. 520-540 (1987), ++ from which much have been borrowed. */ ++ ++#define M 15 ++ ++/* Q1 (= 2 to the M) must be sufficiently large, but not so ++ large as the unsigned long 4 * Q1 * (Q1 - 1) overflows. */ ++ ++#define Q1 (1UL << M) ++#define Q2 (2 * Q1) ++#define Q3 (3 * Q1) ++#define Q4 (4 * Q1) ++#define MAX_CUM (Q1 - 1) ++ ++#define N_CHAR (256 - THRESHOLD + F) ++ /* character code = 0, 1, ..., N_CHAR - 1 */ ++ ++static unsigned long char_to_sym[N_CHAR], sym_to_char[N_CHAR + 1]; ++static unsigned long ++ sym_freq[N_CHAR + 1], /* frequency for symbols */ ++ sym_cum[N_CHAR + 1], /* cumulative freq for symbols */ ++ position_cum[N + 1]; /* cumulative freq for positions */ ++ ++static void StartModel(void) /* Initialize model */ ++{ ++ unsigned long ch, sym, i; ++ ++ sym_cum[N_CHAR] = 0; ++ for (sym = N_CHAR; sym >= 1; sym--) { ++ ch = sym - 1; ++ char_to_sym[ch] = sym; sym_to_char[sym] = ch; ++ sym_freq[sym] = 1; ++ sym_cum[sym - 1] = sym_cum[sym] + sym_freq[sym]; ++ } ++ sym_freq[0] = 0; /* sentinel (!= sym_freq[1]) */ ++ position_cum[N] = 0; ++ for (i = N; i >= 1; i--) ++ position_cum[i - 1] = position_cum[i] + 10000 / (i + 200); ++ /* empirical distribution function (quite tentative) */ ++ /* Please devise a better mechanism! */ ++} ++ ++static void UpdateModel(unsigned long sym) ++{ ++ unsigned long c, ch_i, ch_sym; ++ unsigned long i; ++ if (sym_cum[0] >= MAX_CUM) { ++ c = 0; ++ for (i = N_CHAR; i > 0; i--) { ++ sym_cum[i] = c; ++ c += (sym_freq[i] = (sym_freq[i] + 1) >> 1); ++ } ++ sym_cum[0] = c; ++ } ++ for (i = sym; sym_freq[i] == sym_freq[i - 1]; i--) ; ++ if (i < sym) { ++ ch_i = sym_to_char[i]; ch_sym = sym_to_char[sym]; ++ sym_to_char[i] = ch_sym; sym_to_char[sym] = ch_i; ++ char_to_sym[ch_i] = sym; char_to_sym[ch_sym] = i; ++ } ++ sym_freq[i]++; ++ while (--i > 0) sym_cum[i]++; ++ sym_cum[0]++; ++} ++ ++static unsigned long BinarySearchSym(unsigned long x) ++ /* 1 if x >= sym_cum[1], ++ N_CHAR if sym_cum[N_CHAR] > x, ++ i such that sym_cum[i - 1] > x >= sym_cum[i] otherwise */ ++{ ++ unsigned long i, j, k; ++ ++ i = 1; j = N_CHAR; ++ while (i < j) { ++ k = (i + j) / 2; ++ if (sym_cum[k] > x) i = k + 1; else j = k; ++ } ++ return i; ++} ++ ++unsigned long BinarySearchPos(unsigned long x) ++ /* 0 if x >= position_cum[1], ++ N - 1 if position_cum[N] > x, ++ i such that position_cum[i] > x >= position_cum[i + 1] otherwise */ ++{ ++ unsigned long i, j, k; ++ ++ i = 1; j = N; ++ while (i < j) { ++ k = (i + j) / 2; ++ if (position_cum[k] > x) i = k + 1; else j = k; ++ } ++ return i - 1; ++} ++ ++/* modified for block compression */ ++/* on return, srclen will contain the number of successfully compressed bytes ++ and dstlen will contain completed compressed bytes */ ++ ++static int Encode(unsigned char *srcbuf, unsigned char *dstbuf, unsigned long *srclen, ++ unsigned long *dstlen) ++{ ++ unsigned long c, i, len, r, s, last_match_length, sym, range; ++ unsigned long low = 0; ++ unsigned long high = Q4; ++ unsigned long shifts = 0; /* counts for magnifying low and high around Q2 */ ++ unsigned char *ip, *op; ++ unsigned long written = 0; ++ unsigned long read = 0; ++ unsigned char buffer = 0; ++ unsigned char mask = 128; ++ unsigned char *srcend = srcbuf + *srclen; ++ unsigned char *dstend = dstbuf + *dstlen; ++ ip = srcbuf; ++ op = dstbuf; ++ StartModel(); ++ InitTree(); /* initialize trees */ ++ s = 0; r = N - F; ++ for (i = s; i < r; i++) text_buf[i] = ' '; /* Clear the buffer with ++ any character that will appear often. */ ++ for (len = 0; (len < F) && (ip < srcend); len++) ++ text_buf[r + len] = *(ip++); /* Read F bytes into the last F bytes of ++ the buffer */ ++ read = len; ++ for (i = 1; i <= F; i++) InsertNode(r - i); /* Insert the F strings, ++ each of which begins with one or more 'space' characters. Note ++ the order in which these strings are inserted. This way, ++ degenerate trees will be less likely to occur. */ ++ InsertNode(r); /* Finally, insert the whole string just read. The ++ global variables match_length and match_position are set. */ ++ do { ++ if (match_length > len) match_length = len; /* match_length ++ may be spuriously long near the end of text. */ ++ if (match_length <= THRESHOLD) { ++ match_length = 1; /* Not long enough match. Send one byte. */ ++ sym = char_to_sym[text_buf[r]]; ++ range = high - low; ++ high = low + (range * sym_cum[sym - 1]) / sym_cum[0]; ++ low += (range * sym_cum[sym ]) / sym_cum[0]; ++ for ( ; ; ) { ++ if (high <= Q2) { ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ for ( ; shifts > 0; shifts--) { ++ buffer |= mask; ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ } ++ } else if (low >= Q2) { ++ buffer |= mask; ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ for ( ; shifts > 0; shifts--) { ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ } ++ low -= Q2; ++ high -= Q2; ++ } else if (low >= Q1 && high <= Q3) { ++ shifts++; ++ low -= Q1; ++ high -= Q1; ++ } else break; ++ low += low; high += high; ++ } ++ UpdateModel(sym); ++ } else { ++ sym = char_to_sym[255 - THRESHOLD + match_length]; ++ range = high - low; ++ high = low + (range * sym_cum[sym - 1]) / sym_cum[0]; ++ low += (range * sym_cum[sym ]) / sym_cum[0]; ++ for ( ; ; ) { ++ if (high <= Q2) { ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ for ( ; shifts > 0; shifts--) { ++ buffer |= mask; ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ } ++ } else if (low >= Q2) { ++ buffer |= mask; ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ for ( ; shifts > 0; shifts--) { ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ } ++ low -= Q2; ++ high -= Q2; ++ } else if (low >= Q1 && high <= Q3) { ++ shifts++; ++ low -= Q1; ++ high -= Q1; ++ } else break; ++ low += low; high += high; ++ } ++ UpdateModel(sym); ++ range = high - low; ++ high = low + (range * position_cum[match_position - 1]) / position_cum[0]; ++ low += (range * position_cum[match_position ]) / position_cum[0]; ++ for ( ; ; ) { ++ if (high <= Q2) { ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ for ( ; shifts > 0; shifts--) { ++ buffer |= mask; ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ } ++ } else { ++ if (low >= Q2) { ++ buffer |= mask; ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ for ( ; shifts > 0; shifts--) { ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ } ++ low -= Q2; ++ high -= Q2; ++ } else { ++ if ((low >= Q1) && (high <= Q3)) { ++ shifts++; ++ low -= Q1; ++ high -= Q1; ++ } else { ++ break; ++ } ++ } ++ } ++ low += low; ++ high += high; ++ } ++ } ++ last_match_length = match_length; ++ for (i = 0; (i < last_match_length) && (ip < srcend); i++) { ++ c = *(ip++); ++ DeleteNode(s); ++ text_buf[s] = c; ++ if (s < F - 1) ++ text_buf[s + N] = c; ++ s = (s + 1) & (N - 1); ++ r = (r + 1) & (N - 1); ++ InsertNode(r); ++ } ++ read += i; ++ while (i++ < last_match_length) { ++ DeleteNode(s); ++ s = (s + 1) & (N - 1); ++ r = (r + 1) & (N - 1); ++ if (--len) InsertNode(r); ++ } ++ } while (len > 0); ++ shifts++; ++ if (low < Q1) { ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ for ( ; shifts > 0; shifts--) { ++ buffer |= mask; ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ } ++ } else { ++ buffer |= mask; ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ for ( ; shifts > 0; shifts--) { ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ } ++ } ++ for (i = 0; i < 7; i++) { ++ if ((mask >>= 1) == 0) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = buffer; ++ buffer = 0; ++ mask = 128; ++ written++; ++ *srclen = read; ++ } ++ } ++ *dstlen = written; ++ return 0; ++} ++ ++static int Decode(unsigned char *srcbuf, unsigned char *dstbuf, unsigned long srclen, ++ unsigned long dstlen) /* Just the reverse of Encode(). */ ++{ ++ unsigned long i, r, j, k, c, range, sym; ++ unsigned char *ip, *op; ++ unsigned char *srcend = srcbuf + srclen; ++ unsigned char *dstend = dstbuf + dstlen; ++ unsigned char buffer = 0; ++ unsigned char mask = 0; ++ unsigned long low = 0; ++ unsigned long high = Q4; ++ unsigned long value = 0; ++ ip = srcbuf; ++ op = dstbuf; ++ for (i = 0; i < M + 2; i++) { ++ value *= 2; ++ if ((mask >>= 1) == 0) { ++ buffer = (ip >= srcend) ? 0 : *(ip++); ++ mask = 128; ++ } ++ value += ((buffer & mask) != 0); ++ } ++ StartModel(); ++ for (i = 0; i < N - F; i++) text_buf[i] = ' '; ++ r = N - F; ++ while (op < dstend) { ++ range = high - low; ++ sym = BinarySearchSym((unsigned long) ++ (((value - low + 1) * sym_cum[0] - 1) / range)); ++ high = low + (range * sym_cum[sym - 1]) / sym_cum[0]; ++ low += (range * sym_cum[sym ]) / sym_cum[0]; ++ for ( ; ; ) { ++ if (low >= Q2) { ++ value -= Q2; low -= Q2; high -= Q2; ++ } else if (low >= Q1 && high <= Q3) { ++ value -= Q1; low -= Q1; high -= Q1; ++ } else if (high > Q2) break; ++ low += low; high += high; ++ value *= 2; ++ if ((mask >>= 1) == 0) { ++ buffer = (ip >= srcend) ? 0 : *(ip++); ++ mask = 128; ++ } ++ value += ((buffer & mask) != 0); ++ } ++ c = sym_to_char[sym]; ++ UpdateModel(sym); ++ if (c < 256) { ++ if (op >= dstend) return -1; ++ *(op++) = c; ++ text_buf[r++] = c; ++ r &= (N - 1); ++ } else { ++ j = c - 255 + THRESHOLD; ++ range = high - low; ++ i = BinarySearchPos((unsigned long) ++ (((value - low + 1) * position_cum[0] - 1) / range)); ++ high = low + (range * position_cum[i ]) / position_cum[0]; ++ low += (range * position_cum[i + 1]) / position_cum[0]; ++ for ( ; ; ) { ++ if (low >= Q2) { ++ value -= Q2; low -= Q2; high -= Q2; ++ } else if (low >= Q1 && high <= Q3) { ++ value -= Q1; low -= Q1; high -= Q1; ++ } else if (high > Q2) break; ++ low += low; high += high; ++ value *= 2; ++ if ((mask >>= 1) == 0) { ++ buffer = (ip >= srcend) ? 0 : *(ip++); ++ mask = 128; ++ } ++ value += ((buffer & mask) != 0); ++ } ++ i = (r - i - 1) & (N - 1); ++ for (k = 0; k < j; k++) { ++ c = text_buf[(i + k) & (N - 1)]; ++ if (op >= dstend) return -1; ++ *(op++) = c; ++ text_buf[r++] = c; ++ r &= (N - 1); ++ } ++ } ++ } ++ return 0; ++} ++ ++/* interface to jffs2 bbc follows */ ++ ++#include "jffs2_bbc_framework.h" ++ ++#define JFFS2_BBC_LZARI_BLOCK_SIGN {0x73, 0x9a, 0x1c, 0x4d} ++ ++static int ++jffs2_bbc_lzari_compressor_init (void); ++ ++static void ++jffs2_bbc_lzari_compressor_deinit (void); ++ ++static int ++jffs2_bbc_lzari_compress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long *sourcelen, ++ unsigned long *dstlen); ++ ++static int ++jffs2_bbc_lzari_estimate (void *model, unsigned char *input, ++ unsigned long sourcelen, unsigned long *dstlen, ++ unsigned long *readtime, unsigned long *writetime); ++ ++static int ++jffs2_bbc_lzari_decompress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long sourcelen, ++ unsigned long dstlen); ++ ++static char * ++jffs2_bbc_lzari_proc_info (void); ++ ++static int ++jffs2_bbc_lzari_proc_command (char *command); ++ ++struct jffs2_bbc_compressor_type jffs2_bbc_lzari = { ++ "lzari", ++ 0, ++ JFFS2_BBC_LZARI_BLOCK_SIGN, ++ jffs2_bbc_lzari_compressor_init, ++ NULL, ++ NULL, ++ jffs2_bbc_lzari_compressor_deinit, ++ jffs2_bbc_lzari_compress, ++ jffs2_bbc_lzari_estimate, ++ jffs2_bbc_lzari_decompress, ++ jffs2_bbc_lzari_proc_info, ++ jffs2_bbc_lzari_proc_command ++}; ++ ++static int ++jffs2_bbc_lzari_compressor_init (void) ++{ ++ return 0; ++} ++ ++static void ++jffs2_bbc_lzari_compressor_deinit (void) ++{ ++} ++ ++static int ++jffs2_bbc_lzari_compress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long *sourcelen, ++ unsigned long *dstlen) ++{ ++ int retval; ++ unsigned long dst = *dstlen; ++ *(output++) = jffs2_bbc_lzari.block_sign[0]; ++ *(output++) = jffs2_bbc_lzari.block_sign[1]; ++ dst -= 2; ++ retval = Encode(input, output, sourcelen, &dst); ++ dst += 2; ++ *dstlen = dst; ++ return retval; ++} ++ ++static int ++jffs2_bbc_lzari_estimate (void *model, unsigned char *input, ++ unsigned long sourcelen, unsigned long *dstlen, ++ unsigned long *readtime, unsigned long *writetime) ++{ ++ *dstlen = sourcelen / 2; ++ *readtime = JFFS2_BBC_ZLIB_READ_TIME * 15; ++ *writetime = JFFS2_BBC_ZLIB_WRITE_TIME * 7; ++ return 0; ++} ++ ++static int ++jffs2_bbc_lzari_decompress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long sourcelen, ++ unsigned long dstlen) ++{ ++ if ( ( *(input++) != (unsigned char)jffs2_bbc_lzari.block_sign[0] ) || ++ ( *(input++) != (unsigned char)jffs2_bbc_lzari.block_sign[1] ) ++ ) { ++ return -1; ++ } else { ++ return Decode(input, output, sourcelen - 2, dstlen); ++ } ++} ++ ++static char * ++jffs2_bbc_lzari_proc_info (void) ++{ ++ return "Lempel-Ziv-Arithmetic coding compression module"; ++} ++ ++static int ++jffs2_bbc_lzari_proc_command (char *command) ++{ ++ return 0; ++} ++ ++struct jffs2_bbc_compressor_type * ++jffs2_bbc_lzari_init (int mode) ++{ ++ if (jffs2_bbc_register_compressor (&jffs2_bbc_lzari) == 0) ++ { ++ return &jffs2_bbc_lzari; ++ } ++ else ++ { ++ return NULL; ++ } ++} ++ ++void ++jffs2_bbc_lzari_deinit (void) ++{ ++ jffs2_bbc_unregister_compressor (&jffs2_bbc_lzari); ++} +diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzhd_comp.c linux-mips/fs/jffs2/jffs2_bbc_lzhd_comp.c +--- linux-mips-cvs/fs/jffs2/jffs2_bbc_lzhd_comp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/jffs2_bbc_lzhd_comp.c 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,747 @@ ++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ ++ ++/* ++ jffs2_bbc_lzhd_comp.c -- Lempel-Ziv-(dynamic) Huffman compression module for jffs2 ++ Copyright (C) 2004 Patrik Kluba ++ Based on the LZHUF source included in LDS (lossless datacompression sources) ++ Block-compression and bitstream modifications by Patrik Kluba ++ $Header: /openwrt/openwrt/package/linux/kernel-patches/301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*/ ++ ++/* ++Original copyright follows: ++ ++************************************************************** ++ lzhuf.c ++ written by Haruyasu Yoshizaki 11/20/1988 ++ some minor changes 4/6/1989 ++ comments translated by Haruhiko Okumura 4/7/1989 ++************************************************************** ++ ++LZHUF.C (c)1989 by Haruyasu Yoshizaki, Haruhiko Okumura, and Kenji Rikitake. ++All rights reserved. Permission granted for non-commercial use. ++ ++*/ ++ ++/* ++ ++ 2004-02-18 pajko <pajko(AT)halom(DOT)u-szeged(DOT)hu> ++ Replaced name lzh-d with lzhd ++ Fixed no return value ++ ++ 2004-02-16 pajko <pajko(AT)halom(DOT)u-szeged(DOT)hu> ++ Initial release ++ ++*/ ++ ++/* required because of memmove */ ++#ifndef __KERNEL__ ++ #include <string.h> ++#else ++ #include <linux/string.h> ++#endif ++ ++/* lzhuf.c */ ++ ++#define N 4096 /* size of ring buffer */ ++#define F 60 /* upper limit for match_length */ ++#define THRESHOLD 2 /* encode string into position and length ++ if match_length is greater than this */ ++#define NIL N /* index for root of binary search trees */ ++ ++static unsigned char ++ text_buf[N + F - 1]; /* ring buffer of size N, ++ with extra F-1 bytes to facilitate string comparison */ ++static unsigned long match_position, match_length, /* of longest match. These are ++ set by the InsertNode() procedure. */ ++ lson[N + 1], rson[N + 257], dad[N + 1]; /* left & right children & ++ parents -- These constitute binary search trees. */ ++ ++static void InitTree(void) /* initialize trees */ ++{ ++ unsigned long i; ++ ++ /* For i = 0 to N - 1, rson[i] and lson[i] will be the right and ++ left children of node i. These nodes need not be initialized. ++ Also, dad[i] is the parent of node i. These are initialized to ++ NIL (= N), which stands for 'not used.' ++ For i = 0 to 255, rson[N + i + 1] is the root of the tree ++ for strings that begin with character i. These are initialized ++ to NIL. Note there are 256 trees. */ ++ ++ for (i = N + 1; i <= N + 256; i++) rson[i] = NIL; ++ for (i = 0; i < N; i++) dad[i] = NIL; ++} ++ ++static void InsertNode(unsigned long r) ++ /* Inserts string of length F, text_buf[r..r+F-1], into one of the ++ trees (text_buf[r]'th tree) and returns the longest-match position ++ and length via the global variables match_position and match_length. ++ If match_length = F, then removes the old node in favor of the new ++ one, because the old one will be deleted sooner. ++ Note r plays double role, as tree node and position in buffer. */ ++{ ++ unsigned long i, p, c; ++ signed long cmp; ++ unsigned char *key; ++ ++ cmp = 1; key = &text_buf[r]; p = N + 1 + key[0]; ++ rson[r] = lson[r] = NIL; match_length = 0; ++ for ( ; ; ) { ++ if (cmp >= 0) { ++ if (rson[p] != NIL) p = rson[p]; ++ else { rson[p] = r; dad[r] = p; return; } ++ } else { ++ if (lson[p] != NIL) p = lson[p]; ++ else { lson[p] = r; dad[r] = p; return; } ++ } ++ for (i = 1; i < F; i++) ++ if ((cmp = key[i] - text_buf[p + i]) != 0) break; ++ if (i > THRESHOLD) { ++ if (i > match_length) { ++ match_position = ((r - p) & (N - 1)) - 1; ++ if ((match_length = i) >= F) break; ++ } ++ if (i == match_length) { ++ if ((c = ((r - p) & (N - 1)) - 1) < match_position) { ++ match_position = c; ++ } ++ } ++ } ++ } ++ dad[r] = dad[p]; lson[r] = lson[p]; rson[r] = rson[p]; ++ dad[lson[p]] = r; dad[rson[p]] = r; ++ if (rson[dad[p]] == p) rson[dad[p]] = r; ++ else lson[dad[p]] = r; ++ dad[p] = NIL; /* remove p */ ++} ++ ++static void DeleteNode(unsigned long p) /* deletes node p from tree */ ++{ ++ unsigned long q; ++ ++ if (dad[p] == NIL) return; /* not in tree */ ++ if (rson[p] == NIL) q = lson[p]; ++ else if (lson[p] == NIL) q = rson[p]; ++ else { ++ q = lson[p]; ++ if (rson[q] != NIL) { ++ do { q = rson[q]; } while (rson[q] != NIL); ++ rson[dad[q]] = lson[q]; dad[lson[q]] = dad[q]; ++ lson[q] = lson[p]; dad[lson[p]] = q; ++ } ++ rson[q] = rson[p]; dad[rson[p]] = q; ++ } ++ dad[q] = dad[p]; ++ if (rson[dad[p]] == p) rson[dad[p]] = q; else lson[dad[p]] = q; ++ dad[p] = NIL; ++} ++ ++/* Huffman coding */ ++ ++#define N_CHAR (256 - THRESHOLD + F) ++ /* kinds of characters (character code = 0..N_CHAR-1) */ ++#define T (N_CHAR * 2 - 1) /* size of table */ ++#define R (T - 1) /* position of root */ ++#define MAX_FREQ 0x8000 /* updates tree when the */ ++ /* root frequency comes to this value. */ ++ ++typedef unsigned long uchar; // much-much faster ++ ++/* table for encoding and decoding the upper 6 bits of position */ ++ ++/* for encoding */ ++static uchar p_len[64] = { ++ 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, ++ 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, ++ 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, ++ 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, ++ 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, ++ 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, ++ 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, ++ 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08 ++}; ++ ++static uchar p_code[64] = { ++ 0x00, 0x20, 0x30, 0x40, 0x50, 0x58, 0x60, 0x68, ++ 0x70, 0x78, 0x80, 0x88, 0x90, 0x94, 0x98, 0x9C, ++ 0xA0, 0xA4, 0xA8, 0xAC, 0xB0, 0xB4, 0xB8, 0xBC, ++ 0xC0, 0xC2, 0xC4, 0xC6, 0xC8, 0xCA, 0xCC, 0xCE, ++ 0xD0, 0xD2, 0xD4, 0xD6, 0xD8, 0xDA, 0xDC, 0xDE, ++ 0xE0, 0xE2, 0xE4, 0xE6, 0xE8, 0xEA, 0xEC, 0xEE, ++ 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, ++ 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF ++}; ++ ++/* for decoding */ ++static uchar d_code[256] = { ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, ++ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, ++ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, ++ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, ++ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, ++ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, ++ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, ++ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, ++ 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, ++ 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, ++ 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, ++ 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, ++ 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, ++ 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, ++ 0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, ++ 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, ++ 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, ++ 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, ++ 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, ++ 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, ++ 0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, ++ 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F, ++ 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, ++ 0x24, 0x24, 0x25, 0x25, 0x26, 0x26, 0x27, 0x27, ++ 0x28, 0x28, 0x29, 0x29, 0x2A, 0x2A, 0x2B, 0x2B, ++ 0x2C, 0x2C, 0x2D, 0x2D, 0x2E, 0x2E, 0x2F, 0x2F, ++ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, ++ 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, ++}; ++ ++static uchar d_len[256] = { ++ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, ++ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, ++ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, ++ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, ++ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, ++ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, ++ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, ++ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, ++ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, ++ 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, ++ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, ++ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, ++ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, ++ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, ++ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, ++ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, ++ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, ++ 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, ++ 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, ++ 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, ++ 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, ++ 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, ++ 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, ++ 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, ++ 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, ++ 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, ++ 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, ++ 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, ++ 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, ++ 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, ++ 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, ++ 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, ++}; ++ ++static unsigned long freq[T + 1]; /* frequency table */ ++ ++static unsigned long prnt[T + N_CHAR]; /* pointers to parent nodes, except for the */ ++ /* elements [T..T + N_CHAR - 1] which are used to get */ ++ /* the positions of leaves corresponding to the codes. */ ++ ++static unsigned long son[T]; /* pointers to child nodes (son[], son[] + 1) */ ++ ++/* initialization of tree */ ++ ++static void StartHuff(void) ++{ ++ unsigned long i, j; ++ ++ for (i = 0; i < N_CHAR; i++) { ++ freq[i] = 1; ++ son[i] = i + T; ++ prnt[i + T] = i; ++ } ++ i = 0; j = N_CHAR; ++ while (j <= R) { ++ freq[j] = freq[i] + freq[i + 1]; ++ son[j] = i; ++ prnt[i] = prnt[i + 1] = j; ++ i += 2; j++; ++ } ++ freq[T] = 0xffff; ++ prnt[R] = 0; ++} ++ ++/* reconstruction of tree */ ++ ++static void reconst(void) ++{ ++ unsigned long f, l, i, j, k; ++ ++ /* collect leaf nodes in the first half of the table */ ++ /* and replace the freq by (freq + 1) / 2. */ ++ j = 0; ++ for (i = 0; i < T; i++) { ++ if (son[i] >= T) { ++ freq[j] = (freq[i] + 1) / 2; ++ son[j] = son[i]; ++ j++; ++ } ++ } ++ /* begin constructing tree by connecting sons */ ++ for (i = 0, j = N_CHAR; j < T; i += 2, j++) { ++ k = i + 1; ++ f = freq[j] = freq[i] + freq[k]; ++ for (k = j - 1; f < freq[k]; k--); ++ k++; ++ l = (j - k) * 2; ++ memmove(&freq[k + 1], &freq[k], l*sizeof(unsigned long)); ++ freq[k] = f; ++ memmove(&son[k + 1], &son[k], l*sizeof(unsigned long)); ++ son[k] = i; ++ } ++ /* connect prnt */ ++ for (i = 0; i < T; i++) { ++ if ((k = son[i]) >= T) { ++ prnt[k] = i; ++ } else { ++ prnt[k] = prnt[k + 1] = i; ++ } ++ } ++} ++ ++/* increment frequency of given code by one, and update tree */ ++ ++static void update(unsigned long c) ++{ ++ unsigned long i, j, k, l; ++ ++ if (freq[R] == MAX_FREQ) { ++ reconst(); ++ } ++ c = prnt[c + T]; ++ do { ++ k = ++freq[c]; ++ ++ /* if the order is disturbed, exchange nodes */ ++ if (k > freq[l = c + 1]) { ++ while (k > freq[++l]); ++ l--; ++ freq[c] = freq[l]; ++ freq[l] = k; ++ ++ i = son[c]; ++ prnt[i] = l; ++ if (i < T) prnt[i + 1] = l; ++ ++ j = son[l]; ++ son[l] = i; ++ ++ prnt[j] = c; ++ if (j < T) prnt[j + 1] = c; ++ son[c] = j; ++ ++ c = l; ++ } ++ } while (c = prnt[c]); /* repeat up to root */ ++} ++ ++/* modified for block compression */ ++/* on return, srclen will contain the number of successfully compressed bytes ++ and dstlen will contain completed compressed bytes */ ++ ++static int Encode(unsigned char *srcbuf, unsigned char *dstbuf, unsigned long *srclen, ++ unsigned long *dstlen) ++{ ++ unsigned long c, i, j, k, len, r, s, last_match_length, code_buf_ptr; ++ unsigned char code_buf[17], mask; ++ unsigned char *ip, *op; ++ unsigned long written = 0; ++ unsigned long read = 0; ++ unsigned short putbuf = 0; ++ uchar putlen = 0; ++ unsigned char *srcend = srcbuf + *srclen; ++ unsigned char *dstend = dstbuf + *dstlen; ++ ip = srcbuf; ++ op = dstbuf; ++ StartHuff(); ++ InitTree(); /* initialize trees */ ++ code_buf[0] = 0; /* code_buf[1..16] saves eight units of code, and ++ code_buf[0] works as eight flags, "1" representing that the unit ++ is an unencoded letter (1 byte), "0" a position-and-length pair ++ (2 bytes). Thus, eight units require at most 16 bytes of code. */ ++ code_buf_ptr = mask = 1; ++ s = 0; r = N - F; ++ for (i = s; i < r; i++) text_buf[i] = ' '; /* Clear the buffer with ++ any character that will appear often. */ ++ for (len = 0; (len < F) && (ip < srcend); len++) ++ text_buf[r + len] = *(ip++); /* Read F bytes into the last F bytes of ++ the buffer */ ++ read = len; ++ for (i = 1; i <= F; i++) InsertNode(r - i); /* Insert the F strings, ++ each of which begins with one or more 'space' characters. Note ++ the order in which these strings are inserted. This way, ++ degenerate trees will be less likely to occur. */ ++ InsertNode(r); /* Finally, insert the whole string just read. The ++ global variables match_length and match_position are set. */ ++ do { ++ if (match_length > len) match_length = len; /* match_length ++ may be spuriously long near the end of text. */ ++ if (match_length <= THRESHOLD) { ++ match_length = 1; /* Not long enough match. Send one byte. */ ++ c = text_buf[r]; ++ i = 0; j = 0; k = prnt[c + T]; ++ do { ++ i >>= 1; ++ /* if node's address is odd-numbered, choose bigger brother node */ ++ if (k & 1) i |= 0x8000; ++ j++; ++ } while ((k = prnt[k]) != R); ++ putbuf |= i >> putlen; ++ if ((putlen += j) >= 8) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = putbuf >> 8; ++ if ((putlen -= 8) >= 8) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = putbuf; ++ written += 2; ++ putlen -= 8; ++ putbuf = i << (j - putlen); /**warm**/ ++ } else { ++ putbuf <<= 8; ++ written++; ++ } ++ *srclen = read; ++ } ++ update(c); ++ } else { ++ c = 255 - THRESHOLD + match_length; ++ i = 0; j = 0; k = prnt[c + T]; ++ do { ++ i >>= 1; ++ /* if node's address is odd-numbered, choose bigger brother node */ ++ if (k & 1) i |= 0x8000; ++ j++; ++ } while ((k = prnt[k]) != R); ++ putbuf |= i >> putlen; ++ if ((putlen += j) >= 8) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = putbuf >> 8; ++ if ((putlen -= 8) >= 8) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = putbuf; ++ written += 2; ++ putlen -= 8; ++ putbuf = i << (j - putlen); /**warm**/ ++ } else { ++ putbuf <<= 8; ++ written++; ++ } ++ *srclen = read; ++ } ++ update(c); ++ j = p_len[match_position >> 6]; ++ i = p_code[match_position >> 6] << 8; ++ putbuf |= i >> putlen; ++ if ((putlen += j) >= 8) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = putbuf >> 8; ++ if ((putlen -= 8) >= 8) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = putbuf; ++ written += 2; ++ putlen -= 8; ++ putbuf = i << (j - putlen); /**hot**/ ++ } else { ++ putbuf <<= 8; ++ written++; ++ } ++ *srclen = read; ++ } ++ j = 6; ++ i = (match_position & 0x3f) << 10; ++ putbuf |= i >> putlen; ++ if ((putlen += j) >= 8) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = putbuf >> 8; ++ if ((putlen -= 8) >= 8) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = putbuf; ++ written += 2; ++ putlen -= 8; ++ putbuf = i << (j - putlen); /**hot**/ ++ } else { ++ putbuf <<= 8; ++ written++; ++ } ++ *srclen = read; ++ } ++ } ++ last_match_length = match_length; ++ for (i = 0; (i < last_match_length) && (ip < srcend); i++) { ++ c = *(ip++); ++ DeleteNode(s); ++ text_buf[s] = c; ++ if (s < F - 1) ++ text_buf[s + N] = c; ++ s = (s + 1) & (N - 1); ++ r = (r + 1) & (N - 1); ++ InsertNode(r); ++ } ++ read += i; ++ while (i++ < last_match_length) { ++ DeleteNode(s); ++ s = (s + 1) & (N - 1); ++ r = (r + 1) & (N - 1); ++ if (--len) InsertNode(r); ++ } ++ } while (len > 0); ++ if (putlen) { ++ if (op >= dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ *(op++) = putbuf >> 8; ++ written++; ++ *srclen = read; ++ } ++ *dstlen = written; ++ return 0; ++} ++ ++static int Decode(unsigned char *srcbuf, unsigned char *dstbuf, unsigned long srclen, ++ unsigned long dstlen) /* Just the reverse of Encode(). */ ++{ ++ unsigned long i, r, j, k, c; ++ unsigned char *ip, *op; ++ unsigned char *srcend = srcbuf + srclen; ++ unsigned char *dstend = dstbuf + dstlen; ++ unsigned short getbuf = 0; ++ uchar getlen = 0; ++ ip = srcbuf; ++ op = dstbuf; ++ StartHuff(); ++ for (i = 0; i < N - F; i++) text_buf[i] = ' '; ++ r = N - F; ++ while (op < dstend) { ++ c = son[R]; ++ /* travel from root to leaf, */ ++ /* choosing the smaller child node (son[]) if the read bit is 0, */ ++ /* the bigger (son[]+1} if 1 */ ++ while (c < T) { ++ while (getlen <= 8) { ++ unsigned short t; ++ t = (ip >= srcend) ? 0 : *(ip++); ++ getbuf |= t << (8 - getlen); ++ getlen += 8; ++ } ++ c += ((signed short)getbuf < 0); ++ getbuf <<= 1; ++ getlen--; ++ c = son[c]; ++ } ++ c -= T; ++ update(c); ++ if (c < 256) { ++ if (op >= dstend) return -1; ++ *(op++) = c; ++ text_buf[r++] = c; ++ r &= (N - 1); ++ } else { ++ j = c - 255 + THRESHOLD; ++ while (getlen <= 8) { ++ unsigned short t; ++ t = (ip >= srcend) ? 0 : *(ip++); ++ getbuf |= t << (8 - getlen); ++ getlen += 8; ++ } ++ i = getbuf >> 8; ++ getbuf <<= 8; ++ getlen -= 8; ++ c = d_code[i] << 6; ++ k = d_len[i]; ++ /* read lower 6 bits verbatim */ ++ k -= 2; ++ while (k--) { ++ while (getlen <= 8) { ++ unsigned short t; ++ t = (ip >= srcend) ? 0 : *(ip++); ++ getbuf |= t << (8 - getlen); ++ getlen += 8; ++ } ++ i = (i << 1) + ((signed short)getbuf < 0); ++ getbuf <<= 1; ++ getlen--; ++ } ++ i = c | (i & 0x3F); ++ i = r - i - 1; ++ i &= (N - 1); ++ for (k = 0; k < j; k++) { ++ c = text_buf[(i + k) & (N - 1)]; ++ if (op >= dstend) return -1; ++ *(op++) = c; ++ text_buf[r++] = c; ++ r &= (N - 1); ++ } ++ } ++ } ++ return 0; ++} ++ ++/* interface to jffs2 bbc follows */ ++ ++#include "jffs2_bbc_framework.h" ++ ++ ++#define JFFS2_BBC_LZHD_BLOCK_SIGN {0x3a, 0x98, 0xf7, 0xda} ++ ++static int ++jffs2_bbc_lzhd_compressor_init (void); ++ ++static void ++jffs2_bbc_lzhd_compressor_deinit (void); ++ ++static int ++jffs2_bbc_lzhd_compress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long *sourcelen, ++ unsigned long *dstlen); ++ ++static int ++jffs2_bbc_lzhd_estimate (void *model, unsigned char *input, ++ unsigned long sourcelen, unsigned long *dstlen, ++ unsigned long *readtime, unsigned long *writetime); ++ ++static int ++jffs2_bbc_lzhd_decompress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long sourcelen, ++ unsigned long dstlen); ++ ++static char * ++jffs2_bbc_lzhd_proc_info (void); ++ ++static int ++jffs2_bbc_lzhd_proc_command (char *command); ++ ++struct jffs2_bbc_compressor_type jffs2_bbc_lzhd = { ++ "lzhd", ++ 0, ++ JFFS2_BBC_LZHD_BLOCK_SIGN, ++ jffs2_bbc_lzhd_compressor_init, ++ NULL, ++ NULL, ++ jffs2_bbc_lzhd_compressor_deinit, ++ jffs2_bbc_lzhd_compress, ++ jffs2_bbc_lzhd_estimate, ++ jffs2_bbc_lzhd_decompress, ++ jffs2_bbc_lzhd_proc_info, ++ jffs2_bbc_lzhd_proc_command ++}; ++ ++static int ++jffs2_bbc_lzhd_compressor_init (void) ++{ ++ return 0; ++} ++ ++static void ++jffs2_bbc_lzhd_compressor_deinit (void) ++{ ++} ++ ++static int ++jffs2_bbc_lzhd_compress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long *sourcelen, ++ unsigned long *dstlen) ++{ ++ int retval; ++ unsigned long dst = *dstlen; ++ *(output++) = jffs2_bbc_lzhd.block_sign[0]; ++ *(output++) = jffs2_bbc_lzhd.block_sign[1]; ++ dst -= 2; ++ retval = Encode(input, output, sourcelen, &dst); ++ dst += 2; ++ *dstlen = dst; ++ return retval; ++} ++ ++static int ++jffs2_bbc_lzhd_estimate (void *model, unsigned char *input, ++ unsigned long sourcelen, unsigned long *dstlen, ++ unsigned long *readtime, unsigned long *writetime) ++{ ++ *dstlen = sourcelen * 55 / 100; ++ *readtime = JFFS2_BBC_ZLIB_READ_TIME * 8; ++ *writetime = JFFS2_BBC_ZLIB_WRITE_TIME * 65 / 10; ++ return 0; ++} ++ ++static int ++jffs2_bbc_lzhd_decompress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long sourcelen, ++ unsigned long dstlen) ++{ ++ if ( ( *(input++) != (unsigned char)jffs2_bbc_lzhd.block_sign[0] ) || ++ ( *(input++) != (unsigned char)jffs2_bbc_lzhd.block_sign[1] ) ++ ) { ++ return -1; ++ } else { ++ return Decode(input, output, sourcelen - 2, dstlen); ++ } ++} ++ ++static char * ++jffs2_bbc_lzhd_proc_info (void) ++{ ++ return "Lempel-Ziv-(dynamic) Huffman compression module"; ++} ++ ++static int ++jffs2_bbc_lzhd_proc_command (char *command) ++{ ++ return 0; ++} ++ ++struct jffs2_bbc_compressor_type * ++jffs2_bbc_lzhd_init (int mode) ++{ ++ if (jffs2_bbc_register_compressor (&jffs2_bbc_lzhd) == 0) ++ { ++ return &jffs2_bbc_lzhd; ++ } ++ else ++ { ++ return NULL; ++ } ++} ++ ++void ++jffs2_bbc_lzhd_deinit (void) ++{ ++ jffs2_bbc_unregister_compressor (&jffs2_bbc_lzhd); ++} +diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzo_comp.c linux-mips/fs/jffs2/jffs2_bbc_lzo_comp.c +--- linux-mips-cvs/fs/jffs2/jffs2_bbc_lzo_comp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/jffs2_bbc_lzo_comp.c 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,2435 @@ ++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ ++ ++/* ++ jffs2_bbc_lzo_comp.c -- LZO1X-1 (and -999) compression module for jffs2 ++ Copyright (C) 2004 Patrik Kluba ++ Based on the original LZO sources ++ $Header: /openwrt/openwrt/package/linux/kernel-patches/301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*/ ++ ++/* ++ Original copyright notice follows: ++ ++ lzo1x_9x.c -- implementation of the LZO1X-999 compression algorithm ++ lzo_ptr.h -- low-level pointer constructs ++ lzo_swd.ch -- sliding window dictionary ++ lzoconf.h -- configuration for the LZO real-time data compression library ++ lzo_mchw.ch -- matching functions using a window ++ minilzo.c -- mini subset of the LZO real-time data compression library ++ config1x.h -- configuration for the LZO1X algorithm ++ lzo1x.h -- public interface of the LZO1X compression algorithm ++ ++ These files are part of the LZO real-time data compression library. ++ ++ Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer ++ All Rights Reserved. ++ ++ The LZO library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU General Public License as ++ published by the Free Software Foundation; either version 2 of ++ the License, or (at your option) any later version. ++ ++ The LZO library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with the LZO library; see the file COPYING. ++ If not, write to the Free Software Foundation, Inc., ++ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ ++ Markus F.X.J. Oberhumer ++ <markus@oberhumer.com> ++*/ ++ ++/* ++ ++ 2004-02-16 pajko <pajko(AT)halom(DOT)u-szeged(DOT)hu> ++ Initial release ++ -removed all 16 bit code ++ -all sensitive data will be on 4 byte boundary ++ -removed check parts for library use ++ -removed all but LZO1X-* compression ++ ++*/ ++ ++#ifndef __KERNEL__ ++ #include <sys/types.h> ++ #include <stddef.h> ++ #include <string.h> ++ #include <limits.h> ++#else ++ #include <linux/kernel.h> ++ #include <linux/types.h> ++ #include <linux/stddef.h> ++ #include <linux/string.h> ++ #define USHRT_MAX 65535 ++ /* #define UINT_MAX 4294967295U */ ++#endif ++ ++/* data type definitions */ ++#define U32 unsigned long ++#define S32 signed long ++#define I32 long ++#define U16 unsigned short ++#define S16 signed short ++#define I16 short ++#define U8 unsigned char ++#define S8 signed char ++#define I8 char ++ ++/*************************************/ ++ ++/* lzo_swd.ch */ ++ ++#define SWD_N N ++#define SWD_F F ++#define SWD_THRESHOLD THRESHOLD ++ ++/* shortest unsigned int that 2 * SWD_F + SWD_N (currently 53248) fits in */ ++typedef unsigned short swd_uint; ++/* upper limit of that data type */ ++#define SWD_UINT_MAX USHRT_MAX ++ ++/* minilzo.c */ ++ ++#define LZO_VERSION_DATE "Jul 12 2002" ++#define LZO_VERSION_STRING "1.08" ++#define LZO_VERSION 0x1080 ++ ++/* lzo_ptr.h */ ++ ++/* Integral types that have *exactly* the same number of bits as a lzo_voidp */ ++typedef unsigned long lzo_ptr_t; ++typedef long lzo_sptr_t; ++ ++ ++/*************************************/ ++ ++/* config1x.h */ ++ ++#define M1_MAX_OFFSET 0x0400 ++#define M2_MAX_OFFSET 0x0800 ++#define M3_MAX_OFFSET 0x4000 ++#define M4_MAX_OFFSET 0xbfff ++ ++#define MX_MAX_OFFSET (M1_MAX_OFFSET + M2_MAX_OFFSET) ++ ++#define M1_MIN_LEN 2 ++#define M1_MAX_LEN 2 ++#define M2_MIN_LEN 3 ++#define M2_MAX_LEN 8 ++#define M3_MIN_LEN 3 ++#define M3_MAX_LEN 33 ++#define M4_MIN_LEN 3 ++#define M4_MAX_LEN 9 ++ ++#define M1_MARKER 0 ++#define M2_MARKER 64 ++#define M3_MARKER 32 ++#define M4_MARKER 16 ++ ++#define MIN_LOOKAHEAD (M2_MAX_LEN + 1) ++ ++/* minilzo.c */ ++ ++#define LZO_BYTE(x) ((unsigned char) ((x) & 0xff)) ++ ++#define LZO_MAX(a,b) ((a) >= (b) ? (a) : (b)) ++#define LZO_MIN(a,b) ((a) <= (b) ? (a) : (b)) ++#define LZO_MAX3(a,b,c) ((a) >= (b) ? LZO_MAX(a,c) : LZO_MAX(b,c)) ++#define LZO_MIN3(a,b,c) ((a) <= (b) ? LZO_MIN(a,c) : LZO_MIN(b,c)) ++ ++#define lzo_sizeof(type) ((lzo_uint) (sizeof(type))) ++ ++#define LZO_HIGH(array) ((lzo_uint) (sizeof(array)/sizeof(*(array)))) ++ ++#define LZO_SIZE(bits) (1u << (bits)) ++#define LZO_MASK(bits) (LZO_SIZE(bits) - 1) ++ ++#define LZO_LSIZE(bits) (1ul << (bits)) ++#define LZO_LMASK(bits) (LZO_LSIZE(bits) - 1) ++ ++#define LZO_USIZE(bits) ((lzo_uint) 1 << (bits)) ++#define LZO_UMASK(bits) (LZO_USIZE(bits) - 1) ++ ++#define LZO_STYPE_MAX(b) (((1l << (8*(b)-2)) - 1l) + (1l << (8*(b)-2))) ++#define LZO_UTYPE_MAX(b) (((1ul << (8*(b)-1)) - 1ul) + (1ul << (8*(b)-1))) ++ ++#define _LZO_STRINGIZE(x) #x ++#define _LZO_MEXPAND(x) _LZO_STRINGIZE(x) ++ ++#define _LZO_CONCAT2(a,b) a ## b ++#define _LZO_CONCAT3(a,b,c) a ## b ## c ++#define _LZO_CONCAT4(a,b,c,d) a ## b ## c ## d ++#define _LZO_CONCAT5(a,b,c,d,e) a ## b ## c ## d ## e ++ ++#define _LZO_ECONCAT2(a,b) _LZO_CONCAT2(a,b) ++#define _LZO_ECONCAT3(a,b,c) _LZO_CONCAT3(a,b,c) ++#define _LZO_ECONCAT4(a,b,c,d) _LZO_CONCAT4(a,b,c,d) ++#define _LZO_ECONCAT5(a,b,c,d,e) _LZO_CONCAT5(a,b,c,d,e) ++ ++#define lzo_dict_t const lzo_bytep ++#define lzo_dict_p lzo_dict_t * ++#define lzo_moff_t lzo_uint ++ ++#define MEMCPY8_DS(dest,src,len) \ ++ memcpy(dest,src,len); \ ++ dest += len; \ ++ src += len ++ ++#define MEMCPY_DS(dest,src,len) \ ++ do *dest++ = *src++; \ ++ while (--len > 0) ++ ++#define MEMMOVE_DS(dest,src,len) \ ++ do *dest++ = *src++; \ ++ while (--len > 0) ++ ++#define BZERO8_PTR(s,l,n) memset((s),0,(lzo_uint)(l)*(n)) ++ ++#define LZO_BASE 65521u ++#define LZO_NMAX 5552 ++ ++#define LZO_DO1(buf,i) {s1 += buf[i]; s2 += s1;} ++#define LZO_DO2(buf,i) LZO_DO1(buf,i); LZO_DO1(buf,i+1); ++#define LZO_DO4(buf,i) LZO_DO2(buf,i); LZO_DO2(buf,i+2); ++#define LZO_DO8(buf,i) LZO_DO4(buf,i); LZO_DO4(buf,i+4); ++#define LZO_DO16(buf,i) LZO_DO8(buf,i); LZO_DO8(buf,i+8); ++ ++#define IS_SIGNED(type) (((type) (-1)) < ((type) 0)) ++#define IS_UNSIGNED(type) (((type) (-1)) > ((type) 0)) ++ ++#define IS_POWER_OF_2(x) (((x) & ((x) - 1)) == 0) ++ ++#define D_BITS 14 ++#define D_INDEX1(d,p) d = DM((0x21*DX3(p,5,5,6)) >> 5) ++#define D_INDEX2(d,p) d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f) ++ ++#define LZO_HASH LZO_HASH_LZO_INCREMENTAL_B ++ ++#define DL_MIN_LEN M2_MIN_LEN ++ ++#define D_SIZE LZO_SIZE(D_BITS) ++#define D_MASK LZO_MASK(D_BITS) ++ ++#define D_HIGH ((D_MASK >> 1) + 1) ++ ++#define DINDEX1 D_INDEX1 ++#define DINDEX2 D_INDEX2 ++ ++#define DX2(p,s1,s2) \ ++ (((((lzo_uint32)((p)[2]) << (s2)) ^ (p)[1]) << (s1)) ^ (p)[0]) ++ ++#define DX3(p,s1,s2,s3) ((DX2((p)+1,s2,s3) << (s1)) ^ (p)[0]) ++#define DMS(v,s) ((lzo_uint) (((v) & (D_MASK >> (s))) << (s))) ++#define DM(v) DMS(v,0) ++ ++#define DENTRY(p,in) (p) ++#define GINDEX(m_pos,m_off,dict,dindex,in) m_pos = dict[dindex] ++ ++#define LZO_CHECK_MPOS_DET(m_pos,m_off,in,ip,max_offset) \ ++ (m_pos == NULL || (m_off = (lzo_moff_t) (ip - m_pos)) > max_offset) ++ ++#define LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,max_offset) \ ++ (BOUNDS_CHECKING_OFF_IN_EXPR( \ ++ (PTR_LT(m_pos,in) || \ ++ (m_off = (lzo_moff_t) PTR_DIFF(ip,m_pos)) <= 0 || \ ++ m_off > max_offset) )) ++ ++#define BOUNDS_CHECKING_OFF_IN_EXPR(expr) (expr) ++ ++#define DD_BITS 0 ++#define DD_SIZE LZO_SIZE(DD_BITS) ++#define DD_MASK LZO_MASK(DD_BITS) ++ ++#define DL_BITS (D_BITS - DD_BITS) ++#define DL_SIZE LZO_SIZE(DL_BITS) ++#define DL_MASK LZO_MASK(DL_BITS) ++ ++#define UPDATE_D(dict,drun,dv,p,in) dict[ DINDEX(dv,p) ] = DENTRY(p,in) ++#define UPDATE_I(dict,drun,index,p,in) dict[index] = DENTRY(p,in) ++#define UPDATE_P(ptr,drun,p,in) (ptr)[0] = DENTRY(p,in) ++ ++#define __COPY4(dst,src) * (lzo_uint32p)(dst) = * (const lzo_uint32p)(src) ++#define COPY4(dst,src) __COPY4((lzo_ptr_t)(dst),(lzo_ptr_t)(src)) ++ ++#define TEST_IP (ip < ip_end) ++#define TEST_OP (op <= op_end) ++ ++#define NEED_IP(x) \ ++ if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x)) goto input_overrun ++#define NEED_OP(x) \ ++ if ((lzo_uint)(op_end - op) < (lzo_uint)(x)) goto output_overrun ++#define TEST_LOOKBEHIND(m_pos,out) if (m_pos < out) goto lookbehind_overrun ++ ++/* lzo1x_9x.c */ ++ ++#define LZO_UINT_MAX UINT_MAX ++#define N M4_MAX_OFFSET ++#define THRESHOLD 1 ++#define F 2048 ++ ++#define SWD_BEST_OFF (LZO_MAX3( M2_MAX_LEN, M3_MAX_LEN, M4_MAX_LEN ) + 1) ++ ++/* ../include/lzoconf.h */ ++ ++typedef U32 lzo_uint32; ++typedef I32 lzo_int32; ++typedef U32 lzo_uint; ++typedef I32 lzo_int; ++typedef int lzo_bool; ++ ++#define lzo_byte U8 ++#define lzo_bytep U8 * ++#define lzo_charp char * ++#define lzo_voidp void * ++#define lzo_shortp short * ++#define lzo_ushortp unsigned short * ++#define lzo_uint32p lzo_uint32 * ++#define lzo_int32p lzo_int32 * ++#define lzo_uintp lzo_uint * ++#define lzo_intp lzo_int * ++#define lzo_voidpp lzo_voidp * ++#define lzo_bytepp lzo_bytep * ++#define lzo_sizeof_dict_t sizeof(lzo_bytep) ++ ++#define LZO_E_OK 0 ++#define LZO_E_ERROR (-1) ++#define LZO_E_OUT_OF_MEMORY (-2) /* not used right now */ ++#define LZO_E_NOT_COMPRESSIBLE (-3) /* not used right now */ ++#define LZO_E_INPUT_OVERRUN (-4) ++#define LZO_E_OUTPUT_OVERRUN (-5) ++#define LZO_E_LOOKBEHIND_OVERRUN (-6) ++#define LZO_E_EOF_NOT_FOUND (-7) ++#define LZO_E_INPUT_NOT_CONSUMED (-8) ++ ++#define LZO_PTR_ALIGN_UP(_ptr,_size) \ ++ ((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size))) ++#define LZO_ALIGN(_ptr,_size) LZO_PTR_ALIGN_UP(_ptr,_size) ++ ++typedef int ++ (*lzo_compress_t) (const lzo_byte * src, lzo_uint src_len, ++ lzo_byte * dst, lzo_uintp dst_len, ++ lzo_voidp wrkmem); ++ ++typedef int ++ (*lzo_decompress_t) (const lzo_byte * src, lzo_uint src_len, ++ lzo_byte * dst, lzo_uintp dst_len, ++ lzo_voidp wrkmem); ++ ++typedef int ++ (*lzo_optimize_t) (lzo_byte * src, lzo_uint src_len, ++ lzo_byte * dst, lzo_uintp dst_len, ++ lzo_voidp wrkmem); ++ ++typedef int ++ (*lzo_compress_dict_t) (const lzo_byte * src, lzo_uint src_len, ++ lzo_byte * dst, lzo_uintp dst_len, ++ lzo_voidp wrkmem, ++ const lzo_byte * dict, lzo_uint dict_len); ++ ++typedef int ++ (*lzo_decompress_dict_t) (const lzo_byte * src, lzo_uint src_len, ++ lzo_byte * dst, lzo_uintp dst_len, ++ lzo_voidp wrkmem, ++ const lzo_byte * dict, lzo_uint dict_len); ++ ++typedef int ++ (*lzo_compress_asm_t) (const lzo_byte * src, lzo_uint src_len, ++ lzo_byte * dst, lzo_uintp dst_len, ++ lzo_voidp wrkmem); ++ ++typedef int ++ (*lzo_decompress_asm_t) (const lzo_byte * src, lzo_uint src_len, ++ lzo_byte * dst, lzo_uintp dst_len, ++ lzo_voidp wrkmem); ++ ++typedef void (*lzo_progress_callback_t) (lzo_uint, lzo_uint); ++ ++typedef union ++{ ++ lzo_bytep p; ++ lzo_uint u; ++} __lzo_pu_u; ++typedef union ++{ ++ lzo_bytep p; ++ lzo_uint32 u32; ++} __lzo_pu32_u; ++typedef union ++{ ++ void *vp; ++ lzo_bytep bp; ++ lzo_uint32 u32; ++ long l; ++} lzo_align_t; ++ ++/* lzo1x.h */ ++ ++#define LZO1X_1_MEM_COMPRESS ((lzo_uint32) (16384L * lzo_sizeof_dict_t)) ++#define LZO1X_999_MEM_COMPRESS ((lzo_uint32) (14 * 16384L * sizeof(short))) ++ ++/* lzo_ptr.h */ ++ ++#define PTR(a) ((lzo_ptr_t) (a)) ++#define PTR_LINEAR(a) PTR(a) ++#define PTR_ALIGNED_4(a) ((PTR_LINEAR(a) & 3) == 0) ++#define PTR_ALIGNED_8(a) ((PTR_LINEAR(a) & 7) == 0) ++#define PTR_ALIGNED2_4(a,b) (((PTR_LINEAR(a) | PTR_LINEAR(b)) & 3) == 0) ++#define PTR_ALIGNED2_8(a,b) (((PTR_LINEAR(a) | PTR_LINEAR(b)) & 7) == 0) ++#define PTR_LT(a,b) (PTR(a) < PTR(b)) ++#define PTR_GE(a,b) (PTR(a) >= PTR(b)) ++#define PTR_DIFF(a,b) ((lzo_ptrdiff_t) (PTR(a) - PTR(b))) ++#define pd(a,b) ((lzo_uint) ((a)-(b))) ++ ++typedef ptrdiff_t lzo_ptrdiff_t; ++ ++typedef union ++{ ++ char a_char; ++ unsigned char a_uchar; ++ short a_short; ++ unsigned short a_ushort; ++ int a_int; ++ unsigned int a_uint; ++ long a_long; ++ unsigned long a_ulong; ++ lzo_int a_lzo_int; ++ lzo_uint a_lzo_uint; ++ lzo_int32 a_lzo_int32; ++ lzo_uint32 a_lzo_uint32; ++ ptrdiff_t a_ptrdiff_t; ++ lzo_ptrdiff_t a_lzo_ptrdiff_t; ++ lzo_ptr_t a_lzo_ptr_t; ++ lzo_voidp a_lzo_voidp; ++ void *a_void_p; ++ lzo_bytep a_lzo_bytep; ++ lzo_bytepp a_lzo_bytepp; ++ lzo_uintp a_lzo_uintp; ++ lzo_uint *a_lzo_uint_p; ++ lzo_uint32p a_lzo_uint32p; ++ lzo_uint32 *a_lzo_uint32_p; ++ unsigned char *a_uchar_p; ++ char *a_char_p; ++} ++lzo_full_align_t; ++ ++/* lzo_mchw.ch */ ++ ++typedef struct ++{ ++ int init; ++ ++ lzo_uint look; ++ ++ lzo_uint m_len; ++ lzo_uint m_off; ++ ++ lzo_uint last_m_len; ++ lzo_uint last_m_off; ++ ++ const lzo_byte *bp; ++ const lzo_byte *ip; ++ const lzo_byte *in; ++ const lzo_byte *in_end; ++ lzo_byte *out; ++ ++ lzo_progress_callback_t cb; ++ ++ lzo_uint textsize; ++ lzo_uint codesize; ++ lzo_uint printcount; ++ ++ unsigned long lit_bytes; ++ unsigned long match_bytes; ++ unsigned long rep_bytes; ++ unsigned long lazy; ++ ++ lzo_uint r1_lit; ++ lzo_uint r1_m_len; ++ ++ unsigned long m1a_m, m1b_m, m2_m, m3_m, m4_m; ++ unsigned long lit1_r, lit2_r, lit3_r; ++} ++lzo1x_999_t; ++ ++#define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1)) ++ ++/* lzo_swd.ch */ ++ ++#define SWD_UINT(x) ((swd_uint)(x)) ++#define SWD_HSIZE 16384 ++#define SWD_MAX_CHAIN 2048 ++#define HEAD3(b,p) \ ++ (((0x9f5f*(((((lzo_uint32)b[p]<<5)^b[p+1])<<5)^b[p+2]))>>5) & (SWD_HSIZE-1)) ++#define HEAD2(b,p) (b[p] ^ ((unsigned)b[p+1]<<8)) ++#define NIL2 SWD_UINT_MAX ++ ++typedef struct ++{ ++ lzo_uint n; ++ lzo_uint f; ++ lzo_uint threshold; ++ ++ lzo_uint max_chain; ++ lzo_uint nice_length; ++ lzo_bool use_best_off; ++ lzo_uint lazy_insert; ++ ++ lzo_uint m_len; ++ lzo_uint m_off; ++ lzo_uint look; ++ int b_char; ++ ++ lzo_uint best_off[SWD_BEST_OFF]; ++ ++ lzo1x_999_t *c; ++ lzo_uint m_pos; ++ ++ lzo_uint best_pos[SWD_BEST_OFF]; ++ ++ const lzo_byte *dict; ++ const lzo_byte *dict_end; ++ lzo_uint dict_len; ++ ++ lzo_uint ip; ++ lzo_uint bp; ++ lzo_uint rp; ++ lzo_uint b_size; ++ ++ unsigned char *b_wrap; ++ ++ lzo_uint node_count; ++ lzo_uint first_rp; ++ ++ unsigned char b[SWD_N + SWD_F + SWD_F]; ++ swd_uint head3[SWD_HSIZE]; ++ swd_uint succ3[SWD_N + SWD_F]; ++ swd_uint best3[SWD_N + SWD_F]; ++ swd_uint llen3[SWD_HSIZE]; ++ ++ swd_uint head2[65536L]; ++} ++lzo1x_999_swd_t; ++ ++#define s_head3(s,key) s->head3[key] ++#define swd_pos2off(s,pos) \ ++ (s->bp > (pos) ? s->bp - (pos) : s->b_size - ((pos) - s->bp)) ++ ++static __inline__ void ++swd_getbyte (lzo1x_999_swd_t * s) ++{ ++ int c; ++ ++ if ((c = getbyte (*(s->c))) < 0) ++ { ++ if (s->look > 0) ++ --s->look; ++ } ++ else ++ { ++ s->b[s->ip] = LZO_BYTE (c); ++ if (s->ip < s->f) ++ s->b_wrap[s->ip] = LZO_BYTE (c); ++ } ++ if (++s->ip == s->b_size) ++ s->ip = 0; ++ if (++s->bp == s->b_size) ++ s->bp = 0; ++ if (++s->rp == s->b_size) ++ s->rp = 0; ++} ++ ++static void ++swd_initdict (lzo1x_999_swd_t * s, const lzo_byte * dict, lzo_uint dict_len) ++{ ++ s->dict = s->dict_end = NULL; ++ s->dict_len = 0; ++ ++ if (!dict || dict_len <= 0) ++ return; ++ if (dict_len > s->n) ++ { ++ dict += dict_len - s->n; ++ dict_len = s->n; ++ } ++ ++ s->dict = dict; ++ s->dict_len = dict_len; ++ s->dict_end = dict + dict_len; ++ memcpy (s->b, dict, dict_len); ++ s->ip = dict_len; ++} ++ ++static void ++swd_insertdict (lzo1x_999_swd_t * s, lzo_uint node, lzo_uint len) ++{ ++ lzo_uint key; ++ ++ s->node_count = s->n - len; ++ s->first_rp = node; ++ ++ while (len-- > 0) ++ { ++ key = HEAD3 (s->b, node); ++ s->succ3[node] = s_head3 (s, key); ++ s->head3[key] = SWD_UINT (node); ++ s->best3[node] = SWD_UINT (s->f + 1); ++ s->llen3[key]++; ++ ++ key = HEAD2 (s->b, node); ++ s->head2[key] = SWD_UINT (node); ++ ++ node++; ++ } ++} ++ ++static int ++swd_init (lzo1x_999_swd_t * s, const lzo_byte * dict, lzo_uint dict_len) ++{ ++ ++ s->n = SWD_N; ++ s->f = SWD_F; ++ s->threshold = SWD_THRESHOLD; ++ ++ ++ ++ s->max_chain = SWD_MAX_CHAIN; ++ s->nice_length = SWD_F; ++ s->use_best_off = 0; ++ s->lazy_insert = 0; ++ ++ s->b_size = s->n + s->f; ++ if (2 * s->f >= s->n || s->b_size + s->f >= NIL2) ++ return LZO_E_ERROR; ++ s->b_wrap = s->b + s->b_size; ++ s->node_count = s->n; ++ ++ memset (s->llen3, 0, sizeof (s->llen3[0]) * SWD_HSIZE); ++ memset (s->head2, 0xff, sizeof (s->head2[0]) * 65536L); ++ ++ s->ip = 0; ++ swd_initdict (s, dict, dict_len); ++ s->bp = s->ip; ++ s->first_rp = s->ip; ++ ++ s->look = (lzo_uint) (s->c->in_end - s->c->ip); ++ if (s->look > 0) ++ { ++ if (s->look > s->f) ++ s->look = s->f; ++ memcpy (&s->b[s->ip], s->c->ip, s->look); ++ s->c->ip += s->look; ++ s->ip += s->look; ++ } ++ ++ if (s->ip == s->b_size) ++ s->ip = 0; ++ ++ if (s->look >= 2 && s->dict_len > 0) ++ swd_insertdict (s, 0, s->dict_len); ++ ++ s->rp = s->first_rp; ++ if (s->rp >= s->node_count) ++ s->rp -= s->node_count; ++ else ++ s->rp += s->b_size - s->node_count; ++ ++ return LZO_E_OK; ++} ++ ++static __inline__ void ++swd_remove_node (lzo1x_999_swd_t * s, lzo_uint node) ++{ ++ if (s->node_count == 0) ++ { ++ lzo_uint key; ++ ++ key = HEAD3 (s->b, node); ++ ++ --s->llen3[key]; ++ ++ key = HEAD2 (s->b, node); ++ ++ if ((lzo_uint) s->head2[key] == node) ++ s->head2[key] = NIL2; ++ } ++ else ++ --s->node_count; ++} ++ ++static void ++swd_accept (lzo1x_999_swd_t * s, lzo_uint n) ++{ ++ ++ while (n--) ++ { ++ lzo_uint key; ++ ++ swd_remove_node (s, s->rp); ++ ++ key = HEAD3 (s->b, s->bp); ++ s->succ3[s->bp] = s_head3 (s, key); ++ s->head3[key] = SWD_UINT (s->bp); ++ s->best3[s->bp] = SWD_UINT (s->f + 1); ++ s->llen3[key]++; ++ ++ key = HEAD2 (s->b, s->bp); ++ s->head2[key] = SWD_UINT (s->bp);; ++ ++ swd_getbyte (s); ++ } ++} ++ ++static void ++swd_search (lzo1x_999_swd_t * s, lzo_uint node, lzo_uint cnt) ++{ ++ const unsigned char *p1; ++ const unsigned char *p2; ++ const unsigned char *px; ++ ++ lzo_uint m_len = s->m_len; ++ const unsigned char *b = s->b; ++ const unsigned char *bp = s->b + s->bp; ++ const unsigned char *bx = s->b + s->bp + s->look; ++ unsigned char scan_end1; ++ ++ scan_end1 = bp[m_len - 1]; ++ for (; cnt-- > 0; node = s->succ3[node]) ++ { ++ p1 = bp; ++ p2 = b + node; ++ px = bx; ++ ++ if (p2[m_len - 1] == scan_end1 && ++ p2[m_len] == p1[m_len] && ++ p2[0] == p1[0] && p2[1] == p1[1]) ++ { ++ lzo_uint i; ++ ++ p1 += 2; ++ p2 += 2; ++ do ++ { ++ } ++ while (++p1 < px && *p1 == *++p2); ++ ++ i = p1 - bp; ++ ++ if (i < SWD_BEST_OFF) ++ { ++ if (s->best_pos[i] == 0) ++ s->best_pos[i] = node + 1; ++ } ++ ++ if (i > m_len) ++ { ++ s->m_len = m_len = i; ++ s->m_pos = node; ++ if (m_len == s->look) ++ return; ++ if (m_len >= s->nice_length) ++ return; ++ if (m_len > (lzo_uint) s->best3[node]) ++ return; ++ scan_end1 = bp[m_len - 1]; ++ } ++ } ++ } ++} ++ ++static lzo_bool ++swd_search2 (lzo1x_999_swd_t * s) ++{ ++ lzo_uint key; ++ ++ key = s->head2[HEAD2 (s->b, s->bp)]; ++ if (key == NIL2) ++ return 0; ++ ++ if (s->best_pos[2] == 0) ++ s->best_pos[2] = key + 1; ++ ++ if (s->m_len < 2) ++ { ++ s->m_len = 2; ++ s->m_pos = key; ++ } ++ return 1; ++} ++ ++static void ++swd_findbest (lzo1x_999_swd_t * s) ++{ ++ lzo_uint key; ++ lzo_uint cnt, node; ++ lzo_uint len; ++ ++ key = HEAD3 (s->b, s->bp); ++ node = s->succ3[s->bp] = s_head3 (s, key); ++ cnt = s->llen3[key]++; ++ ++ if (cnt > s->max_chain && s->max_chain > 0) ++ cnt = s->max_chain; ++ s->head3[key] = SWD_UINT (s->bp); ++ ++ s->b_char = s->b[s->bp]; ++ len = s->m_len; ++ if (s->m_len >= s->look) ++ { ++ if (s->look == 0) ++ s->b_char = -1; ++ s->m_off = 0; ++ s->best3[s->bp] = SWD_UINT (s->f + 1); ++ } ++ else ++ { ++ ++ if (swd_search2 (s)) ++ ++ if (s->look >= 3) ++ swd_search (s, node, cnt); ++ if (s->m_len > len) ++ s->m_off = swd_pos2off (s, s->m_pos); ++ s->best3[s->bp] = SWD_UINT (s->m_len); ++ ++ if (s->use_best_off) ++ { ++ int i; ++ for (i = 2; i < SWD_BEST_OFF; i++) ++ if (s->best_pos[i] > 0) ++ s->best_off[i] = ++ swd_pos2off (s, ++ s->best_pos[i] - ++ 1); ++ else ++ s->best_off[i] = 0; ++ } ++ ++ } ++ ++ swd_remove_node (s, s->rp); ++ ++ key = HEAD2 (s->b, s->bp); ++ s->head2[key] = SWD_UINT (s->bp); ++ ++} ++ ++/* lzo_mchw.ch */ ++ ++static int ++init_match (lzo1x_999_t * c, lzo1x_999_swd_t * s, ++ const lzo_byte * dict, lzo_uint dict_len, lzo_uint32 flags) ++{ ++ int r; ++ ++ c->init = 1; ++ ++ s->c = c; ++ ++ c->last_m_len = c->last_m_off = 0; ++ ++ c->textsize = c->codesize = c->printcount = 0; ++ c->lit_bytes = c->match_bytes = c->rep_bytes = 0; ++ c->lazy = 0; ++ ++ r = swd_init (s, dict, dict_len); ++ if (r != 0) ++ return r; ++ ++ s->use_best_off = (flags & 1) ? 1 : 0; ++ return r; ++} ++ ++static int ++find_match (lzo1x_999_t * c, lzo1x_999_swd_t * s, ++ lzo_uint this_len, lzo_uint skip) ++{ ++ if (skip > 0) ++ { ++ swd_accept (s, this_len - skip); ++ c->textsize += this_len - skip + 1; ++ } ++ else ++ { ++ c->textsize += this_len - skip; ++ } ++ ++ s->m_len = 1; ++ s->m_len = 1; ++ ++ if (s->use_best_off) ++ memset (s->best_pos, 0, sizeof (s->best_pos)); ++ ++ swd_findbest (s); ++ c->m_len = s->m_len; ++ c->m_off = s->m_off; ++ ++ swd_getbyte (s); ++ ++ if (s->b_char < 0) ++ { ++ c->look = 0; ++ c->m_len = 0; ++ } ++ else ++ { ++ c->look = s->look + 1; ++ } ++ c->bp = c->ip - c->look; ++ ++ if (c->cb && c->textsize > c->printcount) ++ { ++ (*c->cb) (c->textsize, c->codesize); ++ c->printcount += 1024; ++ } ++ ++ return LZO_E_OK; ++} ++ ++/* lzo1x_9x.c */ ++ ++static lzo_byte * ++code_match (lzo1x_999_t * c, lzo_byte * op, lzo_uint m_len, lzo_uint m_off) ++{ ++ lzo_uint x_len = m_len; ++ lzo_uint x_off = m_off; ++ ++ c->match_bytes += m_len; ++ ++ if (m_len == 2) ++ { ++ m_off -= 1; ++ ++ *op++ = LZO_BYTE (M1_MARKER | ((m_off & 3) << 2)); ++ *op++ = LZO_BYTE (m_off >> 2); ++ ++ c->m1a_m++; ++ } ++ ++ else if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET) ++ ++ { ++ ++ m_off -= 1; ++ *op++ = LZO_BYTE (((m_len - 1) << 5) | ((m_off & 7) << 2)); ++ *op++ = LZO_BYTE (m_off >> 3); ++ c->m2_m++; ++ } ++ else if (m_len == M2_MIN_LEN && m_off <= MX_MAX_OFFSET ++ && c->r1_lit >= 4) ++ { ++ m_off -= 1 + M2_MAX_OFFSET; ++ ++ *op++ = LZO_BYTE (M1_MARKER | ((m_off & 3) << 2)); ++ *op++ = LZO_BYTE (m_off >> 2); ++ ++ c->m1b_m++; ++ } ++ else if (m_off <= M3_MAX_OFFSET) ++ { ++ m_off -= 1; ++ if (m_len <= M3_MAX_LEN) ++ *op++ = LZO_BYTE (M3_MARKER | (m_len - 2)); ++ else ++ { ++ m_len -= M3_MAX_LEN; ++ *op++ = M3_MARKER | 0; ++ while (m_len > 255) ++ { ++ m_len -= 255; ++ *op++ = 0; ++ } ++ *op++ = LZO_BYTE (m_len); ++ } ++ ++ *op++ = LZO_BYTE (m_off << 2); ++ *op++ = LZO_BYTE (m_off >> 6); ++ ++ c->m3_m++; ++ } ++ else ++ { ++ lzo_uint k; ++ ++ m_off -= 0x4000; ++ k = (m_off & 0x4000) >> 11; ++ if (m_len <= M4_MAX_LEN) ++ *op++ = LZO_BYTE (M4_MARKER | k | (m_len - 2)); ++ else ++ { ++ m_len -= M4_MAX_LEN; ++ *op++ = LZO_BYTE (M4_MARKER | k | 0); ++ while (m_len > 255) ++ { ++ m_len -= 255; ++ *op++ = 0; ++ } ++ *op++ = LZO_BYTE (m_len); ++ } ++ ++ *op++ = LZO_BYTE (m_off << 2); ++ *op++ = LZO_BYTE (m_off >> 6); ++ ++ c->m4_m++; ++ } ++ ++ c->last_m_len = x_len; ++ c->last_m_off = x_off; ++ return op; ++} ++ ++static lzo_byte * ++STORE_RUN (lzo1x_999_t * c, lzo_byte * op, const lzo_byte * ii, lzo_uint t) ++{ ++ c->lit_bytes += t; ++ ++ if (op == c->out && t <= 238) ++ { ++ *op++ = LZO_BYTE (17 + t); ++ } ++ else if (t <= 3) ++ { ++ op[-2] |= LZO_BYTE (t); ++ ++ c->lit1_r++; ++ } ++ else if (t <= 18) ++ { ++ *op++ = LZO_BYTE (t - 3); ++ c->lit2_r++; ++ } ++ else ++ { ++ lzo_uint tt = t - 18; ++ ++ *op++ = 0; ++ while (tt > 255) ++ { ++ tt -= 255; ++ *op++ = 0; ++ } ++ *op++ = LZO_BYTE (tt); ++ c->lit3_r++; ++ } ++ do ++ *op++ = *ii++; ++ while (--t > 0); ++ ++ return op; ++} ++ ++static lzo_byte * ++code_run (lzo1x_999_t * c, lzo_byte * op, const lzo_byte * ii, ++ lzo_uint lit, lzo_uint m_len) ++{ ++ if (lit > 0) ++ { ++ op = STORE_RUN (c, op, ii, lit); ++ c->r1_m_len = m_len; ++ c->r1_lit = lit; ++ } ++ else ++ { ++ c->r1_m_len = 0; ++ c->r1_lit = 0; ++ } ++ ++ return op; ++} ++ ++static int ++len_of_coded_match (lzo_uint m_len, lzo_uint m_off, lzo_uint lit) ++{ ++ int n = 4; ++ ++ if (m_len < 2) ++ return -1; ++ if (m_len == 2) ++ return (m_off <= M1_MAX_OFFSET && lit > 0 ++ && lit < 4) ? 2 : -1; ++ if (m_len <= M2_MAX_LEN && m_off <= M2_MAX_OFFSET) ++ return 2; ++ if (m_len == M2_MIN_LEN && m_off <= MX_MAX_OFFSET && lit >= 4) ++ return 2; ++ if (m_off <= M3_MAX_OFFSET) ++ { ++ if (m_len <= M3_MAX_LEN) ++ return 3; ++ m_len -= M3_MAX_LEN; ++ while (m_len > 255) ++ { ++ m_len -= 255; ++ n++; ++ } ++ return n; ++ } ++ if (m_off <= M4_MAX_OFFSET) ++ { ++ if (m_len <= M4_MAX_LEN) ++ return 3; ++ m_len -= M4_MAX_LEN; ++ while (m_len > 255) ++ { ++ m_len -= 255; ++ n++; ++ } ++ return n; ++ } ++ return -1; ++} ++ ++static lzo_int ++min_gain (lzo_uint ahead, lzo_uint lit1, lzo_uint lit2, int l1, int l2, ++ int l3) ++{ ++ lzo_int lazy_match_min_gain = 0; ++ ++ lazy_match_min_gain += ahead; ++ ++ if (lit1 <= 3) ++ lazy_match_min_gain += (lit2 <= 3) ? 0 : 2; ++ else if (lit1 <= 18) ++ lazy_match_min_gain += (lit2 <= 18) ? 0 : 1; ++ ++ lazy_match_min_gain += (l2 - l1) * 2; ++ if (l3 > 0) ++ lazy_match_min_gain -= (ahead - l3) * 2; ++ ++ if (lazy_match_min_gain < 0) ++ lazy_match_min_gain = 0; ++ ++ return lazy_match_min_gain; ++} ++ ++static void ++better_match (const lzo1x_999_swd_t * swd, lzo_uint * m_len, lzo_uint * m_off) ++{ ++ if (*m_len <= M2_MIN_LEN) ++ return; ++ ++ if (*m_off <= M2_MAX_OFFSET) ++ return; ++ ++ if (*m_off > M2_MAX_OFFSET && ++ *m_len >= M2_MIN_LEN + 1 && *m_len <= M2_MAX_LEN + 1 && ++ swd->best_off[*m_len - 1] ++ && swd->best_off[*m_len - 1] <= M2_MAX_OFFSET) ++ { ++ *m_len = *m_len - 1; ++ *m_off = swd->best_off[*m_len]; ++ return; ++ } ++ ++ if (*m_off > M3_MAX_OFFSET && ++ *m_len >= M4_MAX_LEN + 1 && *m_len <= M2_MAX_LEN + 2 && ++ swd->best_off[*m_len - 2] ++ && swd->best_off[*m_len - 2] <= M2_MAX_OFFSET) ++ { ++ *m_len = *m_len - 2; ++ *m_off = swd->best_off[*m_len]; ++ return; ++ } ++ ++ if (*m_off > M3_MAX_OFFSET && ++ *m_len >= M4_MAX_LEN + 1 && *m_len <= M3_MAX_LEN + 1 && ++ swd->best_off[*m_len - 1] ++ && swd->best_off[*m_len - 1] <= M3_MAX_OFFSET) ++ { ++ *m_len = *m_len - 1; ++ *m_off = swd->best_off[*m_len]; ++ } ++ ++} ++ ++/* minilzo.c */ ++ ++static lzo_bool ++lzo_assert (int expr) ++{ ++ return (expr) ? 1 : 0; ++} ++ ++/* lzo1x_9x.c */ ++ ++static int ++lzo1x_999_compress_internal (const lzo_byte * in, lzo_uint in_len, ++ lzo_byte * out, lzo_uintp out_len, ++ lzo_voidp wrkmem, ++ const lzo_byte * dict, lzo_uint dict_len, ++ lzo_progress_callback_t cb, ++ int try_lazy, ++ lzo_uint good_length, ++ lzo_uint max_lazy, ++ lzo_uint nice_length, ++ lzo_uint max_chain, lzo_uint32 flags) ++{ ++ lzo_byte *op; ++ const lzo_byte *ii; ++ lzo_uint lit; ++ lzo_uint m_len, m_off; ++ lzo1x_999_t cc; ++ lzo1x_999_t *const c = &cc; ++ lzo1x_999_swd_t *const swd = (lzo1x_999_swd_t *) wrkmem; ++ int r; ++ ++ if (!lzo_assert ++ (LZO1X_999_MEM_COMPRESS >= lzo_sizeof (lzo1x_999_swd_t))) ++ return LZO_E_ERROR; ++ ++ if (try_lazy < 0) ++ try_lazy = 1; ++ ++ if (good_length <= 0) ++ good_length = 32; ++ ++ if (max_lazy <= 0) ++ max_lazy = 32; ++ ++ if (nice_length <= 0) ++ nice_length = 0; ++ ++ if (max_chain <= 0) ++ max_chain = SWD_MAX_CHAIN; ++ ++ c->init = 0; ++ c->ip = c->in = in; ++ c->in_end = in + in_len; ++ c->out = out; ++ c->cb = cb; ++ c->m1a_m = c->m1b_m = c->m2_m = c->m3_m = c->m4_m = 0; ++ c->lit1_r = c->lit2_r = c->lit3_r = 0; ++ ++ op = out; ++ ii = c->ip; ++ lit = 0; ++ c->r1_lit = c->r1_m_len = 0; ++ ++ r = init_match (c, swd, dict, dict_len, flags); ++ if (r != 0) ++ return r; ++ if (max_chain > 0) ++ swd->max_chain = max_chain; ++ if (nice_length > 0) ++ swd->nice_length = nice_length; ++ ++ r = find_match (c, swd, 0, 0); ++ if (r != 0) ++ return r; ++ while (c->look > 0) ++ { ++ lzo_uint ahead; ++ lzo_uint max_ahead; ++ int l1, l2, l3; ++ ++ c->codesize = op - out; ++ ++ m_len = c->m_len; ++ m_off = c->m_off; ++ ++ if (lit == 0) ++ ii = c->bp; ++ ++ if (m_len < 2 || ++ (m_len == 2 ++ && (m_off > M1_MAX_OFFSET || lit == 0 || lit >= 4)) ++ || (m_len == 2 && op == out) || (op == out && lit == 0)) ++ { ++ ++ m_len = 0; ++ } ++ else if (m_len == M2_MIN_LEN) ++ { ++ ++ if (m_off > MX_MAX_OFFSET && lit >= 4) ++ m_len = 0; ++ } ++ ++ if (m_len == 0) ++ { ++ ++ lit++; ++ swd->max_chain = max_chain; ++ r = find_match (c, swd, 1, 0); ++ continue; ++ } ++ ++ if (swd->use_best_off) ++ better_match (swd, &m_len, &m_off); ++ ++ ahead = 0; ++ if (try_lazy <= 0 || m_len >= max_lazy) ++ { ++ ++ l1 = 0; ++ max_ahead = 0; ++ } ++ else ++ { ++ ++ l1 = len_of_coded_match (m_len, m_off, lit); ++ ++ max_ahead = LZO_MIN (try_lazy, l1 - 1); ++ ++ } ++ ++ while (ahead < max_ahead && c->look > m_len) ++ { ++ lzo_int lazy_match_min_gain; ++ ++ if (m_len >= good_length) ++ swd->max_chain = max_chain >> 2; ++ else ++ swd->max_chain = max_chain; ++ r = find_match (c, swd, 1, 0); ++ ahead++; ++ ++ if (c->m_len < m_len) ++ continue; ++ ++ if (c->m_len == m_len && c->m_off >= m_off) ++ continue; ++ ++ if (swd->use_best_off) ++ better_match (swd, &c->m_len, &c->m_off); ++ ++ l2 = len_of_coded_match (c->m_len, c->m_off, ++ lit + ahead); ++ if (l2 < 0) ++ continue; ++ ++ l3 = (op == out) ? -1 : len_of_coded_match (ahead, ++ m_off, ++ lit); ++ ++ lazy_match_min_gain = ++ min_gain (ahead, lit, lit + ahead, l1, l2, ++ l3); ++ if (c->m_len >= m_len + lazy_match_min_gain) ++ { ++ c->lazy++; ++ ++ if (l3 > 0) ++ { ++ ++ op = code_run (c, op, ii, lit, ahead); ++ lit = 0; ++ ++ op = code_match (c, op, ahead, m_off); ++ } ++ else ++ { ++ lit += ahead; ++ } ++ goto lazy_match_done; ++ } ++ } ++ ++ op = code_run (c, op, ii, lit, m_len); ++ lit = 0; ++ ++ op = code_match (c, op, m_len, m_off); ++ swd->max_chain = max_chain; ++ r = find_match (c, swd, m_len, 1 + ahead); ++ ++ lazy_match_done:; ++ } ++ ++ if (lit > 0) ++ op = STORE_RUN (c, op, ii, lit); ++ ++ *op++ = M4_MARKER | 1; ++ *op++ = 0; ++ *op++ = 0; ++ ++ c->codesize = op - out; ++ ++ *out_len = op - out; ++ ++ if (c->cb) ++ (*c->cb) (c->textsize, c->codesize); ++ ++ return LZO_E_OK; ++} ++ ++static int ++lzo1x_999_compress_level (const lzo_byte * in, lzo_uint in_len, ++ lzo_byte * out, lzo_uintp out_len, ++ lzo_voidp wrkmem, ++ const lzo_byte * dict, lzo_uint dict_len, ++ lzo_progress_callback_t cb, int compression_level) ++{ ++ static const struct ++ { ++ int try_lazy; ++ lzo_uint good_length; ++ lzo_uint max_lazy; ++ lzo_uint nice_length; ++ lzo_uint max_chain; ++ lzo_uint32 flags; ++ } c[9] = ++ { ++ { ++ 0, 0, 0, 8, 4, 0}, ++ { ++ 0, 0, 0, 16, 8, 0}, ++ { ++ 0, 0, 0, 32, 16, 0}, ++ { ++ 1, 4, 4, 16, 16, 0}, ++ { ++ 1, 8, 16, 32, 32, 0}, ++ { ++ 1, 8, 16, 128, 128, 0}, ++ { ++ 2, 8, 32, 128, 256, 0}, ++ { ++ 2, 32, 128, F, 2048, 1}, ++ { ++ 2, F, F, F, 4096, 1} ++ }; ++ ++ if (compression_level < 1 || compression_level > 9) ++ return LZO_E_ERROR; ++ ++ compression_level -= 1; ++ return lzo1x_999_compress_internal (in, in_len, out, out_len, wrkmem, ++ dict, dict_len, cb, ++ c[compression_level].try_lazy, ++ c[compression_level].good_length, ++ c[compression_level].max_lazy, ++ 0, ++ c[compression_level].max_chain, ++ c[compression_level].flags); ++} ++ ++static int ++lzo1x_999_compress (const lzo_byte * in, lzo_uint in_len, ++ lzo_byte * out, lzo_uintp out_len, lzo_voidp wrkmem) ++{ ++ return lzo1x_999_compress_level (in, in_len, out, out_len, wrkmem, ++ NULL, 0, 0, 8); ++} ++ ++/* minilzo.c */ ++ ++static const lzo_byte __lzo_copyright[] = LZO_VERSION_STRING; ++ ++static lzo_uint ++_lzo1x_1_do_compress (const lzo_byte * in, lzo_uint in_len, ++ lzo_byte * out, lzo_uintp out_len, lzo_voidp wrkmem) ++{ ++ ++ register const lzo_byte *ip; ++ ++ lzo_byte *op; ++ const lzo_byte *const in_end = in + in_len; ++ const lzo_byte *const ip_end = in + in_len - 8 - 5; ++ const lzo_byte *ii; ++ lzo_dict_p const dict = (lzo_dict_p) wrkmem; ++ ++ op = out; ++ ip = in; ++ ii = ip; ++ ++ ip += 4; ++ for (;;) ++ { ++ register const lzo_byte *m_pos; ++ ++ lzo_uint m_off; ++ lzo_uint m_len; ++ lzo_uint dindex; ++ ++ DINDEX1 (dindex, ip); ++ GINDEX (m_pos, m_off, dict, dindex, in); ++ if (LZO_CHECK_MPOS_NON_DET ++ (m_pos, m_off, in, ip, M4_MAX_OFFSET)) ++ goto literal; ++ ++ if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3]) ++ goto try_match; ++ DINDEX2 (dindex, ip); ++ GINDEX (m_pos, m_off, dict, dindex, in); ++ ++ if (LZO_CHECK_MPOS_NON_DET ++ (m_pos, m_off, in, ip, M4_MAX_OFFSET)) ++ goto literal; ++ if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3]) ++ goto try_match; ++ goto literal; ++ ++ try_match: ++ if (m_pos[0] != ip[0] || m_pos[1] != ip[1]) ++ { ++ } ++ else ++ { ++ if (m_pos[2] == ip[2]) ++ { ++ goto match; ++ } ++ else ++ { ++ } ++ } ++ ++ literal: ++ UPDATE_I (dict, 0, dindex, ip, in); ++ ++ip; ++ if (ip >= ip_end) ++ break; ++ continue; ++ ++ match: ++ UPDATE_I (dict, 0, dindex, ip, in); ++ ++ if (pd (ip, ii) > 0) ++ { ++ register lzo_uint t = pd (ip, ii); ++ ++ if (t <= 3) ++ { ++ op[-2] |= LZO_BYTE (t); ++ } ++ else if (t <= 18) ++ *op++ = LZO_BYTE (t - 3); ++ else ++ { ++ register lzo_uint tt = t - 18; ++ ++ *op++ = 0; ++ while (tt > 255) ++ { ++ tt -= 255; ++ *op++ = 0; ++ } ++ *op++ = LZO_BYTE (tt);; ++ } ++ do ++ *op++ = *ii++; ++ while (--t > 0); ++ } ++ ++ ip += 3; ++ if (m_pos[3] != *ip++ || m_pos[4] != *ip++ ++ || m_pos[5] != *ip++ || m_pos[6] != *ip++ ++ || m_pos[7] != *ip++ || m_pos[8] != *ip++) ++ { ++ --ip; ++ m_len = ip - ii; ++ ++ if (m_off <= M2_MAX_OFFSET) ++ { ++ m_off -= 1; ++ ++ *op++ = LZO_BYTE (((m_len - ++ 1) << 5) | ((m_off & 7) << ++ 2)); ++ *op++ = LZO_BYTE (m_off >> 3); ++ } ++ else if (m_off <= M3_MAX_OFFSET) ++ { ++ m_off -= 1; ++ *op++ = LZO_BYTE (M3_MARKER | (m_len - 2)); ++ goto m3_m4_offset; ++ } ++ else ++ ++ { ++ m_off -= 0x4000; ++ ++ *op++ = LZO_BYTE (M4_MARKER | ++ ((m_off & 0x4000) >> 11) | ++ (m_len - 2)); ++ goto m3_m4_offset; ++ } ++ } ++ else ++ { ++ { ++ const lzo_byte *end = in_end; ++ const lzo_byte *m = m_pos + M2_MAX_LEN + 1; ++ while (ip < end && *m == *ip) ++ m++, ip++; ++ m_len = (ip - ii); ++ } ++ ++ ++ if (m_off <= M3_MAX_OFFSET) ++ { ++ m_off -= 1; ++ if (m_len <= 33) ++ *op++ = LZO_BYTE (M3_MARKER | ++ (m_len - 2)); ++ else ++ { ++ m_len -= 33; ++ *op++ = M3_MARKER | 0; ++ goto m3_m4_len; ++ } ++ } ++ else ++ { ++ m_off -= 0x4000; ++ ++ if (m_len <= M4_MAX_LEN) ++ *op++ = LZO_BYTE (M4_MARKER | ++ ((m_off & 0x4000) >> ++ 11) | (m_len - 2)); ++ ++ else ++ { ++ m_len -= M4_MAX_LEN; ++ *op++ = LZO_BYTE (M4_MARKER | ++ ((m_off & 0x4000) >> ++ 11)); ++ m3_m4_len: ++ while (m_len > 255) ++ { ++ m_len -= 255; ++ *op++ = 0; ++ } ++ ++ *op++ = LZO_BYTE (m_len); ++ } ++ } ++ ++ m3_m4_offset: ++ *op++ = LZO_BYTE ((m_off & 63) << 2); ++ *op++ = LZO_BYTE (m_off >> 6); ++ } ++ ii = ip; ++ if (ip >= ip_end) ++ break; ++ } ++ ++ *out_len = op - out; ++ return pd (in_end, ii); ++} ++ ++static int ++lzo1x_1_compress (const lzo_byte * in, lzo_uint in_len, ++ lzo_byte * out, lzo_uintp out_len, lzo_voidp wrkmem) ++{ ++ lzo_byte *op = out; ++ lzo_uint t; ++ ++ if (in_len <= M2_MAX_LEN + 5) ++ t = in_len; ++ else ++ { ++ t = _lzo1x_1_do_compress (in, in_len, op, out_len, wrkmem); ++ op += *out_len; ++ } ++ ++ if (t > 0) ++ { ++ const lzo_byte *ii = in + in_len - t; ++ ++ if (op == out && t <= 238) ++ *op++ = LZO_BYTE (17 + t); ++ else if (t <= 3) ++ op[-2] |= LZO_BYTE (t); ++ else if (t <= 18) ++ *op++ = LZO_BYTE (t - 3); ++ else ++ { ++ lzo_uint tt = t - 18; ++ ++ *op++ = 0; ++ while (tt > 255) ++ { ++ tt -= 255; ++ *op++ = 0; ++ } ++ ++ *op++ = LZO_BYTE (tt); ++ } ++ do ++ *op++ = *ii++; ++ while (--t > 0); ++ } ++ ++ *op++ = M4_MARKER | 1; ++ *op++ = 0; ++ *op++ = 0; ++ ++ *out_len = op - out; ++ return 0; ++} ++ ++static int ++lzo1x_decompress (const lzo_byte * in, lzo_uint in_len, ++ lzo_byte * out, lzo_uintp out_len, lzo_voidp wrkmem) ++{ ++ register lzo_byte *op; ++ register const lzo_byte *ip; ++ register lzo_uint t; ++ ++ register const lzo_byte *m_pos; ++ ++ const lzo_byte *const ip_end = in + in_len; ++ lzo_byte *const op_end = out + *out_len; ++ ++ *out_len = 0; ++ ++ op = out; ++ ip = in; ++ ++ if (*ip > 17) ++ { ++ t = *ip++ - 17; ++ if (t < 4) ++ goto match_next; ++ NEED_OP (t); ++ NEED_IP (t + 1); ++ do ++ *op++ = *ip++; ++ while (--t > 0); ++ goto first_literal_run; ++ } ++ ++ while (TEST_IP && TEST_OP) ++ { ++ t = *ip++; ++ if (t >= 16) ++ goto match; ++ if (t == 0) ++ { ++ NEED_IP (1); ++ while (*ip == 0) ++ { ++ t += 255; ++ ip++; ++ NEED_IP (1); ++ } ++ t += 15 + *ip++; ++ } ++ NEED_OP (t + 3); ++ NEED_IP (t + 4); ++ if (PTR_ALIGNED2_4 (op, ip)) ++ { ++ COPY4 (op, ip); ++ ++ op += 4; ++ ip += 4; ++ if (--t > 0) ++ { ++ if (t >= 4) ++ { ++ do ++ { ++ COPY4 (op, ip); ++ op += 4; ++ ip += 4; ++ t -= 4; ++ } ++ while (t >= 4); ++ if (t > 0) ++ do ++ *op++ = *ip++; ++ while (--t > 0); ++ } ++ else ++ do ++ *op++ = *ip++; ++ while (--t > 0); ++ } ++ } ++ else ++ { ++ *op++ = *ip++; ++ *op++ = *ip++; ++ *op++ = *ip++; ++ do ++ *op++ = *ip++; ++ while (--t > 0); ++ } ++ first_literal_run: ++ ++ t = *ip++; ++ if (t >= 16) ++ goto match; ++ ++ m_pos = op - (1 + M2_MAX_OFFSET); ++ m_pos -= t >> 2; ++ m_pos -= *ip++ << 2; ++ TEST_LOOKBEHIND (m_pos, out); ++ NEED_OP (3); ++ *op++ = *m_pos++; ++ *op++ = *m_pos++; ++ *op++ = *m_pos; ++ ++ goto match_done; ++ ++ while (TEST_IP && TEST_OP) ++ { ++ match: ++ if (t >= 64) ++ { ++ m_pos = op - 1; ++ m_pos -= (t >> 2) & 7; ++ m_pos -= *ip++ << 3; ++ t = (t >> 5) - 1; ++ TEST_LOOKBEHIND (m_pos, out); ++ NEED_OP (t + 3 - 1); ++ goto copy_match; ++ ++ } ++ else if (t >= 32) ++ { ++ t &= 31; ++ if (t == 0) ++ { ++ NEED_IP (1); ++ while (*ip == 0) ++ { ++ t += 255; ++ ip++; ++ NEED_IP (1); ++ } ++ t += 31 + *ip++; ++ } ++ ++ m_pos = op - 1; ++ m_pos -= (ip[0] >> 2) + (ip[1] << 6); ++ ++ ip += 2; ++ } ++ else if (t >= 16) ++ { ++ m_pos = op; ++ m_pos -= (t & 8) << 11; ++ ++ t &= 7; ++ if (t == 0) ++ { ++ NEED_IP (1); ++ while (*ip == 0) ++ { ++ t += 255; ++ ip++; ++ NEED_IP (1); ++ } ++ t += 7 + *ip++; ++ } ++ ++ m_pos -= (ip[0] >> 2) + (ip[1] << 6); ++ ++ ip += 2; ++ if (m_pos == op) ++ goto eof_found; ++ m_pos -= 0x4000; ++ } ++ else ++ { ++ ++ m_pos = op - 1; ++ m_pos -= t >> 2; ++ m_pos -= *ip++ << 2; ++ TEST_LOOKBEHIND (m_pos, out); ++ NEED_OP (2); ++ *op++ = *m_pos++; ++ *op++ = *m_pos; ++ ++ goto match_done; ++ } ++ ++ TEST_LOOKBEHIND (m_pos, out); ++ NEED_OP (t + 3 - 1); ++ if (t >= 2 * 4 - (3 - 1) ++ && PTR_ALIGNED2_4 (op, m_pos)) ++ { ++ COPY4 (op, m_pos); ++ op += 4; ++ m_pos += 4; ++ t -= 4 - (3 - 1); ++ do ++ { ++ COPY4 (op, m_pos); ++ op += 4; ++ m_pos += 4; ++ t -= 4; ++ } ++ while (t >= 4); ++ if (t > 0) ++ do ++ *op++ = *m_pos++; ++ while (--t > 0); ++ } ++ else ++ ++ { ++ copy_match: ++ *op++ = *m_pos++; ++ *op++ = *m_pos++; ++ do ++ *op++ = *m_pos++; ++ while (--t > 0); ++ } ++ ++ match_done: ++ t = ip[-2] & 3; ++ ++ if (t == 0) ++ break; ++ ++ match_next: ++ NEED_OP (t); ++ NEED_IP (t + 1); ++ do ++ *op++ = *ip++; ++ while (--t > 0); ++ t = *ip++; ++ } ++ } ++ *out_len = op - out; ++ return LZO_E_EOF_NOT_FOUND; ++ ++ eof_found: ++ *out_len = op - out; ++ return (ip == ip_end ? LZO_E_OK : ++ (ip < ++ ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); ++ ++ input_overrun: ++ *out_len = op - out; ++ return LZO_E_INPUT_OVERRUN; ++ ++ output_overrun: ++ *out_len = op - out; ++ return LZO_E_OUTPUT_OVERRUN; ++ ++ lookbehind_overrun: ++ *out_len = op - out; ++ return LZO_E_LOOKBEHIND_OVERRUN; ++} ++ ++/* lzo1x_oo.ch */ ++ ++#define NO_LIT LZO_UINT_MAX ++ ++static void ++copy2 (lzo_byte * ip, const lzo_byte * m_pos, lzo_ptrdiff_t off) ++{ ++ ip[0] = m_pos[0]; ++ if (off == 1) ++ ip[1] = m_pos[0]; ++ else ++ ip[1] = m_pos[1]; ++} ++ ++static void ++copy3 (lzo_byte * ip, const lzo_byte * m_pos, lzo_ptrdiff_t off) ++{ ++ ip[0] = m_pos[0]; ++ if (off == 1) ++ { ++ ip[2] = ip[1] = m_pos[0]; ++ } ++ else if (off == 2) ++ { ++ ip[1] = m_pos[1]; ++ ip[2] = m_pos[0]; ++ } ++ else ++ { ++ ip[1] = m_pos[1]; ++ ip[2] = m_pos[2]; ++ } ++} ++ ++static int ++lzo1x_optimize (lzo_byte * in, lzo_uint in_len, ++ lzo_byte * out, lzo_uintp out_len, lzo_voidp wrkmem) ++{ ++ register lzo_byte *op; ++ register lzo_byte *ip; ++ register lzo_uint t; ++ register lzo_byte *m_pos; ++ lzo_uint nl; ++ const lzo_byte *const ip_end = in + in_len; ++ const lzo_byte *const op_end = out + *out_len; ++ lzo_byte *litp = NULL; ++ lzo_uint lit = 0; ++ lzo_uint next_lit = NO_LIT; ++ long o_m1_a = 0, o_m1_b = 0, o_m2 = 0, o_m3_a = 0, o_m3_b = 0; ++ ++ *out_len = 0; ++ ++ op = out; ++ ip = in; ++ ++ if (*ip > 17) ++ { ++ t = *ip++ - 17; ++ if (t < 4) ++ goto match_next; ++ goto first_literal_run; ++ } ++ ++ while (TEST_IP && TEST_OP) ++ { ++ t = *ip++; ++ if (t >= 16) ++ goto match; ++ litp = ip - 1; ++ if (t == 0) ++ { ++ t = 15; ++ while (*ip == 0) ++ t += 255, ip++; ++ t += *ip++; ++ } ++ lit = t + 3; ++ copy_literal_run: ++ *op++ = *ip++; ++ *op++ = *ip++; ++ *op++ = *ip++; ++ first_literal_run: ++ do ++ *op++ = *ip++; ++ while (--t > 0); ++ ++ t = *ip++; ++ ++ if (t >= 16) ++ goto match; ++ m_pos = op - 1 - 0x800; ++ m_pos -= t >> 2; ++ m_pos -= *ip++ << 2; ++ *op++ = *m_pos++; ++ *op++ = *m_pos++; ++ *op++ = *m_pos++; ++ lit = 0; ++ goto match_done; ++ ++ while (TEST_IP && TEST_OP) ++ { ++ if (t < 16) ++ { ++ m_pos = op - 1; ++ m_pos -= t >> 2; ++ m_pos -= *ip++ << 2; ++ ++ if (litp == NULL) ++ goto copy_m1; ++ ++ nl = ip[-2] & 3; ++ if (nl == 0 && lit == 1 && ip[0] >= 16) ++ { ++ next_lit = nl; ++ lit += 2; ++ *litp = LZO_BYTE ((*litp & ~3) | lit); ++ copy2 (ip - 2, m_pos, op - m_pos); ++ o_m1_a++; ++ } ++ else if (nl == 0 && ip[0] < 16 && ip[0] != 0 ++ && (lit + 2 + ip[0] < 16)) ++ { ++ t = *ip++; ++ *litp &= ~3; ++ copy2 (ip - 3 + 1, m_pos, op - m_pos); ++ litp += 2; ++ if (lit > 0) ++ memmove (litp + 1, litp, lit); ++ lit += 2 + t + 3; ++ *litp = LZO_BYTE (lit - 3); ++ ++ o_m1_b++; ++ *op++ = *m_pos++; ++ *op++ = *m_pos++; ++ goto copy_literal_run; ++ } ++ copy_m1: ++ *op++ = *m_pos++; ++ *op++ = *m_pos++; ++ } ++ else ++ { ++ match: ++ if (t >= 64) ++ { ++ m_pos = op - 1; ++ m_pos -= (t >> 2) & 7; ++ m_pos -= *ip++ << 3; ++ t = (t >> 5) - 1; ++ if (litp == NULL) ++ goto copy_m; ++ ++ nl = ip[-2] & 3; ++ if (t == 1 && lit > 3 && nl == 0 && ++ ip[0] < 16 && ip[0] != 0 ++ && (lit + 3 + ip[0] < 16)) ++ { ++ t = *ip++; ++ copy3 (ip - 1 - 2, m_pos, ++ op - m_pos); ++ lit += 3 + t + 3; ++ *litp = LZO_BYTE (lit - 3); ++ o_m2++; ++ *op++ = *m_pos++; ++ *op++ = *m_pos++; ++ *op++ = *m_pos++; ++ goto copy_literal_run; ++ } ++ } ++ else ++ { ++ if (t >= 32) ++ { ++ t &= 31; ++ if (t == 0) ++ { ++ t = 31; ++ while (*ip == 0) ++ t += 255, ++ ip++; ++ t += *ip++; ++ } ++ m_pos = op - 1; ++ m_pos -= *ip++ >> 2; ++ m_pos -= *ip++ << 6; ++ } ++ else ++ { ++ m_pos = op; ++ m_pos -= (t & 8) << 11; ++ t &= 7; ++ if (t == 0) ++ { ++ t = 7; ++ while (*ip == 0) ++ t += 255, ++ ip++; ++ t += *ip++; ++ } ++ m_pos -= *ip++ >> 2; ++ m_pos -= *ip++ << 6; ++ if (m_pos == op) ++ goto eof_found; ++ m_pos -= 0x4000; ++ } ++ if (litp == NULL) ++ goto copy_m; ++ ++ nl = ip[-2] & 3; ++ if (t == 1 && lit == 0 && nl == 0 ++ && ip[0] >= 16) ++ { ++ next_lit = nl; ++ lit += 3; ++ *litp = LZO_BYTE ((*litp & ~3) ++ | lit); ++ copy3 (ip - 3, m_pos, ++ op - m_pos); ++ o_m3_a++; ++ } ++ else if (t == 1 && lit <= 3 && nl == 0 ++ && ip[0] < 16 && ip[0] != 0 ++ && (lit + 3 + ip[0] < 16)) ++ { ++ t = *ip++; ++ *litp &= ~3; ++ copy3 (ip - 4 + 1, m_pos, ++ op - m_pos); ++ litp += 2; ++ if (lit > 0) ++ memmove (litp + 1, ++ litp, lit); ++ lit += 3 + t + 3; ++ *litp = LZO_BYTE (lit - 3); ++ ++ o_m3_b++; ++ *op++ = *m_pos++; ++ *op++ = *m_pos++; ++ *op++ = *m_pos++; ++ goto copy_literal_run; ++ } ++ } ++ copy_m: ++ *op++ = *m_pos++; ++ *op++ = *m_pos++; ++ do ++ *op++ = *m_pos++; ++ while (--t > 0); ++ } ++ ++ match_done: ++ if (next_lit == NO_LIT) ++ { ++ t = ip[-2] & 3; ++ lit = t; ++ litp = ip - 2; ++ } ++ else ++ t = next_lit; ++ next_lit = NO_LIT; ++ if (t == 0) ++ break; ++ match_next: ++ do ++ *op++ = *ip++; ++ while (--t > 0); ++ t = *ip++; ++ } ++ } ++ ++ *out_len = op - out; ++ return LZO_E_EOF_NOT_FOUND; ++ ++ eof_found: ++ *out_len = op - out; ++ return (ip == ip_end ? LZO_E_OK : ++ (ip < ++ ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN)); ++} ++ ++/* interface to jffs2 bbc follows */ ++ ++#include "jffs2_bbc_framework.h" ++ ++#define BLOCKSIZE 4096 ++#define OUTBLOCKSIZE (BLOCKSIZE + BLOCKSIZE / 64 + 16 + 3) ++ ++#define JFFS2_BBC_LZO_BLOCK_SIGN {0x3f, 0x47, 0x5a, 0x18} ++ ++static int ++jffs2_bbc_lzo_compressor_init (void); ++ ++static void ++jffs2_bbc_lzo_compressor_deinit (void); ++ ++static int ++jffs2_bbc_lzo_compress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long *sourcelen, ++ unsigned long *dstlen); ++ ++static int ++jffs2_bbc_lzo_estimate (void *model, unsigned char *input, ++ unsigned long sourcelen, unsigned long *dstlen, ++ unsigned long *readtime, unsigned long *writetime); ++ ++static int ++jffs2_bbc_lzo_decompress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long sourcelen, ++ unsigned long dstlen); ++ ++static char * ++jffs2_bbc_lzo_proc_info (void); ++ ++static int ++jffs2_bbc_lzo_proc_command (char *command); ++ ++struct jffs2_bbc_compressor_type jffs2_bbc_lzo = { ++ "lzo", ++ 0, ++ JFFS2_BBC_LZO_BLOCK_SIGN, ++ jffs2_bbc_lzo_compressor_init, ++ NULL, ++ NULL, ++ jffs2_bbc_lzo_compressor_deinit, ++ jffs2_bbc_lzo_compress, ++ jffs2_bbc_lzo_estimate, ++ jffs2_bbc_lzo_decompress, ++ jffs2_bbc_lzo_proc_info, ++ jffs2_bbc_lzo_proc_command ++}; ++ ++static int ++no_lzo1x_optimize (lzo_byte * src, lzo_uint src_len, ++ lzo_byte * dst, lzo_uintp dst_len, lzo_voidp wrkmem) ++{ ++ return 0; ++} ++ ++#ifdef __KERNEL__ ++static lzo_compress_t lzo1x_compressor = lzo1x_1_compress; ++static lzo_optimize_t lzo1x_optimizer = no_lzo1x_optimize; ++static int lzo1x_compressor_type = 1; ++static int lzo1x_optimize_type = 0; ++static unsigned long lzo1x_compressor_memsize = LZO1X_1_MEM_COMPRESS; ++#else ++static lzo_compress_t lzo1x_compressor = lzo1x_999_compress; ++static lzo_optimize_t lzo1x_optimizer = lzo1x_optimize; ++static int lzo1x_compressor_type = 999; ++static int lzo1x_optimize_type = 1; ++static unsigned long lzo1x_compressor_memsize = LZO1X_999_MEM_COMPRESS; ++#endif ++ ++static lzo_bytep wrkmem = NULL; /* temporary buffer for compression, used by lzo */ ++static lzo_bytep cmprssmem = NULL; /* temporary buffer for compression, used by interface */ ++ ++static int ++jffs2_bbc_lzo_compressor_init (void) ++{ ++ wrkmem = (lzo_bytep) jffs2_bbc_malloc (lzo1x_compressor_memsize); ++ cmprssmem = (lzo_bytep) jffs2_bbc_malloc (OUTBLOCKSIZE); ++ return !(wrkmem && cmprssmem); ++} ++ ++static void ++jffs2_bbc_lzo_compressor_deinit (void) ++{ ++ jffs2_bbc_free (wrkmem); ++ jffs2_bbc_free (cmprssmem); ++} ++ ++static int ++jffs2_bbc_lzo_compress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long *sourcelen, ++ unsigned long *dstlen) ++{ ++ lzo_uint csize = OUTBLOCKSIZE; ++ lzo_uint isize = *sourcelen; ++ int retval; ++ if ((retval = ++ lzo1x_compressor (input, *sourcelen, cmprssmem, &csize, ++ wrkmem)) != LZO_E_OK) ++ { ++ *sourcelen = *dstlen = 0; ++ return retval; ++ } ++ else ++ { ++ retval = lzo1x_optimizer (cmprssmem, csize, input, &isize, ++ NULL); ++ csize += 2; ++ if (csize <= *dstlen) { ++ *dstlen = csize; ++ *(output++) = jffs2_bbc_lzo.block_sign[0]; ++ *(output++) = jffs2_bbc_lzo.block_sign[1]; ++ memcpy (output, cmprssmem, csize - 2); ++ return retval; ++ } else { ++ *sourcelen = *dstlen = 0; ++ return -1; ++ } ++ } ++} ++ ++static int ++jffs2_bbc_lzo_estimate (void *model, unsigned char *input, ++ unsigned long sourcelen, unsigned long *dstlen, ++ unsigned long *readtime, unsigned long *writetime) ++{ ++ *dstlen = sourcelen * 55 / 100; ++ *readtime = JFFS2_BBC_ZLIB_READ_TIME / 2; ++ *writetime = JFFS2_BBC_ZLIB_WRITE_TIME * 8 / 10; /* LZO1X-1 is much-much faster, ++ but LZO1X-999 is slow. The default mode for inside kernel compression is LZO1X-1 ++ This should be *0.4 really */ ++ return 0; ++} ++ ++static int ++jffs2_bbc_lzo_decompress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long sourcelen, ++ unsigned long dstlen) ++{ ++ lzo_uint outlen = dstlen; ++ if ( ( *(input++) != (unsigned char)jffs2_bbc_lzo.block_sign[0] ) || ++ ( *(input++) != (unsigned char)jffs2_bbc_lzo.block_sign[1] ) ++ ) { ++ return -1; ++ } else { ++ return lzo1x_decompress (input, sourcelen - 2, output, &outlen, NULL); ++ } ++} ++ ++static char * ++jffs2_bbc_lzo_proc_info (void) ++{ ++ if (lzo1x_compressor_type == 1) ++ { ++ if (lzo1x_optimize_type == 1) ++ { ++ return "LZO1X-1 compression with optimization"; ++ } ++ else ++ { ++ return "LZO1X-1 compression without optimization"; ++ } ++ } ++ else if (lzo1x_compressor_type == 999) ++ { ++ if (lzo1x_optimize_type == 1) ++ { ++ return "LZO1X-999 compression with optimization"; ++ } ++ else ++ { ++ return "LZO1X-999 compression without optimization"; ++ } ++ } ++ else ++ { ++ return "Unknown configuration!"; ++ } ++} ++ ++static int ++jffs2_bbc_lzo_proc_command (char *command) ++{ ++ switch (*command) ++ { ++ case 'o': ++ /* switch optimization off */ ++ lzo1x_optimizer = no_lzo1x_optimize; ++ lzo1x_optimize_type = 0; ++ jffs2_bbc_print1 ("Compression optimization switched off.\n"); ++ return 0; ++ case 'O': ++ /* switch optimization on */ ++ lzo1x_optimizer = lzo1x_optimize; ++ lzo1x_optimize_type = 1; ++ jffs2_bbc_print1 ("Compression optimization switched on.\n"); ++ return 0; ++ case '1': ++ /* switch compression to LZO1X-1 */ ++ jffs2_bbc_free (wrkmem); ++ lzo1x_compressor_type = 1; ++ lzo1x_compressor = lzo1x_1_compress; ++ lzo1x_compressor_memsize = LZO1X_1_MEM_COMPRESS; ++ wrkmem = (lzo_bytep) ++ jffs2_bbc_malloc (lzo1x_compressor_memsize); ++ jffs2_bbc_print1 ("Compression type switched to LZO1X-1.\n"); ++ return 0; ++ case '9': ++ /* switch compression to LZO1X-999 */ ++ jffs2_bbc_free (wrkmem); ++ lzo1x_compressor_type = 999; ++ lzo1x_compressor = lzo1x_999_compress; ++ lzo1x_compressor_memsize = LZO1X_999_MEM_COMPRESS; ++ wrkmem = (lzo_bytep) ++ jffs2_bbc_malloc (lzo1x_compressor_memsize); ++ jffs2_bbc_print1 ++ ("Compression type switched to LZO1X-999.\n"); ++ return 0; ++ default: ++ jffs2_bbc_print1 ("Unknown command!\n"); ++ return 0; ++ } ++} ++ ++ ++struct jffs2_bbc_compressor_type * ++jffs2_bbc_lzo_init (int mode) ++{ ++ if (jffs2_bbc_register_compressor (&jffs2_bbc_lzo) == 0) ++ { ++ return &jffs2_bbc_lzo; ++ } ++ else ++ { ++ return NULL; ++ } ++} ++ ++void ++jffs2_bbc_lzo_deinit (void) ++{ ++ jffs2_bbc_unregister_compressor (&jffs2_bbc_lzo); ++} +diff -Nur linux-mips-cvs/fs/jffs2/jffs2_bbc_lzss_comp.c linux-mips/fs/jffs2/jffs2_bbc_lzss_comp.c +--- linux-mips-cvs/fs/jffs2/jffs2_bbc_lzss_comp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/jffs2_bbc_lzss_comp.c 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,385 @@ ++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ ++ ++/* ++ jffs2_bbc_lzss_comp.c -- Lempel-Ziv-Storer-Szymanski compression module for jffs2 ++ Copyright (C) 2004 Patrik Kluba ++ Based on the LZSS source included in LDS (lossless datacompression sources) ++ Block-compression modifications by Patrik Kluba ++ $Header: /openwrt/openwrt/package/linux/kernel-patches/301-jffs-compression,v 1.1 2005/03/26 10:33:31 wbx Exp $ ++*/ ++ ++/* ++Original copyright follows: ++ ++************************************************************** ++ LZSS.C -- A Data Compression Program ++************************************************************** ++ 4/6/1989 Haruhiko Okumura ++ Use, distribute, and modify this program freely. ++ Please send me your improved versions. ++ PC-VAN SCIENCE ++ NIFTY-Serve PAF01022 ++ CompuServe 74050,1022 ++************************************************************** ++ ++*/ ++ ++/* ++ ++ 2004-02-16 pajko <pajko(AT)halom(DOT)u-szeged(DOT)hu> ++ Initial release ++ ++*/ ++ ++/* lzss.c */ ++ ++#define N 4096 /* size of ring buffer */ ++#define F 18 /* upper limit for match_length */ ++#define THRESHOLD 2 /* encode string into position and length ++ if match_length is greater than this */ ++#define NIL N /* index for root of binary search trees */ ++ ++static unsigned char ++ text_buf[N + F - 1]; /* ring buffer of size N, ++ with extra F-1 bytes to facilitate string comparison */ ++static unsigned long match_position, match_length; /* of longest match. These are ++ set by the InsertNode() procedure. */ ++static unsigned long lson[N + 1], rson[N + 257], dad[N + 1]; /* left & right children & ++ parents -- These constitute binary search trees. */ ++ ++static void InitTree(void) /* initialize trees */ ++{ ++ unsigned long i; ++ ++ /* For i = 0 to N - 1, rson[i] and lson[i] will be the right and ++ left children of node i. These nodes need not be initialized. ++ Also, dad[i] is the parent of node i. These are initialized to ++ NIL (= N), which stands for 'not used.' ++ For i = 0 to 255, rson[N + i + 1] is the root of the tree ++ for strings that begin with character i. These are initialized ++ to NIL. Note there are 256 trees. */ ++ ++ for (i = N + 1; i <= N + 256; i++) rson[i] = NIL; ++ for (i = 0; i < N; i++) dad[i] = NIL; ++} ++ ++static void InsertNode(unsigned long r) ++ /* Inserts string of length F, text_buf[r..r+F-1], into one of the ++ trees (text_buf[r]'th tree) and returns the longest-match position ++ and length via the global variables match_position and match_length. ++ If match_length = F, then removes the old node in favor of the new ++ one, because the old one will be deleted sooner. ++ Note r plays double role, as tree node and position in buffer. */ ++{ ++ unsigned long i, p; ++ unsigned char *key; ++ signed long cmp; ++ ++ cmp = 1; key = &text_buf[r]; p = N + 1 + key[0]; ++ rson[r] = lson[r] = NIL; match_length = 0; ++ for ( ; ; ) { ++ if (cmp >= 0) { ++ if (rson[p] != NIL) p = rson[p]; ++ else { rson[p] = r; dad[r] = p; return; } ++ } else { ++ if (lson[p] != NIL) p = lson[p]; ++ else { lson[p] = r; dad[r] = p; return; } ++ } ++ for (i = 1; i < F; i++) ++ if ((cmp = key[i] - text_buf[p + i]) != 0) break; ++ if (i > match_length) { ++ match_position = p; ++ if ((match_length = i) >= F) break; ++ } ++ } ++ dad[r] = dad[p]; lson[r] = lson[p]; rson[r] = rson[p]; ++ dad[lson[p]] = r; dad[rson[p]] = r; ++ if (rson[dad[p]] == p) rson[dad[p]] = r; ++ else lson[dad[p]] = r; ++ dad[p] = NIL; /* remove p */ ++} ++ ++static void DeleteNode(unsigned long p) /* deletes node p from tree */ ++{ ++ unsigned long q; ++ ++ if (dad[p] == NIL) return; /* not in tree */ ++ if (rson[p] == NIL) q = lson[p]; ++ else if (lson[p] == NIL) q = rson[p]; ++ else { ++ q = lson[p]; ++ if (rson[q] != NIL) { ++ do { q = rson[q]; } while (rson[q] != NIL); ++ rson[dad[q]] = lson[q]; dad[lson[q]] = dad[q]; ++ lson[q] = lson[p]; dad[lson[p]] = q; ++ } ++ rson[q] = rson[p]; dad[rson[p]] = q; ++ } ++ dad[q] = dad[p]; ++ if (rson[dad[p]] == p) rson[dad[p]] = q; else lson[dad[p]] = q; ++ dad[p] = NIL; ++} ++ ++/* modified for block compression */ ++/* on return, srclen will contain the number of successfully compressed bytes ++ and dstlen will contain completed compressed bytes */ ++ ++static int Encode(unsigned char *srcbuf, unsigned char *dstbuf, unsigned long *srclen, ++ unsigned long *dstlen) ++{ ++ unsigned long i, len, r, c, s, last_match_length, code_buf_ptr; ++ unsigned char code_buf[17], mask; ++ unsigned char *ip, *op; ++ unsigned long written = 0; ++ unsigned long read = 0; ++ unsigned char *srcend = srcbuf + *srclen; ++ unsigned char *dstend = dstbuf + *dstlen; ++ ip = srcbuf; ++ op = dstbuf; ++ InitTree(); /* initialize trees */ ++ code_buf[0] = 0; /* code_buf[1..16] saves eight units of code, and ++ code_buf[0] works as eight flags, "1" representing that the unit ++ is an unencoded letter (1 byte), "0" a position-and-length pair ++ (2 bytes). Thus, eight units require at most 16 bytes of code. */ ++ code_buf_ptr = mask = 1; ++ s = 0; r = N - F; ++ for (i = s; i < r; i++) text_buf[i] = ' '; /* Clear the buffer with ++ any character that will appear often. */ ++ for (len = 0; (len < F) && (ip < srcend); len++) ++ text_buf[r + len] = *(ip++); /* Read F bytes into the last F bytes of ++ the buffer */ ++ read = len; ++ for (i = 1; i <= F; i++) InsertNode(r - i); /* Insert the F strings, ++ each of which begins with one or more 'space' characters. Note ++ the order in which these strings are inserted. This way, ++ degenerate trees will be less likely to occur. */ ++ InsertNode(r); /* Finally, insert the whole string just read. The ++ global variables match_length and match_position are set. */ ++ do { ++ if (match_length > len) match_length = len; /* match_length ++ may be spuriously long near the end of text. */ ++ if (match_length <= THRESHOLD) { ++ match_length = 1; /* Not long enough match. Send one byte. */ ++ code_buf[0] |= mask; /* 'send one byte' flag */ ++ code_buf[code_buf_ptr++] = text_buf[r]; /* Send uncoded. */ ++ } else { ++ code_buf[code_buf_ptr++] = match_position; ++ code_buf[code_buf_ptr++] = (((match_position >> 4) & 0xf0) ++ | (match_length - (THRESHOLD + 1))); /* Send position and ++ length pair. Note match_length > THRESHOLD. */ ++ } ++ if ((mask <<= 1) == 0) { /* Shift mask left one bit. */ ++ if ((op + code_buf_ptr) > dstend) { ++ *dstlen = written; /* written contains bytes of complete compressed ++ code */ ++ return -1; ++ }; ++ for (i = 0; i < code_buf_ptr; *(op++) = code_buf[i++]); /* Send at most 8 units of */ ++ /* code together */ ++ written += code_buf_ptr; ++ *srclen = read; /* this many bytes have been successfully compressed */ ++ code_buf[0] = 0; code_buf_ptr = mask = 1; ++ } ++ last_match_length = match_length; ++ for (i = 0; (i < last_match_length) && (ip < srcend); i++) { ++ c = *(ip++); ++ DeleteNode(s); /* Delete old strings and */ ++ text_buf[s] = c; /* read new bytes */ ++ if (s < F - 1) text_buf[s + N] = c; /* If the position is ++ near the end of buffer, extend the buffer to make ++ string comparison easier. */ ++ s = (s + 1) & (N - 1); r = (r + 1) & (N - 1); ++ /* Since this is a ring buffer, increment the position ++ modulo N. */ ++ InsertNode(r); /* Register the string in text_buf[r..r+F-1] */ ++ } ++ read += i; ++ while (i++ < last_match_length) { /* After the end of text, */ ++ DeleteNode(s); /* no need to read, but */ ++ s = (s + 1) & (N - 1); r = (r + 1) & (N - 1); ++ if (--len) InsertNode(r); /* buffer may not be empty. */ ++ } ++ } while (len > 0); /* until length of string to be processed is zero */ ++ if (code_buf_ptr > 1) { /* Send remaining code. */ ++ if ((op + code_buf_ptr) > dstend) { ++ *dstlen = written; ++ return -1; ++ } ++ for (i = 0; i < code_buf_ptr; *(op++) = code_buf[i++]); ++ written += code_buf_ptr; ++ *srclen = read; ++ } ++ *dstlen = written; ++ return 0; ++} ++ ++static int Decode(unsigned char *srcbuf, unsigned char *dstbuf, unsigned long srclen, ++ unsigned long dstlen) /* Just the reverse of Encode(). */ ++{ ++ unsigned long i, r, c, j, k, flags; ++ unsigned char *ip, *op; ++ unsigned long written; ++ unsigned long read; ++ unsigned char *srcend = srcbuf + srclen; ++ unsigned char *dstend = dstbuf + dstlen; ++ read = written = 0; ++ ip = srcbuf; ++ op = dstbuf; ++ for (i = 0; i < N - F; i++) text_buf[i] = ' '; ++ r = N - F; flags = 0; ++ for ( ; ; ) { ++ if (((flags >>= 1) & 256) == 0) { ++ if (ip >= srcend) return 0; ++ c = *(ip++); ++ flags = c | 0xff00; /* uses higher byte cleverly */ ++ } /* to count eight */ ++ if (flags & 1) { ++ if (ip >= srcend) return 0; ++ c = *(ip++); ++ if (op >= dstend) return -1; ++ *(op++) = text_buf[r++] = c; r &= (N - 1); ++ } else { ++ if ((ip + 2) > srcend) return 0; ++ i = *(ip++); ++ j = *(ip++); ++ i |= ((j & 0xf0) << 4); j = (j & 0x0f) + THRESHOLD; ++ if ((op + j + 1) > dstend) return -1; ++ for (k = 0; k <= j; k++) { ++ c = text_buf[(i + k) & (N - 1)]; ++ *(op++) = text_buf[r++] = c; r &= (N - 1); ++ } ++ } ++ } ++} ++ ++/* interface to jffs2 bbc follows */ ++ ++#include "jffs2_bbc_framework.h" ++ ++ ++#define JFFS2_BBC_LZSS_BLOCK_SIGN {0x27, 0x6f, 0x12, 0xc4} ++ ++static int ++jffs2_bbc_lzss_compressor_init (void); ++ ++static void ++jffs2_bbc_lzss_compressor_deinit (void); ++ ++static int ++jffs2_bbc_lzss_compress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long *sourcelen, ++ unsigned long *dstlen); ++ ++static int ++jffs2_bbc_lzss_estimate (void *model, unsigned char *input, ++ unsigned long sourcelen, unsigned long *dstlen, ++ unsigned long *readtime, unsigned long *writetime); ++ ++static int ++jffs2_bbc_lzss_decompress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long sourcelen, ++ unsigned long dstlen); ++ ++static char * ++jffs2_bbc_lzss_proc_info (void); ++ ++static int ++jffs2_bbc_lzss_proc_command (char *command); ++ ++struct jffs2_bbc_compressor_type jffs2_bbc_lzss = { ++ "lzss", ++ 0, ++ JFFS2_BBC_LZSS_BLOCK_SIGN, ++ jffs2_bbc_lzss_compressor_init, ++ NULL, ++ NULL, ++ jffs2_bbc_lzss_compressor_deinit, ++ jffs2_bbc_lzss_compress, ++ jffs2_bbc_lzss_estimate, ++ jffs2_bbc_lzss_decompress, ++ jffs2_bbc_lzss_proc_info, ++ jffs2_bbc_lzss_proc_command ++}; ++ ++static int ++jffs2_bbc_lzss_compressor_init (void) ++{ ++ return 0; ++} ++ ++static void ++jffs2_bbc_lzss_compressor_deinit (void) ++{ ++} ++ ++static int ++jffs2_bbc_lzss_compress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long *sourcelen, ++ unsigned long *dstlen) ++{ ++ int retval; ++ unsigned long dst = *dstlen; ++ *(output++) = jffs2_bbc_lzss.block_sign[0]; ++ *(output++) = jffs2_bbc_lzss.block_sign[1]; ++ dst -= 2; ++ retval = Encode(input, output, sourcelen, &dst); ++ dst += 2; ++ *dstlen = dst; ++ return retval; ++} ++ ++static int ++jffs2_bbc_lzss_estimate (void *model, unsigned char *input, ++ unsigned long sourcelen, unsigned long *dstlen, ++ unsigned long *readtime, unsigned long *writetime) ++{ ++ *dstlen = sourcelen * 60 / 100; ++ *readtime = JFFS2_BBC_ZLIB_READ_TIME * 12 / 10; ++ *writetime = JFFS2_BBC_ZLIB_WRITE_TIME * 3; ++ return 0; ++} ++ ++static int ++jffs2_bbc_lzss_decompress (void *model, unsigned char *input, ++ unsigned char *output, unsigned long sourcelen, ++ unsigned long dstlen) ++{ ++ if ( ( *(input++) != (unsigned char)jffs2_bbc_lzss.block_sign[0] ) || ++ ( *(input++) != (unsigned char)jffs2_bbc_lzss.block_sign[1] ) ++ ) { ++ return -1; ++ } else { ++ return Decode(input, output, sourcelen - 2, dstlen); ++ } ++} ++ ++static char * ++jffs2_bbc_lzss_proc_info (void) ++{ ++ return "Lempel-Ziv-Storer-Szymanski compression module"; ++} ++ ++static int ++jffs2_bbc_lzss_proc_command (char *command) ++{ ++ return 0; ++} ++ ++struct jffs2_bbc_compressor_type * ++jffs2_bbc_lzss_init (int mode) ++{ ++ if (jffs2_bbc_register_compressor (&jffs2_bbc_lzss) == 0) ++ { ++ return &jffs2_bbc_lzss; ++ } ++ else ++ { ++ return NULL; ++ } ++} ++ ++void ++jffs2_bbc_lzss_deinit (void) ++{ ++ jffs2_bbc_unregister_compressor (&jffs2_bbc_lzss); ++} +diff -Nur linux-mips-cvs/fs/jffs2/linux-2.4.25.hpatch linux-mips/fs/jffs2/linux-2.4.25.hpatch +--- linux-mips-cvs/fs/jffs2/linux-2.4.25.hpatch 1970-01-01 01:00:00.000000000 +0100 ++++ linux-mips/fs/jffs2/linux-2.4.25.hpatch 2005-02-07 05:08:34.000000000 +0100 +@@ -0,0 +1,97 @@ ++FMakefile ++=BBC insertion ++-COMPR_OBJS ++iMakefile.bbc.inc +++ ++I ++?JFFS2_OBJS +++ $(JFFS2_BBC_KERNEL_OBJS) \ ++ ++F../Config.in ++=BBC insertion ++-tristate 'Compressed ROM file system support' CONFIG_CRAMFS ++iConfig.in.bbc.inc +++ ++I ++F../../Documentation/Configure.help ++=BBC insertion ++-JFFS stats available ++iConfigure.help.bbc.inc +++ ++I ++Fcompr_zlib.c ++=(de)compress->(de)compress2 ++-int zlib_compress(unsigned char *data_in, unsigned char *cpage_out, +++int jffs2_zlib_compress2(unsigned char *data_in, unsigned char *cpage_out, ++-void zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, +++void jffs2_zlib_decompress2(unsigned char *data_in, unsigned char *cpage_out, ++?inflateEnd(&strm); ++?} +++ +++extern int jffs2_zlib_compress(unsigned char *data_in, unsigned char *cpage_out, __u32 * sourcelen, __u32 * dstlen); +++extern void jffs2_zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, __u32 srclen, __u32 destlen); +++ +++int zlib_compress(unsigned char *data_in, unsigned char *cpage_out, +++ __u32 *sourcelen, __u32 *dstlen) +++{ +++ return jffs2_zlib_compress(data_in,cpage_out,sourcelen,dstlen); +++} +++ +++void zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, +++ __u32 srclen, __u32 destlen) +++{ +++ jffs2_zlib_decompress(data_in,cpage_out,srclen,destlen); +++} +++ ++ ++Ffile.c ++=set_act_sb before write ++-#include +++#include "jffs2_bbc_framework.h" /**BBC**/ ++I ++?int jffs2_commit_write ++-jffs2_compress( +++ jffs2_bbc_model_set_act_sb(c); /**BBC**/ ++I ++ ++Fgc.c ++=set_act_sb before write ++-#include +++#include "jffs2_bbc_framework.h" /**BBC**/ ++I ++?int jffs2_garbage_collect_dnode( ++-jffs2_compress( +++ jffs2_bbc_model_set_act_sb(c); /**BBC**/ ++I ++ ++Fread.c ++=set_act_sb before read ++-#include +++#include "jffs2_bbc_framework.h" /**BBC**/ ++I ++?int jffs2_read_dnode( ++-jffs2_decompress( +++ jffs2_bbc_model_set_act_sb(c); /**BBC**/ ++I ++ ++Fsuper.c ++=init, load_model ++-#include +++#include "jffs2_bbc_fs.h" /**BBC**/ ++I ++?struct super_block *jffs2_read_super( ++-return sb; +++ jffs2_bbc_load_model(sb); /**BBC**/ ++I ++?void jffs2_put_super ++?c = JFFS2_SB_INFO +++ jffs2_bbc_unload_model(sb); /**BBC**/ ++?init_jffs2_fs(void) ++?int ret; +++ +++ jffs2_bbc_proc_init(); /**BBC**/ +++ ++?exit_jffs2_fs(void) ++?{ +++ jffs2_bbc_proc_deinit(); /**BBC**/ +++ +diff -Nur linux-mips-cvs/fs/jffs2/read.c linux-mips/fs/jffs2/read.c +--- linux-mips-cvs/fs/jffs2/read.c 2003-11-17 02:07:44.000000000 +0100 ++++ linux-mips/fs/jffs2/read.c 2005-02-07 05:08:35.000000000 +0100 +@@ -35,6 +35,7 @@ + * + */ + ++#include "jffs2_bbc_framework.h" /**BBC**/ + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/jffs2.h> +@@ -140,6 +141,7 @@ + D2(printk(KERN_DEBUG "Data CRC matches calculated CRC %08x\n", crc)); + if (ri->compr != JFFS2_COMPR_NONE) { + D2(printk(KERN_DEBUG "Decompress %d bytes from %p to %d bytes at %p\n", ri->csize, readbuf, ri->dsize, decomprbuf)); ++ jffs2_bbc_model_set_act_sb(c); /**BBC**/ + ret = jffs2_decompress(ri->compr, readbuf, decomprbuf, ri->csize, ri->dsize); + if (ret) { + printk(KERN_WARNING "Error: jffs2_decompress returned %d\n", ret); +diff -Nur linux-mips-cvs/fs/jffs2/super.c linux-mips/fs/jffs2/super.c +--- linux-mips-cvs/fs/jffs2/super.c 2003-01-11 18:53:17.000000000 +0100 ++++ linux-mips/fs/jffs2/super.c 2005-02-07 05:08:35.000000000 +0100 +@@ -35,6 +35,7 @@ + * + */ + ++#include "jffs2_bbc_fs.h" /**BBC**/ + #include <linux/config.h> + #include <linux/kernel.h> + #include <linux/module.h> +@@ -272,6 +273,7 @@ + sb->s_magic = JFFS2_SUPER_MAGIC; + if (!(sb->s_flags & MS_RDONLY)) + jffs2_start_garbage_collect_thread(c); ++ jffs2_bbc_load_model(sb); /**BBC**/ + return sb; + + out_root_i: +@@ -288,6 +290,7 @@ + void jffs2_put_super (struct super_block *sb) + { + struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); ++ jffs2_bbc_unload_model(sb); /**BBC**/ + + D2(printk(KERN_DEBUG "jffs2: jffs2_put_super()\n")); + +@@ -344,6 +347,9 @@ + { + int ret; + ++ jffs2_bbc_proc_init(); /**BBC**/ ++ ++ + printk(KERN_NOTICE "JFFS2 version 2.1. (C) 2001 Red Hat, Inc., designed by Axis Communications AB.\n"); + + #ifdef JFFS2_OUT_OF_KERNEL +@@ -388,6 +394,8 @@ + + static void __exit exit_jffs2_fs(void) + { ++ jffs2_bbc_proc_deinit(); /**BBC**/ ++ + jffs2_destroy_slab_caches(); + jffs2_zlib_exit(); + unregister_filesystem(&jffs2_fs_type); diff --git a/recipes/linux/linux-wrt-2.4.30/302-ebtables b/recipes/linux/linux-wrt-2.4.30/302-ebtables new file mode 100644 index 0000000000..b1c34abe4d --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/302-ebtables @@ -0,0 +1,7012 @@ +--- linux-2.4.29/net/bridge/br_private.h 2004-08-08 01:26:06.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/net/bridge/br_private.h 2005-03-14 21:24:04.000000000 +0100 +@@ -143,8 +143,10 @@ extern void br_fdb_insert(struct net_bri + /* br_forward.c */ + extern void br_deliver(struct net_bridge_port *to, + struct sk_buff *skb); ++extern int br_dev_queue_push_xmit(struct sk_buff *skb); + extern void br_forward(struct net_bridge_port *to, + struct sk_buff *skb); ++extern int br_forward_finish(struct sk_buff *skb); + extern void br_flood_deliver(struct net_bridge *br, + struct sk_buff *skb, + int clone); +@@ -165,7 +167,8 @@ extern void br_get_port_ifindices(struct + int *ifindices); + + /* br_input.c */ +-extern void br_handle_frame(struct sk_buff *skb); ++extern int br_handle_frame_finish(struct sk_buff *skb); ++extern int br_handle_frame(struct sk_buff *skb); + + /* br_ioctl.c */ + extern int br_ioctl(struct net_bridge *br, +@@ -175,6 +178,10 @@ extern int br_ioctl(struct net_bridge *b + unsigned long arg2); + extern int br_ioctl_deviceless_stub(unsigned long arg); + ++/* br_netfilter.c */ ++extern int br_netfilter_init(void); ++extern void br_netfilter_fini(void); ++ + /* br_stp.c */ + extern int br_is_root_bridge(struct net_bridge *br); + extern struct net_bridge_port *br_get_port(struct net_bridge *br, +--- linux-2.4.29/include/linux/if_bridge.h 2001-11-22 20:47:12.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/if_bridge.h 2005-03-14 21:11:28.000000000 +0100 +@@ -102,7 +102,8 @@ struct net_bridge; + struct net_bridge_port; + + extern int (*br_ioctl_hook)(unsigned long arg); +-extern void (*br_handle_frame_hook)(struct sk_buff *skb); ++extern int (*br_handle_frame_hook)(struct sk_buff *skb); ++extern int (*br_should_route_hook)(struct sk_buff **pskb); + + #endif + +--- linux-2.4.29/net/core/dev.c 2004-04-14 15:05:41.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/net/core/dev.c 2005-03-14 00:00:29.000000000 +0100 +@@ -1426,7 +1426,7 @@ static void net_tx_action(struct softirq + + + #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) +-void (*br_handle_frame_hook)(struct sk_buff *skb) = NULL; ++int (*br_handle_frame_hook)(struct sk_buff *skb) = NULL; + #endif + + static __inline__ int handle_bridge(struct sk_buff *skb, +@@ -1443,7 +1443,6 @@ static __inline__ int handle_bridge(stru + } + } + +- br_handle_frame_hook(skb); + return ret; + } + +@@ -1503,7 +1502,12 @@ int netif_receive_skb(struct sk_buff *sk + #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) + if (skb->dev->br_port != NULL && br_handle_frame_hook != NULL && + skb->pkt_type != PACKET_LOOPBACK) { +- return handle_bridge(skb, pt_prev); ++ int ret; ++ ++ ret = handle_bridge(skb, pt_prev); ++ if (br_handle_frame_hook(skb) == 0) ++ return ret; ++ pt_prev = NULL; + } + #endif + +--- linux-2.4.29/net/bridge/br_input.c 2003-08-25 13:44:44.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/net/bridge/br_input.c 2005-03-14 00:00:29.000000000 +0100 +@@ -24,6 +24,9 @@ unsigned char bridge_ula[6] = { 0x01, 0x + + static int br_pass_frame_up_finish(struct sk_buff *skb) + { ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug = 0; ++#endif + netif_rx(skb); + + return 0; +@@ -46,7 +49,7 @@ static void br_pass_frame_up(struct net_ + br_pass_frame_up_finish); + } + +-static int br_handle_frame_finish(struct sk_buff *skb) ++int br_handle_frame_finish(struct sk_buff *skb) + { + struct net_bridge *br; + unsigned char *dest; +@@ -112,7 +115,7 @@ err_nolock: + return 0; + } + +-void br_handle_frame(struct sk_buff *skb) ++int br_handle_frame(struct sk_buff *skb) + { + struct net_bridge *br; + unsigned char *dest; +@@ -146,26 +149,35 @@ void br_handle_frame(struct sk_buff *skb + goto handle_special_frame; + + if (p->state == BR_STATE_FORWARDING) { ++ if (br_should_route_hook && br_should_route_hook(&skb)) { ++ read_unlock(&br->lock); ++ return -1; ++ } ++ ++ if (!memcmp(p->br->dev.dev_addr, dest, ETH_ALEN)) ++ skb->pkt_type = PACKET_HOST; ++ + NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, + br_handle_frame_finish); + read_unlock(&br->lock); +- return; ++ return 0; + } + + err: + read_unlock(&br->lock); + err_nolock: + kfree_skb(skb); +- return; ++ return 0; + + handle_special_frame: + if (!dest[5]) { + NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,NULL, + br_stp_handle_bpdu); + read_unlock(&br->lock); +- return; ++ return 0; + } + + read_unlock(&br->lock); + kfree_skb(skb); ++ return 0; + } +--- linux-2.4.29/net/bridge/br_forward.c 2003-11-28 19:26:21.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/br_forward.c 2005-03-14 00:00:29.000000000 +0100 +@@ -30,18 +30,21 @@ static inline int should_deliver(struct + return 1; + } + +-static int __dev_queue_push_xmit(struct sk_buff *skb) ++int br_dev_queue_push_xmit(struct sk_buff *skb) + { ++#ifdef CONFIG_NETFILTER ++ nf_bridge_maybe_copy_header(skb); ++#endif + skb_push(skb, ETH_HLEN); + dev_queue_xmit(skb); + + return 0; + } + +-static int __br_forward_finish(struct sk_buff *skb) ++int br_forward_finish(struct sk_buff *skb) + { + NF_HOOK(PF_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev, +- __dev_queue_push_xmit); ++ br_dev_queue_push_xmit); + + return 0; + } +@@ -49,8 +52,11 @@ static int __br_forward_finish(struct sk + static void __br_deliver(struct net_bridge_port *to, struct sk_buff *skb) + { + skb->dev = to->dev; ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug = 0; ++#endif + NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, +- __br_forward_finish); ++ br_forward_finish); + } + + static void __br_forward(struct net_bridge_port *to, struct sk_buff *skb) +@@ -62,7 +68,7 @@ static void __br_forward(struct net_brid + skb->ip_summed = CHECKSUM_NONE; + + NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev, +- __br_forward_finish); ++ br_forward_finish); + } + + /* called under bridge lock */ +--- linux-2.4.29/net/bridge/br.c 2004-08-08 01:26:06.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/net/bridge/br.c 2005-03-14 00:00:29.000000000 +0100 +@@ -30,6 +30,8 @@ + #include "../atm/lec.h" + #endif + ++int (*br_should_route_hook) (struct sk_buff **pskb) = NULL; ++ + void br_dec_use_count() + { + MOD_DEC_USE_COUNT; +@@ -44,6 +46,10 @@ static int __init br_init(void) + { + printk(KERN_INFO "NET4: Ethernet Bridge 008 for NET4.0\n"); + ++#ifdef CONFIG_NETFILTER ++ if (br_netfilter_init()) ++ return 1; ++#endif + br_handle_frame_hook = br_handle_frame; + br_ioctl_hook = br_ioctl_deviceless_stub; + #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) +@@ -57,6 +63,9 @@ static int __init br_init(void) + + static void __exit br_deinit(void) + { ++#ifdef CONFIG_NETFILTER ++ br_netfilter_fini(); ++#endif + unregister_netdevice_notifier(&br_device_notifier); + + rtnl_lock(); +@@ -73,7 +82,7 @@ static void __exit br_deinit(void) + #endif + } + +-EXPORT_NO_SYMBOLS; ++EXPORT_SYMBOL(br_should_route_hook); + + module_init(br_init) + module_exit(br_deinit) +--- linux-2.4.29/net/bridge/Makefile 2000-12-29 23:07:24.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/Makefile 2005-03-14 00:00:29.000000000 +0100 +@@ -7,10 +7,17 @@ + # + # Note 2! The CFLAGS definition is now in the main makefile... + ++export-objs := br.o ++ + O_TARGET := bridge.o + obj-y := br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \ + br_ioctl.o br_notify.o br_stp.o br_stp_bpdu.o \ + br_stp_if.o br_stp_timer.o ++ ++ifeq ($(CONFIG_NETFILTER),y) ++obj-y += br_netfilter.o ++endif ++ + obj-m := $(O_TARGET) + + include $(TOPDIR)/Rules.make +--- linux-2.4.29/include/linux/netfilter_bridge.h 2001-06-12 04:15:27.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge.h 2005-03-14 21:24:06.000000000 +0100 +@@ -6,6 +6,10 @@ + + #include <linux/config.h> + #include <linux/netfilter.h> ++#if defined(__KERNEL__) && defined(CONFIG_NETFILTER) ++#include <asm/atomic.h> ++#include <linux/if_ether.h> ++#endif + + /* Bridge Hooks */ + /* After promisc drops, checksum checks. */ +@@ -18,7 +22,76 @@ + #define NF_BR_LOCAL_OUT 3 + /* Packets about to hit the wire. */ + #define NF_BR_POST_ROUTING 4 +-#define NF_BR_NUMHOOKS 5 ++/* Not really a hook, but used for the ebtables broute table */ ++#define NF_BR_BROUTING 5 ++#define NF_BR_NUMHOOKS 6 ++ ++#ifdef __KERNEL__ ++ ++#define BRNF_PKT_TYPE 0x01 ++#define BRNF_BRIDGED_DNAT 0x02 ++#define BRNF_DONT_TAKE_PARENT 0x04 ++#define BRNF_BRIDGED 0x08 ++#define BRNF_NF_BRIDGE_PREROUTING 0x10 ++ ++enum nf_br_hook_priorities { ++ NF_BR_PRI_FIRST = INT_MIN, ++ NF_BR_PRI_NAT_DST_BRIDGED = -300, ++ NF_BR_PRI_FILTER_BRIDGED = -200, ++ NF_BR_PRI_BRNF = 0, ++ NF_BR_PRI_NAT_DST_OTHER = 100, ++ NF_BR_PRI_FILTER_OTHER = 200, ++ NF_BR_PRI_NAT_SRC = 300, ++ NF_BR_PRI_LAST = INT_MAX, ++}; ++ ++#ifdef CONFIG_NETFILTER ++static inline ++struct nf_bridge_info *nf_bridge_alloc(struct sk_buff *skb) ++{ ++ struct nf_bridge_info **nf_bridge = &(skb->nf_bridge); ++ ++ if ((*nf_bridge = kmalloc(sizeof(**nf_bridge), GFP_ATOMIC)) != NULL) { ++ atomic_set(&(*nf_bridge)->use, 1); ++ (*nf_bridge)->mask = 0; ++ (*nf_bridge)->physindev = (*nf_bridge)->physoutdev = NULL; ++#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) ++ (*nf_bridge)->netoutdev = NULL; ++#endif ++ } ++ ++ return *nf_bridge; ++} ++ ++/* Only used in br_forward.c */ ++static inline ++void nf_bridge_maybe_copy_header(struct sk_buff *skb) ++{ ++ if (skb->nf_bridge) { ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ memcpy(skb->data - 18, skb->nf_bridge->data, 18); ++ skb_push(skb, 4); ++ } else ++ memcpy(skb->data - 16, skb->nf_bridge->data, 16); ++ } ++} ++ ++static inline ++void nf_bridge_save_header(struct sk_buff *skb) ++{ ++ int header_size = 16; ++ ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) ++ header_size = 18; ++ memcpy(skb->nf_bridge->data, skb->data - header_size, header_size); ++} + ++struct bridge_skb_cb { ++ union { ++ __u32 ipv4; ++ } daddr; ++}; ++#endif /* CONFIG_NETFILTER */ + ++#endif /* __KERNEL__ */ + #endif +--- linux-2.4.29/include/linux/netfilter_ipv4/ip_tables.h 2004-08-08 01:26:06.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_ipv4/ip_tables.h 2005-03-14 21:24:28.000000000 +0100 +@@ -159,7 +159,7 @@ struct ipt_entry + #define IPT_CONTINUE 0xFFFFFFFF + + /* For standard target */ +-#define IPT_RETURN (-NF_MAX_VERDICT - 1) ++#define IPT_RETURN (-NF_REPEAT - 1) + + /* TCP matching stuff */ + struct ipt_tcp +--- linux-2.4.29/include/linux/netfilter_ipv6/ip6_tables.h 2004-08-08 01:26:06.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_ipv6/ip6_tables.h 2005-03-14 00:00:29.000000000 +0100 +@@ -167,7 +167,7 @@ struct ip6t_entry + #define IP6T_CONTINUE 0xFFFFFFFF + + /* For standard target */ +-#define IP6T_RETURN (-NF_MAX_VERDICT - 1) ++#define IP6T_RETURN (-NF_REPEAT - 1) + + /* TCP matching stuff */ + struct ip6t_tcp +--- linux-2.4.29/include/linux/netfilter_arp/arp_tables.h 2003-08-25 13:44:44.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_arp/arp_tables.h 2005-03-14 21:24:31.000000000 +0100 +@@ -154,7 +154,7 @@ struct arpt_entry + #define ARPT_CONTINUE 0xFFFFFFFF + + /* For standard target */ +-#define ARPT_RETURN (-NF_MAX_VERDICT - 1) ++#define ARPT_RETURN (-NF_REPEAT - 1) + + /* The argument to ARPT_SO_GET_INFO */ + struct arpt_getinfo +--- linux-2.4.29/net/Makefile 2004-08-08 01:26:06.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/net/Makefile 2005-03-14 00:00:29.000000000 +0100 +@@ -7,7 +7,8 @@ + + O_TARGET := network.o + +-mod-subdirs := ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched core sctp 802 ++mod-subdirs := ipv4/netfilter ipv6/netfilter bridge/netfilter ipx irda \ ++ bluetooth atm netlink sched core sctp 802 + export-objs := netsyms.o + + subdir-y := core ethernet +@@ -27,6 +28,12 @@ subdir-$(CONFIG_NETFILTER) += ipv6/netfi + endif + endif + ++ifneq ($(CONFIG_BRIDGE),n) ++ifneq ($(CONFIG_BRIDGE),) ++subdir-$(CONFIG_BRIDGE) += bridge/netfilter ++endif ++endif ++ + subdir-$(CONFIG_KHTTPD) += khttpd + subdir-$(CONFIG_PACKET) += packet + subdir-$(CONFIG_NET_SCHED) += sched +--- linux-2.4.29/net/Config.in 2005-01-19 15:10:13.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/net/Config.in 2005-03-14 00:00:29.000000000 +0100 +@@ -70,6 +70,9 @@ if [ "$CONFIG_DECNET" != "n" ]; then + source net/decnet/Config.in + fi + dep_tristate '802.1d Ethernet Bridging' CONFIG_BRIDGE $CONFIG_INET ++if [ "$CONFIG_BRIDGE" != "n" -a "$CONFIG_NETFILTER" != "n" ]; then ++ source net/bridge/netfilter/Config.in ++fi + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25 + tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/Makefile 2005-03-14 00:00:29.000000000 +0100 +@@ -0,0 +1,34 @@ ++# ++# Makefile for the netfilter modules on top of bridging. ++# ++# Note! Dependencies are done automagically by 'make dep', which also ++# removes any old dependencies. DON'T put your own dependencies here ++# unless it's something special (ie not a .c file). ++# ++# Note 2! The CFLAGS definition is now in the main makefile... ++ ++O_TARGET := netfilter.o ++ ++export-objs := ebtables.o ++ ++obj-$(CONFIG_BRIDGE_NF_EBTABLES) += ebtables.o ++obj-$(CONFIG_BRIDGE_EBT_T_FILTER) += ebtable_filter.o ++obj-$(CONFIG_BRIDGE_EBT_T_NAT) += ebtable_nat.o ++obj-$(CONFIG_BRIDGE_EBT_BROUTE) += ebtable_broute.o ++obj-$(CONFIG_BRIDGE_EBT_802_3) += ebt_802_3.o ++obj-$(CONFIG_BRIDGE_EBT_ARPF) += ebt_arp.o ++obj-$(CONFIG_BRIDGE_EBT_AMONG) += ebt_among.o ++obj-$(CONFIG_BRIDGE_EBT_IPF) += ebt_ip.o ++obj-$(CONFIG_BRIDGE_EBT_LIMIT) += ebt_limit.o ++obj-$(CONFIG_BRIDGE_EBT_MARKF) += ebt_mark_m.o ++obj-$(CONFIG_BRIDGE_EBT_PKTTYPE) += ebt_pkttype.o ++obj-$(CONFIG_BRIDGE_EBT_STP) += ebt_stp.o ++obj-$(CONFIG_BRIDGE_EBT_VLANF) += ebt_vlan.o ++obj-$(CONFIG_BRIDGE_EBT_LOG) += ebt_log.o ++obj-$(CONFIG_BRIDGE_EBT_LOG) += ebt_ulog.o ++obj-$(CONFIG_BRIDGE_EBT_ARPREPLY) += ebt_arpreply.o ++obj-$(CONFIG_BRIDGE_EBT_DNAT) += ebt_dnat.o ++obj-$(CONFIG_BRIDGE_EBT_MARK_T) += ebt_mark.o ++obj-$(CONFIG_BRIDGE_EBT_REDIRECT) += ebt_redirect.o ++obj-$(CONFIG_BRIDGE_EBT_SNAT) += ebt_snat.o ++include $(TOPDIR)/Rules.make +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/Config.in 2005-03-14 00:00:29.000000000 +0100 +@@ -0,0 +1,23 @@ ++# ++# Bridge netfilter configuration ++# ++dep_tristate ' Bridge: ebtables' CONFIG_BRIDGE_NF_EBTABLES $CONFIG_BRIDGE ++dep_tristate ' ebt: filter table support' CONFIG_BRIDGE_EBT_T_FILTER $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: nat table support' CONFIG_BRIDGE_EBT_T_NAT $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: broute table support' CONFIG_BRIDGE_EBT_BROUTE $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: log support' CONFIG_BRIDGE_EBT_LOG $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: ulog support' CONFIG_BRIDGE_EBT_LOG $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: IP filter support' CONFIG_BRIDGE_EBT_IPF $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: ARP filter support' CONFIG_BRIDGE_EBT_ARPF $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: among filter support' CONFIG_BRIDGE_EBT_AMONG $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: limit filter support' CONFIG_BRIDGE_EBT_LIMIT $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: 802.1Q VLAN filter support' CONFIG_BRIDGE_EBT_VLANF $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: 802.3 filter support' CONFIG_BRIDGE_EBT_802_3 $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: packet type filter support' CONFIG_BRIDGE_EBT_PKTTYPE $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: STP filter support' CONFIG_BRIDGE_EBT_STP $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: mark filter support' CONFIG_BRIDGE_EBT_MARKF $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: arp reply target support' CONFIG_BRIDGE_EBT_ARPREPLY $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: snat target support' CONFIG_BRIDGE_EBT_SNAT $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: dnat target support' CONFIG_BRIDGE_EBT_DNAT $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: redirect target support' CONFIG_BRIDGE_EBT_REDIRECT $CONFIG_BRIDGE_NF_EBTABLES ++dep_tristate ' ebt: mark target support' CONFIG_BRIDGE_EBT_MARK_T $CONFIG_BRIDGE_NF_EBTABLES +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebtable_filter.c 2005-03-14 00:00:29.000000000 +0100 +@@ -0,0 +1,90 @@ ++/* ++ * ebtable_filter ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * April, 2002 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/module.h> ++ ++#define FILTER_VALID_HOOKS ((1 << NF_BR_LOCAL_IN) | (1 << NF_BR_FORWARD) | \ ++ (1 << NF_BR_LOCAL_OUT)) ++ ++static struct ebt_entries initial_chains[] = ++{ ++ {0, "INPUT", 0, EBT_ACCEPT, 0}, ++ {0, "FORWARD", 0, EBT_ACCEPT, 0}, ++ {0, "OUTPUT", 0, EBT_ACCEPT, 0} ++}; ++ ++static struct ebt_replace initial_table = ++{ ++ "filter", FILTER_VALID_HOOKS, 0, 3 * sizeof(struct ebt_entries), ++ { [NF_BR_LOCAL_IN]&initial_chains[0], [NF_BR_FORWARD]&initial_chains[1], ++ [NF_BR_LOCAL_OUT]&initial_chains[2] }, 0, NULL, (char *)initial_chains ++}; ++ ++static int check(const struct ebt_table_info *info, unsigned int valid_hooks) ++{ ++ if (valid_hooks & ~FILTER_VALID_HOOKS) ++ return -EINVAL; ++ return 0; ++} ++ ++static struct ebt_table frame_filter = ++{ ++ {NULL, NULL}, "filter", &initial_table, FILTER_VALID_HOOKS, ++ RW_LOCK_UNLOCKED, check, NULL ++}; ++ ++static unsigned int ++ebt_hook (unsigned int hook, struct sk_buff **pskb, const struct net_device *in, ++ const struct net_device *out, int (*okfn)(struct sk_buff *)) ++{ ++ return ebt_do_table(hook, pskb, in, out, &frame_filter); ++} ++ ++static struct nf_hook_ops ebt_ops_filter[] = { ++ { { NULL, NULL }, ebt_hook, PF_BRIDGE, NF_BR_LOCAL_IN, ++ NF_BR_PRI_FILTER_BRIDGED}, ++ { { NULL, NULL }, ebt_hook, PF_BRIDGE, NF_BR_FORWARD, ++ NF_BR_PRI_FILTER_BRIDGED}, ++ { { NULL, NULL }, ebt_hook, PF_BRIDGE, NF_BR_LOCAL_OUT, ++ NF_BR_PRI_FILTER_OTHER} ++}; ++ ++static int __init init(void) ++{ ++ int i, j, ret; ++ ++ ret = ebt_register_table(&frame_filter); ++ if (ret < 0) ++ return ret; ++ for (i = 0; i < sizeof(ebt_ops_filter) / sizeof(ebt_ops_filter[0]); i++) ++ if ((ret = nf_register_hook(&ebt_ops_filter[i])) < 0) ++ goto cleanup; ++ return ret; ++cleanup: ++ for (j = 0; j < i; j++) ++ nf_unregister_hook(&ebt_ops_filter[j]); ++ ebt_unregister_table(&frame_filter); ++ return ret; ++} ++ ++static void __exit fini(void) ++{ ++ int i; ++ ++ for (i = 0; i < sizeof(ebt_ops_filter) / sizeof(ebt_ops_filter[0]); i++) ++ nf_unregister_hook(&ebt_ops_filter[i]); ++ ebt_unregister_table(&frame_filter); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebtable_nat.c 2005-03-14 00:00:29.000000000 +0100 +@@ -0,0 +1,96 @@ ++/* ++ * ebtable_nat ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * April, 2002 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/module.h> ++#define NAT_VALID_HOOKS ((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT) | \ ++ (1 << NF_BR_POST_ROUTING)) ++ ++static struct ebt_entries initial_chains[] = ++{ ++ {0, "PREROUTING", 0, EBT_ACCEPT, 0}, ++ {0, "OUTPUT", 0, EBT_ACCEPT, 0}, ++ {0, "POSTROUTING", 0, EBT_ACCEPT, 0} ++}; ++ ++static struct ebt_replace initial_table = ++{ ++ "nat", NAT_VALID_HOOKS, 0, 3 * sizeof(struct ebt_entries), ++ { [NF_BR_PRE_ROUTING]&initial_chains[0], [NF_BR_LOCAL_OUT]&initial_chains[1], ++ [NF_BR_POST_ROUTING]&initial_chains[2] }, 0, NULL, (char *)initial_chains ++}; ++ ++static int check(const struct ebt_table_info *info, unsigned int valid_hooks) ++{ ++ if (valid_hooks & ~NAT_VALID_HOOKS) ++ return -EINVAL; ++ return 0; ++} ++ ++static struct ebt_table frame_nat = ++{ ++ {NULL, NULL}, "nat", &initial_table, NAT_VALID_HOOKS, ++ RW_LOCK_UNLOCKED, check, NULL ++}; ++ ++static unsigned int ++ebt_nat_dst(unsigned int hook, struct sk_buff **pskb, const struct net_device *in ++ , const struct net_device *out, int (*okfn)(struct sk_buff *)) ++{ ++ return ebt_do_table(hook, pskb, in, out, &frame_nat); ++} ++ ++static unsigned int ++ebt_nat_src(unsigned int hook, struct sk_buff **pskb, const struct net_device *in ++ , const struct net_device *out, int (*okfn)(struct sk_buff *)) ++{ ++ return ebt_do_table(hook, pskb, in, out, &frame_nat); ++} ++ ++static struct nf_hook_ops ebt_ops_nat[] = { ++ { { NULL, NULL }, ebt_nat_dst, PF_BRIDGE, NF_BR_LOCAL_OUT, ++ NF_BR_PRI_NAT_DST_OTHER}, ++ { { NULL, NULL }, ebt_nat_src, PF_BRIDGE, NF_BR_POST_ROUTING, ++ NF_BR_PRI_NAT_SRC}, ++ { { NULL, NULL }, ebt_nat_dst, PF_BRIDGE, NF_BR_PRE_ROUTING, ++ NF_BR_PRI_NAT_DST_BRIDGED}, ++}; ++ ++static int __init init(void) ++{ ++ int i, ret, j; ++ ++ ret = ebt_register_table(&frame_nat); ++ if (ret < 0) ++ return ret; ++ for (i = 0; i < sizeof(ebt_ops_nat) / sizeof(ebt_ops_nat[0]); i++) ++ if ((ret = nf_register_hook(&ebt_ops_nat[i])) < 0) ++ goto cleanup; ++ return ret; ++cleanup: ++ for (j = 0; j < i; j++) ++ nf_unregister_hook(&ebt_ops_nat[j]); ++ ebt_unregister_table(&frame_nat); ++ return ret; ++} ++ ++static void __exit fini(void) ++{ ++ int i; ++ ++ for (i = 0; i < sizeof(ebt_ops_nat) / sizeof(ebt_ops_nat[0]); i++) ++ nf_unregister_hook(&ebt_ops_nat[i]); ++ ebt_unregister_table(&frame_nat); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebtable_broute.c 2005-03-14 00:00:29.000000000 +0100 +@@ -0,0 +1,79 @@ ++/* ++ * ebtable_broute ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * April, 2002 ++ * ++ * This table lets you choose between routing and bridging for frames ++ * entering on a bridge enslaved nic. This table is traversed before any ++ * other ebtables table. See net/bridge/br_input.c. ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/module.h> ++#include <linux/if_bridge.h> ++#include <linux/brlock.h> ++ ++// EBT_ACCEPT means the frame will be bridged ++// EBT_DROP means the frame will be routed ++static struct ebt_entries initial_chain = ++ {0, "BROUTING", 0, EBT_ACCEPT, 0}; ++ ++static struct ebt_replace initial_table = ++{ ++ "broute", 1 << NF_BR_BROUTING, 0, sizeof(struct ebt_entries), ++ { [NF_BR_BROUTING]&initial_chain}, 0, NULL, (char *)&initial_chain ++}; ++ ++static int check(const struct ebt_table_info *info, unsigned int valid_hooks) ++{ ++ if (valid_hooks & ~(1 << NF_BR_BROUTING)) ++ return -EINVAL; ++ return 0; ++} ++ ++static struct ebt_table broute_table = ++{ ++ {NULL, NULL}, "broute", &initial_table, 1 << NF_BR_BROUTING, ++ RW_LOCK_UNLOCKED, check, NULL ++}; ++ ++static int ebt_broute(struct sk_buff **pskb) ++{ ++ int ret; ++ ++ ret = ebt_do_table(NF_BR_BROUTING, pskb, (*pskb)->dev, NULL, ++ &broute_table); ++ if (ret == NF_DROP) ++ return 1; // route it ++ return 0; // bridge it ++} ++ ++static int __init init(void) ++{ ++ int ret; ++ ++ ret = ebt_register_table(&broute_table); ++ if (ret < 0) ++ return ret; ++ br_write_lock_bh(BR_NETPROTO_LOCK); ++ // see br_input.c ++ br_should_route_hook = ebt_broute; ++ br_write_unlock_bh(BR_NETPROTO_LOCK); ++ return ret; ++} ++ ++static void __exit fini(void) ++{ ++ br_write_lock_bh(BR_NETPROTO_LOCK); ++ br_should_route_hook = NULL; ++ br_write_unlock_bh(BR_NETPROTO_LOCK); ++ ebt_unregister_table(&broute_table); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_among.c 2005-03-14 00:00:29.000000000 +0100 +@@ -0,0 +1,223 @@ ++/* ++ * ebt_among ++ * ++ * Authors: ++ * Grzegorz Borowiak <grzes@gnu.univ.gda.pl> ++ * ++ * August, 2003 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_among.h> ++#include <linux/ip.h> ++#include <linux/if_arp.h> ++#include <linux/module.h> ++ ++static int ebt_mac_wormhash_contains(const struct ebt_mac_wormhash *wh, ++ const char *mac, uint32_t ip) ++{ ++ /* You may be puzzled as to how this code works. ++ * Some tricks were used, refer to ++ * include/linux/netfilter_bridge/ebt_among.h ++ * as there you can find a solution of this mystery. ++ */ ++ const struct ebt_mac_wormhash_tuple *p; ++ int start, limit, i; ++ uint32_t cmp[2] = { 0, 0 }; ++ int key = (const unsigned char) mac[5]; ++ ++ memcpy(((char *) cmp) + 2, mac, 6); ++ start = wh->table[key]; ++ limit = wh->table[key + 1]; ++ if (ip) { ++ for (i = start; i < limit; i++) { ++ p = &wh->pool[i]; ++ if (cmp[1] == p->cmp[1] && cmp[0] == p->cmp[0]) { ++ if (p->ip == 0 || p->ip == ip) { ++ return 1; ++ } ++ } ++ } ++ } else { ++ for (i = start; i < limit; i++) { ++ p = &wh->pool[i]; ++ if (cmp[1] == p->cmp[1] && cmp[0] == p->cmp[0]) { ++ if (p->ip == 0) { ++ return 1; ++ } ++ } ++ } ++ } ++ return 0; ++} ++ ++static int ebt_mac_wormhash_check_integrity(const struct ebt_mac_wormhash ++ *wh) ++{ ++ int i; ++ ++ for (i = 0; i < 256; i++) { ++ if (wh->table[i] > wh->table[i + 1]) ++ return -0x100 - i; ++ if (wh->table[i] < 0) ++ return -0x200 - i; ++ if (wh->table[i] > wh->poolsize) ++ return -0x300 - i; ++ } ++ if (wh->table[256] > wh->poolsize) ++ return -0xc00; ++ return 0; ++} ++ ++static int get_ip_dst(const struct sk_buff *skb, uint32_t * addr) ++{ ++ if (skb->mac.ethernet->h_proto == __constant_htons(ETH_P_IP)) ++ *addr = skb->nh.iph->daddr; ++ else if (skb->mac.ethernet->h_proto == __constant_htons(ETH_P_ARP)) { ++ uint32_t arp_len = sizeof(struct arphdr) + ++ (2 * (((*skb).nh.arph)->ar_hln)) + ++ (2 * (((*skb).nh.arph)->ar_pln)); ++ ++ /* Make sure the packet is long enough. */ ++ if ((((*skb).nh.raw) + arp_len) > (*skb).tail) ++ return -1; ++ /* IPv4 addresses are always 4 bytes. */ ++ if (((*skb).nh.arph)->ar_pln != sizeof(uint32_t)) ++ return -1; ++ ++ memcpy(addr, ((*skb).nh.raw) + sizeof(struct arphdr) + ++ (2 * (((*skb).nh.arph)->ar_hln)) + ++ (((*skb).nh.arph)->ar_pln), sizeof(uint32_t)); ++ ++ } ++ return 0; ++} ++ ++static int get_ip_src(const struct sk_buff *skb, uint32_t * addr) ++{ ++ if (skb->mac.ethernet->h_proto == __constant_htons(ETH_P_IP)) ++ *addr = skb->nh.iph->saddr; ++ else if (skb->mac.ethernet->h_proto == __constant_htons(ETH_P_ARP)) { ++ uint32_t arp_len = sizeof(struct arphdr) + ++ (2 * (((*skb).nh.arph)->ar_hln)) + ++ (2 * (((*skb).nh.arph)->ar_pln)); ++ ++ /* Make sure the packet is long enough. */ ++ if ((((*skb).nh.raw) + arp_len) > (*skb).tail) ++ return -1; ++ /* IPv4 addresses are always 4 bytes. */ ++ if (((*skb).nh.arph)->ar_pln != sizeof(uint32_t)) ++ return -1; ++ ++ memcpy(addr, ((*skb).nh.raw) + sizeof(struct arphdr) + ++ ((((*skb).nh.arph)->ar_hln)), sizeof(uint32_t)); ++ ++ } ++ return 0; ++} ++ ++static int ebt_filter_among(const struct sk_buff *skb, ++ const struct net_device *in, ++ const struct net_device *out, const void *data, ++ unsigned int datalen) ++{ ++ struct ebt_among_info *info = (struct ebt_among_info *) data; ++ const char *dmac, *smac; ++ const struct ebt_mac_wormhash *wh_dst, *wh_src; ++ uint32_t dip = 0, sip = 0; ++ ++ wh_dst = ebt_among_wh_dst(info); ++ wh_src = ebt_among_wh_src(info); ++ ++ if (wh_src) { ++ smac = skb->mac.ethernet->h_source; ++ if (get_ip_src(skb, &sip)) ++ return EBT_NOMATCH; ++ if (!(info->bitmask & EBT_AMONG_SRC_NEG)) { ++ /* we match only if it contains */ ++ if (!ebt_mac_wormhash_contains(wh_src, smac, sip)) ++ return EBT_NOMATCH; ++ } else { ++ /* we match only if it DOES NOT contain */ ++ if (ebt_mac_wormhash_contains(wh_src, smac, sip)) ++ return EBT_NOMATCH; ++ } ++ } ++ ++ if (wh_dst) { ++ dmac = skb->mac.ethernet->h_dest; ++ if (get_ip_dst(skb, &dip)) ++ return EBT_NOMATCH; ++ if (!(info->bitmask & EBT_AMONG_DST_NEG)) { ++ /* we match only if it contains */ ++ if (!ebt_mac_wormhash_contains(wh_dst, dmac, dip)) ++ return EBT_NOMATCH; ++ } else { ++ /* we match only if it DOES NOT contain */ ++ if (ebt_mac_wormhash_contains(wh_dst, dmac, dip)) ++ return EBT_NOMATCH; ++ } ++ } ++ ++ return EBT_MATCH; ++} ++ ++static int ebt_among_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, ++ unsigned int datalen) ++{ ++ struct ebt_among_info *info = (struct ebt_among_info *) data; ++ int expected_length = sizeof(struct ebt_among_info); ++ const struct ebt_mac_wormhash *wh_dst, *wh_src; ++ int err; ++ ++ wh_dst = ebt_among_wh_dst(info); ++ wh_src = ebt_among_wh_src(info); ++ expected_length += ebt_mac_wormhash_size(wh_dst); ++ expected_length += ebt_mac_wormhash_size(wh_src); ++ ++ if (datalen != EBT_ALIGN(expected_length)) { ++ printk(KERN_WARNING ++ "ebtables: among: wrong size: %d" ++ "against expected %d, rounded to %d\n", ++ datalen, expected_length, ++ EBT_ALIGN(expected_length)); ++ return -EINVAL; ++ } ++ if (wh_dst && (err = ebt_mac_wormhash_check_integrity(wh_dst))) { ++ printk(KERN_WARNING ++ "ebtables: among: dst integrity fail: %x\n", -err); ++ return -EINVAL; ++ } ++ if (wh_src && (err = ebt_mac_wormhash_check_integrity(wh_src))) { ++ printk(KERN_WARNING ++ "ebtables: among: src integrity fail: %x\n", -err); ++ return -EINVAL; ++ } ++ return 0; ++} ++ ++static struct ebt_match filter_among = { ++ {NULL, NULL}, ++ EBT_AMONG_MATCH, ++ ebt_filter_among, ++ ebt_among_check, ++ NULL, ++ THIS_MODULE ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_match(&filter_among); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_match(&filter_among); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_limit.c 2005-03-14 00:00:29.000000000 +0100 +@@ -0,0 +1,101 @@ ++/* ++ * ebt_limit ++ * ++ * Authors: ++ * Tom Marshall <tommy@home.tig-grr.com> ++ * ++ * Mostly copied from netfilter's ipt_limit.c, see that file for explanation ++ * ++ * September, 2003 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_limit.h> ++#include <linux/module.h> ++ ++#include <linux/netdevice.h> ++#include <linux/spinlock.h> ++ ++static spinlock_t limit_lock = SPIN_LOCK_UNLOCKED; ++ ++#define CREDITS_PER_JIFFY 128 ++ ++static int ebt_limit_match(const struct sk_buff *skb, const struct net_device *in, ++ const struct net_device *out, const void *data, unsigned int datalen) ++{ ++ struct ebt_limit_info *info = (struct ebt_limit_info *)data; ++ unsigned long now = jiffies; ++ ++ spin_lock_bh(&limit_lock); ++ info->credit += (now - xchg(&info->prev, now)) * CREDITS_PER_JIFFY; ++ if (info->credit > info->credit_cap) ++ info->credit = info->credit_cap; ++ ++ if (info->credit >= info->cost) { ++ /* We're not limited. */ ++ info->credit -= info->cost; ++ spin_unlock_bh(&limit_lock); ++ return EBT_MATCH; ++ } ++ ++ spin_unlock_bh(&limit_lock); ++ return EBT_NOMATCH; ++} ++ ++/* Precision saver. */ ++static u_int32_t ++user2credits(u_int32_t user) ++{ ++ /* If multiplying would overflow... */ ++ if (user > 0xFFFFFFFF / (HZ*CREDITS_PER_JIFFY)) ++ /* Divide first. */ ++ return (user / EBT_LIMIT_SCALE) * HZ * CREDITS_PER_JIFFY; ++ ++ return (user * HZ * CREDITS_PER_JIFFY) / EBT_LIMIT_SCALE; ++} ++ ++static int ebt_limit_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_limit_info *info = (struct ebt_limit_info *)data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_limit_info))) ++ return -EINVAL; ++ ++ /* Check for overflow. */ ++ if (info->burst == 0 ++ || user2credits(info->avg * info->burst) < user2credits(info->avg)) { ++ printk("Overflow in ebt_limit: %u/%u\n", ++ info->avg, info->burst); ++ return -EINVAL; ++ } ++ ++ /* User avg in seconds * EBT_LIMIT_SCALE: convert to jiffies * 128. */ ++ info->prev = jiffies; ++ info->credit = user2credits(info->avg * info->burst); ++ info->credit_cap = user2credits(info->avg * info->burst); ++ info->cost = user2credits(info->avg); ++ return 0; ++} ++ ++static struct ebt_match ebt_limit_reg = ++{ ++ {NULL, NULL}, EBT_LIMIT_MATCH, ebt_limit_match, ebt_limit_check, NULL, ++ THIS_MODULE ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_match(&ebt_limit_reg); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_match(&ebt_limit_reg); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_arpreply.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,86 @@ ++/* ++ * ebt_arpreply ++ * ++ * Authors: ++ * Grzegorz Borowiak <grzes@gnu.univ.gda.pl> ++ * Bart De Schuymer <bdschuym@pandora.be> ++ * ++ * August, 2003 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_arpreply.h> ++#include <linux/if_arp.h> ++#include <net/arp.h> ++#include <linux/module.h> ++ ++static int ebt_target_reply(struct sk_buff **pskb, unsigned int hooknr, ++ const struct net_device *in, const struct net_device *out, ++ const void *data, unsigned int datalen) ++{ ++ struct ebt_arpreply_info *info = (struct ebt_arpreply_info *)data; ++ struct arphdr *ah; ++ unsigned char *sha, *arp_ptr; ++ u32 sip, tip; ++ ++ ah = (**pskb).nh.arph; ++ if (ah->ar_op != __constant_htons(ARPOP_REQUEST) || ++ ah->ar_hln != ETH_ALEN || ah->ar_pro != htons(ETH_P_IP) || ++ ah->ar_pln != 4) ++ return EBT_CONTINUE; ++ ++ arp_ptr = (unsigned char *)(ah + 1); ++ ++ /* get source and target IP */ ++ sha = arp_ptr; ++ arp_ptr += ETH_ALEN; ++ memcpy(&sip, arp_ptr, 4); ++ arp_ptr += 4 + ETH_ALEN; ++ memcpy(&tip, arp_ptr, 4); ++ ++ arp_send(ARPOP_REPLY, ETH_P_ARP, sip, in, tip, sha, info->mac, sha); ++ ++ return info->target; ++} ++ ++static int ebt_target_reply_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_arpreply_info *info = (struct ebt_arpreply_info *)data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_arpreply_info))) ++ return -EINVAL; ++ if (BASE_CHAIN && info->target == EBT_RETURN) ++ return -EINVAL; ++ if (e->ethproto != __constant_htons(ETH_P_ARP) || ++ e->invflags & EBT_IPROTO) ++ return -EINVAL; ++ CLEAR_BASE_CHAIN_BIT; ++ if (strcmp(tablename, "nat") || hookmask & ~(1 << NF_BR_PRE_ROUTING)) ++ return -EINVAL; ++ return 0; ++} ++ ++static struct ebt_target reply_target = ++{ ++ .name = EBT_ARPREPLY_TARGET, ++ .target = ebt_target_reply, ++ .check = ebt_target_reply_check, ++ .me = THIS_MODULE, ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_target(&reply_target); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_target(&reply_target); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_802_3.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,74 @@ ++/* ++ * 802_3 ++ * ++ * Author: ++ * Chris Vitale csv@bluetail.com ++ * ++ * May 2003 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_802_3.h> ++#include <linux/module.h> ++ ++static int ebt_filter_802_3(const struct sk_buff *skb, const struct net_device *in, ++ const struct net_device *out, const void *data, unsigned int datalen) ++{ ++ struct ebt_802_3_info *info = (struct ebt_802_3_info *)data; ++ struct ebt_802_3_hdr *hdr = (struct ebt_802_3_hdr *)skb->mac.ethernet; ++ uint16_t type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type; ++ ++ if (info->bitmask & EBT_802_3_SAP) { ++ if (FWINV(info->sap != hdr->llc.ui.ssap, EBT_802_3_SAP)) ++ return EBT_NOMATCH; ++ if (FWINV(info->sap != hdr->llc.ui.dsap, EBT_802_3_SAP)) ++ return EBT_NOMATCH; ++ } ++ ++ if (info->bitmask & EBT_802_3_TYPE) { ++ if (!(hdr->llc.ui.dsap == CHECK_TYPE && hdr->llc.ui.ssap == CHECK_TYPE)) ++ return EBT_NOMATCH; ++ if (FWINV(info->type != type, EBT_802_3_TYPE)) ++ return EBT_NOMATCH; ++ } ++ ++ return EBT_MATCH; ++} ++ ++static struct ebt_match filter_802_3; ++static int ebt_802_3_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_802_3_info *info = (struct ebt_802_3_info *)data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_802_3_info))) ++ return -EINVAL; ++ if (info->bitmask & ~EBT_802_3_MASK || info->invflags & ~EBT_802_3_MASK) ++ return -EINVAL; ++ ++ return 0; ++} ++ ++static struct ebt_match filter_802_3 = ++{ ++ .name = EBT_802_3_MATCH, ++ .match = ebt_filter_802_3, ++ .check = ebt_802_3_check, ++ .me = THIS_MODULE, ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_match(&filter_802_3); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_match(&filter_802_3); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_mark.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,66 @@ ++/* ++ * ebt_mark ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * July, 2002 ++ * ++ */ ++ ++// The mark target can be used in any chain ++// I believe adding a mangle table just for marking is total overkill ++// Marking a frame doesn't really change anything in the frame anyway ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_mark_t.h> ++#include <linux/module.h> ++ ++static int ebt_target_mark(struct sk_buff **pskb, unsigned int hooknr, ++ const struct net_device *in, const struct net_device *out, ++ const void *data, unsigned int datalen) ++{ ++ struct ebt_mark_t_info *info = (struct ebt_mark_t_info *)data; ++ ++ if ((*pskb)->nfmark != info->mark) { ++ (*pskb)->nfmark = info->mark; ++ (*pskb)->nfcache |= NFC_ALTERED; ++ } ++ return info->target; ++} ++ ++static int ebt_target_mark_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_mark_t_info *info = (struct ebt_mark_t_info *)data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_mark_t_info))) ++ return -EINVAL; ++ if (BASE_CHAIN && info->target == EBT_RETURN) ++ return -EINVAL; ++ CLEAR_BASE_CHAIN_BIT; ++ if (INVALID_TARGET) ++ return -EINVAL; ++ return 0; ++} ++ ++static struct ebt_target mark_target = ++{ ++ {NULL, NULL}, EBT_MARK_TARGET, ebt_target_mark, ++ ebt_target_mark_check, NULL, THIS_MODULE ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_target(&mark_target); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_target(&mark_target); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_mark_m.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,61 @@ ++/* ++ * ebt_mark_m ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * July, 2002 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_mark_m.h> ++#include <linux/module.h> ++ ++static int ebt_filter_mark(const struct sk_buff *skb, ++ const struct net_device *in, const struct net_device *out, const void *data, ++ unsigned int datalen) ++{ ++ struct ebt_mark_m_info *info = (struct ebt_mark_m_info *) data; ++ ++ if (info->bitmask & EBT_MARK_OR) ++ return !(!!(skb->nfmark & info->mask) ^ info->invert); ++ return !(((skb->nfmark & info->mask) == info->mark) ^ info->invert); ++} ++ ++static int ebt_mark_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_mark_m_info *info = (struct ebt_mark_m_info *) data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_mark_m_info))) ++ return -EINVAL; ++ if (info->bitmask & ~EBT_MARK_MASK) ++ return -EINVAL; ++ if ((info->bitmask & EBT_MARK_OR) && (info->bitmask & EBT_MARK_AND)) ++ return -EINVAL; ++ if (!info->bitmask) ++ return -EINVAL; ++ return 0; ++} ++ ++static struct ebt_match filter_mark = ++{ ++ {NULL, NULL}, EBT_MARK_MATCH, ebt_filter_mark, ebt_mark_check, NULL, ++ THIS_MODULE ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_match(&filter_mark); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_match(&filter_mark); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_pkttype.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,60 @@ ++/* ++ * ebt_pkttype ++ * ++ * Authors: ++ * Bart De Schuymer <bdschuym@pandora.be> ++ * ++ * April, 2003 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_pkttype.h> ++#include <linux/module.h> ++ ++static int ebt_filter_pkttype(const struct sk_buff *skb, ++ const struct net_device *in, ++ const struct net_device *out, ++ const void *data, ++ unsigned int datalen) ++{ ++ struct ebt_pkttype_info *info = (struct ebt_pkttype_info *)data; ++ ++ return (skb->pkt_type != info->pkt_type) ^ info->invert; ++} ++ ++static int ebt_pkttype_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_pkttype_info *info = (struct ebt_pkttype_info *)data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_pkttype_info))) ++ return -EINVAL; ++ if (info->invert != 0 && info->invert != 1) ++ return -EINVAL; ++ /* Allow any pkt_type value */ ++ return 0; ++} ++ ++static struct ebt_match filter_pkttype = ++{ ++ .name = EBT_PKTTYPE_MATCH, ++ .match = ebt_filter_pkttype, ++ .check = ebt_pkttype_check, ++ .me = THIS_MODULE, ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_match(&filter_pkttype); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_match(&filter_pkttype); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_stp.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,191 @@ ++/* ++ * ebt_stp ++ * ++ * Authors: ++ * Bart De Schuymer <bdschuym@pandora.be> ++ * Stephen Hemminger <shemminger@osdl.org> ++ * ++ * June, 2003 ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_stp.h> ++#include <linux/module.h> ++ ++#define BPDU_TYPE_CONFIG 0 ++#define BPDU_TYPE_TCN 0x80 ++ ++struct stp_header { ++ uint8_t dsap; ++ uint8_t ssap; ++ uint8_t ctrl; ++ uint8_t pid; ++ uint8_t vers; ++ uint8_t type; ++}; ++ ++struct stp_config_pdu { ++ uint8_t flags; ++ uint8_t root[8]; ++ uint8_t root_cost[4]; ++ uint8_t sender[8]; ++ uint8_t port[2]; ++ uint8_t msg_age[2]; ++ uint8_t max_age[2]; ++ uint8_t hello_time[2]; ++ uint8_t forward_delay[2]; ++}; ++ ++#define NR16(p) (p[0] << 8 | p[1]) ++#define NR32(p) ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]) ++ ++static int ebt_filter_config(struct ebt_stp_info *info, ++ struct stp_config_pdu *stpc) ++{ ++ struct ebt_stp_config_info *c; ++ uint16_t v16; ++ uint32_t v32; ++ int verdict, i; ++ ++ c = &info->config; ++ if ((info->bitmask & EBT_STP_FLAGS) && ++ FWINV(c->flags != stpc->flags, EBT_STP_FLAGS)) ++ return EBT_NOMATCH; ++ if (info->bitmask & EBT_STP_ROOTPRIO) { ++ v16 = NR16(stpc->root); ++ if (FWINV(v16 < c->root_priol || ++ v16 > c->root_priou, EBT_STP_ROOTPRIO)) ++ return EBT_NOMATCH; ++ } ++ if (info->bitmask & EBT_STP_ROOTADDR) { ++ verdict = 0; ++ for (i = 0; i < 6; i++) ++ verdict |= (stpc->root[2+i] ^ c->root_addr[i]) & ++ c->root_addrmsk[i]; ++ if (FWINV(verdict != 0, EBT_STP_ROOTADDR)) ++ return EBT_NOMATCH; ++ } ++ if (info->bitmask & EBT_STP_ROOTCOST) { ++ v32 = NR32(stpc->root_cost); ++ if (FWINV(v32 < c->root_costl || ++ v32 > c->root_costu, EBT_STP_ROOTCOST)) ++ return EBT_NOMATCH; ++ } ++ if (info->bitmask & EBT_STP_SENDERPRIO) { ++ v16 = NR16(stpc->sender); ++ if (FWINV(v16 < c->sender_priol || ++ v16 > c->sender_priou, EBT_STP_SENDERPRIO)) ++ return EBT_NOMATCH; ++ } ++ if (info->bitmask & EBT_STP_SENDERADDR) { ++ verdict = 0; ++ for (i = 0; i < 6; i++) ++ verdict |= (stpc->sender[2+i] ^ c->sender_addr[i]) & ++ c->sender_addrmsk[i]; ++ if (FWINV(verdict != 0, EBT_STP_SENDERADDR)) ++ return EBT_NOMATCH; ++ } ++ if (info->bitmask & EBT_STP_PORT) { ++ v16 = NR16(stpc->port); ++ if (FWINV(v16 < c->portl || ++ v16 > c->portu, EBT_STP_PORT)) ++ return EBT_NOMATCH; ++ } ++ if (info->bitmask & EBT_STP_MSGAGE) { ++ v16 = NR16(stpc->msg_age); ++ if (FWINV(v16 < c->msg_agel || ++ v16 > c->msg_ageu, EBT_STP_MSGAGE)) ++ return EBT_NOMATCH; ++ } ++ if (info->bitmask & EBT_STP_MAXAGE) { ++ v16 = NR16(stpc->max_age); ++ if (FWINV(v16 < c->max_agel || ++ v16 > c->max_ageu, EBT_STP_MAXAGE)) ++ return EBT_NOMATCH; ++ } ++ if (info->bitmask & EBT_STP_HELLOTIME) { ++ v16 = NR16(stpc->hello_time); ++ if (FWINV(v16 < c->hello_timel || ++ v16 > c->hello_timeu, EBT_STP_HELLOTIME)) ++ return EBT_NOMATCH; ++ } ++ if (info->bitmask & EBT_STP_FWDD) { ++ v16 = NR16(stpc->forward_delay); ++ if (FWINV(v16 < c->forward_delayl || ++ v16 > c->forward_delayu, EBT_STP_FWDD)) ++ return EBT_NOMATCH; ++ } ++ return EBT_MATCH; ++} ++ ++static int ebt_filter_stp(const struct sk_buff *skb, const struct net_device *in, ++ const struct net_device *out, const void *data, unsigned int datalen) ++{ ++ struct ebt_stp_info *info = (struct ebt_stp_info *)data; ++ struct stp_header stph; ++ uint8_t header[6] = {0x42, 0x42, 0x03, 0x00, 0x00, 0x00}; ++ if (skb_copy_bits(skb, 0, &stph, sizeof(stph))) ++ return EBT_NOMATCH; ++ ++ /* The stp code only considers these */ ++ if (memcmp(&stph, header, sizeof(header))) ++ return EBT_NOMATCH; ++ ++ if (info->bitmask & EBT_STP_TYPE ++ && FWINV(info->type != stph.type, EBT_STP_TYPE)) ++ return EBT_NOMATCH; ++ ++ if (stph.type == BPDU_TYPE_CONFIG && ++ info->bitmask & EBT_STP_CONFIG_MASK) { ++ struct stp_config_pdu stpc; ++ ++ if (skb_copy_bits(skb, sizeof(stph), &stpc, sizeof(stpc))) ++ return EBT_NOMATCH; ++ return ebt_filter_config(info, &stpc); ++ } ++ return EBT_MATCH; ++} ++ ++static int ebt_stp_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_stp_info *info = (struct ebt_stp_info *)data; ++ int len = EBT_ALIGN(sizeof(struct ebt_stp_info)); ++ uint8_t bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }; ++ uint8_t msk[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; ++ ++ if (info->bitmask & ~EBT_STP_MASK || info->invflags & ~EBT_STP_MASK || ++ !(info->bitmask & EBT_STP_MASK)) ++ return -EINVAL; ++ if (datalen != len) ++ return -EINVAL; ++ /* Make sure the match only receives stp frames */ ++ if (memcmp(e->destmac, bridge_ula, ETH_ALEN) || ++ memcmp(e->destmsk, msk, ETH_ALEN) || !(e->bitmask & EBT_DESTMAC)) ++ return -EINVAL; ++ ++ return 0; ++} ++ ++static struct ebt_match filter_stp = ++{ ++ .name = EBT_STP_MATCH, ++ .match = ebt_filter_stp, ++ .check = ebt_stp_check, ++ .me = THIS_MODULE, ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_match(&filter_stp); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_match(&filter_stp); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_redirect.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,71 @@ ++/* ++ * ebt_redirect ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * April, 2002 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_redirect.h> ++#include <linux/module.h> ++#include <net/sock.h> ++#include "../br_private.h" ++ ++static int ebt_target_redirect(struct sk_buff **pskb, unsigned int hooknr, ++ const struct net_device *in, const struct net_device *out, ++ const void *data, unsigned int datalen) ++{ ++ struct ebt_redirect_info *info = (struct ebt_redirect_info *)data; ++ ++ if (hooknr != NF_BR_BROUTING) ++ memcpy((**pskb).mac.ethernet->h_dest, ++ in->br_port->br->dev.dev_addr, ETH_ALEN); ++ else { ++ memcpy((**pskb).mac.ethernet->h_dest, ++ in->dev_addr, ETH_ALEN); ++ (*pskb)->pkt_type = PACKET_HOST; ++ } ++ return info->target; ++} ++ ++static int ebt_target_redirect_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_redirect_info *info = (struct ebt_redirect_info *)data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_redirect_info))) ++ return -EINVAL; ++ if (BASE_CHAIN && info->target == EBT_RETURN) ++ return -EINVAL; ++ CLEAR_BASE_CHAIN_BIT; ++ if ( (strcmp(tablename, "nat") || hookmask & ~(1 << NF_BR_PRE_ROUTING)) && ++ (strcmp(tablename, "broute") || hookmask & ~(1 << NF_BR_BROUTING)) ) ++ return -EINVAL; ++ if (INVALID_TARGET) ++ return -EINVAL; ++ return 0; ++} ++ ++static struct ebt_target redirect_target = ++{ ++ {NULL, NULL}, EBT_REDIRECT_TARGET, ebt_target_redirect, ++ ebt_target_redirect_check, NULL, THIS_MODULE ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_target(&redirect_target); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_target(&redirect_target); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_arp.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,149 @@ ++/* ++ * ebt_arp ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * Tim Gardner <timg@tpi.com> ++ * ++ * April, 2002 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_arp.h> ++#include <linux/if_arp.h> ++#include <linux/if_ether.h> ++#include <linux/module.h> ++ ++static int ebt_filter_arp(const struct sk_buff *skb, const struct net_device *in, ++ const struct net_device *out, const void *data, unsigned int datalen) ++{ ++ struct ebt_arp_info *info = (struct ebt_arp_info *)data; ++ ++ if (info->bitmask & EBT_ARP_OPCODE && FWINV(info->opcode != ++ ((*skb).nh.arph)->ar_op, EBT_ARP_OPCODE)) ++ return EBT_NOMATCH; ++ if (info->bitmask & EBT_ARP_HTYPE && FWINV(info->htype != ++ ((*skb).nh.arph)->ar_hrd, EBT_ARP_HTYPE)) ++ return EBT_NOMATCH; ++ if (info->bitmask & EBT_ARP_PTYPE && FWINV(info->ptype != ++ ((*skb).nh.arph)->ar_pro, EBT_ARP_PTYPE)) ++ return EBT_NOMATCH; ++ ++ if (info->bitmask & (EBT_ARP_SRC_IP | EBT_ARP_DST_IP)) ++ { ++ uint32_t arp_len = sizeof(struct arphdr) + ++ (2 * (((*skb).nh.arph)->ar_hln)) + ++ (2 * (((*skb).nh.arph)->ar_pln)); ++ uint32_t dst; ++ uint32_t src; ++ ++ // Make sure the packet is long enough. ++ if ((((*skb).nh.raw) + arp_len) > (*skb).tail) ++ return EBT_NOMATCH; ++ // IPv4 addresses are always 4 bytes. ++ if (((*skb).nh.arph)->ar_pln != sizeof(uint32_t)) ++ return EBT_NOMATCH; ++ ++ if (info->bitmask & EBT_ARP_SRC_IP) { ++ memcpy(&src, ((*skb).nh.raw) + sizeof(struct arphdr) + ++ ((*skb).nh.arph)->ar_hln, sizeof(uint32_t)); ++ if (FWINV(info->saddr != (src & info->smsk), ++ EBT_ARP_SRC_IP)) ++ return EBT_NOMATCH; ++ } ++ ++ if (info->bitmask & EBT_ARP_DST_IP) { ++ memcpy(&dst, ((*skb).nh.raw)+sizeof(struct arphdr) + ++ (2*(((*skb).nh.arph)->ar_hln)) + ++ (((*skb).nh.arph)->ar_pln), sizeof(uint32_t)); ++ if (FWINV(info->daddr != (dst & info->dmsk), ++ EBT_ARP_DST_IP)) ++ return EBT_NOMATCH; ++ } ++ } ++ ++ if (info->bitmask & (EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC)) ++ { ++ uint32_t arp_len = sizeof(struct arphdr) + ++ (2 * (((*skb).nh.arph)->ar_hln)) + ++ (2 * (((*skb).nh.arph)->ar_pln)); ++ unsigned char dst[ETH_ALEN]; ++ unsigned char src[ETH_ALEN]; ++ ++ // Make sure the packet is long enough. ++ if ((((*skb).nh.raw) + arp_len) > (*skb).tail) ++ return EBT_NOMATCH; ++ // MAC addresses are 6 bytes. ++ if (((*skb).nh.arph)->ar_hln != ETH_ALEN) ++ return EBT_NOMATCH; ++ if (info->bitmask & EBT_ARP_SRC_MAC) { ++ uint8_t verdict, i; ++ ++ memcpy(&src, ((*skb).nh.raw) + ++ sizeof(struct arphdr), ++ ETH_ALEN); ++ verdict = 0; ++ for (i = 0; i < 6; i++) ++ verdict |= (src[i] ^ info->smaddr[i]) & ++ info->smmsk[i]; ++ if (FWINV(verdict != 0, EBT_ARP_SRC_MAC)) ++ return EBT_NOMATCH; ++ } ++ ++ if (info->bitmask & EBT_ARP_DST_MAC) { ++ uint8_t verdict, i; ++ ++ memcpy(&dst, ((*skb).nh.raw) + ++ sizeof(struct arphdr) + ++ (((*skb).nh.arph)->ar_hln) + ++ (((*skb).nh.arph)->ar_pln), ++ ETH_ALEN); ++ verdict = 0; ++ for (i = 0; i < 6; i++) ++ verdict |= (dst[i] ^ info->dmaddr[i]) & ++ info->dmmsk[i]; ++ if (FWINV(verdict != 0, EBT_ARP_DST_MAC)) ++ return EBT_NOMATCH; ++ } ++ } ++ ++ return EBT_MATCH; ++} ++ ++static int ebt_arp_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_arp_info *info = (struct ebt_arp_info *)data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_arp_info))) ++ return -EINVAL; ++ if ((e->ethproto != __constant_htons(ETH_P_ARP) && ++ e->ethproto != __constant_htons(ETH_P_RARP)) || ++ e->invflags & EBT_IPROTO) ++ return -EINVAL; ++ if (info->bitmask & ~EBT_ARP_MASK || info->invflags & ~EBT_ARP_MASK) ++ return -EINVAL; ++ return 0; ++} ++ ++static struct ebt_match filter_arp = ++{ ++ {NULL, NULL}, EBT_ARP_MATCH, ebt_filter_arp, ebt_arp_check, NULL, ++ THIS_MODULE ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_match(&filter_arp); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_match(&filter_arp); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_ip.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,121 @@ ++/* ++ * ebt_ip ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * April, 2002 ++ * ++ * Changes: ++ * added ip-sport and ip-dport ++ * Innominate Security Technologies AG <mhopf@innominate.com> ++ * September, 2002 ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_ip.h> ++#include <linux/ip.h> ++#include <linux/in.h> ++#include <linux/module.h> ++ ++struct tcpudphdr { ++ uint16_t src; ++ uint16_t dst; ++}; ++ ++union h_u { ++ unsigned char *raw; ++ struct tcpudphdr *tuh; ++}; ++ ++static int ebt_filter_ip(const struct sk_buff *skb, const struct net_device *in, ++ const struct net_device *out, const void *data, ++ unsigned int datalen) ++{ ++ struct ebt_ip_info *info = (struct ebt_ip_info *)data; ++ ++ if (info->bitmask & EBT_IP_TOS && ++ FWINV(info->tos != ((*skb).nh.iph)->tos, EBT_IP_TOS)) ++ return EBT_NOMATCH; ++ if (info->bitmask & EBT_IP_PROTO) { ++ if (FWINV(info->protocol != ((*skb).nh.iph)->protocol, ++ EBT_IP_PROTO)) ++ return EBT_NOMATCH; ++ if ( info->protocol == IPPROTO_TCP || ++ info->protocol == IPPROTO_UDP ) ++ { ++ union h_u h; ++ h.raw = skb->data + skb->nh.iph->ihl*4; ++ if (info->bitmask & EBT_IP_DPORT) { ++ uint16_t port = ntohs(h.tuh->dst); ++ if (FWINV(port < info->dport[0] || ++ port > info->dport[1], ++ EBT_IP_DPORT)) ++ return EBT_NOMATCH; ++ } ++ if (info->bitmask & EBT_IP_SPORT) { ++ uint16_t port = ntohs(h.tuh->src); ++ if (FWINV(port < info->sport[0] || ++ port > info->sport[1], ++ EBT_IP_SPORT)) ++ return EBT_NOMATCH; ++ } ++ } ++ } ++ if (info->bitmask & EBT_IP_SOURCE && ++ FWINV((((*skb).nh.iph)->saddr & info->smsk) != ++ info->saddr, EBT_IP_SOURCE)) ++ return EBT_NOMATCH; ++ if ((info->bitmask & EBT_IP_DEST) && ++ FWINV((((*skb).nh.iph)->daddr & info->dmsk) != ++ info->daddr, EBT_IP_DEST)) ++ return EBT_NOMATCH; ++ return EBT_MATCH; ++} ++ ++static int ebt_ip_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_ip_info *info = (struct ebt_ip_info *)data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_ip_info))) ++ return -EINVAL; ++ if (e->ethproto != __constant_htons(ETH_P_IP) || ++ e->invflags & EBT_IPROTO) ++ return -EINVAL; ++ if (info->bitmask & ~EBT_IP_MASK || info->invflags & ~EBT_IP_MASK) ++ return -EINVAL; ++ if (info->bitmask & (EBT_IP_DPORT | EBT_IP_SPORT)) { ++ if (!info->bitmask & EBT_IPROTO) ++ return -EINVAL; ++ if (info->protocol != IPPROTO_TCP && ++ info->protocol != IPPROTO_UDP) ++ return -EINVAL; ++ } ++ if (info->bitmask & EBT_IP_DPORT && info->dport[0] > info->dport[1]) ++ return -EINVAL; ++ if (info->bitmask & EBT_IP_SPORT && info->sport[0] > info->sport[1]) ++ return -EINVAL; ++ return 0; ++} ++ ++static struct ebt_match filter_ip = ++{ ++ {NULL, NULL}, EBT_IP_MATCH, ebt_filter_ip, ebt_ip_check, NULL, ++ THIS_MODULE ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_match(&filter_ip); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_match(&filter_ip); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_vlan.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,259 @@ ++/* ++ * Description: EBTables 802.1Q match extension kernelspace module. ++ * Authors: Nick Fedchik <nick@fedchik.org.ua> ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <linux/if_ether.h> ++#include <linux/if_vlan.h> ++#include <linux/module.h> ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_vlan.h> ++ ++static unsigned char debug; ++#define MODULE_VERSION "0.6" ++ ++MODULE_PARM(debug, "0-1b"); ++MODULE_PARM_DESC(debug, "debug=1 is turn on debug messages"); ++MODULE_AUTHOR("Nick Fedchik <nick@fedchik.org.ua>"); ++MODULE_DESCRIPTION("802.1Q match module (ebtables extension), v" ++ MODULE_VERSION); ++MODULE_LICENSE("GPL"); ++ ++ ++#define DEBUG_MSG(args...) if (debug) printk (KERN_DEBUG "ebt_vlan: " args) ++#define INV_FLAG(_inv_flag_) (info->invflags & _inv_flag_) ? "!" : "" ++#define GET_BITMASK(_BIT_MASK_) info->bitmask & _BIT_MASK_ ++#define SET_BITMASK(_BIT_MASK_) info->bitmask |= _BIT_MASK_ ++#define EXIT_ON_MISMATCH(_MATCH_,_MASK_) if (!((info->_MATCH_ == _MATCH_)^!!(info->invflags & _MASK_))) return 1; ++ ++/* ++ * Function description: ebt_filter_vlan() is main engine for ++ * checking passed 802.1Q frame according to ++ * the passed extension parameters (in the *data buffer) ++ * ebt_filter_vlan() is called after successfull check the rule params ++ * by ebt_check_vlan() function. ++ * Parameters: ++ * const struct sk_buff *skb - pointer to passed ethernet frame buffer ++ * const void *data - pointer to passed extension parameters ++ * unsigned int datalen - length of passed *data buffer ++ * const struct net_device *in - ++ * const struct net_device *out - ++ * const struct ebt_counter *c - ++ * Returned values: ++ * 0 - ok (all rule params matched) ++ * 1 - miss (rule params not acceptable to the parsed frame) ++ */ ++static int ++ebt_filter_vlan(const struct sk_buff *skb, ++ const struct net_device *in, ++ const struct net_device *out, ++ const void *data, unsigned int datalen) ++{ ++ struct ebt_vlan_info *info = (struct ebt_vlan_info *) data; /* userspace data */ ++ struct vlan_ethhdr *frame = (struct vlan_ethhdr *) skb->mac.raw; /* Passed tagged frame */ ++ ++ unsigned short TCI; /* Whole TCI, given from parsed frame */ ++ unsigned short id; /* VLAN ID, given from frame TCI */ ++ unsigned char prio; /* user_priority, given from frame TCI */ ++ unsigned short encap; /* VLAN encapsulated Type/Length field, given from orig frame */ ++ ++ /* ++ * Tag Control Information (TCI) consists of the following elements: ++ * - User_priority. The user_priority field is three bits in length, ++ * interpreted as a binary number. ++ * - Canonical Format Indicator (CFI). The Canonical Format Indicator ++ * (CFI) is a single bit flag value. Currently ignored. ++ * - VLAN Identifier (VID). The VID is encoded as ++ * an unsigned binary number. ++ */ ++ TCI = ntohs(frame->h_vlan_TCI); ++ id = TCI & VLAN_VID_MASK; ++ prio = (TCI >> 13) & 0x7; ++ encap = frame->h_vlan_encapsulated_proto; ++ ++ /* ++ * Checking VLAN Identifier (VID) ++ */ ++ if (GET_BITMASK(EBT_VLAN_ID)) { /* Is VLAN ID parsed? */ ++ EXIT_ON_MISMATCH(id, EBT_VLAN_ID); ++ } ++ /* ++ * Checking user_priority ++ */ ++ if (GET_BITMASK(EBT_VLAN_PRIO)) { /* Is VLAN user_priority parsed? */ ++ EXIT_ON_MISMATCH(prio, EBT_VLAN_PRIO); ++ } ++ /* ++ * Checking Encapsulated Proto (Length/Type) field ++ */ ++ if (GET_BITMASK(EBT_VLAN_ENCAP)) { /* Is VLAN Encap parsed? */ ++ EXIT_ON_MISMATCH(encap, EBT_VLAN_ENCAP); ++ } ++ /* ++ * All possible extension parameters was parsed. ++ * If rule never returned by missmatch, then all ok. ++ */ ++ return 0; ++} ++ ++/* ++ * Function description: ebt_vlan_check() is called when userspace ++ * delivers the table entry to the kernel, ++ * and to check that userspace doesn't give a bad table. ++ * Parameters: ++ * const char *tablename - table name string ++ * unsigned int hooknr - hook number ++ * const struct ebt_entry *e - ebtables entry basic set ++ * const void *data - pointer to passed extension parameters ++ * unsigned int datalen - length of passed *data buffer ++ * Returned values: ++ * 0 - ok (all delivered rule params are correct) ++ * 1 - miss (rule params is out of range, invalid, incompatible, etc.) ++ */ ++static int ++ebt_check_vlan(const char *tablename, ++ unsigned int hooknr, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_vlan_info *info = (struct ebt_vlan_info *) data; ++ ++ /* ++ * Parameters buffer overflow check ++ */ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_vlan_info))) { ++ DEBUG_MSG ++ ("passed size %d is not eq to ebt_vlan_info (%d)\n", ++ datalen, sizeof(struct ebt_vlan_info)); ++ return -EINVAL; ++ } ++ ++ /* ++ * Is it 802.1Q frame checked? ++ */ ++ if (e->ethproto != __constant_htons(ETH_P_8021Q)) { ++ DEBUG_MSG ++ ("passed entry proto %2.4X is not 802.1Q (8100)\n", ++ (unsigned short) ntohs(e->ethproto)); ++ return -EINVAL; ++ } ++ ++ /* ++ * Check for bitmask range ++ * True if even one bit is out of mask ++ */ ++ if (info->bitmask & ~EBT_VLAN_MASK) { ++ DEBUG_MSG("bitmask %2X is out of mask (%2X)\n", ++ info->bitmask, EBT_VLAN_MASK); ++ return -EINVAL; ++ } ++ ++ /* ++ * Check for inversion flags range ++ */ ++ if (info->invflags & ~EBT_VLAN_MASK) { ++ DEBUG_MSG("inversion flags %2X is out of mask (%2X)\n", ++ info->invflags, EBT_VLAN_MASK); ++ return -EINVAL; ++ } ++ ++ /* ++ * Reserved VLAN ID (VID) values ++ * ----------------------------- ++ * 0 - The null VLAN ID. ++ * 1 - The default Port VID (PVID) ++ * 0x0FFF - Reserved for implementation use. ++ * if_vlan.h: VLAN_GROUP_ARRAY_LEN 4096. ++ */ ++ if (GET_BITMASK(EBT_VLAN_ID)) { /* when vlan-id param was spec-ed */ ++ if (!!info->id) { /* if id!=0 => check vid range */ ++ if (info->id > VLAN_GROUP_ARRAY_LEN) { ++ DEBUG_MSG ++ ("id %d is out of range (1-4096)\n", ++ info->id); ++ return -EINVAL; ++ } ++ /* ++ * Note: This is valid VLAN-tagged frame point. ++ * Any value of user_priority are acceptable, ++ * but should be ignored according to 802.1Q Std. ++ * So we just drop the prio flag. ++ */ ++ info->bitmask &= ~EBT_VLAN_PRIO; ++ } ++ /* ++ * Else, id=0 (null VLAN ID) => user_priority range (any?) ++ */ ++ } ++ ++ if (GET_BITMASK(EBT_VLAN_PRIO)) { ++ if ((unsigned char) info->prio > 7) { ++ DEBUG_MSG ++ ("prio %d is out of range (0-7)\n", ++ info->prio); ++ return -EINVAL; ++ } ++ } ++ /* ++ * Check for encapsulated proto range - it is possible to be ++ * any value for u_short range. ++ * if_ether.h: ETH_ZLEN 60 - Min. octets in frame sans FCS ++ */ ++ if (GET_BITMASK(EBT_VLAN_ENCAP)) { ++ if ((unsigned short) ntohs(info->encap) < ETH_ZLEN) { ++ DEBUG_MSG ++ ("encap frame length %d is less than minimal\n", ++ ntohs(info->encap)); ++ return -EINVAL; ++ } ++ } ++ ++ return 0; ++} ++ ++static struct ebt_match filter_vlan = { ++ {NULL, NULL}, ++ EBT_VLAN_MATCH, ++ ebt_filter_vlan, ++ ebt_check_vlan, ++ NULL, ++ THIS_MODULE ++}; ++ ++/* ++ * Module initialization function. ++ */ ++static int __init init(void) ++{ ++ DEBUG_MSG("ebtables 802.1Q extension module v" ++ MODULE_VERSION "\n"); ++ DEBUG_MSG("module debug=%d\n", !!debug); ++ return ebt_register_match(&filter_vlan); ++} ++ ++/* ++ * Module "finalization" function ++ */ ++static void __exit fini(void) ++{ ++ ebt_unregister_match(&filter_vlan); ++} ++ ++module_init(init); ++module_exit(fini); ++ ++EXPORT_NO_SYMBOLS; +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_log.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,153 @@ ++/* ++ * ebt_log ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * April, 2002 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_log.h> ++#include <linux/module.h> ++#include <linux/ip.h> ++#include <linux/in.h> ++#include <linux/if_arp.h> ++#include <linux/spinlock.h> ++ ++static spinlock_t ebt_log_lock = SPIN_LOCK_UNLOCKED; ++ ++static int ebt_log_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_log_info *info = (struct ebt_log_info *)data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_log_info))) ++ return -EINVAL; ++ if (info->bitmask & ~EBT_LOG_MASK) ++ return -EINVAL; ++ if (info->loglevel >= 8) ++ return -EINVAL; ++ info->prefix[EBT_LOG_PREFIX_SIZE - 1] = '\0'; ++ return 0; ++} ++ ++struct tcpudphdr ++{ ++ uint16_t src; ++ uint16_t dst; ++}; ++ ++struct arppayload ++{ ++ unsigned char mac_src[ETH_ALEN]; ++ unsigned char ip_src[4]; ++ unsigned char mac_dst[ETH_ALEN]; ++ unsigned char ip_dst[4]; ++}; ++ ++static void print_MAC(unsigned char *p) ++{ ++ int i; ++ ++ for (i = 0; i < ETH_ALEN; i++, p++) ++ printk("%02x%c", *p, i == ETH_ALEN - 1 ? ' ':':'); ++} ++ ++#define myNIPQUAD(a) a[0], a[1], a[2], a[3] ++static void ebt_log(const struct sk_buff *skb, unsigned int hooknr, ++ const struct net_device *in, const struct net_device *out, ++ const void *data, unsigned int datalen) ++{ ++ struct ebt_log_info *info = (struct ebt_log_info *)data; ++ char level_string[4] = "< >"; ++ level_string[1] = '0' + info->loglevel; ++ ++ spin_lock_bh(&ebt_log_lock); ++ printk(level_string); ++ printk("%s IN=%s OUT=%s ", info->prefix, in ? in->name : "", ++ out ? out->name : ""); ++ ++ printk("MAC source = "); ++ print_MAC((skb->mac.ethernet)->h_source); ++ printk("MAC dest = "); ++ print_MAC((skb->mac.ethernet)->h_dest); ++ ++ printk("proto = 0x%04x", ntohs(((*skb).mac.ethernet)->h_proto)); ++ ++ if ((info->bitmask & EBT_LOG_IP) && skb->mac.ethernet->h_proto == ++ htons(ETH_P_IP)){ ++ struct iphdr *iph = skb->nh.iph; ++ printk(" IP SRC=%u.%u.%u.%u IP DST=%u.%u.%u.%u,", ++ NIPQUAD(iph->saddr), NIPQUAD(iph->daddr)); ++ printk(" IP tos=0x%02X, IP proto=%d", iph->tos, iph->protocol); ++ if (iph->protocol == IPPROTO_TCP || ++ iph->protocol == IPPROTO_UDP) { ++ struct tcpudphdr *ports = (struct tcpudphdr *)(skb->data + iph->ihl*4); ++ ++ if (skb->data + iph->ihl*4 > skb->tail) { ++ printk(" INCOMPLETE TCP/UDP header"); ++ goto out; ++ } ++ printk(" SPT=%u DPT=%u", ntohs(ports->src), ++ ntohs(ports->dst)); ++ } ++ goto out; ++ } ++ ++ if ((info->bitmask & EBT_LOG_ARP) && ++ ((skb->mac.ethernet->h_proto == __constant_htons(ETH_P_ARP)) || ++ (skb->mac.ethernet->h_proto == __constant_htons(ETH_P_RARP)))) { ++ struct arphdr * arph = skb->nh.arph; ++ printk(" ARP HTYPE=%d, PTYPE=0x%04x, OPCODE=%d", ++ ntohs(arph->ar_hrd), ntohs(arph->ar_pro), ++ ntohs(arph->ar_op)); ++ /* If it's for Ethernet and the lengths are OK, ++ * then log the ARP payload */ ++ if (arph->ar_hrd == __constant_htons(1) && ++ arph->ar_hln == ETH_ALEN && ++ arph->ar_pln == sizeof(uint32_t)) { ++ struct arppayload *arpp = (struct arppayload *)(skb->data + sizeof(*arph)); ++ ++ if (skb->data + sizeof(*arph) > skb->tail) { ++ printk(" INCOMPLETE ARP header"); ++ goto out; ++ } ++ ++ printk(" ARP MAC SRC="); ++ print_MAC(arpp->mac_src); ++ printk(" ARP IP SRC=%u.%u.%u.%u", ++ myNIPQUAD(arpp->ip_src)); ++ printk(" ARP MAC DST="); ++ print_MAC(arpp->mac_dst); ++ printk(" ARP IP DST=%u.%u.%u.%u", ++ myNIPQUAD(arpp->ip_dst)); ++ } ++ ++ } ++out: ++ printk("\n"); ++ spin_unlock_bh(&ebt_log_lock); ++} ++ ++static struct ebt_watcher log = ++{ ++ {NULL, NULL}, EBT_LOG_WATCHER, ebt_log, ebt_log_check, NULL, ++ THIS_MODULE ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_watcher(&log); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_watcher(&log); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_ulog.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,281 @@ ++/* ++ * netfilter module for userspace bridged Ethernet frames logging daemons ++ * ++ * Authors: ++ * Bart De Schuymer <bdschuym@pandora.be> ++ * ++ * November, 2004 ++ * ++ * Based on ipt_ULOG.c, which is ++ * (C) 2000-2002 by Harald Welte <laforge@netfilter.org> ++ * ++ * This module accepts two parameters: ++ * ++ * nlbufsiz: ++ * The parameter specifies how big the buffer for each netlink multicast ++ * group is. e.g. If you say nlbufsiz=8192, up to eight kb of packets will ++ * get accumulated in the kernel until they are sent to userspace. It is ++ * NOT possible to allocate more than 128kB, and it is strongly discouraged, ++ * because atomically allocating 128kB inside the network rx softirq is not ++ * reliable. Please also keep in mind that this buffer size is allocated for ++ * each nlgroup you are using, so the total kernel memory usage increases ++ * by that factor. ++ * ++ * flushtimeout: ++ * Specify, after how many hundredths of a second the queue should be ++ * flushed even if it is not full yet. ++ * ++ */ ++ ++#include <linux/module.h> ++#include <linux/config.h> ++#include <linux/spinlock.h> ++#include <linux/socket.h> ++#include <linux/skbuff.h> ++#include <linux/kernel.h> ++#include <linux/timer.h> ++#include <linux/netlink.h> ++#include <linux/netdevice.h> ++#include <linux/module.h> ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_ulog.h> ++#include <net/sock.h> ++#include "../br_private.h" ++ ++#define PRINTR(format, args...) do { if (net_ratelimit()) \ ++ printk(format , ## args); } while (0) ++ ++static unsigned int nlbufsiz = 4096; ++MODULE_PARM(nlbufsiz, "i"); ++MODULE_PARM_DESC(nlbufsiz, "netlink buffer size (number of bytes) " ++ "(defaults to 4096)"); ++ ++static unsigned int flushtimeout = 10; ++MODULE_PARM(flushtimeout, "i"); ++MODULE_PARM_DESC(flushtimeout, "buffer flush timeout (hundredths of a second) " ++ "(defaults to 10)"); ++ ++typedef struct { ++ unsigned int qlen; /* number of nlmsgs' in the skb */ ++ struct nlmsghdr *lastnlh; /* netlink header of last msg in skb */ ++ struct sk_buff *skb; /* the pre-allocated skb */ ++ struct timer_list timer; /* the timer function */ ++ spinlock_t lock; /* the per-queue lock */ ++} ebt_ulog_buff_t; ++ ++static ebt_ulog_buff_t ulog_buffers[EBT_ULOG_MAXNLGROUPS]; ++static struct sock *ebtlognl; ++ ++/* send one ulog_buff_t to userspace */ ++static void ulog_send(unsigned int nlgroup) ++{ ++ ebt_ulog_buff_t *ub = &ulog_buffers[nlgroup]; ++ ++ if (timer_pending(&ub->timer)) ++ del_timer(&ub->timer); ++ ++ /* last nlmsg needs NLMSG_DONE */ ++ if (ub->qlen > 1) ++ ub->lastnlh->nlmsg_type = NLMSG_DONE; ++ ++ NETLINK_CB(ub->skb).dst_groups = 1 << nlgroup; ++ netlink_broadcast(ebtlognl, ub->skb, 0, 1 << nlgroup, GFP_ATOMIC); ++ ++ ub->qlen = 0; ++ ub->skb = NULL; ++} ++ ++/* timer function to flush queue in flushtimeout time */ ++static void ulog_timer(unsigned long data) ++{ ++ spin_lock_bh(&ulog_buffers[data].lock); ++ if (ulog_buffers[data].skb) ++ ulog_send(data); ++ spin_unlock_bh(&ulog_buffers[data].lock); ++} ++ ++static struct sk_buff *ulog_alloc_skb(unsigned int size) ++{ ++ struct sk_buff *skb; ++ ++ skb = alloc_skb(nlbufsiz, GFP_ATOMIC); ++ if (!skb) { ++ PRINTR(KERN_ERR "ebt_ulog: can't alloc whole buffer " ++ "of size %ub!\n", nlbufsiz); ++ if (size < nlbufsiz) { ++ /* try to allocate only as much as we need for ++ * current packet */ ++ skb = alloc_skb(size, GFP_ATOMIC); ++ if (!skb) ++ PRINTR(KERN_ERR "ebt_ulog: can't even allocate " ++ "buffer of size %ub\n", size); ++ } ++ } ++ ++ return skb; ++} ++ ++static void ebt_ulog(const struct sk_buff *skb, unsigned int hooknr, ++ const struct net_device *in, const struct net_device *out, ++ const void *data, unsigned int datalen) ++{ ++ ebt_ulog_packet_msg_t *pm; ++ size_t size, copy_len; ++ struct nlmsghdr *nlh; ++ struct ebt_ulog_info *loginfo = (struct ebt_ulog_info *)data; ++ unsigned int group = loginfo->nlgroup; ++ ebt_ulog_buff_t *ub = &ulog_buffers[group]; ++ spinlock_t *lock = &ub->lock; ++ ++ if ((loginfo->cprange == 0) || ++ (loginfo->cprange > skb->len + ETH_HLEN)) ++ copy_len = skb->len + ETH_HLEN; ++ else ++ copy_len = loginfo->cprange; ++ ++ size = NLMSG_SPACE(sizeof(*pm) + copy_len); ++ ++ spin_lock_bh(lock); ++ ++ if (!ub->skb) { ++ if (!(ub->skb = ulog_alloc_skb(size))) ++ goto alloc_failure; ++ } else if (size > skb_tailroom(ub->skb)) { ++ ulog_send(group); ++ ++ if (!(ub->skb = ulog_alloc_skb(size))) ++ goto alloc_failure; ++ } ++ ++ nlh = NLMSG_PUT(ub->skb, 0, ub->qlen, 0, ++ size - NLMSG_ALIGN(sizeof(*nlh))); ++ ub->qlen++; ++ ++ pm = NLMSG_DATA(nlh); ++ ++ /* Fill in the ulog data */ ++ do_gettimeofday(&pm->stamp); ++ if (ub->qlen == 1) ++ ub->skb->stamp = pm->stamp; ++ pm->data_len = copy_len; ++ pm->mark = skb->nfmark; ++ pm->hook = hooknr; ++ if (loginfo->prefix != NULL) ++ strcpy(pm->prefix, loginfo->prefix); ++ else ++ *(pm->prefix) = '\0'; ++ ++ if (in) { ++ strcpy(pm->physindev, in->name); ++ strcpy(pm->indev, in->br_port->br->dev.name); ++ } else ++ pm->indev[0] = pm->physindev[0] = '\0'; ++ ++ if (out) { ++ strcpy(pm->physoutdev, out->name); ++ strcpy(pm->outdev, out->br_port->br->dev.name); ++ } else ++ pm->outdev[0] = pm->physoutdev[0] = '\0'; ++ ++ if (skb_copy_bits(skb, -ETH_HLEN, pm->data, copy_len) < 0) ++ BUG(); ++ ++ if (ub->qlen > 1) ++ ub->lastnlh->nlmsg_flags |= NLM_F_MULTI; ++ ++ ub->lastnlh = nlh; ++ ++ if (ub->qlen >= loginfo->qthreshold) ++ ulog_send(group); ++ else if (!timer_pending(&ub->timer)) { ++ ub->timer.expires = jiffies + flushtimeout * HZ / 100; ++ add_timer(&ub->timer); ++ } ++ ++unlock: ++ spin_unlock_bh(lock); ++ ++ return; ++ ++nlmsg_failure: ++ PRINTR(KERN_ERR "ebt_ULOG: error during NLMSG_PUT.\n"); ++ goto unlock; ++alloc_failure: ++ goto unlock; ++} ++ ++static int ebt_ulog_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_ulog_info *loginfo = (struct ebt_ulog_info *)data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_ulog_info)) || ++ loginfo->nlgroup > 31) ++ return -EINVAL; ++ ++ loginfo->prefix[EBT_ULOG_PREFIX_LEN - 1] = '\0'; ++ ++ if (loginfo->qthreshold > EBT_ULOG_MAX_QLEN) ++ loginfo->qthreshold = EBT_ULOG_MAX_QLEN; ++ ++ return 0; ++} ++ ++static struct ebt_watcher ulog = { ++ {NULL, NULL}, EBT_ULOG_WATCHER, ebt_ulog, ebt_ulog_check, NULL, ++ THIS_MODULE ++}; ++ ++static int __init init(void) ++{ ++ int i, ret = 0; ++ ++ if (nlbufsiz >= 128*1024) { ++ printk(KERN_NOTICE "ebt_ulog: Netlink buffer has to be <= 128kB," ++ " please try a smaller nlbufsiz parameter.\n"); ++ return -EINVAL; ++ } ++ ++ /* initialize ulog_buffers */ ++ for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) { ++ init_timer(&ulog_buffers[i].timer); ++ ulog_buffers[i].timer.function = ulog_timer; ++ ulog_buffers[i].timer.data = i; ++ ulog_buffers[i].lock = SPIN_LOCK_UNLOCKED; ++ } ++ ++ ebtlognl = netlink_kernel_create(NETLINK_NFLOG, NULL); ++ if (!ebtlognl) ++ ret = -ENOMEM; ++ else if ((ret = ebt_register_watcher(&ulog))) ++ sock_release(ebtlognl->socket); ++ ++ return ret; ++} ++ ++static void __exit fini(void) ++{ ++ ebt_ulog_buff_t *ub; ++ int i; ++ ++ ebt_unregister_watcher(&ulog); ++ for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) { ++ ub = &ulog_buffers[i]; ++ if (timer_pending(&ub->timer)) ++ del_timer(&ub->timer); ++ spin_lock_bh(&ub->lock); ++ if (ub->skb) { ++ kfree_skb(ub->skb); ++ ub->skb = NULL; ++ } ++ spin_unlock_bh(&ub->lock); ++ } ++ sock_release(ebtlognl->socket); ++} ++ ++module_init(init); ++module_exit(fini); ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>"); ++MODULE_DESCRIPTION("ebtables userspace logging module for bridged Ethernet" ++ " frames"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_snat.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,64 @@ ++/* ++ * ebt_snat ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * June, 2002 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_nat.h> ++#include <linux/module.h> ++ ++static int ebt_target_snat(struct sk_buff **pskb, unsigned int hooknr, ++ const struct net_device *in, const struct net_device *out, ++ const void *data, unsigned int datalen) ++{ ++ struct ebt_nat_info *info = (struct ebt_nat_info *) data; ++ ++ memcpy(((**pskb).mac.ethernet)->h_source, info->mac, ++ ETH_ALEN * sizeof(unsigned char)); ++ return info->target; ++} ++ ++static int ebt_target_snat_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_nat_info *info = (struct ebt_nat_info *) data; ++ ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_nat_info))) ++ return -EINVAL; ++ if (BASE_CHAIN && info->target == EBT_RETURN) ++ return -EINVAL; ++ CLEAR_BASE_CHAIN_BIT; ++ if (strcmp(tablename, "nat")) ++ return -EINVAL; ++ if (hookmask & ~(1 << NF_BR_POST_ROUTING)) ++ return -EINVAL; ++ if (INVALID_TARGET) ++ return -EINVAL; ++ return 0; ++} ++ ++static struct ebt_target snat = ++{ ++ {NULL, NULL}, EBT_SNAT_TARGET, ebt_target_snat, ebt_target_snat_check, ++ NULL, THIS_MODULE ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_target(&snat); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_target(&snat); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebt_dnat.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,65 @@ ++/* ++ * ebt_dnat ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * June, 2002 ++ * ++ */ ++ ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/netfilter_bridge/ebt_nat.h> ++#include <linux/module.h> ++#include <net/sock.h> ++ ++static int ebt_target_dnat(struct sk_buff **pskb, unsigned int hooknr, ++ const struct net_device *in, const struct net_device *out, ++ const void *data, unsigned int datalen) ++{ ++ struct ebt_nat_info *info = (struct ebt_nat_info *)data; ++ ++ memcpy(((**pskb).mac.ethernet)->h_dest, info->mac, ++ ETH_ALEN * sizeof(unsigned char)); ++ return info->target; ++} ++ ++static int ebt_target_dnat_check(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *data, unsigned int datalen) ++{ ++ struct ebt_nat_info *info = (struct ebt_nat_info *)data; ++ ++ if (BASE_CHAIN && info->target == EBT_RETURN) ++ return -EINVAL; ++ CLEAR_BASE_CHAIN_BIT; ++ if ( (strcmp(tablename, "nat") || ++ (hookmask & ~((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT)))) && ++ (strcmp(tablename, "broute") || hookmask & ~(1 << NF_BR_BROUTING)) ) ++ return -EINVAL; ++ if (datalen != EBT_ALIGN(sizeof(struct ebt_nat_info))) ++ return -EINVAL; ++ if (INVALID_TARGET) ++ return -EINVAL; ++ return 0; ++} ++ ++static struct ebt_target dnat = ++{ ++ {NULL, NULL}, EBT_DNAT_TARGET, ebt_target_dnat, ebt_target_dnat_check, ++ NULL, THIS_MODULE ++}; ++ ++static int __init init(void) ++{ ++ return ebt_register_target(&dnat); ++} ++ ++static void __exit fini(void) ++{ ++ ebt_unregister_target(&dnat); ++} ++ ++module_init(init); ++module_exit(fini); ++EXPORT_NO_SYMBOLS; ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/netfilter/ebtables.c 2005-03-14 21:04:05.155913576 +0100 +@@ -0,0 +1,1497 @@ ++/* ++ * ebtables ++ * ++ * Author: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * ebtables.c,v 2.0, July, 2002 ++ * ++ * This code is stongly inspired on the iptables code which is ++ * Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ */ ++ ++// used for print_string ++#include <linux/sched.h> ++#include <linux/tty.h> ++ ++#include <linux/kmod.h> ++#include <linux/module.h> ++#include <linux/vmalloc.h> ++#include <linux/netfilter_bridge/ebtables.h> ++#include <linux/spinlock.h> ++#include <asm/uaccess.h> ++#include <linux/smp.h> ++#include <net/sock.h> ++// needed for logical [in,out]-dev filtering ++#include "../br_private.h" ++ ++// list_named_find ++#define ASSERT_READ_LOCK(x) ++#define ASSERT_WRITE_LOCK(x) ++#include <linux/netfilter_ipv4/listhelp.h> ++ ++#if 0 // use this for remote debugging ++// Copyright (C) 1998 by Ori Pomerantz ++// Print the string to the appropriate tty, the one ++// the current task uses ++static void print_string(char *str) ++{ ++ struct tty_struct *my_tty; ++ ++ /* The tty for the current task */ ++ my_tty = current->tty; ++ if (my_tty != NULL) { ++ (*(my_tty->driver).write)(my_tty, 0, str, strlen(str)); ++ (*(my_tty->driver).write)(my_tty, 0, "\015\012", 2); ++ } ++} ++ ++#define BUGPRINT(args) print_string(args); ++#else ++#define BUGPRINT(format, args...) printk("kernel msg: ebtables bug: please "\ ++ "report to author: "format, ## args) ++// #define BUGPRINT(format, args...) ++#endif ++#define MEMPRINT(format, args...) printk("kernel msg: ebtables "\ ++ ": out of memory: "format, ## args) ++// #define MEMPRINT(format, args...) ++ ++ ++ ++// Each cpu has its own set of counters, so there is no need for write_lock in ++// the softirq ++// For reading or updating the counters, the user context needs to ++// get a write_lock ++ ++// The size of each set of counters is altered to get cache alignment ++#define SMP_ALIGN(x) (((x) + SMP_CACHE_BYTES-1) & ~(SMP_CACHE_BYTES-1)) ++#define COUNTER_OFFSET(n) (SMP_ALIGN(n * sizeof(struct ebt_counter))) ++#define COUNTER_BASE(c, n, cpu) ((struct ebt_counter *)(((char *)c) + \ ++ COUNTER_OFFSET(n) * cpu)) ++ ++ ++ ++static DECLARE_MUTEX(ebt_mutex); ++static LIST_HEAD(ebt_tables); ++static LIST_HEAD(ebt_targets); ++static LIST_HEAD(ebt_matches); ++static LIST_HEAD(ebt_watchers); ++ ++static struct ebt_target ebt_standard_target = ++{ {NULL, NULL}, EBT_STANDARD_TARGET, NULL, NULL, NULL, NULL}; ++ ++static inline int ebt_do_watcher (struct ebt_entry_watcher *w, ++ const struct sk_buff *skb, unsigned int hooknr, const struct net_device *in, ++ const struct net_device *out) ++{ ++ w->u.watcher->watcher(skb, hooknr, in, out, w->data, ++ w->watcher_size); ++ // watchers don't give a verdict ++ return 0; ++} ++ ++static inline int ebt_do_match (struct ebt_entry_match *m, ++ const struct sk_buff *skb, const struct net_device *in, ++ const struct net_device *out) ++{ ++ return m->u.match->match(skb, in, out, m->data, ++ m->match_size); ++} ++ ++static inline int ebt_dev_check(char *entry, const struct net_device *device) ++{ ++ int i = 0; ++ char *devname = device->name; ++ ++ if (*entry == '\0') ++ return 0; ++ if (!device) ++ return 1; ++ /* 1 is the wildcard token */ ++ while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[i]) ++ i++; ++ return (devname[i] != entry[i] && entry[i] != 1); ++} ++ ++#define FWINV2(bool,invflg) ((bool) ^ !!(e->invflags & invflg)) ++// process standard matches ++static inline int ebt_basic_match(struct ebt_entry *e, struct ethhdr *h, ++ const struct net_device *in, const struct net_device *out) ++{ ++ int verdict, i; ++ ++ if (e->bitmask & EBT_802_3) { ++ if (FWINV2(ntohs(h->h_proto) >= 1536, EBT_IPROTO)) ++ return 1; ++ } else if (!(e->bitmask & EBT_NOPROTO) && ++ FWINV2(e->ethproto != h->h_proto, EBT_IPROTO)) ++ return 1; ++ ++ if (FWINV2(ebt_dev_check(e->in, in), EBT_IIN)) ++ return 1; ++ if (FWINV2(ebt_dev_check(e->out, out), EBT_IOUT)) ++ return 1; ++ if ((!in || !in->br_port) ? 0 : FWINV2(ebt_dev_check( ++ e->logical_in, &in->br_port->br->dev), EBT_ILOGICALIN)) ++ return 1; ++ if ((!out || !out->br_port) ? 0 : FWINV2(ebt_dev_check( ++ e->logical_out, &out->br_port->br->dev), EBT_ILOGICALOUT)) ++ return 1; ++ ++ if (e->bitmask & EBT_SOURCEMAC) { ++ verdict = 0; ++ for (i = 0; i < 6; i++) ++ verdict |= (h->h_source[i] ^ e->sourcemac[i]) & ++ e->sourcemsk[i]; ++ if (FWINV2(verdict != 0, EBT_ISOURCE) ) ++ return 1; ++ } ++ if (e->bitmask & EBT_DESTMAC) { ++ verdict = 0; ++ for (i = 0; i < 6; i++) ++ verdict |= (h->h_dest[i] ^ e->destmac[i]) & ++ e->destmsk[i]; ++ if (FWINV2(verdict != 0, EBT_IDEST) ) ++ return 1; ++ } ++ return 0; ++} ++ ++// Do some firewalling ++unsigned int ebt_do_table (unsigned int hook, struct sk_buff **pskb, ++ const struct net_device *in, const struct net_device *out, ++ struct ebt_table *table) ++{ ++ int i, nentries; ++ struct ebt_entry *point; ++ struct ebt_counter *counter_base, *cb_base; ++ struct ebt_entry_target *t; ++ int verdict, sp = 0; ++ struct ebt_chainstack *cs; ++ struct ebt_entries *chaininfo; ++ char *base; ++ struct ebt_table_info *private; ++ ++ read_lock_bh(&table->lock); ++ private = table->private; ++ cb_base = COUNTER_BASE(private->counters, private->nentries, ++ cpu_number_map(smp_processor_id())); ++ if (private->chainstack) ++ cs = private->chainstack[cpu_number_map(smp_processor_id())]; ++ else ++ cs = NULL; ++ chaininfo = private->hook_entry[hook]; ++ nentries = private->hook_entry[hook]->nentries; ++ point = (struct ebt_entry *)(private->hook_entry[hook]->data); ++ counter_base = cb_base + private->hook_entry[hook]->counter_offset; ++ // base for chain jumps ++ base = private->entries; ++ i = 0; ++ while (i < nentries) { ++ if (ebt_basic_match(point, (**pskb).mac.ethernet, in, out)) ++ goto letscontinue; ++ ++ if (EBT_MATCH_ITERATE(point, ebt_do_match, *pskb, in, out) != 0) ++ goto letscontinue; ++ ++ // increase counter ++ (*(counter_base + i)).pcnt++; ++ (*(counter_base + i)).bcnt+=(**pskb).len; ++ ++ // these should only watch: not modify, nor tell us ++ // what to do with the packet ++ EBT_WATCHER_ITERATE(point, ebt_do_watcher, *pskb, hook, in, ++ out); ++ ++ t = (struct ebt_entry_target *) ++ (((char *)point) + point->target_offset); ++ // standard target ++ if (!t->u.target->target) ++ verdict = ((struct ebt_standard_target *)t)->verdict; ++ else ++ verdict = t->u.target->target(pskb, hook, ++ in, out, t->data, t->target_size); ++ if (verdict == EBT_ACCEPT) { ++ read_unlock_bh(&table->lock); ++ return NF_ACCEPT; ++ } ++ if (verdict == EBT_DROP) { ++ read_unlock_bh(&table->lock); ++ return NF_DROP; ++ } ++ if (verdict == EBT_RETURN) { ++letsreturn: ++#ifdef CONFIG_NETFILTER_DEBUG ++ if (sp == 0) { ++ BUGPRINT("RETURN on base chain"); ++ // act like this is EBT_CONTINUE ++ goto letscontinue; ++ } ++#endif ++ sp--; ++ // put all the local variables right ++ i = cs[sp].n; ++ chaininfo = cs[sp].chaininfo; ++ nentries = chaininfo->nentries; ++ point = cs[sp].e; ++ counter_base = cb_base + ++ chaininfo->counter_offset; ++ continue; ++ } ++ if (verdict == EBT_CONTINUE) ++ goto letscontinue; ++#ifdef CONFIG_NETFILTER_DEBUG ++ if (verdict < 0) { ++ BUGPRINT("bogus standard verdict\n"); ++ read_unlock_bh(&table->lock); ++ return NF_DROP; ++ } ++#endif ++ // jump to a udc ++ cs[sp].n = i + 1; ++ cs[sp].chaininfo = chaininfo; ++ cs[sp].e = (struct ebt_entry *) ++ (((char *)point) + point->next_offset); ++ i = 0; ++ chaininfo = (struct ebt_entries *) (base + verdict); ++#ifdef CONFIG_NETFILTER_DEBUG ++ if (chaininfo->distinguisher) { ++ BUGPRINT("jump to non-chain\n"); ++ read_unlock_bh(&table->lock); ++ return NF_DROP; ++ } ++#endif ++ nentries = chaininfo->nentries; ++ point = (struct ebt_entry *)chaininfo->data; ++ counter_base = cb_base + chaininfo->counter_offset; ++ sp++; ++ continue; ++letscontinue: ++ point = (struct ebt_entry *) ++ (((char *)point) + point->next_offset); ++ i++; ++ } ++ ++ // I actually like this :) ++ if (chaininfo->policy == EBT_RETURN) ++ goto letsreturn; ++ if (chaininfo->policy == EBT_ACCEPT) { ++ read_unlock_bh(&table->lock); ++ return NF_ACCEPT; ++ } ++ read_unlock_bh(&table->lock); ++ return NF_DROP; ++} ++ ++// If it succeeds, returns element and locks mutex ++static inline void * ++find_inlist_lock_noload(struct list_head *head, const char *name, int *error, ++ struct semaphore *mutex) ++{ ++ void *ret; ++ ++ *error = down_interruptible(mutex); ++ if (*error != 0) ++ return NULL; ++ ++ ret = list_named_find(head, name); ++ if (!ret) { ++ *error = -ENOENT; ++ up(mutex); ++ } ++ return ret; ++} ++ ++#ifndef CONFIG_KMOD ++#define find_inlist_lock(h,n,p,e,m) find_inlist_lock_noload((h),(n),(e),(m)) ++#else ++static void * ++find_inlist_lock(struct list_head *head, const char *name, const char *prefix, ++ int *error, struct semaphore *mutex) ++{ ++ void *ret; ++ ++ ret = find_inlist_lock_noload(head, name, error, mutex); ++ if (!ret) { ++ char modulename[EBT_FUNCTION_MAXNAMELEN + strlen(prefix) + 1]; ++ strcpy(modulename, prefix); ++ strcat(modulename, name); ++ request_module(modulename); ++ ret = find_inlist_lock_noload(head, name, error, mutex); ++ } ++ return ret; ++} ++#endif ++ ++static inline struct ebt_table * ++find_table_lock(const char *name, int *error, struct semaphore *mutex) ++{ ++ return find_inlist_lock(&ebt_tables, name, "ebtable_", error, mutex); ++} ++ ++static inline struct ebt_match * ++find_match_lock(const char *name, int *error, struct semaphore *mutex) ++{ ++ return find_inlist_lock(&ebt_matches, name, "ebt_", error, mutex); ++} ++ ++static inline struct ebt_watcher * ++find_watcher_lock(const char *name, int *error, struct semaphore *mutex) ++{ ++ return find_inlist_lock(&ebt_watchers, name, "ebt_", error, mutex); ++} ++ ++static inline struct ebt_target * ++find_target_lock(const char *name, int *error, struct semaphore *mutex) ++{ ++ return find_inlist_lock(&ebt_targets, name, "ebt_", error, mutex); ++} ++ ++static inline int ++ebt_check_match(struct ebt_entry_match *m, struct ebt_entry *e, ++ const char *name, unsigned int hookmask, unsigned int *cnt) ++{ ++ struct ebt_match *match; ++ int ret; ++ ++ if (((char *)m) + m->match_size + sizeof(struct ebt_entry_match) > ++ ((char *)e) + e->watchers_offset) ++ return -EINVAL; ++ match = find_match_lock(m->u.name, &ret, &ebt_mutex); ++ if (!match) ++ return ret; ++ m->u.match = match; ++ if (match->me) ++ __MOD_INC_USE_COUNT(match->me); ++ up(&ebt_mutex); ++ if (match->check && ++ match->check(name, hookmask, e, m->data, m->match_size) != 0) { ++ BUGPRINT("match->check failed\n"); ++ if (match->me) ++ __MOD_DEC_USE_COUNT(match->me); ++ return -EINVAL; ++ } ++ (*cnt)++; ++ return 0; ++} ++ ++static inline int ++ebt_check_watcher(struct ebt_entry_watcher *w, struct ebt_entry *e, ++ const char *name, unsigned int hookmask, unsigned int *cnt) ++{ ++ struct ebt_watcher *watcher; ++ int ret; ++ ++ if (((char *)w) + w->watcher_size + sizeof(struct ebt_entry_watcher) > ++ ((char *)e) + e->target_offset) ++ return -EINVAL; ++ watcher = find_watcher_lock(w->u.name, &ret, &ebt_mutex); ++ if (!watcher) ++ return ret; ++ w->u.watcher = watcher; ++ if (watcher->me) ++ __MOD_INC_USE_COUNT(watcher->me); ++ up(&ebt_mutex); ++ if (watcher->check && ++ watcher->check(name, hookmask, e, w->data, w->watcher_size) != 0) { ++ BUGPRINT("watcher->check failed\n"); ++ if (watcher->me) ++ __MOD_DEC_USE_COUNT(watcher->me); ++ return -EINVAL; ++ } ++ (*cnt)++; ++ return 0; ++} ++ ++// this one is very careful, as it is the first function ++// to parse the userspace data ++static inline int ++ebt_check_entry_size_and_hooks(struct ebt_entry *e, ++ struct ebt_table_info *newinfo, char *base, char *limit, ++ struct ebt_entries **hook_entries, unsigned int *n, unsigned int *cnt, ++ unsigned int *totalcnt, unsigned int *udc_cnt, unsigned int valid_hooks) ++{ ++ int i; ++ ++ for (i = 0; i < NF_BR_NUMHOOKS; i++) { ++ if ((valid_hooks & (1 << i)) == 0) ++ continue; ++ if ( (char *)hook_entries[i] - base == ++ (char *)e - newinfo->entries) ++ break; ++ } ++ // beginning of a new chain ++ // if i == NF_BR_NUMHOOKS it must be a user defined chain ++ if (i != NF_BR_NUMHOOKS || !(e->bitmask & EBT_ENTRY_OR_ENTRIES)) { ++ if ((e->bitmask & EBT_ENTRY_OR_ENTRIES) != 0) { ++ // we make userspace set this right, ++ // so there is no misunderstanding ++ BUGPRINT("EBT_ENTRY_OR_ENTRIES shouldn't be set " ++ "in distinguisher\n"); ++ return -EINVAL; ++ } ++ // this checks if the previous chain has as many entries ++ // as it said it has ++ if (*n != *cnt) { ++ BUGPRINT("nentries does not equal the nr of entries " ++ "in the chain\n"); ++ return -EINVAL; ++ } ++ // before we look at the struct, be sure it is not too big ++ if ((char *)hook_entries[i] + sizeof(struct ebt_entries) ++ > limit) { ++ BUGPRINT("entries_size too small\n"); ++ return -EINVAL; ++ } ++ if (((struct ebt_entries *)e)->policy != EBT_DROP && ++ ((struct ebt_entries *)e)->policy != EBT_ACCEPT) { ++ // only RETURN from udc ++ if (i != NF_BR_NUMHOOKS || ++ ((struct ebt_entries *)e)->policy != EBT_RETURN) { ++ BUGPRINT("bad policy\n"); ++ return -EINVAL; ++ } ++ } ++ if (i == NF_BR_NUMHOOKS) // it's a user defined chain ++ (*udc_cnt)++; ++ else ++ newinfo->hook_entry[i] = (struct ebt_entries *)e; ++ if (((struct ebt_entries *)e)->counter_offset != *totalcnt) { ++ BUGPRINT("counter_offset != totalcnt"); ++ return -EINVAL; ++ } ++ *n = ((struct ebt_entries *)e)->nentries; ++ *cnt = 0; ++ return 0; ++ } ++ // a plain old entry, heh ++ if (sizeof(struct ebt_entry) > e->watchers_offset || ++ e->watchers_offset > e->target_offset || ++ e->target_offset >= e->next_offset) { ++ BUGPRINT("entry offsets not in right order\n"); ++ return -EINVAL; ++ } ++ // this is not checked anywhere else ++ if (e->next_offset - e->target_offset < sizeof(struct ebt_entry_target)) { ++ BUGPRINT("target size too small\n"); ++ return -EINVAL; ++ } ++ ++ (*cnt)++; ++ (*totalcnt)++; ++ return 0; ++} ++ ++struct ebt_cl_stack ++{ ++ struct ebt_chainstack cs; ++ int from; ++ unsigned int hookmask; ++}; ++ ++// we need these positions to check that the jumps to a different part of the ++// entries is a jump to the beginning of a new chain. ++static inline int ++ebt_get_udc_positions(struct ebt_entry *e, struct ebt_table_info *newinfo, ++ struct ebt_entries **hook_entries, unsigned int *n, unsigned int valid_hooks, ++ struct ebt_cl_stack *udc) ++{ ++ int i; ++ ++ // we're only interested in chain starts ++ if (e->bitmask & EBT_ENTRY_OR_ENTRIES) ++ return 0; ++ for (i = 0; i < NF_BR_NUMHOOKS; i++) { ++ if ((valid_hooks & (1 << i)) == 0) ++ continue; ++ if (newinfo->hook_entry[i] == (struct ebt_entries *)e) ++ break; ++ } ++ // only care about udc ++ if (i != NF_BR_NUMHOOKS) ++ return 0; ++ ++ udc[*n].cs.chaininfo = (struct ebt_entries *)e; ++ // these initialisations are depended on later in check_chainloops() ++ udc[*n].cs.n = 0; ++ udc[*n].hookmask = 0; ++ ++ (*n)++; ++ return 0; ++} ++ ++static inline int ++ebt_cleanup_match(struct ebt_entry_match *m, unsigned int *i) ++{ ++ if (i && (*i)-- == 0) ++ return 1; ++ if (m->u.match->destroy) ++ m->u.match->destroy(m->data, m->match_size); ++ if (m->u.match->me) ++ __MOD_DEC_USE_COUNT(m->u.match->me); ++ ++ return 0; ++} ++ ++static inline int ++ebt_cleanup_watcher(struct ebt_entry_watcher *w, unsigned int *i) ++{ ++ if (i && (*i)-- == 0) ++ return 1; ++ if (w->u.watcher->destroy) ++ w->u.watcher->destroy(w->data, w->watcher_size); ++ if (w->u.watcher->me) ++ __MOD_DEC_USE_COUNT(w->u.watcher->me); ++ ++ return 0; ++} ++ ++static inline int ++ebt_cleanup_entry(struct ebt_entry *e, unsigned int *cnt) ++{ ++ struct ebt_entry_target *t; ++ ++ if ((e->bitmask & EBT_ENTRY_OR_ENTRIES) == 0) ++ return 0; ++ // we're done ++ if (cnt && (*cnt)-- == 0) ++ return 1; ++ EBT_WATCHER_ITERATE(e, ebt_cleanup_watcher, NULL); ++ EBT_MATCH_ITERATE(e, ebt_cleanup_match, NULL); ++ t = (struct ebt_entry_target *)(((char *)e) + e->target_offset); ++ if (t->u.target->destroy) ++ t->u.target->destroy(t->data, t->target_size); ++ if (t->u.target->me) ++ __MOD_DEC_USE_COUNT(t->u.target->me); ++ ++ return 0; ++} ++ ++static inline int ++ebt_check_entry(struct ebt_entry *e, struct ebt_table_info *newinfo, ++ const char *name, unsigned int *cnt, unsigned int valid_hooks, ++ struct ebt_cl_stack *cl_s, unsigned int udc_cnt) ++{ ++ struct ebt_entry_target *t; ++ struct ebt_target *target; ++ unsigned int i, j, hook = 0, hookmask = 0; ++ int ret; ++ ++ // Don't mess with the struct ebt_entries ++ if ((e->bitmask & EBT_ENTRY_OR_ENTRIES) == 0) ++ return 0; ++ ++ if (e->bitmask & ~EBT_F_MASK) { ++ BUGPRINT("Unknown flag for bitmask\n"); ++ return -EINVAL; ++ } ++ if (e->invflags & ~EBT_INV_MASK) { ++ BUGPRINT("Unknown flag for inv bitmask\n"); ++ return -EINVAL; ++ } ++ if ( (e->bitmask & EBT_NOPROTO) && (e->bitmask & EBT_802_3) ) { ++ BUGPRINT("NOPROTO & 802_3 not allowed\n"); ++ return -EINVAL; ++ } ++ // what hook do we belong to? ++ for (i = 0; i < NF_BR_NUMHOOKS; i++) { ++ if ((valid_hooks & (1 << i)) == 0) ++ continue; ++ if ((char *)newinfo->hook_entry[i] < (char *)e) ++ hook = i; ++ else ++ break; ++ } ++ // (1 << NF_BR_NUMHOOKS) tells the check functions the rule is on ++ // a base chain ++ if (i < NF_BR_NUMHOOKS) ++ hookmask = (1 << hook) | (1 << NF_BR_NUMHOOKS); ++ else { ++ for (i = 0; i < udc_cnt; i++) ++ if ((char *)(cl_s[i].cs.chaininfo) > (char *)e) ++ break; ++ if (i == 0) ++ hookmask = (1 << hook) | (1 << NF_BR_NUMHOOKS); ++ else ++ hookmask = cl_s[i - 1].hookmask; ++ } ++ i = 0; ++ ret = EBT_MATCH_ITERATE(e, ebt_check_match, e, name, hookmask, &i); ++ if (ret != 0) ++ goto cleanup_matches; ++ j = 0; ++ ret = EBT_WATCHER_ITERATE(e, ebt_check_watcher, e, name, hookmask, &j); ++ if (ret != 0) ++ goto cleanup_watchers; ++ t = (struct ebt_entry_target *)(((char *)e) + e->target_offset); ++ target = find_target_lock(t->u.name, &ret, &ebt_mutex); ++ if (!target) ++ goto cleanup_watchers; ++ if (target->me) ++ __MOD_INC_USE_COUNT(target->me); ++ up(&ebt_mutex); ++ ++ t->u.target = target; ++ if (t->u.target == &ebt_standard_target) { ++ if (e->target_offset + sizeof(struct ebt_standard_target) > ++ e->next_offset) { ++ BUGPRINT("Standard target size too big\n"); ++ ret = -EFAULT; ++ goto cleanup_watchers; ++ } ++ if (((struct ebt_standard_target *)t)->verdict < ++ -NUM_STANDARD_TARGETS) { ++ BUGPRINT("Invalid standard target\n"); ++ ret = -EFAULT; ++ goto cleanup_watchers; ++ } ++ } else if ((e->target_offset + t->target_size + ++ sizeof(struct ebt_entry_target) > e->next_offset) || ++ (t->u.target->check && ++ t->u.target->check(name, hookmask, e, t->data, t->target_size) != 0)){ ++ if (t->u.target->me) ++ __MOD_DEC_USE_COUNT(t->u.target->me); ++ ret = -EFAULT; ++ goto cleanup_watchers; ++ } ++ (*cnt)++; ++ return 0; ++cleanup_watchers: ++ EBT_WATCHER_ITERATE(e, ebt_cleanup_watcher, &j); ++cleanup_matches: ++ EBT_MATCH_ITERATE(e, ebt_cleanup_match, &i); ++ return ret; ++} ++ ++// checks for loops and sets the hook mask for udc ++// the hook mask for udc tells us from which base chains the udc can be ++// accessed. This mask is a parameter to the check() functions of the extensions ++static int check_chainloops(struct ebt_entries *chain, ++ struct ebt_cl_stack *cl_s, unsigned int udc_cnt, ++ unsigned int hooknr, char *base) ++{ ++ int i, chain_nr = -1, pos = 0, nentries = chain->nentries, verdict; ++ struct ebt_entry *e = (struct ebt_entry *)chain->data; ++ struct ebt_entry_target *t; ++ ++ while (pos < nentries || chain_nr != -1) { ++ // end of udc, go back one 'recursion' step ++ if (pos == nentries) { ++ // put back values of the time when this chain was called ++ e = cl_s[chain_nr].cs.e; ++ if (cl_s[chain_nr].from != -1) ++ nentries = ++ cl_s[cl_s[chain_nr].from].cs.chaininfo->nentries; ++ else ++ nentries = chain->nentries; ++ pos = cl_s[chain_nr].cs.n; ++ // make sure we won't see a loop that isn't one ++ cl_s[chain_nr].cs.n = 0; ++ chain_nr = cl_s[chain_nr].from; ++ if (pos == nentries) ++ continue; ++ } ++ t = (struct ebt_entry_target *) ++ (((char *)e) + e->target_offset); ++ if (strcmp(t->u.name, EBT_STANDARD_TARGET)) ++ goto letscontinue; ++ if (e->target_offset + sizeof(struct ebt_standard_target) > ++ e->next_offset) { ++ BUGPRINT("Standard target size too big\n"); ++ return -1; ++ } ++ verdict = ((struct ebt_standard_target *)t)->verdict; ++ if (verdict >= 0) { // jump to another chain ++ struct ebt_entries *hlp2 = ++ (struct ebt_entries *)(base + verdict); ++ for (i = 0; i < udc_cnt; i++) ++ if (hlp2 == cl_s[i].cs.chaininfo) ++ break; ++ // bad destination or loop ++ if (i == udc_cnt) { ++ BUGPRINT("bad destination\n"); ++ return -1; ++ } ++ if (cl_s[i].cs.n) { ++ BUGPRINT("loop\n"); ++ return -1; ++ } ++ // this can't be 0, so the above test is correct ++ cl_s[i].cs.n = pos + 1; ++ pos = 0; ++ cl_s[i].cs.e = ((void *)e + e->next_offset); ++ e = (struct ebt_entry *)(hlp2->data); ++ nentries = hlp2->nentries; ++ cl_s[i].from = chain_nr; ++ chain_nr = i; ++ // this udc is accessible from the base chain for hooknr ++ cl_s[i].hookmask |= (1 << hooknr); ++ continue; ++ } ++letscontinue: ++ e = (void *)e + e->next_offset; ++ pos++; ++ } ++ return 0; ++} ++ ++// do the parsing of the table/chains/entries/matches/watchers/targets, heh ++static int translate_table(struct ebt_replace *repl, ++ struct ebt_table_info *newinfo) ++{ ++ unsigned int i, j, k, udc_cnt; ++ int ret; ++ struct ebt_cl_stack *cl_s = NULL; // used in the checking for chain loops ++ ++ i = 0; ++ while (i < NF_BR_NUMHOOKS && !(repl->valid_hooks & (1 << i))) ++ i++; ++ if (i == NF_BR_NUMHOOKS) { ++ BUGPRINT("No valid hooks specified\n"); ++ return -EINVAL; ++ } ++ if (repl->hook_entry[i] != (struct ebt_entries *)repl->entries) { ++ BUGPRINT("Chains don't start at beginning\n"); ++ return -EINVAL; ++ } ++ // make sure chains are ordered after each other in same order ++ // as their corresponding hooks ++ for (j = i + 1; j < NF_BR_NUMHOOKS; j++) { ++ if (!(repl->valid_hooks & (1 << j))) ++ continue; ++ if ( repl->hook_entry[j] <= repl->hook_entry[i] ) { ++ BUGPRINT("Hook order must be followed\n"); ++ return -EINVAL; ++ } ++ i = j; ++ } ++ ++ for (i = 0; i < NF_BR_NUMHOOKS; i++) ++ newinfo->hook_entry[i] = NULL; ++ ++ newinfo->entries_size = repl->entries_size; ++ newinfo->nentries = repl->nentries; ++ ++ // do some early checkings and initialize some things ++ i = 0; // holds the expected nr. of entries for the chain ++ j = 0; // holds the up to now counted entries for the chain ++ k = 0; // holds the total nr. of entries, should equal ++ // newinfo->nentries afterwards ++ udc_cnt = 0; // will hold the nr. of user defined chains (udc) ++ ret = EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size, ++ ebt_check_entry_size_and_hooks, newinfo, repl->entries, ++ repl->entries + repl->entries_size, repl->hook_entry, &i, &j, &k, ++ &udc_cnt, repl->valid_hooks); ++ ++ if (ret != 0) ++ return ret; ++ ++ if (i != j) { ++ BUGPRINT("nentries does not equal the nr of entries in the " ++ "(last) chain\n"); ++ return -EINVAL; ++ } ++ if (k != newinfo->nentries) { ++ BUGPRINT("Total nentries is wrong\n"); ++ return -EINVAL; ++ } ++ ++ // check if all valid hooks have a chain ++ for (i = 0; i < NF_BR_NUMHOOKS; i++) { ++ if (newinfo->hook_entry[i] == NULL && ++ (repl->valid_hooks & (1 << i))) { ++ BUGPRINT("Valid hook without chain\n"); ++ return -EINVAL; ++ } ++ } ++ ++ // Get the location of the udc, put them in an array ++ // While we're at it, allocate the chainstack ++ if (udc_cnt) { ++ // this will get free'd in do_replace()/ebt_register_table() ++ // if an error occurs ++ newinfo->chainstack = (struct ebt_chainstack **) ++ vmalloc(smp_num_cpus * sizeof(struct ebt_chainstack)); ++ if (!newinfo->chainstack) ++ return -ENOMEM; ++ for (i = 0; i < smp_num_cpus; i++) { ++ newinfo->chainstack[i] = ++ vmalloc(udc_cnt * sizeof(struct ebt_chainstack)); ++ if (!newinfo->chainstack[i]) { ++ while (i) ++ vfree(newinfo->chainstack[--i]); ++ vfree(newinfo->chainstack); ++ newinfo->chainstack = NULL; ++ return -ENOMEM; ++ } ++ } ++ ++ cl_s = (struct ebt_cl_stack *) ++ vmalloc(udc_cnt * sizeof(struct ebt_cl_stack)); ++ if (!cl_s) ++ return -ENOMEM; ++ i = 0; // the i'th udc ++ EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size, ++ ebt_get_udc_positions, newinfo, repl->hook_entry, &i, ++ repl->valid_hooks, cl_s); ++ // sanity check ++ if (i != udc_cnt) { ++ BUGPRINT("i != udc_cnt\n"); ++ vfree(cl_s); ++ return -EFAULT; ++ } ++ } ++ ++ // Check for loops ++ for (i = 0; i < NF_BR_NUMHOOKS; i++) ++ if (repl->valid_hooks & (1 << i)) ++ if (check_chainloops(newinfo->hook_entry[i], ++ cl_s, udc_cnt, i, newinfo->entries)) { ++ if (cl_s) ++ vfree(cl_s); ++ return -EINVAL; ++ } ++ ++ // we now know the following (along with E=mc): ++ // - the nr of entries in each chain is right ++ // - the size of the allocated space is right ++ // - all valid hooks have a corresponding chain ++ // - there are no loops ++ // - wrong data can still be on the level of a single entry ++ // - could be there are jumps to places that are not the ++ // beginning of a chain. This can only occur in chains that ++ // are not accessible from any base chains, so we don't care. ++ ++ // used to know what we need to clean up if something goes wrong ++ i = 0; ++ ret = EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size, ++ ebt_check_entry, newinfo, repl->name, &i, repl->valid_hooks, ++ cl_s, udc_cnt); ++ if (ret != 0) { ++ EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size, ++ ebt_cleanup_entry, &i); ++ } ++ if (cl_s) ++ vfree(cl_s); ++ return ret; ++} ++ ++// called under write_lock ++static void get_counters(struct ebt_counter *oldcounters, ++ struct ebt_counter *counters, unsigned int nentries) ++{ ++ int i, cpu; ++ struct ebt_counter *counter_base; ++ ++ // counters of cpu 0 ++ memcpy(counters, oldcounters, ++ sizeof(struct ebt_counter) * nentries); ++ // add other counters to those of cpu 0 ++ for (cpu = 1; cpu < smp_num_cpus; cpu++) { ++ counter_base = COUNTER_BASE(oldcounters, nentries, cpu); ++ for (i = 0; i < nentries; i++) { ++ counters[i].pcnt += counter_base[i].pcnt; ++ counters[i].bcnt += counter_base[i].bcnt; ++ } ++ } ++} ++ ++// replace the table ++static int do_replace(void *user, unsigned int len) ++{ ++ int ret, i, countersize; ++ struct ebt_table_info *newinfo; ++ struct ebt_replace tmp; ++ struct ebt_table *t; ++ struct ebt_counter *counterstmp = NULL; ++ // used to be able to unlock earlier ++ struct ebt_table_info *table; ++ ++ if (copy_from_user(&tmp, user, sizeof(tmp)) != 0) ++ return -EFAULT; ++ ++ if (len != sizeof(tmp) + tmp.entries_size) { ++ BUGPRINT("Wrong len argument\n"); ++ return -EINVAL; ++ } ++ ++ if (tmp.entries_size == 0) { ++ BUGPRINT("Entries_size never zero\n"); ++ return -EINVAL; ++ } ++ countersize = COUNTER_OFFSET(tmp.nentries) * smp_num_cpus; ++ newinfo = (struct ebt_table_info *) ++ vmalloc(sizeof(struct ebt_table_info) + countersize); ++ if (!newinfo) ++ return -ENOMEM; ++ ++ if (countersize) ++ memset(newinfo->counters, 0, countersize); ++ ++ newinfo->entries = (char *)vmalloc(tmp.entries_size); ++ if (!newinfo->entries) { ++ ret = -ENOMEM; ++ goto free_newinfo; ++ } ++ if (copy_from_user( ++ newinfo->entries, tmp.entries, tmp.entries_size) != 0) { ++ BUGPRINT("Couldn't copy entries from userspace\n"); ++ ret = -EFAULT; ++ goto free_entries; ++ } ++ ++ // the user wants counters back ++ // the check on the size is done later, when we have the lock ++ if (tmp.num_counters) { ++ counterstmp = (struct ebt_counter *) ++ vmalloc(tmp.num_counters * sizeof(struct ebt_counter)); ++ if (!counterstmp) { ++ ret = -ENOMEM; ++ goto free_entries; ++ } ++ } ++ else ++ counterstmp = NULL; ++ ++ // this can get initialized by translate_table() ++ newinfo->chainstack = NULL; ++ ret = translate_table(&tmp, newinfo); ++ ++ if (ret != 0) ++ goto free_counterstmp; ++ ++ t = find_table_lock(tmp.name, &ret, &ebt_mutex); ++ if (!t) ++ goto free_iterate; ++ ++ // the table doesn't like it ++ if (t->check && (ret = t->check(newinfo, tmp.valid_hooks))) ++ goto free_unlock; ++ ++ if (tmp.num_counters && tmp.num_counters != t->private->nentries) { ++ BUGPRINT("Wrong nr. of counters requested\n"); ++ ret = -EINVAL; ++ goto free_unlock; ++ } ++ ++ // we have the mutex lock, so no danger in reading this pointer ++ table = t->private; ++ // we need an atomic snapshot of the counters ++ write_lock_bh(&t->lock); ++ if (tmp.num_counters) ++ get_counters(t->private->counters, counterstmp, ++ t->private->nentries); ++ ++ t->private = newinfo; ++ write_unlock_bh(&t->lock); ++ up(&ebt_mutex); ++ // So, a user can change the chains while having messed up her counter ++ // allocation. Only reason why this is done is because this way the lock ++ // is held only once, while this doesn't bring the kernel into a ++ // dangerous state. ++ if (tmp.num_counters && ++ copy_to_user(tmp.counters, counterstmp, ++ tmp.num_counters * sizeof(struct ebt_counter))) { ++ BUGPRINT("Couldn't copy counters to userspace\n"); ++ ret = -EFAULT; ++ } ++ else ++ ret = 0; ++ ++ // decrease module count and free resources ++ EBT_ENTRY_ITERATE(table->entries, table->entries_size, ++ ebt_cleanup_entry, NULL); ++ ++ vfree(table->entries); ++ if (table->chainstack) { ++ for (i = 0; i < smp_num_cpus; i++) ++ vfree(table->chainstack[i]); ++ vfree(table->chainstack); ++ } ++ vfree(table); ++ ++ if (counterstmp) ++ vfree(counterstmp); ++ return ret; ++ ++free_unlock: ++ up(&ebt_mutex); ++free_iterate: ++ EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size, ++ ebt_cleanup_entry, NULL); ++free_counterstmp: ++ if (counterstmp) ++ vfree(counterstmp); ++ // can be initialized in translate_table() ++ if (newinfo->chainstack) { ++ for (i = 0; i < smp_num_cpus; i++) ++ vfree(newinfo->chainstack[i]); ++ vfree(newinfo->chainstack); ++ } ++free_entries: ++ if (newinfo->entries) ++ vfree(newinfo->entries); ++free_newinfo: ++ if (newinfo) ++ vfree(newinfo); ++ return ret; ++} ++ ++int ebt_register_target(struct ebt_target *target) ++{ ++ int ret; ++ ++ ret = down_interruptible(&ebt_mutex); ++ if (ret != 0) ++ return ret; ++ if (!list_named_insert(&ebt_targets, target)) { ++ up(&ebt_mutex); ++ return -EEXIST; ++ } ++ up(&ebt_mutex); ++ MOD_INC_USE_COUNT; ++ ++ return 0; ++} ++ ++void ebt_unregister_target(struct ebt_target *target) ++{ ++ down(&ebt_mutex); ++ LIST_DELETE(&ebt_targets, target); ++ up(&ebt_mutex); ++ MOD_DEC_USE_COUNT; ++} ++ ++int ebt_register_match(struct ebt_match *match) ++{ ++ int ret; ++ ++ ret = down_interruptible(&ebt_mutex); ++ if (ret != 0) ++ return ret; ++ if (!list_named_insert(&ebt_matches, match)) { ++ up(&ebt_mutex); ++ return -EEXIST; ++ } ++ up(&ebt_mutex); ++ MOD_INC_USE_COUNT; ++ ++ return 0; ++} ++ ++void ebt_unregister_match(struct ebt_match *match) ++{ ++ down(&ebt_mutex); ++ LIST_DELETE(&ebt_matches, match); ++ up(&ebt_mutex); ++ MOD_DEC_USE_COUNT; ++} ++ ++int ebt_register_watcher(struct ebt_watcher *watcher) ++{ ++ int ret; ++ ++ ret = down_interruptible(&ebt_mutex); ++ if (ret != 0) ++ return ret; ++ if (!list_named_insert(&ebt_watchers, watcher)) { ++ up(&ebt_mutex); ++ return -EEXIST; ++ } ++ up(&ebt_mutex); ++ MOD_INC_USE_COUNT; ++ ++ return 0; ++} ++ ++void ebt_unregister_watcher(struct ebt_watcher *watcher) ++{ ++ down(&ebt_mutex); ++ LIST_DELETE(&ebt_watchers, watcher); ++ up(&ebt_mutex); ++ MOD_DEC_USE_COUNT; ++} ++ ++int ebt_register_table(struct ebt_table *table) ++{ ++ struct ebt_table_info *newinfo; ++ int ret, i, countersize; ++ ++ if (!table || !table->table ||!table->table->entries || ++ table->table->entries_size == 0 || ++ table->table->counters || table->private) { ++ BUGPRINT("Bad table data for ebt_register_table!!!\n"); ++ return -EINVAL; ++ } ++ ++ countersize = COUNTER_OFFSET(table->table->nentries) * smp_num_cpus; ++ newinfo = (struct ebt_table_info *) ++ vmalloc(sizeof(struct ebt_table_info) + countersize); ++ ret = -ENOMEM; ++ if (!newinfo) ++ return -ENOMEM; ++ ++ newinfo->entries = (char *)vmalloc(table->table->entries_size); ++ if (!(newinfo->entries)) ++ goto free_newinfo; ++ ++ memcpy(newinfo->entries, table->table->entries, ++ table->table->entries_size); ++ ++ if (countersize) ++ memset(newinfo->counters, 0, countersize); ++ ++ // fill in newinfo and parse the entries ++ newinfo->chainstack = NULL; ++ ret = translate_table(table->table, newinfo); ++ if (ret != 0) { ++ BUGPRINT("Translate_table failed\n"); ++ goto free_chainstack; ++ } ++ ++ if (table->check && table->check(newinfo, table->valid_hooks)) { ++ BUGPRINT("The table doesn't like its own initial data, lol\n"); ++ return -EINVAL; ++ } ++ ++ table->private = newinfo; ++ table->lock = RW_LOCK_UNLOCKED; ++ ret = down_interruptible(&ebt_mutex); ++ if (ret != 0) ++ goto free_chainstack; ++ ++ if (list_named_find(&ebt_tables, table->name)) { ++ ret = -EEXIST; ++ BUGPRINT("Table name already exists\n"); ++ goto free_unlock; ++ } ++ ++ list_prepend(&ebt_tables, table); ++ up(&ebt_mutex); ++ MOD_INC_USE_COUNT; ++ return 0; ++free_unlock: ++ up(&ebt_mutex); ++free_chainstack: ++ if (newinfo->chainstack) { ++ for (i = 0; i < smp_num_cpus; i++) ++ vfree(newinfo->chainstack[i]); ++ vfree(newinfo->chainstack); ++ } ++ vfree(newinfo->entries); ++free_newinfo: ++ vfree(newinfo); ++ return ret; ++} ++ ++void ebt_unregister_table(struct ebt_table *table) ++{ ++ int i; ++ ++ if (!table) { ++ BUGPRINT("Request to unregister NULL table!!!\n"); ++ return; ++ } ++ down(&ebt_mutex); ++ LIST_DELETE(&ebt_tables, table); ++ up(&ebt_mutex); ++ EBT_ENTRY_ITERATE(table->private->entries, ++ table->private->entries_size, ebt_cleanup_entry, NULL); ++ if (table->private->entries) ++ vfree(table->private->entries); ++ if (table->private->chainstack) { ++ for (i = 0; i < smp_num_cpus; i++) ++ vfree(table->private->chainstack[i]); ++ vfree(table->private->chainstack); ++ } ++ vfree(table->private); ++ MOD_DEC_USE_COUNT; ++} ++ ++// userspace just supplied us with counters ++static int update_counters(void *user, unsigned int len) ++{ ++ int i, ret; ++ struct ebt_counter *tmp; ++ struct ebt_replace hlp; ++ struct ebt_table *t; ++ ++ if (copy_from_user(&hlp, user, sizeof(hlp))) ++ return -EFAULT; ++ ++ if (len != sizeof(hlp) + hlp.num_counters * sizeof(struct ebt_counter)) ++ return -EINVAL; ++ if (hlp.num_counters == 0) ++ return -EINVAL; ++ ++ if ( !(tmp = (struct ebt_counter *) ++ vmalloc(hlp.num_counters * sizeof(struct ebt_counter))) ){ ++ MEMPRINT("Update_counters && nomemory\n"); ++ return -ENOMEM; ++ } ++ ++ t = find_table_lock(hlp.name, &ret, &ebt_mutex); ++ if (!t) ++ goto free_tmp; ++ ++ if (hlp.num_counters != t->private->nentries) { ++ BUGPRINT("Wrong nr of counters\n"); ++ ret = -EINVAL; ++ goto unlock_mutex; ++ } ++ ++ if ( copy_from_user(tmp, hlp.counters, ++ hlp.num_counters * sizeof(struct ebt_counter)) ) { ++ BUGPRINT("Updata_counters && !cfu\n"); ++ ret = -EFAULT; ++ goto unlock_mutex; ++ } ++ ++ // we want an atomic add of the counters ++ write_lock_bh(&t->lock); ++ ++ // we add to the counters of the first cpu ++ for (i = 0; i < hlp.num_counters; i++) { ++ t->private->counters[i].pcnt += tmp[i].pcnt; ++ t->private->counters[i].bcnt += tmp[i].bcnt; ++ } ++ ++ write_unlock_bh(&t->lock); ++ ret = 0; ++unlock_mutex: ++ up(&ebt_mutex); ++free_tmp: ++ vfree(tmp); ++ return ret; ++} ++ ++static inline int ebt_make_matchname(struct ebt_entry_match *m, ++ char *base, char *ubase) ++{ ++ char *hlp = ubase - base + (char *)m; ++ if (copy_to_user(hlp, m->u.match->name, EBT_FUNCTION_MAXNAMELEN)) ++ return -EFAULT; ++ return 0; ++} ++ ++static inline int ebt_make_watchername(struct ebt_entry_watcher *w, ++ char *base, char *ubase) ++{ ++ char *hlp = ubase - base + (char *)w; ++ if (copy_to_user(hlp , w->u.watcher->name, EBT_FUNCTION_MAXNAMELEN)) ++ return -EFAULT; ++ return 0; ++} ++ ++static inline int ebt_make_names(struct ebt_entry *e, char *base, char *ubase) ++{ ++ int ret; ++ char *hlp; ++ struct ebt_entry_target *t; ++ ++ if ((e->bitmask & EBT_ENTRY_OR_ENTRIES) == 0) ++ return 0; ++ ++ hlp = ubase - base + (char *)e + e->target_offset; ++ t = (struct ebt_entry_target *)(((char *)e) + e->target_offset); ++ ++ ret = EBT_MATCH_ITERATE(e, ebt_make_matchname, base, ubase); ++ if (ret != 0) ++ return ret; ++ ret = EBT_WATCHER_ITERATE(e, ebt_make_watchername, base, ubase); ++ if (ret != 0) ++ return ret; ++ if (copy_to_user(hlp, t->u.target->name, EBT_FUNCTION_MAXNAMELEN)) ++ return -EFAULT; ++ return 0; ++} ++ ++// called with ebt_mutex down ++static int copy_everything_to_user(struct ebt_table *t, void *user, ++ int *len, int cmd) ++{ ++ struct ebt_replace tmp; ++ struct ebt_counter *counterstmp, *oldcounters; ++ unsigned int entries_size, nentries; ++ char *entries; ++ ++ if (cmd == EBT_SO_GET_ENTRIES) { ++ entries_size = t->private->entries_size; ++ nentries = t->private->nentries; ++ entries = t->private->entries; ++ oldcounters = t->private->counters; ++ } else { ++ entries_size = t->table->entries_size; ++ nentries = t->table->nentries; ++ entries = t->table->entries; ++ oldcounters = t->table->counters; ++ } ++ ++ if (copy_from_user(&tmp, user, sizeof(tmp))) { ++ BUGPRINT("Cfu didn't work\n"); ++ return -EFAULT; ++ } ++ ++ if (*len != sizeof(struct ebt_replace) + entries_size + ++ (tmp.num_counters? nentries * sizeof(struct ebt_counter): 0)) { ++ BUGPRINT("Wrong size\n"); ++ return -EINVAL; ++ } ++ ++ if (tmp.nentries != nentries) { ++ BUGPRINT("Nentries wrong\n"); ++ return -EINVAL; ++ } ++ ++ if (tmp.entries_size != entries_size) { ++ BUGPRINT("Wrong size\n"); ++ return -EINVAL; ++ } ++ ++ // userspace might not need the counters ++ if (tmp.num_counters) { ++ if (tmp.num_counters != nentries) { ++ BUGPRINT("Num_counters wrong\n"); ++ return -EINVAL; ++ } ++ counterstmp = (struct ebt_counter *) ++ vmalloc(nentries * sizeof(struct ebt_counter)); ++ if (!counterstmp) { ++ MEMPRINT("Couldn't copy counters, out of memory\n"); ++ return -ENOMEM; ++ } ++ write_lock_bh(&t->lock); ++ get_counters(oldcounters, counterstmp, nentries); ++ write_unlock_bh(&t->lock); ++ ++ if (copy_to_user(tmp.counters, counterstmp, ++ nentries * sizeof(struct ebt_counter))) { ++ BUGPRINT("Couldn't copy counters to userspace\n"); ++ vfree(counterstmp); ++ return -EFAULT; ++ } ++ vfree(counterstmp); ++ } ++ ++ if (copy_to_user(tmp.entries, entries, entries_size)) { ++ BUGPRINT("Couldn't copy entries to userspace\n"); ++ return -EFAULT; ++ } ++ // set the match/watcher/target names right ++ return EBT_ENTRY_ITERATE(entries, entries_size, ++ ebt_make_names, entries, tmp.entries); ++} ++ ++static int do_ebt_set_ctl(struct sock *sk, ++ int cmd, void *user, unsigned int len) ++{ ++ int ret; ++ ++ switch(cmd) { ++ case EBT_SO_SET_ENTRIES: ++ ret = do_replace(user, len); ++ break; ++ case EBT_SO_SET_COUNTERS: ++ ret = update_counters(user, len); ++ break; ++ default: ++ ret = -EINVAL; ++ } ++ return ret; ++} ++ ++static int do_ebt_get_ctl(struct sock *sk, int cmd, void *user, int *len) ++{ ++ int ret; ++ struct ebt_replace tmp; ++ struct ebt_table *t; ++ ++ if (copy_from_user(&tmp, user, sizeof(tmp))) ++ return -EFAULT; ++ ++ t = find_table_lock(tmp.name, &ret, &ebt_mutex); ++ if (!t) ++ return ret; ++ ++ switch(cmd) { ++ case EBT_SO_GET_INFO: ++ case EBT_SO_GET_INIT_INFO: ++ if (*len != sizeof(struct ebt_replace)){ ++ ret = -EINVAL; ++ up(&ebt_mutex); ++ break; ++ } ++ if (cmd == EBT_SO_GET_INFO) { ++ tmp.nentries = t->private->nentries; ++ tmp.entries_size = t->private->entries_size; ++ tmp.valid_hooks = t->valid_hooks; ++ } else { ++ tmp.nentries = t->table->nentries; ++ tmp.entries_size = t->table->entries_size; ++ tmp.valid_hooks = t->table->valid_hooks; ++ } ++ up(&ebt_mutex); ++ if (copy_to_user(user, &tmp, *len) != 0){ ++ BUGPRINT("c2u Didn't work\n"); ++ ret = -EFAULT; ++ break; ++ } ++ ret = 0; ++ break; ++ ++ case EBT_SO_GET_ENTRIES: ++ case EBT_SO_GET_INIT_ENTRIES: ++ ret = copy_everything_to_user(t, user, len, cmd); ++ up(&ebt_mutex); ++ break; ++ ++ default: ++ up(&ebt_mutex); ++ ret = -EINVAL; ++ } ++ ++ return ret; ++} ++ ++static struct nf_sockopt_ops ebt_sockopts = ++{ { NULL, NULL }, PF_INET, EBT_BASE_CTL, EBT_SO_SET_MAX + 1, do_ebt_set_ctl, ++ EBT_BASE_CTL, EBT_SO_GET_MAX + 1, do_ebt_get_ctl, 0, NULL ++}; ++ ++static int __init init(void) ++{ ++ int ret; ++ ++ down(&ebt_mutex); ++ list_named_insert(&ebt_targets, &ebt_standard_target); ++ up(&ebt_mutex); ++ if ((ret = nf_register_sockopt(&ebt_sockopts)) < 0) ++ return ret; ++ ++ printk(KERN_NOTICE "Ebtables v2.0 registered\n"); ++ return 0; ++} ++ ++static void __exit fini(void) ++{ ++ nf_unregister_sockopt(&ebt_sockopts); ++ printk(KERN_NOTICE "Ebtables v2.0 unregistered\n"); ++} ++ ++EXPORT_SYMBOL(ebt_register_table); ++EXPORT_SYMBOL(ebt_unregister_table); ++EXPORT_SYMBOL(ebt_register_match); ++EXPORT_SYMBOL(ebt_unregister_match); ++EXPORT_SYMBOL(ebt_register_watcher); ++EXPORT_SYMBOL(ebt_unregister_watcher); ++EXPORT_SYMBOL(ebt_register_target); ++EXPORT_SYMBOL(ebt_unregister_target); ++EXPORT_SYMBOL(ebt_do_table); ++module_init(init); ++module_exit(fini); ++MODULE_LICENSE("GPL"); +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebtables.h 2005-03-14 21:24:12.000000000 +0100 +@@ -0,0 +1,361 @@ ++/* ++ * ebtables ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * ebtables.c,v 2.0, September, 2002 ++ * ++ * This code is stongly inspired on the iptables code which is ++ * Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling ++ */ ++ ++#ifndef __LINUX_BRIDGE_EFF_H ++#define __LINUX_BRIDGE_EFF_H ++#include <linux/if.h> ++#include <linux/netfilter_bridge.h> ++#include <linux/if_ether.h> ++ ++#define EBT_TABLE_MAXNAMELEN 32 ++#define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN ++#define EBT_FUNCTION_MAXNAMELEN EBT_TABLE_MAXNAMELEN ++ ++// verdicts >0 are "branches" ++#define EBT_ACCEPT -1 ++#define EBT_DROP -2 ++#define EBT_CONTINUE -3 ++#define EBT_RETURN -4 ++#define NUM_STANDARD_TARGETS 4 ++ ++struct ebt_counter ++{ ++ uint64_t pcnt; ++ uint64_t bcnt; ++}; ++ ++struct ebt_entries { ++ // this field is always set to zero ++ // See EBT_ENTRY_OR_ENTRIES. ++ // Must be same size as ebt_entry.bitmask ++ unsigned int distinguisher; ++ // the chain name ++ char name[EBT_CHAIN_MAXNAMELEN]; ++ // counter offset for this chain ++ unsigned int counter_offset; ++ // one standard (accept, drop, return) per hook ++ int policy; ++ // nr. of entries ++ unsigned int nentries; ++ // entry list ++ char data[0]; ++}; ++ ++// used for the bitmask of struct ebt_entry ++ ++// This is a hack to make a difference between an ebt_entry struct and an ++// ebt_entries struct when traversing the entries from start to end. ++// Using this simplifies the code alot, while still being able to use ++// ebt_entries. ++// Contrary, iptables doesn't use something like ebt_entries and therefore uses ++// different techniques for naming the policy and such. So, iptables doesn't ++// need a hack like this. ++#define EBT_ENTRY_OR_ENTRIES 0x01 ++// these are the normal masks ++#define EBT_NOPROTO 0x02 ++#define EBT_802_3 0x04 ++#define EBT_SOURCEMAC 0x08 ++#define EBT_DESTMAC 0x10 ++#define EBT_F_MASK (EBT_NOPROTO | EBT_802_3 | EBT_SOURCEMAC | EBT_DESTMAC \ ++ | EBT_ENTRY_OR_ENTRIES) ++ ++#define EBT_IPROTO 0x01 ++#define EBT_IIN 0x02 ++#define EBT_IOUT 0x04 ++#define EBT_ISOURCE 0x8 ++#define EBT_IDEST 0x10 ++#define EBT_ILOGICALIN 0x20 ++#define EBT_ILOGICALOUT 0x40 ++#define EBT_INV_MASK (EBT_IPROTO | EBT_IIN | EBT_IOUT | EBT_ILOGICALIN \ ++ | EBT_ILOGICALOUT | EBT_ISOURCE | EBT_IDEST) ++ ++struct ebt_entry_match ++{ ++ union { ++ char name[EBT_FUNCTION_MAXNAMELEN]; ++ struct ebt_match *match; ++ } u; ++ // size of data ++ unsigned int match_size; ++ unsigned char data[0]; ++}; ++ ++struct ebt_entry_watcher ++{ ++ union { ++ char name[EBT_FUNCTION_MAXNAMELEN]; ++ struct ebt_watcher *watcher; ++ } u; ++ // size of data ++ unsigned int watcher_size; ++ unsigned char data[0]; ++}; ++ ++struct ebt_entry_target ++{ ++ union { ++ char name[EBT_FUNCTION_MAXNAMELEN]; ++ struct ebt_target *target; ++ } u; ++ // size of data ++ unsigned int target_size; ++ unsigned char data[0]; ++}; ++ ++#define EBT_STANDARD_TARGET "standard" ++struct ebt_standard_target ++{ ++ struct ebt_entry_target target; ++ int verdict; ++}; ++ ++// one entry ++struct ebt_entry { ++ // this needs to be the first field ++ unsigned int bitmask; ++ unsigned int invflags; ++ uint16_t ethproto; ++ // the physical in-dev ++ char in[IFNAMSIZ]; ++ // the logical in-dev ++ char logical_in[IFNAMSIZ]; ++ // the physical out-dev ++ char out[IFNAMSIZ]; ++ // the logical out-dev ++ char logical_out[IFNAMSIZ]; ++ unsigned char sourcemac[ETH_ALEN]; ++ unsigned char sourcemsk[ETH_ALEN]; ++ unsigned char destmac[ETH_ALEN]; ++ unsigned char destmsk[ETH_ALEN]; ++ // sizeof ebt_entry + matches ++ unsigned int watchers_offset; ++ // sizeof ebt_entry + matches + watchers ++ unsigned int target_offset; ++ // sizeof ebt_entry + matches + watchers + target ++ unsigned int next_offset; ++ unsigned char elems[0]; ++}; ++ ++struct ebt_replace ++{ ++ char name[EBT_TABLE_MAXNAMELEN]; ++ unsigned int valid_hooks; ++ // nr of rules in the table ++ unsigned int nentries; ++ // total size of the entries ++ unsigned int entries_size; ++ // start of the chains ++ struct ebt_entries *hook_entry[NF_BR_NUMHOOKS]; ++ // nr of counters userspace expects back ++ unsigned int num_counters; ++ // where the kernel will put the old counters ++ struct ebt_counter *counters; ++ char *entries; ++}; ++ ++// [gs]etsockopt numbers ++#define EBT_BASE_CTL 128 ++ ++#define EBT_SO_SET_ENTRIES (EBT_BASE_CTL) ++#define EBT_SO_SET_COUNTERS (EBT_SO_SET_ENTRIES+1) ++#define EBT_SO_SET_MAX (EBT_SO_SET_COUNTERS+1) ++ ++#define EBT_SO_GET_INFO (EBT_BASE_CTL) ++#define EBT_SO_GET_ENTRIES (EBT_SO_GET_INFO+1) ++#define EBT_SO_GET_INIT_INFO (EBT_SO_GET_ENTRIES+1) ++#define EBT_SO_GET_INIT_ENTRIES (EBT_SO_GET_INIT_INFO+1) ++#define EBT_SO_GET_MAX (EBT_SO_GET_INIT_ENTRIES+1) ++ ++#ifdef __KERNEL__ ++ ++// return values for match() functions ++#define EBT_MATCH 0 ++#define EBT_NOMATCH 1 ++ ++struct ebt_match ++{ ++ struct list_head list; ++ const char name[EBT_FUNCTION_MAXNAMELEN]; ++ // 0 == it matches ++ int (*match)(const struct sk_buff *skb, const struct net_device *in, ++ const struct net_device *out, const void *matchdata, ++ unsigned int datalen); ++ // 0 == let it in ++ int (*check)(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *matchdata, unsigned int datalen); ++ void (*destroy)(void *matchdata, unsigned int datalen); ++ struct module *me; ++}; ++ ++struct ebt_watcher ++{ ++ struct list_head list; ++ const char name[EBT_FUNCTION_MAXNAMELEN]; ++ void (*watcher)(const struct sk_buff *skb, unsigned int hooknr, ++ const struct net_device *in, const struct net_device *out, ++ const void *watcherdata, unsigned int datalen); ++ // 0 == let it in ++ int (*check)(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *watcherdata, unsigned int datalen); ++ void (*destroy)(void *watcherdata, unsigned int datalen); ++ struct module *me; ++}; ++ ++struct ebt_target ++{ ++ struct list_head list; ++ const char name[EBT_FUNCTION_MAXNAMELEN]; ++ // returns one of the standard verdicts ++ int (*target)(struct sk_buff **pskb, unsigned int hooknr, ++ const struct net_device *in, const struct net_device *out, ++ const void *targetdata, unsigned int datalen); ++ // 0 == let it in ++ int (*check)(const char *tablename, unsigned int hookmask, ++ const struct ebt_entry *e, void *targetdata, unsigned int datalen); ++ void (*destroy)(void *targetdata, unsigned int datalen); ++ struct module *me; ++}; ++ ++// used for jumping from and into user defined chains (udc) ++struct ebt_chainstack ++{ ++ struct ebt_entries *chaininfo; // pointer to chain data ++ struct ebt_entry *e; // pointer to entry data ++ unsigned int n; // n'th entry ++}; ++ ++struct ebt_table_info ++{ ++ // total size of the entries ++ unsigned int entries_size; ++ unsigned int nentries; ++ // pointers to the start of the chains ++ struct ebt_entries *hook_entry[NF_BR_NUMHOOKS]; ++ // room to maintain the stack used for jumping from and into udc ++ struct ebt_chainstack **chainstack; ++ char *entries; ++ struct ebt_counter counters[0] ____cacheline_aligned; ++}; ++ ++struct ebt_table ++{ ++ struct list_head list; ++ char name[EBT_TABLE_MAXNAMELEN]; ++ struct ebt_replace *table; ++ unsigned int valid_hooks; ++ rwlock_t lock; ++ // e.g. could be the table explicitly only allows certain ++ // matches, targets, ... 0 == let it in ++ int (*check)(const struct ebt_table_info *info, ++ unsigned int valid_hooks); ++ // the data used by the kernel ++ struct ebt_table_info *private; ++}; ++ ++#define EBT_ALIGN(s) (((s) + (__alignof__(struct ebt_entry_target)-1)) & \ ++ ~(__alignof__(struct ebt_entry_target)-1)) ++extern int ebt_register_table(struct ebt_table *table); ++extern void ebt_unregister_table(struct ebt_table *table); ++extern int ebt_register_match(struct ebt_match *match); ++extern void ebt_unregister_match(struct ebt_match *match); ++extern int ebt_register_watcher(struct ebt_watcher *watcher); ++extern void ebt_unregister_watcher(struct ebt_watcher *watcher); ++extern int ebt_register_target(struct ebt_target *target); ++extern void ebt_unregister_target(struct ebt_target *target); ++extern unsigned int ebt_do_table(unsigned int hook, struct sk_buff **pskb, ++ const struct net_device *in, const struct net_device *out, ++ struct ebt_table *table); ++ ++ // Used in the kernel match() functions ++#define FWINV(bool,invflg) ((bool) ^ !!(info->invflags & invflg)) ++// True if the hook mask denotes that the rule is in a base chain, ++// used in the check() functions ++#define BASE_CHAIN (hookmask & (1 << NF_BR_NUMHOOKS)) ++// Clear the bit in the hook mask that tells if the rule is on a base chain ++#define CLEAR_BASE_CHAIN_BIT (hookmask &= ~(1 << NF_BR_NUMHOOKS)) ++// True if the target is not a standard target ++#define INVALID_TARGET (info->target < -NUM_STANDARD_TARGETS || info->target >= 0) ++ ++#endif /* __KERNEL__ */ ++ ++// blatently stolen from ip_tables.h ++// fn returns 0 to continue iteration ++#define EBT_MATCH_ITERATE(e, fn, args...) \ ++({ \ ++ unsigned int __i; \ ++ int __ret = 0; \ ++ struct ebt_entry_match *__match; \ ++ \ ++ for (__i = sizeof(struct ebt_entry); \ ++ __i < (e)->watchers_offset; \ ++ __i += __match->match_size + \ ++ sizeof(struct ebt_entry_match)) { \ ++ __match = (void *)(e) + __i; \ ++ \ ++ __ret = fn(__match , ## args); \ ++ if (__ret != 0) \ ++ break; \ ++ } \ ++ if (__ret == 0) { \ ++ if (__i != (e)->watchers_offset) \ ++ __ret = -EINVAL; \ ++ } \ ++ __ret; \ ++}) ++ ++#define EBT_WATCHER_ITERATE(e, fn, args...) \ ++({ \ ++ unsigned int __i; \ ++ int __ret = 0; \ ++ struct ebt_entry_watcher *__watcher; \ ++ \ ++ for (__i = e->watchers_offset; \ ++ __i < (e)->target_offset; \ ++ __i += __watcher->watcher_size + \ ++ sizeof(struct ebt_entry_watcher)) { \ ++ __watcher = (void *)(e) + __i; \ ++ \ ++ __ret = fn(__watcher , ## args); \ ++ if (__ret != 0) \ ++ break; \ ++ } \ ++ if (__ret == 0) { \ ++ if (__i != (e)->target_offset) \ ++ __ret = -EINVAL; \ ++ } \ ++ __ret; \ ++}) ++ ++#define EBT_ENTRY_ITERATE(entries, size, fn, args...) \ ++({ \ ++ unsigned int __i; \ ++ int __ret = 0; \ ++ struct ebt_entry *__entry; \ ++ \ ++ for (__i = 0; __i < (size);) { \ ++ __entry = (void *)(entries) + __i; \ ++ __ret = fn(__entry , ## args); \ ++ if (__ret != 0) \ ++ break; \ ++ if (__entry->bitmask != 0) \ ++ __i += __entry->next_offset; \ ++ else \ ++ __i += sizeof(struct ebt_entries); \ ++ } \ ++ if (__ret == 0) { \ ++ if (__i != (size)) \ ++ __ret = -EINVAL; \ ++ } \ ++ __ret; \ ++}) ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_among.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,65 @@ ++#ifndef __LINUX_BRIDGE_EBT_AMONG_H ++#define __LINUX_BRIDGE_EBT_AMONG_H ++ ++#define EBT_AMONG_DST 0x01 ++#define EBT_AMONG_SRC 0x02 ++ ++/* Grzegorz Borowiak <grzes@gnu.univ.gda.pl> 2003 ++ * ++ * Write-once-read-many hash table, used for checking if a given ++ * MAC address belongs to a set or not and possibly for checking ++ * if it is related with a given IPv4 address. ++ * ++ * The hash value of an address is its last byte. ++ * ++ * In real-world ethernet addresses, values of the last byte are ++ * evenly distributed and there is no need to consider other bytes. ++ * It would only slow the routines down. ++ * ++ * For MAC address comparison speedup reasons, we introduce a trick. ++ * MAC address is mapped onto an array of two 32-bit integers. ++ * This pair of integers is compared with MAC addresses in the ++ * hash table, which are stored also in form of pairs of integers ++ * (in `cmp' array). This is quick as it requires only two elementary ++ * number comparisons in worst case. Further, we take advantage of ++ * fact that entropy of 3 last bytes of address is larger than entropy ++ * of 3 first bytes. So first we compare 4 last bytes of addresses and ++ * if they are the same we compare 2 first. ++ * ++ * Yes, it is a memory overhead, but in 2003 AD, who cares? ++ */ ++ ++struct ebt_mac_wormhash_tuple ++{ ++ uint32_t cmp[2]; ++ uint32_t ip; ++}; ++ ++struct ebt_mac_wormhash ++{ ++ int table[257]; ++ int poolsize; ++ struct ebt_mac_wormhash_tuple pool[0]; ++}; ++ ++#define ebt_mac_wormhash_size(x) ((x) ? sizeof(struct ebt_mac_wormhash) \ ++ + (x)->poolsize * sizeof(struct ebt_mac_wormhash_tuple) : 0) ++ ++struct ebt_among_info ++{ ++ int wh_dst_ofs; ++ int wh_src_ofs; ++ int bitmask; ++}; ++ ++#define EBT_AMONG_DST_NEG 0x1 ++#define EBT_AMONG_SRC_NEG 0x2 ++ ++#define ebt_among_wh_dst(x) ((x)->wh_dst_ofs ? \ ++ (struct ebt_mac_wormhash*)((char*)(x) + (x)->wh_dst_ofs) : NULL) ++#define ebt_among_wh_src(x) ((x)->wh_src_ofs ? \ ++ (struct ebt_mac_wormhash*)((char*)(x) + (x)->wh_src_ofs) : NULL) ++ ++#define EBT_AMONG_MATCH "among" ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_limit.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,23 @@ ++#ifndef __LINUX_BRIDGE_EBT_LIMIT_H ++#define __LINUX_BRIDGE_EBT_LIMIT_H ++ ++#define EBT_LIMIT_MATCH "limit" ++ ++/* timings are in milliseconds. */ ++#define EBT_LIMIT_SCALE 10000 ++ ++/* 1/10,000 sec period => max of 10,000/sec. Min rate is then 429490 ++ seconds, or one every 59 hours. */ ++ ++struct ebt_limit_info ++{ ++ u_int32_t avg; /* Average secs between packets * scale */ ++ u_int32_t burst; /* Period multiplier for upper limit. */ ++ ++ /* Used internally by the kernel */ ++ unsigned long prev; ++ u_int32_t credit; ++ u_int32_t credit_cap, cost; ++}; ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_arpreply.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,11 @@ ++#ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H ++#define __LINUX_BRIDGE_EBT_ARPREPLY_H ++ ++struct ebt_arpreply_info ++{ ++ unsigned char mac[ETH_ALEN]; ++ int target; ++}; ++#define EBT_ARPREPLY_TARGET "arpreply" ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_802_3.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,60 @@ ++#ifndef __LINUX_BRIDGE_EBT_802_3_H ++#define __LINUX_BRIDGE_EBT_802_3_H ++ ++#define EBT_802_3_SAP 0x01 ++#define EBT_802_3_TYPE 0x02 ++ ++#define EBT_802_3_MATCH "802_3" ++ ++/* ++ * If frame has DSAP/SSAP value 0xaa you must check the SNAP type ++ * to discover what kind of packet we're carrying. ++ */ ++#define CHECK_TYPE 0xaa ++ ++/* ++ * Control field may be one or two bytes. If the first byte has ++ * the value 0x03 then the entire length is one byte, otherwise it is two. ++ * One byte controls are used in Unnumbered Information frames. ++ * Two byte controls are used in Numbered Information frames. ++ */ ++#define IS_UI 0x03 ++ ++#define EBT_802_3_MASK (EBT_802_3_SAP | EBT_802_3_TYPE | EBT_802_3) ++ ++/* ui has one byte ctrl, ni has two */ ++struct hdr_ui { ++ uint8_t dsap; ++ uint8_t ssap; ++ uint8_t ctrl; ++ uint8_t orig[3]; ++ uint16_t type; ++}; ++ ++struct hdr_ni { ++ uint8_t dsap; ++ uint8_t ssap; ++ uint16_t ctrl; ++ uint8_t orig[3]; ++ uint16_t type; ++}; ++ ++struct ebt_802_3_hdr { ++ uint8_t daddr[6]; ++ uint8_t saddr[6]; ++ uint16_t len; ++ union { ++ struct hdr_ui ui; ++ struct hdr_ni ni; ++ } llc; ++}; ++ ++struct ebt_802_3_info ++{ ++ uint8_t sap; ++ uint16_t type; ++ uint8_t bitmask; ++ uint8_t invflags; ++}; ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_arp.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,32 @@ ++#ifndef __LINUX_BRIDGE_EBT_ARP_H ++#define __LINUX_BRIDGE_EBT_ARP_H ++ ++#define EBT_ARP_OPCODE 0x01 ++#define EBT_ARP_HTYPE 0x02 ++#define EBT_ARP_PTYPE 0x04 ++#define EBT_ARP_SRC_IP 0x08 ++#define EBT_ARP_DST_IP 0x10 ++#define EBT_ARP_SRC_MAC 0x20 ++#define EBT_ARP_DST_MAC 0x40 ++#define EBT_ARP_MASK (EBT_ARP_OPCODE | EBT_ARP_HTYPE | EBT_ARP_PTYPE | \ ++ EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC) ++#define EBT_ARP_MATCH "arp" ++ ++struct ebt_arp_info ++{ ++ uint16_t htype; ++ uint16_t ptype; ++ uint16_t opcode; ++ uint32_t saddr; ++ uint32_t smsk; ++ uint32_t daddr; ++ uint32_t dmsk; ++ unsigned char smaddr[ETH_ALEN]; ++ unsigned char smmsk[ETH_ALEN]; ++ unsigned char dmaddr[ETH_ALEN]; ++ unsigned char dmmsk[ETH_ALEN]; ++ uint8_t bitmask; ++ uint8_t invflags; ++}; ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_ip.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,43 @@ ++/* ++ * ebt_ip ++ * ++ * Authors: ++ * Bart De Schuymer <bart.de.schuymer@pandora.be> ++ * ++ * April, 2002 ++ * ++ * Changes: ++ * added ip-sport and ip-dport ++ * Innominate Security Technologies AG <mhopf@innominate.com> ++ * September, 2002 ++ */ ++ ++#ifndef __LINUX_BRIDGE_EBT_IP_H ++#define __LINUX_BRIDGE_EBT_IP_H ++ ++#define EBT_IP_SOURCE 0x01 ++#define EBT_IP_DEST 0x02 ++#define EBT_IP_TOS 0x04 ++#define EBT_IP_PROTO 0x08 ++#define EBT_IP_SPORT 0x10 ++#define EBT_IP_DPORT 0x20 ++#define EBT_IP_MASK (EBT_IP_SOURCE | EBT_IP_DEST | EBT_IP_TOS | EBT_IP_PROTO |\ ++ EBT_IP_SPORT | EBT_IP_DPORT ) ++#define EBT_IP_MATCH "ip" ++ ++// the same values are used for the invflags ++struct ebt_ip_info ++{ ++ uint32_t saddr; ++ uint32_t daddr; ++ uint32_t smsk; ++ uint32_t dmsk; ++ uint8_t tos; ++ uint8_t protocol; ++ uint8_t bitmask; ++ uint8_t invflags; ++ uint16_t sport[2]; ++ uint16_t dport[2]; ++}; ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_pkttype.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,11 @@ ++#ifndef __LINUX_BRIDGE_EBT_PKTTYPE_H ++#define __LINUX_BRIDGE_EBT_PKTTYPE_H ++ ++struct ebt_pkttype_info ++{ ++ uint8_t pkt_type; ++ uint8_t invert; ++}; ++#define EBT_PKTTYPE_MATCH "pkttype" ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_stp.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,46 @@ ++#ifndef __LINUX_BRIDGE_EBT_STP_H ++#define __LINUX_BRIDGE_EBT_STP_H ++ ++#define EBT_STP_TYPE 0x0001 ++ ++#define EBT_STP_FLAGS 0x0002 ++#define EBT_STP_ROOTPRIO 0x0004 ++#define EBT_STP_ROOTADDR 0x0008 ++#define EBT_STP_ROOTCOST 0x0010 ++#define EBT_STP_SENDERPRIO 0x0020 ++#define EBT_STP_SENDERADDR 0x0040 ++#define EBT_STP_PORT 0x0080 ++#define EBT_STP_MSGAGE 0x0100 ++#define EBT_STP_MAXAGE 0x0200 ++#define EBT_STP_HELLOTIME 0x0400 ++#define EBT_STP_FWDD 0x0800 ++ ++#define EBT_STP_MASK 0x0fff ++#define EBT_STP_CONFIG_MASK 0x0ffe ++ ++#define EBT_STP_MATCH "stp" ++ ++struct ebt_stp_config_info ++{ ++ uint8_t flags; ++ uint16_t root_priol, root_priou; ++ char root_addr[6], root_addrmsk[6]; ++ uint32_t root_costl, root_costu; ++ uint16_t sender_priol, sender_priou; ++ char sender_addr[6], sender_addrmsk[6]; ++ uint16_t portl, portu; ++ uint16_t msg_agel, msg_ageu; ++ uint16_t max_agel, max_ageu; ++ uint16_t hello_timel, hello_timeu; ++ uint16_t forward_delayl, forward_delayu; ++}; ++ ++struct ebt_stp_info ++{ ++ uint8_t type; ++ struct ebt_stp_config_info config; ++ uint16_t bitmask; ++ uint16_t invflags; ++}; ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_vlan.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,20 @@ ++#ifndef __LINUX_BRIDGE_EBT_VLAN_H ++#define __LINUX_BRIDGE_EBT_VLAN_H ++ ++#define EBT_VLAN_ID 0x01 ++#define EBT_VLAN_PRIO 0x02 ++#define EBT_VLAN_ENCAP 0x04 ++#define EBT_VLAN_MASK (EBT_VLAN_ID | EBT_VLAN_PRIO | EBT_VLAN_ENCAP) ++#define EBT_VLAN_MATCH "vlan" ++ ++struct ebt_vlan_info { ++ uint16_t id; /* VLAN ID {1-4095} */ ++ uint8_t prio; /* VLAN User Priority {0-7} */ ++ uint16_t encap; /* VLAN Encapsulated frame code {0-65535} */ ++ uint8_t bitmask; /* Args bitmask bit 1=1 - ID arg, ++ bit 2=1 User-Priority arg, bit 3=1 encap*/ ++ uint8_t invflags; /* Inverse bitmask bit 1=1 - inversed ID arg, ++ bit 2=1 - inversed Pirority arg */ ++}; ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_log.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,17 @@ ++#ifndef __LINUX_BRIDGE_EBT_LOG_H ++#define __LINUX_BRIDGE_EBT_LOG_H ++ ++#define EBT_LOG_IP 0x01 // if the frame is made by ip, log the ip information ++#define EBT_LOG_ARP 0x02 ++#define EBT_LOG_MASK (EBT_LOG_IP | EBT_LOG_ARP) ++#define EBT_LOG_PREFIX_SIZE 30 ++#define EBT_LOG_WATCHER "log" ++ ++struct ebt_log_info ++{ ++ uint8_t loglevel; ++ uint8_t prefix[EBT_LOG_PREFIX_SIZE]; ++ uint32_t bitmask; ++}; ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_ulog.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,33 @@ ++#ifndef _EBT_ULOG_H ++#define _EBT_ULOG_H ++ ++#define EBT_ULOG_DEFAULT_NLGROUP 0 ++#define EBT_ULOG_DEFAULT_QTHRESHOLD 1 ++#define EBT_ULOG_MAXNLGROUPS 32 /* hardcoded netlink max */ ++#define EBT_ULOG_PREFIX_LEN 32 ++#define EBT_ULOG_MAX_QLEN 50 ++#define EBT_ULOG_WATCHER "ulog" ++ ++struct ebt_ulog_info { ++ uint32_t nlgroup; ++ unsigned int cprange; ++ unsigned int qthreshold; ++ char prefix[EBT_ULOG_PREFIX_LEN]; ++}; ++ ++typedef struct ebt_ulog_packet_msg { ++ char indev[IFNAMSIZ]; ++ char outdev[IFNAMSIZ]; ++ char physindev[IFNAMSIZ]; ++ char physoutdev[IFNAMSIZ]; ++ char prefix[EBT_ULOG_PREFIX_LEN]; ++ struct timeval stamp; ++ unsigned long mark; ++ unsigned int hook; ++ size_t data_len; ++ /* The complete packet, including Ethernet header and perhaps ++ * the VLAN header is appended */ ++ unsigned char data[0] __attribute__ ((aligned (__alignof__(int)))); ++} ebt_ulog_packet_msg_t; ++ ++#endif /* _EBT_ULOG_H */ +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_nat.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,13 @@ ++#ifndef __LINUX_BRIDGE_EBT_NAT_H ++#define __LINUX_BRIDGE_EBT_NAT_H ++ ++struct ebt_nat_info ++{ ++ unsigned char mac[ETH_ALEN]; ++ // EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN ++ int target; ++}; ++#define EBT_SNAT_TARGET "snat" ++#define EBT_DNAT_TARGET "dnat" ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_redirect.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,11 @@ ++#ifndef __LINUX_BRIDGE_EBT_REDIRECT_H ++#define __LINUX_BRIDGE_EBT_REDIRECT_H ++ ++struct ebt_redirect_info ++{ ++ // EBT_ACCEPT, EBT_DROP or EBT_CONTINUE or EBT_RETURN ++ int target; ++}; ++#define EBT_REDIRECT_TARGET "redirect" ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_mark_m.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,15 @@ ++#ifndef __LINUX_BRIDGE_EBT_MARK_M_H ++#define __LINUX_BRIDGE_EBT_MARK_M_H ++ ++#define EBT_MARK_AND 0x01 ++#define EBT_MARK_OR 0x02 ++#define EBT_MARK_MASK (EBT_MARK_AND | EBT_MARK_OR) ++struct ebt_mark_m_info ++{ ++ unsigned long mark, mask; ++ uint8_t invert; ++ uint8_t bitmask; ++}; ++#define EBT_MARK_MATCH "mark_m" ++ ++#endif +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_bridge/ebt_mark_t.h 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,12 @@ ++#ifndef __LINUX_BRIDGE_EBT_MARK_T_H ++#define __LINUX_BRIDGE_EBT_MARK_T_H ++ ++struct ebt_mark_t_info ++{ ++ unsigned long mark; ++ // EBT_ACCEPT, EBT_DROP or EBT_CONTINUE or EBT_RETURN ++ int target; ++}; ++#define EBT_MARK_TARGET "mark" ++ ++#endif +--- linux-2.4.29/include/linux/netfilter.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter.h 2005-03-14 21:11:36.000000000 +0100 +@@ -17,7 +17,8 @@ + #define NF_STOLEN 2 + #define NF_QUEUE 3 + #define NF_REPEAT 4 +-#define NF_MAX_VERDICT NF_REPEAT ++#define NF_STOP 5 ++#define NF_MAX_VERDICT NF_STOP + + /* Generic cache responses from hook functions. + <= 0x2000 is used for protocol-flags. */ +@@ -118,17 +119,34 @@ extern struct list_head nf_hooks[NPROTO] + /* This is gross, but inline doesn't cut it for avoiding the function + call in fast path: gcc doesn't inline (needs value tracking?). --RR */ + #ifdef CONFIG_NETFILTER_DEBUG +-#define NF_HOOK nf_hook_slow ++#define NF_HOOK(pf, hook, skb, indev, outdev, okfn) \ ++({int __ret; \ ++if ((__ret=nf_hook_slow(pf, hook, &(skb), indev, outdev, okfn, INT_MIN)) == 1) \ ++ __ret = (okfn)(skb); \ ++__ret;}) ++#define NF_HOOK_THRESH(pf, hook, skb, indev, outdev, okfn, thresh) \ ++({int __ret; \ ++if ((__ret=nf_hook_slow(pf, hook, &(skb), indev, outdev, okfn, thresh)) == 1) \ ++ __ret = (okfn)(skb); \ ++__ret;}) + #else +-#define NF_HOOK(pf, hook, skb, indev, outdev, okfn) \ +-(list_empty(&nf_hooks[(pf)][(hook)]) \ +- ? (okfn)(skb) \ +- : nf_hook_slow((pf), (hook), (skb), (indev), (outdev), (okfn))) ++#define NF_HOOK(pf, hook, skb, indev, outdev, okfn) \ ++({int __ret; \ ++if (list_empty(&nf_hooks[pf][hook]) || \ ++ (__ret=nf_hook_slow(pf, hook, &(skb), indev, outdev, okfn, INT_MIN)) == 1) \ ++ __ret = (okfn)(skb); \ ++__ret;}) ++#define NF_HOOK_THRESH(pf, hook, skb, indev, outdev, okfn, thresh) \ ++({int __ret; \ ++if (list_empty(&nf_hooks[pf][hook]) || \ ++ (__ret=nf_hook_slow(pf, hook, &(skb), indev, outdev, okfn, thresh)) == 1) \ ++ __ret = (okfn)(skb); \ ++__ret;}) + #endif + +-int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb, ++int nf_hook_slow(int pf, unsigned int hook, struct sk_buff **pskb, + struct net_device *indev, struct net_device *outdev, +- int (*okfn)(struct sk_buff *)); ++ int (*okfn)(struct sk_buff *), int thresh); + + /* Call setsockopt() */ + int nf_setsockopt(struct sock *sk, int pf, int optval, char *opt, +--- linux-2.4.29/include/linux/netfilter_ipv4.h 2002-02-25 20:38:13.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_ipv4.h 2005-03-14 21:11:36.000000000 +0100 +@@ -52,8 +52,10 @@ + enum nf_ip_hook_priorities { + NF_IP_PRI_FIRST = INT_MIN, + NF_IP_PRI_CONNTRACK = -200, ++ NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD = -175, + NF_IP_PRI_MANGLE = -150, + NF_IP_PRI_NAT_DST = -100, ++ NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT = -50, + NF_IP_PRI_FILTER = 0, + NF_IP_PRI_NAT_SRC = 100, + NF_IP_PRI_LAST = INT_MAX, +--- linux-2.4.29/include/linux/netfilter_ipv6.h 2001-01-02 01:17:54.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_ipv6.h 2005-03-14 21:24:11.000000000 +0100 +@@ -57,8 +57,10 @@ + enum nf_ip6_hook_priorities { + NF_IP6_PRI_FIRST = INT_MIN, + NF_IP6_PRI_CONNTRACK = -200, ++ NF_IP6_PRI_BRIDGE_SABOTAGE_FORWARD = -175, + NF_IP6_PRI_MANGLE = -150, + NF_IP6_PRI_NAT_DST = -100, ++ NF_IP6_PRI_BRIDGE_SABOTAGE_LOCAL_OUT = -50, + NF_IP6_PRI_FILTER = 0, + NF_IP6_PRI_NAT_SRC = 100, + NF_IP6_PRI_LAST = INT_MAX, +--- linux-2.4.29/include/linux/skbuff.h 2004-08-08 01:26:06.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/include/linux/skbuff.h 2005-03-14 21:07:31.000000000 +0100 +@@ -92,6 +92,20 @@ struct nf_conntrack { + struct nf_ct_info { + struct nf_conntrack *master; + }; ++ ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++struct nf_bridge_info { ++ atomic_t use; ++ struct net_device *physindev; ++ struct net_device *physoutdev; ++#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) ++ struct net_device *netoutdev; ++#endif ++ unsigned int mask; ++ unsigned long data[32 / sizeof(unsigned long)]; ++}; ++#endif ++ + #endif + + struct sk_buff_head { +@@ -208,6 +222,9 @@ struct sk_buff { + #ifdef CONFIG_NETFILTER_DEBUG + unsigned int nf_debug; + #endif ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ struct nf_bridge_info *nf_bridge; /* Saved data about a bridged frame - see br_netfilter.c */ ++#endif + #endif /*CONFIG_NETFILTER*/ + + #if defined(CONFIG_HIPPI) +@@ -1175,6 +1192,20 @@ nf_reset(struct sk_buff *skb) + skb->nf_debug = 0; + #endif + } ++ ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++static inline void nf_bridge_put(struct nf_bridge_info *nf_bridge) ++{ ++ if (nf_bridge && atomic_dec_and_test(&nf_bridge->use)) ++ kfree(nf_bridge); ++} ++static inline void nf_bridge_get(struct nf_bridge_info *nf_bridge) ++{ ++ if (nf_bridge) ++ atomic_inc(&nf_bridge->use); ++} ++#endif ++ + #else /* CONFIG_NETFILTER */ + static inline void nf_reset(struct sk_buff *skb) {} + #endif /* CONFIG_NETFILTER */ +--- linux-2.4.29/net/core/netfilter.c 2005-01-19 15:10:13.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/net/core/netfilter.c 2005-03-14 21:21:41.825275416 +0100 +@@ -342,32 +342,29 @@ static unsigned int nf_iterate(struct li + const struct net_device *indev, + const struct net_device *outdev, + struct list_head **i, +- int (*okfn)(struct sk_buff *)) ++ int (*okfn)(struct sk_buff *), ++ int hook_thresh) + { ++ unsigned int verdict; ++ + for (*i = (*i)->next; *i != head; *i = (*i)->next) { + struct nf_hook_ops *elem = (struct nf_hook_ops *)*i; +- switch (elem->hook(hook, skb, indev, outdev, okfn)) { +- case NF_QUEUE: +- return NF_QUEUE; +- +- case NF_STOLEN: +- return NF_STOLEN; +- +- case NF_DROP: +- return NF_DROP; + +- case NF_REPEAT: +- *i = (*i)->prev; +- break; ++ if (hook_thresh > elem->priority) ++ continue; + ++ verdict = elem->hook(hook, skb, indev, outdev, okfn); ++ if (verdict != NF_ACCEPT) { + #ifdef CONFIG_NETFILTER_DEBUG +- case NF_ACCEPT: +- break; +- +- default: +- NFDEBUG("Evil return from %p(%u).\n", +- elem->hook, hook); ++ if (unlikely(verdict > NF_MAX_VERDICT)) { ++ NFDEBUG("Evil return from %p(%u).\n", ++ elem->hook, hook); ++ continue; ++ } + #endif ++ if (verdict != NF_REPEAT) ++ return verdict; ++ *i = (*i)->prev; + } + } + return NF_ACCEPT; +@@ -413,6 +410,10 @@ static void nf_queue(struct sk_buff *skb + { + int status; + struct nf_info *info; ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ struct net_device *physindev = NULL; ++ struct net_device *physoutdev = NULL; ++#endif + + if (!queue_handler[pf].outfn) { + kfree_skb(skb); +@@ -435,36 +436,52 @@ static void nf_queue(struct sk_buff *skb + if (indev) dev_hold(indev); + if (outdev) dev_hold(outdev); + ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ if (skb->nf_bridge) { ++ physindev = skb->nf_bridge->physindev; ++ if (physindev) dev_hold(physindev); ++ physoutdev = skb->nf_bridge->physoutdev; ++ if (physoutdev) dev_hold(physoutdev); ++ } ++#endif ++ + status = queue_handler[pf].outfn(skb, info, queue_handler[pf].data); + if (status < 0) { + /* James M doesn't say fuck enough. */ + if (indev) dev_put(indev); + if (outdev) dev_put(outdev); ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ if (physindev) dev_put(physindev); ++ if (physoutdev) dev_put(physoutdev); ++#endif + kfree(info); + kfree_skb(skb); + return; + } + } + +-int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb, ++/* Returns 1 if okfn() needs to be executed by the caller, ++ * -EPERM for NF_DROP, 0 otherwise. */ ++int nf_hook_slow(int pf, unsigned int hook, struct sk_buff **pskb, + struct net_device *indev, + struct net_device *outdev, +- int (*okfn)(struct sk_buff *)) ++ int (*okfn)(struct sk_buff *), ++ int hook_thresh) + { + struct list_head *elem; + unsigned int verdict; + int ret = 0; + + /* This stopgap cannot be removed until all the hooks are audited. */ +- if (skb_is_nonlinear(skb) && skb_linearize(skb, GFP_ATOMIC) != 0) { +- kfree_skb(skb); ++ if (skb_is_nonlinear(*pskb) && skb_linearize(*pskb, GFP_ATOMIC) != 0) { ++ kfree_skb(*pskb); + return -ENOMEM; + } +- if (skb->ip_summed == CHECKSUM_HW) { ++ if ((*pskb)->ip_summed == CHECKSUM_HW) { + if (outdev == NULL) { +- skb->ip_summed = CHECKSUM_NONE; ++ (*pskb)->ip_summed = CHECKSUM_NONE; + } else { +- skb_checksum_help(skb); ++ skb_checksum_help(*pskb); + } + } + +@@ -472,30 +489,24 @@ int nf_hook_slow(int pf, unsigned int ho + br_read_lock_bh(BR_NETPROTO_LOCK); + + #ifdef CONFIG_NETFILTER_DEBUG +- if (skb->nf_debug & (1 << hook)) { ++ if (unlikely((*pskb)->nf_debug & (1 << hook))) { + printk("nf_hook: hook %i already set.\n", hook); +- nf_dump_skb(pf, skb); ++ nf_dump_skb(pf, *pskb); + } +- skb->nf_debug |= (1 << hook); ++ (*pskb)->nf_debug |= (1 << hook); + #endif + + elem = &nf_hooks[pf][hook]; +- verdict = nf_iterate(&nf_hooks[pf][hook], &skb, hook, indev, +- outdev, &elem, okfn); +- if (verdict == NF_QUEUE) { +- NFDEBUG("nf_hook: Verdict = QUEUE.\n"); +- nf_queue(skb, elem, pf, hook, indev, outdev, okfn); +- } +- +- switch (verdict) { +- case NF_ACCEPT: +- ret = okfn(skb); +- break; +- +- case NF_DROP: +- kfree_skb(skb); ++ verdict = nf_iterate(&nf_hooks[pf][hook], pskb, hook, indev, ++ outdev, &elem, okfn, hook_thresh); ++ if (verdict == NF_ACCEPT || verdict == NF_STOP) ++ ret = 1; ++ else if (verdict == NF_DROP) { ++ kfree_skb(*pskb); + ret = -EPERM; +- break; ++ } else if (verdict == NF_QUEUE) { ++ NFDEBUG("nf_hook: Verdict = QUEUE.\n"); ++ nf_queue(*pskb, elem, pf, hook, indev, outdev, okfn); + } + + br_read_unlock_bh(BR_NETPROTO_LOCK); +@@ -510,6 +521,14 @@ void nf_reinject(struct sk_buff *skb, st + + /* We don't have BR_NETPROTO_LOCK here */ + br_read_lock_bh(BR_NETPROTO_LOCK); ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ if (skb->nf_bridge) { ++ if (skb->nf_bridge->physindev) ++ dev_put(skb->nf_bridge->physindev); ++ if (skb->nf_bridge->physoutdev) ++ dev_put(skb->nf_bridge->physoutdev); ++ } ++#endif + for (i = nf_hooks[info->pf][info->hook].next; i != elem; i = i->next) { + if (i == &nf_hooks[info->pf][info->hook]) { + /* The module which sent it to userspace is gone. */ +@@ -530,7 +549,7 @@ void nf_reinject(struct sk_buff *skb, st + verdict = nf_iterate(&nf_hooks[info->pf][info->hook], + &skb, info->hook, + info->indev, info->outdev, &elem, +- info->okfn); ++ info->okfn, INT_MIN); + } + + switch (verdict) { +--- linux-2.4.29/net/core/skbuff.c 2003-08-25 13:44:44.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/net/core/skbuff.c 2005-03-14 00:00:30.000000000 +0100 +@@ -246,6 +246,9 @@ static inline void skb_headerinit(void * + #ifdef CONFIG_NETFILTER_DEBUG + skb->nf_debug = 0; + #endif ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ skb->nf_bridge = NULL; ++#endif + #endif + #ifdef CONFIG_NET_SCHED + skb->tc_index = 0; +@@ -326,6 +329,9 @@ void __kfree_skb(struct sk_buff *skb) + } + #ifdef CONFIG_NETFILTER + nf_conntrack_put(skb->nfct); ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ nf_bridge_put(skb->nf_bridge); ++#endif + #endif + skb_headerinit(skb, NULL, 0); /* clean state */ + kfree_skbmem(skb); +@@ -393,6 +399,9 @@ struct sk_buff *skb_clone(struct sk_buff + #ifdef CONFIG_NETFILTER_DEBUG + C(nf_debug); + #endif ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ C(nf_bridge); ++#endif + #endif /*CONFIG_NETFILTER*/ + #if defined(CONFIG_HIPPI) + C(private); +@@ -405,6 +414,9 @@ struct sk_buff *skb_clone(struct sk_buff + skb->cloned = 1; + #ifdef CONFIG_NETFILTER + nf_conntrack_get(skb->nfct); ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ nf_bridge_get(skb->nf_bridge); ++#endif + #endif + return n; + } +@@ -440,6 +452,10 @@ static void copy_skb_header(struct sk_bu + #ifdef CONFIG_NETFILTER_DEBUG + new->nf_debug=old->nf_debug; + #endif ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ new->nf_bridge=old->nf_bridge; ++ nf_bridge_get(new->nf_bridge); ++#endif + #endif + #ifdef CONFIG_NET_SCHED + new->tc_index = old->tc_index; +@@ -726,9 +742,9 @@ struct sk_buff *skb_copy_expand(const st + /* Set the tail pointer and length */ + skb_put(n,skb->len); + +- /* Copy the data only. */ +- if (skb_copy_bits(skb, 0, n->data, skb->len)) +- BUG(); ++ /* Copy the linear data and header. */ ++ if (skb_copy_bits(skb, -newheadroom, n->head, newheadroom + skb->len)) ++ BUG(); + + copy_skb_header(n, skb); + return n; +--- linux-2.4.29/net/ipv4/netfilter/ip_tables.c 2005-01-19 15:10:13.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/net/ipv4/netfilter/ip_tables.c 2005-03-14 00:00:30.000000000 +0100 +@@ -118,12 +118,19 @@ static LIST_HEAD(ipt_tables); + static inline int + ip_packet_match(const struct iphdr *ip, + const char *indev, ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ const char *physindev, ++#endif + const char *outdev, ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ const char *physoutdev, ++#endif + const struct ipt_ip *ipinfo, + int isfrag) + { + size_t i; + unsigned long ret; ++ unsigned long ret2 = 1; + + #define FWINV(bool,invflg) ((bool) ^ !!(ipinfo->invflags & invflg)) + +@@ -153,7 +160,15 @@ ip_packet_match(const struct iphdr *ip, + & ((const unsigned long *)ipinfo->iniface_mask)[i]; + } + +- if (FWINV(ret != 0, IPT_INV_VIA_IN)) { ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ for (i = 0, ret2 = 0; i < IFNAMSIZ/sizeof(unsigned long); i++) { ++ ret2 |= (((const unsigned long *)physindev)[i] ++ ^ ((const unsigned long *)ipinfo->iniface)[i]) ++ & ((const unsigned long *)ipinfo->iniface_mask)[i]; ++ } ++#endif ++ ++ if (FWINV(ret != 0 && ret2 != 0, IPT_INV_VIA_IN)) { + dprintf("VIA in mismatch (%s vs %s).%s\n", + indev, ipinfo->iniface, + ipinfo->invflags&IPT_INV_VIA_IN ?" (INV)":""); +@@ -166,7 +181,15 @@ ip_packet_match(const struct iphdr *ip, + & ((const unsigned long *)ipinfo->outiface_mask)[i]; + } + +- if (FWINV(ret != 0, IPT_INV_VIA_OUT)) { ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ for (i = 0, ret2 = 0; i < IFNAMSIZ/sizeof(unsigned long); i++) { ++ ret2 |= (((const unsigned long *)physoutdev)[i] ++ ^ ((const unsigned long *)ipinfo->outiface)[i]) ++ & ((const unsigned long *)ipinfo->outiface_mask)[i]; ++ } ++#endif ++ ++ if (FWINV(ret != 0 && ret2 != 0, IPT_INV_VIA_OUT)) { + dprintf("VIA out mismatch (%s vs %s).%s\n", + outdev, ipinfo->outiface, + ipinfo->invflags&IPT_INV_VIA_OUT ?" (INV)":""); +@@ -265,6 +288,9 @@ ipt_do_table(struct sk_buff **pskb, + /* Initializing verdict to NF_DROP keeps gcc happy. */ + unsigned int verdict = NF_DROP; + const char *indev, *outdev; ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ const char *physindev, *physoutdev; ++#endif + void *table_base; + struct ipt_entry *e, *back; + +@@ -274,6 +300,13 @@ ipt_do_table(struct sk_buff **pskb, + datalen = (*pskb)->len - ip->ihl * 4; + indev = in ? in->name : nulldevname; + outdev = out ? out->name : nulldevname; ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ physindev = ((*pskb)->nf_bridge && (*pskb)->nf_bridge->physindev) ? ++ (*pskb)->nf_bridge->physindev->name : nulldevname; ++ physoutdev = ((*pskb)->nf_bridge && (*pskb)->nf_bridge->physoutdev) ? ++ (*pskb)->nf_bridge->physoutdev->name : nulldevname; ++#endif ++ + /* We handle fragments by dealing with the first fragment as + * if it was a normal packet. All other fragments are treated + * normally, except that they will NEVER match rules that ask +@@ -309,7 +342,15 @@ ipt_do_table(struct sk_buff **pskb, + IP_NF_ASSERT(e); + IP_NF_ASSERT(back); + (*pskb)->nfcache |= e->nfcache; +- if (ip_packet_match(ip, indev, outdev, &e->ip, offset)) { ++ if (ip_packet_match(ip, indev, ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ physindev, ++#endif ++ outdev, ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ physoutdev, ++#endif ++ &e->ip, offset)) { + struct ipt_entry_target *t; + + if (IPT_MATCH_ITERATE(e, do_match, +--- linux-2.4.29/net/ipv4/ip_output.c 2005-01-19 15:10:13.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/net/ipv4/ip_output.c 2005-03-14 00:00:30.000000000 +0100 +@@ -890,6 +890,10 @@ int ip_fragment(struct sk_buff *skb, int + /* Connection association is same as pre-frag packet */ + skb2->nfct = skb->nfct; + nf_conntrack_get(skb2->nfct); ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ skb2->nf_bridge = skb->nf_bridge; ++ nf_bridge_get(skb2->nf_bridge); ++#endif + #ifdef CONFIG_NETFILTER_DEBUG + skb2->nf_debug = skb->nf_debug; + #endif +--- linux-2.4.29/net/ipv4/netfilter/ipt_LOG.c 2003-11-28 19:26:21.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/net/ipv4/netfilter/ipt_LOG.c 2005-03-14 00:00:30.000000000 +0100 +@@ -316,6 +316,18 @@ ipt_log_target(struct sk_buff **pskb, + loginfo->prefix, + in ? in->name : "", + out ? out->name : ""); ++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) ++ if ((*pskb)->nf_bridge) { ++ struct net_device *physindev = (*pskb)->nf_bridge->physindev; ++ struct net_device *physoutdev = (*pskb)->nf_bridge->physoutdev; ++ ++ if (physindev && in != physindev) ++ printk("PHYSIN=%s ", physindev->name); ++ if (physoutdev && out != physoutdev) ++ printk("PHYSOUT=%s ", physoutdev->name); ++ } ++#endif ++ + if (in && !out) { + /* MAC logging for input chain only. */ + printk("MAC="); +--- linux-2.4.29/net/ipv4/netfilter/Makefile 2003-08-25 13:44:44.000000000 +0200 ++++ linux-2.4.29-ebt-brnf/net/ipv4/netfilter/Makefile 2005-03-14 00:00:30.000000000 +0100 +@@ -87,6 +87,8 @@ obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += i + obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o + obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o + ++obj-$(CONFIG_IP_NF_MATCH_PHYSDEV) += ipt_physdev.o ++ + # targets + obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o + obj-$(CONFIG_IP_NF_TARGET_MIRROR) += ipt_MIRROR.o +--- linux-2.4.29/net/ipv4/netfilter/Config.in 2005-01-19 15:10:13.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/net/ipv4/netfilter/Config.in 2005-03-14 00:00:30.000000000 +0100 +@@ -44,6 +44,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; + dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES + dep_tristate ' Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES + fi ++ if [ "$CONFIG_BRIDGE" != "n" ]; then ++ dep_tristate ' Physdev match support' CONFIG_IP_NF_MATCH_PHYSDEV $CONFIG_IP_NF_IPTABLES ++ fi + # The targets + dep_tristate ' Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES + if [ "$CONFIG_IP_NF_FILTER" != "n" ]; then +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/bridge/br_netfilter.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,1101 @@ ++/* ++ * Handle firewalling ++ * Linux ethernet bridge ++ * ++ * Authors: ++ * Lennert Buytenhek <buytenh@gnu.org> ++ * Bart De Schuymer (maintainer) <bdschuym@pandora.be> ++ * ++ * Changes: ++ * Apr 29 2003: physdev module support (bdschuym) ++ * Jun 19 2003: let arptables see bridged ARP traffic (bdschuym) ++ * Oct 06 2003: filter encapsulated IP/ARP VLAN traffic on untagged bridge ++ * (bdschuym) ++ * Aug 28 2004: add IPv6 filtering (bdschuym) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ * ++ * Lennert dedicates this file to Kerstin Wurdinger. ++ */ ++ ++#include <linux/module.h> ++#include <linux/kernel.h> ++#include <linux/ip.h> ++#include <linux/netdevice.h> ++#include <linux/skbuff.h> ++#include <linux/if_ether.h> ++#include <linux/if_vlan.h> ++#include <linux/netfilter_bridge.h> ++#include <linux/netfilter_ipv4.h> ++#include <linux/netfilter_ipv6.h> ++#include <linux/in_route.h> ++#include <net/ip.h> ++#include <net/ipv6.h> ++#include <asm/uaccess.h> ++#include <asm/checksum.h> ++#include "br_private.h" ++#ifdef CONFIG_SYSCTL ++#include <linux/sysctl.h> ++#endif ++ ++#define skb_origaddr(skb) (((struct bridge_skb_cb *) \ ++ (skb->nf_bridge->data))->daddr.ipv4) ++#define store_orig_dstaddr(skb) (skb_origaddr(skb) = (skb)->nh.iph->daddr) ++#define dnat_took_place(skb) (skb_origaddr(skb) != (skb)->nh.iph->daddr) ++ ++#define has_bridge_parent(device) ((device)->br_port != NULL) ++#define bridge_parent(device) (&((device)->br_port->br->dev)) ++ ++#ifdef CONFIG_SYSCTL ++static struct ctl_table_header *brnf_sysctl_header; ++static int brnf_call_iptables = 1; ++static int brnf_call_ip6tables = 1; ++static int brnf_call_arptables = 1; ++static int brnf_filter_vlan_tagged = 1; ++#else ++#define brnf_filter_vlan_tagged 1 ++#endif ++ ++#define IS_VLAN_IP (skb->protocol == __constant_htons(ETH_P_8021Q) && \ ++ hdr->h_vlan_encapsulated_proto == __constant_htons(ETH_P_IP) && \ ++ brnf_filter_vlan_tagged) ++#define IS_VLAN_IPV6 (skb->protocol == __constant_htons(ETH_P_8021Q) && \ ++ hdr->h_vlan_encapsulated_proto == __constant_htons(ETH_P_IPV6) && \ ++ brnf_filter_vlan_tagged) ++/* ++#define IS_VLAN_ARP (skb->protocol == __constant_htons(ETH_P_8021Q) && \ ++ hdr->h_vlan_encapsulated_proto == __constant_htons(ETH_P_ARP) && \ ++ brnf_filter_vlan_tagged) ++*/ ++ ++/* We need these fake structures to make netfilter happy -- ++ * lots of places assume that skb->dst != NULL, which isn't ++ * all that unreasonable. ++ * ++ * Currently, we fill in the PMTU entry because netfilter ++ * refragmentation needs it, and the rt_flags entry because ++ * ipt_REJECT needs it. Future netfilter modules might ++ * require us to fill additional fields. ++ */ ++static struct net_device __fake_net_device = { ++ .hard_header_len = ETH_HLEN ++}; ++ ++static struct rtable __fake_rtable = { ++ u: { ++ dst: { ++ __refcnt: ATOMIC_INIT(1), ++ dev: &__fake_net_device, ++ pmtu: 1500 ++ } ++ }, ++ ++ rt_flags: 0 ++}; ++ ++ ++/* PF_BRIDGE/PRE_ROUTING *********************************************/ ++/* Undo the changes made for ip6tables PREROUTING and continue the ++ * bridge PRE_ROUTING hook. */ ++static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb) ++{ ++ struct nf_bridge_info *nf_bridge = skb->nf_bridge; ++ ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug ^= (1 << NF_BR_PRE_ROUTING); ++#endif ++ ++ if (nf_bridge->mask & BRNF_PKT_TYPE) { ++ skb->pkt_type = PACKET_OTHERHOST; ++ nf_bridge->mask ^= BRNF_PKT_TYPE; ++ } ++ nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING; ++ ++ skb->dst = (struct dst_entry *)&__fake_rtable; ++ dst_hold(skb->dst); ++ ++ skb->dev = nf_bridge->physindev; ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ skb_push(skb, VLAN_HLEN); ++ skb->nh.raw -= VLAN_HLEN; ++ } ++ NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, ++ br_handle_frame_finish, 1); ++ ++ return 0; ++} ++ ++static void __br_dnat_complain(void) ++{ ++ static unsigned long last_complaint; ++ ++ if (jiffies - last_complaint >= 5 * HZ) { ++ printk(KERN_WARNING "Performing cross-bridge DNAT requires IP " ++ "forwarding to be enabled\n"); ++ last_complaint = jiffies; ++ } ++} ++ ++ ++/* This requires some explaining. If DNAT has taken place, ++ * we will need to fix up the destination Ethernet address, ++ * and this is a tricky process. ++ * ++ * There are two cases to consider: ++ * 1. The packet was DNAT'ed to a device in the same bridge ++ * port group as it was received on. We can still bridge ++ * the packet. ++ * 2. The packet was DNAT'ed to a different device, either ++ * a non-bridged device or another bridge port group. ++ * The packet will need to be routed. ++ * ++ * The correct way of distinguishing between these two cases is to ++ * call ip_route_input() and to look at skb->dst->dev, which is ++ * changed to the destination device if ip_route_input() succeeds. ++ * ++ * Let us first consider the case that ip_route_input() succeeds: ++ * ++ * If skb->dst->dev equals the logical bridge device the packet ++ * came in on, we can consider this bridging. We then call ++ * skb->dst->output() which will make the packet enter br_nf_local_out() ++ * not much later. In that function it is assured that the iptables ++ * FORWARD chain is traversed for the packet. ++ * ++ * Otherwise, the packet is considered to be routed and we just ++ * change the destination MAC address so that the packet will ++ * later be passed up to the IP stack to be routed. ++ * ++ * Let us now consider the case that ip_route_input() fails: ++ * ++ * After a "echo '0' > /proc/sys/net/ipv4/ip_forward" ip_route_input() ++ * will fail, while __ip_route_output_key() will return success. The source ++ * address for __ip_route_output_key() is set to zero, so __ip_route_output_key ++ * thinks we're handling a locally generated packet and won't care ++ * if IP forwarding is allowed. We send a warning message to the users's ++ * log telling her to put IP forwarding on. ++ * ++ * ip_route_input() will also fail if there is no route available. ++ * In that case we just drop the packet. ++ * ++ * --Lennert, 20020411 ++ * --Bart, 20020416 (updated) ++ * --Bart, 20021007 (updated) ++ */ ++ ++static int br_nf_pre_routing_finish_bridge(struct sk_buff *skb) ++{ ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug |= (1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_FORWARD); ++#endif ++ ++ if (skb->pkt_type == PACKET_OTHERHOST) { ++ skb->pkt_type = PACKET_HOST; ++ skb->nf_bridge->mask |= BRNF_PKT_TYPE; ++ } ++ skb->nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING; ++ ++ skb->dev = bridge_parent(skb->dev); ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ skb_pull(skb, VLAN_HLEN); ++ skb->nh.raw += VLAN_HLEN; ++ } ++ skb->dst->output(skb); ++ return 0; ++} ++ ++static int br_nf_pre_routing_finish(struct sk_buff *skb) ++{ ++ struct net_device *dev = skb->dev; ++ struct iphdr *iph = skb->nh.iph; ++ struct nf_bridge_info *nf_bridge = skb->nf_bridge; ++ ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug ^= (1 << NF_BR_PRE_ROUTING); ++#endif ++ ++ if (nf_bridge->mask & BRNF_PKT_TYPE) { ++ skb->pkt_type = PACKET_OTHERHOST; ++ nf_bridge->mask ^= BRNF_PKT_TYPE; ++ } ++ nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING; ++ ++ if (dnat_took_place(skb)) { ++ if (ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, ++ dev)) { ++ struct rtable *rt; ++ ++ if (!ip_route_output(&rt, iph->daddr, 0, iph->tos, 0)) { ++ /* Bridged-and-DNAT'ed traffic doesn't ++ * require ip_forwarding. ++ */ ++ if (((struct dst_entry *)rt)->dev == dev) { ++ skb->dst = (struct dst_entry *)rt; ++ goto bridged_dnat; ++ } ++ __br_dnat_complain(); ++ dst_release((struct dst_entry *)rt); ++ } ++ kfree_skb(skb); ++ return 0; ++ } else { ++ if (skb->dst->dev == dev) { ++bridged_dnat: ++ /* Tell br_nf_local_out this is a ++ * bridged frame ++ */ ++ nf_bridge->mask |= BRNF_BRIDGED_DNAT; ++ skb->dev = nf_bridge->physindev; ++ if (skb->protocol == ++ __constant_htons(ETH_P_8021Q)) { ++ skb_push(skb, VLAN_HLEN); ++ skb->nh.raw -= VLAN_HLEN; ++ } ++ NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, ++ skb, skb->dev, NULL, ++ br_nf_pre_routing_finish_bridge, ++ 1); ++ return 0; ++ } ++ memcpy(skb->mac.ethernet->h_dest, dev->dev_addr, ++ ETH_ALEN); ++ skb->pkt_type = PACKET_HOST; ++ } ++ } else { ++ skb->dst = (struct dst_entry *)&__fake_rtable; ++ dst_hold(skb->dst); ++ } ++ ++ skb->dev = nf_bridge->physindev; ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ skb_push(skb, VLAN_HLEN); ++ skb->nh.raw -= VLAN_HLEN; ++ } ++ NF_HOOK_THRESH(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, ++ br_handle_frame_finish, 1); ++ ++ return 0; ++} ++ ++/* Some common code for IPv4/IPv6 */ ++static void setup_pre_routing(struct sk_buff *skb) ++{ ++ struct nf_bridge_info *nf_bridge = skb->nf_bridge; ++ ++ if (skb->pkt_type == PACKET_OTHERHOST) { ++ skb->pkt_type = PACKET_HOST; ++ nf_bridge->mask |= BRNF_PKT_TYPE; ++ } ++ ++ nf_bridge->mask |= BRNF_NF_BRIDGE_PREROUTING; ++ nf_bridge->physindev = skb->dev; ++ skb->dev = bridge_parent(skb->dev); ++} ++ ++/* We only check the length. A bridge shouldn't do any hop-by-hop stuff anyway */ ++static int check_hbh_len(struct sk_buff *skb) ++{ ++ unsigned char *raw = (u8*)(skb->nh.ipv6h+1); ++ u32 pkt_len; ++ int off = raw - skb->nh.raw; ++ int len = (raw[1]+1)<<3; ++ ++ if ((raw + len) - skb->data > skb_headlen(skb)) ++ goto bad; ++ ++ off += 2; ++ len -= 2; ++ ++ while (len > 0) { ++ int optlen = raw[off+1]+2; ++ ++ switch (skb->nh.raw[off]) { ++ case IPV6_TLV_PAD0: ++ optlen = 1; ++ break; ++ ++ case IPV6_TLV_PADN: ++ break; ++ ++ case IPV6_TLV_JUMBO: ++ if (skb->nh.raw[off+1] != 4 || (off&3) != 2) ++ goto bad; ++ ++ pkt_len = ntohl(*(u32*)(skb->nh.raw+off+2)); ++ ++ if (pkt_len > skb->len - sizeof(struct ipv6hdr)) ++ goto bad; ++ if (pkt_len + sizeof(struct ipv6hdr) < skb->len) { ++ if (__pskb_trim(skb, ++ pkt_len + sizeof(struct ipv6hdr))) ++ goto bad; ++ if (skb->ip_summed == CHECKSUM_HW) ++ skb->ip_summed = CHECKSUM_NONE; ++ } ++ break; ++ default: ++ if (optlen > len) ++ goto bad; ++ break; ++ } ++ off += optlen; ++ len -= optlen; ++ } ++ if (len == 0) ++ return 0; ++bad: ++ return -1; ++ ++} ++ ++/* Replicate the checks that IPv6 does on packet reception and pass the packet ++ * to ip6tables, which doesn't support NAT, so things are fairly simple. */ ++static unsigned int br_nf_pre_routing_ipv6(unsigned int hook, ++ struct sk_buff *skb, const struct net_device *in, ++ const struct net_device *out, int (*okfn)(struct sk_buff *)) ++{ ++ struct ipv6hdr *hdr; ++ u32 pkt_len; ++ struct nf_bridge_info *nf_bridge; ++ ++ if (skb->len < sizeof(struct ipv6hdr)) ++ goto inhdr_error; ++ ++ if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) ++ goto inhdr_error; ++ ++ hdr = skb->nh.ipv6h; ++ ++ if (hdr->version != 6) ++ goto inhdr_error; ++ ++ pkt_len = ntohs(hdr->payload_len); ++ ++ if (pkt_len || hdr->nexthdr != NEXTHDR_HOP) { ++ if (pkt_len + sizeof(struct ipv6hdr) > skb->len) ++ goto inhdr_error; ++ if (pkt_len + sizeof(struct ipv6hdr) < skb->len) { ++ if (__pskb_trim(skb, pkt_len + sizeof(struct ipv6hdr))) ++ goto inhdr_error; ++ if (skb->ip_summed == CHECKSUM_HW) ++ skb->ip_summed = CHECKSUM_NONE; ++ } ++ } ++ if (hdr->nexthdr == NEXTHDR_HOP && check_hbh_len(skb)) ++ goto inhdr_error; ++ ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug ^= (1 << NF_IP6_PRE_ROUTING); ++#endif ++ if ((nf_bridge = nf_bridge_alloc(skb)) == NULL) ++ return NF_DROP; ++ setup_pre_routing(skb); ++ ++ NF_HOOK(PF_INET6, NF_IP6_PRE_ROUTING, skb, skb->dev, NULL, ++ br_nf_pre_routing_finish_ipv6); ++ ++ return NF_STOLEN; ++ ++inhdr_error: ++ return NF_DROP; ++} ++ ++/* Direct IPv6 traffic to br_nf_pre_routing_ipv6. ++ * Replicate the checks that IPv4 does on packet reception. ++ * Set skb->dev to the bridge device (i.e. parent of the ++ * receiving device) to make netfilter happy, the REDIRECT ++ * target in particular. Save the original destination IP ++ * address to be able to detect DNAT afterwards. ++ */ ++static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb, ++ const struct net_device *in, const struct net_device *out, ++ int (*okfn)(struct sk_buff *)) ++{ ++ struct iphdr *iph; ++ __u32 len; ++ struct sk_buff *skb = *pskb; ++ struct nf_bridge_info *nf_bridge; ++ struct vlan_ethhdr *hdr = (struct vlan_ethhdr *) ++ ((*pskb)->mac.ethernet); ++ ++ if (skb->protocol == __constant_htons(ETH_P_IPV6) || IS_VLAN_IPV6) { ++#ifdef CONFIG_SYSCTL ++ if (!brnf_call_ip6tables) ++ return NF_ACCEPT; ++#endif ++ if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL) ++ goto out; ++ ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ skb_pull(skb, VLAN_HLEN); ++ (skb)->nh.raw += VLAN_HLEN; ++ } ++ return br_nf_pre_routing_ipv6(hook, skb, in, out, okfn); ++ } ++ ++#ifdef CONFIG_SYSCTL ++ if (!brnf_call_iptables) ++ return NF_ACCEPT; ++#endif ++ ++ if (skb->protocol != __constant_htons(ETH_P_IP) && !IS_VLAN_IP) ++ return NF_ACCEPT; ++ if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL) ++ goto out; ++ ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ skb_pull(skb, VLAN_HLEN); ++ (skb)->nh.raw += VLAN_HLEN; ++ } ++ ++ if (!pskb_may_pull(skb, sizeof(struct iphdr))) ++ goto inhdr_error; ++ ++ iph = skb->nh.iph; ++ if (iph->ihl < 5 || iph->version != 4) ++ goto inhdr_error; ++ ++ if (!pskb_may_pull(skb, 4*iph->ihl)) ++ goto inhdr_error; ++ ++ iph = skb->nh.iph; ++ if (ip_fast_csum((__u8 *)iph, iph->ihl) != 0) ++ goto inhdr_error; ++ ++ len = ntohs(iph->tot_len); ++ if (skb->len < len || len < 4*iph->ihl) ++ goto inhdr_error; ++ ++ if (skb->len > len) { ++ __pskb_trim(skb, len); ++ if (skb->ip_summed == CHECKSUM_HW) ++ skb->ip_summed = CHECKSUM_NONE; ++ } ++ ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug ^= (1 << NF_IP_PRE_ROUTING); ++#endif ++ if ((nf_bridge = nf_bridge_alloc(skb)) == NULL) ++ return NF_DROP; ++ ++ setup_pre_routing(skb); ++ store_orig_dstaddr(skb); ++ ++ NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, skb->dev, NULL, ++ br_nf_pre_routing_finish); ++ ++ return NF_STOLEN; ++ ++inhdr_error: ++// IP_INC_STATS_BH(IpInHdrErrors); ++out: ++ return NF_DROP; ++} ++ ++ ++/* PF_BRIDGE/LOCAL_IN ************************************************/ ++/* The packet is locally destined, which requires a real ++ * dst_entry, so detach the fake one. On the way up, the ++ * packet would pass through PRE_ROUTING again (which already ++ * took place when the packet entered the bridge), but we ++ * register an IPv4 PRE_ROUTING 'sabotage' hook that will ++ * prevent this from happening. ++ */ ++static unsigned int br_nf_local_in(unsigned int hook, struct sk_buff **pskb, ++ const struct net_device *in, const struct net_device *out, ++ int (*okfn)(struct sk_buff *)) ++{ ++ struct sk_buff *skb = *pskb; ++ ++ if (skb->dst == (struct dst_entry *)&__fake_rtable) { ++ dst_release(skb->dst); ++ skb->dst = NULL; ++ } ++ ++ return NF_ACCEPT; ++} ++ ++/* PF_BRIDGE/FORWARD *************************************************/ ++static int br_nf_forward_finish(struct sk_buff *skb) ++{ ++ struct nf_bridge_info *nf_bridge = skb->nf_bridge; ++ struct net_device *in; ++/* struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)(skb->mac.ethernet);*/ ++ ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug ^= (1 << NF_BR_FORWARD); ++#endif ++ ++/* if (skb->protocol != __constant_htons(ETH_P_ARP) && !IS_VLAN_ARP) {*/ ++ in = nf_bridge->physindev; ++ if (nf_bridge->mask & BRNF_PKT_TYPE) { ++ skb->pkt_type = PACKET_OTHERHOST; ++ nf_bridge->mask ^= BRNF_PKT_TYPE; ++ } ++/* } else { ++ in = *((struct net_device **)(skb->cb)); ++ }*/ ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ skb_push(skb, VLAN_HLEN); ++ skb->nh.raw -= VLAN_HLEN; ++ } ++ NF_HOOK_THRESH(PF_BRIDGE, NF_BR_FORWARD, skb, in, ++ skb->dev, br_forward_finish, 1); ++ return 0; ++} ++ ++/* This is the 'purely bridged' case. For IP, we pass the packet to ++ * netfilter with indev and outdev set to the bridge device, ++ * but we are still able to filter on the 'real' indev/outdev ++ * because of the ipt_physdev.c module. For ARP, indev and outdev are the ++ * bridge ports. ++ */ ++static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff **pskb, ++ const struct net_device *in, const struct net_device *out, ++ int (*okfn)(struct sk_buff *)) ++{ ++ struct sk_buff *skb = *pskb; ++ struct nf_bridge_info *nf_bridge; ++ struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)(skb->mac.ethernet); ++ int pf; ++ ++ if (!skb->nf_bridge) ++ return NF_ACCEPT; ++ ++ if (skb->protocol == __constant_htons(ETH_P_IP) || IS_VLAN_IP) ++ pf = PF_INET; ++ else ++ pf = PF_INET6; ++ ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ skb_pull(*pskb, VLAN_HLEN); ++ (*pskb)->nh.raw += VLAN_HLEN; ++ } ++ ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug ^= (1 << NF_BR_FORWARD); ++#endif ++ nf_bridge = skb->nf_bridge; ++ if (skb->pkt_type == PACKET_OTHERHOST) { ++ skb->pkt_type = PACKET_HOST; ++ nf_bridge->mask |= BRNF_PKT_TYPE; ++ } ++ ++ /* The physdev module checks on this */ ++ nf_bridge->mask |= BRNF_BRIDGED; ++ nf_bridge->physoutdev = skb->dev; ++ ++ NF_HOOK(pf, NF_IP_FORWARD, skb, bridge_parent(in), ++ bridge_parent(out), br_nf_forward_finish); ++ ++ return NF_STOLEN; ++} ++ ++/* ++static unsigned int br_nf_forward_arp(unsigned int hook, struct sk_buff **pskb, ++ const struct net_device *in, const struct net_device *out, ++ int (*okfn)(struct sk_buff *)) ++{ ++ struct sk_buff *skb = *pskb; ++ struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)(skb->mac.ethernet); ++ struct net_device **d = (struct net_device **)(skb->cb); ++ ++ if (!brnf_call_arptables) ++ return NF_ACCEPT; ++ ++ if (skb->protocol != __constant_htons(ETH_P_ARP)) { ++ if (!IS_VLAN_ARP) ++ return NF_ACCEPT; ++ skb_pull(*pskb, VLAN_HLEN); ++ (*pskb)->nh.raw += VLAN_HLEN; ++ } ++ ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug ^= (1 << NF_BR_FORWARD); ++#endif ++ ++ if (skb->nh.arph->ar_pln != 4) { ++ if (IS_VLAN_ARP) { ++ skb_push(*pskb, VLAN_HLEN); ++ (*pskb)->nh.raw -= VLAN_HLEN; ++ } ++ return NF_ACCEPT; ++ } ++ *d = (struct net_device *)in; ++ NF_HOOK(NF_ARP, NF_ARP_FORWARD, skb, (struct net_device *)in, ++ (struct net_device *)out, br_nf_forward_finish); ++ ++ return NF_STOLEN; ++} ++*/ ++ ++/* PF_BRIDGE/LOCAL_OUT ***********************************************/ ++static int br_nf_local_out_finish(struct sk_buff *skb) ++{ ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug &= ~(1 << NF_BR_LOCAL_OUT); ++#endif ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ skb_push(skb, VLAN_HLEN); ++ skb->nh.raw -= VLAN_HLEN; ++ } ++ ++ NF_HOOK_THRESH(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, ++ br_forward_finish, NF_BR_PRI_FIRST + 1); ++ ++ return 0; ++} ++ ++ ++/* This function sees both locally originated IP packets and forwarded ++ * IP packets (in both cases the destination device is a bridge ++ * device). It also sees bridged-and-DNAT'ed packets. ++ * To be able to filter on the physical bridge devices (with the ipt_physdev.c ++ * module), we steal packets destined to a bridge device away from the ++ * PF_INET/FORWARD and PF_INET/OUTPUT hook functions, and give them back later, ++ * when we have determined the real output device. This is done in here. ++ * ++ * If (nf_bridge->mask & BRNF_BRIDGED_DNAT) then the packet is bridged ++ * and we fake the PF_BRIDGE/FORWARD hook. The function br_nf_forward() ++ * will then fake the PF_INET/FORWARD hook. br_nf_local_out() has priority ++ * NF_BR_PRI_FIRST, so no relevant PF_BRIDGE/INPUT functions have been nor ++ * will be executed. ++ * Otherwise, if nf_bridge->physindev is NULL, the bridge-nf code never touched ++ * this packet before, and so the packet was locally originated. We fake ++ * the PF_INET/LOCAL_OUT hook. ++ * Finally, if nf_bridge->physindev isn't NULL, then the packet was IP routed, ++ * so we fake the PF_INET/FORWARD hook. ipv4_sabotage_out() makes sure ++ * even routed packets that didn't arrive on a bridge interface have their ++ * nf_bridge->physindev set. ++ */ ++ ++static unsigned int br_nf_local_out(unsigned int hook, struct sk_buff **pskb, ++ const struct net_device *in, const struct net_device *out, ++ int (*okfn)(struct sk_buff *)) ++{ ++ struct net_device *realindev, *realoutdev; ++ struct sk_buff *skb = *pskb; ++ struct nf_bridge_info *nf_bridge; ++ struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)(skb->mac.ethernet); ++ int pf; ++ ++ if (!skb->nf_bridge) ++ return NF_ACCEPT; ++ ++ if (skb->protocol == __constant_htons(ETH_P_IP) || IS_VLAN_IP) ++ pf = PF_INET; ++ else ++ pf = PF_INET6; ++ ++#ifdef CONFIG_NETFILTER_DEBUG ++ /* Sometimes we get packets with NULL ->dst here (for example, ++ * running a dhcp client daemon triggers this). This should now ++ * be fixed, but let's keep the check around. */ ++ if (skb->dst == NULL) { ++ printk(KERN_CRIT "br_netfilter: skb->dst == NULL."); ++ return NF_ACCEPT; ++ } ++#endif ++ ++ nf_bridge = skb->nf_bridge; ++ nf_bridge->physoutdev = skb->dev; ++ realindev = nf_bridge->physindev; ++ ++ /* Bridged, take PF_BRIDGE/FORWARD. ++ * (see big note in front of br_nf_pre_routing_finish) ++ */ ++ if (nf_bridge->mask & BRNF_BRIDGED_DNAT) { ++ if (nf_bridge->mask & BRNF_PKT_TYPE) { ++ skb->pkt_type = PACKET_OTHERHOST; ++ nf_bridge->mask ^= BRNF_PKT_TYPE; ++ } ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ skb_push(skb, VLAN_HLEN); ++ skb->nh.raw -= VLAN_HLEN; ++ } ++ ++ NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, realindev, ++ skb->dev, br_forward_finish); ++ goto out; ++ } ++ realoutdev = bridge_parent(skb->dev); ++ ++#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) ++ /* iptables should match -o br0.x */ ++ if (nf_bridge->netoutdev) ++ realoutdev = nf_bridge->netoutdev; ++#endif ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ skb_pull(skb, VLAN_HLEN); ++ (*pskb)->nh.raw += VLAN_HLEN; ++ } ++ /* IP forwarded traffic has a physindev, locally ++ * generated traffic hasn't. ++ */ ++ if (realindev != NULL) { ++ if (((nf_bridge->mask & BRNF_DONT_TAKE_PARENT) == 0) && ++ has_bridge_parent(realindev)) ++ realindev = bridge_parent(realindev); ++ NF_HOOK_THRESH(pf, NF_IP_FORWARD, skb, realindev, ++ realoutdev, okfn, ++ NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD + 1); ++ } else { ++#ifdef CONFIG_NETFILTER_DEBUG ++ skb->nf_debug ^= (1 << NF_IP_LOCAL_OUT); ++#endif ++ ++ NF_HOOK_THRESH(pf, NF_IP_LOCAL_OUT, skb, realindev, ++ realoutdev, okfn, ++ NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT + 1); ++ } ++ ++out: ++ return NF_STOLEN; ++} ++ ++ ++/* PF_BRIDGE/POST_ROUTING ********************************************/ ++static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, ++ const struct net_device *in, const struct net_device *out, ++ int (*okfn)(struct sk_buff *)) ++{ ++ struct sk_buff *skb = *pskb; ++ struct nf_bridge_info *nf_bridge = (*pskb)->nf_bridge; ++ struct vlan_ethhdr *hdr = (struct vlan_ethhdr *)(skb->mac.ethernet); ++ struct net_device *realoutdev = bridge_parent(skb->dev); ++ int pf; ++ ++#ifdef CONFIG_NETFILTER_DEBUG ++ /* Be very paranoid. This probably won't happen anymore, but let's ++ * keep the check just to be sure... */ ++ if (skb->mac.raw < skb->head || skb->mac.raw + ETH_HLEN > skb->data) { ++ printk(KERN_CRIT "br_netfilter: Argh!! br_nf_post_routing: " ++ "bad mac.raw pointer."); ++ goto print_error; ++ } ++#endif ++ ++ if (!nf_bridge) ++ return NF_ACCEPT; ++ ++ if (skb->protocol == __constant_htons(ETH_P_IP) || IS_VLAN_IP) ++ pf = PF_INET; ++ else ++ pf = PF_INET6; ++ ++ /* Sometimes we get packets with NULL ->dst here (for example, ++ * running a dhcp client daemon triggers this). ++ */ ++ if (skb->dst == NULL) ++ return NF_ACCEPT; ++ ++#ifdef CONFIG_NETFILTER_DEBUG ++ /* Sometimes we get packets with NULL ->dst here (for example, ++ * running a dhcp client daemon triggers this). This should now ++ * be fixed, but let's keep the check around. ++ */ ++ if (skb->dst == NULL) { ++ printk(KERN_CRIT "br_netfilter: skb->dst == NULL."); ++ goto print_error; ++ } ++ ++ skb->nf_debug ^= (1 << NF_IP_POST_ROUTING); ++#endif ++ ++ /* We assume any code from br_dev_queue_push_xmit onwards doesn't care ++ * about the value of skb->pkt_type. ++ */ ++ if (skb->pkt_type == PACKET_OTHERHOST) { ++ skb->pkt_type = PACKET_HOST; ++ nf_bridge->mask |= BRNF_PKT_TYPE; ++ } ++ ++ if (skb->protocol == __constant_htons(ETH_P_8021Q)) { ++ skb_pull(skb, VLAN_HLEN); ++ skb->nh.raw += VLAN_HLEN; ++ } ++ ++ nf_bridge_save_header(skb); ++ ++#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) ++ if (nf_bridge->netoutdev) ++ realoutdev = nf_bridge->netoutdev; ++#endif ++ NF_HOOK(pf, NF_IP_POST_ROUTING, skb, NULL, ++ realoutdev, br_dev_queue_push_xmit); ++ ++ return NF_STOLEN; ++ ++#ifdef CONFIG_NETFILTER_DEBUG ++print_error: ++ if (skb->dev != NULL) { ++ printk("[%s]", skb->dev->name); ++ if (has_bridge_parent(skb->dev)) ++ printk("[%s]", bridge_parent(skb->dev)->name); ++ } ++ printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw, ++ skb->data); ++ return NF_ACCEPT; ++#endif ++} ++ ++ ++/* IPv4/SABOTAGE *****************************************************/ ++ ++/* Don't hand locally destined packets to PF_INET/PRE_ROUTING ++ * for the second time. ++ */ ++static unsigned int ip_sabotage_in(unsigned int hook, struct sk_buff **pskb, ++ const struct net_device *in, const struct net_device *out, ++ int (*okfn)(struct sk_buff *)) ++{ ++ if ((*pskb)->nf_bridge && ++ !((*pskb)->nf_bridge->mask & BRNF_NF_BRIDGE_PREROUTING)) { ++ return NF_STOP; ++ } ++ ++ return NF_ACCEPT; ++} ++ ++/* Postpone execution of PF_INET/FORWARD, PF_INET/LOCAL_OUT ++ * and PF_INET/POST_ROUTING until we have done the forwarding ++ * decision in the bridge code and have determined skb->physoutdev. ++ */ ++static unsigned int ip_sabotage_out(unsigned int hook, struct sk_buff **pskb, ++ const struct net_device *in, const struct net_device *out, ++ int (*okfn)(struct sk_buff *)) ++{ ++ struct sk_buff *skb = *pskb; ++ ++ if ((out->hard_start_xmit == br_dev_xmit && ++ okfn != br_nf_forward_finish && ++ okfn != br_nf_local_out_finish && ++ okfn != br_dev_queue_push_xmit) ++#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) ++ || ((out->priv_flags & IFF_802_1Q_VLAN) && ++ VLAN_DEV_INFO(out)->real_dev->hard_start_xmit == br_dev_xmit) ++#endif ++ ) { ++ struct nf_bridge_info *nf_bridge; ++ ++ if (!skb->nf_bridge) { ++#ifdef CONFIG_SYSCTL ++ /* This code is executed while in the IP(v6) stack, ++ the version should be 4 or 6. We can't use ++ skb->protocol because that isn't set on ++ PF_INET(6)/LOCAL_OUT. */ ++ struct iphdr *ip = skb->nh.iph; ++ ++ if (ip->version == 4 && !brnf_call_iptables) ++ return NF_ACCEPT; ++ else if (ip->version == 6 && !brnf_call_ip6tables) ++ return NF_ACCEPT; ++#endif ++ if (hook == NF_IP_POST_ROUTING) ++ return NF_ACCEPT; ++ if (!nf_bridge_alloc(skb)) ++ return NF_DROP; ++ } ++ ++ nf_bridge = skb->nf_bridge; ++ ++ /* This frame will arrive on PF_BRIDGE/LOCAL_OUT and we ++ * will need the indev then. For a brouter, the real indev ++ * can be a bridge port, so we make sure br_nf_local_out() ++ * doesn't use the bridge parent of the indev by using ++ * the BRNF_DONT_TAKE_PARENT mask. ++ */ ++ if (hook == NF_IP_FORWARD && nf_bridge->physindev == NULL) { ++ nf_bridge->mask &= BRNF_DONT_TAKE_PARENT; ++ nf_bridge->physindev = (struct net_device *)in; ++ } ++#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) ++ /* the iptables outdev is br0.x, not br0 */ ++ if (out->priv_flags & IFF_802_1Q_VLAN) ++ nf_bridge->netoutdev = (struct net_device *)out; ++#endif ++ return NF_STOP; ++ } ++ ++ return NF_ACCEPT; ++} ++ ++/* For br_nf_local_out we need (prio = NF_BR_PRI_FIRST), to insure that innocent ++ * PF_BRIDGE/NF_BR_LOCAL_OUT functions don't get bridged traffic as input. ++ * For br_nf_post_routing, we need (prio = NF_BR_PRI_LAST), because ++ * ip_refrag() can return NF_STOLEN. ++ */ ++static struct nf_hook_ops br_nf_ops[] = { ++ { .hook = br_nf_pre_routing, ++ .pf = PF_BRIDGE, ++ .hooknum = NF_BR_PRE_ROUTING, ++ .priority = NF_BR_PRI_BRNF, }, ++ { .hook = br_nf_local_in, ++ .pf = PF_BRIDGE, ++ .hooknum = NF_BR_LOCAL_IN, ++ .priority = NF_BR_PRI_BRNF, }, ++ { .hook = br_nf_forward_ip, ++ .pf = PF_BRIDGE, ++ .hooknum = NF_BR_FORWARD, ++ .priority = NF_BR_PRI_BRNF /*- 1*/, }, ++/* { .hook = br_nf_forward_arp, ++ .pf = PF_BRIDGE, ++ .hooknum = NF_BR_FORWARD, ++ .priority = NF_BR_PRI_BRNF, },*/ ++ { .hook = br_nf_local_out, ++ .pf = PF_BRIDGE, ++ .hooknum = NF_BR_LOCAL_OUT, ++ .priority = NF_BR_PRI_FIRST, }, ++ { .hook = br_nf_post_routing, ++ .pf = PF_BRIDGE, ++ .hooknum = NF_BR_POST_ROUTING, ++ .priority = NF_BR_PRI_LAST, }, ++ { .hook = ip_sabotage_in, ++ .pf = PF_INET, ++ .hooknum = NF_IP_PRE_ROUTING, ++ .priority = NF_IP_PRI_FIRST, }, ++ { .hook = ip_sabotage_in, ++ .pf = PF_INET6, ++ .hooknum = NF_IP6_PRE_ROUTING, ++ .priority = NF_IP6_PRI_FIRST, }, ++ { .hook = ip_sabotage_out, ++ .pf = PF_INET, ++ .hooknum = NF_IP_FORWARD, ++ .priority = NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD, }, ++ { .hook = ip_sabotage_out, ++ .pf = PF_INET6, ++ .hooknum = NF_IP6_FORWARD, ++ .priority = NF_IP6_PRI_BRIDGE_SABOTAGE_FORWARD, }, ++ { .hook = ip_sabotage_out, ++ .pf = PF_INET, ++ .hooknum = NF_IP_LOCAL_OUT, ++ .priority = NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT, }, ++ { .hook = ip_sabotage_out, ++ .pf = PF_INET6, ++ .hooknum = NF_IP6_LOCAL_OUT, ++ .priority = NF_IP6_PRI_BRIDGE_SABOTAGE_LOCAL_OUT, }, ++ { .hook = ip_sabotage_out, ++ .pf = PF_INET, ++ .hooknum = NF_IP_POST_ROUTING, ++ .priority = NF_IP_PRI_FIRST, }, ++ { .hook = ip_sabotage_out, ++ .pf = PF_INET6, ++ .hooknum = NF_IP6_POST_ROUTING, ++ .priority = NF_IP6_PRI_FIRST, }, ++}; ++ ++#ifdef CONFIG_SYSCTL ++static ++int brnf_sysctl_call_tables(ctl_table *ctl, int write, struct file * filp, ++ void *buffer, size_t *lenp) ++{ ++ int ret; ++ ++ ret = proc_dointvec(ctl, write, filp, buffer, lenp); ++ ++ if (write && *(int *)(ctl->data)) ++ *(int *)(ctl->data) = 1; ++ return ret; ++} ++ ++static ctl_table brnf_table[] = { ++ { ++ .ctl_name = NET_BRIDGE_NF_CALL_ARPTABLES, ++ .procname = "bridge-nf-call-arptables", ++ .data = &brnf_call_arptables, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = &brnf_sysctl_call_tables, ++ }, ++ { ++ .ctl_name = NET_BRIDGE_NF_CALL_IPTABLES, ++ .procname = "bridge-nf-call-iptables", ++ .data = &brnf_call_iptables, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = &brnf_sysctl_call_tables, ++ }, ++ { ++ .ctl_name = NET_BRIDGE_NF_CALL_IP6TABLES, ++ .procname = "bridge-nf-call-ip6tables", ++ .data = &brnf_call_ip6tables, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = &brnf_sysctl_call_tables, ++ }, ++ { ++ .ctl_name = NET_BRIDGE_NF_FILTER_VLAN_TAGGED, ++ .procname = "bridge-nf-filter-vlan-tagged", ++ .data = &brnf_filter_vlan_tagged, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = &brnf_sysctl_call_tables, ++ }, ++ { .ctl_name = 0 } ++}; ++ ++static ctl_table brnf_bridge_table[] = { ++ { ++ .ctl_name = NET_BRIDGE, ++ .procname = "bridge", ++ .mode = 0555, ++ .child = brnf_table, ++ }, ++ { .ctl_name = 0 } ++}; ++ ++static ctl_table brnf_net_table[] = { ++ { ++ .ctl_name = CTL_NET, ++ .procname = "net", ++ .mode = 0555, ++ .child = brnf_bridge_table, ++ }, ++ { .ctl_name = 0 } ++}; ++#endif ++ ++int br_netfilter_init(void) ++{ ++ int i; ++ ++ for (i = 0; i < ARRAY_SIZE(br_nf_ops); i++) { ++ int ret; ++ ++ if ((ret = nf_register_hook(&br_nf_ops[i])) >= 0) ++ continue; ++ ++ while (i--) ++ nf_unregister_hook(&br_nf_ops[i]); ++ ++ return ret; ++ } ++ ++#ifdef CONFIG_SYSCTL ++ brnf_sysctl_header = register_sysctl_table(brnf_net_table, 0); ++ if (brnf_sysctl_header == NULL) { ++ printk(KERN_WARNING "br_netfilter: can't register to sysctl.\n"); ++ for (i = 0; i < ARRAY_SIZE(br_nf_ops); i++) ++ nf_unregister_hook(&br_nf_ops[i]); ++ return -EFAULT; ++ } ++#endif ++ ++ printk(KERN_NOTICE "Bridge firewalling registered\n"); ++ ++ return 0; ++} ++ ++void br_netfilter_fini(void) ++{ ++ int i; ++ ++ for (i = ARRAY_SIZE(br_nf_ops) - 1; i >= 0; i--) ++ nf_unregister_hook(&br_nf_ops[i]); ++#ifdef CONFIG_SYSCTL ++ unregister_sysctl_table(brnf_sysctl_header); ++#endif ++ ++} +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/net/ipv4/netfilter/ipt_physdev.c 2005-03-14 00:00:30.000000000 +0100 +@@ -0,0 +1,127 @@ ++/* Kernel module to match the bridge port in and ++ * out device for IP packets coming into contact with a bridge. */ ++#include <linux/module.h> ++#include <linux/skbuff.h> ++#include <linux/netfilter_ipv4/ipt_physdev.h> ++#include <linux/netfilter_ipv4/ip_tables.h> ++#include <linux/netfilter_bridge.h> ++#include <linux/netdevice.h> ++#define MATCH 1 ++#define NOMATCH 0 ++ ++static int ++match(const struct sk_buff *skb, ++ const struct net_device *in, ++ const struct net_device *out, ++ const void *matchinfo, ++ int offset, ++ const void *hdr, ++ u_int16_t datalen, ++ int *hotdrop) ++{ ++ int i; ++ static const char nulldevname[IFNAMSIZ] = { 0 }; ++ const struct ipt_physdev_info *info = matchinfo; ++ unsigned long ret; ++ const char *indev, *outdev; ++ struct nf_bridge_info *nf_bridge; ++ ++ /* Not a bridged IP packet or no info available yet: ++ * LOCAL_OUT/mangle and LOCAL_OUT/nat don't know if ++ * the destination device will be a bridge. */ ++ if (!(nf_bridge = skb->nf_bridge)) { ++ /* Return MATCH if the invert flags of the used options are on */ ++ if ((info->bitmask & IPT_PHYSDEV_OP_BRIDGED) && ++ !(info->invert & IPT_PHYSDEV_OP_BRIDGED)) ++ return NOMATCH; ++ if ((info->bitmask & IPT_PHYSDEV_OP_ISIN) && ++ !(info->invert & IPT_PHYSDEV_OP_ISIN)) ++ return NOMATCH; ++ if ((info->bitmask & IPT_PHYSDEV_OP_ISOUT) && ++ !(info->invert & IPT_PHYSDEV_OP_ISOUT)) ++ return NOMATCH; ++ if ((info->bitmask & IPT_PHYSDEV_OP_IN) && ++ !(info->invert & IPT_PHYSDEV_OP_IN)) ++ return NOMATCH; ++ if ((info->bitmask & IPT_PHYSDEV_OP_OUT) && ++ !(info->invert & IPT_PHYSDEV_OP_OUT)) ++ return NOMATCH; ++ return MATCH; ++ } ++ ++ /* This only makes sense in the FORWARD and POSTROUTING chains */ ++ if ((info->bitmask & IPT_PHYSDEV_OP_BRIDGED) && ++ (!!(nf_bridge->mask & BRNF_BRIDGED) ^ ++ !(info->invert & IPT_PHYSDEV_OP_BRIDGED))) ++ return NOMATCH; ++ ++ if ((info->bitmask & IPT_PHYSDEV_OP_ISIN && ++ (!nf_bridge->physindev ^ !!(info->invert & IPT_PHYSDEV_OP_ISIN))) || ++ (info->bitmask & IPT_PHYSDEV_OP_ISOUT && ++ (!nf_bridge->physoutdev ^ !!(info->invert & IPT_PHYSDEV_OP_ISOUT)))) ++ return NOMATCH; ++ ++ if (!(info->bitmask & IPT_PHYSDEV_OP_IN)) ++ goto match_outdev; ++ indev = nf_bridge->physindev ? nf_bridge->physindev->name : nulldevname; ++ for (i = 0, ret = 0; i < IFNAMSIZ/sizeof(unsigned long); i++) { ++ ret |= (((const unsigned long *)indev)[i] ++ ^ ((const unsigned long *)info->physindev)[i]) ++ & ((const unsigned long *)info->in_mask)[i]; ++ } ++ ++ if ((ret == 0) ^ !(info->invert & IPT_PHYSDEV_OP_IN)) ++ return NOMATCH; ++ ++match_outdev: ++ if (!(info->bitmask & IPT_PHYSDEV_OP_OUT)) ++ return MATCH; ++ outdev = nf_bridge->physoutdev ? ++ nf_bridge->physoutdev->name : nulldevname; ++ for (i = 0, ret = 0; i < IFNAMSIZ/sizeof(unsigned long); i++) { ++ ret |= (((const unsigned long *)outdev)[i] ++ ^ ((const unsigned long *)info->physoutdev)[i]) ++ & ((const unsigned long *)info->out_mask)[i]; ++ } ++ ++ return (ret != 0) ^ !(info->invert & IPT_PHYSDEV_OP_OUT); ++} ++ ++static int ++checkentry(const char *tablename, ++ const struct ipt_ip *ip, ++ void *matchinfo, ++ unsigned int matchsize, ++ unsigned int hook_mask) ++{ ++ const struct ipt_physdev_info *info = matchinfo; ++ ++ if (matchsize != IPT_ALIGN(sizeof(struct ipt_physdev_info))) ++ return 0; ++ if (!(info->bitmask & IPT_PHYSDEV_OP_MASK) || ++ info->bitmask & ~IPT_PHYSDEV_OP_MASK) ++ return 0; ++ return 1; ++} ++ ++static struct ipt_match physdev_match = { ++ .name = "physdev", ++ .match = &match, ++ .checkentry = &checkentry, ++ .me = THIS_MODULE, ++}; ++ ++static int __init init(void) ++{ ++ return ipt_register_match(&physdev_match); ++} ++ ++static void __exit fini(void) ++{ ++ ipt_unregister_match(&physdev_match); ++} ++ ++module_init(init); ++module_exit(fini); ++MODULE_LICENSE("GPL"); ++EXPORT_NO_SYMBOLS; +--- /dev/null 2005-03-14 20:10:29.001600248 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/netfilter_ipv4/ipt_physdev.h 2005-03-14 21:24:30.000000000 +0100 +@@ -0,0 +1,24 @@ ++#ifndef _IPT_PHYSDEV_H ++#define _IPT_PHYSDEV_H ++ ++#ifdef __KERNEL__ ++#include <linux/if.h> ++#endif ++ ++#define IPT_PHYSDEV_OP_IN 0x01 ++#define IPT_PHYSDEV_OP_OUT 0x02 ++#define IPT_PHYSDEV_OP_BRIDGED 0x04 ++#define IPT_PHYSDEV_OP_ISIN 0x08 ++#define IPT_PHYSDEV_OP_ISOUT 0x10 ++#define IPT_PHYSDEV_OP_MASK (0x20 - 1) ++ ++struct ipt_physdev_info { ++ char physindev[IFNAMSIZ]; ++ char in_mask[IFNAMSIZ]; ++ char physoutdev[IFNAMSIZ]; ++ char out_mask[IFNAMSIZ]; ++ u_int8_t invert; ++ u_int8_t bitmask; ++}; ++ ++#endif /*_IPT_PHYSDEV_H*/ +--- linux-2.4.29/net/8021q/vlan_dev.c 2005-01-19 15:10:13.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/net/8021q/vlan_dev.c 2005-03-14 00:00:30.000000000 +0100 +@@ -488,6 +488,10 @@ int vlan_dev_hard_start_xmit(struct sk_b + stats->tx_packets++; /* for statics only */ + stats->tx_bytes += skb->len; + ++ skb->protocol = __constant_htons(ETH_P_8021Q); ++ skb->mac.raw -= VLAN_HLEN; ++ skb->nh.raw -= VLAN_HLEN; ++ + skb->dev = VLAN_DEV_INFO(dev)->real_dev; + dev_queue_xmit(skb); + +--- linux-2.4.29/include/linux/sysctl.h 2005-01-19 15:10:13.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/include/linux/sysctl.h 2005-03-14 21:07:18.000000000 +0100 +@@ -608,6 +608,15 @@ enum { + NET_DECNET_CONF_DEV_STATE = 7 + }; + ++/* /proc/sys/net/bridge */ ++enum { ++ NET_BRIDGE_NF_CALL_ARPTABLES = 1, ++ NET_BRIDGE_NF_CALL_IPTABLES = 2, ++ NET_BRIDGE_NF_CALL_IP6TABLES = 3, ++ NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4, ++}; ++ ++ + /* CTL_PROC names: */ + + /* CTL_FS names: */ +--- linux-2.4.29/net/ipv4/netfilter/ipt_REJECT.c 2005-01-19 15:10:13.000000000 +0100 ++++ linux-2.4.29-ebt-brnf/net/ipv4/netfilter/ipt_REJECT.c 2005-03-14 00:00:30.000000000 +0100 +@@ -15,6 +15,9 @@ + #include <net/route.h> + #include <linux/netfilter_ipv4/ip_tables.h> + #include <linux/netfilter_ipv4/ipt_REJECT.h> ++#ifdef CONFIG_BRIDGE_NETFILTER ++#include <linux/netfilter_bridge.h> ++#endif + + #if 0 + #define DEBUGP printk +@@ -29,7 +32,13 @@ static inline struct rtable *route_rever + struct rt_key key = {}; + struct rtable *rt; + +- if (hook != NF_IP_FORWARD) { ++ /* We don't require ip forwarding to be enabled to be able to ++ * send a RST reply for bridged traffic. */ ++ if (hook != NF_IP_FORWARD ++#ifdef CONFIG_BRIDGE_NETFILTER ++ || (skb->nf_bridge && skb->nf_bridge->mask & BRNF_BRIDGED) ++#endif ++ ) { + key.dst = iph->saddr; + if (hook == NF_IP_LOCAL_IN) + key.src = iph->daddr; diff --git a/recipes/linux/linux-wrt-2.4.30/303-mppe-mppc b/recipes/linux/linux-wrt-2.4.30/303-mppe-mppc new file mode 100644 index 0000000000..44f7e18a17 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/303-mppe-mppc @@ -0,0 +1,1648 @@ +MPPE/MPPC kernel module for Linux + +Microsoft Point-to-Point Encryption / Compression support + + http://www.polbox.com/h/hs001/linux-2.4.29-mppe-mppc-1.3.patch.gz + +diff -ruN linux-2.4.29.orig/Documentation/Configure.help linux-2.4.29/Documentation/Configure.help +--- linux-2.4.29.orig/Documentation/Configure.help 2005-02-02 22:18:18.000000000 +0100 ++++ linux-2.4.29/Documentation/Configure.help 2005-02-02 22:26:37.000000000 +0100 +@@ -9969,6 +9969,28 @@ + module; it is called bsd_comp.o and will show up in the directory + modules once you have said "make modules". If unsure, say N. + ++Microsoft PPP compression/encryption (MPPC/MPPE) ++CONFIG_PPP_MPPE_MPPC ++ Support for the Microsoft Point-To-Point Compression (RFC2118) and ++ Microsoft Point-To-Point Encryption (RFC3078). These protocols are ++ supported by Microsoft Windows and wide range of "hardware" access ++ servers. MPPE is common protocol in Virtual Private Networks. According ++ to RFC3078, MPPE supports 40, 56 and 128-bit key lengths. Depending on ++ PPP daemon configuration on both ends of the link, following scenarios ++ are possible: ++ - only compression (MPPC) is used, ++ - only encryption (MPPE) is used, ++ - compression and encryption (MPPC+MPPE) are used. ++ ++ Please note that Hi/Fn (http://www.hifn.com) holds patent on MPPC so ++ you should check if this patent is valid in your country in order to ++ avoid legal problems. ++ ++ For more information please visit http://free.polbox.pl/h/hs001 ++ ++ To compile this driver as a module, choose M here. The module will ++ be called ppp_mppe_mppc.o. ++ + PPP over Ethernet + CONFIG_PPPOE + Support for PPP over Ethernet. +diff -ruN linux-2.4.29.orig/crypto/Config.in linux-2.4.29/crypto/Config.in +--- linux-2.4.29.orig/crypto/Config.in 2005-02-02 22:18:14.000000000 +0100 ++++ linux-2.4.29/crypto/Config.in 2005-02-02 22:26:37.000000000 +0100 +@@ -11,7 +11,9 @@ + "$CONFIG_INET6_AH" = "y" -o \ + "$CONFIG_INET6_AH" = "m" -o \ + "$CONFIG_INET6_ESP" = "y" -o \ +- "$CONFIG_INET6_ESP" = "m" ]; then ++ "$CONFIG_INET6_ESP" = "m" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "y" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "m" ]; then + define_bool CONFIG_CRYPTO y + else + bool 'Cryptographic API' CONFIG_CRYPTO +@@ -51,11 +53,24 @@ + "$CONFIG_INET6_AH" = "y" -o \ + "$CONFIG_INET6_AH" = "m" -o \ + "$CONFIG_INET6_ESP" = "y" -o \ +- "$CONFIG_INET6_ESP" = "m" ]; then +- define_bool CONFIG_CRYPTO_SHA1 y +- else +- tristate ' SHA1 digest algorithm' CONFIG_CRYPTO_SHA1 ++ "$CONFIG_INET6_ESP" = "m" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "y" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "m" ]; then ++ if [ "$CONFIG_INET_AH" = "y" -o \ ++ "$CONFIG_INET_ESP" = "y" -o \ ++ "$CONFIG_INET6_AH" = "y" -o \ ++ "$CONFIG_INET6_ESP" = "y" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "y" ]; then ++ define_tristate CONFIG_CRYPTO_SHA1 y ++ else ++ if [ "$CONFIG_CRYPTO_SHA1" != "y" -a \ ++ "$CONFIG_CRYPTO_SHA1" != "m" ]; then ++ define_tristate CONFIG_CRYPTO_SHA1 m ++ fi ++ fi + fi ++ tristate ' SHA1 digest algorithm' CONFIG_CRYPTO_SHA1 ++ + tristate ' SHA256 digest algorithm' CONFIG_CRYPTO_SHA256 + tristate ' SHA384 and SHA512 digest algorithms' CONFIG_CRYPTO_SHA512 + tristate ' Whirlpool digest algorithms' CONFIG_CRYPTO_WP512 +@@ -76,7 +91,20 @@ + tristate ' TEA and XTEA cipher algorithms' CONFIG_CRYPTO_TEA + tristate ' Khazad cipher algorithm' CONFIG_CRYPTO_KHAZAD + tristate ' Anubis cipher algorithm' CONFIG_CRYPTO_ANUBIS ++ ++ if [ "$CONFIG_PPP_MPPE_MPPC" = "y" -o \ ++ "$CONFIG_PPP_MPPE_MPPC" = "m" ]; then ++ if [ "$CONFIG_PPP_MPPE_MPPC" = "y" ]; then ++ define_tristate CONFIG_CRYPTO_ARC4 y ++ else ++ if [ "$CONFIG_CRYPTO_ARC4" != "y" -a \ ++ "$CONFIG_CRYPTO_ARC4" != "m" ]; then ++ define_tristate CONFIG_CRYPTO_ARC4 m ++ fi ++ fi ++ fi + tristate ' ARC4 cipher algorithm' CONFIG_CRYPTO_ARC4 ++ + if [ "$CONFIG_INET_IPCOMP" = "y" -o \ + "$CONFIG_INET_IPCOMP" = "m" -o \ + "$CONFIG_INET6_IPCOMP" = "y" -o \ +diff -ruN linux-2.4.29.orig/drivers/net/Config.in linux-2.4.29/drivers/net/Config.in +--- linux-2.4.29.orig/drivers/net/Config.in 2005-02-02 22:17:31.000000000 +0100 ++++ linux-2.4.29/drivers/net/Config.in 2005-02-02 22:26:37.000000000 +0100 +@@ -332,6 +332,7 @@ + dep_tristate ' PPP support for sync tty ports' CONFIG_PPP_SYNC_TTY $CONFIG_PPP + dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP + dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP $CONFIG_PPP ++ dep_tristate ' Microsoft PPP compression/encryption (MPPC/MPPE)' CONFIG_PPP_MPPE_MPPC $CONFIG_PPP + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP + fi +diff -ruN linux-2.4.29.orig/drivers/net/Makefile linux-2.4.29/drivers/net/Makefile +--- linux-2.4.29.orig/drivers/net/Makefile 2005-02-02 22:17:23.000000000 +0100 ++++ linux-2.4.29/drivers/net/Makefile 2005-02-02 22:26:37.000000000 +0100 +@@ -163,6 +163,7 @@ + obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o + obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o + obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o ++obj-$(CONFIG_PPP_MPPE_MPPC) += ppp_mppe_mppc.o + obj-$(CONFIG_PPPOE) += pppox.o pppoe.o + + obj-$(CONFIG_SLIP) += slip.o +diff -ruN linux-2.4.29.orig/drivers/net/ppp_generic.c linux-2.4.29/drivers/net/ppp_generic.c +--- linux-2.4.29.orig/drivers/net/ppp_generic.c 2005-02-02 22:17:24.000000000 +0100 ++++ linux-2.4.29/drivers/net/ppp_generic.c 2005-02-02 22:26:37.000000000 +0100 +@@ -19,7 +19,7 @@ + * PPP driver, written by Michael Callahan and Al Longyear, and + * subsequently hacked by Paul Mackerras. + * +- * ==FILEVERSION 20020217== ++ * ==FILEVERSION 20040509== + */ + + #include <linux/config.h> +@@ -102,6 +102,7 @@ + spinlock_t rlock; /* lock for receive side 58 */ + spinlock_t wlock; /* lock for transmit side 5c */ + int mru; /* max receive unit 60 */ ++ int mru_alloc; /* MAX(1500,MRU) for dev_alloc_skb() */ + unsigned int flags; /* control bits 64 */ + unsigned int xstate; /* transmit state bits 68 */ + unsigned int rstate; /* receive state bits 6c */ +@@ -552,7 +553,9 @@ + case PPPIOCSMRU: + if (get_user(val, (int *) arg)) + break; +- ppp->mru = val; ++ ppp->mru_alloc = ppp->mru = val; ++ if (ppp->mru_alloc < PPP_MRU) ++ ppp->mru_alloc = PPP_MRU; /* increase for broken peers */ + err = 0; + break; + +@@ -1025,14 +1028,37 @@ + case PPP_CCP: + /* peek at outbound CCP frames */ + ppp_ccp_peek(ppp, skb, 0); ++ /* ++ * When LZS or MPPE/MPPC has been negotiated we don't send ++ * CCP_RESETACK after receiving CCP_RESETREQ; in fact pppd ++ * sends such a packet but we silently discard it here ++ */ ++ if (CCP_CODE(skb->data+2) == CCP_RESETACK ++ && (ppp->xcomp->compress_proto == CI_MPPE ++ || ppp->xcomp->compress_proto == CI_LZS)) { ++ --ppp->stats.tx_packets; ++ ppp->stats.tx_bytes -= skb->len - 2; ++ kfree_skb(skb); ++ return; ++ } + break; + } + + /* try to do packet compression */ + if ((ppp->xstate & SC_COMP_RUN) && ppp->xc_state != 0 + && proto != PPP_LCP && proto != PPP_CCP) { +- new_skb = alloc_skb(ppp->dev->mtu + ppp->dev->hard_header_len, +- GFP_ATOMIC); ++ int comp_ovhd = 0; ++ /* ++ * because of possible data expansion when MPPC or LZS ++ * is used, allocate compressor's buffer 12.5% bigger ++ * than MTU ++ */ ++ if (ppp->xcomp->compress_proto == CI_MPPE) ++ comp_ovhd = ((ppp->dev->mtu * 9) / 8) + 1 + MPPE_OVHD; ++ else if (ppp->xcomp->compress_proto == CI_LZS) ++ comp_ovhd = ((ppp->dev->mtu * 9) / 8) + 1 + LZS_OVHD; ++ new_skb = alloc_skb(ppp->dev->mtu + ppp->dev->hard_header_len ++ + comp_ovhd, GFP_ATOMIC); + if (new_skb == 0) { + printk(KERN_ERR "PPP: no memory (comp pkt)\n"); + goto drop; +@@ -1050,9 +1076,21 @@ + skb = new_skb; + skb_put(skb, len); + skb_pull(skb, 2); /* pull off A/C bytes */ +- } else { ++ } else if (len == 0) { + /* didn't compress, or CCP not up yet */ + kfree_skb(new_skb); ++ } else { ++ /* ++ * (len < 0) ++ * MPPE requires that we do not send unencrypted ++ * frames. The compressor will return -1 if we ++ * should drop the frame. We cannot simply test ++ * the compress_proto because MPPE and MPPC share ++ * the same number. ++ */ ++ printk(KERN_ERR "ppp: compressor dropped pkt\n"); ++ kfree_skb(new_skb); ++ goto drop; + } + } + +@@ -1540,14 +1578,15 @@ + int len; + + if (proto == PPP_COMP) { +- ns = dev_alloc_skb(ppp->mru + PPP_HDRLEN); ++ ns = dev_alloc_skb(ppp->mru_alloc + PPP_HDRLEN); + if (ns == 0) { + printk(KERN_ERR "ppp_decompress_frame: no memory\n"); + goto err; + } + /* the decompressor still expects the A/C bytes in the hdr */ + len = ppp->rcomp->decompress(ppp->rc_state, skb->data - 2, +- skb->len + 2, ns->data, ppp->mru + PPP_HDRLEN); ++ skb->len + 2, ns->data, ++ ppp->mru_alloc + PPP_HDRLEN); + if (len < 0) { + /* Pass the compressed frame to pppd as an + error indication. */ +@@ -1573,7 +1612,14 @@ + return skb; + + err: +- ppp->rstate |= SC_DC_ERROR; ++ if (ppp->rcomp->compress_proto != CI_MPPE ++ && ppp->rcomp->compress_proto != CI_LZS) { ++ /* ++ * If decompression protocol isn't MPPE/MPPC or LZS, we set ++ * SC_DC_ERROR flag and wait for CCP_RESETACK ++ */ ++ ppp->rstate |= SC_DC_ERROR; ++ } + ppp_receive_error(ppp); + return skb; + } +@@ -2253,6 +2299,7 @@ + /* Initialize the new ppp unit */ + ppp->file.index = unit; + ppp->mru = PPP_MRU; ++ ppp->mru_alloc = PPP_MRU; + init_ppp_file(&ppp->file, INTERFACE); + ppp->file.hdrlen = PPP_HDRLEN - 2; /* don't count proto bytes */ + for (i = 0; i < NUM_NP; ++i) +diff -ruN linux-2.4.29.orig/drivers/net/ppp_mppe_mppc.c linux-2.4.29/drivers/net/ppp_mppe_mppc.c +--- linux-2.4.29.orig/drivers/net/ppp_mppe_mppc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/drivers/net/ppp_mppe_mppc.c 2005-02-02 23:07:40.000000000 +0100 +@@ -0,0 +1,1312 @@ ++/* ++ * ppp_mppe_mppc.c - MPPC/MPPE "compressor/decompressor" module. ++ * ++ * Copyright (c) 1994 Árpád Magosányi <mag@bunuel.tii.matav.hu> ++ * Copyright (c) 1999 Tim Hockin, Cobalt Networks Inc. <thockin@cobaltnet.com> ++ * Copyright (c) 2002-2005 Jan Dubiec <jdx@slackware.pl> ++ * ++ * Permission to use, copy, modify, and distribute this software and its ++ * documentation is hereby granted, provided that the above copyright ++ * notice appears in all copies. This software is provided without any ++ * warranty, express or implied. ++ * ++ * The code is based on MPPE kernel module written by Árpád Magosányi and ++ * Tim Hockin which can be found on http://planetmirror.com/pub/mppe/. ++ * I have added MPPC and 56 bit session keys support in MPPE. ++ * ++ * WARNING! Although this is open source code, its usage in some countries ++ * (in particular in the USA) may violate Stac Inc. patent for MPPC. ++ * ++ * ==FILEVERSION 20050202== ++ * ++ */ ++ ++#include <linux/init.h> ++#include <linux/module.h> ++#include <linux/mm.h> ++#include <linux/slab.h> ++#include <asm/scatterlist.h> ++#include <linux/vmalloc.h> ++#include <linux/crypto.h> ++ ++#include <linux/ppp_defs.h> ++#include <linux/ppp-comp.h> ++ ++/* ++ * In 2.4.x kernels macro offset_in_page() is not defined in linux/mm.h so ++ * we define it here; PAGE_MASK is defined in asm/page.h which is included ++ * by linux/mm.h. ++ */ ++#define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK) ++ ++/* ++ * State for a mppc/mppe "(de)compressor". ++ */ ++struct ppp_mppe_state { ++ struct crypto_tfm *arc4_tfm; ++ struct crypto_tfm *sha1_tfm; ++ u8 *sha1_digest; ++ u8 master_key[MPPE_MAX_KEY_LEN]; ++ u8 session_key[MPPE_MAX_KEY_LEN]; ++ u8 mppc; /* do we use compression (MPPC)? */ ++ u8 mppe; /* do we use encryption (MPPE)? */ ++ u8 keylen; /* key length in bytes */ ++ u8 bitkeylen; /* key length in bits */ ++ u16 ccount; /* coherency counter */ ++ u16 bits; /* MPPC/MPPE control bits */ ++ u8 stateless; /* do we use stateless mode? */ ++ u8 nextflushed; /* set A bit in the next outgoing packet; ++ used only by compressor*/ ++ u8 flushexpected; /* drop packets until A bit is received; ++ used only by decompressor*/ ++ u8 *hist; /* MPPC history */ ++ u16 *hash; /* Hash table; used only by compressor */ ++ u16 histptr; /* history "cursor" */ ++ int unit; ++ int debug; ++ int mru; ++ struct compstat stats; ++}; ++ ++#define MPPE_HIST_LEN 8192 /* MPPC history size */ ++#define MPPE_MAX_CCOUNT 0x0FFF /* max. coherency counter value */ ++ ++#define MPPE_BIT_FLUSHED 0x80 /* bit A */ ++#define MPPE_BIT_RESET 0x40 /* bit B */ ++#define MPPE_BIT_COMP 0x20 /* bit C */ ++#define MPPE_BIT_ENCRYPTED 0x10 /* bit D */ ++ ++#define MPPE_SALT0 0xD1 /* values used in MPPE key derivation */ ++#define MPPE_SALT1 0x26 /* according to RFC3079 */ ++#define MPPE_SALT2 0x9E ++ ++#define MPPE_CCOUNT(x) ((((x)[4] & 0x0f) << 8) + (x)[5]) ++#define MPPE_BITS(x) ((x)[4] & 0xf0) ++#define MPPE_CTRLHI(x) ((((x)->ccount & 0xf00)>>8)|((x)->bits)) ++#define MPPE_CTRLLO(x) ((x)->ccount & 0xff) ++ ++/* ++ * Kernel Crypto API needs its arguments to be in kmalloc'd memory, not in the ++ * module static data area. That means sha_pad needs to be kmalloc'd. It is done ++ * in mppe_module_init(). This has been pointed out on 30th July 2004 by Oleg ++ * Makarenko on pptpclient-devel mailing list. ++ */ ++#define SHA1_PAD_SIZE 40 ++struct sha_pad { ++ unsigned char sha_pad1[SHA1_PAD_SIZE]; ++ unsigned char sha_pad2[SHA1_PAD_SIZE]; ++}; ++static struct sha_pad *sha_pad; ++ ++static inline void ++setup_sg(struct scatterlist *sg, const void *address, unsigned int length) ++{ ++ sg[0].page = virt_to_page(address); ++ sg[0].offset = offset_in_page(address); ++ sg[0].length = length; ++} ++ ++static inline void ++arc4_setkey(struct ppp_mppe_state *state, const unsigned char *key, ++ const unsigned int keylen) ++{ ++ crypto_cipher_setkey(state->arc4_tfm, key, keylen); ++} ++ ++static inline void ++arc4_encrypt(struct ppp_mppe_state *state, const unsigned char *in, ++ const unsigned int len, unsigned char *out) ++{ ++ struct scatterlist sgin[4], sgout[4]; ++ ++ setup_sg(sgin, in, len); ++ setup_sg(sgout, out, len); ++ crypto_cipher_encrypt(state->arc4_tfm, sgout, sgin, len); ++} ++ ++#define arc4_decrypt arc4_encrypt ++ ++/* ++ * Key Derivation, from RFC 3078, RFC 3079. ++ * Equivalent to Get_Key() for MS-CHAP as described in RFC 3079. ++ */ ++static void ++get_new_key_from_sha(struct ppp_mppe_state *state, unsigned char *interim_key) ++{ ++ struct scatterlist sg[4]; ++ ++ setup_sg(&sg[0], state->master_key, state->keylen); ++ setup_sg(&sg[1], sha_pad->sha_pad1, sizeof(sha_pad->sha_pad1)); ++ setup_sg(&sg[2], state->session_key, state->keylen); ++ setup_sg(&sg[3], sha_pad->sha_pad2, sizeof(sha_pad->sha_pad2)); ++ ++ crypto_digest_digest (state->sha1_tfm, sg, 4, state->sha1_digest); ++ ++ memcpy(interim_key, state->sha1_digest, state->keylen); ++} ++ ++static void ++mppe_change_key(struct ppp_mppe_state *state, int initialize) ++{ ++ unsigned char interim_key[MPPE_MAX_KEY_LEN]; ++ ++ get_new_key_from_sha(state, interim_key); ++ if (initialize) { ++ memcpy(state->session_key, interim_key, state->keylen); ++ } else { ++ arc4_setkey(state, interim_key, state->keylen); ++ arc4_encrypt(state, interim_key, state->keylen, state->session_key); ++ } ++ if (state->keylen == 8) { ++ if (state->bitkeylen == 40) { ++ state->session_key[0] = MPPE_SALT0; ++ state->session_key[1] = MPPE_SALT1; ++ state->session_key[2] = MPPE_SALT2; ++ } else { ++ state->session_key[0] = MPPE_SALT0; ++ } ++ } ++ arc4_setkey(state, state->session_key, state->keylen); ++} ++ ++/* increase 12-bit coherency counter */ ++static inline void ++mppe_increase_ccount(struct ppp_mppe_state *state) ++{ ++ state->ccount = (state->ccount + 1) & MPPE_MAX_CCOUNT; ++ if (state->mppe) { ++ if (state->stateless) { ++ mppe_change_key(state, 0); ++ state->nextflushed = 1; ++ } else { ++ if ((state->ccount & 0xff) == 0xff) { ++ mppe_change_key(state, 0); ++ } ++ } ++ } ++} ++ ++/* allocate space for a MPPE/MPPC (de)compressor. */ ++/* comp != 0 -> init compressor */ ++/* comp = 0 -> init decompressor */ ++static void * ++mppe_alloc(unsigned char *options, int opt_len, int comp) ++{ ++ struct ppp_mppe_state *state; ++ unsigned int digestsize; ++ u8* fname; ++ ++ fname = comp ? "mppe_comp_alloc" : "mppe_decomp_alloc"; ++ ++ /* ++ * Hack warning - additionally to the standard MPPC/MPPE configuration ++ * options, pppd passes to the (de)copressor 8 or 16 byte session key. ++ * Therefore options[1] contains MPPC/MPPE configuration option length ++ * (CILEN_MPPE = 6), but the real options length, depending on the key ++ * length, is 6+8 or 6+16. ++ */ ++ if (opt_len < CILEN_MPPE) { ++ printk(KERN_WARNING "%s: wrong options length: %u\n", fname, opt_len); ++ return NULL; ++ } ++ ++ if (options[0] != CI_MPPE || options[1] != CILEN_MPPE || ++ (options[2] & ~MPPE_STATELESS) != 0 || ++ options[3] != 0 || options[4] != 0 || ++ (options[5] & ~(MPPE_128BIT|MPPE_56BIT|MPPE_40BIT|MPPE_MPPC)) != 0 || ++ (options[5] & (MPPE_128BIT|MPPE_56BIT|MPPE_40BIT|MPPE_MPPC)) == 0) { ++ printk(KERN_WARNING "%s: options rejected: o[0]=%02x, o[1]=%02x, " ++ "o[2]=%02x, o[3]=%02x, o[4]=%02x, o[5]=%02x\n", fname, options[0], ++ options[1], options[2], options[3], options[4], options[5]); ++ return NULL; ++ } ++ ++ state = (struct ppp_mppe_state *)kmalloc(sizeof(*state), GFP_KERNEL); ++ if (state == NULL) { ++ printk(KERN_ERR "%s: cannot allocate space for %scompressor\n", fname, ++ comp ? "" : "de"); ++ return NULL; ++ } ++ memset(state, 0, sizeof(struct ppp_mppe_state)); ++ ++ state->mppc = options[5] & MPPE_MPPC; /* Do we use MPPC? */ ++ state->mppe = options[5] & (MPPE_128BIT | MPPE_56BIT | ++ MPPE_40BIT); /* Do we use MPPE? */ ++ ++ if (state->mppc) { ++ /* allocate MPPC history */ ++ state->hist = (u8*)vmalloc(2*MPPE_HIST_LEN*sizeof(u8)); ++ if (state->hist == NULL) { ++ kfree(state); ++ printk(KERN_ERR "%s: cannot allocate space for MPPC history\n", ++ fname); ++ return NULL; ++ } ++ ++ /* allocate hashtable for MPPC compressor */ ++ if (comp) { ++ state->hash = (u16*)vmalloc(MPPE_HIST_LEN*sizeof(u16)); ++ if (state->hash == NULL) { ++ vfree(state->hist); ++ kfree(state); ++ printk(KERN_ERR "%s: cannot allocate space for MPPC history\n", ++ fname); ++ return NULL; ++ } ++ } ++ } ++ ++ if (state->mppe) { /* specific for MPPE */ ++ /* Load ARC4 algorithm */ ++ state->arc4_tfm = crypto_alloc_tfm("arc4", 0); ++ if (state->arc4_tfm == NULL) { ++ if (state->mppc) { ++ vfree(state->hash); ++ if (comp) ++ vfree(state->hist); ++ } ++ kfree(state); ++ printk(KERN_ERR "%s: cannot load ARC4 module\n", fname); ++ return NULL; ++ } ++ ++ /* Load SHA1 algorithm */ ++ state->sha1_tfm = crypto_alloc_tfm("sha1", 0); ++ if (state->sha1_tfm == NULL) { ++ crypto_free_tfm(state->arc4_tfm); ++ if (state->mppc) { ++ vfree(state->hash); ++ if (comp) ++ vfree(state->hist); ++ } ++ kfree(state); ++ printk(KERN_ERR "%s: cannot load SHA1 module\n", fname); ++ return NULL; ++ } ++ ++ digestsize = crypto_tfm_alg_digestsize(state->sha1_tfm); ++ if (digestsize < MPPE_MAX_KEY_LEN) { ++ crypto_free_tfm(state->sha1_tfm); ++ crypto_free_tfm(state->arc4_tfm); ++ if (state->mppc) { ++ vfree(state->hash); ++ if (comp) ++ vfree(state->hist); ++ } ++ kfree(state); ++ printk(KERN_ERR "%s: CryptoAPI SHA1 digest size too small\n", fname); ++ } ++ ++ state->sha1_digest = kmalloc(digestsize, GFP_KERNEL); ++ if (!state->sha1_digest) { ++ crypto_free_tfm(state->sha1_tfm); ++ crypto_free_tfm(state->arc4_tfm); ++ if (state->mppc) { ++ vfree(state->hash); ++ if (comp) ++ vfree(state->hist); ++ } ++ kfree(state); ++ printk(KERN_ERR "%s: cannot allocate space for SHA1 digest\n", fname); ++ } ++ ++ memcpy(state->master_key, options+CILEN_MPPE, MPPE_MAX_KEY_LEN); ++ memcpy(state->session_key, state->master_key, MPPE_MAX_KEY_LEN); ++ /* initial key generation is done in mppe_init() */ ++ } ++ ++ MOD_INC_USE_COUNT; ++ ++ return (void *) state; ++} ++ ++static void * ++mppe_comp_alloc(unsigned char *options, int opt_len) ++{ ++ return mppe_alloc(options, opt_len, 1); ++} ++ ++static void * ++mppe_decomp_alloc(unsigned char *options, int opt_len) ++{ ++ return mppe_alloc(options, opt_len, 0); ++} ++ ++/* cleanup the (de)compressor */ ++static void ++mppe_comp_free(void *arg) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; ++ ++ if (state != NULL) { ++ if (state->mppe) { ++ if (state->sha1_tfm != NULL) ++ crypto_free_tfm(state->sha1_tfm); ++ if (state->arc4_tfm != NULL) ++ crypto_free_tfm(state->arc4_tfm); ++ } ++ if (state->hist != NULL) ++ vfree(state->hist); ++ if (state->hash != NULL) ++ vfree(state->hash); ++ kfree(state); ++ } ++ ++ MOD_DEC_USE_COUNT; ++} ++ ++/* init MPPC/MPPE (de)compresor */ ++/* comp != 0 -> init compressor */ ++/* comp = 0 -> init decompressor */ ++static int ++mppe_init(void *arg, unsigned char *options, int opt_len, int unit, ++ int hdrlen, int mru, int debug, int comp) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; ++ u8* fname; ++ ++ fname = comp ? "mppe_comp_init" : "mppe_decomp_init"; ++ ++ if (opt_len < CILEN_MPPE) { ++ if (debug) ++ printk(KERN_WARNING "%s: wrong options length: %u\n", ++ fname, opt_len); ++ return 0; ++ } ++ ++ if (options[0] != CI_MPPE || options[1] != CILEN_MPPE || ++ (options[2] & ~MPPE_STATELESS) != 0 || ++ options[3] != 0 || options[4] != 0 || ++ (options[5] & ~(MPPE_56BIT|MPPE_128BIT|MPPE_40BIT|MPPE_MPPC)) != 0 || ++ (options[5] & (MPPE_56BIT|MPPE_128BIT|MPPE_40BIT|MPPE_MPPC)) == 0) { ++ if (debug) ++ printk(KERN_WARNING "%s: options rejected: o[0]=%02x, o[1]=%02x, " ++ "o[2]=%02x, o[3]=%02x, o[4]=%02x, o[5]=%02x\n", fname, ++ options[0], options[1], options[2], options[3], options[4], ++ options[5]); ++ return 0; ++ } ++ ++ if ((options[5] & ~MPPE_MPPC) != MPPE_128BIT && ++ (options[5] & ~MPPE_MPPC) != MPPE_56BIT && ++ (options[5] & ~MPPE_MPPC) != MPPE_40BIT && ++ (options[5] & MPPE_MPPC) != MPPE_MPPC) { ++ if (debug) ++ printk(KERN_WARNING "%s: don't know what to do: o[5]=%02x\n", ++ fname, options[5]); ++ return 0; ++ } ++ ++ state->mppc = options[5] & MPPE_MPPC; /* Do we use MPPC? */ ++ state->mppe = options[5] & (MPPE_128BIT | MPPE_56BIT | ++ MPPE_40BIT); /* Do we use MPPE? */ ++ state->stateless = options[2] & MPPE_STATELESS; /* Do we use stateless mode? */ ++ ++ switch (state->mppe) { ++ case MPPE_40BIT: /* 40 bit key */ ++ state->keylen = 8; ++ state->bitkeylen = 40; ++ break; ++ case MPPE_56BIT: /* 56 bit key */ ++ state->keylen = 8; ++ state->bitkeylen = 56; ++ break; ++ case MPPE_128BIT: /* 128 bit key */ ++ state->keylen = 16; ++ state->bitkeylen = 128; ++ break; ++ default: ++ state->keylen = 0; ++ state->bitkeylen = 0; ++ } ++ ++ state->ccount = MPPE_MAX_CCOUNT; ++ state->bits = 0; ++ state->unit = unit; ++ state->debug = debug; ++ state->histptr = MPPE_HIST_LEN; ++ if (state->mppc) { /* reset history if MPPC was negotiated */ ++ memset(state->hist, 0, 2*MPPE_HIST_LEN*sizeof(u8)); ++ } ++ ++ if (state->mppe) { /* generate initial session keys */ ++ mppe_change_key(state, 1); ++ } ++ ++ if (comp) { /* specific for compressor */ ++ state->nextflushed = 1; ++ } else { /* specific for decompressor */ ++ state->mru = mru; ++ state->flushexpected = 1; ++ } ++ ++ return 1; ++} ++ ++static int ++mppe_comp_init(void *arg, unsigned char *options, int opt_len, int unit, ++ int hdrlen, int debug) ++{ ++ return mppe_init(arg, options, opt_len, unit, hdrlen, 0, debug, 1); ++} ++ ++ ++static int ++mppe_decomp_init(void *arg, unsigned char *options, int opt_len, int unit, ++ int hdrlen, int mru, int debug) ++{ ++ return mppe_init(arg, options, opt_len, unit, hdrlen, mru, debug, 0); ++} ++ ++static void ++mppe_comp_reset(void *arg) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *)arg; ++ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: resetting MPPC/MPPE compressor\n", ++ __FUNCTION__, state->unit); ++ ++ state->nextflushed = 1; ++ if (state->mppe) ++ arc4_setkey(state, state->session_key, state->keylen); ++} ++ ++static void ++mppe_decomp_reset(void *arg) ++{ ++ /* When MPPC/MPPE is in use, we shouldn't receive any CCP Reset-Ack. ++ But when we receive such a packet, we just ignore it. */ ++ return; ++} ++ ++static void ++mppe_stats(void *arg, struct compstat *stats) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *)arg; ++ ++ *stats = state->stats; ++} ++ ++/***************************/ ++/**** Compression stuff ****/ ++/***************************/ ++/* inserts 1 to 8 bits into the output buffer */ ++static inline void putbits8(u8 *buf, u32 val, const u32 n, u32 *i, u32 *l) ++{ ++ buf += *i; ++ if (*l >= n) { ++ *l = (*l) - n; ++ val <<= *l; ++ *buf = *buf | (val & 0xff); ++ if (*l == 0) { ++ *l = 8; ++ (*i)++; ++ *(++buf) = 0; ++ } ++ } else { ++ (*i)++; ++ *l = 8 - n + (*l); ++ val <<= *l; ++ *buf = *buf | ((val >> 8) & 0xff); ++ *(++buf) = val & 0xff; ++ } ++} ++ ++/* inserts 9 to 16 bits into the output buffer */ ++static inline void putbits16(u8 *buf, u32 val, const u32 n, u32 *i, u32 *l) ++{ ++ buf += *i; ++ if (*l >= n - 8) { ++ (*i)++; ++ *l = 8 - n + (*l); ++ val <<= *l; ++ *buf = *buf | ((val >> 8) & 0xff); ++ *(++buf) = val & 0xff; ++ if (*l == 0) { ++ *l = 8; ++ (*i)++; ++ *(++buf) = 0; ++ } ++ } else { ++ (*i)++; (*i)++; ++ *l = 16 - n + (*l); ++ val <<= *l; ++ *buf = *buf | ((val >> 16) & 0xff); ++ *(++buf) = (val >> 8) & 0xff; ++ *(++buf) = val & 0xff; ++ } ++} ++ ++/* inserts 17 to 24 bits into the output buffer */ ++static inline void putbits24(u8 *buf, u32 val, const u32 n, u32 *i, u32 *l) ++{ ++ buf += *i; ++ if (*l >= n - 16) { ++ (*i)++; (*i)++; ++ *l = 16 - n + (*l); ++ val <<= *l; ++ *buf = *buf | ((val >> 16) & 0xff); ++ *(++buf) = (val >> 8) & 0xff; ++ *(++buf) = val & 0xff; ++ if (*l == 0) { ++ *l = 8; ++ (*i)++; ++ *(++buf) = 0; ++ } ++ } else { ++ (*i)++; (*i)++; (*i)++; ++ *l = 24 - n + (*l); ++ val <<= *l; ++ *buf = *buf | ((val >> 24) & 0xff); ++ *(++buf) = (val >> 16) & 0xff; ++ *(++buf) = (val >> 8) & 0xff; ++ *(++buf) = val & 0xff; ++ } ++} ++ ++static int ++mppc_compress(struct ppp_mppe_state *state, unsigned char *ibuf, ++ unsigned char *obuf, int isize, int osize) ++{ ++ u32 olen, off, len, idx, i, l; ++ u8 *hist, *sbuf, *p, *q, *r, *s; ++ ++ /* ++ At this point, to avoid possible buffer overflow caused by packet ++ expansion during/after compression, we should make sure that ++ osize >= (((isize*9)/8)+1)+2, but we don't do that because in ++ ppp_generic.c we simply allocate bigger obuf. ++ ++ Maximum MPPC packet expansion is 12.5%. This is the worst case when ++ all octets in the input buffer are >= 0x80 and we cannot find any ++ repeated tokens. Additionally we have to reserve 2 bytes for MPPE/MPPC ++ status bits and coherency counter. ++ */ ++ ++ hist = state->hist + MPPE_HIST_LEN; ++ /* check if there is enough room at the end of the history */ ++ if (state->histptr + isize >= 2*MPPE_HIST_LEN) { ++ state->bits |= MPPE_BIT_RESET; ++ state->histptr = MPPE_HIST_LEN; ++ memcpy(state->hist, hist, MPPE_HIST_LEN); ++ } ++ /* add packet to the history; isize must be <= MPPE_HIST_LEN */ ++ sbuf = state->hist + state->histptr; ++ memcpy(sbuf, ibuf, isize); ++ state->histptr += isize; ++ ++ /* compress data */ ++ r = sbuf + isize; ++ *obuf = olen = i = 0; ++ l = 8; ++ while (i < isize - 2) { ++ s = q = sbuf + i; ++ idx = ((40543*((((s[0]<<4)^s[1])<<4)^s[2]))>>4) & 0x1fff; ++ p = hist + state->hash[idx]; ++ state->hash[idx] = (u16) (s - hist); ++ off = s - p; ++ if (off > MPPE_HIST_LEN - 1 || off < 1 || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++) { ++ /* no match found; encode literal byte */ ++ if (ibuf[i] < 0x80) { /* literal byte < 0x80 */ ++ putbits8(obuf, (u32) ibuf[i], 8, &olen, &l); ++ } else { /* literal byte >= 0x80 */ ++ putbits16(obuf, (u32) (0x100|(ibuf[i]&0x7f)), 9, &olen, &l); ++ } ++ ++i; ++ continue; ++ } ++ if (r - q >= 64) { ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || *p++ != *s++ || ++ *p++ != *s++; ++ if (s - q == 64) { ++ p--; s--; ++ while((*p++ == *s++) && (s < r) && (p < q)); ++ } ++ } else { ++ while((*p++ == *s++) && (s < r) && (p < q)); ++ } ++ len = s - q - 1; ++ i += len; ++ ++ /* at least 3 character match found; code data */ ++ /* encode offset */ ++ if (off < 64) { /* 10-bit offset; 0 <= offset < 64 */ ++ putbits16(obuf, 0x3c0|off, 10, &olen, &l); ++ } else if (off < 320) { /* 12-bit offset; 64 <= offset < 320 */ ++ putbits16(obuf, 0xe00|(off-64), 12, &olen, &l); ++ } else if (off < 8192) { /* 16-bit offset; 320 <= offset < 8192 */ ++ putbits16(obuf, 0xc000|(off-320), 16, &olen, &l); ++ } else { ++ /* This shouldn't happen; we return 0 what means "packet expands", ++ and we send packet uncompressed. */ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: wrong offset value: %d\n", ++ __FUNCTION__, state->unit, off); ++ return 0; ++ } ++ /* encode length of match */ ++ if (len < 4) { /* length = 3 */ ++ putbits8(obuf, 0, 1, &olen, &l); ++ } else if (len < 8) { /* 4 <= length < 8 */ ++ putbits8(obuf, 0x08|(len&0x03), 4, &olen, &l); ++ } else if (len < 16) { /* 8 <= length < 16 */ ++ putbits8(obuf, 0x30|(len&0x07), 6, &olen, &l); ++ } else if (len < 32) { /* 16 <= length < 32 */ ++ putbits8(obuf, 0xe0|(len&0x0f), 8, &olen, &l); ++ } else if (len < 64) { /* 32 <= length < 64 */ ++ putbits16(obuf, 0x3c0|(len&0x1f), 10, &olen, &l); ++ } else if (len < 128) { /* 64 <= length < 128 */ ++ putbits16(obuf, 0xf80|(len&0x3f), 12, &olen, &l); ++ } else if (len < 256) { /* 128 <= length < 256 */ ++ putbits16(obuf, 0x3f00|(len&0x7f), 14, &olen, &l); ++ } else if (len < 512) { /* 256 <= length < 512 */ ++ putbits16(obuf, 0xfe00|(len&0xff), 16, &olen, &l); ++ } else if (len < 1024) { /* 512 <= length < 1024 */ ++ putbits24(obuf, 0x3fc00|(len&0x1ff), 18, &olen, &l); ++ } else if (len < 2048) { /* 1024 <= length < 2048 */ ++ putbits24(obuf, 0xff800|(len&0x3ff), 20, &olen, &l); ++ } else if (len < 4096) { /* 2048 <= length < 4096 */ ++ putbits24(obuf, 0x3ff000|(len&0x7ff), 22, &olen, &l); ++ } else if (len < 8192) { /* 4096 <= length < 8192 */ ++ putbits24(obuf, 0xffe000|(len&0xfff), 24, &olen, &l); ++ } else { ++ /* This shouldn't happen; we return 0 what means "packet expands", ++ and send packet uncompressed. */ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: wrong length of match value: %d\n", ++ __FUNCTION__, state->unit, len); ++ return 0; ++ } ++ } ++ ++ /* Add remaining octets to the output */ ++ while(isize - i > 0) { ++ if (ibuf[i] < 0x80) { /* literal byte < 0x80 */ ++ putbits8(obuf, (u32) ibuf[i++], 8, &olen, &l); ++ } else { /* literal byte >= 0x80 */ ++ putbits16(obuf, (u32) (0x100|(ibuf[i++]&0x7f)), 9, &olen, &l); ++ } ++ } ++ /* Reset unused bits of the last output octet */ ++ if ((l != 0) && (l != 8)) { ++ putbits8(obuf, 0, l, &olen, &l); ++ } ++ ++ return (int) olen; ++} ++ ++int ++mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf, ++ int isize, int osize) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; ++ int proto, olen, complen, off; ++ unsigned char *wptr; ++ ++ /* Check that the protocol is in the range we handle. */ ++ proto = PPP_PROTOCOL(ibuf); ++ if (proto < 0x0021 || proto > 0x00fa) ++ return 0; ++ ++ wptr = obuf; ++ /* Copy over the PPP header */ ++ wptr[0] = PPP_ADDRESS(ibuf); ++ wptr[1] = PPP_CONTROL(ibuf); ++ wptr[2] = PPP_COMP >> 8; ++ wptr[3] = PPP_COMP; ++ wptr += PPP_HDRLEN + (MPPE_OVHD / 2); /* Leave two octets for MPPE/MPPC bits */ ++ ++ /* ++ * In ver. 0.99 protocol field was compressed. Deflate and BSD compress ++ * do PFC before actual compression, RCF2118 and RFC3078 are not precise ++ * on this topic so I decided to do PFC. Unfortunately this change caused ++ * incompatibility with older/other MPPE/MPPC modules. I have received ++ * a lot of complaints from unexperienced users so I have decided to revert ++ * to previous state, i.e. the protocol field is sent uncompressed now. ++ * Although this may be changed in the future. ++ * ++ * Receiving side (mppe_decompress()) still accepts packets with compressed ++ * and uncompressed protocol field so you shouldn't get "Unsupported protocol ++ * 0x2145 received" messages anymore. ++ */ ++ //off = (proto > 0xff) ? 2 : 3; /* PFC - skip first protocol byte if 0 */ ++ off = 2; ++ ++ ibuf += off; ++ ++ mppe_increase_ccount(state); ++ ++ if (state->nextflushed) { ++ state->bits |= MPPE_BIT_FLUSHED; ++ state->nextflushed = 0; ++ if (state->mppe && !state->stateless) { ++ /* ++ * If this is the flag packet, the key has been already changed in ++ * mppe_increase_ccount() so we dont't do it once again. ++ */ ++ if ((state->ccount & 0xff) != 0xff) { ++ arc4_setkey(state, state->session_key, state->keylen); ++ } ++ } ++ if (state->mppc) { /* reset history */ ++ state->bits |= MPPE_BIT_RESET; ++ state->histptr = MPPE_HIST_LEN; ++ memset(state->hist + MPPE_HIST_LEN, 0, MPPE_HIST_LEN*sizeof(u8)); ++ } ++ } ++ ++ if (state->mppc && !state->mppe) { /* Do only compression */ ++ complen = mppc_compress(state, ibuf, wptr, isize - off, ++ osize - PPP_HDRLEN - (MPPE_OVHD / 2)); ++ /* ++ * TODO: Implement an heuristics to handle packet expansion in a smart ++ * way. Now, when a packet expands, we send it as uncompressed and ++ * when next packet is sent we have to reset compressor's history. ++ * Maybe it would be better to send such packet as compressed in order ++ * to keep history's continuity. ++ */ ++ if ((complen > isize) || (complen > osize - PPP_HDRLEN) || ++ (complen == 0)) { ++ /* packet expands */ ++ state->nextflushed = 1; ++ memcpy(wptr, ibuf, isize - off); ++ olen = isize - (off - 2) + MPPE_OVHD; ++ (state->stats).inc_bytes += olen; ++ (state->stats).inc_packets++; ++ } else { ++ state->bits |= MPPE_BIT_COMP; ++ olen = complen + PPP_HDRLEN + (MPPE_OVHD / 2); ++ (state->stats).comp_bytes += olen; ++ (state->stats).comp_packets++; ++ } ++ } else { /* Do encryption with or without compression */ ++ state->bits |= MPPE_BIT_ENCRYPTED; ++ if (!state->mppc && state->mppe) { /* Do only encryption */ ++ /* read from ibuf, write to wptr, adjust for PPP_HDRLEN */ ++ arc4_encrypt(state, ibuf, isize - off, wptr); ++ olen = isize - (off - 2) + MPPE_OVHD; ++ (state->stats).inc_bytes += olen; ++ (state->stats).inc_packets++; ++ } else { /* Do compression and then encryption - RFC3078 */ ++ complen = mppc_compress(state, ibuf, wptr, isize - off, ++ osize - PPP_HDRLEN - (MPPE_OVHD / 2)); ++ /* ++ * TODO: Implement an heuristics to handle packet expansion in a smart ++ * way. Now, when a packet expands, we send it as uncompressed and ++ * when next packet is sent we have to reset compressor's history. ++ * Maybe it would be good to send such packet as compressed in order ++ * to keep history's continuity. ++ */ ++ if ((complen > isize) || (complen > osize - PPP_HDRLEN) || ++ (complen == 0)) { ++ /* packet expands */ ++ state->nextflushed = 1; ++ arc4_encrypt(state, ibuf, isize - off, wptr); ++ olen = isize - (off - 2) + MPPE_OVHD; ++ (state->stats).inc_bytes += olen; ++ (state->stats).inc_packets++; ++ } else { ++ state->bits |= MPPE_BIT_COMP; ++ /* Hack warning !!! RC4 implementation which we use does ++ encryption "in place" - it means that input and output ++ buffers can be *the same* memory area. Therefore we don't ++ need to use a temporary buffer. But be careful - other ++ implementations don't have to be so nice. ++ I used to use ibuf as temporary buffer here, but it led ++ packet sniffers into error. Thanks to Wilfried Weissmann ++ for pointing that. */ ++ arc4_encrypt(state, wptr, complen, wptr); ++ olen = complen + PPP_HDRLEN + (MPPE_OVHD / 2); ++ (state->stats).comp_bytes += olen; ++ (state->stats).comp_packets++; ++ } ++ } ++ } ++ ++ /* write status bits and coherency counter into the output buffer */ ++ wptr = obuf + PPP_HDRLEN; ++ wptr[0] = MPPE_CTRLHI(state); ++ wptr[1] = MPPE_CTRLLO(state); ++ ++ state->bits = 0; ++ ++ (state->stats).unc_bytes += isize; ++ (state->stats).unc_packets++; ++ ++ return olen; ++} ++ ++/***************************/ ++/*** Decompression stuff ***/ ++/***************************/ ++static inline u32 getbits(const u8 *buf, const u32 n, u32 *i, u32 *l) ++{ ++ static const u32 m[] = {0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff}; ++ u32 res, ol; ++ ++ ol = *l; ++ if (*l >= n) { ++ *l = (*l) - n; ++ res = (buf[*i] & m[ol]) >> (*l); ++ if (*l == 0) { ++ *l = 8; ++ (*i)++; ++ } ++ } else { ++ *l = 8 - n + (*l); ++ res = (buf[(*i)++] & m[ol]) << 8; ++ res = (res | buf[*i]) >> (*l); ++ } ++ ++ return res; ++} ++ ++static inline u32 getbyte(const u8 *buf, const u32 i, const u32 l) ++{ ++ if (l == 8) { ++ return buf[i]; ++ } else { ++ return (((buf[i] << 8) | buf[i+1]) >> l) & 0xff; ++ } ++} ++ ++static inline void lamecopy(u8 *dst, u8 *src, u32 len) ++{ ++ while (len--) ++ *dst++ = *src++; ++} ++ ++static int ++mppc_decompress(struct ppp_mppe_state *state, unsigned char *ibuf, ++ unsigned char *obuf, int isize, int osize) ++{ ++ u32 olen, off, len, bits, val, sig, i, l; ++ u8 *history, *s; ++ ++ history = state->hist + state->histptr; ++ olen = len = i = 0; ++ l = 8; ++ bits = isize * 8; ++ while (bits >= 8) { ++ val = getbyte(ibuf, i++, l); ++ if (val < 0x80) { /* literal byte < 0x80 */ ++ if (state->histptr < 2*MPPE_HIST_LEN) { ++ /* copy uncompressed byte to the history */ ++ (state->hist)[(state->histptr)++] = (u8) val; ++ } else { ++ /* buffer overflow; drop packet */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: trying to write outside history " ++ "buffer\n", __FUNCTION__, state->unit); ++ return DECOMP_ERROR; ++ } ++ olen++; ++ bits -= 8; ++ continue; ++ } ++ ++ sig = val & 0xc0; ++ if (sig == 0x80) { /* literal byte >= 0x80 */ ++ if (state->histptr < 2*MPPE_HIST_LEN) { ++ /* copy uncompressed byte to the history */ ++ (state->hist)[(state->histptr)++] = ++ (u8) (0x80|((val&0x3f)<<1)|getbits(ibuf, 1 , &i ,&l)); ++ } else { ++ /* buffer overflow; drop packet */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: trying to write outside history " ++ "buffer\n", __FUNCTION__, state->unit); ++ return DECOMP_ERROR; ++ } ++ olen++; ++ bits -= 9; ++ continue; ++ } ++ ++ /* Not a literal byte so it must be an (offset,length) pair */ ++ /* decode offset */ ++ sig = val & 0xf0; ++ if (sig == 0xf0) { /* 10-bit offset; 0 <= offset < 64 */ ++ off = (((val&0x0f)<<2)|getbits(ibuf, 2 , &i ,&l)); ++ bits -= 10; ++ } else { ++ if (sig == 0xe0) { /* 12-bit offset; 64 <= offset < 320 */ ++ off = ((((val&0x0f)<<4)|getbits(ibuf, 4 , &i ,&l))+64); ++ bits -= 12; ++ } else { ++ if ((sig&0xe0) == 0xc0) {/* 16-bit offset; 320 <= offset < 8192 */ ++ off = ((((val&0x1f)<<8)|getbyte(ibuf, i++, l))+320); ++ bits -= 16; ++ if (off > MPPE_HIST_LEN - 1) { ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: too big offset value: %d\n", ++ __FUNCTION__, state->unit, off); ++ return DECOMP_ERROR; ++ } ++ } else { /* this shouldn't happen */ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: cannot decode offset value\n", ++ __FUNCTION__, state->unit); ++ return DECOMP_ERROR; ++ } ++ } ++ } ++ /* decode length of match */ ++ val = getbyte(ibuf, i, l); ++ if ((val & 0x80) == 0x00) { /* len = 3 */ ++ len = 3; ++ bits--; ++ getbits(ibuf, 1 , &i ,&l); ++ } else if ((val & 0xc0) == 0x80) { /* 4 <= len < 8 */ ++ len = 0x04 | ((val>>4) & 0x03); ++ bits -= 4; ++ getbits(ibuf, 4 , &i ,&l); ++ } else if ((val & 0xe0) == 0xc0) { /* 8 <= len < 16 */ ++ len = 0x08 | ((val>>2) & 0x07); ++ bits -= 6; ++ getbits(ibuf, 6 , &i ,&l); ++ } else if ((val & 0xf0) == 0xe0) { /* 16 <= len < 32 */ ++ len = 0x10 | (val & 0x0f); ++ bits -= 8; ++ i++; ++ } else { ++ bits -= 8; ++ val = (val << 8) | getbyte(ibuf, ++i, l); ++ if ((val & 0xf800) == 0xf000) { /* 32 <= len < 64 */ ++ len = 0x0020 | ((val >> 6) & 0x001f); ++ bits -= 2; ++ getbits(ibuf, 2 , &i ,&l); ++ } else if ((val & 0xfc00) == 0xf800) { /* 64 <= len < 128 */ ++ len = 0x0040 | ((val >> 4) & 0x003f); ++ bits -= 4; ++ getbits(ibuf, 4 , &i ,&l); ++ } else if ((val & 0xfe00) == 0xfc00) { /* 128 <= len < 256 */ ++ len = 0x0080 | ((val >> 2) & 0x007f); ++ bits -= 6; ++ getbits(ibuf, 6 , &i ,&l); ++ } else if ((val & 0xff00) == 0xfe00) { /* 256 <= len < 512 */ ++ len = 0x0100 | (val & 0x00ff); ++ bits -= 8; ++ i++; ++ } else { ++ bits -= 8; ++ val = (val << 8) | getbyte(ibuf, ++i, l); ++ if ((val & 0xff8000) == 0xff0000) { /* 512 <= len < 1024 */ ++ len = 0x000200 | ((val >> 6) & 0x0001ff); ++ bits -= 2; ++ getbits(ibuf, 2 , &i ,&l); ++ } else if ((val & 0xffc000) == 0xff8000) {/* 1024 <= len < 2048 */ ++ len = 0x000400 | ((val >> 4) & 0x0003ff); ++ bits -= 4; ++ getbits(ibuf, 4 , &i ,&l); ++ } else if ((val & 0xffe000) == 0xffc000) {/* 2048 <= len < 4096 */ ++ len = 0x000800 | ((val >> 2) & 0x0007ff); ++ bits -= 6; ++ getbits(ibuf, 6 , &i ,&l); ++ } else if ((val & 0xfff000) == 0xffe000) {/* 4096 <= len < 8192 */ ++ len = 0x001000 | (val & 0x000fff); ++ bits -= 8; ++ i++; ++ } else { /* this shouldn't happen */ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: wrong length code: 0x%X\n", ++ __FUNCTION__, state->unit, val); ++ return DECOMP_ERROR; ++ } ++ } ++ } ++ s = state->hist + state->histptr; ++ state->histptr += len; ++ olen += len; ++ if (state->histptr < 2*MPPE_HIST_LEN) { ++ /* copy uncompressed bytes to the history */ ++ ++ /* In some cases len may be greater than off. It means that memory ++ * areas pointed by s and s-off overlap. I had used memmove() here ++ * because I thought that it acts as libc's version. Unfortunately, ++ * I was wrong. :-) I got strange errors sometimes. Wilfried suggested ++ * using of byte by byte copying here and strange errors disappeared. ++ */ ++ lamecopy(s, s - off, len); ++ } else { ++ /* buffer overflow; drop packet */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: trying to write outside history " ++ "buffer\n", __FUNCTION__, state->unit); ++ return DECOMP_ERROR; ++ } ++ } ++ ++ /* Do PFC decompression */ ++ len = olen; ++ if ((history[0] & 0x01) != 0) { ++ obuf[0] = 0; ++ obuf++; ++ len++; ++ } ++ ++ if (len <= osize) { ++ /* copy uncompressed packet to the output buffer */ ++ memcpy(obuf, history, olen); ++ } else { ++ /* buffer overflow; drop packet */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: too big uncompressed packet: %d\n", ++ __FUNCTION__, state->unit, len + (PPP_HDRLEN / 2)); ++ return DECOMP_ERROR; ++ } ++ ++ return (int) len; ++} ++ ++int ++mppe_decompress(void *arg, unsigned char *ibuf, int isize, ++ unsigned char *obuf, int osize) ++{ ++ struct ppp_mppe_state *state = (struct ppp_mppe_state *)arg; ++ int seq, bits, uncomplen; ++ ++ if (isize <= PPP_HDRLEN + MPPE_OVHD) { ++ if (state->debug) { ++ printk(KERN_DEBUG "%s%d: short packet (len=%d)\n", __FUNCTION__, ++ state->unit, isize); ++ } ++ return DECOMP_ERROR; ++ } ++ ++ /* Get coherency counter and control bits from input buffer */ ++ seq = MPPE_CCOUNT(ibuf); ++ bits = MPPE_BITS(ibuf); ++ ++ if (state->stateless) { ++ /* RFC 3078, sec 8.1. */ ++ mppe_increase_ccount(state); ++ if ((seq != state->ccount) && state->debug) ++ printk(KERN_DEBUG "%s%d: bad sequence number: %d, expected: %d\n", ++ __FUNCTION__, state->unit, seq, state->ccount); ++ while (seq != state->ccount) ++ mppe_increase_ccount(state); ++ } else { ++ /* RFC 3078, sec 8.2. */ ++ if (state->flushexpected) { /* discard state */ ++ if ((bits & MPPE_BIT_FLUSHED)) { /* we received expected FLUSH bit */ ++ while (seq != state->ccount) ++ mppe_increase_ccount(state); ++ state->flushexpected = 0; ++ } else /* drop packet*/ ++ return DECOMP_ERROR; ++ } else { /* normal state */ ++ mppe_increase_ccount(state); ++ if (seq != state->ccount) { ++ /* Packet loss detected, enter the discard state. */ ++ if (state->debug) ++ printk(KERN_DEBUG "%s%d: bad sequence number: %d, expected: %d\n", ++ __FUNCTION__, state->unit, seq, state->ccount); ++ state->flushexpected = 1; ++ return DECOMP_ERROR; ++ } ++ } ++ if (state->mppe && (bits & MPPE_BIT_FLUSHED)) { ++ arc4_setkey(state, state->session_key, state->keylen); ++ } ++ } ++ ++ if (state->mppc && (bits & (MPPE_BIT_FLUSHED | MPPE_BIT_RESET))) { ++ state->histptr = MPPE_HIST_LEN; ++ if ((bits & MPPE_BIT_FLUSHED)) { ++ memset(state->hist + MPPE_HIST_LEN, 0, MPPE_HIST_LEN*sizeof(u8)); ++ } else ++ if ((bits & MPPE_BIT_RESET)) { ++ memcpy(state->hist, state->hist + MPPE_HIST_LEN, MPPE_HIST_LEN); ++ } ++ } ++ ++ /* Fill in the first part of the PPP header. The protocol field ++ comes from the decompressed data. */ ++ obuf[0] = PPP_ADDRESS(ibuf); ++ obuf[1] = PPP_CONTROL(ibuf); ++ obuf += PPP_HDRLEN / 2; ++ ++ if (state->mppe) { /* process encrypted packet */ ++ if ((bits & MPPE_BIT_ENCRYPTED)) { ++ /* OK, packet encrypted, so decrypt it */ ++ if (state->mppc && (bits & MPPE_BIT_COMP)) { ++ /* Hack warning !!! RC4 implementation which we use does ++ decryption "in place" - it means that input and output ++ buffers can be *the same* memory area. Therefore we don't ++ need to use a temporary buffer. But be careful - other ++ implementations don't have to be so nice. */ ++ arc4_decrypt(state, ibuf + PPP_HDRLEN + (MPPE_OVHD / 2), isize - ++ PPP_HDRLEN - (MPPE_OVHD / 2), ibuf + PPP_HDRLEN + ++ (MPPE_OVHD / 2)); ++ uncomplen = mppc_decompress(state, ibuf + PPP_HDRLEN + ++ (MPPE_OVHD / 2), obuf, isize - ++ PPP_HDRLEN - (MPPE_OVHD / 2), ++ osize - (PPP_HDRLEN / 2)); ++ if (uncomplen == DECOMP_ERROR) { ++ state->flushexpected = 1; ++ return DECOMP_ERROR; ++ } ++ uncomplen += PPP_HDRLEN / 2; ++ (state->stats).comp_bytes += isize; ++ (state->stats).comp_packets++; ++ } else { ++ uncomplen = isize - MPPE_OVHD; ++ /* Decrypt the first byte in order to check if it is ++ compressed or uncompressed protocol field */ ++ arc4_decrypt(state, ibuf + PPP_HDRLEN + (MPPE_OVHD / 2), 1, obuf); ++ /* Do PFC decompression */ ++ if ((obuf[0] & 0x01) != 0) { ++ obuf[1] = obuf[0]; ++ obuf[0] = 0; ++ obuf++; ++ uncomplen++; ++ } ++ /* And finally, decrypt the rest of the frame. */ ++ arc4_decrypt(state, ibuf + PPP_HDRLEN + (MPPE_OVHD / 2) + 1, ++ isize - PPP_HDRLEN - (MPPE_OVHD / 2) - 1, obuf + 1); ++ (state->stats).inc_bytes += isize; ++ (state->stats).inc_packets++; ++ } ++ } else { /* this shouldn't happen */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: encryption negotiated but not an " ++ "encrypted packet received\n", __FUNCTION__, state->unit); ++ mppe_change_key(state, 0); ++ state->flushexpected = 1; ++ return DECOMP_ERROR; ++ } ++ } else { ++ if (state->mppc) { /* no MPPE, only MPPC */ ++ if ((bits & MPPE_BIT_COMP)) { ++ uncomplen = mppc_decompress(state, ibuf + PPP_HDRLEN + ++ (MPPE_OVHD / 2), obuf, isize - ++ PPP_HDRLEN - (MPPE_OVHD / 2), ++ osize - (PPP_HDRLEN / 2)); ++ if (uncomplen == DECOMP_ERROR) { ++ state->flushexpected = 1; ++ return DECOMP_ERROR; ++ } ++ uncomplen += PPP_HDRLEN / 2; ++ (state->stats).comp_bytes += isize; ++ (state->stats).comp_packets++; ++ } else { ++ memcpy(obuf, ibuf + PPP_HDRLEN + (MPPE_OVHD / 2), isize - ++ PPP_HDRLEN - (MPPE_OVHD / 2)); ++ uncomplen = isize - MPPE_OVHD; ++ (state->stats).inc_bytes += isize; ++ (state->stats).inc_packets++; ++ } ++ } else { /* this shouldn't happen */ ++ if (state->debug) ++ printk(KERN_ERR "%s%d: error - not an MPPC or MPPE frame " ++ "received\n", __FUNCTION__, state->unit); ++ state->flushexpected = 1; ++ return DECOMP_ERROR; ++ } ++ } ++ ++ (state->stats).unc_bytes += uncomplen; ++ (state->stats).unc_packets++; ++ ++ return uncomplen; ++} ++ ++ ++/************************************************************ ++ * Module interface table ++ ************************************************************/ ++ ++/* These are in ppp_generic.c */ ++extern int ppp_register_compressor (struct compressor *cp); ++extern void ppp_unregister_compressor (struct compressor *cp); ++ ++/* ++ * Functions exported to ppp_generic.c. ++ * ++ * In case of MPPC/MPPE there is no need to process incompressible data ++ * because such a data is sent in MPPC/MPPE frame. Therefore the (*incomp) ++ * callback function isn't needed. ++ */ ++struct compressor ppp_mppe = { ++ CI_MPPE, /* compress_proto */ ++ mppe_comp_alloc, /* comp_alloc */ ++ mppe_comp_free, /* comp_free */ ++ mppe_comp_init, /* comp_init */ ++ mppe_comp_reset, /* comp_reset */ ++ mppe_compress, /* compress */ ++ mppe_stats, /* comp_stat */ ++ mppe_decomp_alloc, /* decomp_alloc */ ++ mppe_comp_free, /* decomp_free */ ++ mppe_decomp_init, /* decomp_init */ ++ mppe_decomp_reset, /* decomp_reset */ ++ mppe_decompress, /* decompress */ ++ NULL, /* incomp */ ++ mppe_stats, /* decomp_stat */ ++}; ++ ++/************************************************************ ++ * Module support routines ++ ************************************************************/ ++ ++int __init mppe_module_init(void) ++{ ++ int answer; ++ ++ /* When the module is compiled into kernel, it is initialized before ++ * CryptoAPI. Therefore the code below reports that there is no crypto ++ * stuff in the kernel. Marlon de Boer who has pointed out the problem, ++ * has sent also a message to CryptoAPI developers, so maybe in the future ++ * the code will be uncommented. ++ * ++ if (!(crypto_alg_available("arc4", 0) && crypto_alg_available("sha1", 0))) { ++ printk(KERN_ERR "Kernel doesn't provide ARC4 and/or SHA1 algorithms " ++ "required by MPPE/MPPC. Check CryptoAPI configuration.\n"); ++ return -ENODEV; ++ } ++ */ ++ ++ /* Allocate space for SHAPad1, SHAPad2 and ... */ ++ sha_pad = kmalloc(sizeof(struct sha_pad), GFP_KERNEL); ++ if (sha_pad == NULL) ++ return -ENOMEM; ++ /* ... initialize them */ ++ memset(sha_pad->sha_pad1, 0x00, sizeof(sha_pad->sha_pad1)); ++ memset(sha_pad->sha_pad2, 0xf2, sizeof(sha_pad->sha_pad2)); ++ ++ answer = ppp_register_compressor(&ppp_mppe); ++ if (answer == 0) { ++ printk(KERN_INFO "MPPE/MPPC encryption/compression module registered\n"); ++ } ++ return answer; ++} ++ ++void __exit mppe_module_cleanup(void) ++{ ++ kfree(sha_pad); ++ ppp_unregister_compressor(&ppp_mppe); ++ printk(KERN_INFO "MPPE/MPPC encryption/compression module unregistered\n"); ++} ++ ++module_init(mppe_module_init); ++module_exit(mppe_module_cleanup); ++ ++MODULE_AUTHOR("Jan Dubiec <jdx@slackware.pl>"); ++MODULE_DESCRIPTION("MPPE/MPPC encryption/compression module for Linux"); ++MODULE_LICENSE("Dual BSD/GPL"); +diff -ruN linux-2.4.29.orig/include/linux/ppp-comp.h linux-2.4.29/include/linux/ppp-comp.h +--- linux-2.4.29.orig/include/linux/ppp-comp.h 2005-02-02 22:18:25.000000000 +0100 ++++ linux-2.4.29/include/linux/ppp-comp.h 2005-02-02 22:41:01.000000000 +0100 +@@ -28,7 +28,7 @@ + */ + + /* +- * ==FILEVERSION 980319== ++ * ==FILEVERSION 20040509== + * + * If you modify this file at all, please set the above date. +@@ -78,7 +78,7 @@ + + /* Compress a packet */ + int (*compress) (void *state, unsigned char *rptr, +- unsigned char *obuf, int isize, int osize); ++ unsigned char *obuf, int isize, int osize); + + /* Return compression statistics */ + void (*comp_stat) (void *state, struct compstat *stats); +@@ -99,7 +99,7 @@ + + /* Decompress a packet. */ + int (*decompress) (void *state, unsigned char *ibuf, int isize, +- unsigned char *obuf, int osize); ++ unsigned char *obuf, int osize); + + /* Update state for an incompressible packet received */ + void (*incomp) (void *state, unsigned char *ibuf, int icnt); +@@ -187,6 +187,42 @@ + #define DEFLATE_CHK_SEQUENCE 0 + + /* ++ * Definitions for MPPE/MPPC. ++ */ ++ ++#define CI_MPPE 18 /* config option for MPPE */ ++#define CILEN_MPPE 6 /* length of config option */ ++ ++#define MPPE_OVHD 4 /* MPPE overhead */ ++#define MPPE_MAX_KEY_LEN 16 /* largest key length (128-bit) */ ++ ++#define MPPE_STATELESS 0x01 /* configuration bit H */ ++#define MPPE_40BIT 0x20 /* configuration bit L */ ++#define MPPE_56BIT 0x80 /* configuration bit M */ ++#define MPPE_128BIT 0x40 /* configuration bit S */ ++#define MPPE_MPPC 0x01 /* configuration bit C */ ++ ++/* ++ * Definitions for Stac LZS. ++ */ ++ ++#define CI_LZS 17 /* config option for Stac LZS */ ++#define CILEN_LZS 5 /* length of config option */ ++ ++#define LZS_OVHD 4 /* max. LZS overhead */ ++#define LZS_HIST_LEN 2048 /* LZS history size */ ++#define LZS_MAX_CCOUNT 0x0FFF /* max. coherency counter value */ ++ ++#define LZS_MODE_NONE 0 ++#define LZS_MODE_LCB 1 ++#define LZS_MODE_CRC 2 ++#define LZS_MODE_SEQ 3 ++#define LZS_MODE_EXT 4 ++ ++#define LZS_EXT_BIT_FLUSHED 0x80 /* bit A */ ++#define LZS_EXT_BIT_COMP 0x20 /* bit C */ ++ ++/* + * Definitions for other, as yet unsupported, compression methods. + */ + diff --git a/recipes/linux/linux-wrt-2.4.30/304-netfilter-ipp2p-0.7.4 b/recipes/linux/linux-wrt-2.4.30/304-netfilter-ipp2p-0.7.4 new file mode 100644 index 0000000000..1314ae4fec --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/304-netfilter-ipp2p-0.7.4 @@ -0,0 +1,720 @@ +diff -urN linux-2.4.29.old/include/linux/netfilter_ipv4/ipt_ipp2p.h linux-2.4.29/include/linux/netfilter_ipv4/ipt_ipp2p.h +--- linux-2.4.29.old/include/linux/netfilter_ipv4/ipt_ipp2p.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/include/linux/netfilter_ipv4/ipt_ipp2p.h 2005-03-12 00:44:17.000000000 +0100 +@@ -0,0 +1,29 @@ ++#ifndef __IPT_IPP2P_H ++#define __IPT_IPP2P_H ++#define IPP2P_VERSION "0.7.4" ++ ++struct ipt_p2p_info { ++ int cmd; ++ int debug; ++}; ++ ++#endif //__IPT_IPP2P_H ++ ++#define SHORT_HAND_IPP2P 1 /* --ipp2p switch*/ ++#define SHORT_HAND_DATA 4 /* --ipp2p-data switch*/ ++#define SHORT_HAND_NONE 5 /* no short hand*/ ++ ++#define IPP2P_EDK 2 ++#define IPP2P_DATA_KAZAA 8 ++#define IPP2P_DATA_EDK 16 ++#define IPP2P_DATA_DC 32 ++#define IPP2P_DC 64 ++#define IPP2P_DATA_GNU 128 ++#define IPP2P_GNU 256 ++#define IPP2P_KAZAA 512 ++#define IPP2P_BIT 1024 ++#define IPP2P_APPLE 2048 ++#define IPP2P_SOUL 4096 ++#define IPP2P_WINMX 8192 ++#define IPP2P_ARES 16384 ++ +diff -urN linux-2.4.29.old/net/ipv4/netfilter/Config.in linux-2.4.29/net/ipv4/netfilter/Config.in +--- linux-2.4.29.old/net/ipv4/netfilter/Config.in 2005-03-12 00:40:38.000000000 +0100 ++++ linux-2.4.29/net/ipv4/netfilter/Config.in 2005-03-12 00:42:57.000000000 +0100 +@@ -26,6 +26,7 @@ + dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES + dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES + dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES ++ dep_tristate ' peer to peer traffic match support' CONFIG_IP_NF_MATCH_IPP2P $CONFIG_IP_NF_IPTABLES + + dep_tristate ' DSCP match support' CONFIG_IP_NF_MATCH_DSCP $CONFIG_IP_NF_IPTABLES + +diff -urN linux-2.4.29.old/net/ipv4/netfilter/ipt_ipp2p.c linux-2.4.29/net/ipv4/netfilter/ipt_ipp2p.c +--- linux-2.4.29.old/net/ipv4/netfilter/ipt_ipp2p.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/net/ipv4/netfilter/ipt_ipp2p.c 2005-03-12 00:44:02.000000000 +0100 +@@ -0,0 +1,661 @@ ++#if defined(MODVERSIONS) ++#include <linux/modversions.h> ++#endif ++#include <linux/module.h> ++#include <linux/netfilter_ipv4/ip_tables.h> ++#include <linux/version.h> ++#include <linux/netfilter_ipv4/ipt_ipp2p.h> ++//#include "ipt_ipp2p.h" ++#include <net/tcp.h> ++#include <net/udp.h> ++ ++#define get_u8(X,O) (*(__u8 *)(X + O)) ++#define get_u16(X,O) (*(__u16 *)(X + O)) ++#define get_u32(X,O) (*(__u32 *)(X + O)) ++ ++MODULE_AUTHOR("Eicke Friedrich <ipp2p@ipp2p.org>"); ++MODULE_DESCRIPTION("An extension to iptables to identify P2P traffic."); ++MODULE_LICENSE("GPL"); ++ ++ ++/*Search for UDP eDonkey/eMule/Kad commands*/ ++int ++udp_search_edk (unsigned char *haystack, int packet_len) ++{ ++ unsigned char *t = haystack; ++ t += 8; ++ ++ switch (t[0]) { ++ case 0xe3: { /*edonkey*/ ++ switch (t[1]) { ++ /* e3 9a + 16Bytes Hash | size == 26 */ ++ case 0x9a: if (packet_len == 26) return ((IPP2P_EDK * 100) + 1); ++ /* e3 96 xx yy zz kk | size == 14 | server status request */ ++ case 0x96: if (packet_len == 14) return ((IPP2P_EDK * 100) + 2); ++ /* e3 a2 | size == 10 or 14 <-- recheck*/ ++ } ++ } ++ ++ case 0xc5: { /*emule*/ ++ switch (t[1]) { ++ /* c5 91 xx yy | size == 12 (8+4) | xx != 0x00 -- xx yy queue rating */ ++ case 0x91: if ((packet_len == 12) && (t[2] != 0x00)) return ((IPP2P_EDK * 100) + 3); ++ /* c5 90 xx .. yy | size == 26 (8+2+16) | xx .. yy == hash -- file ping */ ++ case 0x90: if ((packet_len == 26) && (t[2] != 0x00)) return ((IPP2P_EDK * 100) + 4); ++ /* c5 92 | size == 10 (8+2) -- file not found */ ++ case 0x92: if (packet_len == 10) return ((IPP2P_EDK * 100) + 5); ++ /* c5 93 | size == 10 (8+2) -- queue full */ ++ case 0x93: if (packet_len == 10) return ((IPP2P_EDK * 100) + 6); ++ } ++ } ++ ++ case 0xe4: { /*kad*/ ++ switch (t[1]) { ++ /* e4 50 | size == 12 */ ++ case 0x50: if (packet_len == 12) return ((IPP2P_EDK * 100) + 7); ++ /* e4 58 | size == 14 */ ++ case 0x58: if ((packet_len == 14) && (t[2] != 0x00)) return ((IPP2P_EDK * 100) + 8); ++ /* e4 59 | size == 10 */ ++ case 0x59: if (packet_len == 10) return ((IPP2P_EDK * 100) + 9); ++ /* e4 30 .. | t[18] == 0x01 | size > 26 | --> search */ ++ case 0x30: if ((packet_len > 26) && (t[18] == 0x01)) return ((IPP2P_EDK * 100) + 10); ++ /* e4 28 .. 00 | t[68] == 0x00 | size > 76 */ ++ case 0x28: if ((packet_len > 76) && (t[68] == 0x00)) return ((IPP2P_EDK * 100) + 11); ++ /* e4 20 .. | size == 43 */ ++ case 0x20: if ((packet_len == 43) && (t[2] != 0x00) && (t[34] != 0x00)) return ((IPP2P_EDK * 100) + 12); ++ /* e4 00 .. 00 | size == 35 ? */ ++ case 0x00: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 13); ++ /* e4 10 .. 00 | size == 35 ? */ ++ case 0x10: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 14); ++ /* e4 18 .. 00 | size == 35 ? */ ++ case 0x18: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 15); ++ /* e4 40 .. | t[18] == 0x01 | t[19] == 0x00 | size > 40 */ ++ case 0x40: if ((packet_len > 40) && (t[18] == 0x01) && (t[19] == 0x00)) return ((IPP2P_EDK * 100) + 16); ++ } ++ } ++ ++ default: return 0; ++ } /* end of switch (t[0]) */ ++}/*udp_search_edk*/ ++ ++ ++/*Search for UDP Gnutella commands*/ ++int ++udp_search_gnu (unsigned char *haystack, int packet_len) ++{ ++ unsigned char *t = haystack; ++ t += 8; ++ ++ if (memcmp(t, "GND", 3) == 0) return ((IPP2P_GNU * 100) + 1); ++ if (memcmp(t, "GNUTELLA ", 9) == 0) return ((IPP2P_GNU * 100) + 2); ++ return 0; ++}/*udp_search_gnu*/ ++ ++ ++/*Search for UDP KaZaA commands*/ ++int ++udp_search_kazaa (unsigned char *haystack, int packet_len) ++{ ++ unsigned char *t = haystack; ++ ++ if (t[packet_len-1] == 0x00){ ++ t += (packet_len - 6); ++ if (memcmp(t, "KaZaA", 5) == 0) return (IPP2P_KAZAA * 100); ++ } ++ return 0; ++}/*udp_search_kazaa*/ ++ ++ ++/*Search for UDP BitTorrent commands*/ ++int ++udp_search_bit (unsigned char *haystack, int packet_len) ++{ ++ unsigned char *t = haystack; ++ ++ /* packet_len has to be 24 */ ++ if (packet_len != 24) return 0; ++ ++ t += 8; ++ ++ /* ^ 00 00 04 17 27 10 19 80 */ ++ if ((ntohl(get_u32(t, 0)) == 0x00000417) && (ntohl(get_u32(t, 4)) == 0x27101980)) return (IPP2P_BIT * 100); ++ ++ return 0; ++}/*udp_search_bit*/ ++ ++ ++ ++/*Search for Ares commands*/ ++int ++search_ares (unsigned char *haystack, int packet_len, int head_len) ++{ ++ unsigned char *t = haystack; ++ t += head_len; ++ ++ if ((packet_len - head_len) == 6){ /* possible connect command*/ ++ if ((t[0] == 0x03) && (t[1] == 0x00) && (t[2] == 0x5a) && (t[3] == 0x04) && (t[4] == 0x03) && (t[5] == 0x05)) ++ return ((IPP2P_ARES * 100) + 1); /* found connect packet: 03 00 5a 04 03 05 */ ++ } ++ if ((packet_len - head_len) == 60){ /* possible download command*/ ++ if ((t[59] == 0x0a) && (t[58] == 0x0a)){ ++ if (memcmp(t, "PUSH SHA1:", 10) == 0) /* found download command */ ++ return ((IPP2P_ARES * 100) + 2); ++ } ++ } ++ return 0; ++} /*search_ares*/ ++ ++ ++/*Search for SoulSeek commands*/ ++int ++search_soul (unsigned char *haystack, int packet_len, int head_len) ++{ ++ unsigned char *t = haystack; ++ t += head_len; ++ ++ if (get_u16(t, 0) == (packet_len - head_len - 4)){ ++ /* xx xx 00 00 yy zz 00 00 .. | xx = sizeof(payload) - 4 */ ++ if ((get_u16(t,2) == 0x0000) &&(t[4] != 0x00) && (get_u16(t,6) == 0x0000)) ++ return ((IPP2P_SOUL * 100) + 1); ++ } else { ++ /* 00 00 00 00 00 00 00 00 + sizeof(payload) == 8*/ ++ if (((packet_len - head_len) == 8) && (get_u32(t, 0) == 0x00000000) && (get_u32(t, 4) == 0x00000000)) ++ return ((IPP2P_SOUL * 100) + 2); ++ } ++ ++ /* 01 xx 00 00 00 yy .. zz 00 00 00 .. | xx == sizeof(nick) | yy .. zz == nick */ ++ if ((t[0] == 0x01) && (t[2] == 0x00) && (get_u16(t,3) == 0x0000) && ((packet_len - head_len) > ((get_u8(t,1))+6)) && ++ (t[(get_u8(t,1))+4] != 0x00) && (t[(get_u8(t,1))+5] == 0x01) && (t[(get_u8(t,1))+6] == 0x00)) ++ return ((IPP2P_SOUL * 100) + 3); ++ return 0; ++} ++ ++ ++/*Search for WinMX commands*/ ++int ++search_winmx (unsigned char *haystack, int packet_len, int head_len) ++{ ++ unsigned char *t = haystack; ++ int c; ++ t += head_len; ++ ++ if (((packet_len - head_len) == 4) && (memcmp(t, "SEND", 4) == 0)) return ((IPP2P_WINMX * 100) + 1); ++ if (((packet_len - head_len) == 3) && (memcmp(t, "GET", 3) == 0)) return ((IPP2P_WINMX * 100) + 2); ++ if (packet_len < (head_len + 10)) return 0; ++ ++ if ((memcmp(t, "SEND", 4) == 0) || (memcmp(t, "GET", 3) == 0)){ ++ c = head_len + 4; ++ t += 4; ++ while (c < packet_len - 5) { ++ if ((t[0] == 0x20) && (t[1] == 0x22)){ ++ c += 2; ++ t += 2; ++ while (c < packet_len - 2) { ++ if ((t[0] == 0x22) && (t[1] == 0x20)) return ((IPP2P_WINMX * 100) + 3); ++ t++; ++ c++; ++ } ++ } ++ t++; ++ c++; ++ } ++ } ++ return 0; ++} /*search_winmx*/ ++ ++ ++/*Search for appleJuice commands*/ ++int ++search_apple (unsigned char *haystack, int packet_len, int head_len) ++{ ++ unsigned char *t = haystack; ++ t += head_len; ++ ++ if ((memcmp(t, "ajprot", 6) == 0) && (t[6] == 0x0d) && (t[7] == 0x0a)) return (IPP2P_APPLE * 100); ++ ++ return 0; ++} ++ ++ ++/*Search for BitTorrent commands*/ ++int ++search_bittorrent (unsigned char *haystack, int packet_len, int head_len) ++{ ++ ++ unsigned char *t = haystack; ++ if (*(haystack+head_len) != 0x13) return 0; /*Bail out of first byte != 0x13*/ ++ ++ t += head_len + 1; ++ ++ if (memcmp(t, "BitTorrent protocol", 19) == 0) return (IPP2P_BIT * 100); ++ return 0; ++} ++ ++ ++ ++/*check for Kazaa get command*/ ++int ++search_kazaa (unsigned char *haystack, int packet_len, int head_len) ++{ ++ unsigned char *t = haystack; ++ ++ if (!((*(haystack + packet_len - 2) == 0x0d) && (*(haystack + packet_len - 1) == 0x0a))) return 0; ++ ++ t += head_len; ++ if (memcmp(t, "GET /.hash=", 11) == 0) ++ return (IPP2P_DATA_KAZAA * 100); ++ else ++ return 0; ++} ++ ++ ++/*check for gnutella get command*/ ++int ++search_gnu (unsigned char *haystack, int packet_len, int head_len) ++{ ++ unsigned char *t = haystack; ++ ++ if (!((*(haystack + packet_len - 2) == 0x0d) && (*(haystack + packet_len - 1) == 0x0a))) return 0; ++ ++ t += head_len; ++ if (memcmp(t, "GET /get/", 9) == 0) return ((IPP2P_DATA_GNU * 100) + 1); ++ if (memcmp(t, "GET /uri-res/", 13) == 0) return ((IPP2P_DATA_GNU * 100) + 2); ++ ++ return 0; ++} ++ ++ ++/*check for gnutella get commands and other typical data*/ ++int ++search_all_gnu (unsigned char *haystack, int packet_len, int head_len) ++{ ++ unsigned char *t = haystack; ++ int c; ++ ++ if (!((*(haystack + packet_len - 2) == 0x0d) && (*(haystack + packet_len - 1) == 0x0a))) return 0; ++ ++ t += head_len; ++ ++ if (memcmp(t, "GNUTELLA CONNECT/", 17) == 0) return ((IPP2P_GNU * 100) + 1); ++ if (memcmp(t, "GNUTELLA/", 9) == 0) return ((IPP2P_GNU * 100) + 2); ++ ++ if ((memcmp(t, "GET /get/", 9) == 0) || (memcmp(t, "GET /uri-res/", 13) == 0)) ++ { ++ c = head_len + 8; ++ t += 8; ++ while (c < packet_len - 22) { ++ if ((t[0] == 0x0d) && (t[1] == 0x0a)) { ++ t += 2; ++ c += 2; ++ if ((memcmp(t, "X-Gnutella-", 11) == 0) || (memcmp(t, "X-Queue:", 8) == 0)) return ((IPP2P_GNU * 100) + 3); ++ } else { ++ t++; ++ c++; ++ } ++ } ++ } ++ return 0; ++} ++ ++ ++/*check for KaZaA download commands and other typical data*/ ++int ++search_all_kazaa (unsigned char *haystack, int packet_len, int head_len) ++{ ++ unsigned char *t = haystack; ++ int c; ++ ++ if (!((*(haystack + packet_len - 2) == 0x0d) && (*(haystack + packet_len - 1) == 0x0a))) return 0; ++ ++ t += head_len; ++ if (memcmp(t, "GIVE ", 5) == 0) return ((IPP2P_KAZAA * 100) + 1); ++ ++ if (memcmp(t, "GET /", 5) == 0) { ++ c = head_len + 8; ++ t += 8; ++ while (c < packet_len - 22) { ++ if ((t[0] == 0x0d) && (t[1] == 0x0a)) { ++ t += 2; ++ c += 2; ++ if ( memcmp(t, "X-Kazaa-Username: ", 18) == 0 ) return ((IPP2P_KAZAA * 100) + 2); ++ if ( memcmp(t, "User-Agent: PeerEnabler/", 24) == 0 ) return ((IPP2P_KAZAA * 100) + 3); ++ } else { ++ t++; ++ c++; ++ } ++ } ++ } ++ ++ return 0; ++} ++ ++/*fast check for edonkey file segment transfer command*/ ++int ++search_edk (unsigned char *haystack, int packet_len, int head_len) ++{ ++ if (*(haystack+head_len) != 0xe3) ++ return 0; ++ else { ++ if (*(haystack+head_len+5) == 0x47) ++ return (IPP2P_DATA_EDK * 100); ++ else ++ return 0; ++ } ++} ++ ++ ++ ++/*intensive but slower search for some edonkey packets including size-check*/ ++int ++search_all_edk (unsigned char *haystack, int packet_len, int head_len) ++{ ++ unsigned char *t = haystack; ++ int cmd; ++ ++ if (*(haystack+head_len) == 0xd4) { ++ t += head_len; ++ cmd = get_u16(t, 1); ++ if (cmd == (packet_len - head_len - 5)) { ++ switch (t[5]) { ++ case 0x82: return ((IPP2P_EDK * 100) + 42); ++ case 0x15: return ((IPP2P_EDK * 100) + 43); ++ default: return 0; ++ } ++ } ++ return 0; ++ } ++ ++ ++ if (*(haystack+head_len) == 0xc5) { /*search for additional eMule packets*/ ++ t += head_len; ++ cmd = get_u16(t, 1); ++ ++ if (cmd == (packet_len - head_len - 5)) { ++ switch (t[5]) { ++ case 0x01: return ((IPP2P_EDK * 100) + 30); ++ case 0x02: return ((IPP2P_EDK * 100) + 31); ++ case 0x60: return ((IPP2P_EDK * 100) + 32); ++ case 0x81: return ((IPP2P_EDK * 100) + 33); ++ case 0x82: return ((IPP2P_EDK * 100) + 34); ++ case 0x85: return ((IPP2P_EDK * 100) + 35); ++ case 0x86: return ((IPP2P_EDK * 100) + 36); ++ case 0x87: return ((IPP2P_EDK * 100) + 37); ++ case 0x40: return ((IPP2P_EDK * 100) + 38); ++ case 0x92: return ((IPP2P_EDK * 100) + 39); ++ case 0x93: return ((IPP2P_EDK * 100) + 40); ++ case 0x12: return ((IPP2P_EDK * 100) + 41); ++ default: return 0; ++ } ++ } ++ ++ return 0; ++ } ++ ++ ++ if (*(haystack+head_len) != 0xe3) ++ return 0; ++ else { ++ t += head_len; ++ cmd = get_u16(t, 1); ++ if (cmd == (packet_len - head_len - 5)) { ++ switch (t[5]) { ++ case 0x01: return ((IPP2P_EDK * 100) + 1); /*Client: hello or Server:hello*/ ++ case 0x50: return ((IPP2P_EDK * 100) + 2); /*Client: file status*/ ++ case 0x16: return ((IPP2P_EDK * 100) + 3); /*Client: search*/ ++ case 0x58: return ((IPP2P_EDK * 100) + 4); /*Client: file request*/ ++ case 0x48: return ((IPP2P_EDK * 100) + 5); /*???*/ ++ case 0x54: return ((IPP2P_EDK * 100) + 6); /*???*/ ++ case 0x47: return ((IPP2P_EDK * 100) + 7); /*Client: file segment request*/ ++ case 0x46: return ((IPP2P_EDK * 100) + 8); /*Client: download segment*/ ++ case 0x4c: return ((IPP2P_EDK * 100) + 9); /*Client: Hello-Answer*/ ++ case 0x4f: return ((IPP2P_EDK * 100) + 10); /*Client: file status request*/ ++ case 0x59: return ((IPP2P_EDK * 100) + 11); /*Client: file request answer*/ ++ case 0x65: return ((IPP2P_EDK * 100) + 12); /*Client: ???*/ ++ case 0x66: return ((IPP2P_EDK * 100) + 13); /*Client: ???*/ ++ case 0x51: return ((IPP2P_EDK * 100) + 14); /*Client: ???*/ ++ case 0x52: return ((IPP2P_EDK * 100) + 15); /*Client: ???*/ ++ case 0x4d: return ((IPP2P_EDK * 100) + 16); /*Client: ???*/ ++ case 0x5c: return ((IPP2P_EDK * 100) + 17); /*Client: ???*/ ++ case 0x38: return ((IPP2P_EDK * 100) + 18); /*Client: ???*/ ++ case 0x69: return ((IPP2P_EDK * 100) + 19); /*Client: ???*/ ++ case 0x19: return ((IPP2P_EDK * 100) + 20); /*Client: ???*/ ++ case 0x42: return ((IPP2P_EDK * 100) + 21); /*Client: ???*/ ++ case 0x34: return ((IPP2P_EDK * 100) + 22); /*Client: ???*/ ++ case 0x94: return ((IPP2P_EDK * 100) + 23); /*Client: ???*/ ++ case 0x1c: return ((IPP2P_EDK * 100) + 24); /*Client: ???*/ ++ case 0x6a: return ((IPP2P_EDK * 100) + 25); /*Client: ???*/ ++ default: return 0; ++ } ++ } else { ++ if (cmd > packet_len - head_len - 5) { ++ if ((t[3] == 0x00) && (t[4] == 0x00)) { ++ if (t[5] == 0x01) return ((IPP2P_EDK * 100) + 26); ++ if (t[5] == 0x4c) return ((IPP2P_EDK * 100) + 27); ++ } ++ return 0; ++ ++ } /*non edk packet*/ ++ if (t[cmd+5] == 0xe3) return ((IPP2P_EDK * 100) + 28);/*found another edk-command*/ ++ if (t[cmd+5] == 0xc5) return ((IPP2P_EDK * 100) + 29);/*found an emule-command*/ ++ return 0; ++ } ++ } ++} ++ ++ ++/*fast check for Direct Connect send command*/ ++int ++search_dc (unsigned char *haystack, int packet_len, int head_len) ++{ ++ unsigned char *t = haystack; ++ ++ if (*(haystack+head_len) != 0x24 ) ++ return 0; ++ else { ++ t += head_len + 1; ++ if (memcmp(t, "Send|", 5) == 0) ++ return (IPP2P_DATA_DC * 100); ++ else ++ return 0; ++ } ++ ++} ++ ++ ++/*intensive but slower check for all direct connect packets*/ ++int ++search_all_dc (unsigned char *haystack, int packet_len, int head_len) ++{ ++ unsigned char *t = haystack; ++ ++ if ((*(haystack + head_len) == 0x24) && (*(haystack + packet_len - 1) == 0x7c)) { ++ t += head_len + 1; ++ if (memcmp(t, "Lock ", 5) == 0) return ((IPP2P_DC * 100) + 1); /*hub: hello*/ ++ if (memcmp(t, "Key ", 4) == 0) return ((IPP2P_DC * 100) + 2); /*client: hello*/ ++ if (memcmp(t, "Hello ", 6) == 0) return ((IPP2P_DC * 100) + 3); /*hub:connected*/ ++ if (memcmp(t, "MyNick ", 7) == 0) return ((IPP2P_DC * 100) + 4); /*client-client: hello*/ ++ if (memcmp(t, "Search ", 7) == 0) return ((IPP2P_DC * 100) + 5); /*client: search*/ ++ if (memcmp(t, "Send", 4) == 0) return ((IPP2P_DC * 100) + 6); /*client: start download*/ ++ return 0; ++ } else ++ return 0; ++} ++ ++ ++static struct { ++ int command; ++ __u8 short_hand; /*for fucntions included in short hands*/ ++ int packet_len; ++ int (*function_name) (unsigned char *, int, int); ++} matchlist[] = { ++ {IPP2P_EDK,SHORT_HAND_IPP2P,40, &search_all_edk}, ++ {IPP2P_DATA_KAZAA,SHORT_HAND_DATA,200, &search_kazaa}, ++ {IPP2P_DATA_EDK,SHORT_HAND_DATA,60, &search_edk}, ++ {IPP2P_DATA_DC,SHORT_HAND_DATA,26, &search_dc}, ++ {IPP2P_DC,SHORT_HAND_IPP2P,25, search_all_dc}, ++ {IPP2P_DATA_GNU,SHORT_HAND_DATA,40, &search_gnu}, ++ {IPP2P_GNU,SHORT_HAND_IPP2P,35, &search_all_gnu}, ++ {IPP2P_KAZAA,SHORT_HAND_IPP2P,35, &search_all_kazaa}, ++ {IPP2P_BIT,SHORT_HAND_NONE,40, &search_bittorrent}, ++ {IPP2P_APPLE,SHORT_HAND_NONE,20, &search_apple}, ++ {IPP2P_SOUL,SHORT_HAND_NONE,25, &search_soul}, ++ {IPP2P_WINMX,SHORT_HAND_NONE,20, &search_winmx}, ++ {IPP2P_ARES,SHORT_HAND_NONE,25, &search_ares}, ++ {0,0,0,NULL} ++}; ++ ++ ++static struct { ++ int command; ++ __u8 short_hand; /*for fucntions included in short hands*/ ++ int packet_len; ++ int (*function_name) (unsigned char *, int); ++} udp_list[] = { ++ {IPP2P_KAZAA,SHORT_HAND_IPP2P,14, &udp_search_kazaa}, ++ {IPP2P_BIT,SHORT_HAND_NONE,23, &udp_search_bit}, ++ {IPP2P_GNU,SHORT_HAND_IPP2P,11, &udp_search_gnu}, ++ {IPP2P_EDK,SHORT_HAND_IPP2P,9, &udp_search_edk}, ++ {0,0,0,NULL} ++}; ++ ++ ++static int ++match(const struct sk_buff *skb, ++ const struct net_device *in, ++ const struct net_device *out, ++ const void *matchinfo, ++ int offset, ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) ++ const void *hdr, ++ u_int16_t datalen, ++#endif ++ ++ int *hotdrop) ++{ ++ const struct ipt_p2p_info *info = matchinfo; ++ unsigned char *haystack; ++ struct iphdr *ip = skb->nh.iph; ++ int p2p_result = 0, i = 0; ++ int head_len; ++ int hlen = ntohs(ip->tot_len)-(ip->ihl*4); /*hlen = packet-data length*/ ++ ++ /*must not be a fragment*/ ++ if (offset) { ++ if (info->debug) printk("IPP2P.match: offset found %i \n",offset); ++ return 0; ++ } ++ ++ /*make sure that skb is linear*/ ++ if(skb_is_nonlinear(skb)){ ++ if (info->debug) printk("IPP2P.match: nonlinear skb found\n"); ++ return 0; ++ } ++ ++ ++ haystack=(char *)ip+(ip->ihl*4); /*haystack = packet data*/ ++ ++ switch (ip->protocol){ ++ case IPPROTO_TCP: /*what to do with a TCP packet*/ ++ { ++ struct tcphdr *tcph = (void *) ip + ip->ihl * 4; ++ ++ if (tcph->fin) return 0; /*if FIN bit is set bail out*/ ++ if (tcph->syn) return 0; /*if SYN bit is set bail out*/ ++ if (tcph->rst) return 0; /*if RST bit is set bail out*/ ++ head_len = tcph->doff * 4; /*get TCP-Header-Size*/ ++ while (matchlist[i].command) { ++ if ((((info->cmd & matchlist[i].command) == matchlist[i].command) || ++ ((info->cmd & matchlist[i].short_hand) == matchlist[i].short_hand)) && ++ (hlen > matchlist[i].packet_len)) { ++ p2p_result = matchlist[i].function_name(haystack, hlen, head_len); ++ if (p2p_result) ++ { ++ if (info->debug) printk("IPP2P.debug:TCP-match: %i from: %u.%u.%u.%u:%i to: %u.%u.%u.%u:%i Length: %i\n", ++ p2p_result, NIPQUAD(ip->saddr),ntohs(tcph->source), NIPQUAD(ip->daddr),ntohs(tcph->dest),hlen); ++ return p2p_result; ++ } ++ } ++ i++; ++ } ++ return p2p_result; ++ } ++ ++ case IPPROTO_UDP: /*what to do with an UDP packet*/ ++ { ++ struct udphdr *udph = (void *) ip + ip->ihl * 4; ++ ++ while (udp_list[i].command){ ++ if ((((info->cmd & udp_list[i].command) == udp_list[i].command) || ++ ((info->cmd & udp_list[i].short_hand) == udp_list[i].short_hand)) && ++ (hlen > udp_list[i].packet_len)) { ++ p2p_result = udp_list[i].function_name(haystack, hlen); ++ if (p2p_result){ ++ if (info->debug) printk("IPP2P.debug:UDP-match: %i from: %u.%u.%u.%u:%i to: %u.%u.%u.%u:%i Length: %i\n", ++ p2p_result, NIPQUAD(ip->saddr),ntohs(udph->source), NIPQUAD(ip->daddr),ntohs(udph->dest),hlen); ++ return p2p_result; ++ } ++ } ++ i++; ++ } ++ return p2p_result; ++ } ++ ++ default: return 0; ++ } ++} ++ ++ ++ ++static int ++checkentry(const char *tablename, ++ const struct ipt_ip *ip, ++ void *matchinfo, ++ unsigned int matchsize, ++ unsigned int hook_mask) ++{ ++ /* Must specify -p tcp */ ++/* if (ip->proto != IPPROTO_TCP || (ip->invflags & IPT_INV_PROTO)) { ++ * printk("ipp2p: Only works on TCP packets, use -p tcp\n"); ++ * return 0; ++ * }*/ ++ return 1; ++} ++ ++ ++ ++ ++static struct ipt_match ipp2p_match = { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) ++ { NULL, NULL }, ++ "ipp2p", ++ &match, ++ &checkentry, ++ NULL, ++ THIS_MODULE ++#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++ .name = "ipp2p", ++ .match = &match, ++ .checkentry = &checkentry, ++ .me = THIS_MODULE, ++#endif ++}; ++ ++ ++static int __init init(void) ++{ ++ printk(KERN_INFO "IPP2P v%s loading\n", IPP2P_VERSION); ++ return ipt_register_match(&ipp2p_match); ++} ++ ++static void __exit fini(void) ++{ ++ ipt_unregister_match(&ipp2p_match); ++ printk(KERN_INFO "IPP2P v%s unloaded\n", IPP2P_VERSION); ++} ++ ++module_init(init); ++module_exit(fini); ++ ++ +diff -urN linux-2.4.29.old/net/ipv4/netfilter/Makefile linux-2.4.29/net/ipv4/netfilter/Makefile +--- linux-2.4.29.old/net/ipv4/netfilter/Makefile 2005-03-12 00:40:38.000000000 +0100 ++++ linux-2.4.29/net/ipv4/netfilter/Makefile 2005-03-12 00:42:57.000000000 +0100 +@@ -67,6 +67,7 @@ + obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o + obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o + obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o ++obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o + + obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt_pkttype.o + obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o diff --git a/recipes/linux/linux-wrt-2.4.30/305-cifs-1.20c b/recipes/linux/linux-wrt-2.4.30/305-cifs-1.20c new file mode 100644 index 0000000000..bdccf4de9f --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/305-cifs-1.20c @@ -0,0 +1,22022 @@ +diff -urN linux-2.4.29.old/Documentation/Configure.help linux-2.4.29/Documentation/Configure.help +--- linux-2.4.29.old/Documentation/Configure.help 2005-03-21 19:30:22.000000000 +0100 ++++ linux-2.4.29/Documentation/Configure.help 2005-03-21 19:36:51.000000000 +0100 +@@ -17943,6 +17943,34 @@ + + If you don't know what all this is about, say N. + ++CIFS (Common Internet File System) support ++CONFIG_CIFS ++ This is the client VFS module for the Common Internet File System ++ (CIFS) protocol which is the successor to the Server Message Block ++ (SMB) protocol, the native file sharing mechanism for most early ++ PC operating systems. CIFS is fully supported by current network ++ file servers such as Windows 2000, Windows 2003 (including ++ Windows XP) as well by Samba (which provides excellent CIFS ++ server support for Linux and many other operating systems). ++ The smbfs module should be used instead of this cifs module for ++ mounting to older SMB servers such as OS/2. The smbfs and cifs ++ modules can coexist and do not conflict. ++ ++ The intent of this module is to provide the most advanced network ++ file system function for CIFS compliant servers, including better ++ POSIX compliance, secure per-user session establishment, high ++ performance safe distributed caching (oplock), optional packet ++ signing, Unicode support and other internationalization improvements ++ For more information see the project page at ++ http://us1.samba.org/samba/Linux_CIFS_client.html ++ ++CIFS Debugging ++CONFIG_CIFS_DEBUG ++ If you are experiencing any problems with the CIFS filesystem, say ++ Y here. This will result in additional debugging messages to be ++ written to the system log. Under normal circumstances, this ++ results in very little overhead. ++ + SMB file system support (to mount Windows shares etc.) + CONFIG_SMB_FS + SMB (Server Message Block) is the protocol Windows for Workgroups +diff -urN linux-2.4.29.old/Documentation/filesystems/00-INDEX linux-2.4.29/Documentation/filesystems/00-INDEX +--- linux-2.4.29.old/Documentation/filesystems/00-INDEX 2004-02-18 14:36:30.000000000 +0100 ++++ linux-2.4.29/Documentation/filesystems/00-INDEX 2005-03-21 19:36:51.000000000 +0100 +@@ -10,6 +10,8 @@ + - info for the BeOS file system (BFS) + bfs.txt + - info for the SCO UnixWare Boot Filesystem (BFS). ++cifs.txt ++ - info on the Common Internet File System (CIFS) + coda.txt + - description of the CODA filesystem. + cramfs.txt +diff -urN linux-2.4.29.old/Documentation/filesystems/cifs.txt linux-2.4.29/Documentation/filesystems/cifs.txt +--- linux-2.4.29.old/Documentation/filesystems/cifs.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/Documentation/filesystems/cifs.txt 2005-03-21 19:36:51.000000000 +0100 +@@ -0,0 +1,51 @@ ++ This is the client VFS module for the Common Internet File System ++ (CIFS) protocol which is the successor to the Server Message Block ++ (SMB) protocol, the native file sharing mechanism for most early ++ PC operating systems. CIFS is fully supported by current network ++ file servers such as Windows 2000, Windows 2003 (including ++ Windows XP) as well by Samba (which provides excellent CIFS ++ server support for Linux and many other operating systems), so ++ this network filesystem client can mount to a wide variety of ++ servers. The smbfs module should be used instead of this cifs module ++ for mounting to older SMB servers such as OS/2. The smbfs and cifs ++ modules can coexist and do not conflict. The CIFS VFS filesystem ++ module is designed to work well with servers that implement the ++ newer versions (dialects) of the SMB/CIFS protocol such as Samba, ++ the program written by Andrew Tridgell that turns any Unix host ++ into a SMB/CIFS file server. ++ ++ The intent of this module is to provide the most advanced network ++ file system function for CIFS compliant servers, including better ++ POSIX compliance, secure per-user session establishment, high ++ performance safe distributed caching (oplock), optional packet ++ signing, large files, Unicode support and other internationalization ++ improvements. Since both Samba server and this filesystem client support ++ the CIFS Unix extensions, the combination can provide a reasonable ++ alternative to NFSv4 for fileserving in some Linux to Linux environments, ++ not just in Linux to Windows environments. ++ ++ This filesystem has an optional mount utility (mount.cifs) that can ++ be obtained from the project page and installed in the path in the same ++ directory with the other mount helpers (such as mount.smbfs). ++ Mounting using the cifs filesystem without installing the mount helper ++ requires specifying the server's ip address. ++ ++ For Linux 2.4: ++ mount //anything/here /mnt_target -o ++ user=username,pass=password,unc=//ip_address_of_server/sharename ++ ++ For Linux 2.5: ++ mount //ip_address_of_server/sharename /mnt_target -o user=username, pass=password ++ ++ ++ For more information on the module see the project page at ++ ++ http://us1.samba.org/samba/Linux_CIFS_client.html ++ ++ For more information on CIFS see: ++ ++ http://www.snia.org/tech_activities/CIFS ++ ++ or the Samba site: ++ ++ http://www.samba.org +diff -urN linux-2.4.29.old/fs/cifs/asn1.c linux-2.4.29/fs/cifs/asn1.c +--- linux-2.4.29.old/fs/cifs/asn1.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/asn1.c 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,614 @@ ++/* ++ * The ASB.1/BER parsing code is derived from ip_nat_snmp_basic.c which was in ++ * turn derived from the gxsnmp package by Gregory McLean & Jochen Friedrich ++ * ++ * Copyright (c) 2000 RP Internet (www.rpi.net.au). ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/types.h> ++#include <linux/kernel.h> ++#include <linux/mm.h> ++#include <linux/slab.h> ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifs_debug.h" ++ ++/***************************************************************************** ++ * ++ * Basic ASN.1 decoding routines (gxsnmp author Dirk Wisse) ++ * ++ *****************************************************************************/ ++ ++/* Class */ ++#define ASN1_UNI 0 /* Universal */ ++#define ASN1_APL 1 /* Application */ ++#define ASN1_CTX 2 /* Context */ ++#define ASN1_PRV 3 /* Private */ ++ ++/* Tag */ ++#define ASN1_EOC 0 /* End Of Contents or N/A */ ++#define ASN1_BOL 1 /* Boolean */ ++#define ASN1_INT 2 /* Integer */ ++#define ASN1_BTS 3 /* Bit String */ ++#define ASN1_OTS 4 /* Octet String */ ++#define ASN1_NUL 5 /* Null */ ++#define ASN1_OJI 6 /* Object Identifier */ ++#define ASN1_OJD 7 /* Object Description */ ++#define ASN1_EXT 8 /* External */ ++#define ASN1_SEQ 16 /* Sequence */ ++#define ASN1_SET 17 /* Set */ ++#define ASN1_NUMSTR 18 /* Numerical String */ ++#define ASN1_PRNSTR 19 /* Printable String */ ++#define ASN1_TEXSTR 20 /* Teletext String */ ++#define ASN1_VIDSTR 21 /* Video String */ ++#define ASN1_IA5STR 22 /* IA5 String */ ++#define ASN1_UNITIM 23 /* Universal Time */ ++#define ASN1_GENTIM 24 /* General Time */ ++#define ASN1_GRASTR 25 /* Graphical String */ ++#define ASN1_VISSTR 26 /* Visible String */ ++#define ASN1_GENSTR 27 /* General String */ ++ ++/* Primitive / Constructed methods*/ ++#define ASN1_PRI 0 /* Primitive */ ++#define ASN1_CON 1 /* Constructed */ ++ ++/* ++ * Error codes. ++ */ ++#define ASN1_ERR_NOERROR 0 ++#define ASN1_ERR_DEC_EMPTY 2 ++#define ASN1_ERR_DEC_EOC_MISMATCH 3 ++#define ASN1_ERR_DEC_LENGTH_MISMATCH 4 ++#define ASN1_ERR_DEC_BADVALUE 5 ++ ++#define SPNEGO_OID_LEN 7 ++#define NTLMSSP_OID_LEN 10 ++unsigned long SPNEGO_OID[7] = { 1, 3, 6, 1, 5, 5, 2 }; ++unsigned long NTLMSSP_OID[10] = { 1, 3, 6, 1, 4, 1, 311, 2, 2, 10 }; ++ ++/* ++ * ASN.1 context. ++ */ ++struct asn1_ctx { ++ int error; /* Error condition */ ++ unsigned char *pointer; /* Octet just to be decoded */ ++ unsigned char *begin; /* First octet */ ++ unsigned char *end; /* Octet after last octet */ ++}; ++ ++/* ++ * Octet string (not null terminated) ++ */ ++struct asn1_octstr { ++ unsigned char *data; ++ unsigned int len; ++}; ++ ++static void ++asn1_open(struct asn1_ctx *ctx, unsigned char *buf, unsigned int len) ++{ ++ ctx->begin = buf; ++ ctx->end = buf + len; ++ ctx->pointer = buf; ++ ctx->error = ASN1_ERR_NOERROR; ++} ++ ++static unsigned char ++asn1_octet_decode(struct asn1_ctx *ctx, unsigned char *ch) ++{ ++ if (ctx->pointer >= ctx->end) { ++ ctx->error = ASN1_ERR_DEC_EMPTY; ++ return 0; ++ } ++ *ch = *(ctx->pointer)++; ++ return 1; ++} ++ ++static unsigned char ++asn1_tag_decode(struct asn1_ctx *ctx, unsigned int *tag) ++{ ++ unsigned char ch; ++ ++ *tag = 0; ++ ++ do { ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ *tag <<= 7; ++ *tag |= ch & 0x7F; ++ } while ((ch & 0x80) == 0x80); ++ return 1; ++} ++ ++static unsigned char ++asn1_id_decode(struct asn1_ctx *ctx, ++ unsigned int *cls, unsigned int *con, unsigned int *tag) ++{ ++ unsigned char ch; ++ ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ ++ *cls = (ch & 0xC0) >> 6; ++ *con = (ch & 0x20) >> 5; ++ *tag = (ch & 0x1F); ++ ++ if (*tag == 0x1F) { ++ if (!asn1_tag_decode(ctx, tag)) ++ return 0; ++ } ++ return 1; ++} ++ ++static unsigned char ++asn1_length_decode(struct asn1_ctx *ctx, unsigned int *def, unsigned int *len) ++{ ++ unsigned char ch, cnt; ++ ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ ++ if (ch == 0x80) ++ *def = 0; ++ else { ++ *def = 1; ++ ++ if (ch < 0x80) ++ *len = ch; ++ else { ++ cnt = (unsigned char) (ch & 0x7F); ++ *len = 0; ++ ++ while (cnt > 0) { ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ *len <<= 8; ++ *len |= ch; ++ cnt--; ++ } ++ } ++ } ++ return 1; ++} ++ ++static unsigned char ++asn1_header_decode(struct asn1_ctx *ctx, ++ unsigned char **eoc, ++ unsigned int *cls, unsigned int *con, unsigned int *tag) ++{ ++ unsigned int def, len; ++ ++ if (!asn1_id_decode(ctx, cls, con, tag)) ++ return 0; ++ ++ if (!asn1_length_decode(ctx, &def, &len)) ++ return 0; ++ ++ if (def) ++ *eoc = ctx->pointer + len; ++ else ++ *eoc = NULL; ++ return 1; ++} ++ ++static unsigned char ++asn1_eoc_decode(struct asn1_ctx *ctx, unsigned char *eoc) ++{ ++ unsigned char ch; ++ ++ if (eoc == 0) { ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ ++ if (ch != 0x00) { ++ ctx->error = ASN1_ERR_DEC_EOC_MISMATCH; ++ return 0; ++ } ++ ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ ++ if (ch != 0x00) { ++ ctx->error = ASN1_ERR_DEC_EOC_MISMATCH; ++ return 0; ++ } ++ return 1; ++ } else { ++ if (ctx->pointer != eoc) { ++ ctx->error = ASN1_ERR_DEC_LENGTH_MISMATCH; ++ return 0; ++ } ++ return 1; ++ } ++} ++ ++/* static unsigned char asn1_null_decode(struct asn1_ctx *ctx, ++ unsigned char *eoc) ++{ ++ ctx->pointer = eoc; ++ return 1; ++} ++ ++static unsigned char asn1_long_decode(struct asn1_ctx *ctx, ++ unsigned char *eoc, long *integer) ++{ ++ unsigned char ch; ++ unsigned int len; ++ ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ ++ *integer = (signed char) ch; ++ len = 1; ++ ++ while (ctx->pointer < eoc) { ++ if (++len > sizeof(long)) { ++ ctx->error = ASN1_ERR_DEC_BADVALUE; ++ return 0; ++ } ++ ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ ++ *integer <<= 8; ++ *integer |= ch; ++ } ++ return 1; ++} ++ ++static unsigned char asn1_uint_decode(struct asn1_ctx *ctx, ++ unsigned char *eoc, ++ unsigned int *integer) ++{ ++ unsigned char ch; ++ unsigned int len; ++ ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ ++ *integer = ch; ++ if (ch == 0) ++ len = 0; ++ else ++ len = 1; ++ ++ while (ctx->pointer < eoc) { ++ if (++len > sizeof(unsigned int)) { ++ ctx->error = ASN1_ERR_DEC_BADVALUE; ++ return 0; ++ } ++ ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ ++ *integer <<= 8; ++ *integer |= ch; ++ } ++ return 1; ++} ++ ++static unsigned char asn1_ulong_decode(struct asn1_ctx *ctx, ++ unsigned char *eoc, ++ unsigned long *integer) ++{ ++ unsigned char ch; ++ unsigned int len; ++ ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ ++ *integer = ch; ++ if (ch == 0) ++ len = 0; ++ else ++ len = 1; ++ ++ while (ctx->pointer < eoc) { ++ if (++len > sizeof(unsigned long)) { ++ ctx->error = ASN1_ERR_DEC_BADVALUE; ++ return 0; ++ } ++ ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ ++ *integer <<= 8; ++ *integer |= ch; ++ } ++ return 1; ++} ++ ++static unsigned char ++asn1_octets_decode(struct asn1_ctx *ctx, ++ unsigned char *eoc, ++ unsigned char **octets, unsigned int *len) ++{ ++ unsigned char *ptr; ++ ++ *len = 0; ++ ++ *octets = kmalloc(eoc - ctx->pointer, GFP_ATOMIC); ++ if (*octets == NULL) { ++ return 0; ++ } ++ ++ ptr = *octets; ++ while (ctx->pointer < eoc) { ++ if (!asn1_octet_decode(ctx, (unsigned char *) ptr++)) { ++ kfree(*octets); ++ *octets = NULL; ++ return 0; ++ } ++ (*len)++; ++ } ++ return 1; ++} */ ++ ++static unsigned char ++asn1_subid_decode(struct asn1_ctx *ctx, unsigned long *subid) ++{ ++ unsigned char ch; ++ ++ *subid = 0; ++ ++ do { ++ if (!asn1_octet_decode(ctx, &ch)) ++ return 0; ++ ++ *subid <<= 7; ++ *subid |= ch & 0x7F; ++ } while ((ch & 0x80) == 0x80); ++ return 1; ++} ++ ++static unsigned char ++asn1_oid_decode(struct asn1_ctx *ctx, ++ unsigned char *eoc, unsigned long **oid, unsigned int *len) ++{ ++ unsigned long subid; ++ unsigned int size; ++ unsigned long *optr; ++ ++ size = eoc - ctx->pointer + 1; ++ *oid = kmalloc(size * sizeof (unsigned long), GFP_ATOMIC); ++ if (*oid == NULL) { ++ return 0; ++ } ++ ++ optr = *oid; ++ ++ if (!asn1_subid_decode(ctx, &subid)) { ++ kfree(*oid); ++ *oid = NULL; ++ return 0; ++ } ++ ++ if (subid < 40) { ++ optr[0] = 0; ++ optr[1] = subid; ++ } else if (subid < 80) { ++ optr[0] = 1; ++ optr[1] = subid - 40; ++ } else { ++ optr[0] = 2; ++ optr[1] = subid - 80; ++ } ++ ++ *len = 2; ++ optr += 2; ++ ++ while (ctx->pointer < eoc) { ++ if (++(*len) > size) { ++ ctx->error = ASN1_ERR_DEC_BADVALUE; ++ kfree(*oid); ++ *oid = NULL; ++ return 0; ++ } ++ ++ if (!asn1_subid_decode(ctx, optr++)) { ++ kfree(*oid); ++ *oid = NULL; ++ return 0; ++ } ++ } ++ return 1; ++} ++ ++static int ++compare_oid(unsigned long *oid1, unsigned int oid1len, ++ unsigned long *oid2, unsigned int oid2len) ++{ ++ unsigned int i; ++ ++ if (oid1len != oid2len) ++ return 0; ++ else { ++ for (i = 0; i < oid1len; i++) { ++ if (oid1[i] != oid2[i]) ++ return 0; ++ } ++ return 1; ++ } ++} ++ ++ /* BB check for endian conversion issues here */ ++ ++int ++decode_negTokenInit(unsigned char *security_blob, int length, ++ enum securityEnum *secType) ++{ ++ struct asn1_ctx ctx; ++ unsigned char *end; ++ unsigned char *sequence_end; ++ unsigned long *oid; ++ unsigned int cls, con, tag, oidlen, rc; ++ int use_ntlmssp = FALSE; ++ ++ *secType = NTLM; /* BB eventually make Kerberos or NLTMSSP the default */ ++ ++ /* cifs_dump_mem(" Received SecBlob ", security_blob, length); */ ++ ++ asn1_open(&ctx, security_blob, length); ++ ++ if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { ++ cFYI(1, ("Error decoding negTokenInit header ")); ++ return 0; ++ } else if ((cls != ASN1_APL) || (con != ASN1_CON) ++ || (tag != ASN1_EOC)) { ++ cFYI(1, ("cls = %d con = %d tag = %d", cls, con, tag)); ++ return 0; ++ } else { ++ /* remember to free obj->oid */ ++ rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag); ++ if (rc) { ++ if ((tag == ASN1_OJI) && (cls == ASN1_PRI)) { ++ rc = asn1_oid_decode(&ctx, end, &oid, &oidlen); ++ if (rc) { ++ rc = compare_oid(oid, oidlen, ++ SPNEGO_OID, ++ SPNEGO_OID_LEN); ++ kfree(oid); ++ } ++ } else ++ rc = 0; ++ } ++ ++ if (!rc) { ++ cFYI(1, ("Error decoding negTokenInit header")); ++ return 0; ++ } ++ ++ if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { ++ cFYI(1, ("Error decoding negTokenInit ")); ++ return 0; ++ } else if ((cls != ASN1_CTX) || (con != ASN1_CON) ++ || (tag != ASN1_EOC)) { ++ cFYI(1,("cls = %d con = %d tag = %d end = %p (%d) exit 0", ++ cls, con, tag, end, *end)); ++ return 0; ++ } ++ ++ if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { ++ cFYI(1, ("Error decoding negTokenInit ")); ++ return 0; ++ } else if ((cls != ASN1_UNI) || (con != ASN1_CON) ++ || (tag != ASN1_SEQ)) { ++ cFYI(1,("cls = %d con = %d tag = %d end = %p (%d) exit 1", ++ cls, con, tag, end, *end)); ++ return 0; ++ } ++ ++ if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { ++ cFYI(1, ("Error decoding 2nd part of negTokenInit ")); ++ return 0; ++ } else if ((cls != ASN1_CTX) || (con != ASN1_CON) ++ || (tag != ASN1_EOC)) { ++ cFYI(1, ++ ("cls = %d con = %d tag = %d end = %p (%d) exit 0", ++ cls, con, tag, end, *end)); ++ return 0; ++ } ++ ++ if (asn1_header_decode ++ (&ctx, &sequence_end, &cls, &con, &tag) == 0) { ++ cFYI(1, ("Error decoding 2nd part of negTokenInit ")); ++ return 0; ++ } else if ((cls != ASN1_UNI) || (con != ASN1_CON) ++ || (tag != ASN1_SEQ)) { ++ cFYI(1, ++ ("cls = %d con = %d tag = %d end = %p (%d) exit 1", ++ cls, con, tag, end, *end)); ++ return 0; ++ } ++ ++ while (!asn1_eoc_decode(&ctx, sequence_end)) { ++ rc = asn1_header_decode(&ctx, &end, &cls, &con, &tag); ++ if (!rc) { ++ cFYI(1, ++ ("Error 1 decoding negTokenInit header exit 2")); ++ return 0; ++ } ++ if ((tag == ASN1_OJI) && (con == ASN1_PRI)) { ++ asn1_oid_decode(&ctx, end, &oid, &oidlen); ++ cFYI(1, ++ ("OID len = %d oid = 0x%lx 0x%lx 0x%lx 0x%lx", ++ oidlen, *oid, *(oid + 1), *(oid + 2), ++ *(oid + 3))); ++ rc = compare_oid(oid, oidlen, NTLMSSP_OID, ++ NTLMSSP_OID_LEN); ++ kfree(oid); ++ if (rc) ++ use_ntlmssp = TRUE; ++ } else { ++ cFYI(1,("This should be an oid what is going on? ")); ++ } ++ } ++ ++ if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { ++ cFYI(1, ++ ("Error decoding last part of negTokenInit exit 3")); ++ return 0; ++ } else if ((cls != ASN1_CTX) || (con != ASN1_CON)) { /* tag = 3 indicating mechListMIC */ ++ cFYI(1, ++ ("Exit 4 cls = %d con = %d tag = %d end = %p (%d)", ++ cls, con, tag, end, *end)); ++ return 0; ++ } ++ if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { ++ cFYI(1, ++ ("Error decoding last part of negTokenInit exit 5")); ++ return 0; ++ } else if ((cls != ASN1_UNI) || (con != ASN1_CON) ++ || (tag != ASN1_SEQ)) { ++ cFYI(1, ++ ("Exit 6 cls = %d con = %d tag = %d end = %p (%d)", ++ cls, con, tag, end, *end)); ++ } ++ ++ if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { ++ cFYI(1, ++ ("Error decoding last part of negTokenInit exit 7")); ++ return 0; ++ } else if ((cls != ASN1_CTX) || (con != ASN1_CON)) { ++ cFYI(1, ++ ("Exit 8 cls = %d con = %d tag = %d end = %p (%d)", ++ cls, con, tag, end, *end)); ++ return 0; ++ } ++ if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) { ++ cFYI(1, ++ ("Error decoding last part of negTokenInit exit 9")); ++ return 0; ++ } else if ((cls != ASN1_UNI) || (con != ASN1_PRI) ++ || (tag != ASN1_GENSTR)) { ++ cFYI(1, ++ ("Exit 10 cls = %d con = %d tag = %d end = %p (%d)", ++ cls, con, tag, end, *end)); ++ return 0; ++ } ++ cFYI(1, ("Need to call asn1_octets_decode() function for this %s", ctx.pointer)); /* is this UTF-8 or ASCII? */ ++ } ++ ++ /* if (use_kerberos) ++ *secType = Kerberos ++ else */ ++ if (use_ntlmssp) { ++ *secType = NTLMSSP; ++ } ++ ++ return 1; ++} +diff -urN linux-2.4.29.old/fs/cifs/AUTHORS linux-2.4.29/fs/cifs/AUTHORS +--- linux-2.4.29.old/fs/cifs/AUTHORS 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/AUTHORS 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,37 @@ ++Original Author ++=============== ++Steve French (sfrench@samba.org) ++ ++The author wishes to express his appreciation and thanks to: ++Andrew Tridgell (Samba team) for his early suggestions about smb/cifs VFS ++improvements. Thanks to IBM for allowing me the time and test resources to pursue ++this project. Jim McDonough from IBM (and the Samba Team) for his help. ++The IBM Linux JFS team for explaining many esoteric Linux filesystem features. ++Dave Boutcher of IBM Rochester (author of the OS/400 smb/cifs filesystem client) ++for proving years ago that a very good smb/cifs client could be done on a Unix like ++operating system. Volker Lendecke, Andrew Tridgell, Urban Widmark, John Newbigin ++and others for their work on the Linux smbfs module over the years. Thanks to ++the other members of the Storage Network Industry Association CIFS Technical ++Workgroup for their work specifying this highly complex protocol and finally ++thanks to the Samba team for their technical advice and encouragement. ++ ++Patch Contributors ++------------------ ++Zwane Mwaikambo ++Andi Kleen ++Amrut Joshi ++Shobhit Dayal ++Sergey Vlasov ++Richard Hughes ++Yury Umanets ++ ++Test case and Bug Report contributors ++------------------------------------- ++Thanks to those in the community who have submitted detailed bug reports ++and debug of problems they have found: Jochen Dolze, David Blaine, ++Rene Scharfe, Martin Josefsson, Alexander Wild, Anthony Liguori, ++Lars Muller, Urban Widmark, Massimiliano Ferrero, Howard Owen, ++Olaf Kirch, Kieron Briggs, Nick Millington and others. ++ ++And thanks to the IBM LTC and Power test teams and SuSE testers for ++finding multiple bugs during excellent stress test runs. +diff -urN linux-2.4.29.old/fs/cifs/CHANGES linux-2.4.29/fs/cifs/CHANGES +--- linux-2.4.29.old/fs/cifs/CHANGES 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/CHANGES 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,572 @@ ++Version 1.20 ++------------ ++Make transaction counts more consistent. Merge /proc/fs/cifs/SimultaneousOps ++info into /proc/fs/cifs/DebugData. Fix oops in rare oops in readdir ++(in build_wildcard_path_from_dentry). Fix mknod to pass type field ++(block/char/fifo) properly. Remove spurious mount warning log entry when ++credentials passed as mount argument. Set major/minor device number in ++inode for block and char devices when unix extensions enabled. ++ ++Version 1.19 ++------------ ++Fix /proc/fs/cifs/Stats and DebugData display to handle larger ++amounts of return data. Properly limit requests to MAX_REQ (50 ++is the usual maximum active multiplex SMB/CIFS requests per server). ++Do not kill cifsd (and thus hurt the other SMB session) when more than one ++session to the same server (but with different userids) exists and one ++of the two user's smb sessions is being removed while leaving the other. ++Do not loop reconnecting in cifsd demultiplex thread when admin ++kills the thread without going through unmount. ++ ++Version 1.18 ++------------ ++Do not rename hardlinked files (since that should be a noop). Flush ++cached write behind data when reopening a file after session abend, ++except when already in write. Grab per socket sem during reconnect ++to avoid oops in sendmsg if overlapping with reconnect. Do not ++reset cached inode file size on readdir for files open for write on ++client. ++ ++ ++Version 1.17 ++------------ ++Update number of blocks in file so du command is happier (in Linux a fake ++blocksize of 512 is required for calculating number of blocks in inode). ++Fix prepare write of partial pages to read in data from server if possible. ++Fix race on tcpStatus field between unmount and reconnection code, causing ++cifsd process sometimes to hang around forever. Improve out of memory ++checks in cifs_filldir ++ ++Version 1.16 ++------------ ++Fix incorrect file size in file handle based setattr on big endian hardware. ++Fix oops in build_path_from_dentry when out of memory. Add checks for invalid ++and closing file structs in writepage/partialpagewrite. Add statistics ++for each mounted share (new menuconfig option). Fix endianness problem in ++volume information displayed in /proc/fs/cifs/DebugData (only affects ++affects big endian architectures). Prevent renames while constructing ++path names for open, mkdir and rmdir. ++ ++Version 1.15 ++------------ ++Change to mempools for alloc smb request buffers and multiplex structs ++to better handle low memory problems (and potential deadlocks). ++ ++Version 1.14 ++------------ ++Fix incomplete listings of large directories on Samba servers when Unix ++extensions enabled. Fix oops when smb_buffer can not be allocated. Fix ++rename deadlock when writing out dirty pages at same time. ++ ++Version 1.13 ++------------ ++Fix open of files in which O_CREATE can cause the mode to change in ++some cases. Fix case in which retry of write overlaps file close. ++Fix PPC64 build error. Reduce excessive stack usage in smb password ++hashing. Fix overwrite of Linux user's view of file mode to Windows servers. ++ ++Version 1.12 ++------------ ++Fixes for large file copy, signal handling, socket retry, buffer ++allocation and low memory situations. ++ ++Version 1.11 ++------------ ++Better port 139 support to Windows servers (RFC1001/RFC1002 Session_Initialize) ++also now allowing support for specifying client netbiosname. NT4 support added. ++ ++Version 1.10 ++------------ ++Fix reconnection (and certain failed mounts) to properly wake up the ++blocked users thread so it does not seem hung (in some cases was blocked ++until the cifs receive timeout expired). Fix spurious error logging ++to kernel log when application with open network files killed. ++ ++Version 1.09 ++------------ ++Fix /proc/fs module unload warning message (that could be logged ++to the kernel log). Fix intermittent failure in connectathon ++test7 (hardlink count not immediately refreshed in case in which ++inode metadata can be incorrectly kept cached when time near zero) ++ ++Version 1.08 ++------------ ++Allow file_mode and dir_mode (specified at mount time) to be enforced ++locally (the server already enforced its own ACLs too) for servers ++that do not report the correct mode (do not support the ++CIFS Unix Extensions). ++ ++Version 1.07 ++------------ ++Fix some small memory leaks in some unmount error paths. Fix major leak ++of cache pages in readpages causing multiple read oriented stress ++testcases (including fsx, and even large file copy) to fail over time. ++ ++Version 1.06 ++------------ ++Send NTCreateX with ATTR_POSIX if Linux/Unix extensions negotiated with server. ++This allows files that differ only in case and improves performance of file ++creation and file open to such servers. Fix semaphore conflict which causes ++slow delete of open file to Samba (which unfortunately can cause an oplock ++break to self while vfs_unlink held i_sem) which can hang for 20 seconds. ++ ++Version 1.05 ++------------ ++fixes to cifs_readpages for fsx test case ++ ++Version 1.04 ++------------ ++Fix caching data integrity bug when extending file size especially when no ++oplock on file. Fix spurious logging of valid already parsed mount options ++that are parsed outside of the cifs vfs such as nosuid. ++ ++ ++Version 1.03 ++------------ ++Connect to server when port number override not specified, and tcp port ++unitialized. Reset search to restart at correct file when kernel routine ++filldir returns error during large directory searches (readdir). ++ ++Version 1.02 ++------------ ++Fix caching problem when files opened by multiple clients in which ++page cache could contain stale data, and write through did ++not occur often enough while file was still open when read ahead ++(read oplock) not allowed. Treat "sep=" when first mount option ++as an overrride of comma as the default separator between mount ++options. ++ ++Version 1.01 ++------------ ++Allow passwords longer than 16 bytes. Allow null password string. ++ ++Version 1.00 ++------------ ++Gracefully clean up failed mounts when attempting to mount to servers such as ++Windows 98 that terminate tcp sessions during prototocol negotiation. Handle ++embedded commas in mount parsing of passwords. ++ ++Version 0.99 ++------------ ++Invalidate local inode cached pages on oplock break and when last file ++instance is closed so that the client does not continue using stale local ++copy rather than later modified server copy of file. Do not reconnect ++when server drops the tcp session prematurely before negotiate ++protocol response. Fix oops in roepen_file when dentry freed. Allow ++the support for CIFS Unix Extensions to be disabled via proc interface. ++ ++Version 0.98 ++------------ ++Fix hang in commit_write during reconnection of open files under heavy load. ++Fix unload_nls oops in a mount failure path. Serialize writes to same socket ++which also fixes any possible races when cifs signatures are enabled in SMBs ++being sent out of signature sequence number order. ++ ++Version 0.97 ++------------ ++Fix byte range locking bug (endian problem) causing bad offset and ++length. ++ ++Version 0.96 ++------------ ++Fix oops (in send_sig) caused by CIFS unmount code trying to ++wake up the demultiplex thread after it had exited. Do not log ++error on harmless oplock release of closed handle. ++ ++Version 0.95 ++------------ ++Fix unsafe global variable usage and password hash failure on gcc 3.3.1 ++Fix problem reconnecting secondary mounts to same server after session ++failure. Fix invalid dentry - race in mkdir when directory gets created ++by another client between the lookup and mkdir. ++ ++Version 0.94 ++------------ ++Fix to list processing in reopen_files. Fix reconnection when server hung ++but tcpip session still alive. Set proper timeout on socket read. ++ ++Version 0.93 ++------------ ++Add missing mount options including iocharset. SMP fixes in write and open. ++Fix errors in reconnecting after TCP session failure. Fix module unloading ++of default nls codepage ++ ++Version 0.92 ++------------ ++Active smb transactions should never go negative (fix double FreeXid). Fix ++list processing in file routines. Check return code on kmalloc in open. ++Fix spinlock usage for SMP. ++ ++Version 0.91 ++------------ ++Fix oops in reopen_files when invalid dentry. drop dentry on server rename ++and on revalidate errors. Fix cases where pid is now tgid. Fix return code ++on create hard link when server does not support them. ++ ++Version 0.90 ++------------ ++Fix scheduling while atomic error in getting inode info on newly created file. ++Fix truncate of existing files opened with O_CREAT but not O_TRUNC set. ++ ++Version 0.89 ++------------ ++Fix oops on write to dead tcp session. Remove error log write for case when file open ++O_CREAT but not O_EXCL ++ ++Version 0.88 ++------------ ++Fix non-POSIX behavior on rename of open file and delete of open file by taking ++advantage of trans2 SetFileInfo rename facility if available on target server. ++Retry on ENOSPC and EAGAIN socket errors. ++ ++Version 0.87 ++------------ ++Fix oops on big endian readdir. Set blksize to be even power of two (2**blkbits) to fix ++allocation size miscalculation. After oplock token lost do not read through ++cache. ++ ++Version 0.86 ++------------ ++Fix oops on empty file readahead. Fix for file size handling for locally cached files. ++ ++Version 0.85 ++------------ ++Fix oops in mkdir when server fails to return inode info. Fix oops in reopen_files ++during auto reconnection to server after server recovered from failure. ++ ++Version 0.84 ++------------ ++Finish support for Linux 2.5 open/create changes, which removes the ++redundant NTCreate/QPathInfo/close that was sent during file create. ++Enable oplock by default. Enable packet signing by default (needed to ++access many recent Windows servers) ++ ++Version 0.83 ++------------ ++Fix oops when mounting to long server names caused by inverted parms to kmalloc. ++Fix MultiuserMount (/proc/fs/cifs configuration setting) so that when enabled ++we will choose a cifs user session (smb uid) that better matches the local ++uid if a) the mount uid does not match the current uid and b) we have another ++session to the same server (ip address) for a different mount which ++matches the current local uid. ++ ++Version 0.82 ++------------ ++Add support for mknod of block or character devices. Fix oplock ++code (distributed caching) to properly send response to oplock ++break from server. ++ ++Version 0.81 ++------------ ++Finish up CIFS packet digital signing for the default ++NTLM security case. This should help Windows 2003 ++network interoperability since it is common for ++packet signing to be required now. Fix statfs (stat -f) ++which recently started returning errors due to ++invalid value (-1 instead of 0) being set in the ++struct kstatfs f_ffiles field. ++ ++Version 0.80 ++----------- ++Fix oops on stopping oplock thread when removing cifs when ++built as module. ++ ++Version 0.79 ++------------ ++Fix mount options for ro (readonly), uid, gid and file and directory mode. ++ ++Version 0.78 ++------------ ++Fix errors displayed on failed mounts to be more understandable. ++Fixed various incorrect or misleading smb to posix error code mappings. ++ ++Version 0.77 ++------------ ++Fix display of NTFS DFS junctions to display as symlinks. ++They are the network equivalent. Fix oops in ++cifs_partialpagewrite caused by missing spinlock protection ++of openfile linked list. Allow writebehind caching errors to ++be returned to the application at file close. ++ ++Version 0.76 ++------------ ++Clean up options displayed in /proc/mounts by show_options to ++be more consistent with other filesystems. ++ ++Version 0.75 ++------------ ++Fix delete of readonly file to Windows servers. Reflect ++presence or absence of read only dos attribute in mode ++bits for servers that do not support CIFS Unix extensions. ++Fix shortened results on readdir of large directories to ++servers supporting CIFS Unix extensions (caused by ++incorrect resume key). ++ ++Version 0.74 ++------------ ++Fix truncate bug (set file size) that could cause hangs e.g. running fsx ++ ++Version 0.73 ++------------ ++unload nls if mount fails. ++ ++Version 0.72 ++------------ ++Add resume key support to search (readdir) code to workaround ++Windows bug. Add /proc/fs/cifs/LookupCacheEnable which ++allows disabling caching of attribute information for ++lookups. ++ ++Version 0.71 ++------------ ++Add more oplock handling (distributed caching code). Remove ++dead code. Remove excessive stack space utilization from ++symlink routines. ++ ++Version 0.70 ++------------ ++Fix oops in get dfs referral (triggered when null path sent in to ++mount). Add support for overriding rsize at mount time. ++ ++Version 0.69 ++------------ ++Fix buffer overrun in readdir which caused intermittent kernel oopses. ++Fix writepage code to release kmap on write data. Allow "-ip=" new ++mount option to be passed in on parameter distinct from the first part ++(server name portion of) the UNC name. Allow override of the ++tcp port of the target server via new mount option "-port=" ++ ++Version 0.68 ++------------ ++Fix search handle leak on rewind. Fix setuid and gid so that they are ++reflected in the local inode immediately. Cleanup of whitespace ++to make 2.4 and 2.5 versions more consistent. ++ ++ ++Version 0.67 ++------------ ++Fix signal sending so that captive thread (cifsd) exits on umount ++(which was causing the warning in kmem_cache_free of the request buffers ++at rmmod time). This had broken as a sideeffect of the recent global ++kernel change to daemonize. Fix memory leak in readdir code which ++showed up in "ls -R" (and applications that did search rewinding). ++ ++Version 0.66 ++------------ ++Reconnect tids and fids after session reconnection (still do not ++reconnect byte range locks though). Fix problem caching ++lookup information for directory inodes, improving performance, ++especially in deep directory trees. Fix various build warnings. ++ ++Version 0.65 ++------------ ++Finish fixes to commit write for caching/readahead consistency. fsx ++now works to Samba servers. Fix oops caused when readahead ++was interrupted by a signal. ++ ++Version 0.64 ++------------ ++Fix data corruption (in partial page after truncate) that caused fsx to ++fail to Windows servers. Cleaned up some extraneous error logging in ++common error paths. Add generic sendfile support. ++ ++Version 0.63 ++------------ ++Fix memory leak in AllocMidQEntry. ++Finish reconnection logic, so connection with server can be dropped ++(or server rebooted) and the cifs client will reconnect. ++ ++Version 0.62 ++------------ ++Fix temporary socket leak when bad userid or password specified ++(or other SMBSessSetup failure). Increase maximum buffer size to slightly ++over 16K to allow negotiation of up to Samba and Windows server default read ++sizes. Add support for readpages ++ ++Version 0.61 ++------------ ++Fix oops when username not passed in on mount. Extensive fixes and improvements ++to error logging (strip redundant newlines, change debug macros to ensure newline ++passed in and to be more consistent). Fix writepage wrong file handle problem, ++a readonly file handle could be incorrectly used to attempt to write out ++file updates through the page cache to multiply open files. This could cause ++the iozone benchmark to fail on the fwrite test. Fix bug mounting two different ++shares to the same Windows server when using different usernames ++(doing this to Samba servers worked but Windows was rejecting it) - now it is ++possible to use different userids when connecting to the same server from a ++Linux client. Fix oops when treeDisconnect called during unmount on ++previously freed socket. ++ ++Version 0.60 ++------------ ++Fix oops in readpages caused by not setting address space operations in inode in ++rare code path. ++ ++Version 0.59 ++------------ ++Includes support for deleting of open files and renaming over existing files (per POSIX ++requirement). Add readlink support for Windows junction points (directory symlinks). ++ ++Version 0.58 ++------------ ++Changed read and write to go through pagecache. Added additional address space operations. ++Memory mapped operations now working. ++ ++Version 0.57 ++------------ ++Added writepage code for additional memory mapping support. Fixed leak in xids causing ++the simultaneous operations counter (/proc/fs/cifs/SimultaneousOps) to increase on ++every stat call. Additional formatting cleanup. ++ ++Version 0.56 ++------------ ++Fix bigendian bug in order of time conversion. Merge 2.5 to 2.4 version. Formatting cleanup. ++ ++Version 0.55 ++------------ ++Fixes from Zwane Mwaikambo for adding missing return code checking in a few places. ++Also included a modified version of his fix to protect global list manipulation of ++the smb session and tree connection and mid related global variables. ++ ++Version 0.54 ++------------ ++Fix problem with captive thread hanging around at unmount time. Adjust to 2.5.42-pre ++changes to superblock layout. Remove wasteful allocation of smb buffers (now the send ++buffer is reused for responses). Add more oplock handling. Additional minor cleanup. ++ ++Version 0.53 ++------------ ++More stylistic updates to better match kernel style. Add additional statistics ++for filesystem which can be viewed via /proc/fs/cifs. Add more pieces of NTLMv2 ++and CIFS Packet Signing enablement. ++ ++Version 0.52 ++------------ ++Replace call to sleep_on with safer wait_on_event. ++Make stylistic changes to better match kernel style recommendations. ++Remove most typedef usage (except for the PDUs themselves). ++ ++Version 0.51 ++------------ ++Update mount so the -unc mount option is no longer required (the ip address can be specified ++in a UNC style device name. Implementation of readpage/writepage started. ++ ++Version 0.50 ++------------ ++Fix intermittent problem with incorrect smb header checking on badly ++fragmented tcp responses ++ ++Version 0.49 ++------------ ++Fixes to setting of allocation size and file size. ++ ++Version 0.48 ++------------ ++Various 2.5.38 fixes. Now works on 2.5.38 ++ ++Version 0.47 ++------------ ++Prepare for 2.5 kernel merge. Remove ifdefs. ++ ++Version 0.46 ++------------ ++Socket buffer management fixes. Fix dual free. ++ ++Version 0.45 ++------------ ++Various big endian fixes for hardlinks and symlinks and also for dfs. ++ ++Version 0.44 ++------------ ++Various big endian fixes for servers with Unix extensions such as Samba ++ ++Version 0.43 ++------------ ++Various FindNext fixes for incorrect filenames on large directory searches on big endian ++clients. basic posix file i/o tests now work on big endian machines, not just le ++ ++Version 0.42 ++------------ ++SessionSetup and NegotiateProtocol now work from Big Endian machines. ++Various Big Endian fixes found during testing on the Linux on 390. Various fixes for compatibility with older ++versions of 2.4 kernel (now builds and works again on kernels at least as early as 2.4.7). ++ ++Version 0.41 ++------------ ++Various minor fixes for Connectathon Posix "basic" file i/o test suite. Directory caching fixed so hardlinked ++files now return the correct rumber of links on fstat as they are repeatedly linked and unlinked. ++ ++Version 0.40 ++------------ ++Implemented "Raw" (i.e. not encapsulated in SPNEGO) NTLMSSP (i.e. the Security Provider Interface used to negotiate ++session advanced session authentication). Raw NTLMSSP is preferred by Windows 2000 Professional and Windows XP. ++Began implementing support for SPNEGO encapsulation of NTLMSSP based session authentication blobs ++(which is the mechanism preferred by Windows 2000 server in the absence of Kerberos). ++ ++Version 0.38 ++------------ ++Introduced optional mount helper utility mount.cifs and made coreq changes to cifs vfs to enable ++it. Fixed a few bugs in the DFS code (e.g. bcc two bytes too short and incorrect uid in PDU). ++ ++Version 0.37 ++------------ ++Rewrote much of connection and mount/unmount logic to handle bugs with ++multiple uses to same share, multiple users to same server etc. ++ ++Version 0.36 ++------------ ++Fixed major problem with dentry corruption (missing call to dput) ++ ++Version 0.35 ++------------ ++Rewrite of readdir code to fix bug. Various fixes for bigendian machines. ++Begin adding oplock support. Multiusermount and oplockEnabled flags added to /proc/fs/cifs ++although corresponding function not fully implemented in the vfs yet ++ ++Version 0.34 ++------------ ++Fixed dentry caching bug, misc. cleanup ++ ++Version 0.33 ++------------ ++Fixed 2.5 support to handle build and configure changes as well as misc. 2.5 changes. Now can build ++on current 2.5 beta version (2.5.24) of the Linux kernel as well as on 2.4 Linux kernels. ++Support for STATUS codes (newer 32 bit NT error codes) added. DFS support begun to be added. ++ ++Version 0.32 ++------------ ++Unix extensions (symlink, readlink, hardlink, chmod and some chgrp and chown) implemented ++and tested against Samba 2.2.5 ++ ++ ++Version 0.31 ++------------ ++1) Fixed lockrange to be correct (it was one byte too short) ++ ++2) Fixed GETLK (i.e. the fcntl call to test a range of bytes in a file to see if locked) to correctly ++show range as locked when there is a conflict with an existing lock. ++ ++3) default file perms are now 2767 (indicating support for mandatory locks) instead of 777 for directories ++in most cases. Eventually will offer optional ability to query server for the correct perms. ++ ++3) Fixed eventual trap when mounting twice to different shares on the same server when the first succeeded ++but the second one was invalid and failed (the second one was incorrectly disconnecting the tcp and smb ++session) ++ ++4) Fixed error logging of valid mount options ++ ++5) Removed logging of password field. ++ ++6) Moved negotiate, treeDisconnect and uloggoffX (only tConx and SessSetup remain in connect.c) to cifssmb.c ++and cleaned them up and made them more consistent with other cifs functions. ++ ++7) Server support for Unix extensions is now fully detected and FindFirst is implemented both ways ++(with or without Unix exentions) but FindNext and QueryPathInfo with the Unix extensions are not completed, ++nor is the symlink support using the Unix extensions ++ ++8) Started adding the readlink and follow_link code ++ ++Version 0.3 ++----------- ++Initial drop ++ +diff -urN linux-2.4.29.old/fs/cifs/cifs_debug.c linux-2.4.29/fs/cifs/cifs_debug.c +--- linux-2.4.29.old/fs/cifs/cifs_debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifs_debug.c 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,797 @@ ++/* ++ * fs/cifs_debug.c ++ * ++ * Copyright (C) International Business Machines Corp., 2000,2003 ++ * ++ * Modified by Steve French (sfrench@us.ibm.com) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/fs.h> ++#include <linux/string.h> ++#include <linux/ctype.h> ++#include <linux/module.h> ++#include <linux/proc_fs.h> ++#include <asm/uaccess.h> ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifsproto.h" ++#include "cifs_debug.h" ++ ++void ++cifs_dump_mem(char *label, void *data, int length) ++{ ++ int i, j; ++ int *intptr = data; ++ char *charptr = data; ++ char buf[10], line[80]; ++ ++ printk(KERN_DEBUG "%s: dump of %d bytes of data at 0x%p\n\n", ++ label, length, data); ++ for (i = 0; i < length; i += 16) { ++ line[0] = 0; ++ for (j = 0; (j < 4) && (i + j * 4 < length); j++) { ++ sprintf(buf, " %08x", intptr[i / 4 + j]); ++ strcat(line, buf); ++ } ++ buf[0] = ' '; ++ buf[2] = 0; ++ for (j = 0; (j < 16) && (i + j < length); j++) { ++ buf[1] = isprint(charptr[i + j]) ? charptr[i + j] : '.'; ++ strcat(line, buf); ++ } ++ printk(KERN_DEBUG "%s\n", line); ++ } ++} ++ ++#ifdef CONFIG_PROC_FS ++int ++cifs_debug_data_read(char *buf, char **beginBuffer, off_t offset, ++ int count, int *eof, void *data) ++{ ++ struct list_head *tmp; ++ struct list_head *tmp1; ++ struct mid_q_entry * mid_entry; ++ struct cifsSesInfo *ses; ++ struct cifsTconInfo *tcon; ++ int i; ++ int length = 0; ++ char * original_buf = buf; ++ ++ *beginBuffer = buf + offset; ++ ++ ++ length = ++ sprintf(buf, ++ "Display Internal CIFS Data Structures for Debugging\n" ++ "---------------------------------------------------\n"); ++ buf += length; ++ ++ length = sprintf(buf, "Servers:\n"); ++ buf += length; ++ ++ i = 0; ++ read_lock(&GlobalSMBSeslock); ++ list_for_each(tmp, &GlobalSMBSessionList) { ++ i++; ++ ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList); ++ length = ++ sprintf(buf, ++ "\n%d) Name: %s Domain: %s Mounts: %d ServerOS: %s \n\tServerNOS: %s\tCapabilities: 0x%x\n\tSMB session status: %d\tTCP status: %d", ++ i, ses->serverName, ses->serverDomain, atomic_read(&ses->inUse), ++ ses->serverOS, ses->serverNOS, ses->capabilities,ses->status,ses->server->tcpStatus); ++ buf += length; ++ if(ses->server) { ++ buf += sprintf(buf, "\n\tLocal Users To Server: %d SecMode: 0x%x Req Active: %d", ++ atomic_read(&ses->server->socketUseCount), ++ ses->server->secMode, ++ atomic_read(&ses->server->inFlight)); ++ ++ length = sprintf(buf, "\nMIDs: \n"); ++ buf += length; ++ ++ spin_lock(&GlobalMid_Lock); ++ list_for_each(tmp1, &ses->server->pending_mid_q) { ++ mid_entry = list_entry(tmp1, struct ++ mid_q_entry, ++ qhead); ++ if(mid_entry) { ++ length = sprintf(buf,"State: %d com: %d pid: %d tsk: %p mid %d\n",mid_entry->midState,mid_entry->command,mid_entry->pid,mid_entry->tsk,mid_entry->mid); ++ buf += length; ++ } ++ } ++ spin_unlock(&GlobalMid_Lock); ++ } ++ ++ } ++ read_unlock(&GlobalSMBSeslock); ++ sprintf(buf, "\n"); ++ buf++; ++ ++ length = sprintf(buf, "\nShares:\n"); ++ buf += length; ++ ++ i = 0; ++ read_lock(&GlobalSMBSeslock); ++ list_for_each(tmp, &GlobalTreeConnectionList) { ++ i++; ++ tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList); ++ length = ++ sprintf(buf, ++ "\n%d) %s Uses: %d Type: %s Characteristics: 0x%x Attributes: 0x%x\nPathComponentMax: %d Status: %d", ++ i, tcon->treeName, ++ atomic_read(&tcon->useCount), ++ tcon->nativeFileSystem, ++ tcon->fsDevInfo.DeviceCharacteristics, ++ tcon->fsAttrInfo.Attributes, ++ tcon->fsAttrInfo.MaxPathNameComponentLength,tcon->tidStatus); ++ buf += length; ++ if (tcon->fsDevInfo.DeviceType == FILE_DEVICE_DISK) ++ length = sprintf(buf, " type: DISK "); ++ else if (tcon->fsDevInfo.DeviceType == FILE_DEVICE_CD_ROM) ++ length = sprintf(buf, " type: CDROM "); ++ else ++ length = ++ sprintf(buf, " type: %d ", ++ tcon->fsDevInfo.DeviceType); ++ buf += length; ++ if(tcon->tidStatus == CifsNeedReconnect) { ++ buf += sprintf(buf, "\tDISCONNECTED "); ++ length += 14; ++ } ++ } ++ read_unlock(&GlobalSMBSeslock); ++ ++ length = sprintf(buf, "\n"); ++ buf += length; ++ ++ /* BB add code to dump additional info such as TCP session info now */ ++ /* Now calculate total size of returned data */ ++ length = buf - original_buf; ++ ++ if(offset + count >= length) ++ *eof = 1; ++ if(length < offset) { ++ *eof = 1; ++ return 0; ++ } else { ++ length = length - offset; ++ } ++ if (length > count) ++ length = count; ++ ++ return length; ++} ++ ++#ifdef CONFIG_CIFS_STATS ++int ++cifs_stats_read(char *buf, char **beginBuffer, off_t offset, ++ int count, int *eof, void *data) ++{ ++ int item_length,i,length; ++ struct list_head *tmp; ++ struct cifsTconInfo *tcon; ++ ++ *beginBuffer = buf + offset; ++ ++ length = sprintf(buf, ++ "Resources in use\nCIFS Session: %d\n", ++ sesInfoAllocCount.counter); ++ buf += length; ++ item_length = ++ sprintf(buf,"Share (unique mount targets): %d\n", ++ tconInfoAllocCount.counter); ++ length += item_length; ++ buf += item_length; ++ item_length = ++ sprintf(buf,"SMB Request/Response Buffer: %d\n", ++ bufAllocCount.counter); ++ length += item_length; ++ buf += item_length; ++ item_length = ++ sprintf(buf,"Operations (MIDs): %d\n", ++ midCount.counter); ++ length += item_length; ++ buf += item_length; ++ item_length = sprintf(buf, ++ "\n%d session %d share reconnects\n", ++ tcpSesReconnectCount.counter,tconInfoReconnectCount.counter); ++ length += item_length; ++ buf += item_length; ++ ++ item_length = sprintf(buf, ++ "Total vfs operations: %d maximum at one time: %d\n", ++ GlobalCurrentXid,GlobalMaxActiveXid); ++ length += item_length; ++ buf += item_length; ++ ++ i = 0; ++ read_lock(&GlobalSMBSeslock); ++ list_for_each(tmp, &GlobalTreeConnectionList) { ++ i++; ++ tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList); ++ item_length = sprintf(buf,"\n%d) %s",i, tcon->treeName); ++ buf += item_length; ++ length += item_length; ++ if(tcon->tidStatus == CifsNeedReconnect) { ++ buf += sprintf(buf, "\tDISCONNECTED "); ++ length += 14; ++ } ++ item_length = sprintf(buf,"\nSMBs: %d Oplock Breaks: %d", ++ atomic_read(&tcon->num_smbs_sent), ++ atomic_read(&tcon->num_oplock_brks)); ++ buf += item_length; ++ length += item_length; ++ item_length = sprintf(buf,"\nReads: %d Bytes %lld", ++ atomic_read(&tcon->num_reads), ++ (long long)(tcon->bytes_read)); ++ buf += item_length; ++ length += item_length; ++ item_length = sprintf(buf,"\nWrites: %d Bytes: %lld", ++ atomic_read(&tcon->num_writes), ++ (long long)(tcon->bytes_written)); ++ buf += item_length; ++ length += item_length; ++ item_length = sprintf(buf, ++ "\nOpens: %d Deletes: %d\nMkdirs: %d Rmdirs: %d", ++ atomic_read(&tcon->num_opens), ++ atomic_read(&tcon->num_deletes), ++ atomic_read(&tcon->num_mkdirs), ++ atomic_read(&tcon->num_rmdirs)); ++ buf += item_length; ++ length += item_length; ++ item_length = sprintf(buf, ++ "\nRenames: %d T2 Renames %d", ++ atomic_read(&tcon->num_renames), ++ atomic_read(&tcon->num_t2renames)); ++ buf += item_length; ++ length += item_length; ++ } ++ read_unlock(&GlobalSMBSeslock); ++ ++ buf += sprintf(buf,"\n"); ++ length++; ++ ++ if(offset + count >= length) ++ *eof = 1; ++ if(length < offset) { ++ *eof = 1; ++ return 0; ++ } else { ++ length = length - offset; ++ } ++ if (length > count) ++ length = count; ++ ++ return length; ++} ++#endif ++ ++struct proc_dir_entry *proc_fs_cifs; ++read_proc_t cifs_txanchor_read; ++static read_proc_t cifsFYI_read; ++static write_proc_t cifsFYI_write; ++static read_proc_t oplockEnabled_read; ++static write_proc_t oplockEnabled_write; ++static read_proc_t lookupFlag_read; ++static write_proc_t lookupFlag_write; ++static read_proc_t traceSMB_read; ++static write_proc_t traceSMB_write; ++static read_proc_t multiuser_mount_read; ++static write_proc_t multiuser_mount_write; ++static read_proc_t extended_security_read; ++static write_proc_t extended_security_write; ++static read_proc_t ntlmv2_enabled_read; ++static write_proc_t ntlmv2_enabled_write; ++static read_proc_t packet_signing_enabled_read; ++static write_proc_t packet_signing_enabled_write; ++static read_proc_t quotaEnabled_read; ++static write_proc_t quotaEnabled_write; ++static read_proc_t linuxExtensionsEnabled_read; ++static write_proc_t linuxExtensionsEnabled_write; ++ ++void ++cifs_proc_init(void) ++{ ++ struct proc_dir_entry *pde; ++ ++ proc_fs_cifs = proc_mkdir("cifs", proc_root_fs); ++ if (proc_fs_cifs == NULL) ++ return; ++ ++ proc_fs_cifs->owner = THIS_MODULE; ++ create_proc_read_entry("DebugData", 0, proc_fs_cifs, ++ cifs_debug_data_read, NULL); ++ ++#ifdef CONFIG_CIFS_STATS ++ create_proc_read_entry("Stats", 0, proc_fs_cifs, ++ cifs_stats_read, NULL); ++#endif ++ pde = create_proc_read_entry("cifsFYI", 0, proc_fs_cifs, ++ cifsFYI_read, NULL); ++ if (pde) ++ pde->write_proc = cifsFYI_write; ++ ++ pde = ++ create_proc_read_entry("traceSMB", 0, proc_fs_cifs, ++ traceSMB_read, NULL); ++ if (pde) ++ pde->write_proc = traceSMB_write; ++ ++ pde = create_proc_read_entry("OplockEnabled", 0, proc_fs_cifs, ++ oplockEnabled_read, NULL); ++ if (pde) ++ pde->write_proc = oplockEnabled_write; ++ ++ pde = create_proc_read_entry("QuotaEnabled", 0, proc_fs_cifs, ++ quotaEnabled_read, NULL); ++ if (pde) ++ pde->write_proc = quotaEnabled_write; ++ ++ pde = create_proc_read_entry("LinuxExtensionsEnabled", 0, proc_fs_cifs, ++ linuxExtensionsEnabled_read, NULL); ++ if (pde) ++ pde->write_proc = linuxExtensionsEnabled_write; ++ ++ pde = ++ create_proc_read_entry("MultiuserMount", 0, proc_fs_cifs, ++ multiuser_mount_read, NULL); ++ if (pde) ++ pde->write_proc = multiuser_mount_write; ++ ++ pde = ++ create_proc_read_entry("ExtendedSecurity", 0, proc_fs_cifs, ++ extended_security_read, NULL); ++ if (pde) ++ pde->write_proc = extended_security_write; ++ ++ pde = ++ create_proc_read_entry("LookupCacheEnabled", 0, proc_fs_cifs, ++ lookupFlag_read, NULL); ++ if (pde) ++ pde->write_proc = lookupFlag_write; ++ ++ pde = ++ create_proc_read_entry("NTLMV2Enabled", 0, proc_fs_cifs, ++ ntlmv2_enabled_read, NULL); ++ if (pde) ++ pde->write_proc = ntlmv2_enabled_write; ++ ++ pde = ++ create_proc_read_entry("PacketSigningEnabled", 0, proc_fs_cifs, ++ packet_signing_enabled_read, NULL); ++ if (pde) ++ pde->write_proc = packet_signing_enabled_write; ++} ++ ++void ++cifs_proc_clean(void) ++{ ++ if (proc_fs_cifs == NULL) ++ return; ++ ++ remove_proc_entry("DebugData", proc_fs_cifs); ++ remove_proc_entry("cifsFYI", proc_fs_cifs); ++ remove_proc_entry("traceSMB", proc_fs_cifs); ++#ifdef CONFIG_CIFS_STATS ++ remove_proc_entry("Stats", proc_fs_cifs); ++#endif ++ remove_proc_entry("MultiuserMount", proc_fs_cifs); ++ remove_proc_entry("OplockEnabled", proc_fs_cifs); ++ remove_proc_entry("NTLMV2Enabled",proc_fs_cifs); ++ remove_proc_entry("ExtendedSecurity",proc_fs_cifs); ++ remove_proc_entry("PacketSigningEnabled",proc_fs_cifs); ++ remove_proc_entry("LinuxExtensionsEnabled",proc_fs_cifs); ++ remove_proc_entry("QuotaEnabled",proc_fs_cifs); ++ remove_proc_entry("LookupCacheEnabled",proc_fs_cifs); ++ remove_proc_entry("cifs", proc_root_fs); ++} ++ ++static int ++cifsFYI_read(char *page, char **start, off_t off, int count, ++ int *eof, void *data) ++{ ++ int len; ++ ++ len = sprintf(page, "%d\n", cifsFYI); ++ ++ len -= off; ++ *start = page + off; ++ ++ if (len > count) ++ len = count; ++ else ++ *eof = 1; ++ ++ if (len < 0) ++ len = 0; ++ ++ return len; ++} ++static int ++cifsFYI_write(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ char c; ++ int rc; ++ ++ rc = get_user(c, buffer); ++ if (rc) ++ return rc; ++ if (c == '0' || c == 'n' || c == 'N') ++ cifsFYI = 0; ++ else if (c == '1' || c == 'y' || c == 'Y') ++ cifsFYI = 1; ++ ++ return count; ++} ++ ++static int ++oplockEnabled_read(char *page, char **start, off_t off, ++ int count, int *eof, void *data) ++{ ++ int len; ++ ++ len = sprintf(page, "%d\n", oplockEnabled); ++ ++ len -= off; ++ *start = page + off; ++ ++ if (len > count) ++ len = count; ++ else ++ *eof = 1; ++ ++ if (len < 0) ++ len = 0; ++ ++ return len; ++} ++static int ++oplockEnabled_write(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ char c; ++ int rc; ++ ++ rc = get_user(c, buffer); ++ if (rc) ++ return rc; ++ if (c == '0' || c == 'n' || c == 'N') ++ oplockEnabled = 0; ++ else if (c == '1' || c == 'y' || c == 'Y') ++ oplockEnabled = 1; ++ ++ return count; ++} ++ ++static int ++quotaEnabled_read(char *page, char **start, off_t off, ++ int count, int *eof, void *data) ++{ ++ int len; ++ ++ len = sprintf(page, "%d\n", quotaEnabled); ++/* could also check if quotas are enabled in kernel ++ as a whole first */ ++ len -= off; ++ *start = page + off; ++ ++ if (len > count) ++ len = count; ++ else ++ *eof = 1; ++ ++ if (len < 0) ++ len = 0; ++ ++ return len; ++} ++static int ++quotaEnabled_write(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ char c; ++ int rc; ++ ++ rc = get_user(c, buffer); ++ if (rc) ++ return rc; ++ if (c == '0' || c == 'n' || c == 'N') ++ quotaEnabled = 0; ++ else if (c == '1' || c == 'y' || c == 'Y') ++ quotaEnabled = 1; ++ ++ return count; ++} ++ ++static int ++linuxExtensionsEnabled_read(char *page, char **start, off_t off, ++ int count, int *eof, void *data) ++{ ++ int len; ++ ++ len = sprintf(page, "%d\n", linuxExtEnabled); ++/* could also check if quotas are enabled in kernel ++ as a whole first */ ++ len -= off; ++ *start = page + off; ++ ++ if (len > count) ++ len = count; ++ else ++ *eof = 1; ++ ++ if (len < 0) ++ len = 0; ++ ++ return len; ++} ++static int ++linuxExtensionsEnabled_write(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ char c; ++ int rc; ++ ++ rc = get_user(c, buffer); ++ if (rc) ++ return rc; ++ if (c == '0' || c == 'n' || c == 'N') ++ linuxExtEnabled = 0; ++ else if (c == '1' || c == 'y' || c == 'Y') ++ linuxExtEnabled = 1; ++ ++ return count; ++} ++ ++ ++static int ++lookupFlag_read(char *page, char **start, off_t off, ++ int count, int *eof, void *data) ++{ ++ int len; ++ ++ len = sprintf(page, "%d\n", lookupCacheEnabled); ++ ++ len -= off; ++ *start = page + off; ++ ++ if (len > count) ++ len = count; ++ else ++ *eof = 1; ++ ++ if (len < 0) ++ len = 0; ++ ++ return len; ++} ++static int ++lookupFlag_write(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ char c; ++ int rc; ++ ++ rc = get_user(c, buffer); ++ if (rc) ++ return rc; ++ if (c == '0' || c == 'n' || c == 'N') ++ lookupCacheEnabled = 0; ++ else if (c == '1' || c == 'y' || c == 'Y') ++ lookupCacheEnabled = 1; ++ ++ return count; ++} ++static int ++traceSMB_read(char *page, char **start, off_t off, int count, ++ int *eof, void *data) ++{ ++ int len; ++ ++ len = sprintf(page, "%d\n", traceSMB); ++ ++ len -= off; ++ *start = page + off; ++ ++ if (len > count) ++ len = count; ++ else ++ *eof = 1; ++ ++ if (len < 0) ++ len = 0; ++ ++ return len; ++} ++static int ++traceSMB_write(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ char c; ++ int rc; ++ ++ rc = get_user(c, buffer); ++ if (rc) ++ return rc; ++ if (c == '0' || c == 'n' || c == 'N') ++ traceSMB = 0; ++ else if (c == '1' || c == 'y' || c == 'Y') ++ traceSMB = 1; ++ ++ return count; ++} ++ ++static int ++multiuser_mount_read(char *page, char **start, off_t off, ++ int count, int *eof, void *data) ++{ ++ int len; ++ ++ len = sprintf(page, "%d\n", multiuser_mount); ++ ++ len -= off; ++ *start = page + off; ++ ++ if (len > count) ++ len = count; ++ else ++ *eof = 1; ++ ++ if (len < 0) ++ len = 0; ++ ++ return len; ++} ++static int ++multiuser_mount_write(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ char c; ++ int rc; ++ ++ rc = get_user(c, buffer); ++ if (rc) ++ return rc; ++ if (c == '0' || c == 'n' || c == 'N') ++ multiuser_mount = 0; ++ else if (c == '1' || c == 'y' || c == 'Y') ++ multiuser_mount = 1; ++ ++ return count; ++} ++ ++static int ++extended_security_read(char *page, char **start, off_t off, ++ int count, int *eof, void *data) ++{ ++ int len; ++ ++ len = sprintf(page, "%d\n", extended_security); ++ ++ len -= off; ++ *start = page + off; ++ ++ if (len > count) ++ len = count; ++ else ++ *eof = 1; ++ ++ if (len < 0) ++ len = 0; ++ ++ return len; ++} ++static int ++extended_security_write(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ char c; ++ int rc; ++ ++ rc = get_user(c, buffer); ++ if (rc) ++ return rc; ++ if (c == '0' || c == 'n' || c == 'N') ++ extended_security = 0; ++ else if (c == '1' || c == 'y' || c == 'Y') ++ extended_security = 1; ++ ++ return count; ++} ++ ++static int ++ntlmv2_enabled_read(char *page, char **start, off_t off, ++ int count, int *eof, void *data) ++{ ++ int len; ++ ++ len = sprintf(page, "%d\n", ntlmv2_support); ++ ++ len -= off; ++ *start = page + off; ++ ++ if (len > count) ++ len = count; ++ else ++ *eof = 1; ++ ++ if (len < 0) ++ len = 0; ++ ++ return len; ++} ++static int ++ntlmv2_enabled_write(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ char c; ++ int rc; ++ ++ rc = get_user(c, buffer); ++ if (rc) ++ return rc; ++ if (c == '0' || c == 'n' || c == 'N') ++ ntlmv2_support = 0; ++ else if (c == '1' || c == 'y' || c == 'Y') ++ ntlmv2_support = 1; ++ ++ return count; ++} ++ ++static int ++packet_signing_enabled_read(char *page, char **start, off_t off, ++ int count, int *eof, void *data) ++{ ++ int len; ++ ++ len = sprintf(page, "%d\n", sign_CIFS_PDUs); ++ ++ len -= off; ++ *start = page + off; ++ ++ if (len > count) ++ len = count; ++ else ++ *eof = 1; ++ ++ if (len < 0) ++ len = 0; ++ ++ return len; ++} ++static int ++packet_signing_enabled_write(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ char c; ++ int rc; ++ ++ rc = get_user(c, buffer); ++ if (rc) ++ return rc; ++ if (c == '0' || c == 'n' || c == 'N') ++ sign_CIFS_PDUs = 0; ++ else if (c == '1' || c == 'y' || c == 'Y') ++ sign_CIFS_PDUs = 1; ++ else if (c == '2') ++ sign_CIFS_PDUs = 2; ++ ++ return count; ++} ++ ++ ++#endif +diff -urN linux-2.4.29.old/fs/cifs/cifs_debug.h linux-2.4.29/fs/cifs/cifs_debug.h +--- linux-2.4.29.old/fs/cifs/cifs_debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifs_debug.h 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,66 @@ ++/* ++ * ++ * Copyright (c) International Business Machines Corp., 2000,2002 ++ * Modified by Steve French (sfrench@us.ibm.com) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++*/ ++#define CIFS_DEBUG /* BB temporary */ ++ ++#ifndef _H_CIFS_DEBUG ++#define _H_CIFS_DEBUG ++ ++void cifs_dump_mem(char *label, void *data, int length); ++extern int traceSMB; /* flag which enables the function below */ ++void dump_smb(struct smb_hdr *, int); ++ ++/* ++ * debug ON ++ * -------- ++ */ ++#ifdef CIFS_DEBUG ++ ++ ++/* information message: e.g., configuration, major event */ ++extern int cifsFYI; ++#define cifsfyi(format,arg...) if (cifsFYI) printk(KERN_DEBUG " " __FILE__ ": " format "\n" "" , ## arg) ++ ++#define cFYI(button,prspec) if (button) cifsfyi prspec ++ ++#define cifswarn(format, arg...) printk(KERN_WARNING ": " format "\n" , ## arg) ++ ++/* debug event message: */ ++extern int cifsERROR; ++ ++#define cEVENT(format,arg...) if (cifsERROR) printk(KERN_EVENT __FILE__ ": " format "\n" , ## arg) ++ ++/* error event message: e.g., i/o error */ ++#define cifserror(format,arg...) if (cifsERROR) printk(KERN_ERR " CIFS VFS: " format "\n" "" , ## arg) ++ ++#define cERROR(button, prspec) if (button) cifserror prspec ++ ++/* ++ * debug OFF ++ * --------- ++ */ ++#else /* _CIFS_DEBUG */ ++#define cERROR(button,prspec) ++#define cEVENT(format,arg...) ++#define cFYI(button, prspec) ++#define cifserror(format,arg...) ++#endif /* _CIFS_DEBUG */ ++ ++#endif /* _H_CIFS_DEBUG */ +diff -urN linux-2.4.29.old/fs/cifs/cifsencrypt.c linux-2.4.29/fs/cifs/cifsencrypt.c +--- linux-2.4.29.old/fs/cifs/cifsencrypt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifsencrypt.c 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,204 @@ ++/* ++ * fs/cifs/cifsencrypt.c ++ * ++ * Copyright (C) International Business Machines Corp., 2003 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <linux/fs.h> ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifs_debug.h" ++#include "md5.h" ++#include "cifs_unicode.h" ++ ++/* Calculate and return the CIFS signature based on the mac key and the smb pdu */ ++/* the 16 byte signature must be allocated by the caller */ ++/* Note we only use the 1st eight bytes */ ++/* Note that the smb header signature field on input contains the ++ sequence number before this function is called */ ++ ++extern void mdfour(unsigned char *out, unsigned char *in, int n); ++extern void E_md4hash(const unsigned char *passwd, unsigned char *p16); ++ ++static int cifs_calculate_signature(const struct smb_hdr * cifs_pdu, const char * key, char * signature) ++{ ++ struct MD5Context context; ++ ++ if((cifs_pdu == NULL) || (signature == NULL)) ++ return -EINVAL; ++ ++ MD5Init(&context); ++ MD5Update(&context,key,CIFS_SESSION_KEY_SIZE+16); ++ MD5Update(&context,cifs_pdu->Protocol,cifs_pdu->smb_buf_length); ++ MD5Final(signature,&context); ++ return 0; ++} ++ ++int cifs_sign_smb(struct smb_hdr * cifs_pdu, struct cifsSesInfo * ses, ++ __u32 * pexpected_response_sequence_number) ++{ ++ int rc = 0; ++ char smb_signature[20]; ++ ++ /* BB remember to initialize sequence number elsewhere and initialize mac_signing key elsewhere BB */ ++ /* BB remember to add code to save expected sequence number in midQ entry BB */ ++ ++ if((cifs_pdu == NULL) || (ses == NULL)) ++ return -EINVAL; ++ ++ if((le32_to_cpu(cifs_pdu->Flags2) & SMBFLG2_SECURITY_SIGNATURE) == 0) ++ return rc; ++ ++ spin_lock(&GlobalMid_Lock); ++ cifs_pdu->Signature.Sequence.SequenceNumber = cpu_to_le32(ses->sequence_number); ++ cifs_pdu->Signature.Sequence.Reserved = 0; ++ ++ *pexpected_response_sequence_number = ses->sequence_number++; ++ ses->sequence_number++; ++ spin_unlock(&GlobalMid_Lock); ++ ++ rc = cifs_calculate_signature(cifs_pdu, ses->mac_signing_key,smb_signature); ++ if(rc) ++ memset(cifs_pdu->Signature.SecuritySignature, 0, 8); ++ else ++ memcpy(cifs_pdu->Signature.SecuritySignature, smb_signature, 8); ++ ++ return rc; ++} ++ ++int cifs_verify_signature(struct smb_hdr * cifs_pdu, const char * mac_key, ++ __u32 expected_sequence_number) ++{ ++ unsigned int rc; ++ char server_response_sig[8]; ++ char what_we_think_sig_should_be[20]; ++ ++ if((cifs_pdu == NULL) || (mac_key == NULL)) ++ return -EINVAL; ++ ++ if (cifs_pdu->Command == SMB_COM_NEGOTIATE) ++ return 0; ++ ++ if (cifs_pdu->Command == SMB_COM_LOCKING_ANDX) { ++ struct smb_com_lock_req * pSMB = (struct smb_com_lock_req *)cifs_pdu; ++ if(pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE) ++ return 0; ++ } ++ ++ /* BB what if signatures are supposed to be on for session but server does not ++ send one? BB */ ++ ++ /* Do not need to verify session setups with signature "BSRSPYL " */ ++ if(memcmp(cifs_pdu->Signature.SecuritySignature,"BSRSPYL ",8)==0) ++ cFYI(1,("dummy signature received for smb command 0x%x",cifs_pdu->Command)); ++ ++ expected_sequence_number = cpu_to_le32(expected_sequence_number); ++ ++ /* save off the origiginal signature so we can modify the smb and check ++ its signature against what the server sent */ ++ memcpy(server_response_sig,cifs_pdu->Signature.SecuritySignature,8); ++ ++ cifs_pdu->Signature.Sequence.SequenceNumber = expected_sequence_number; ++ cifs_pdu->Signature.Sequence.Reserved = 0; ++ ++ rc = cifs_calculate_signature(cifs_pdu, mac_key, ++ what_we_think_sig_should_be); ++ ++ if(rc) ++ return rc; ++ ++ ++/* cifs_dump_mem("what we think it should be: ",what_we_think_sig_should_be,16); */ ++ ++ if(memcmp(server_response_sig, what_we_think_sig_should_be, 8)) ++ return -EACCES; ++ else ++ return 0; ++ ++} ++ ++/* We fill in key by putting in 40 byte array which was allocated by caller */ ++int cifs_calculate_mac_key(char * key, const char * rn, const char * password) ++{ ++ char temp_key[16]; ++ if ((key == NULL) || (rn == NULL)) ++ return -EINVAL; ++ ++ E_md4hash(password, temp_key); ++ mdfour(key,temp_key,16); ++ memcpy(key+16,rn, CIFS_SESSION_KEY_SIZE); ++ return 0; ++} ++ ++int CalcNTLMv2_partial_mac_key(struct cifsSesInfo * ses, struct nls_table * nls_info) ++{ ++ char temp_hash[16]; ++ struct HMACMD5Context ctx; ++ char * ucase_buf; ++ wchar_t * unicode_buf; ++ unsigned int i,user_name_len,dom_name_len; ++ ++ if(ses) ++ return -EINVAL; ++ ++ E_md4hash(ses->password, temp_hash); ++ ++ hmac_md5_init_limK_to_64(temp_hash, 16, &ctx); ++ user_name_len = strlen(ses->userName); ++ if(user_name_len > MAX_USERNAME_SIZE) ++ return -EINVAL; ++ dom_name_len = strlen(ses->domainName); ++ if(dom_name_len > MAX_USERNAME_SIZE) ++ return -EINVAL; ++ ++ ucase_buf = kmalloc((MAX_USERNAME_SIZE+1), GFP_KERNEL); ++ unicode_buf = kmalloc((MAX_USERNAME_SIZE+1)*4, GFP_KERNEL); ++ ++ for(i=0;i<user_name_len;i++) ++ ucase_buf[i] = nls_info->charset2upper[(int)ses->userName[i]]; ++ ucase_buf[i] = 0; ++ user_name_len = cifs_strtoUCS(unicode_buf, ucase_buf, MAX_USERNAME_SIZE*2, nls_info); ++ unicode_buf[user_name_len] = 0; ++ user_name_len++; ++ ++ for(i=0;i<dom_name_len;i++) ++ ucase_buf[i] = nls_info->charset2upper[(int)ses->domainName[i]]; ++ ucase_buf[i] = 0; ++ dom_name_len = cifs_strtoUCS(unicode_buf+user_name_len, ucase_buf, MAX_USERNAME_SIZE*2, nls_info); ++ ++ unicode_buf[user_name_len + dom_name_len] = 0; ++ hmac_md5_update((const unsigned char *) unicode_buf, ++ (user_name_len+dom_name_len)*2,&ctx); ++ ++ hmac_md5_final(ses->mac_signing_key,&ctx); ++ kfree(ucase_buf); ++ kfree(unicode_buf); ++ return 0; ++} ++void CalcNTLMv2_response(const struct cifsSesInfo * ses,char * v2_session_response) ++{ ++ struct HMACMD5Context context; ++ memcpy(v2_session_response + 8, ses->server->cryptKey,8); ++ /* gen_blob(v2_session_response + 16); */ ++ hmac_md5_init_limK_to_64(ses->mac_signing_key, 16, &context); ++ ++ hmac_md5_update(ses->server->cryptKey,8,&context); ++/* hmac_md5_update(v2_session_response+16)client thing,8,&context); */ /* BB fix */ ++ ++ hmac_md5_final(v2_session_response,&context); ++} +diff -urN linux-2.4.29.old/fs/cifs/cifserr.c linux-2.4.29/fs/cifs/cifserr.c +--- linux-2.4.29.old/fs/cifs/cifserr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifserr.c 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,70 @@ ++/* ++ * fs/cifserr.c ++ * ++ * Copyright (c) International Business Machines Corp., 2002 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <linux/errno.h> ++#include <linux/fs.h> ++#include <linux/smbno.h> ++#include "cifsfs.h" ++ ++int map_cifs_error(int error_class, int error_code, ++ int status_codes_negotiated) ++{ ++ ++ ++ if (status_codes_negotiated) { ++ switch (error_code) { ++ default: ++ return EIO; ++ } ++ } else ++ switch (error_class) { ++ case SUCCESS: ++ return 0; ++ ++ case ERRDOS: ++ switch (error_code) { ++ case ERRbadfunc: ++ return EINVAL; ++ default: ++ return EIO; ++ } ++ ++ case ERRSRV: ++ switch (error_code) { ++ default: ++ return EIO; ++ } ++ ++ case ERRHRD: ++ switch (error_code) { ++ default: ++ return EIO; ++ } ++ default: ++ return EIO; ++ } ++ return 0; ++} ++ ++int map_smb_error(int error_class, int error_code) ++{ ++ return map_cifs_error(error_class, error_code, FALSE); ++} +diff -urN linux-2.4.29.old/fs/cifs/cifsfs.c linux-2.4.29/fs/cifs/cifsfs.c +--- linux-2.4.29.old/fs/cifs/cifsfs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifsfs.c 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,769 @@ ++/* ++ * fs/cifs/cifsfs.c ++ * ++ * Copyright (C) International Business Machines Corp., 2002,2004 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * Common Internet FileSystem (CIFS) client ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++/* Note that BB means BUGBUG (ie something to fix eventually) */ ++ ++#include <linux/module.h> ++#include <linux/fs.h> ++#include <linux/mount.h> ++#include <linux/slab.h> ++#include <linux/init.h> ++#include <linux/version.h> ++#include <linux/list.h> ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15)) ++#include <linux/seq_file.h> ++#endif ++#include <linux/vfs.h> ++#include "cifsfs.h" ++#include "cifspdu.h" ++#define DECLARE_GLOBALS_HERE ++#include "cifsglob.h" ++#include "cifsproto.h" ++#include "cifs_debug.h" ++#include "cifs_fs_sb.h" ++#include <linux/mm.h> ++#define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ ++/* BB when mempool_resize is added back in, we will resize pool on new mount */ ++#define CIFS_MIN_RCV_POOL 11 /* enough for progress to five servers */ ++ ++#ifdef CONFIG_CIFS_QUOTA ++static struct quotactl_ops cifs_quotactl_ops; ++#endif ++ ++extern struct file_system_type cifs_fs_type; ++ ++int cifsFYI = 0; ++int cifsERROR = 1; ++int traceSMB = 0; ++unsigned int oplockEnabled = 1; ++unsigned int quotaEnabled = 0; ++unsigned int linuxExtEnabled = 1; ++unsigned int lookupCacheEnabled = 1; ++unsigned int multiuser_mount = 0; ++unsigned int extended_security = 0; ++unsigned int ntlmv2_support = 0; ++unsigned int sign_CIFS_PDUs = 1; ++unsigned int CIFSMaximumBufferSize = CIFS_MAX_MSGSIZE; ++struct task_struct * oplockThread = NULL; ++ ++extern int cifs_mount(struct super_block *, struct cifs_sb_info *, char *, ++ const char *); ++extern int cifs_umount(struct super_block *, struct cifs_sb_info *); ++void cifs_proc_init(void); ++void cifs_proc_clean(void); ++ ++static DECLARE_COMPLETION(cifs_oplock_exited); ++ ++ ++struct super_block * ++cifs_read_super(struct super_block *sb, void *data, int silent) ++{ ++ struct inode *inode; ++ struct cifs_sb_info *cifs_sb; ++ int rc = 0; ++ ++ sb->s_flags |= MS_NODIRATIME; /* and probably even noatime */ ++ cifs_sb = CIFS_SB(sb); ++ if(cifs_sb == NULL) ++ return 0; ++ else ++ memset(cifs_sb,0,sizeof(struct cifs_sb_info)); ++ ++ ++ rc = cifs_mount(sb, cifs_sb, data, NULL); ++ ++ if (rc) { ++ if (!silent) ++ cERROR(1, ++ ("cifs_mount failed w/return code = %d", rc)); ++ goto out_mount_failed; ++ } ++ ++ sb->s_magic = CIFS_MAGIC_NUMBER; ++ sb->s_op = &cifs_super_ops; ++/* if(cifs_sb->tcon->ses->server->maxBuf > MAX_CIFS_HDR_SIZE + 512) ++ sb->s_blocksize = cifs_sb->tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; */ ++#ifdef CONFIG_CIFS_QUOTA ++ sb->s_qcop = &cifs_quotactl_ops; ++#endif ++ sb->s_blocksize = CIFS_MAX_MSGSIZE; ++ sb->s_blocksize_bits = 14; /* default 2**14 = CIFS_MAX_MSGSIZE */ ++ inode = iget(sb, ROOT_I); ++ ++ if (!inode) { ++ goto out_no_root; ++ } ++ ++ sb->s_root = d_alloc_root(inode); ++ ++ if (!sb->s_root) { ++ goto out_no_root; ++ } ++ ++ return sb; ++ ++out_no_root: ++ cERROR(1, ("cifs_read_super: get root inode failed")); ++ if (inode) ++ iput(inode); ++ ++out_mount_failed: ++ if(cifs_sb->local_nls) ++ unload_nls(cifs_sb->local_nls); ++ sb->s_dev = 0; ++ return 0; ++} ++ ++static void ++cifs_put_super(struct super_block *sb) ++{ ++ int rc = 0; ++ struct cifs_sb_info *cifs_sb; ++ ++ cFYI(1, ("In cifs_put_super")); ++ cifs_sb = CIFS_SB(sb); ++ if(cifs_sb == NULL) { ++ cFYI(1,("Empty cifs superblock info passed to unmount")); ++ return; ++ } ++ rc = cifs_umount(sb, cifs_sb); ++ if (rc) { ++ cERROR(1, ("cifs_umount failed with return code %d", rc)); ++ } ++ unload_nls(cifs_sb->local_nls); ++ return; ++} ++ ++static int ++cifs_statfs(struct super_block *sb, struct statfs *buf) ++{ ++ int xid, rc; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(sb); ++ pTcon = cifs_sb->tcon; ++ ++ buf->f_type = CIFS_MAGIC_NUMBER; ++ ++ /* instead could get the real value via SMB_QUERY_FS_ATTRIBUTE_INFO */ ++ buf->f_namelen = PATH_MAX; /* PATH_MAX may be too long - it would presumably ++ be length of total path, note that some servers may be ++ able to support more than this, but best to be safe ++ since Win2k and others can not handle very long filenames */ ++ buf->f_files = 0; /* undefined */ ++ buf->f_ffree = 0; /* unlimited */ ++ ++ rc = CIFSSMBQFSInfo(xid, pTcon, buf, cifs_sb->local_nls); ++ ++ /* ++ int f_type; ++ __fsid_t f_fsid; ++ int f_namelen; */ ++ /* BB get from info put in tcon struct at mount time with call to QFSAttrInfo */ ++ FreeXid(xid); ++ return 0; /* always return success? what if volume is no longer available? */ ++} ++ ++static int cifs_permission(struct inode * inode, int mask) ++{ ++ /* the server does permission checks, we do not need to do it here */ ++ return 0; ++} ++ ++kmem_cache_t *cifs_req_cachep; ++kmem_cache_t *cifs_mid_cachep; ++kmem_cache_t *cifs_oplock_cachep; ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) ++static struct inode * ++cifs_alloc_inode(struct super_block *sb) ++{ ++ struct cifsInodeInfo *cifs_inode; ++ cifs_inode = ++ (struct cifsInodeInfo *) kmem_cache_alloc(cifs_inode_cachep, ++ SLAB_KERNEL); ++ if (!cifs_inode) ++ return NULL; ++ cifs_inode->cifsAttrs = 0x20; /* default */ ++ atomic_set(&cifs_inode->inUse, 0); ++ cifs_inode->time = 0; ++ /* Until the file is open and we have gotten oplock ++ info back from the server, can not assume caching of ++ file data or metadata */ ++ cifs_inode->clientCanCacheRead = FALSE; ++ cifs_inode->clientCanCacheAll = FALSE; ++ INIT_LIST_HEAD(&cifs_inode->openFileList); ++ return &cifs_inode->vfs_inode; ++} ++ ++static void ++cifs_destroy_inode(struct inode *inode) ++{ ++ kmem_cache_free(cifs_inode_cachep, CIFS_I(inode)); ++} ++#endif ++ ++/* ++ * cifs_show_options() is for displaying mount options in /proc/mounts. ++ * Not all settable options are displayed but most of the important ++ * ones are. ++ */ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15)) ++static int ++cifs_show_options(struct seq_file *s, struct vfsmount *m) ++{ ++ struct cifs_sb_info *cifs_sb; ++ ++ cifs_sb = CIFS_SB(m->mnt_sb); ++ ++ if (cifs_sb) { ++ if (cifs_sb->tcon) { ++ seq_printf(s, ",unc=%s", cifs_sb->tcon->treeName); ++ if ((cifs_sb->tcon->ses) && (cifs_sb->tcon->ses->userName)) ++ seq_printf(s, ",username=%s", ++ cifs_sb->tcon->ses->userName); ++ if(cifs_sb->tcon->ses->domainName) ++ seq_printf(s, ",domain=%s", ++ cifs_sb->tcon->ses->domainName); ++ } ++ seq_printf(s, ",rsize=%d",cifs_sb->rsize); ++ seq_printf(s, ",wsize=%d",cifs_sb->wsize); ++ } ++ return 0; ++} ++#endif ++ ++#ifdef CONFIG_CIFS_QUOTA ++int cifs_xquota_set(struct super_block * sb, int quota_type, qid_t qid, ++ struct fs_disk_quota * pdquota) ++{ ++ int xid; ++ int rc = 0; ++ struct cifs_sb_info *cifs_sb = CIFS_SB(sb); ++ struct cifsTconInfo *pTcon; ++ ++ if(cifs_sb) ++ pTcon = cifs_sb->tcon; ++ else ++ return -EIO; ++ ++ ++ xid = GetXid(); ++ if(pTcon) { ++ cFYI(1,("set type: 0x%x id: %d",quota_type,qid)); ++ } else { ++ return -EIO; ++ } ++ ++ FreeXid(xid); ++ return rc; ++} ++ ++int cifs_xquota_get(struct super_block * sb, int quota_type, qid_t qid, ++ struct fs_disk_quota * pdquota) ++{ ++ int xid; ++ int rc = 0; ++ struct cifs_sb_info *cifs_sb = CIFS_SB(sb); ++ struct cifsTconInfo *pTcon; ++ ++ if(cifs_sb) ++ pTcon = cifs_sb->tcon; ++ else ++ return -EIO; ++ ++ xid = GetXid(); ++ if(pTcon) { ++ cFYI(1,("set type: 0x%x id: %d",quota_type,qid)); ++ } else { ++ rc = -EIO; ++ } ++ ++ FreeXid(xid); ++ return rc; ++} ++ ++int cifs_xstate_set(struct super_block * sb, unsigned int flags, int operation) ++{ ++ int xid; ++ int rc = 0; ++ struct cifs_sb_info *cifs_sb = CIFS_SB(sb); ++ struct cifsTconInfo *pTcon; ++ ++ if(cifs_sb) ++ pTcon = cifs_sb->tcon; ++ else ++ return -EIO; ++ ++ xid = GetXid(); ++ if(pTcon) { ++ cFYI(1,("flags: 0x%x operation: 0x%x",flags,operation)); ++ } else { ++ rc = -EIO; ++ } ++ ++ FreeXid(xid); ++ return rc; ++} ++ ++int cifs_xstate_get(struct super_block * sb, struct fs_quota_stat *qstats) ++{ ++ int xid; ++ int rc = 0; ++ struct cifs_sb_info *cifs_sb = CIFS_SB(sb); ++ struct cifsTconInfo *pTcon; ++ ++ if(cifs_sb) { ++ pTcon = cifs_sb->tcon; ++ } else { ++ return -EIO; ++ } ++ xid = GetXid(); ++ if(pTcon) { ++ cFYI(1,("pqstats %p",qstats)); ++ } else { ++ rc = -EIO; ++ } ++ ++ FreeXid(xid); ++ return rc; ++} ++ ++static struct quotactl_ops cifs_quotactl_ops = { ++ .set_xquota = cifs_xquota_set, ++ .get_xquota = cifs_xquota_set, ++ .set_xstate = cifs_xstate_set, ++ .get_xstate = cifs_xstate_get, ++}; ++#endif ++ ++static int cifs_remount(struct super_block *sb, int *flags, char *data) ++{ ++ *flags |= MS_NODIRATIME; ++ return 0; ++} ++ ++struct super_operations cifs_super_ops = { ++ .read_inode = cifs_read_inode, ++ .put_super = cifs_put_super, ++ .statfs = cifs_statfs, ++/* .alloc_inode = cifs_alloc_inode, ++ .destroy_inode = cifs_destroy_inode, */ ++/* .drop_inode = generic_delete_inode, ++ .delete_inode = cifs_delete_inode, *//* Do not need the above two functions ++ unless later we add lazy close of inodes or unless the kernel forgets to call ++ us with the same number of releases (closes) as opens */ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15)) ++ .show_options = cifs_show_options, ++#endif ++/* .umount_begin = cifs_umount_begin, *//* consider adding in the future */ ++}; ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) ++static struct super_block * ++cifs_get_sb(struct file_system_type *fs_type, ++ int flags, const char *dev_name, void *data) ++{ ++ int rc; ++ struct super_block *sb = sget(fs_type, NULL, set_anon_super, NULL); ++ ++ cFYI(1, ("Devname: %s flags: %d ", dev_name, flags)); ++ ++ if (IS_ERR(sb)) ++ return sb; ++ ++ sb->s_flags = flags; ++ ++ rc = cifs_read_super(sb, data, dev_name, flags & MS_VERBOSE ? 1 : 0); ++ if (rc) { ++ up_write(&sb->s_umount); ++ deactivate_super(sb); ++ return ERR_PTR(rc); ++ } ++ sb->s_flags |= MS_ACTIVE; ++ return sb; ++} ++#endif ++ ++static ssize_t ++cifs_read_wrapper(struct file * file, char *read_data, size_t read_size, ++ loff_t * poffset) ++{ ++ if(file == NULL) ++ return -EIO; ++ else if(file->f_dentry == NULL) ++ return -EIO; ++ else if(file->f_dentry->d_inode == NULL) ++ return -EIO; ++ ++ if(CIFS_I(file->f_dentry->d_inode)->clientCanCacheRead) { ++ return generic_file_read(file,read_data,read_size,poffset); ++ } else { ++ /* BB do we need to lock inode from here until after invalidate? */ ++/* if(file->f_dentry->d_inode->i_mapping) { ++ filemap_fdatawrite(file->f_dentry->d_inode->i_mapping); ++ filemap_fdatawait(file->f_dentry->d_inode->i_mapping); ++ }*/ ++/* cifs_revalidate(file->f_dentry);*/ /* BB fixme */ ++ ++ /* BB we should make timer configurable - perhaps ++ by simply calling cifs_revalidate here */ ++ /* invalidate_remote_inode(file->f_dentry->d_inode);*/ ++ return generic_file_read(file,read_data,read_size,poffset); ++ } ++} ++ ++static ssize_t ++cifs_write_wrapper(struct file * file, const char *write_data, ++ size_t write_size, loff_t * poffset) ++{ ++ ssize_t written; ++ ++ if(file == NULL) ++ return -EIO; ++ else if(file->f_dentry == NULL) ++ return -EIO; ++ else if(file->f_dentry->d_inode == NULL) ++ return -EIO; ++ ++ /* check whether we can cache writes locally */ ++ written = generic_file_write(file,write_data,write_size,poffset); ++ if(!CIFS_I(file->f_dentry->d_inode)->clientCanCacheAll) { ++ if(file->f_dentry->d_inode->i_mapping) { ++ filemap_fdatasync(file->f_dentry->d_inode->i_mapping); ++ } ++ } ++ return written; ++} ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) ++static struct file_system_type cifs_fs_type = { ++ .owner = THIS_MODULE, ++ .name = "cifs", ++ .get_sb = cifs_get_sb, ++ .kill_sb = kill_anon_super, ++ /* .fs_flags */ ++}; ++#endif ++ ++static DECLARE_FSTYPE(cifs_fs_type, "cifs", cifs_read_super,0); ++ ++ ++struct inode_operations cifs_dir_inode_ops = { ++ .create = cifs_create, ++ .lookup = cifs_lookup, ++ .unlink = cifs_unlink, ++ .link = cifs_hardlink, ++ .mkdir = cifs_mkdir, ++ .rmdir = cifs_rmdir, ++ .rename = cifs_rename, ++ .permission = cifs_permission, ++ .revalidate = cifs_revalidate, ++ .setattr = cifs_setattr, ++ .symlink = cifs_symlink, ++ .mknod = cifs_mknod, ++}; ++ ++struct inode_operations cifs_file_inode_ops = { ++ .revalidate = cifs_revalidate, ++ .setattr = cifs_setattr, ++/* .getattr = cifs_getattr,*/ ++ .rename = cifs_rename, ++ .permission = cifs_permission, ++#ifdef CONFIG_CIFS_XATTR ++ .setxattr = cifs_setxattr, ++ .getxattr = cifs_getxattr, ++ .listxattr = cifs_listxattr, ++ .removexattr = cifs_removexattr, ++#endif ++}; ++ ++struct inode_operations cifs_symlink_inode_ops = { ++ .readlink = cifs_readlink, ++ .follow_link = cifs_follow_link, ++ .permission = cifs_permission, ++ /* BB add the following two eventually */ ++ /* revalidate: cifs_revalidate, ++ setattr: cifs_notify_change, *//* BB do we need notify change */ ++#ifdef CONFIG_CIFS_XATTR ++ .setxattr = cifs_setxattr, ++ .getxattr = cifs_getxattr, ++ .listxattr = cifs_listxattr, ++ .removexattr = cifs_removexattr, ++#endif ++}; ++ ++struct file_operations cifs_file_ops = { ++ .read = cifs_read_wrapper, ++ .write = cifs_write_wrapper, ++ .open = cifs_open, ++ .release = cifs_close, ++ .lock = cifs_lock, ++ .fsync = cifs_fsync, ++ .flush = cifs_flush, ++ .mmap = cifs_file_mmap, ++/* .sendfile = generic_file_sendfile,*/ ++#ifdef CONFIG_CIFS_FCNTL ++ .fcntl = cifs_fcntl, ++#endif ++}; ++ ++struct file_operations cifs_dir_ops = { ++ .readdir = cifs_readdir, ++ .release = cifs_closedir, ++ .read = generic_read_dir, ++#ifdef CONFIG_CIFS_FCNTL ++ .fcntl = cifs_fcntl, ++#endif ++}; ++/* ++static void ++cifs_init_once(void *inode, kmem_cache_t * cachep, unsigned long flags) ++{ ++ struct cifsInodeInfo *cifsi = (struct cifsInodeInfo *) inode; ++ ++ if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) == ++ SLAB_CTOR_CONSTRUCTOR) { ++ inode_init_once(&cifsi->vfs_inode); ++ INIT_LIST_HEAD(&cifsi->lockList); ++ } ++} ++ ++static int ++cifs_init_inodecache(void) ++{ ++ cifs_inode_cachep = kmem_cache_create("cifs_inode_cache", ++ sizeof (struct cifsInodeInfo), ++ 0, SLAB_HWCACHE_ALIGN, ++ cifs_init_once, NULL); ++ if (cifs_inode_cachep == NULL) ++ return -ENOMEM; ++ ++ ++ return 0; ++} ++ ++static void ++cifs_destroy_inodecache(void) ++{ ++ if (kmem_cache_destroy(cifs_inode_cachep)) ++ printk(KERN_WARNING "cifs_inode_cache: error freeing\n"); ++} */ ++ ++static int ++cifs_init_request_bufs(void) ++{ ++ cifs_req_cachep = kmem_cache_create("cifs_request", ++ CIFS_MAX_MSGSIZE + ++ MAX_CIFS_HDR_SIZE, 0, ++ SLAB_HWCACHE_ALIGN, NULL, NULL); ++ if (cifs_req_cachep == NULL) ++ return -ENOMEM; ++ ++ return 0; ++} ++ ++static void ++cifs_destroy_request_bufs(void) ++{ ++ if (kmem_cache_destroy(cifs_req_cachep)) ++ printk(KERN_WARNING ++ "cifs_destroy_request_cache: error not all structures were freed\n"); ++} ++ ++static int ++cifs_init_mids(void) ++{ ++ cifs_mid_cachep = kmem_cache_create("cifs_mpx_ids", ++ sizeof (struct mid_q_entry), 0, ++ SLAB_HWCACHE_ALIGN, NULL, NULL); ++ if (cifs_mid_cachep == NULL) ++ return -ENOMEM; ++ cifs_oplock_cachep = kmem_cache_create("cifs_oplock_struct", ++ sizeof (struct oplock_q_entry), 0, ++ SLAB_HWCACHE_ALIGN, NULL, NULL); ++ if (cifs_oplock_cachep == NULL) { ++ kmem_cache_destroy(cifs_mid_cachep); ++ return -ENOMEM; ++ } ++ ++ return 0; ++} ++ ++static void ++cifs_destroy_mids(void) ++{ ++ if (kmem_cache_destroy(cifs_mid_cachep)) ++ printk(KERN_WARNING ++ "cifs_destroy_mids: error not all structures were freed\n"); ++ if (kmem_cache_destroy(cifs_oplock_cachep)) ++ printk(KERN_WARNING ++ "error not all oplock structures were freed\n"); ++} ++ ++static int cifs_oplock_thread(void * dummyarg) ++{ ++ struct oplock_q_entry * oplock_item; ++ struct cifsTconInfo *pTcon; ++ struct inode * inode; ++ __u16 netfid; ++ int rc = 0; ++ ++ daemonize(); ++ sprintf(current->comm,"cifsoplockd"); ++ ++ oplockThread = current; ++ do { ++ set_current_state(TASK_INTERRUPTIBLE); ++ ++ schedule_timeout(1*HZ); ++ spin_lock(&GlobalMid_Lock); ++ if(list_empty(&GlobalOplock_Q)) { ++ spin_unlock(&GlobalMid_Lock); ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule_timeout(39*HZ); ++ } else { ++ oplock_item = list_entry(GlobalOplock_Q.next, ++ struct oplock_q_entry, qhead); ++ if(oplock_item) { ++ cFYI(1,("found oplock item to write out")); ++ pTcon = oplock_item->tcon; ++ inode = oplock_item->pinode; ++ netfid = oplock_item->netfid; ++ spin_unlock(&GlobalMid_Lock); ++ DeleteOplockQEntry(oplock_item); ++ /* can not grab inode sem here since it would ++ deadlock when oplock received on delete ++ since vfs_unlink holds the i_sem across ++ the call */ ++ /* down(&inode->i_sem);*/ ++ if (S_ISREG(inode->i_mode)) { ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,17)) ++ rc = filemap_fdatasync(inode->i_mapping); ++ if(rc) ++ CIFS_I(inode)->write_behind_rc = rc; ++#else ++ filemap_fdatasync(inode->i_mapping); ++#endif ++ if(CIFS_I(inode)->clientCanCacheRead == 0) ++ invalidate_inode_pages(inode); ++ } else ++ rc = 0; ++ /* releasing a stale oplock after recent reconnection ++ of smb session using a now incorrect file ++ handle is not a data integrity issue but do ++ not bother sending an oplock release if session ++ to server still is disconnected since oplock ++ already released by the server in that case */ ++ if(pTcon->tidStatus != CifsNeedReconnect) { ++ rc = CIFSSMBLock(0, pTcon, ++ netfid, ++ 0 /* len */ , 0 /* offset */, 0, ++ 0, LOCKING_ANDX_OPLOCK_RELEASE, ++ 0 /* wait flag */); ++ cFYI(1,("Oplock release rc = %d ",rc)); ++ } ++ } else ++ spin_unlock(&GlobalMid_Lock); ++ } ++ } while(!signal_pending(current)); ++ complete_and_exit (&cifs_oplock_exited, 0); ++} ++ ++static int __init ++init_cifs(void) ++{ ++ int rc = 0; ++#if CONFIG_PROC_FS ++ cifs_proc_init(); ++#endif ++ INIT_LIST_HEAD(&GlobalServerList); /* BB not implemented yet */ ++ INIT_LIST_HEAD(&GlobalSMBSessionList); ++ INIT_LIST_HEAD(&GlobalTreeConnectionList); ++ INIT_LIST_HEAD(&GlobalOplock_Q); ++/* ++ * Initialize Global counters ++ */ ++ atomic_set(&sesInfoAllocCount, 0); ++ atomic_set(&tconInfoAllocCount, 0); ++ atomic_set(&tcpSesReconnectCount, 0); ++ atomic_set(&tconInfoReconnectCount, 0); ++ ++ atomic_set(&bufAllocCount, 0); ++ atomic_set(&midCount, 0); ++ GlobalCurrentXid = 0; ++ GlobalTotalActiveXid = 0; ++ GlobalMaxActiveXid = 0; ++ GlobalSMBSeslock = RW_LOCK_UNLOCKED; ++ GlobalMid_Lock = SPIN_LOCK_UNLOCKED; ++ ++/* rc = cifs_init_inodecache();*/ ++ if (!rc) { ++ rc = cifs_init_mids(); ++ if (!rc) { ++ rc = cifs_init_request_bufs(); ++ if (!rc) { ++ rc = register_filesystem(&cifs_fs_type); ++ if (!rc) { ++ kernel_thread(cifs_oplock_thread, NULL, ++ CLONE_FS | CLONE_FILES | CLONE_VM); ++ return rc; /* Success */ ++ } else ++ cifs_destroy_request_bufs(); ++ } ++ cifs_destroy_mids(); ++ } ++/* cifs_destroy_inodecache(); */ ++ } ++#if CONFIG_PROC_FS ++ cifs_proc_clean(); ++#endif ++ return rc; ++} ++ ++static void __exit ++exit_cifs(void) ++{ ++ cFYI(0, ("In unregister ie exit_cifs")); ++#if CONFIG_PROC_FS ++ cifs_proc_clean(); ++#endif ++ unregister_filesystem(&cifs_fs_type); ++/* cifs_destroy_inodecache();*/ ++ cifs_destroy_mids(); ++ cifs_destroy_request_bufs(); ++ if(oplockThread) { ++ send_sig(SIGTERM, oplockThread, 1); ++ wait_for_completion(&cifs_oplock_exited); ++ } ++} ++ ++MODULE_AUTHOR("Steve French <sfrench@us.ibm.com>"); ++MODULE_LICENSE("GPL"); /* combination of LGPL + GPL source behaves as GPL */ ++MODULE_DESCRIPTION ++ ("VFS to access servers complying with the SNIA CIFS Specification e.g. Samba and Windows"); ++module_init(init_cifs) ++module_exit(exit_cifs) +diff -urN linux-2.4.29.old/fs/cifs/cifsfs.h linux-2.4.29/fs/cifs/cifsfs.h +--- linux-2.4.29.old/fs/cifs/cifsfs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifsfs.h 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,97 @@ ++/* ++ * fs/cifs/cifsfs.h ++ * ++ * Copyright (c) International Business Machines Corp., 2002 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef _CIFSFS_H ++#define _CIFSFS_H ++ ++#define ROOT_I 2 ++ ++#ifndef FALSE ++#define FALSE 0 ++#endif ++ ++#ifndef TRUE ++#define TRUE 1 ++#endif ++ ++extern int map_cifs_error(int error_class, int error_code, ++ int status_codes_negotiated); ++ ++extern struct address_space_operations cifs_addr_ops; ++ ++/* Functions related to super block operations */ ++extern struct super_operations cifs_super_ops; ++extern void cifs_put_inode(struct inode *); ++extern void cifs_read_inode(struct inode *); ++extern void cifs_delete_inode(struct inode *); ++/* extern void cifs_write_inode(struct inode *); *//* BB not needed yet */ ++ ++/* Functions related to inodes */ ++extern struct inode_operations cifs_dir_inode_ops; ++extern int cifs_create(struct inode *, struct dentry *, int); ++extern struct dentry *cifs_lookup(struct inode *, struct dentry *); ++extern int cifs_unlink(struct inode *, struct dentry *); ++extern int cifs_hardlink(struct dentry *, struct inode *, struct dentry *); ++extern int cifs_mknod(struct inode *, struct dentry *, int, int); ++extern int cifs_mkdir(struct inode *, struct dentry *, int); ++extern int cifs_rmdir(struct inode *, struct dentry *); ++extern int cifs_rename(struct inode *, struct dentry *, struct inode *, ++ struct dentry *); ++extern int cifs_revalidate(struct dentry *); ++extern int cifs_setattr(struct dentry *, struct iattr *); ++ ++extern struct inode_operations cifs_file_inode_ops; ++extern void cifs_truncate_file(struct inode *); ++extern struct inode_operations cifs_symlink_inode_ops; ++ ++/* Functions related to files and directories */ ++extern struct file_operations cifs_file_ops; ++extern int cifs_open(struct inode *inode, struct file *file); ++extern int cifs_close(struct inode *inode, struct file *file); ++extern int cifs_closedir(struct inode *inode, struct file *file); ++extern ssize_t cifs_read(struct file *file, char *read_data, ++ size_t read_size, loff_t * poffset); ++extern ssize_t cifs_write(struct file *file, const char *write_data, ++ size_t write_size, loff_t * poffset); ++extern int cifs_lock(struct file *, int, struct file_lock *); ++extern int cifs_fsync(struct file *, struct dentry *, int); ++extern int cifs_flush(struct file *); ++extern int cifs_file_mmap(struct file * , struct vm_area_struct *); ++extern struct file_operations cifs_dir_ops; ++extern int cifs_dir_open(struct inode *inode, struct file *file); ++extern int cifs_readdir(struct file *file, void *direntry, filldir_t filldir); ++extern long cifs_fcntl(int, unsigned int, unsigned long, struct file *); ++ ++/* Functions related to dir entries */ ++extern struct dentry_operations cifs_dentry_ops; ++ ++/* Functions related to symlinks */ ++extern int cifs_follow_link(struct dentry *direntry, struct nameidata *nd); ++extern int cifs_readlink(struct dentry *direntry, char *buffer, int buflen); ++extern int cifs_symlink(struct inode *inode, struct dentry *direntry, ++ const char *symname); ++extern int cifs_removexattr(struct dentry *, const char *); ++extern int cifs_setxattr(struct dentry *, const char *, const void *, ++ size_t, int); ++extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t); ++extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); ++#define CIFS_VERSION "1.20" ++#endif /* _CIFSFS_H */ +diff -urN linux-2.4.29.old/fs/cifs/cifs_fs_sb.h linux-2.4.29/fs/cifs/cifs_fs_sb.h +--- linux-2.4.29.old/fs/cifs/cifs_fs_sb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifs_fs_sb.h 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,32 @@ ++/* ++ * fs/cifs/cifs_fs_sb.h ++ * ++ * Copyright (c) International Business Machines Corp., 2002 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ */ ++#ifndef _CIFS_FS_SB_H ++#define _CIFS_FS_SB_H ++ ++struct cifs_sb_info { ++ struct cifsTconInfo *tcon; /* primary mount */ ++ struct list_head nested_tcon_q; ++ struct nls_table *local_nls; ++ unsigned int rsize; ++ unsigned int wsize; ++ uid_t mnt_uid; ++ gid_t mnt_gid; ++ mode_t mnt_file_mode; ++ mode_t mnt_dir_mode; ++}; ++#endif /* _CIFS_FS_SB_H */ +diff -urN linux-2.4.29.old/fs/cifs/cifsglob.h linux-2.4.29/fs/cifs/cifsglob.h +--- linux-2.4.29.old/fs/cifs/cifsglob.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifsglob.h 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,413 @@ ++/* ++ * fs/cifs/cifsglob.h ++ * ++ * Copyright (C) International Business Machines Corp., 2002,2003 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ */ ++#include <linux/in.h> ++#include <linux/in6.h> ++#include "cifs_fs_sb.h" ++/* ++ * The sizes of various internal tables and strings ++ */ ++#define MAX_UID_INFO 16 ++#define MAX_SES_INFO 2 ++#define MAX_TCON_INFO 4 ++ ++#define MAX_TREE_SIZE 2 + MAX_SERVER_SIZE + 1 + MAX_SHARE_SIZE + 1 ++#define MAX_SERVER_SIZE 15 ++#define MAX_SHARE_SIZE 64 /* used to be 20 - this should still be enough */ ++#define MAX_USERNAME_SIZE 32 /* 32 is to allow for 15 char names + null ++ termination then *2 for unicode versions */ ++#define MAX_PASSWORD_SIZE 16 ++ ++/* ++ * MAX_REQ is the maximum number of requests that WE will send ++ * on one socket concurently. It also matches the most common ++ * value of max multiplex returned by servers. We may ++ * eventually want to use the negotiated value (in case ++ * future servers can handle more) when we are more confident that ++ * we will not have problems oveloading the socket with pending ++ * write data. ++ */ ++#define CIFS_MAX_REQ 50 ++ ++#define SERVER_NAME_LENGTH 15 ++#define SERVER_NAME_LEN_WITH_NULL (SERVER_NAME_LENGTH + 1) ++ ++/* used to define string lengths for reversing unicode strings */ ++/* (256+1)*2 = 514 */ ++/* (max path length + 1 for null) * 2 for unicode */ ++#define MAX_NAME 514 ++ ++#include "cifspdu.h" ++ ++#ifndef FALSE ++#define FALSE 0 ++#endif ++ ++#ifndef TRUE ++#define TRUE 1 ++#endif ++ ++#ifndef XATTR_DOS_ATTRIB ++#define XATTR_DOS_ATTRIB "user.DOSATTRIB" ++#endif ++ ++/* ++ * This information is kept on every Server we know about. ++ * ++ * Some things to note: ++ * ++ */ ++#define SERVER_NAME_LEN_WITH_NULL (SERVER_NAME_LENGTH + 1) ++ ++/* ++ * CIFS vfs client Status information (based on what we know.) ++ */ ++ ++ /* associated with each tcp and smb session */ ++enum statusEnum { ++ CifsNew = 0, ++ CifsGood, ++ CifsExiting, ++ CifsNeedReconnect ++}; ++ ++enum securityEnum { ++ NTLM = 0, /* Legacy NTLM012 auth with NTLM hash */ ++ NTLMv2, /* Legacy NTLM auth with NTLMv2 hash */ ++ RawNTLMSSP, /* NTLMSSP without SPNEGO */ ++ NTLMSSP, /* NTLMSSP via SPNEGO */ ++ Kerberos /* Kerberos via SPNEGO */ ++}; ++ ++enum protocolEnum { ++ IPV4 = 0, ++ IPV6, ++ SCTP ++ /* Netbios frames protocol not supported at this time */ ++}; ++ ++/* ++ ***************************************************************** ++ * Except the CIFS PDUs themselves all the ++ * globally interesting structs should go here ++ ***************************************************************** ++ */ ++ ++struct TCP_Server_Info { ++ char server_Name[SERVER_NAME_LEN_WITH_NULL]; /* 15 chars + X'20'in 16th */ ++ char unicode_server_Name[SERVER_NAME_LEN_WITH_NULL * 2]; /* Unicode version of server_Name */ ++ struct socket *ssocket; ++ union { ++ struct sockaddr_in sockAddr; ++ struct sockaddr_in6 sockAddr6; ++ } addr; ++ wait_queue_head_t response_q; ++ wait_queue_head_t request_q; /* if more than maxmpx to srvr must block*/ ++ struct list_head pending_mid_q; ++ void *Server_NlsInfo; /* BB - placeholder for future NLS info */ ++ unsigned short server_codepage; /* codepage for the server */ ++ unsigned long ip_address; /* IP addr for the server if known */ ++ enum protocolEnum protocolType; ++ char versionMajor; ++ char versionMinor; ++ int svlocal:1; /* local server or remote */ ++ atomic_t socketUseCount; /* number of open cifs sessions on socket */ ++ atomic_t inFlight; /* number of requests on the wire to server */ ++ enum statusEnum tcpStatus; /* what we think the status is */ ++ struct semaphore tcpSem; ++ struct task_struct *tsk; ++ char server_GUID[16]; ++ char secMode; ++ enum securityEnum secType; ++ unsigned int maxReq; /* Clients should submit no more */ ++ /* than maxReq distinct unanswered SMBs to the server when using */ ++ /* multiplexed reads or writes */ ++ unsigned int maxBuf; /* maxBuf specifies the maximum */ ++ /* message size the server can send or receive for non-raw SMBs */ ++ unsigned int maxRw; /* maxRw specifies the maximum */ ++ /* message size the server can send or receive for */ ++ /* SMB_COM_WRITE_RAW or SMB_COM_READ_RAW. */ ++ char sessid[4]; /* unique token id for this session */ ++ /* (returned on Negotiate */ ++ int capabilities; /* allow selective disabling of caps by smb sess */ ++ __u16 timeZone; ++ char cryptKey[CIFS_CRYPTO_KEY_SIZE]; ++ char workstation_RFC1001_name[16]; /* 16th byte is always zero */ ++}; ++ ++/* ++ * The following is our shortcut to user information. We surface the uid, ++ * and name. We always get the password on the fly in case it ++ * has changed. We also hang a list of sessions owned by this user off here. ++ */ ++struct cifsUidInfo { ++ struct list_head userList; ++ struct list_head sessionList; /* SMB sessions for this user */ ++ uid_t linux_uid; ++ char user[MAX_USERNAME_SIZE + 1]; /* ascii name of user */ ++ /* BB may need ptr or callback for PAM or WinBind info */ ++}; ++ ++/* ++ * Session structure. One of these for each uid session with a particular host ++ */ ++struct cifsSesInfo { ++ struct list_head cifsSessionList; ++ struct semaphore sesSem; ++ struct cifsUidInfo *uidInfo; /* pointer to user info */ ++ struct TCP_Server_Info *server; /* pointer to server info */ ++ atomic_t inUse; /* # of mounts (tree connections) on this ses */ ++ enum statusEnum status; ++ __u32 sequence_number; /* needed for CIFS PDU signature */ ++ __u16 ipc_tid; /* special tid for connection to IPC share */ ++ char mac_signing_key[CIFS_SESSION_KEY_SIZE + 16]; ++ char *serverOS; /* name of operating system underlying the server */ ++ char *serverNOS; /* name of network operating system that the server is running */ ++ char *serverDomain; /* security realm of server */ ++ int Suid; /* remote smb uid */ ++ uid_t linux_uid; /* local Linux uid */ ++ int capabilities; ++ char serverName[SERVER_NAME_LEN_WITH_NULL * 2]; /* BB make bigger for tcp names - will ipv6 and sctp addresses fit here?? */ ++ char userName[MAX_USERNAME_SIZE + 1]; ++ char domainName[MAX_USERNAME_SIZE + 1]; ++ char * password; ++}; ++ ++/* ++ * there is one of these for each connection to a resource on a particular ++ * session ++ */ ++struct cifsTconInfo { ++ struct list_head cifsConnectionList; ++ struct list_head openFileList; ++ struct semaphore tconSem; ++ struct cifsSesInfo *ses; /* pointer to session associated with */ ++ char treeName[MAX_TREE_SIZE + 1]; /* UNC name of resource (in ASCII not UTF) */ ++ char *nativeFileSystem; ++ __u16 tid; /* The 2 byte tree id */ ++ __u16 Flags; /* optional support bits */ ++ enum statusEnum tidStatus; ++ atomic_t useCount; /* how many mounts (explicit or implicit) to this share */ ++#ifdef CONFIG_CIFS_STATS ++ atomic_t num_smbs_sent; ++ atomic_t num_writes; ++ atomic_t num_reads; ++ atomic_t num_oplock_brks; ++ atomic_t num_opens; ++ atomic_t num_deletes; ++ atomic_t num_mkdirs; ++ atomic_t num_rmdirs; ++ atomic_t num_renames; ++ atomic_t num_t2renames; ++ __u64 bytes_read; ++ __u64 bytes_written; ++ spinlock_t stat_lock; ++#endif ++ FILE_SYSTEM_DEVICE_INFO fsDevInfo; ++ FILE_SYSTEM_ATTRIBUTE_INFO fsAttrInfo; /* ok if file system name truncated */ ++ FILE_SYSTEM_UNIX_INFO fsUnixInfo; ++ int retry:1; ++ /* BB add field for back pointer to sb struct? */ ++}; ++ ++/* ++ * This info hangs off the cifsFileInfo structure. This is used to track ++ * byte stream locks on the file ++ */ ++struct cifsLockInfo { ++ struct cifsLockInfo *next; ++ int start; ++ int length; ++ int type; ++}; ++ ++/* ++ * One of these for each open instance of a file ++ */ ++struct cifsFileInfo { ++ struct list_head tlist; /* pointer to next fid owned by tcon */ ++ struct list_head flist; /* next fid (file instance) for this inode */ ++ unsigned int uid; /* allows finding which FileInfo structure */ ++ __u32 pid; /* process id who opened file */ ++ __u16 netfid; /* file id from remote */ ++ /* BB add lock scope info here if needed */ ; ++ /* lock scope id (0 if none) */ ++ struct file * pfile; /* needed for writepage */ ++ struct inode * pInode; /* needed for oplock break */ ++ int endOfSearch:1; /* we have reached end of search */ ++ int closePend:1; /* file is marked to close */ ++ int emptyDir:1; ++ int invalidHandle:1; /* file closed via session abend */ ++ struct semaphore fh_sem; /* prevents reopen race after dead ses*/ ++ char * search_resume_name; ++ unsigned int resume_name_length; ++ __u32 resume_key; ++}; ++ ++/* ++ * One of these for each file inode ++ */ ++ ++struct cifsInodeInfo { ++ struct list_head lockList; ++ /* BB add in lists for dirty pages - i.e. write caching info for oplock */ ++ struct list_head openFileList; ++ int write_behind_rc; ++ __u32 cifsAttrs; /* e.g. DOS archive bit, sparse, compressed, system */ ++ atomic_t inUse; /* num concurrent users (local openers cifs) of file*/ ++ unsigned long time; /* jiffies of last update/check of inode */ ++ int clientCanCacheRead:1; /* read oplock */ ++ int clientCanCacheAll:1; /* read and writebehind oplock */ ++ int oplockPending:1; ++ struct inode vfs_inode; ++}; ++ ++static inline struct cifsInodeInfo * CIFS_I(struct inode *inode) ++{ ++ return (struct cifsInodeInfo *)&(inode->u); ++} ++ ++static inline struct cifs_sb_info * CIFS_SB(struct super_block *sb) ++{ ++ return (struct cifs_sb_info *) &(sb->u); ++} ++ ++ ++/* one of these for every pending CIFS request to the server */ ++struct mid_q_entry { ++ struct list_head qhead; /* mids waiting on reply from this server */ ++ __u16 mid; /* multiplex id */ ++ __u16 pid; /* process id */ ++ __u32 sequence_number; /* for CIFS signing */ ++ __u16 command; /* smb command code */ ++ struct timeval when_sent; /* time when smb sent */ ++ struct cifsSesInfo *ses; /* smb was sent to this server */ ++ struct task_struct *tsk; /* task waiting for response */ ++ struct smb_hdr *resp_buf; /* response buffer */ ++ int midState; /* wish this were enum but can not pass to wait_event */ ++}; ++ ++struct oplock_q_entry { ++ struct list_head qhead; ++ struct inode * pinode; ++ struct cifsTconInfo * tcon; ++ __u16 netfid; ++}; ++ ++#define MID_FREE 0 ++#define MID_REQUEST_ALLOCATED 1 ++#define MID_REQUEST_SUBMITTED 2 ++#define MID_RESPONSE_RECEIVED 4 ++#define MID_RETRY_NEEDED 8 /* session closed while this request out */ ++ ++/* ++ ***************************************************************** ++ * All constants go here ++ ***************************************************************** ++ */ ++ ++#define UID_HASH (16) ++ ++/* ++ * Note that ONE module should define _DECLARE_GLOBALS_HERE to cause the ++ * following to be declared. ++ */ ++ ++/**************************************************************************** ++ * Locking notes. All updates to global variables and lists should be ++ * protected by spinlocks or semaphores. ++ * ++ * Spinlocks ++ * --------- ++ * GlobalMid_Lock protects: ++ * list operations on pending_mid_q and oplockQ ++ * updates to XID counters, multiplex id and SMB sequence numbers ++ * GlobalSMBSesLock protects: ++ * list operations on tcp and SMB session lists and tCon lists ++ * f_owner.lock protects certain per file struct operations ++ * mapping->page_lock protects certain per page operations ++ * ++ * Semaphores ++ * ---------- ++ * sesSem operations on smb session ++ * tconSem operations on tree connection ++ * fh_sem file handle reconnection operations ++ * ++ ****************************************************************************/ ++ ++#ifdef DECLARE_GLOBALS_HERE ++#define GLOBAL_EXTERN ++#else ++#define GLOBAL_EXTERN extern ++#endif ++ ++/* ++ * The list of servers that did not respond with NT LM 0.12. ++ * This list helps improve performance and eliminate the messages indicating ++ * that we had a communications error talking to the server in this list. ++ */ ++GLOBAL_EXTERN struct servers_not_supported *NotSuppList; /*@z4a */ ++ ++/* ++ * The following is a hash table of all the users we know about. ++ */ ++GLOBAL_EXTERN struct smbUidInfo *GlobalUidList[UID_HASH]; ++ ++GLOBAL_EXTERN struct list_head GlobalServerList; /* BB not implemented yet */ ++GLOBAL_EXTERN struct list_head GlobalSMBSessionList; ++GLOBAL_EXTERN struct list_head GlobalTreeConnectionList; ++GLOBAL_EXTERN rwlock_t GlobalSMBSeslock; /* protects list inserts on 3 above */ ++ ++GLOBAL_EXTERN struct list_head GlobalOplock_Q; ++ ++/* ++ * Global transaction id (XID) information ++ */ ++GLOBAL_EXTERN unsigned int GlobalCurrentXid; /* protected by GlobalMid_Sem */ ++GLOBAL_EXTERN unsigned int GlobalTotalActiveXid; /* prot by GlobalMid_Sem */ ++GLOBAL_EXTERN unsigned int GlobalMaxActiveXid; /* prot by GlobalMid_Sem */ ++GLOBAL_EXTERN spinlock_t GlobalMid_Lock; /* protects above and list operations */ ++ /* on midQ entries */ ++GLOBAL_EXTERN char Local_System_Name[15]; ++ ++/* ++ * Global counters, updated atomically ++ */ ++GLOBAL_EXTERN atomic_t sesInfoAllocCount; ++GLOBAL_EXTERN atomic_t tconInfoAllocCount; ++ ++GLOBAL_EXTERN atomic_t tcpSesReconnectCount; ++GLOBAL_EXTERN atomic_t tconInfoReconnectCount; ++ ++/* Various Debug counters to remove someday (BB) */ ++GLOBAL_EXTERN atomic_t bufAllocCount; ++GLOBAL_EXTERN atomic_t midCount; ++ ++/* Misc globals */ ++GLOBAL_EXTERN unsigned int multiuser_mount; /* if enabled allows new sessions ++ to be established on existing mount if we ++ have the uid/password or Kerberos credential ++ or equivalent for current user */ ++GLOBAL_EXTERN unsigned int oplockEnabled; ++GLOBAL_EXTERN unsigned int quotaEnabled; ++GLOBAL_EXTERN unsigned int lookupCacheEnabled; ++GLOBAL_EXTERN unsigned int extended_security; /* if on, session setup sent ++ with more secure ntlmssp2 challenge/resp */ ++GLOBAL_EXTERN unsigned int ntlmv2_support; /* better optional password hash */ ++GLOBAL_EXTERN unsigned int sign_CIFS_PDUs; /* enable smb packet signing */ ++GLOBAL_EXTERN unsigned int linuxExtEnabled; /* enable Linux/Unix CIFS extensions */ ++ +diff -urN linux-2.4.29.old/fs/cifs/cifspdu.h linux-2.4.29/fs/cifs/cifspdu.h +--- linux-2.4.29.old/fs/cifs/cifspdu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifspdu.h 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,1793 @@ ++/* ++ * fs/cifs/cifspdu.h ++ * ++ * Copyright (c) International Business Machines Corp., 2002 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef _CIFSPDU_H ++#define _CIFSPDU_H ++ ++#include <net/sock.h> ++ ++#define CIFS_PROT 0 ++#define BAD_PROT CIFS_PROT+1 ++ ++/* SMB command codes */ ++#define SMB_COM_CREATE_DIRECTORY 0x00 ++#define SMB_COM_DELETE_DIRECTORY 0x01 ++#define SMB_COM_CLOSE 0x04 ++#define SMB_COM_DELETE 0x06 ++#define SMB_COM_RENAME 0x07 ++#define SMB_COM_LOCKING_ANDX 0x24 ++#define SMB_COM_COPY 0x29 ++#define SMB_COM_READ_ANDX 0x2E ++#define SMB_COM_WRITE_ANDX 0x2F ++#define SMB_COM_TRANSACTION2 0x32 ++#define SMB_COM_TRANSACTION2_SECONDARY 0x33 ++#define SMB_COM_FIND_CLOSE2 0x34 ++#define SMB_COM_TREE_DISCONNECT 0x71 ++#define SMB_COM_NEGOTIATE 0x72 ++#define SMB_COM_SESSION_SETUP_ANDX 0x73 ++#define SMB_COM_LOGOFF_ANDX 0x74 ++#define SMB_COM_TREE_CONNECT_ANDX 0x75 ++#define SMB_COM_NT_TRANSACT 0xA0 ++#define SMB_COM_NT_TRANSACT_SECONDARY 0xA1 ++#define SMB_COM_NT_CREATE_ANDX 0xA2 ++#define SMB_COM_NT_RENAME 0xA5 ++ ++/* Transact2 subcommand codes */ ++#define TRANS2_OPEN 0x00 ++#define TRANS2_FIND_FIRST 0x01 ++#define TRANS2_FIND_NEXT 0x02 ++#define TRANS2_QUERY_FS_INFORMATION 0x03 ++#define TRANS2_QUERY_PATH_INFORMATION 0x05 ++#define TRANS2_SET_PATH_INFORMATION 0x06 ++#define TRANS2_QUERY_FILE_INFORMATION 0x07 ++#define TRANS2_SET_FILE_INFORMATION 0x08 ++#define TRANS2_GET_DFS_REFERRAL 0x10 ++#define TRANS2_REPORT_DFS_INCOSISTENCY 0x11 ++ ++/* NT Transact subcommand codes */ ++#define NT_TRANSACT_CREATE 0x01 ++#define NT_TRANSACT_IOCTL 0x02 ++#define NT_TRANSACT_SET_SECURITY_DESC 0x03 ++#define NT_TRANSACT_NOTIFY_CHANGE 0x04 ++#define NT_TRANSACT_RENAME 0x05 ++#define NT_TRANSACT_QUERY_SECURITY_DESC 0x06 ++#define NT_TRANSACT_GET_USER_QUOTA 0x07 ++#define NT_TRANSACT_SET_USER_QUOTA 0x08 ++ ++#define MAX_CIFS_HDR_SIZE 256 /* chained NTCreateXReadX will probably be biggest */ ++ ++/* internal cifs vfs structures */ ++/***************************************************************** ++ * All constants go here ++ ***************************************************************** ++ */ ++ ++/* ++ * Starting value for maximum SMB size negotiation ++ */ ++#define CIFS_MAX_MSGSIZE (4*4096) ++ ++/* ++ * Size of encrypted user password in bytes ++ */ ++#define CIFS_ENCPWD_SIZE (16) ++ ++/* ++ * Size of the crypto key returned on the negotiate SMB in bytes ++ */ ++#define CIFS_CRYPTO_KEY_SIZE (8) ++ ++/* ++ * Size of the session key (crypto key encrypted with the password ++ */ ++#define CIFS_SESSION_KEY_SIZE (24) ++ ++/* ++ * Maximum user name length ++ */ ++#define CIFS_UNLEN (20) ++ ++/* ++ * Flags on SMB open ++ */ ++#define SMBOPEN_WRITE_THROUGH 0x4000 ++#define SMBOPEN_DENY_ALL 0x0010 ++#define SMBOPEN_DENY_WRITE 0x0020 ++#define SMBOPEN_DENY_READ 0x0030 ++#define SMBOPEN_DENY_NONE 0x0040 ++#define SMBOPEN_READ 0x0000 ++#define SMBOPEN_WRITE 0x0001 ++#define SMBOPEN_READWRITE 0x0002 ++#define SMBOPEN_EXECUTE 0x0003 ++ ++#define SMBOPEN_OCREATE 0x0010 ++#define SMBOPEN_OTRUNC 0x0002 ++#define SMBOPEN_OAPPEND 0x0001 ++ ++/* ++ * SMB flag definitions ++ */ ++#define SMBFLG_EXTD_LOCK 0x01 /* server supports lock-read write-unlock primitives */ ++#define SMBFLG_RCV_POSTED 0x02 /* obsolete */ ++#define SMBFLG_RSVD 0x04 ++#define SMBFLG_CASELESS 0x08 /* all pathnames treated as caseless (off implies case sensitive file handling requested) */ ++#define SMBFLG_CANONICAL_PATH_FORMAT 0x10 /* obsolete */ ++#define SMBFLG_OLD_OPLOCK 0x20 /* obsolete */ ++#define SMBFLG_OLD_OPLOCK_NOTIFY 0x40 /* obsolete */ ++#define SMBFLG_RESPONSE 0x80 /* this PDU is a response from server */ ++ ++/* ++ * SMB flag2 definitions ++ */ ++#define SMBFLG2_KNOWS_LONG_NAMES 0x0001 /* can send long (non-8.3) path names in response */ ++#define SMBFLG2_KNOWS_EAS 0x0002 ++#define SMBFLG2_SECURITY_SIGNATURE 0x0004 ++#define SMBFLG2_IS_LONG_NAME 0x0040 ++#define SMBFLG2_EXT_SEC 0x0800 ++#define SMBFLG2_DFS 0x1000 ++#define SMBFLG2_PAGING_IO 0x2000 ++#define SMBFLG2_ERR_STATUS 0x4000 ++#define SMBFLG2_UNICODE 0x8000 ++ ++/* ++ * These are the file access permission bits defined in CIFS for the ++ * NTCreateAndX as well as the level 0x107 ++ * TRANS2_QUERY_PATH_INFORMATION API. The level 0x107, SMB_QUERY_FILE_ALL_INFO ++ * responds with the AccessFlags. ++ * The AccessFlags specifies the access permissions a caller has to the ++ * file and can have any suitable combination of the following values: ++ */ ++ ++#define FILE_READ_DATA 0x00000001 /* Data can be read from the file */ ++#define FILE_WRITE_DATA 0x00000002 /* Data can be written to the file */ ++#define FILE_APPEND_DATA 0x00000004 /* Data can be appended to the file */ ++#define FILE_READ_EA 0x00000008 /* Extended attributes associated */ ++ /* with the file can be read */ ++#define FILE_WRITE_EA 0x00000010 /* Extended attributes associated */ ++ /* with the file can be written */ ++#define FILE_EXECUTE 0x00000020 /*Data can be read into memory from */ ++ /* the file using system paging I/O */ ++#define FILE_DELETE_CHILD 0x00000040 ++#define FILE_READ_ATTRIBUTES 0x00000080 /* Attributes associated with the */ ++ /* file can be read */ ++#define FILE_WRITE_ATTRIBUTES 0x00000100 /* Attributes associated with the */ ++ /* file can be written */ ++#define DELETE 0x00010000 /* The file can be deleted */ ++#define READ_CONTROL 0x00020000 /* The access control list and */ ++ /* ownership associated with the */ ++ /* file can be read */ ++#define WRITE_DAC 0x00040000 /* The access control list and */ ++ /* ownership associated with the */ ++ /* file can be written. */ ++#define WRITE_OWNER 0x00080000 /* Ownership information associated */ ++ /* with the file can be written */ ++#define SYNCHRONIZE 0x00100000 /* The file handle can waited on to */ ++ /* synchronize with the completion */ ++ /* of an input/output request */ ++#define GENERIC_ALL 0x10000000 ++#define GENERIC_EXECUTE 0x20000000 ++#define GENERIC_WRITE 0x40000000 ++#define GENERIC_READ 0x80000000 ++ /* In summary - Relevant file */ ++ /* access flags from CIFS are */ ++ /* file_read_data, file_write_data */ ++ /* file_execute, file_read_attributes */ ++ /* write_dac, and delete. */ ++ ++/* ++ * Invalid readdir handle ++ */ ++#define CIFS_NO_HANDLE 0xFFFF ++ ++/* IPC$ in ASCII */ ++#define CIFS_IPC_RESOURCE "\x49\x50\x43\x24" ++ ++/* IPC$ in Unicode */ ++#define CIFS_IPC_UNICODE_RESOURCE "\x00\x49\x00\x50\x00\x43\x00\x24\x00\x00" ++ ++/* Unicode Null terminate 2 bytes of 0 */ ++#define UNICODE_NULL "\x00\x00" ++#define ASCII_NULL 0x00 ++ ++/* ++ * Server type values (returned on EnumServer API ++ */ ++#define CIFS_SV_TYPE_DC 0x00000008 ++#define CIFS_SV_TYPE_BACKDC 0x00000010 ++ ++/* ++ * Alias type flags (From EnumAlias API call ++ */ ++#define CIFS_ALIAS_TYPE_FILE 0x0001 ++#define CIFS_SHARE_TYPE_FILE 0x0000 ++ ++/* ++ * File Attribute flags ++ */ ++#define ATTR_READONLY 0x0001 ++#define ATTR_HIDDEN 0x0002 ++#define ATTR_SYSTEM 0x0004 ++#define ATTR_VOLUME 0x0008 ++#define ATTR_DIRECTORY 0x0010 ++#define ATTR_ARCHIVE 0x0020 ++#define ATTR_DEVICE 0x0040 ++#define ATTR_NORMAL 0x0080 ++#define ATTR_TEMPORARY 0x0100 ++#define ATTR_SPARSE 0x0200 ++#define ATTR_REPARSE 0x0400 ++#define ATTR_COMPRESSED 0x0800 ++#define ATTR_OFFLINE 0x1000 /* ie file not immediately available - offline storage */ ++#define ATTR_NOT_CONTENT_INDEXED 0x2000 ++#define ATTR_ENCRYPTED 0x4000 ++#define ATTR_POSIX_SEMANTICS 0x01000000 ++#define ATTR_BACKUP_SEMANTICS 0x02000000 ++#define ATTR_DELETE_ON_CLOSE 0x04000000 ++#define ATTR_SEQUENTIAL_SCAN 0x08000000 ++#define ATTR_RANDOM_ACCESS 0x10000000 ++#define ATTR_NO_BUFFERING 0x20000000 ++#define ATTR_WRITE_THROUGH 0x80000000 ++ ++/* ShareAccess flags */ ++#define FILE_NO_SHARE 0x00000000 ++#define FILE_SHARE_READ 0x00000001 ++#define FILE_SHARE_WRITE 0x00000002 ++#define FILE_SHARE_DELETE 0x00000004 ++#define FILE_SHARE_ALL 0x00000007 ++ ++/* CreateDisposition flags */ ++#define FILE_SUPERSEDE 0x00000000 ++#define FILE_OPEN 0x00000001 ++#define FILE_CREATE 0x00000002 ++#define FILE_OPEN_IF 0x00000003 ++#define FILE_OVERWRITE 0x00000004 ++#define FILE_OVERWRITE_IF 0x00000005 ++ ++/* CreateOptions */ ++#define CREATE_NOT_FILE 0x00000001 /* if set must not be file */ ++#define CREATE_WRITE_THROUGH 0x00000002 ++#define CREATE_NOT_DIR 0x00000040 /* if set must not be directory */ ++#define CREATE_RANDOM_ACCESS 0x00000800 ++#define CREATE_DELETE_ON_CLOSE 0x00001000 ++#define OPEN_REPARSE_POINT 0x00200000 ++ ++/* ImpersonationLevel flags */ ++#define SECURITY_ANONYMOUS 0 ++#define SECURITY_IDENTIFICATION 1 ++#define SECURITY_IMPERSONATION 2 ++#define SECURITY_DELEGATION 3 ++ ++/* SecurityFlags */ ++#define SECURITY_CONTEXT_TRACKING 0x01 ++#define SECURITY_EFFECTIVE_ONLY 0x02 ++ ++/* ++ * Default PID value, used in all SMBs where the PID is not important ++ */ ++#define CIFS_DFT_PID 0x1234 ++ ++/* ++ * We use the same routine for Copy and Move SMBs. This flag is used to ++ * distinguish ++ */ ++#define CIFS_COPY_OP 1 ++#define CIFS_RENAME_OP 2 ++ ++#define GETU16(var) (*((__u16 *)var)) /* BB check for endian issues */ ++#define GETU32(var) (*((__u32 *)var)) /* BB check for endian issues */ ++ ++#pragma pack(1) ++ ++struct smb_hdr { ++ __u32 smb_buf_length; /* big endian on wire *//* BB length is only two or three bytes - with one or two byte type preceding it but that is always zero - we could mask the type byte off just in case BB */ ++ __u8 Protocol[4]; ++ __u8 Command; ++ union { ++ struct { ++ __u8 ErrorClass; ++ __u8 Reserved; ++ __u16 Error; /* note: treated as little endian (le) on wire */ ++ } DosError; ++ __u32 CifsError; /* note: le */ ++ } Status; ++ __u8 Flags; ++ __u16 Flags2; /* note: le */ ++ __u16 PidHigh; /* note: le */ ++ union { ++ struct { ++ __u32 SequenceNumber; /* le */ ++ __u32 Reserved; /* zero */ ++ } Sequence; ++ __u8 SecuritySignature[8]; /* le */ ++ } Signature; ++ __u8 pad[2]; ++ __u16 Tid; ++ __u16 Pid; /* note: le */ ++ __u16 Uid; ++ __u16 Mid; ++ __u8 WordCount; ++}; ++/* given a pointer to an smb_hdr retrieve the value of byte count */ ++#define BCC(smb_var) ( *(__u16 *)((char *)smb_var + sizeof(struct smb_hdr) + (2* smb_var->WordCount) ) ) ++ ++/* given a pointer to an smb_hdr retrieve the pointer to the byte area */ ++#define pByteArea(smb_var) ((char *)smb_var + sizeof(struct smb_hdr) + (2* smb_var->WordCount) + 2 ) ++ ++/* ++ * Computer Name Length ++ */ ++#define CNLEN 15 ++ ++/* ++ * Share Name Length @S8A ++ * Note: This length is limited by the SMB used to get @S8A ++ * the Share info. NetShareEnum only returns 13 @S8A ++ * chars, including the null termination. @S8A ++ */ ++#define SNLEN 12 /*@S8A */ ++ ++/* ++ * Comment Length ++ */ ++#define MAXCOMMENTLEN 40 ++ ++/* ++ * The OS/2 maximum path name ++ */ ++#define MAX_PATHCONF 256 ++ ++/* ++ * SMB frame definitions (following must be packed structs) ++ * See the SNIA CIFS Specification for details. ++ * ++ * The Naming convention is the lower case version of the ++ * smb command code name for the struct and this is typedef to the ++ * uppercase version of the same name with the prefix SMB_ removed ++ * for brevity. Although typedefs are not commonly used for ++ * structure definitions in the Linux kernel, their use in the ++ * CIFS standards document, which this code is based on, may ++ * make this one of the cases where typedefs for structures make ++ * sense to improve readability for readers of the standards doc. ++ * Typedefs can always be removed later if they are too distracting ++ * and they are only used for the CIFSs PDUs themselves, not ++ * internal cifs vfs structures ++ * ++ */ ++ ++typedef struct negotiate_req { ++ struct smb_hdr hdr; /* wct = 0 */ ++ __u16 ByteCount; ++ unsigned char DialectsArray[1]; ++} NEGOTIATE_REQ; ++ ++typedef struct negotiate_rsp { ++ struct smb_hdr hdr; /* wct = 17 */ ++ __u16 DialectIndex; ++ __u8 SecurityMode; ++ __u16 MaxMpxCount; ++ __u16 MaxNumberVcs; ++ __u32 MaxBufferSize; ++ __u32 MaxRawSize; ++ __u32 SessionKey; ++ __u32 Capabilities; /* see below */ ++ __u32 SystemTimeLow; ++ __u32 SystemTimeHigh; ++ __u16 ServerTimeZone; ++ __u8 EncryptionKeyLength; ++ __u16 ByteCount; ++ union { ++ unsigned char EncryptionKey[1]; /* if cap extended security is off */ ++ /* followed by Domain name - if extended security is off */ ++ /* followed by 16 bytes of server GUID */ ++ /* followed by security blob if cap_extended_security negotiated */ ++ struct { ++ unsigned char GUID[16]; ++ unsigned char SecurityBlob[1]; ++ } extended_response; ++ } u; ++} NEGOTIATE_RSP; ++ ++/* SecurityMode bits */ ++#define SECMODE_USER 0x01 /* off indicates share level security */ ++#define SECMODE_PW_ENCRYPT 0x02 ++#define SECMODE_SIGN_ENABLED 0x04 /* SMB security signatures enabled */ ++#define SECMODE_SIGN_REQUIRED 0x08 /* SMB security signatures required */ ++ ++/* Negotiate response Capabilities */ ++#define CAP_RAW_MODE 0x00000001 ++#define CAP_MPX_MODE 0x00000002 ++#define CAP_UNICODE 0x00000004 ++#define CAP_LARGE_FILES 0x00000008 ++#define CAP_NT_SMBS 0x00000010 /* implies CAP_NT_FIND */ ++#define CAP_RPC_REMOTE_APIS 0x00000020 ++#define CAP_STATUS32 0x00000040 ++#define CAP_LEVEL_II_OPLOCKS 0x00000080 ++#define CAP_LOCK_AND_READ 0x00000100 ++#define CAP_NT_FIND 0x00000200 ++#define CAP_DFS 0x00001000 ++#define CAP_INFOLEVEL_PASSTHRU 0x00002000 ++#define CAP_LARGE_READ_X 0x00004000 ++#define CAP_LARGE_WRITE_X 0x00008000 ++#define CAP_UNIX 0x00800000 ++#define CAP_RESERVED 0x02000000 ++#define CAP_BULK_TRANSFER 0x20000000 ++#define CAP_COMPRESSED_DATA 0x40000000 ++#define CAP_EXTENDED_SECURITY 0x80000000 ++ ++typedef union smb_com_session_setup_andx { ++ struct { /* request format */ ++ struct smb_hdr hdr; /* wct = 12 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 MaxBufferSize; ++ __u16 MaxMpxCount; ++ __u16 VcNumber; ++ __u32 SessionKey; ++ __u16 SecurityBlobLength; ++ __u32 Reserved; ++ __u32 Capabilities; /* see below */ ++ __u16 ByteCount; ++ unsigned char SecurityBlob[1]; /* followed by */ ++ /* STRING NativeOS */ ++ /* STRING NativeLanMan */ ++ } req; /* NTLM request format (with extended security */ ++ ++ struct { /* request format */ ++ struct smb_hdr hdr; /* wct = 13 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 MaxBufferSize; ++ __u16 MaxMpxCount; ++ __u16 VcNumber; ++ __u32 SessionKey; ++ __u16 CaseInsensitivePasswordLength; /* ASCII password length */ ++ __u16 CaseSensitivePasswordLength; /* Unicode password length */ ++ __u32 Reserved; /* see below */ ++ __u32 Capabilities; ++ __u16 ByteCount; ++ unsigned char CaseInsensitivePassword[1]; /* followed by: */ ++ /* unsigned char * CaseSensitivePassword; */ ++ /* STRING AccountName */ ++ /* STRING PrimaryDomain */ ++ /* STRING NativeOS */ ++ /* STRING NativeLanMan */ ++ } req_no_secext; /* NTLM request format (without extended security */ ++ ++ struct { /* default (NTLM) response format */ ++ struct smb_hdr hdr; /* wct = 4 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 Action; /* see below */ ++ __u16 SecurityBlobLength; ++ __u16 ByteCount; ++ unsigned char SecurityBlob[1]; /* followed by */ ++/* unsigned char * NativeOS; */ ++/* unsigned char * NativeLanMan; */ ++/* unsigned char * PrimaryDomain; */ ++ } resp; /* NTLM response format (with or without extended security */ ++ ++ struct { /* request format */ ++ struct smb_hdr hdr; /* wct = 10 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 MaxBufferSize; ++ __u16 MaxMpxCount; ++ __u16 VcNumber; ++ __u32 SessionKey; ++ __u16 PassswordLength; ++ __u32 Reserved; ++ __u16 ByteCount; ++ unsigned char AccountPassword[1]; /* followed by */ ++ /* STRING AccountName */ ++ /* STRING PrimaryDomain */ ++ /* STRING NativeOS */ ++ /* STRING NativeLanMan */ ++ } old_req; /* pre-NTLM (LANMAN2.1) request format */ ++ ++ struct { /* default (NTLM) response format */ ++ struct smb_hdr hdr; /* wct = 3 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 Action; /* see below */ ++ __u16 ByteCount; ++ unsigned char NativeOS[1]; /* followed by */ ++/* unsigned char * NativeLanMan; */ ++/* unsigned char * PrimaryDomain; */ ++ } old_resp; /* pre-NTLM (LANMAN2.1) response format */ ++} SESSION_SETUP_ANDX; ++ ++#define CIFS_NETWORK_OPSYS "CIFS VFS Client for Linux" ++ ++/* Capabilities bits (for NTLM SessSetup request) */ ++#define CAP_UNICODE 0x00000004 ++#define CAP_LARGE_FILES 0x00000008 ++#define CAP_NT_SMBS 0x00000010 ++#define CAP_STATUS32 0x00000040 ++#define CAP_LEVEL_II_OPLOCKS 0x00000080 ++#define CAP_NT_FIND 0x00000200 /* reserved should be zero (presumably because NT_SMBs implies the same thing) */ ++#define CAP_BULK_TRANSFER 0x20000000 ++#define CAP_EXTENDED_SECURITY 0x80000000 ++ ++/* Action bits */ ++#define GUEST_LOGIN 1 ++ ++typedef struct smb_com_tconx_req { ++ struct smb_hdr hdr; /* wct = 4 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 Flags; /* see below */ ++ __u16 PasswordLength; ++ __u16 ByteCount; ++ unsigned char Password[1]; /* followed by */ ++/* STRING Path *//* \\server\share name */ ++ /* STRING Service */ ++} TCONX_REQ; ++ ++typedef struct smb_com_tconx_rsp { ++ struct smb_hdr hdr; /* wct = 3 *//* note that Win2000 has sent wct=7 in some cases on responses. Four unspecified words followed OptionalSupport */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 OptionalSupport; /* see below */ ++ __u16 ByteCount; ++ unsigned char Service[1]; /* always ASCII, not Unicode */ ++ /* STRING NativeFileSystem */ ++} TCONX_RSP; ++ ++/* tree connect Flags */ ++#define DISCONNECT_TID 0x0001 ++#define TCON_EXTENDED_SECINFO 0x0008 ++/* OptionalSupport bits */ ++#define SMB_SUPPORT_SEARCH_BITS 0x0001 /* must have bits (exclusive searches suppt. */ ++#define SMB_SHARE_IS_IN_DFS 0x0002 ++ ++typedef struct smb_com_logoff_andx_req { ++ ++ struct smb_hdr hdr; /* wct = 2 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 ByteCount; ++} LOGOFF_ANDX_REQ; ++ ++typedef struct smb_com_logoff_andx_rsp { ++ struct smb_hdr hdr; /* wct = 2 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 ByteCount; ++} LOGOFF_ANDX_RSP; ++ ++typedef union smb_com_tree_disconnect { /* as an altetnative can use flag on tree_connect PDU to effect disconnect *//* probably the simplest SMB PDU */ ++ struct { ++ struct smb_hdr hdr; /* wct = 0 */ ++ __u16 ByteCount; /* bcc = 0 */ ++ } req; ++ struct { ++ struct smb_hdr hdr; /* wct = 0 */ ++ __u16 ByteCount; /* bcc = 0 */ ++ } resp; ++} TREE_DISCONNECT; ++ ++typedef struct smb_com_close_req { ++ struct smb_hdr hdr; /* wct = 3 */ ++ __u16 FileID; ++ __u32 LastWriteTime; /* should be zero */ ++ __u16 ByteCount; /* 0 */ ++} CLOSE_REQ; ++ ++typedef struct smb_com_close_rsp { ++ struct smb_hdr hdr; /* wct = 0 */ ++ __u16 ByteCount; /* bct = 0 */ ++} CLOSE_RSP; ++ ++typedef struct smb_com_findclose_req { ++ struct smb_hdr hdr; /* wct = 1 */ ++ __u16 FileID; ++ __u16 ByteCount; /* 0 */ ++} FINDCLOSE_REQ; ++ ++/* OpenFlags */ ++#define REQ_OPLOCK 0x00000002 ++#define REQ_BATCHOPLOCK 0x00000004 ++#define REQ_OPENDIRONLY 0x00000008 ++ ++typedef struct smb_com_open_req { /* also handles create */ ++ struct smb_hdr hdr; /* wct = 24 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u8 Reserved; /* Must Be Zero */ ++ __u16 NameLength; ++ __u32 OpenFlags; ++ __u32 RootDirectoryFid; ++ __u32 DesiredAccess; ++ __u64 AllocationSize; ++ __u32 FileAttributes; ++ __u32 ShareAccess; ++ __u32 CreateDisposition; ++ __u32 CreateOptions; ++ __u32 ImpersonationLevel; ++ __u8 SecurityFlags; ++ __u16 ByteCount; ++ char fileName[1]; ++} OPEN_REQ; ++ ++/* open response: oplock levels */ ++#define OPLOCK_NONE 0 ++#define OPLOCK_EXCLUSIVE 1 ++#define OPLOCK_BATCH 2 ++#define OPLOCK_READ 3 /* level 2 oplock */ ++ ++/* open response for CreateAction shifted left */ ++#define CIFS_CREATE_ACTION 0x20000 /* file created */ ++ ++typedef struct smb_com_open_rsp { ++ struct smb_hdr hdr; /* wct = 34 BB */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u8 OplockLevel; ++ __u16 Fid; ++ __u32 CreateAction; ++ __u64 CreationTime; ++ __u64 LastAccessTime; ++ __u64 LastWriteTime; ++ __u64 ChangeTime; ++ __u32 FileAttributes; ++ __u64 AllocationSize; ++ __u64 EndOfFile; ++ __u16 FileType; ++ __u16 DeviceState; ++ __u8 DirectoryFlag; ++ __u16 ByteCount; /* bct = 0 */ ++} OPEN_RSP; ++ ++typedef struct smb_com_write_req { ++ struct smb_hdr hdr; /* wct = 14 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 Fid; ++ __u32 OffsetLow; ++ __u32 Reserved; ++ __u16 WriteMode; ++ __u16 Remaining; ++ __u16 DataLengthHigh; ++ __u16 DataLengthLow; ++ __u16 DataOffset; ++ __u32 OffsetHigh; ++ __u16 ByteCount; ++ __u8 Pad; /* BB check for whether padded to DWORD boundary and optimum performance here */ ++ char Data[1]; ++} WRITE_REQ; ++ ++typedef struct smb_com_write_rsp { ++ struct smb_hdr hdr; /* wct = 6 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 Count; ++ __u16 Remaining; ++ __u32 Reserved; ++ __u16 ByteCount; ++} WRITE_RSP; ++ ++typedef struct smb_com_read_req { ++ struct smb_hdr hdr; /* wct = 12 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 Fid; ++ __u32 OffsetLow; ++ __u16 MaxCount; ++ __u16 MinCount; /* obsolete */ ++ __u32 MaxCountHigh; ++ __u16 Remaining; ++ __u32 OffsetHigh; ++ __u16 ByteCount; ++} READ_REQ; ++ ++typedef struct smb_com_read_rsp { ++ struct smb_hdr hdr; /* wct = 12 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 Remaining; ++ __u16 DataCompactionMode; ++ __u16 Reserved; ++ __u16 DataLength; ++ __u16 DataOffset; ++ __u16 DataLengthHigh; ++ __u64 Reserved2; ++ __u16 ByteCount; ++ __u8 Pad; /* BB check for whether padded to DWORD boundary and optimum performance here */ ++ char Data[1]; ++} READ_RSP; ++ ++typedef struct locking_andx_range { ++ __u16 Pid; ++ __u16 Pad; ++ __u32 OffsetHigh; ++ __u32 OffsetLow; ++ __u32 LengthHigh; ++ __u32 LengthLow; ++} LOCKING_ANDX_RANGE; ++ ++#define LOCKING_ANDX_SHARED_LOCK 0x01 ++#define LOCKING_ANDX_OPLOCK_RELEASE 0x02 ++#define LOCKING_ANDX_CHANGE_LOCKTYPE 0x04 ++#define LOCKING_ANDX_CANCEL_LOCK 0x08 ++#define LOCKING_ANDX_LARGE_FILES 0x10 /* always on for us */ ++ ++typedef struct smb_com_lock_req { ++ struct smb_hdr hdr; /* wct = 8 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 Fid; ++ __u8 LockType; ++ __u8 OplockLevel; ++ __u32 Timeout; ++ __u16 NumberOfUnlocks; ++ __u16 NumberOfLocks; ++ __u16 ByteCount; ++ LOCKING_ANDX_RANGE Locks[1]; ++} LOCK_REQ; ++ ++typedef struct smb_com_lock_rsp { ++ struct smb_hdr hdr; /* wct = 2 */ ++ __u8 AndXCommand; ++ __u8 AndXReserved; ++ __u16 AndXOffset; ++ __u16 ByteCount; ++} LOCK_RSP; ++ ++typedef struct smb_com_rename_req { ++ struct smb_hdr hdr; /* wct = 1 */ ++ __u16 SearchAttributes; /* target file attributes */ ++ __u16 ByteCount; ++ __u8 BufferFormat; /* 4 = ASCII or Unicode */ ++ unsigned char OldFileName[1]; ++ /* followed by __u8 BufferFormat2 */ ++ /* followed by NewFileName */ ++} RENAME_REQ; ++ ++ /* copy request flags */ ++#define COPY_MUST_BE_FILE 0x0001 ++#define COPY_MUST_BE_DIR 0x0002 ++#define COPY_TARGET_MODE_ASCII 0x0004 /* if not set, binary */ ++#define COPY_SOURCE_MODE_ASCII 0x0008 /* if not set, binary */ ++#define COPY_VERIFY_WRITES 0x0010 ++#define COPY_TREE 0x0020 ++ ++typedef struct smb_com_copy_req { ++ struct smb_hdr hdr; /* wct = 3 */ ++ __u16 Tid2; ++ __u16 OpenFunction; ++ __u16 Flags; ++ __u16 ByteCount; ++ __u8 BufferFormat; /* 4 = ASCII or Unicode */ ++ unsigned char OldFileName[1]; ++ /* followed by __u8 BufferFormat2 */ ++ /* followed by NewFileName string */ ++} COPY_REQ; ++ ++typedef struct smb_com_copy_rsp { ++ struct smb_hdr hdr; /* wct = 1 */ ++ __u16 CopyCount; /* number of files copied */ ++ __u16 ByteCount; /* may be zero */ ++ __u8 BufferFormat; /* 0x04 - only present if errored file follows */ ++ unsigned char ErrorFileName[1]; /* only present if error in copy */ ++} COPY_RSP; ++ ++#define CREATE_HARD_LINK 0x103 ++#define MOVEFILE_COPY_ALLOWED 0x0002 ++#define MOVEFILE_REPLACE_EXISTING 0x0001 ++ ++typedef struct smb_com_nt_rename_req { /* A5 - also used for create hardlink */ ++ struct smb_hdr hdr; /* wct = 4 */ ++ __u16 SearchAttributes; /* target file attributes */ ++ __u16 Flags; /* spec says Information Level */ ++ __u32 ClusterCount; ++ __u16 ByteCount; ++ __u8 BufferFormat; /* 4 = ASCII or Unicode */ ++ unsigned char OldFileName[1]; ++ /* followed by __u8 BufferFormat2 */ ++ /* followed by NewFileName */ ++} NT_RENAME_REQ; ++ ++typedef struct smb_com_rename_rsp { ++ struct smb_hdr hdr; /* wct = 0 */ ++ __u16 ByteCount; /* bct = 0 */ ++} RENAME_RSP; ++ ++typedef struct smb_com_delete_file_req { ++ struct smb_hdr hdr; /* wct = 1 */ ++ __u16 SearchAttributes; ++ __u16 ByteCount; ++ __u8 BufferFormat; /* 4 = ASCII */ ++ unsigned char fileName[1]; ++} DELETE_FILE_REQ; ++ ++typedef struct smb_com_delete_file_rsp { ++ struct smb_hdr hdr; /* wct = 0 */ ++ __u16 ByteCount; /* bct = 0 */ ++} DELETE_FILE_RSP; ++ ++typedef struct smb_com_delete_directory_req { ++ struct smb_hdr hdr; /* wct = 0 */ ++ __u16 ByteCount; ++ __u8 BufferFormat; /* 4 = ASCII */ ++ unsigned char DirName[1]; ++} DELETE_DIRECTORY_REQ; ++ ++typedef struct smb_com_delete_directory_rsp { ++ struct smb_hdr hdr; /* wct = 0 */ ++ __u16 ByteCount; /* bct = 0 */ ++} DELETE_DIRECTORY_RSP; ++ ++typedef struct smb_com_create_directory_req { ++ struct smb_hdr hdr; /* wct = 0 */ ++ __u16 ByteCount; ++ __u8 BufferFormat; /* 4 = ASCII */ ++ unsigned char DirName[1]; ++} CREATE_DIRECTORY_REQ; ++ ++typedef struct smb_com_create_directory_rsp { ++ struct smb_hdr hdr; /* wct = 0 */ ++ __u16 ByteCount; /* bct = 0 */ ++} CREATE_DIRECTORY_RSP; ++ ++/***************************************************/ ++/* NT Transact structure defintions follow */ ++/* Currently only ioctl and notify are implemented */ ++/***************************************************/ ++typedef struct smb_com_transaction_ioctl_req { ++ struct smb_hdr hdr; /* wct = 23 */ ++ __u8 MaxSetupCount; ++ __u16 Reserved; ++ __u32 TotalParameterCount; ++ __u32 TotalDataCount; ++ __u32 MaxParameterCount; ++ __u32 MaxDataCount; ++ __u32 ParameterCount; ++ __u32 ParameterOffset; ++ __u32 DataCount; ++ __u32 DataOffset; ++ __u8 SetupCount; /* four setup words follow subcommand */ ++ /* SNIA spec incorrectly included spurious pad here */ ++ __u16 SubCommand;/* 2 = IOCTL/FSCTL */ ++ __u32 FunctionCode; ++ __u16 Fid; ++ __u8 IsFsctl; /* 1 = File System Control, 0 = device control (IOCTL)*/ ++ __u8 IsRootFlag; /* 1 = apply command to root of share (must be DFS share)*/ ++ __u16 ByteCount; ++ __u8 Pad[3]; ++ __u8 Data[1]; ++} TRANSACT_IOCTL_REQ; ++ ++typedef struct smb_com_transaction_ioctl_rsp { ++ struct smb_hdr hdr; /* wct = 19 */ ++ __u8 Reserved[3]; ++ __u32 TotalParameterCount; ++ __u32 TotalDataCount; ++ __u32 ParameterCount; ++ __u32 ParameterOffset; ++ __u32 ParameterDisplacement; ++ __u32 DataCount; ++ __u32 DataOffset; ++ __u32 DataDisplacement; ++ __u8 SetupCount; /* 1 */ ++ __u16 ReturnedDataLen; ++ __u16 ByteCount; ++ __u8 Pad[3]; ++} TRANSACT_IOCTL_RSP; ++ ++typedef struct smb_com_transaction_change_notify_req { ++ struct smb_hdr hdr; /* wct = 23 */ ++ __u8 MaxSetupCount; ++ __u16 Reserved; ++ __u32 TotalParameterCount; ++ __u32 TotalDataCount; ++ __u32 MaxParameterCount; ++ __u32 MaxDataCount; ++ __u32 ParameterCount; ++ __u32 ParameterOffset; ++ __u32 DataCount; ++ __u32 DataOffset; ++ __u8 SetupCount; /* four setup words follow subcommand */ ++ /* SNIA spec incorrectly included spurious pad here */ ++ __u16 SubCommand;/* 4 = Change Notify */ ++ __u32 CompletionFilter; /* operation to monitor */ ++ __u16 Fid; ++ __u8 WatchTree; /* 1 = Monitor subdirectories */ ++ __u8 Reserved2; ++ __u16 ByteCount; ++/* __u8 Pad[3];*/ ++/* __u8 Data[1];*/ ++} TRANSACT_CHANGE_NOTIFY_REQ; ++ ++typedef struct smb_com_transaction_change_notify_rsp { ++ struct smb_hdr hdr; /* wct = 18 */ ++ __u8 Reserved[3]; ++ __u32 TotalParameterCount; ++ __u32 TotalDataCount; ++ __u32 ParameterCount; ++ __u32 ParameterOffset; ++ __u32 ParameterDisplacement; ++ __u32 DataCount; ++ __u32 DataOffset; ++ __u32 DataDisplacement; ++ __u8 SetupCount; /* 0 */ ++ __u16 ByteCount; ++ /* __u8 Pad[3]; */ ++} TRANSACT_CHANGE_NOTIFY_RSP; ++/* Completion Filter flags for Notify */ ++#define FILE_NOTIFY_CHANGE_FILE_NAME 0x00000001 ++#define FILE_NOTIFY_CHANGE_DIR_NAME 0x00000002 ++#define FILE_NOTIFY_CHANGE_NAME 0x00000003 ++#define FILE_NOTIFY_CHANGE_ATTRIBUTES 0x00000004 ++#define FILE_NOTIFY_CHANGE_SIZE 0x00000008 ++#define FILE_NOTIFY_CHANGE_LAST_WRITE 0x00000010 ++#define FILE_NOTIFY_CHANGE_LAST_ACCESS 0x00000020 ++#define FILE_NOTIFY_CHANGE_CREATION 0x00000040 ++#define FILE_NOTIFY_CHANGE_EA 0x00000080 ++#define FILE_NOTIFY_CHANGE_SECURITY 0x00000100 ++#define FILE_NOTIFY_CHANGE_STREAM_NAME 0x00000200 ++#define FILE_NOTIFY_CHANGE_STREAM_SIZE 0x00000400 ++#define FILE_NOTIFY_CHANGE_STREAM_WRITE 0x00000800 ++ ++#define FILE_ACTION_ADDED 0x00000001 ++#define FILE_ACTION_REMOVED 0x00000002 ++#define FILE_ACTION_MODIFIED 0x00000003 ++#define FILE_ACTION_RENAMED_OLD_NAME 0x00000004 ++#define FILE_ACTION_RENAMED_NEW_NAME 0x00000005 ++#define FILE_ACTION_ADDED_STREAM 0x00000006 ++#define FILE_ACTION_REMOVED_STREAM 0x00000007 ++#define FILE_ACTION_MODIFIED_STREAM 0x00000008 ++ ++/* response contains array of the following structures */ ++struct file_notify_information { ++ __u32 NextEntryOffset; ++ __u32 Action; ++ __u32 FileNameLength; ++ __u8 FileName[1]; ++}; ++ ++struct reparse_data { ++ __u32 ReparseTag; ++ __u16 ReparseDataLength; ++ __u16 Reserved; ++ __u16 AltNameOffset; ++ __u16 AltNameLen; ++ __u16 TargetNameOffset; ++ __u16 TargetNameLen; ++ char LinkNamesBuf[1]; ++}; ++ ++struct cifs_quota_data { ++ __u32 rsrvd1; /* 0 */ ++ __u32 sid_size; ++ __u64 rsrvd2; /* 0 */ ++ __u64 space_used; ++ __u64 soft_limit; ++ __u64 hard_limit; ++ char sid[1]; /* variable size? */ ++}; ++ ++/* quota sub commands */ ++#define QUOTA_LIST_CONTINUE 0 ++#define QUOTA_LIST_START 0x100 ++#define QUOTA_FOR_SID 0x101 ++ ++typedef union smb_com_transaction2 { ++ struct { ++ struct smb_hdr hdr; /* wct = 14+ */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 MaxParameterCount; ++ __u16 MaxDataCount; ++ __u8 MaxSetupCount; ++ __u8 Reserved; ++ __u16 Flags; ++ __u32 Timeout; ++ __u16 Reserved2; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u8 SetupCount; ++ __u8 Reserved3; ++ __u16 SubCommand; /* 1st setup word - can be followed by SetupCount words */ ++ __u16 ByteCount; /* careful - setupcount is not always one */ ++ } req; ++ struct { ++ struct smb_hdr hdr; /* wct = 0 */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 Reserved; ++ __u16 ParameterCount; ++ __u16 ParamterOffset; ++ __u16 ParameterDisplacement; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u16 DataDisplacement; ++ __u8 SetupCount; ++ __u8 Reserved1; /* should be zero setup words following */ ++ __u16 ByteCount; ++ __u16 Reserved2; /* parameter word reserved - present for infolevels > 100 */ ++ /* data area follows */ ++ } resp; ++} TRANSACTION2; ++ ++/* PathInfo/FileInfo infolevels */ ++#define SMB_INFO_STANDARD 1 ++#define SMB_INFO_QUERY_EAS_FROM_LIST 3 ++#define SMB_INFO_QUERY_ALL_EAS 4 ++#define SMB_INFO_IS_NAME_VALID 6 ++#define SMB_QUERY_FILE_BASIC_INFO 0x101 ++#define SMB_QUERY_FILE_STANDARD_INFO 0x102 ++#define SMB_QUERY_FILE_EA_INFO 0x103 ++#define SMB_QUERY_FILE_NAME_INFO 0x104 ++#define SMB_QUERY_FILE_ALLOCATION_INFO 0x105 ++#define SMB_QUERY_FILE_END_OF_FILEINFO 0x106 ++#define SMB_QUERY_FILE_ALL_INFO 0x107 ++#define SMB_QUERY_ALT_NAME_INFO 0x108 ++#define SMB_QUERY_FILE_STREAM_INFO 0x109 ++#define SMB_QUERY_FILE_COMPRESSION_INFO 0x10B ++#define SMB_QUERY_FILE_UNIX_BASIC 0x200 ++#define SMB_QUERY_FILE_UNIX_LINK 0x201 ++ ++#define SMB_SET_FILE_BASIC_INFO 0x101 ++#define SMB_SET_FILE_DISPOSITION_INFO 0x102 ++#define SMB_SET_FILE_ALLOCATION_INFO 0x103 ++#define SMB_SET_FILE_END_OF_FILE_INFO 0x104 ++#define SMB_SET_FILE_UNIX_BASIC 0x200 ++#define SMB_SET_FILE_UNIX_LINK 0x201 ++#define SMB_SET_FILE_UNIX_HLINK 0x203 ++#define SMB_SET_FILE_BASIC_INFO2 0x3ec ++#define SMB_SET_FILE_RENAME_INFORMATION 0x3f2 ++#define SMB_FILE_ALL_INFO2 0x3fa ++#define SMB_SET_FILE_ALLOCATION_INFO2 0x3fb ++#define SMB_SET_FILE_END_OF_FILE_INFO2 0x3fc ++#define SMB_FILE_MOVE_CLUSTER_INFO 0x407 ++#define SMB_FILE_QUOTA_INFO 0x408 ++#define SMB_FILE_REPARSEPOINT_INFO 0x409 ++#define SMB_FILE_MAXIMUM_INFO 0x40d ++ ++/* Find File infolevels */ ++#define SMB_FIND_FILE_DIRECTORY_INFO 0x101 ++#define SMB_FIND_FILE_FULL_DIRECTORY_INFO 0x102 ++#define SMB_FIND_FILE_NAMES_INFO 0x103 ++#define SMB_FIND_FILE_BOTH_DIRECTORY_INFO 0x104 ++#define SMB_FIND_FILE_UNIX 0x202 ++ ++typedef struct smb_com_transaction2_qpi_req { ++ struct smb_hdr hdr; /* wct = 14+ */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 MaxParameterCount; ++ __u16 MaxDataCount; ++ __u8 MaxSetupCount; ++ __u8 Reserved; ++ __u16 Flags; ++ __u32 Timeout; ++ __u16 Reserved2; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u8 SetupCount; ++ __u8 Reserved3; ++ __u16 SubCommand; /* one setup word */ ++ __u16 ByteCount; ++ __u8 Pad; ++ __u16 InformationLevel; ++ __u32 Reserved4; ++ char FileName[1]; ++} TRANSACTION2_QPI_REQ; ++ ++typedef struct smb_com_transaction2_qpi_rsp { ++ struct smb_hdr hdr; /* wct = 10 + SetupCount */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 Reserved; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 ParameterDisplacement; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u16 DataDisplacement; ++ __u8 SetupCount; ++ __u8 Reserved1; /* should be zero setup words following */ ++ __u16 ByteCount; ++ __u16 Reserved2; /* parameter word reserved - present for infolevels > 100 */ ++} TRANSACTION2_QPI_RSP; ++ ++typedef struct smb_com_transaction2_spi_req { ++ struct smb_hdr hdr; /* wct = 15 */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 MaxParameterCount; ++ __u16 MaxDataCount; ++ __u8 MaxSetupCount; ++ __u8 Reserved; ++ __u16 Flags; ++ __u32 Timeout; ++ __u16 Reserved2; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u8 SetupCount; ++ __u8 Reserved3; ++ __u16 SubCommand; /* one setup word */ ++ __u16 ByteCount; ++ __u8 Pad; ++ __u16 Pad1; ++ __u16 InformationLevel; ++ __u32 Reserved4; ++ char FileName[1]; ++} TRANSACTION2_SPI_REQ; ++ ++typedef struct smb_com_transaction2_spi_rsp { ++ struct smb_hdr hdr; /* wct = 10 + SetupCount */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 Reserved; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 ParameterDisplacement; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u16 DataDisplacement; ++ __u8 SetupCount; ++ __u8 Reserved1; /* should be zero setup words following */ ++ __u16 ByteCount; ++ __u16 Reserved2; /* parameter word reserved - present for infolevels > 100 */ ++} TRANSACTION2_SPI_RSP; ++ ++struct set_file_rename { ++ __u32 overwrite; /* 1 = overwrite dest */ ++ __u32 root_fid; /* zero */ ++ __u32 target_name_len; ++ char target_name[0]; /* Must be unicode */ ++}; ++ ++struct smb_com_transaction2_sfi_req { ++ struct smb_hdr hdr; /* wct = 15 */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 MaxParameterCount; ++ __u16 MaxDataCount; ++ __u8 MaxSetupCount; ++ __u8 Reserved; ++ __u16 Flags; ++ __u32 Timeout; ++ __u16 Reserved2; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u8 SetupCount; ++ __u8 Reserved3; ++ __u16 SubCommand; /* one setup word */ ++ __u16 ByteCount; ++ __u8 Pad; ++ __u16 Pad1; ++ __u16 Fid; ++ __u16 InformationLevel; ++ __u16 Reserved4; ++}; ++ ++struct smb_com_transaction2_sfi_rsp { ++ struct smb_hdr hdr; /* wct = 10 + SetupCount */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 Reserved; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 ParameterDisplacement; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u16 DataDisplacement; ++ __u8 SetupCount; ++ __u8 Reserved1; /* should be zero setup words following */ ++ __u16 ByteCount; ++ __u16 Reserved2; /* parameter word reserved - present for infolevels > 100 */ ++}; ++ ++ ++/* ++ * Flags on T2 FINDFIRST and FINDNEXT ++ */ ++#define CIFS_SEARCH_CLOSE_ALWAYS 0x0001 ++#define CIFS_SEARCH_CLOSE_AT_END 0x0002 ++#define CIFS_SEARCH_RETURN_RESUME 0x0004 ++#define CIFS_SEARCH_CONTINUE_FROM_LAST 0x0008 ++#define CIFS_SEARCH_BACKUP_SEARCH 0x0010 ++ ++/* ++ * Size of the resume key on FINDFIRST and FINDNEXT calls ++ */ ++#define CIFS_SMB_RESUME_KEY_SIZE 4 ++ ++typedef struct smb_com_transaction2_ffirst_req { ++ struct smb_hdr hdr; /* wct = 15 */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 MaxParameterCount; ++ __u16 MaxDataCount; ++ __u8 MaxSetupCount; ++ __u8 Reserved; ++ __u16 Flags; ++ __u32 Timeout; ++ __u16 Reserved2; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u8 SetupCount; /* one */ ++ __u8 Reserved3; ++ __u16 SubCommand; /* TRANS2_FIND_FIRST */ ++ __u16 ByteCount; ++ __u8 Pad; ++ __u16 SearchAttributes; ++ __u16 SearchCount; ++ __u16 SearchFlags; ++ __u16 InformationLevel; ++ __u32 SearchStorageType; ++ char FileName[1]; ++} TRANSACTION2_FFIRST_REQ; ++ ++typedef struct smb_com_transaction2_ffirst_rsp { ++ struct smb_hdr hdr; /* wct = 10 */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 Reserved; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 ParameterDisplacement; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u16 DataDisplacement; ++ __u8 SetupCount; ++ __u8 Reserved1; /* should be zero setup words following */ ++ __u16 ByteCount; ++} TRANSACTION2_FFIRST_RSP; ++ ++typedef struct smb_com_transaction2_ffirst_rsp_parms { ++ __u16 SearchHandle; ++ __u16 SearchCount; ++ __u16 EndofSearch; ++ __u16 EAErrorOffset; ++ __u16 LastNameOffset; ++} T2_FFIRST_RSP_PARMS; ++ ++typedef struct smb_com_transaction2_fnext_req { ++ struct smb_hdr hdr; /* wct = 15 */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 MaxParameterCount; ++ __u16 MaxDataCount; ++ __u8 MaxSetupCount; ++ __u8 Reserved; ++ __u16 Flags; ++ __u32 Timeout; ++ __u16 Reserved2; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u8 SetupCount; /* one */ ++ __u8 Reserved3; ++ __u16 SubCommand; /* TRANS2_FIND_NEXT */ ++ __u16 ByteCount; ++ __u8 Pad; ++ __u16 SearchHandle; ++ __u16 SearchCount; ++ __u16 InformationLevel; ++ __u32 ResumeKey; ++ __u16 SearchFlags; ++ char ResumeFileName[1]; ++} TRANSACTION2_FNEXT_REQ; ++ ++typedef struct smb_com_transaction2_fnext_rsp { ++ struct smb_hdr hdr; /* wct = 10 */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 Reserved; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 ParameterDisplacement; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u16 DataDisplacement; ++ __u8 SetupCount; ++ __u8 Reserved1; /* should be zero setup words following */ ++ __u16 ByteCount; ++} TRANSACTION2_FNEXT_RSP; ++ ++typedef struct smb_com_transaction2_fnext_rsp_parms { ++ __u16 SearchCount; ++ __u16 EndofSearch; ++ __u16 EAErrorOffset; ++ __u16 LastNameOffset; ++} T2_FNEXT_RSP_PARMS; ++ ++/* QFSInfo Levels */ ++#define SMB_INFO_ALLOCATION 1 ++#define SMB_INFO_VOLUME 2 ++#define SMB_QUERY_FS_VOLUME_INFO 0x102 ++#define SMB_QUERY_FS_SIZE_INFO 0x103 ++#define SMB_QUERY_FS_DEVICE_INFO 0x104 ++#define SMB_QUERY_FS_ATTRIBUTE_INFO 0x105 ++#define SMB_QUERY_CIFS_UNIX_INFO 0x200 ++#define SMB_QUERY_LABEL_INFO 0x3ea ++#define SMB_QUERY_FS_QUOTA_INFO 0x3ee ++ ++typedef struct smb_com_transaction2_qfsi_req { ++ struct smb_hdr hdr; /* wct = 14+ */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 MaxParameterCount; ++ __u16 MaxDataCount; ++ __u8 MaxSetupCount; ++ __u8 Reserved; ++ __u16 Flags; ++ __u32 Timeout; ++ __u16 Reserved2; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u8 SetupCount; ++ __u8 Reserved3; ++ __u16 SubCommand; /* one setup word */ ++ __u16 ByteCount; ++ __u8 Pad; ++ __u16 InformationLevel; ++} TRANSACTION2_QFSI_REQ; ++ ++typedef struct smb_com_transaction_qfsi_rsp { ++ struct smb_hdr hdr; /* wct = 10 + SetupCount */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 Reserved; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 ParameterDisplacement; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u16 DataDisplacement; ++ __u8 SetupCount; ++ __u8 Reserved1; /* should be zero setup words following */ ++ __u16 ByteCount; ++ __u8 Pad; /* may be three bytes *//* followed by data area */ ++} TRANSACTION2_QFSI_RSP; ++ ++typedef struct smb_com_transaction2_get_dfs_refer_req { ++ struct smb_hdr hdr; /* wct = 15 */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 MaxParameterCount; ++ __u16 MaxDataCount; ++ __u8 MaxSetupCount; ++ __u8 Reserved; ++ __u16 Flags; ++ __u32 Timeout; ++ __u16 Reserved2; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u8 SetupCount; ++ __u8 Reserved3; ++ __u16 SubCommand; /* one setup word */ ++ __u16 ByteCount; ++ __u8 Pad[3]; /* Win2K has sent 0x0F01 (max resp length perhaps?) followed by one byte pad - doesn't seem to matter though */ ++ __u16 MaxReferralLevel; ++ char RequestFileName[1]; ++} TRANSACTION2_GET_DFS_REFER_REQ; ++ ++typedef struct dfs_referral_level_3 { ++ __u16 VersionNumber; ++ __u16 ReferralSize; ++ __u16 ServerType; /* 0x0001 = CIFS server */ ++ __u16 ReferralFlags; /* or proximity - not clear which since always set to zero - SNIA spec says 0x01 means strip off PathConsumed chars before submitting RequestFileName to remote node */ ++ __u16 TimeToLive; ++ __u16 Proximity; ++ __u16 DfsPathOffset; ++ __u16 DfsAlternatePathOffset; ++ __u16 NetworkAddressOffset; ++} REFERRAL3; ++ ++typedef struct smb_com_transaction_get_dfs_refer_rsp { ++ struct smb_hdr hdr; /* wct = 10 */ ++ __u16 TotalParameterCount; ++ __u16 TotalDataCount; ++ __u16 Reserved; ++ __u16 ParameterCount; ++ __u16 ParameterOffset; ++ __u16 ParameterDisplacement; ++ __u16 DataCount; ++ __u16 DataOffset; ++ __u16 DataDisplacement; ++ __u8 SetupCount; ++ __u8 Reserved1; /* zero setup words following */ ++ __u16 ByteCount; ++ __u8 Pad; ++ __u16 PathConsumed; ++ __u16 NumberOfReferrals; ++ __u16 DFSFlags; ++ __u16 Pad2; ++ REFERRAL3 referrals[1]; /* array of level 3 dfs_referral structures */ ++ /* followed by the strings pointed to by the referral structures */ ++} TRANSACTION2_GET_DFS_REFER_RSP; ++ ++/* DFS Flags */ ++#define DFSREF_REFERRAL_SERVER 0x0001 ++#define DFSREF_STORAGE_SERVER 0x0002 ++ ++/* IOCTL information */ ++/* List of ioctl function codes that look to be of interest to remote clients like this. */ ++/* Need to do some experimentation to make sure they all work remotely. */ ++/* Some of the following such as the encryption/compression ones would be */ ++/* invoked from tools via a specialized hook into the VFS rather than via the */ ++/* standard vfs entry points */ ++#define FSCTL_REQUEST_OPLOCK_LEVEL_1 0x00090000 ++#define FSCTL_REQUEST_OPLOCK_LEVEL_2 0x00090004 ++#define FSCTL_REQUEST_BATCH_OPLOCK 0x00090008 ++#define FSCTL_LOCK_VOLUME 0x00090018 ++#define FSCTL_UNLOCK_VOLUME 0x0009001C ++#define FSCTL_GET_COMPRESSION 0x0009003C ++#define FSCTL_SET_COMPRESSION 0x0009C040 ++#define FSCTL_REQUEST_FILTER_OPLOCK 0x0009008C ++#define FSCTL_FILESYS_GET_STATISTICS 0x00090090 ++#define FSCTL_SET_REPARSE_POINT 0x000900A4 ++#define FSCTL_GET_REPARSE_POINT 0x000900A8 ++#define FSCTL_DELETE_REPARSE_POINT 0x000900AC ++#define FSCTL_SET_SPARSE 0x000900C4 ++#define FSCTL_SET_ZERO_DATA 0x000900C8 ++#define FSCTL_SET_ENCRYPTION 0x000900D7 ++#define FSCTL_ENCRYPTION_FSCTL_IO 0x000900DB ++#define FSCTL_WRITE_RAW_ENCRYPTED 0x000900DF ++#define FSCTL_READ_RAW_ENCRYPTED 0x000900E3 ++#define FSCTL_SIS_COPYFILE 0x00090100 ++#define FSCTL_SIS_LINK_FILES 0x0009C104 ++ ++#define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003 ++#define IO_REPARSE_TAG_HSM 0xC0000004 ++#define IO_REPARSE_TAG_SIS 0x80000007 ++ ++/* ++ ************************************************************************ ++ * All structs for everything above the SMB PDUs themselves ++ * (such as the T2 level specific data) go here ++ ************************************************************************ ++ */ ++ ++/* ++ * Information on a server ++ */ ++ ++struct serverInfo { ++ char name[16]; ++ unsigned char versionMajor; ++ unsigned char versionMinor; ++ unsigned long type; ++ unsigned int commentOffset; ++}; ++ ++/* ++ * The following structure is the format of the data returned on a NetShareEnum ++ * with level "90" (x5A) ++ */ ++ ++struct shareInfo { ++ char shareName[13]; ++ char pad; ++ unsigned short type; ++ unsigned int commentOffset; ++}; ++ ++struct aliasInfo { ++ char aliasName[9]; ++ char pad; ++ unsigned int commentOffset; ++ unsigned char type[2]; ++}; ++ ++struct aliasInfo92 { ++ int aliasNameOffset; ++ int serverNameOffset; ++ int shareNameOffset; ++}; ++ ++typedef struct { ++ __u64 TotalAllocationUnits; ++ __u64 FreeAllocationUnits; ++ __u32 SectorsPerAllocationUnit; ++ __u32 BytesPerSector; ++} FILE_SYSTEM_INFO; /* size info, level 0x103 */ ++ ++typedef struct { ++ __u16 MajorVersionNumber; ++ __u16 MinorVersionNumber; ++ __u64 Capability; ++} FILE_SYSTEM_UNIX_INFO; /* Unix extensions info, level 0x200 */ ++/* Linux/Unix extensions capability flags */ ++#define CIFS_UNIX_FCNTL_CAP 0x00000001 /* support for fcntl locks */ ++#define CIFS_UNIX_POSIX_ACL_CAP 0x00000002 ++ ++/* DeviceType Flags */ ++#define FILE_DEVICE_CD_ROM 0x00000002 ++#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 ++#define FILE_DEVICE_DFS 0x00000006 ++#define FILE_DEVICE_DISK 0x00000007 ++#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 ++#define FILE_DEVICE_FILE_SYSTEM 0x00000009 ++#define FILE_DEVICE_NAMED_PIPE 0x00000011 ++#define FILE_DEVICE_NETWORK 0x00000012 ++#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014 ++#define FILE_DEVICE_NULL 0x00000015 ++#define FILE_DEVICE_PARALLEL_PORT 0x00000016 ++#define FILE_DEVICE_PRINTER 0x00000018 ++#define FILE_DEVICE_SERIAL_PORT 0x0000001b ++#define FILE_DEVICE_STREAMS 0x0000001e ++#define FILE_DEVICE_TAPE 0x0000001f ++#define FILE_DEVICE_TAPE_FILE_SYSTEM 0x00000020 ++#define FILE_DEVICE_VIRTUAL_DISK 0x00000024 ++#define FILE_DEVICE_NETWORK_REDIRECTOR 0x00000028 ++ ++typedef struct { ++ __u32 DeviceType; ++ __u32 DeviceCharacteristics; ++} FILE_SYSTEM_DEVICE_INFO; /* device info, level 0x104 */ ++ ++typedef struct { ++ __u32 Attributes; ++ __u32 MaxPathNameComponentLength; ++ __u32 FileSystemNameLen; ++ char FileSystemName[52]; /* do not really need to save this - so potentially get only subset of name */ ++} FILE_SYSTEM_ATTRIBUTE_INFO; ++ ++typedef struct { /* data block encoding of response to level 263 QPathInfo */ ++ __u64 CreationTime; ++ __u64 LastAccessTime; ++ __u64 LastWriteTime; ++ __u64 ChangeTime; ++ __u32 Attributes; ++ __u32 Pad1; ++ __u64 AllocationSize; ++ __u64 EndOfFile; /* size ie offset to first free byte in file */ ++ __u32 NumberOfLinks; /* hard links */ ++ __u8 DeletePending; ++ __u8 Directory; ++ __u16 Pad2; ++ __u64 IndexNumber; ++ __u32 EASize; ++ __u32 AccessFlags; ++ __u64 IndexNumber1; ++ __u64 CurrentByteOffset; ++ __u32 Mode; ++ __u32 AlignmentRequirement; ++ __u32 FileNameLength; ++ char FileName[1]; ++} FILE_ALL_INFO; /* level 263 QPathInfo */ ++ ++typedef struct { ++ __u64 EndOfFile; ++ __u64 NumOfBytes; ++ __u64 LastStatusChange; /*SNIA spec says DCE time for the three time fields */ ++ __u64 LastAccessTime; ++ __u64 LastModificationTime; ++ __u64 Uid; ++ __u64 Gid; ++ __u32 Type; ++ __u64 DevMajor; ++ __u64 DevMinor; ++ __u64 UniqueId; ++ __u64 Permissions; ++ __u64 Nlinks; ++} FILE_UNIX_BASIC_INFO; /* level 512 QPathInfo */ ++ ++typedef struct { ++ char LinkDest[1]; ++} FILE_UNIX_LINK_INFO; /* level 513 QPathInfo */ ++ ++/* defines for enumerating possible values of the Unix type field below */ ++#define UNIX_FILE 0 ++#define UNIX_DIR 1 ++#define UNIX_SYMLINK 2 ++#define UNIX_CHARDEV 3 ++#define UNIX_BLOCKDEV 4 ++#define UNIX_FIFO 5 ++#define UNIX_SOCKET 6 ++ ++typedef struct { ++ __u32 NextEntryOffset; ++ __u32 ResumeKey; ++ __u64 EndOfFile; ++ __u64 NumOfBytes; ++ __u64 LastStatusChange; /*SNIA spec says DCE time for the three time fields */ ++ __u64 LastAccessTime; ++ __u64 LastModificationTime; ++ __u64 Uid; ++ __u64 Gid; ++ __u32 Type; ++ __u64 DevMajor; ++ __u64 DevMinor; ++ __u64 UniqueId; ++ __u64 Permissions; ++ __u64 Nlinks; ++ char FileName[1]; ++} FILE_UNIX_INFO; ++ ++typedef struct { ++ __u64 CreationTime; ++ __u64 LastAccessTime; ++ __u64 LastWriteTime; ++ __u64 ChangeTime; ++ __u32 Attributes; ++ __u32 Pad; ++} FILE_BASIC_INFO; /* size info, level 0x101 */ ++ ++struct file_allocation_info { ++ __u64 AllocationSize; ++}; /* size info, level 0x103 */ ++ ++struct file_end_of_file_info { ++ __u64 FileSize; /* offset to end of file */ ++}; /* size info, level 0x104 */ ++ ++typedef struct { ++ __u32 NextEntryOffset; ++ __u32 FileIndex; ++ __u64 CreationTime; ++ __u64 LastAccessTime; ++ __u64 LastWriteTime; ++ __u64 ChangeTime; ++ __u64 EndOfFile; ++ __u64 AllocationSize; ++ __u32 ExtFileAttributes; ++ __u32 FileNameLength; ++ char FileName[1]; ++} FILE_DIRECTORY_INFO; /* level 257 FF response data area */ ++ ++struct gea { ++ unsigned char cbName; ++ char szName[1]; ++}; ++ ++struct gealist { ++ unsigned long cbList; ++ struct gea list[1]; ++}; ++ ++struct fea { ++ unsigned char EA_flags; ++ __u8 name_len; ++ __u16 value_len; ++ char szName[1]; ++ /* optionally followed by value */ ++}; ++/* flags for _FEA.fEA */ ++#define FEA_NEEDEA 0x80 /* need EA bit */ ++ ++struct fealist { ++ __u32 list_len; ++ struct fea list[1]; ++}; ++ ++/* used to hold an arbitrary blob of data */ ++struct data_blob { ++ __u8 *data; ++ size_t length; ++ void (*free) (struct data_blob * data_blob); ++}; ++ ++#ifdef CONFIG_CIFS_POSIX ++/* ++ For better POSIX semantics from Linux client, (even better ++ than the existing CIFS Unix Extensions) we need updated PDUs for: ++ ++ 1) PosixCreateX - to set and return the mode, inode#, device info and ++ perhaps add a CreateDevice - to create Pipes and other special .inodes ++ Also note POSIX open flags ++ 2) Close - to return the last write time to do cache across close more safely ++ 3) PosixQFSInfo - to return statfs info ++ 4) FindFirst return unique inode number - what about resume key, two forms short (matches readdir) and full (enough info to cache inodes) ++ 5) Mkdir - set mode ++ ++ And under consideration: ++ 6) FindClose2 (return nanosecond timestamp ??) ++ 7) Use nanosecond timestamps throughout all time fields if ++ corresponding attribute flag is set ++ 8) sendfile - handle based copy ++ 9) Direct i/o ++ 10) "POSIX ACL" support ++ 11) Misc fcntls? ++ ++ what about fixing 64 bit alignment ++ ++ There are also various legacy SMB/CIFS requests used as is ++ ++ From existing Lanman and NTLM dialects: ++ -------------------------------------- ++ NEGOTIATE ++ SESSION_SETUP_ANDX (BB which?) ++ TREE_CONNECT_ANDX (BB which wct?) ++ TREE_DISCONNECT (BB add volume timestamp on response) ++ LOGOFF_ANDX ++ DELETE (note delete open file behavior) ++ DELETE_DIRECTORY ++ READ_AND_X ++ WRITE_AND_X ++ LOCKING_AND_X (note posix lock semantics) ++ RENAME (note rename across dirs and open file rename posix behaviors) ++ NT_RENAME (for hardlinks) Is this good enough for all features? ++ FIND_CLOSE2 ++ TRANSACTION2 (18 cases) ++ SMB_SET_FILE_END_OF_FILE_INFO2 SMB_SET_PATH_END_OF_FILE_INFO2 ++ (BB verify that never need to set allocation size) ++ SMB_SET_FILE_BASIC_INFO2 (setting times - BB can it be done via Unix ext?) ++ ++ COPY (note support for copy across directories) - FUTURE, OPTIONAL ++ setting/getting OS/2 EAs - FUTURE (BB can this handle ++ setting Linux xattrs perfectly) - OPTIONAL ++ dnotify - FUTURE, OPTIONAL ++ quota - FUTURE, OPTIONAL ++ ++ Note that various requests implemented for NT interop such as ++ NT_TRANSACT (IOCTL) QueryReparseInfo ++ are unneeded to servers compliant with the CIFS POSIX extensions ++ ++ From CIFS Unix Extensions: ++ ------------------------- ++ T2 SET_PATH_INFO (SMB_SET_FILE_UNIX_LINK) for symlinks ++ T2 SET_PATH_INFO (SMB_SET_FILE_BASIC_INFO2) ++ T2 QUERY_PATH_INFO (SMB_QUERY_FILE_UNIX_LINK) ++ T2 QUERY_PATH_INFO (SMB_QUERY_FILE_UNIX_BASIC) - BB check for missing inode fields ++ Actually need QUERY_FILE_UNIX_INFO since has inode num ++ BB what about a) blksize/blkbits/blocks ++ b) i_version ++ c) i_rdev ++ d) notify mask? ++ e) generation ++ f) size_seqcount ++ T2 FIND_FIRST/FIND_NEXT FIND_FILE_UNIX ++ TRANS2_GET_DFS_REFERRAL - OPTIONAL but recommended ++ T2_QFS_INFO QueryDevice/AttributeInfo - OPTIONAL ++ ++ ++ */ ++#endif ++ ++#pragma pack() /* resume default structure packing */ ++ ++#endif /* _CIFSPDU_H */ +diff -urN linux-2.4.29.old/fs/cifs/cifsproto.h linux-2.4.29/fs/cifs/cifsproto.h +--- linux-2.4.29.old/fs/cifs/cifsproto.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifsproto.h 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,254 @@ ++/* ++ * fs/cifs/cifsproto.h ++ * ++ * Copyright (c) International Business Machines Corp., 2002 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#ifndef _CIFSPROTO_H ++#define _CIFSPROTO_H ++#include <linux/nls.h> ++ ++struct statfs; ++ ++/* ++ ***************************************************************** ++ * All Prototypes ++ ***************************************************************** ++ */ ++ ++extern struct smb_hdr *cifs_buf_get(void); ++extern void cifs_buf_release(void *); ++extern int smb_send(struct socket *, struct smb_hdr *, ++ unsigned int /* length */ , struct sockaddr *); ++extern unsigned int _GetXid(void); ++extern void _FreeXid(unsigned int); ++#define GetXid() (int)_GetXid(); cFYI(1,("CIFS VFS: in %s as Xid: %d with uid: %d",__FUNCTION__, xid,current->fsuid)); ++#define FreeXid(curr_xid) {_FreeXid(curr_xid); cFYI(1,("CIFS VFS: leaving %s (xid = %d) rc = %d",__FUNCTION__,curr_xid,rc));} ++extern char *build_path_from_dentry(struct dentry *); ++extern char *build_wildcard_path_from_dentry(struct dentry *direntry); ++extern void renew_parental_timestamps(struct dentry *direntry); ++extern int SendReceive(const unsigned int /* xid */ , struct cifsSesInfo *, ++ struct smb_hdr * /* input */ , ++ struct smb_hdr * /* out */ , ++ int * /* bytes returned */ , const int long_op); ++extern int checkSMBhdr(struct smb_hdr *smb, __u16 mid); ++extern int checkSMB(struct smb_hdr *smb, __u16 mid, int length); ++extern int is_valid_oplock_break(struct smb_hdr *smb); ++extern unsigned int smbCalcSize(struct smb_hdr *ptr); ++extern int decode_negTokenInit(unsigned char *security_blob, int length, ++ enum securityEnum *secType); ++extern int map_smb_to_linux_error(struct smb_hdr *smb); ++extern void header_assemble(struct smb_hdr *, char /* command */ , ++ const struct cifsTconInfo *, int ++ /* length of fixed section (word count) in two byte units */ ++ ); ++struct oplock_q_entry * AllocOplockQEntry(struct inode *, u16, struct cifsTconInfo *); ++void DeleteOplockQEntry(struct oplock_q_entry *); ++extern time_t cifs_NTtimeToUnix(u64 /* utc nanoseconds since 1601 */ ); ++extern u64 cifs_UnixTimeToNT(time_t); ++extern int cifs_get_inode_info(struct inode **pinode, ++ const unsigned char *search_path, ++ FILE_ALL_INFO * pfile_info, ++ struct super_block *sb, int xid); ++extern int cifs_get_inode_info_unix(struct inode **pinode, ++ const unsigned char *search_path, ++ struct super_block *sb,int xid); ++ ++extern int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, ++ struct nls_table * nls_info); ++extern int CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses); ++ ++extern int CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, ++ const char *tree, struct cifsTconInfo *tcon, ++ const struct nls_table *); ++ ++extern int CIFSFindFirst(const int xid, struct cifsTconInfo *tcon, ++ const char *searchName, ++ FILE_DIRECTORY_INFO * findData, ++ T2_FFIRST_RSP_PARMS * findParms, ++ const struct nls_table *nls_codepage, ++ int *pUnicodeFlag, ++ int *pUnixFlag /* if Unix extensions used */ ); ++extern int CIFSFindNext(const int xid, struct cifsTconInfo *tcon, ++ FILE_DIRECTORY_INFO * findData, ++ T2_FNEXT_RSP_PARMS * findParms, ++ const __u16 searchHandle, char * resume_name, ++ int name_length, __u32 resume_key, ++ int *UnicodeFlag, int *pUnixFlag); ++ ++extern int CIFSFindClose(const int, struct cifsTconInfo *tcon, ++ const __u16 search_handle); ++ ++extern int CIFSSMBQPathInfo(const int xid, struct cifsTconInfo *tcon, ++ const unsigned char *searchName, ++ FILE_ALL_INFO * findData, ++ const struct nls_table *nls_codepage); ++ ++extern int CIFSSMBUnixQPathInfo(const int xid, ++ struct cifsTconInfo *tcon, ++ const unsigned char *searchName, ++ FILE_UNIX_BASIC_INFO * pFindData, ++ const struct nls_table *nls_codepage); ++ ++extern int CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, ++ const unsigned char *searchName, ++ unsigned char **targetUNCs, ++ unsigned int *number_of_UNC_in_array, ++ const struct nls_table *nls_codepage); ++ ++extern int connect_to_dfs_path(int xid, struct cifsSesInfo *pSesInfo, ++ const char *old_path, ++ const struct nls_table *nls_codepage); ++extern int get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, ++ const char *old_path, const struct nls_table *nls_codepage, ++ unsigned int *pnum_referrals, unsigned char ** preferrals); ++extern int CIFSSMBQFSInfo(const int xid, struct cifsTconInfo *tcon, ++ struct statfs *FSData, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBQFSAttributeInfo(const int xid, ++ struct cifsTconInfo *tcon, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBQFSDeviceInfo(const int xid, struct cifsTconInfo *tcon, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBQFSUnixInfo(const int xid, struct cifsTconInfo *tcon, ++ const struct nls_table *nls_codepage); ++ ++extern int CIFSSMBSetTimes(const int xid, struct cifsTconInfo *tcon, ++ char *fileName, FILE_BASIC_INFO * data, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBSetEOF(const int xid, struct cifsTconInfo *tcon, ++ char *fileName, __u64 size,int setAllocationSizeFlag, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, ++ __u64 size, __u16 fileHandle,__u32 opener_pid, int AllocSizeFlag); ++extern int CIFSSMBUnixSetPerms(const int xid, struct cifsTconInfo *pTcon, ++ char *full_path, __u64 mode, __u64 uid, ++ __u64 gid, dev_t dev, const struct nls_table *nls_codepage); ++ ++extern int CIFSSMBMkDir(const int xid, struct cifsTconInfo *tcon, ++ const char *newName, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBRmDir(const int xid, struct cifsTconInfo *tcon, ++ const char *name, const struct nls_table *nls_codepage); ++ ++extern int CIFSSMBDelFile(const int xid, struct cifsTconInfo *tcon, ++ const char *name, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBRename(const int xid, struct cifsTconInfo *tcon, ++ const char *fromName, const char *toName, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBRenameOpenFile(const int xid,struct cifsTconInfo *pTcon, ++ int netfid, char * target_name, const struct nls_table *nls_codepage); ++extern int CIFSCreateHardLink(const int xid, ++ struct cifsTconInfo *tcon, ++ const char *fromName, const char *toName, ++ const struct nls_table *nls_codepage); ++extern int CIFSUnixCreateHardLink(const int xid, ++ struct cifsTconInfo *tcon, ++ const char *fromName, const char *toName, ++ const struct nls_table *nls_codepage); ++extern int CIFSUnixCreateSymLink(const int xid, ++ struct cifsTconInfo *tcon, ++ const char *fromName, const char *toName, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBUnixQuerySymLink(const int xid, ++ struct cifsTconInfo *tcon, ++ const unsigned char *searchName, ++ char *syminfo, const int buflen, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBQueryReparseLinkInfo(const int xid, ++ struct cifsTconInfo *tcon, ++ const unsigned char *searchName, ++ char *symlinkinfo, const int buflen, __u16 fid, ++ const struct nls_table *nls_codepage); ++ ++extern int CIFSSMBOpen(const int xid, struct cifsTconInfo *tcon, ++ const char *fileName, const int disposition, ++ const int access_flags, const int omode, ++ __u16 * netfid, int *pOplock, FILE_ALL_INFO *, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBClose(const int xid, struct cifsTconInfo *tcon, ++ const int smb_file_id); ++ ++extern int CIFSSMBRead(const int xid, struct cifsTconInfo *tcon, ++ const int netfid, unsigned int count, ++ const __u64 lseek, unsigned int *nbytes, char **buf); ++extern int CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon, ++ const int netfid, const unsigned int count, ++ const __u64 lseek, unsigned int *nbytes, ++ const char *buf, const int long_op); ++extern int CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, ++ const __u16 netfid, const __u64 len, ++ const __u64 offset, const __u32 numUnlock, ++ const __u32 numLock, const __u8 lockType, ++ const int waitFlag); ++ ++extern int CIFSSMBTDis(const int xid, struct cifsTconInfo *tcon); ++extern int CIFSSMBLogoff(const int xid, struct cifsSesInfo *ses); ++ ++extern struct cifsSesInfo *sesInfoAlloc(void); ++extern void sesInfoFree(struct cifsSesInfo *); ++extern struct cifsTconInfo *tconInfoAlloc(void); ++extern void tconInfoFree(struct cifsTconInfo *); ++ ++extern int cifs_reconnect(struct TCP_Server_Info *server); ++ ++extern int cifs_sign_smb(struct smb_hdr *, struct cifsSesInfo *,__u32 *); ++extern int cifs_verify_signature(const struct smb_hdr *, const char * mac_key, ++ __u32 expected_sequence_number); ++extern int cifs_calculate_mac_key(char * key,const char * rn,const char * pass); ++extern void CalcNTLMv2_partial_mac_key(struct cifsSesInfo *, struct nls_table *); ++extern void CalcNTLMv2_response(const struct cifsSesInfo *,char * ); ++ ++extern int CIFSBuildServerList(int xid, char *serverBufferList, ++ int recordlength, int *entries, ++ int *totalEntries, int *topoChangedFlag); ++extern int CIFSSMBQueryShares(int xid, struct cifsTconInfo *tcon, ++ struct shareInfo *shareList, int bufferLen, ++ int *entries, int *totalEntries); ++extern int CIFSSMBQueryAlias(int xid, struct cifsTconInfo *tcon, ++ struct aliasInfo *aliasList, int bufferLen, ++ int *entries, int *totalEntries); ++extern int CIFSSMBAliasInfo(int xid, struct cifsTconInfo *tcon, ++ char *aliasName, char *serverName, ++ char *shareName, char *comment); ++extern int CIFSSMBGetShareInfo(int xid, struct cifsTconInfo *tcon, ++ char *share, char *comment); ++extern int CIFSSMBGetUserPerms(int xid, struct cifsTconInfo *tcon, ++ char *userName, char *searchName, int *perms); ++extern int CIFSSMBSync(int xid, struct cifsTconInfo *tcon, int netfid, int pid); ++ ++extern int CIFSSMBSeek(int xid, ++ struct cifsTconInfo *tcon, ++ int netfid, ++ int pid, ++ int whence, unsigned long offset, long long *newoffset); ++ ++extern int CIFSSMBCopy(int xid, ++ struct cifsTconInfo *source_tcon, ++ const char *fromName, ++ const __u16 target_tid, ++ const char *toName, const int flags, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon, ++ const int notify_subdirs,const __u16 netfid,__u32 filter, ++ const struct nls_table *nls_codepage); ++extern int CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon, ++ const unsigned char *searchName, ++ char * EAData, size_t size, ++ const struct nls_table *nls_codepage); ++#endif /* _CIFSPROTO_H */ +diff -urN linux-2.4.29.old/fs/cifs/cifssmb.c linux-2.4.29/fs/cifs/cifssmb.c +--- linux-2.4.29.old/fs/cifs/cifssmb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifssmb.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,3016 @@ ++/* ++ * fs/cifs/cifssmb.c ++ * ++ * Copyright (C) International Business Machines Corp., 2002,2003 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * Contains the routines for constructing the SMB PDUs themselves ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++ /* SMB/CIFS PDU handling routines here - except for leftovers in connect.c */ ++ /* These are mostly routines that operate on a pathname, or on a tree id */ ++ /* (mounted volume), but there are eight handle based routines which must be */ ++ /* treated slightly different for reconnection purposes since we never want */ ++ /* to reuse a stale file handle and the caller knows the file handle */ ++ ++#include <linux/fs.h> ++#include <linux/kernel.h> ++#include <linux/vfs.h> ++#include <asm/uaccess.h> ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifsproto.h" ++#include "cifs_unicode.h" ++#include "cifs_debug.h" ++ ++#ifdef CONFIG_CIFS_POSIX ++static struct { ++ int index; ++ char *name; ++} protocols[] = { ++ {CIFS_PROT, "\2NT LM 0.12"}, ++ {CIFS_PROT, "\2POSIX 2"}, ++ {BAD_PROT, "\2"} ++}; ++#else ++static struct { ++ int index; ++ char *name; ++} protocols[] = { ++ {CIFS_PROT, "\2NT LM 0.12"}, ++ {BAD_PROT, "\2"} ++}; ++#endif ++ ++ ++/* Mark as invalid, all open files on tree connections since they ++ were closed when session to server was lost */ ++static void mark_open_files_invalid(struct cifsTconInfo * pTcon) ++{ ++ struct cifsFileInfo *open_file = NULL; ++ struct list_head * tmp; ++ struct list_head * tmp1; ++ ++/* list all files open on tree connection and mark them invalid */ ++ write_lock(&GlobalSMBSeslock); ++ list_for_each_safe(tmp, tmp1, &pTcon->openFileList) { ++ open_file = list_entry(tmp,struct cifsFileInfo, tlist); ++ if(open_file) { ++ open_file->invalidHandle = TRUE; ++ } ++ } ++ write_unlock(&GlobalSMBSeslock); ++ /* BB Add call to invalidate_inodes(sb) for all superblocks mounted to this tcon */ ++} ++ ++static int ++smb_init(int smb_command, int wct, struct cifsTconInfo *tcon, ++ void **request_buf /* returned */ , ++ void **response_buf /* returned */ ) ++{ ++ int rc = 0; ++ int timeout = 10 * HZ; ++ ++ /* SMBs NegProt, SessSetup, uLogoff do not have tcon yet so ++ check for tcp and smb session status done differently ++ for those three - in the calling routine */ ++ if(tcon) { ++ if((tcon->ses) && (tcon->ses->server)){ ++ struct nls_table *nls_codepage; ++ /* Give Demultiplex thread up to 10 seconds to ++ reconnect, should be greater than cifs socket ++ timeout which is 7 seconds */ ++ while(tcon->ses->server->tcpStatus == CifsNeedReconnect) { ++ while ((tcon->ses->server->tcpStatus != CifsGood) && (timeout > 0)){ ++ timeout = interruptible_sleep_on_timeout(&tcon->ses->server->response_q,timeout); ++ } ++ if(tcon->ses->server->tcpStatus == CifsNeedReconnect) { ++ /* on "soft" mounts we wait once */ ++ if((tcon->retry == FALSE) || ++ (tcon->ses->status == CifsExiting)) { ++ cFYI(1,("gave up waiting on reconnect in smb_init")); ++ return -EHOSTDOWN; ++ } /* else "hard" mount - keep retrying until ++ process is killed or server comes back up */ ++ } else /* TCP session is reestablished now */ ++ break; ++ ++ } ++ ++ nls_codepage = load_nls_default(); ++ /* need to prevent multiple threads trying to ++ simultaneously reconnect the same SMB session */ ++ down(&tcon->ses->sesSem); ++ if(tcon->ses->status == CifsNeedReconnect) ++ rc = cifs_setup_session(0, tcon->ses, nls_codepage); ++ if(!rc && (tcon->tidStatus == CifsNeedReconnect)) { ++ mark_open_files_invalid(tcon); ++ rc = CIFSTCon(0, tcon->ses, tcon->treeName, tcon, ++ nls_codepage); ++ up(&tcon->ses->sesSem); ++ if(rc == 0) ++ atomic_inc(&tconInfoReconnectCount); ++ ++ cFYI(1, ("reconnect tcon rc = %d", rc)); ++ /* Removed call to reopen open files here - ++ it is safer (and faster) to reopen files ++ one at a time as needed in read and write */ ++ ++ /* Check if handle based operation so we ++ know whether we can continue or not without ++ returning to caller to reset file handle */ ++ switch(smb_command) { ++ case SMB_COM_READ_ANDX: ++ case SMB_COM_WRITE_ANDX: ++ case SMB_COM_CLOSE: ++ case SMB_COM_FIND_CLOSE2: ++ case SMB_COM_LOCKING_ANDX: { ++ unload_nls(nls_codepage); ++ return -EAGAIN; ++ } ++ } ++ } else { ++ up(&tcon->ses->sesSem); ++ } ++ unload_nls(nls_codepage); ++ ++ } else { ++ return -EIO; ++ } ++ } ++ if(rc) ++ return rc; ++ ++ *request_buf = cifs_buf_get(); ++ if (*request_buf == 0) { ++ /* BB should we add a retry in here if not a writepage? */ ++ return -ENOMEM; ++ } ++ /* Although the original thought was we needed the response buf for */ ++ /* potential retries of smb operations it turns out we can determine */ ++ /* from the mid flags when the request buffer can be resent without */ ++ /* having to use a second distinct buffer for the response */ ++ *response_buf = *request_buf; ++ ++ header_assemble((struct smb_hdr *) *request_buf, smb_command, tcon, ++ wct /*wct */ ); ++ ++#ifdef CONFIG_CIFS_STATS ++ if(tcon != NULL) { ++ atomic_inc(&tcon->num_smbs_sent); ++ } ++#endif ++ return rc; ++} ++ ++int ++CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) ++{ ++ NEGOTIATE_REQ *pSMB; ++ NEGOTIATE_RSP *pSMBr; ++ int rc = 0; ++ int bytes_returned; ++ struct TCP_Server_Info * server; ++ ++ if(ses->server) ++ server = ses->server; ++ else { ++ rc = -EIO; ++ return rc; ++ } ++ rc = smb_init(SMB_COM_NEGOTIATE, 0, NULL /* no tcon yet */ , ++ (void **) &pSMB, (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->hdr.Flags2 |= SMBFLG2_UNICODE; ++ if (extended_security) ++ pSMB->hdr.Flags2 |= SMBFLG2_EXT_SEC; ++ ++ pSMB->ByteCount = strlen(protocols[0].name) + 1; ++ strncpy(pSMB->DialectsArray, protocols[0].name, 30); ++ /* null guaranteed to be at end of source and target buffers anyway */ ++ ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc == 0) { ++ server->secMode = pSMBr->SecurityMode; ++ server->secType = NTLM; /* BB override default for NTLMv2 or krb*/ ++ /* one byte - no need to convert this or EncryptionKeyLen from le,*/ ++ server->maxReq = le16_to_cpu(pSMBr->MaxMpxCount); ++ /* probably no need to store and check maxvcs */ ++ server->maxBuf = ++ min(le32_to_cpu(pSMBr->MaxBufferSize), ++ (__u32) CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE); ++ server->maxRw = le32_to_cpu(pSMBr->MaxRawSize); ++ cFYI(0, ("Max buf = %d ", ses->server->maxBuf)); ++ GETU32(ses->server->sessid) = le32_to_cpu(pSMBr->SessionKey); ++ server->capabilities = le32_to_cpu(pSMBr->Capabilities); ++ server->timeZone = le16_to_cpu(pSMBr->ServerTimeZone); ++ /* BB with UTC do we ever need to be using srvr timezone? */ ++ if (pSMBr->EncryptionKeyLength == CIFS_CRYPTO_KEY_SIZE) { ++ memcpy(server->cryptKey, pSMBr->u.EncryptionKey, ++ CIFS_CRYPTO_KEY_SIZE); ++ } else if ((pSMBr->hdr.Flags2 & SMBFLG2_EXT_SEC) ++ && (pSMBr->EncryptionKeyLength == 0)) { ++ /* decode security blob */ ++ } else ++ rc = -EIO; ++ ++ /* BB might be helpful to save off the domain of server here */ ++ ++ if (pSMBr->hdr.Flags2 & SMBFLG2_EXT_SEC) { ++ if (pSMBr->ByteCount < 16) ++ rc = -EIO; ++ else if (pSMBr->ByteCount == 16) { ++ server->secType = RawNTLMSSP; ++ if (server->socketUseCount.counter > 1) { ++ if (memcmp ++ (server->server_GUID, ++ pSMBr->u.extended_response. ++ GUID, 16) != 0) { ++ cFYI(1, ++ ("UID of server does not match previous connection to same ip address")); ++ memcpy(server-> ++ server_GUID, ++ pSMBr->u. ++ extended_response. ++ GUID, 16); ++ } ++ } else ++ memcpy(server->server_GUID, ++ pSMBr->u.extended_response. ++ GUID, 16); ++ } else { ++ rc = decode_negTokenInit(pSMBr->u. ++ extended_response. ++ SecurityBlob, ++ pSMBr->ByteCount - ++ 16, &server->secType); ++ } ++ } else ++ server->capabilities &= ~CAP_EXTENDED_SECURITY; ++ if(sign_CIFS_PDUs == FALSE) { ++ if(server->secMode & SECMODE_SIGN_REQUIRED) ++ cERROR(1, ++ ("Server requires /proc/fs/cifs/PacketSigningEnabled")); ++ server->secMode &= ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED); ++ } else if(sign_CIFS_PDUs == 1) { ++ if((server->secMode & SECMODE_SIGN_REQUIRED) == 0) ++ server->secMode &= ~(SECMODE_SIGN_ENABLED | SECMODE_SIGN_REQUIRED); ++ } ++ ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ return rc; ++} ++ ++int ++CIFSSMBTDis(const int xid, struct cifsTconInfo *tcon) ++{ ++ struct smb_hdr *smb_buffer; ++ struct smb_hdr *smb_buffer_response; ++ int rc = 0; ++ int length; ++ ++ cFYI(1, ("In tree disconnect")); ++ /* ++ * If last user of the connection and ++ * connection alive - disconnect it ++ * If this is the last connection on the server session disconnect it ++ * (and inside session disconnect we should check if tcp socket needs ++ * to be freed and kernel thread woken up). ++ */ ++ if (tcon) ++ down(&tcon->tconSem); ++ else ++ return -EIO; ++ ++ atomic_dec(&tcon->useCount); ++ if (atomic_read(&tcon->useCount) > 0) { ++ up(&tcon->tconSem); ++ return -EBUSY; ++ } ++ ++ /* No need to return error on this operation if tid invalidated and ++ closed on server already e.g. due to tcp session crashing */ ++ if(tcon->tidStatus == CifsNeedReconnect) { ++ up(&tcon->tconSem); ++ return 0; ++ } ++ ++ if((tcon->ses == 0) || (tcon->ses->server == 0)) { ++ up(&tcon->tconSem); ++ return -EIO; ++ } ++ ++ rc = smb_init(SMB_COM_TREE_DISCONNECT, 0, tcon, ++ (void **) &smb_buffer, (void **) &smb_buffer_response); ++ if (rc) { ++ up(&tcon->tconSem); ++ return rc; ++ } ++ rc = SendReceive(xid, tcon->ses, smb_buffer, smb_buffer_response, ++ &length, 0); ++ if (rc) ++ cFYI(1, (" Tree disconnect failed %d", rc)); ++ ++ if (smb_buffer) ++ cifs_buf_release(smb_buffer); ++ up(&tcon->tconSem); ++ ++ /* No need to return error on this operation if tid invalidated and ++ closed on server already e.g. due to tcp session crashing */ ++ if (rc == -EAGAIN) ++ rc = 0; ++ ++ return rc; ++} ++ ++int ++CIFSSMBLogoff(const int xid, struct cifsSesInfo *ses) ++{ ++ struct smb_hdr *smb_buffer_response; ++ LOGOFF_ANDX_REQ *pSMB; ++ int rc = 0; ++ int length; ++ ++ cFYI(1, ("In SMBLogoff for session disconnect")); ++ if (ses) ++ down(&ses->sesSem); ++ else ++ return -EIO; ++ ++ atomic_dec(&ses->inUse); ++ if (atomic_read(&ses->inUse) > 0) { ++ up(&ses->sesSem); ++ return -EBUSY; ++ } ++ ++ rc = smb_init(SMB_COM_LOGOFF_ANDX, 2, NULL /* no tcon anymore */, ++ (void **) &pSMB, (void **) &smb_buffer_response); ++ ++ if(ses->server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) ++ pSMB->hdr.Flags2 |= SMBFLG2_SECURITY_SIGNATURE; ++ ++ if (rc) { ++ up(&ses->sesSem); ++ return rc; ++ } ++ ++ pSMB->hdr.Uid = ses->Suid; ++ ++ pSMB->AndXCommand = 0xFF; ++ rc = SendReceive(xid, ses, (struct smb_hdr *) pSMB, ++ smb_buffer_response, &length, 0); ++ if (ses->server) { ++ atomic_dec(&ses->server->socketUseCount); ++ if (atomic_read(&ses->server->socketUseCount) == 0) { ++ spin_lock(&GlobalMid_Lock); ++ ses->server->tcpStatus = CifsExiting; ++ spin_unlock(&GlobalMid_Lock); ++ rc = -ESHUTDOWN; ++ } ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ up(&ses->sesSem); ++ ++ /* if session dead then we do not need to do ulogoff, ++ since server closed smb session, no sense reporting ++ error */ ++ if (rc == -EAGAIN) ++ rc = 0; ++ return rc; ++} ++ ++int ++CIFSSMBDelFile(const int xid, struct cifsTconInfo *tcon, ++ const char *fileName, const struct nls_table *nls_codepage) ++{ ++ DELETE_FILE_REQ *pSMB = NULL; ++ DELETE_FILE_RSP *pSMBr = NULL; ++ int rc = 0; ++ int bytes_returned; ++ int name_len; ++ ++DelFileRetry: ++ rc = smb_init(SMB_COM_DELETE, 1, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->fileName, fileName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(fileName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->fileName, fileName, name_len); ++ } ++ pSMB->SearchAttributes = ++ cpu_to_le16(ATTR_READONLY | ATTR_HIDDEN | ATTR_SYSTEM); ++ pSMB->ByteCount = name_len + 1; ++ pSMB->BufferFormat = 0x04; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Error in RMFile = %d", rc)); ++ } ++#ifdef CONFIG_CIFS_STATS ++ else { ++ atomic_inc(&tcon->num_deletes); ++ } ++#endif ++ ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto DelFileRetry; ++ ++ return rc; ++} ++ ++int ++CIFSSMBRmDir(const int xid, struct cifsTconInfo *tcon, ++ const char *dirName, const struct nls_table *nls_codepage) ++{ ++ DELETE_DIRECTORY_REQ *pSMB = NULL; ++ DELETE_DIRECTORY_RSP *pSMBr = NULL; ++ int rc = 0; ++ int bytes_returned; ++ int name_len; ++ ++ cFYI(1, ("In CIFSSMBRmDir")); ++RmDirRetry: ++ rc = smb_init(SMB_COM_DELETE_DIRECTORY, 0, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = cifs_strtoUCS((wchar_t *) pSMB->DirName, dirName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(dirName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->DirName, dirName, name_len); ++ } ++ ++ pSMB->ByteCount = name_len + 1; ++ pSMB->BufferFormat = 0x04; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Error in RMDir = %d", rc)); ++ } ++#ifdef CONFIG_CIFS_STATS ++ else { ++ atomic_inc(&tcon->num_rmdirs); ++ } ++#endif ++ ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto RmDirRetry; ++ return rc; ++} ++ ++int ++CIFSSMBMkDir(const int xid, struct cifsTconInfo *tcon, ++ const char *name, const struct nls_table *nls_codepage) ++{ ++ int rc = 0; ++ CREATE_DIRECTORY_REQ *pSMB = NULL; ++ CREATE_DIRECTORY_RSP *pSMBr = NULL; ++ int bytes_returned; ++ int name_len; ++ ++ cFYI(1, ("In CIFSSMBMkDir")); ++MkDirRetry: ++ rc = smb_init(SMB_COM_CREATE_DIRECTORY, 0, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = cifs_strtoUCS((wchar_t *) pSMB->DirName, name, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(name, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->DirName, name, name_len); ++ } ++ ++ pSMB->ByteCount = name_len + 1 /* for buf format */ ; ++ pSMB->BufferFormat = 0x04; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Error in Mkdir = %d", rc)); ++ } ++#ifdef CONFIG_CIFS_STATS ++ else { ++ atomic_inc(&tcon->num_mkdirs); ++ } ++#endif ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto MkDirRetry; ++ return rc; ++} ++ ++int ++CIFSSMBOpen(const int xid, struct cifsTconInfo *tcon, ++ const char *fileName, const int openDisposition, ++ const int access_flags, const int create_options, __u16 * netfid, ++ int *pOplock, FILE_ALL_INFO * pfile_info, ++ const struct nls_table *nls_codepage) ++{ ++ int rc = -EACCES; ++ OPEN_REQ *pSMB = NULL; ++ OPEN_RSP *pSMBr = NULL; ++ int bytes_returned; ++ int name_len; ++ ++openRetry: ++ rc = smb_init(SMB_COM_NT_CREATE_ANDX, 24, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->AndXCommand = 0xFF; /* none */ ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ pSMB->ByteCount = 1; /* account for one byte pad to word boundary */ ++ name_len = ++ cifs_strtoUCS((wchar_t *) (pSMB->fileName + 1), ++ fileName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ pSMB->NameLength = cpu_to_le16(name_len); ++ } else { /* BB improve the check for buffer overruns BB */ ++ pSMB->ByteCount = 0; /* no pad */ ++ name_len = strnlen(fileName, 530); ++ name_len++; /* trailing null */ ++ pSMB->NameLength = cpu_to_le16(name_len); ++ strncpy(pSMB->fileName, fileName, name_len); ++ } ++ if (*pOplock & REQ_OPLOCK) ++ pSMB->OpenFlags = cpu_to_le32(REQ_OPLOCK); ++ else if (*pOplock & REQ_BATCHOPLOCK) { ++ pSMB->OpenFlags = cpu_to_le32(REQ_BATCHOPLOCK); ++ } ++ pSMB->DesiredAccess = cpu_to_le32(access_flags); ++ pSMB->AllocationSize = 0; ++ pSMB->FileAttributes = ATTR_NORMAL; ++ /* XP does not handle ATTR_POSIX_SEMANTICS */ ++ /* but it helps speed up case sensitive checks for other ++ servers such as Samba */ ++ if (tcon->ses->capabilities & CAP_UNIX) ++ pSMB->FileAttributes |= ATTR_POSIX_SEMANTICS; ++ ++ /* if ((omode & S_IWUGO) == 0) ++ pSMB->FileAttributes |= ATTR_READONLY;*/ ++ /* Above line causes problems due to vfs splitting create into two ++ pieces - need to set mode after file created not while it is ++ being created */ ++ pSMB->FileAttributes = cpu_to_le32(pSMB->FileAttributes); ++ pSMB->ShareAccess = cpu_to_le32(FILE_SHARE_ALL); ++ pSMB->CreateDisposition = cpu_to_le32(openDisposition); ++ pSMB->CreateOptions = cpu_to_le32(create_options); ++ pSMB->ImpersonationLevel = cpu_to_le32(SECURITY_IMPERSONATION); /* BB ??*/ ++ pSMB->SecurityFlags = ++ cpu_to_le32(SECURITY_CONTEXT_TRACKING | SECURITY_EFFECTIVE_ONLY); ++ ++ pSMB->ByteCount += name_len; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ /* long_op set to 1 to allow for oplock break timeouts */ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 1); ++ if (rc) { ++ cFYI(1, ("Error in Open = %d", rc)); ++ } else { ++ *pOplock = pSMBr->OplockLevel; /* one byte no need to le_to_cpu */ ++ *netfid = pSMBr->Fid; /* cifs fid stays in le */ ++ /* Let caller know file was created so we can set the mode. */ ++ /* Do we care about the CreateAction in any other cases? */ ++ if(cpu_to_le32(FILE_CREATE) == pSMBr->CreateAction) ++ *pOplock |= CIFS_CREATE_ACTION; ++ if(pfile_info) { ++ memcpy((char *)pfile_info,(char *)&pSMBr->CreationTime, ++ 36 /* CreationTime to Attributes */); ++ /* the file_info buf is endian converted by caller */ ++ pfile_info->AllocationSize = pSMBr->AllocationSize; ++ pfile_info->EndOfFile = pSMBr->EndOfFile; ++ pfile_info->NumberOfLinks = cpu_to_le32(1); ++ } ++ ++#ifdef CONFIG_CIFS_STATS ++ atomic_inc(&tcon->num_opens); ++#endif ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto openRetry; ++ return rc; ++} ++ ++/* If no buffer passed in, then caller wants to do the copy ++ as in the case of readpages so the SMB buffer must be ++ freed by the caller */ ++ ++int ++CIFSSMBRead(const int xid, struct cifsTconInfo *tcon, ++ const int netfid, const unsigned int count, ++ const __u64 lseek, unsigned int *nbytes, char **buf) ++{ ++ int rc = -EACCES; ++ READ_REQ *pSMB = NULL; ++ READ_RSP *pSMBr = NULL; ++ char *pReadData = NULL; ++ int bytes_returned; ++ ++ *nbytes = 0; ++ rc = smb_init(SMB_COM_READ_ANDX, 12, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ /* tcon and ses pointer are checked in smb_init */ ++ if (tcon->ses->server == NULL) ++ return -ECONNABORTED; ++ ++ pSMB->AndXCommand = 0xFF; /* none */ ++ pSMB->Fid = netfid; ++ pSMB->OffsetLow = cpu_to_le32(lseek & 0xFFFFFFFF); ++ pSMB->OffsetHigh = cpu_to_le32(lseek >> 32); ++ pSMB->Remaining = 0; ++ pSMB->MaxCount = cpu_to_le16(count); ++ pSMB->MaxCountHigh = 0; ++ pSMB->ByteCount = 0; /* no need to do le conversion since it is 0 */ ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cERROR(1, ("Send error in read = %d", rc)); ++ } else { ++ pSMBr->DataLength = le16_to_cpu(pSMBr->DataLength); ++ *nbytes = pSMBr->DataLength; ++ /*check that DataLength would not go beyond end of SMB */ ++ if ((pSMBr->DataLength > CIFS_MAX_MSGSIZE) ++ || (pSMBr->DataLength > count)) { ++ cFYI(1,("bad length %d for count %d",pSMBr->DataLength,count)); ++ rc = -EIO; ++ *nbytes = 0; ++ } else { ++ pReadData = ++ (char *) (&pSMBr->hdr.Protocol) + ++ le16_to_cpu(pSMBr->DataOffset); ++/* if(rc = copy_to_user(buf, pReadData, pSMBr->DataLength)) { ++ cERROR(1,("Faulting on read rc = %d",rc)); ++ rc = -EFAULT; ++ }*/ /* can not use copy_to_user when using page cache*/ ++ if(*buf) ++ memcpy(*buf,pReadData,pSMBr->DataLength); ++ } ++ } ++ if (pSMB) { ++ if(*buf) ++ cifs_buf_release(pSMB); ++ else ++ *buf = (char *)pSMB; ++ } ++ ++ /* Note: On -EAGAIN error only caller can retry on handle based calls ++ since file handle passed in no longer valid */ ++ return rc; ++} ++ ++int ++CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon, ++ const int netfid, const unsigned int count, ++ const __u64 offset, unsigned int *nbytes, const char *buf, ++ const int long_op) ++{ ++ int rc = -EACCES; ++ WRITE_REQ *pSMB = NULL; ++ WRITE_RSP *pSMBr = NULL; ++ int bytes_returned; ++ ++ rc = smb_init(SMB_COM_WRITE_ANDX, 14, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ /* tcon and ses pointer are checked in smb_init */ ++ if (tcon->ses->server == NULL) ++ return -ECONNABORTED; ++ ++ pSMB->AndXCommand = 0xFF; /* none */ ++ pSMB->Fid = netfid; ++ pSMB->OffsetLow = cpu_to_le32(offset & 0xFFFFFFFF); ++ pSMB->OffsetHigh = cpu_to_le32(offset >> 32); ++ pSMB->Remaining = 0; ++ if (count > ((tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE) & 0xFFFFFF00)) ++ pSMB->DataLengthLow = ++ (tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE) & 0xFFFFFF00; ++ else ++ pSMB->DataLengthLow = count; ++ pSMB->DataLengthHigh = 0; ++ pSMB->DataOffset = ++ cpu_to_le16(offsetof(struct smb_com_write_req,Data) - 4); ++ ++ memcpy(pSMB->Data,buf,pSMB->DataLengthLow); ++ ++ pSMB->ByteCount += pSMB->DataLengthLow + 1 /* pad */ ; ++ pSMB->DataLengthLow = cpu_to_le16(pSMB->DataLengthLow); ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, long_op); ++ if (rc) { ++ cFYI(1, ("Send error in write = %d", rc)); ++ *nbytes = 0; ++ } else ++ *nbytes = le16_to_cpu(pSMBr->Count); ++ ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ /* Note: On -EAGAIN error only caller can retry on handle based calls ++ since file handle passed in no longer valid */ ++ ++ return rc; ++} ++ ++int ++CIFSSMBLock(const int xid, struct cifsTconInfo *tcon, ++ const __u16 smb_file_id, const __u64 len, ++ const __u64 offset, const __u32 numUnlock, ++ const __u32 numLock, const __u8 lockType, const int waitFlag) ++{ ++ int rc = 0; ++ LOCK_REQ *pSMB = NULL; ++ LOCK_RSP *pSMBr = NULL; ++ int bytes_returned; ++ int timeout = 0; ++ __u64 temp; ++ ++ cFYI(1, ("In CIFSSMBLock - timeout %d numLock %d",waitFlag,numLock)); ++ rc = smb_init(SMB_COM_LOCKING_ANDX, 8, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if(lockType == LOCKING_ANDX_OPLOCK_RELEASE) { ++ timeout = -1; /* no response expected */ ++ pSMB->Timeout = 0; ++ } else if (waitFlag == TRUE) { ++ timeout = 3; /* blocking operation, no timeout */ ++ pSMB->Timeout = -1; /* blocking - do not time out */ ++ } else { ++ pSMB->Timeout = 0; ++ } ++ ++ pSMB->NumberOfLocks = cpu_to_le32(numLock); ++ pSMB->NumberOfUnlocks = cpu_to_le32(numUnlock); ++ pSMB->LockType = lockType; ++ pSMB->AndXCommand = 0xFF; /* none */ ++ pSMB->Fid = smb_file_id; /* netfid stays le */ ++ ++ if(numLock != 0) { ++ pSMB->Locks[0].Pid = cpu_to_le16(current->tgid); ++ /* BB where to store pid high? */ ++ temp = cpu_to_le64(len); ++ pSMB->Locks[0].LengthLow = (__u32)(temp & 0xFFFFFFFF); ++ pSMB->Locks[0].LengthHigh = (__u32)(temp>>32); ++ temp = cpu_to_le64(offset); ++ pSMB->Locks[0].OffsetLow = (__u32)(temp & 0xFFFFFFFF); ++ pSMB->Locks[0].OffsetHigh = (__u32)(temp>>32); ++ pSMB->ByteCount = sizeof (LOCKING_ANDX_RANGE); ++ } else { ++ /* oplock break */ ++ pSMB->ByteCount = 0; ++ } ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, timeout); ++ ++ if (rc) { ++ cFYI(1, ("Send error in Lock = %d", rc)); ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ /* Note: On -EAGAIN error only caller can retry on handle based calls ++ since file handle passed in no longer valid */ ++ return rc; ++} ++ ++int ++CIFSSMBClose(const int xid, struct cifsTconInfo *tcon, int smb_file_id) ++{ ++ int rc = 0; ++ CLOSE_REQ *pSMB = NULL; ++ CLOSE_RSP *pSMBr = NULL; ++ int bytes_returned; ++ cFYI(1, ("In CIFSSMBClose")); ++ ++/* do not retry on dead session on close */ ++ rc = smb_init(SMB_COM_CLOSE, 3, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if(rc == -EAGAIN) ++ return 0; ++ if (rc) ++ return rc; ++ ++ pSMB->FileID = (__u16) smb_file_id; ++ pSMB->LastWriteTime = 0; ++ pSMB->ByteCount = 0; ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ if(rc!=-EINTR) { ++ /* EINTR is expected when user ctl-c to kill app */ ++ cERROR(1, ("Send error in Close = %d", rc)); ++ } ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ /* Since session is dead, file will be closed on server already */ ++ if(rc == -EAGAIN) ++ rc = 0; ++ ++ return rc; ++} ++ ++int ++CIFSSMBRename(const int xid, struct cifsTconInfo *tcon, ++ const char *fromName, const char *toName, ++ const struct nls_table *nls_codepage) ++{ ++ int rc = 0; ++ RENAME_REQ *pSMB = NULL; ++ RENAME_RSP *pSMBr = NULL; ++ int bytes_returned; ++ int name_len, name_len2; ++ ++ cFYI(1, ("In CIFSSMBRename")); ++renameRetry: ++ rc = smb_init(SMB_COM_RENAME, 1, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->BufferFormat = 0x04; ++ pSMB->SearchAttributes = ++ cpu_to_le16(ATTR_READONLY | ATTR_HIDDEN | ATTR_SYSTEM | ++ ATTR_DIRECTORY); ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->OldFileName, fromName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ pSMB->OldFileName[name_len] = 0x04; /* pad */ ++ /* protocol requires ASCII signature byte on Unicode string */ ++ pSMB->OldFileName[name_len + 1] = 0x00; ++ name_len2 = ++ cifs_strtoUCS((wchar_t *) & pSMB-> ++ OldFileName[name_len + 2], toName, 530, ++ nls_codepage); ++ name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ; ++ name_len2 *= 2; /* convert to bytes */ ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(fromName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->OldFileName, fromName, name_len); ++ name_len2 = strnlen(toName, 530); ++ name_len2++; /* trailing null */ ++ pSMB->OldFileName[name_len] = 0x04; /* 2nd buffer format */ ++ strncpy(&pSMB->OldFileName[name_len + 1], toName, name_len2); ++ name_len2++; /* trailing null */ ++ name_len2++; /* signature byte */ ++ } ++ ++ pSMB->ByteCount = 1 /* 1st signature byte */ + name_len + name_len2; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Send error in rename = %d", rc)); ++ } ++ ++#ifdef CONFIG_CIFS_STATS ++ else { ++ atomic_inc(&tcon->num_renames); ++ } ++#endif ++ ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ if (rc == -EAGAIN) ++ goto renameRetry; ++ ++ return rc; ++} ++ ++int CIFSSMBRenameOpenFile(const int xid,struct cifsTconInfo *pTcon, ++ int netfid, char * target_name, const struct nls_table * nls_codepage) ++{ ++ struct smb_com_transaction2_sfi_req *pSMB = NULL; ++ struct smb_com_transaction2_sfi_rsp *pSMBr = NULL; ++ struct set_file_rename * rename_info; ++ char *data_offset; ++ char dummy_string[30]; ++ int rc = 0; ++ int bytes_returned = 0; ++ int len_of_str; ++ ++ cFYI(1, ("Rename to File by handle")); ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, pTcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->ParameterCount = 6; ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = offsetof(struct smb_com_transaction2_sfi_req, ++ Fid) - 4; ++ pSMB->DataOffset = pSMB->ParameterOffset + pSMB->ParameterCount; ++ ++ data_offset = (char *) (&pSMB->hdr.Protocol) + pSMB->DataOffset; ++ rename_info = (struct set_file_rename *) data_offset; ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB PDU from sess */ ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION); ++ pSMB->ByteCount = 3 /* pad */ + pSMB->ParameterCount; ++ pSMB->ParameterCount = cpu_to_le16(pSMB->ParameterCount); ++ pSMB->TotalParameterCount = pSMB->ParameterCount; ++ pSMB->ParameterOffset = cpu_to_le16(pSMB->ParameterOffset); ++ pSMB->DataOffset = cpu_to_le16(pSMB->DataOffset); ++ /* construct random name ".cifs_tmp<inodenum><mid>" */ ++ rename_info->overwrite = cpu_to_le32(1); ++ rename_info->root_fid = 0; ++ /* unicode only call */ ++ if(target_name == NULL) { ++ sprintf(dummy_string,"cifs%x",pSMB->hdr.Mid); ++ len_of_str = cifs_strtoUCS((wchar_t *) rename_info->target_name, dummy_string, 24, nls_codepage); ++ } else { ++ len_of_str = cifs_strtoUCS((wchar_t *) rename_info->target_name, target_name, 530, nls_codepage); ++ } ++ rename_info->target_name_len = cpu_to_le32(2 * len_of_str); ++ pSMB->DataCount = 12 /* sizeof(struct set_file_rename) */ + (2 * len_of_str) + 2; ++ pSMB->ByteCount += pSMB->DataCount; ++ pSMB->DataCount = cpu_to_le16(pSMB->DataCount); ++ pSMB->TotalDataCount = pSMB->DataCount; ++ pSMB->Fid = netfid; ++ pSMB->InformationLevel = ++ cpu_to_le16(SMB_SET_FILE_RENAME_INFORMATION); ++ pSMB->Reserved4 = 0; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ rc = SendReceive(xid, pTcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1,("Send error in Rename (by file handle) = %d", rc)); ++ } ++#ifdef CONFIG_CIFS_STATS ++ else { ++ atomic_inc(&pTcon->num_t2renames); ++ } ++#endif ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ /* Note: On -EAGAIN error only caller can retry on handle based calls ++ since file handle passed in no longer valid */ ++ ++ return rc; ++} ++ ++int ++CIFSSMBCopy(const int xid, struct cifsTconInfo *tcon, const char * fromName, ++ const __u16 target_tid, const char *toName, const int flags, ++ const struct nls_table *nls_codepage) ++{ ++ int rc = 0; ++ COPY_REQ *pSMB = NULL; ++ COPY_RSP *pSMBr = NULL; ++ int bytes_returned; ++ int name_len, name_len2; ++ ++ cFYI(1, ("In CIFSSMBCopy")); ++copyRetry: ++ rc = smb_init(SMB_COM_COPY, 1, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->BufferFormat = 0x04; ++ pSMB->Tid2 = target_tid; ++ ++ if(flags & COPY_TREE) ++ pSMB->Flags |= COPY_TREE; ++ pSMB->Flags = cpu_to_le16(pSMB->Flags); ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = cifs_strtoUCS((wchar_t *) pSMB->OldFileName, ++ fromName, ++ 530 /* find define for this maxpathcomponent */, ++ nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ pSMB->OldFileName[name_len] = 0x04; /* pad */ ++ /* protocol requires ASCII signature byte on Unicode string */ ++ pSMB->OldFileName[name_len + 1] = 0x00; ++ name_len2 = cifs_strtoUCS((wchar_t *) & pSMB-> ++ OldFileName[name_len + 2], toName, 530, ++ nls_codepage); ++ name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ; ++ name_len2 *= 2; /* convert to bytes */ ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(fromName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->OldFileName, fromName, name_len); ++ name_len2 = strnlen(toName, 530); ++ name_len2++; /* trailing null */ ++ pSMB->OldFileName[name_len] = 0x04; /* 2nd buffer format */ ++ strncpy(&pSMB->OldFileName[name_len + 1], toName, name_len2); ++ name_len2++; /* trailing null */ ++ name_len2++; /* signature byte */ ++ } ++ ++ pSMB->ByteCount = 1 /* 1st signature byte */ + name_len + name_len2; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Send error in copy = %d with %d files copied", ++ rc, pSMBr->CopyCount)); ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ if (rc == -EAGAIN) ++ goto copyRetry; ++ ++ return rc; ++} ++ ++int ++CIFSUnixCreateSymLink(const int xid, struct cifsTconInfo *tcon, ++ const char *fromName, const char *toName, ++ const struct nls_table *nls_codepage) ++{ ++ TRANSACTION2_SPI_REQ *pSMB = NULL; ++ TRANSACTION2_SPI_RSP *pSMBr = NULL; ++ char *data_offset; ++ int name_len; ++ int name_len_target; ++ int rc = 0; ++ int bytes_returned = 0; ++ ++ cFYI(1, ("In Symlink Unix style")); ++createSymLinkRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->FileName, fromName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(fromName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->FileName, fromName, name_len); ++ } ++ pSMB->ParameterCount = 6 + name_len; ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = offsetof(struct smb_com_transaction2_spi_req, ++ InformationLevel) - 4; ++ pSMB->DataOffset = pSMB->ParameterOffset + pSMB->ParameterCount; ++ ++ data_offset = (char *) (&pSMB->hdr.Protocol) + pSMB->DataOffset; ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len_target = ++ cifs_strtoUCS((wchar_t *) data_offset, toName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len_target++; /* trailing null */ ++ name_len_target *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len_target = strnlen(toName, 530); ++ name_len_target++; /* trailing null */ ++ strncpy(data_offset, toName, name_len_target); ++ } ++ ++ pSMB->DataCount = name_len_target; ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ /* BB find exact max on data count below from sess */ ++ pSMB->MaxDataCount = cpu_to_le16(1000); ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_SET_PATH_INFORMATION); ++ pSMB->ByteCount = 3 /* pad */ + pSMB->ParameterCount + pSMB->DataCount; ++ pSMB->DataCount = cpu_to_le16(pSMB->DataCount); ++ pSMB->ParameterCount = cpu_to_le16(pSMB->ParameterCount); ++ pSMB->TotalDataCount = pSMB->DataCount; ++ pSMB->TotalParameterCount = pSMB->ParameterCount; ++ pSMB->ParameterOffset = cpu_to_le16(pSMB->ParameterOffset); ++ pSMB->DataOffset = cpu_to_le16(pSMB->DataOffset); ++ pSMB->InformationLevel = cpu_to_le16(SMB_SET_FILE_UNIX_LINK); ++ pSMB->Reserved4 = 0; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ++ ("Send error in SetPathInfo (create symlink) = %d", ++ rc)); ++ } ++ ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ if (rc == -EAGAIN) ++ goto createSymLinkRetry; ++ ++ return rc; ++} ++ ++int ++CIFSUnixCreateHardLink(const int xid, struct cifsTconInfo *tcon, ++ const char *fromName, const char *toName, ++ const struct nls_table *nls_codepage) ++{ ++ TRANSACTION2_SPI_REQ *pSMB = NULL; ++ TRANSACTION2_SPI_RSP *pSMBr = NULL; ++ char *data_offset; ++ int name_len; ++ int name_len_target; ++ int rc = 0; ++ int bytes_returned = 0; ++ ++ cFYI(1, ("In Create Hard link Unix style")); ++createHardLinkRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = cifs_strtoUCS((wchar_t *) pSMB->FileName, toName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(toName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->FileName, toName, name_len); ++ } ++ pSMB->ParameterCount = 6 + name_len; ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = offsetof(struct smb_com_transaction2_spi_req, ++ InformationLevel) - 4; ++ pSMB->DataOffset = pSMB->ParameterOffset + pSMB->ParameterCount; ++ ++ data_offset = (char *) (&pSMB->hdr.Protocol) + pSMB->DataOffset; ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len_target = ++ cifs_strtoUCS((wchar_t *) data_offset, fromName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len_target++; /* trailing null */ ++ name_len_target *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len_target = strnlen(fromName, 530); ++ name_len_target++; /* trailing null */ ++ strncpy(data_offset, fromName, name_len_target); ++ } ++ ++ pSMB->DataCount = name_len_target; ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ /* BB find exact max on data count below from sess*/ ++ pSMB->MaxDataCount = cpu_to_le16(1000); ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_SET_PATH_INFORMATION); ++ pSMB->ByteCount = 3 /* pad */ + pSMB->ParameterCount + pSMB->DataCount; ++ pSMB->ParameterCount = cpu_to_le16(pSMB->ParameterCount); ++ pSMB->TotalParameterCount = pSMB->ParameterCount; ++ pSMB->DataCount = cpu_to_le16(pSMB->DataCount); ++ pSMB->TotalDataCount = pSMB->DataCount; ++ pSMB->ParameterOffset = cpu_to_le16(pSMB->ParameterOffset); ++ pSMB->DataOffset = cpu_to_le16(pSMB->DataOffset); ++ pSMB->InformationLevel = cpu_to_le16(SMB_SET_FILE_UNIX_HLINK); ++ pSMB->Reserved4 = 0; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Send error in SetPathInfo (hard link) = %d", rc)); ++ } ++ ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto createHardLinkRetry; ++ ++ return rc; ++} ++ ++int ++CIFSCreateHardLink(const int xid, struct cifsTconInfo *tcon, ++ const char *fromName, const char *toName, ++ const struct nls_table *nls_codepage) ++{ ++ int rc = 0; ++ NT_RENAME_REQ *pSMB = NULL; ++ RENAME_RSP *pSMBr = NULL; ++ int bytes_returned; ++ int name_len, name_len2; ++ ++ cFYI(1, ("In CIFSCreateHardLink")); ++winCreateHardLinkRetry: ++ ++ rc = smb_init(SMB_COM_NT_RENAME, 4, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->SearchAttributes = ++ cpu_to_le16(ATTR_READONLY | ATTR_HIDDEN | ATTR_SYSTEM | ++ ATTR_DIRECTORY); ++ pSMB->Flags = cpu_to_le16(CREATE_HARD_LINK); ++ pSMB->ClusterCount = 0; ++ ++ pSMB->BufferFormat = 0x04; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->OldFileName, fromName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ pSMB->OldFileName[name_len] = 0; /* pad */ ++ pSMB->OldFileName[name_len + 1] = 0x04; ++ name_len2 = ++ cifs_strtoUCS((wchar_t *) & pSMB-> ++ OldFileName[name_len + 2], toName, 530, ++ nls_codepage); ++ name_len2 += 1 /* trailing null */ + 1 /* Signature word */ ; ++ name_len2 *= 2; /* convert to bytes */ ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(fromName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->OldFileName, fromName, name_len); ++ name_len2 = strnlen(toName, 530); ++ name_len2++; /* trailing null */ ++ pSMB->OldFileName[name_len] = 0x04; /* 2nd buffer format */ ++ strncpy(&pSMB->OldFileName[name_len + 1], toName, name_len2); ++ name_len2++; /* trailing null */ ++ name_len2++; /* signature byte */ ++ } ++ ++ pSMB->ByteCount = 1 /* string type byte */ + name_len + name_len2; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Send error in hard link (NT rename) = %d", rc)); ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto winCreateHardLinkRetry; ++ ++ return rc; ++} ++ ++int ++CIFSSMBUnixQuerySymLink(const int xid, struct cifsTconInfo *tcon, ++ const unsigned char *searchName, ++ char *symlinkinfo, const int buflen, ++ const struct nls_table *nls_codepage) ++{ ++/* SMB_QUERY_FILE_UNIX_LINK */ ++ TRANSACTION2_QPI_REQ *pSMB = NULL; ++ TRANSACTION2_QPI_RSP *pSMBr = NULL; ++ int rc = 0; ++ int bytes_returned; ++ int name_len; ++ ++ cFYI(1, ("In QPathSymLinkInfo (Unix) for path %s", searchName)); ++ ++querySymLinkRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->FileName, searchName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(searchName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->FileName, searchName, name_len); ++ } ++ ++ pSMB->TotalParameterCount = ++ 2 /* level */ + 4 /* rsrvd */ + name_len /* incl null */ ; ++ pSMB->TotalDataCount = 0; ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ /* BB find exact max data count below from sess structure BB */ ++ pSMB->MaxDataCount = cpu_to_le16(4000); ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = cpu_to_le16(offsetof( ++ struct smb_com_transaction2_qpi_req ,InformationLevel) - 4); ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_PATH_INFORMATION); ++ pSMB->ByteCount = pSMB->TotalParameterCount + 1 /* pad */ ; ++ pSMB->TotalParameterCount = cpu_to_le16(pSMB->TotalParameterCount); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_FILE_UNIX_LINK); ++ pSMB->Reserved4 = 0; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Send error in QuerySymLinkInfo = %d", rc)); ++ } else { /* decode response */ ++ pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset); ++ pSMBr->DataCount = le16_to_cpu(pSMBr->DataCount); ++ if ((pSMBr->ByteCount < 2) || (pSMBr->DataOffset > 512)) ++ /* BB also check enough total bytes returned */ ++ rc = -EIO; /* bad smb */ ++ else { ++ if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = UniStrnlen((wchar_t *) ((char *) ++ &pSMBr->hdr.Protocol +pSMBr->DataOffset), ++ min_t(const int, buflen,pSMBr->DataCount) / 2); ++ cifs_strfromUCS_le(symlinkinfo, ++ (wchar_t *) ((char *)&pSMBr->hdr.Protocol + ++ pSMBr->DataOffset), ++ name_len, nls_codepage); ++ } else { ++ strncpy(symlinkinfo, ++ (char *) &pSMBr->hdr.Protocol + ++ pSMBr->DataOffset, ++ min_t(const int, buflen, pSMBr->DataCount)); ++ } ++ symlinkinfo[buflen] = 0; ++ /* just in case so calling code does not go off the end of buffer */ ++ } ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto querySymLinkRetry; ++ return rc; ++} ++ ++ ++ ++int ++CIFSSMBQueryReparseLinkInfo(const int xid, struct cifsTconInfo *tcon, ++ const unsigned char *searchName, ++ char *symlinkinfo, const int buflen,__u16 fid, ++ const struct nls_table *nls_codepage) ++{ ++ int rc = 0; ++ int bytes_returned; ++ int name_len; ++ struct smb_com_transaction_ioctl_req * pSMB; ++ struct smb_com_transaction_ioctl_rsp * pSMBr; ++ ++ cFYI(1, ("In Windows reparse style QueryLink for path %s", searchName)); ++ rc = smb_init(SMB_COM_NT_TRANSACT, 23, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->TotalParameterCount = 0 ; ++ pSMB->TotalDataCount = 0; ++ pSMB->MaxParameterCount = cpu_to_le32(2); ++ /* BB find exact data count max from sess structure BB */ ++ pSMB->MaxDataCount = cpu_to_le32(4000); ++ pSMB->MaxSetupCount = 4; ++ pSMB->Reserved = 0; ++ pSMB->ParameterOffset = 0; ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 4; ++ pSMB->SubCommand = cpu_to_le16(NT_TRANSACT_IOCTL); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ pSMB->FunctionCode = cpu_to_le32(FSCTL_GET_REPARSE_POINT); ++ pSMB->IsFsctl = 1; /* FSCTL */ ++ pSMB->IsRootFlag = 0; ++ pSMB->Fid = fid; /* file handle always le */ ++ pSMB->ByteCount = 0; ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Send error in QueryReparseLinkInfo = %d", rc)); ++ } else { /* decode response */ ++ pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset); ++ pSMBr->DataCount = le16_to_cpu(pSMBr->DataCount); ++ if ((pSMBr->ByteCount < 2) || (pSMBr->DataOffset > 512)) ++ /* BB also check enough total bytes returned */ ++ rc = -EIO; /* bad smb */ ++ else { ++ if(pSMBr->DataCount && (pSMBr->DataCount < 2048)) { ++ /* could also validate reparse tag && better check name length */ ++ struct reparse_data * reparse_buf = (struct reparse_data *) ++ ((char *)&pSMBr->hdr.Protocol + pSMBr->DataOffset); ++ if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = UniStrnlen((wchar_t *) ++ (reparse_buf->LinkNamesBuf + ++ reparse_buf->TargetNameOffset), ++ min(buflen/2, reparse_buf->TargetNameLen / 2)); ++ cifs_strfromUCS_le(symlinkinfo, ++ (wchar_t *) (reparse_buf->LinkNamesBuf + ++ reparse_buf->TargetNameOffset), ++ name_len, nls_codepage); ++ } else { /* ASCII names */ ++ strncpy(symlinkinfo,reparse_buf->LinkNamesBuf + ++ reparse_buf->TargetNameOffset, ++ min_t(const int, buflen, reparse_buf->TargetNameLen)); ++ } ++ } else { ++ rc = -EIO; ++ cFYI(1,("Invalid return data count on get reparse info ioctl")); ++ } ++ symlinkinfo[buflen] = 0; /* just in case so the caller ++ does not go off the end of the buffer */ ++ cFYI(1,("readlink result - %s ",symlinkinfo)); ++ } ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ /* Note: On -EAGAIN error only caller can retry on handle based calls ++ since file handle passed in no longer valid */ ++ ++ return rc; ++} ++ ++int ++CIFSSMBQPathInfo(const int xid, struct cifsTconInfo *tcon, ++ const unsigned char *searchName, ++ FILE_ALL_INFO * pFindData, ++ const struct nls_table *nls_codepage) ++{ ++/* level 263 SMB_QUERY_FILE_ALL_INFO */ ++ TRANSACTION2_QPI_REQ *pSMB = NULL; ++ TRANSACTION2_QPI_RSP *pSMBr = NULL; ++ int rc = 0; ++ int bytes_returned; ++ int name_len; ++ ++ cFYI(1, ("In QPathInfo path %s", searchName)); ++QPathInfoRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->FileName, searchName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(searchName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->FileName, searchName, name_len); ++ } ++ ++ pSMB->TotalParameterCount = 2 /* level */ + 4 /* reserved */ + ++ name_len /* includes null */ ; ++ pSMB->TotalDataCount = 0; ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(4000); /* BB find exact max SMB PDU from sess structure BB */ ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = cpu_to_le16(offsetof( ++ struct smb_com_transaction2_qpi_req ,InformationLevel) - 4); ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_PATH_INFORMATION); ++ pSMB->ByteCount = pSMB->TotalParameterCount + 1 /* pad */ ; ++ pSMB->TotalParameterCount = cpu_to_le16(pSMB->TotalParameterCount); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_FILE_ALL_INFO); ++ pSMB->Reserved4 = 0; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Send error in QPathInfo = %d", rc)); ++ } else { /* decode response */ ++ pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset); ++ /* BB also check enough total bytes returned */ ++ /* BB we need to improve the validity checking ++ of these trans2 responses */ ++ if ((pSMBr->ByteCount < 40) || (pSMBr->DataOffset > 512)) ++ rc = -EIO; /* bad smb */ ++ else if (pFindData){ ++ memcpy((char *) pFindData, ++ (char *) &pSMBr->hdr.Protocol + ++ pSMBr->DataOffset, sizeof (FILE_ALL_INFO)); ++ } else ++ rc = -ENOMEM; ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto QPathInfoRetry; ++ ++ return rc; ++} ++ ++int ++CIFSSMBUnixQPathInfo(const int xid, struct cifsTconInfo *tcon, ++ const unsigned char *searchName, ++ FILE_UNIX_BASIC_INFO * pFindData, ++ const struct nls_table *nls_codepage) ++{ ++/* SMB_QUERY_FILE_UNIX_BASIC */ ++ TRANSACTION2_QPI_REQ *pSMB = NULL; ++ TRANSACTION2_QPI_RSP *pSMBr = NULL; ++ int rc = 0; ++ int bytes_returned = 0; ++ int name_len; ++ ++ cFYI(1, ("In QPathInfo (Unix) the path %s", searchName)); ++UnixQPathInfoRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->FileName, searchName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(searchName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->FileName, searchName, name_len); ++ } ++ ++ pSMB->TotalParameterCount = 2 /* level */ + 4 /* reserved */ + ++ name_len /* includes null */ ; ++ pSMB->TotalDataCount = 0; ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ /* BB find exact max SMB PDU from sess structure BB */ ++ pSMB->MaxDataCount = cpu_to_le16(4000); ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = cpu_to_le16(offsetof( ++ struct smb_com_transaction2_qpi_req ,InformationLevel) - 4); ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_PATH_INFORMATION); ++ pSMB->ByteCount = pSMB->TotalParameterCount + 1 /* pad */ ; ++ pSMB->TotalParameterCount = cpu_to_le16(pSMB->TotalParameterCount); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_FILE_UNIX_BASIC); ++ pSMB->Reserved4 = 0; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Send error in QPathInfo = %d", rc)); ++ } else { /* decode response */ ++ pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset); ++ /* BB also check if enough total bytes returned */ ++ if ((pSMBr->ByteCount < sizeof(FILE_UNIX_BASIC_INFO)) || ++ (pSMBr->DataOffset > 512) || ++ (pSMBr->DataOffset < sizeof(struct smb_hdr))) { ++ cFYI(1,("UnixQPathinfo invalid data offset %d bytes returned %d", ++ (int)pSMBr->DataOffset,bytes_returned)); ++ rc = -EIO; /* bad smb */ ++ } else { ++ memcpy((char *) pFindData, ++ (char *) &pSMBr->hdr.Protocol + ++ pSMBr->DataOffset, ++ sizeof (FILE_UNIX_BASIC_INFO)); ++ } ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto UnixQPathInfoRetry; ++ ++ return rc; ++} ++ ++int ++CIFSFindSingle(const int xid, struct cifsTconInfo *tcon, ++ const char *searchName, FILE_ALL_INFO * findData, ++ const struct nls_table *nls_codepage) ++{ ++/* level 257 SMB_ */ ++ TRANSACTION2_FFIRST_REQ *pSMB = NULL; ++ TRANSACTION2_FFIRST_RSP *pSMBr = NULL; ++ int rc = 0; ++ int bytes_returned; ++ int name_len; ++ ++ cFYI(1, ("In FindUnique")); ++findUniqueRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->FileName, searchName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(searchName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->FileName, searchName, name_len); ++ } ++ ++ pSMB->TotalParameterCount = 12 + name_len /* includes null */ ; ++ pSMB->TotalDataCount = 0; /* no EAs */ ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(4000); /* BB find exact max SMB PDU from sess structure BB */ ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = cpu_to_le16( ++ offsetof(struct smb_com_transaction2_ffirst_req,InformationLevel) - 4); ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 1; /* one byte, no need to le convert */ ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_FIND_FIRST); ++ pSMB->ByteCount = pSMB->TotalParameterCount + 1 /* pad */ ; ++ pSMB->TotalParameterCount = cpu_to_le16(pSMB->TotalDataCount); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ pSMB->SearchAttributes = ++ cpu_to_le16(ATTR_READONLY | ATTR_HIDDEN | ATTR_SYSTEM | ++ ATTR_DIRECTORY); ++ pSMB->SearchCount = cpu_to_le16(16); /* BB increase */ ++ pSMB->SearchFlags = cpu_to_le16(1); ++ pSMB->InformationLevel = cpu_to_le16(SMB_FIND_FILE_DIRECTORY_INFO); ++ pSMB->SearchStorageType = 0; /* BB what should we set this to? BB */ ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ ++ if (rc) { ++ cFYI(1, ("Send error in FindFileDirInfo = %d", rc)); ++ } else { /* decode response */ ++ ++ /* BB fill in */ ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto findUniqueRetry; ++ ++ return rc; ++} ++ ++int ++CIFSFindFirst(const int xid, struct cifsTconInfo *tcon, ++ const char *searchName, FILE_DIRECTORY_INFO * findData, ++ T2_FFIRST_RSP_PARMS * findParms, ++ const struct nls_table *nls_codepage, int *pUnicodeFlag, ++ int *pUnixFlag) ++{ ++/* level 257 SMB_ */ ++ TRANSACTION2_FFIRST_REQ *pSMB = NULL; ++ TRANSACTION2_FFIRST_RSP *pSMBr = NULL; ++ char *response_data; ++ int rc = 0; ++ int bytes_returned; ++ int name_len; ++ ++ cFYI(1, ("In FindFirst")); ++findFirstRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->FileName, searchName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(searchName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->FileName, searchName, name_len); ++ } ++ ++ pSMB->TotalParameterCount = 12 + name_len /* includes null */ ; ++ pSMB->TotalDataCount = 0; /* no EAs */ ++ pSMB->MaxParameterCount = cpu_to_le16(10); ++ pSMB->MaxDataCount = cpu_to_le16((tcon->ses->server->maxBuf - ++ MAX_CIFS_HDR_SIZE) & 0xFFFFFF00); ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ByteCount = pSMB->TotalParameterCount + 1 /* pad */ ; ++ pSMB->TotalParameterCount = cpu_to_le16(pSMB->TotalParameterCount); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ pSMB->ParameterOffset = cpu_to_le16(offsetof(struct ++ smb_com_transaction2_ffirst_req, SearchAttributes) - 4); ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 1; /* one byte no need to make endian neutral */ ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_FIND_FIRST); ++ pSMB->SearchAttributes = ++ cpu_to_le16(ATTR_READONLY | ATTR_HIDDEN | ATTR_SYSTEM | ++ ATTR_DIRECTORY); ++ pSMB->SearchCount = cpu_to_le16(CIFS_MAX_MSGSIZE / sizeof (FILE_DIRECTORY_INFO)); /* should this be shrunk even more ? */ ++ pSMB->SearchFlags = cpu_to_le16(CIFS_SEARCH_CLOSE_AT_END | CIFS_SEARCH_RETURN_RESUME); ++ ++ /* test for Unix extensions */ ++ if (tcon->ses->capabilities & CAP_UNIX) { ++ pSMB->InformationLevel = cpu_to_le16(SMB_FIND_FILE_UNIX); ++ *pUnixFlag = TRUE; ++ } else { ++ pSMB->InformationLevel = ++ cpu_to_le16(SMB_FIND_FILE_DIRECTORY_INFO); ++ *pUnixFlag = FALSE; ++ } ++ pSMB->SearchStorageType = 0; /* BB what should we set this to? It is not clear if it matters BB */ ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ ++ if (rc) { /* BB add logic to retry regular search if Unix search rejected unexpectedly by server */ ++ cFYI(1, ("Error in FindFirst = %d", rc)); ++ } else { /* decode response */ ++ /* BB add safety checks for these memcpys */ ++ if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) ++ *pUnicodeFlag = TRUE; ++ else ++ *pUnicodeFlag = FALSE; ++ memcpy(findParms, ++ (char *) &pSMBr->hdr.Protocol + ++ le16_to_cpu(pSMBr->ParameterOffset), ++ sizeof (T2_FFIRST_RSP_PARMS)); ++ /* search handle can stay LE and EAoffset not needed so not converted */ ++ findParms->EndofSearch = le16_to_cpu(findParms->EndofSearch); ++ findParms->LastNameOffset = ++ le16_to_cpu(findParms->LastNameOffset); ++ findParms->SearchCount = le16_to_cpu(findParms->SearchCount); ++ response_data = ++ (char *) &pSMBr->hdr.Protocol + ++ le16_to_cpu(pSMBr->DataOffset); ++ memcpy(findData, response_data, le16_to_cpu(pSMBr->DataCount)); ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ if (rc == -EAGAIN) ++ goto findFirstRetry; ++ ++ return rc; ++} ++ ++int ++CIFSFindNext(const int xid, struct cifsTconInfo *tcon, ++ FILE_DIRECTORY_INFO * findData, T2_FNEXT_RSP_PARMS * findParms, ++ const __u16 searchHandle, char * resume_file_name, int name_len, ++ __u32 resume_key, int *pUnicodeFlag, int *pUnixFlag) ++{ ++/* level 257 SMB_ */ ++ TRANSACTION2_FNEXT_REQ *pSMB = NULL; ++ TRANSACTION2_FNEXT_RSP *pSMBr = NULL; ++ char *response_data; ++ int rc = 0; ++ int bytes_returned; ++ ++ cFYI(1, ("In FindNext")); ++ ++ if(resume_file_name == NULL) { ++ return -EIO; ++ } ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->TotalParameterCount = 14; /* includes 2 bytes of null string, converted to LE below */ ++ pSMB->TotalDataCount = 0; /* no EAs */ ++ pSMB->MaxParameterCount = cpu_to_le16(8); ++ pSMB->MaxDataCount = ++ cpu_to_le16((tcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE) & 0xFFFFFF00); ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = cpu_to_le16(offsetof( ++ struct smb_com_transaction2_fnext_req,SearchHandle) - 4); ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_FIND_NEXT); ++ pSMB->SearchHandle = searchHandle; /* always kept as le */ ++ findParms->SearchCount = 0; /* set to zero in case of error */ ++ pSMB->SearchCount = ++ cpu_to_le16(CIFS_MAX_MSGSIZE / sizeof (FILE_DIRECTORY_INFO)); ++ /* test for Unix extensions */ ++ if (tcon->ses->capabilities & CAP_UNIX) { ++ pSMB->InformationLevel = cpu_to_le16(SMB_FIND_FILE_UNIX); ++ *pUnixFlag = TRUE; ++ } else { ++ pSMB->InformationLevel = ++ cpu_to_le16(SMB_FIND_FILE_DIRECTORY_INFO); ++ *pUnixFlag = FALSE; ++ } ++ pSMB->ResumeKey = resume_key; ++ pSMB->SearchFlags = ++ cpu_to_le16(CIFS_SEARCH_CLOSE_AT_END | CIFS_SEARCH_RETURN_RESUME); ++ /* BB add check to make sure we do not cross end of smb */ ++ if(name_len < CIFS_MAX_MSGSIZE) { ++ memcpy(pSMB->ResumeFileName, resume_file_name, name_len); ++ pSMB->ByteCount += name_len; ++ } ++ pSMB->TotalParameterCount += name_len; ++ pSMB->ByteCount = pSMB->TotalParameterCount + 1 /* pad */ ; ++ pSMB->TotalParameterCount = cpu_to_le16(pSMB->TotalParameterCount); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ /* BB improve error handling here */ ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ ++ if (rc) { ++ if (rc == -EBADF) ++ rc = 0; /* search probably was closed at end of search above */ ++ else ++ cFYI(1, ("FindNext returned = %d", rc)); ++ } else { /* decode response */ ++ /* BB add safety checks for these memcpys */ ++ if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) ++ *pUnicodeFlag = TRUE; ++ else ++ *pUnicodeFlag = FALSE; ++ memcpy(findParms, ++ (char *) &pSMBr->hdr.Protocol + ++ le16_to_cpu(pSMBr->ParameterOffset), ++ sizeof (T2_FNEXT_RSP_PARMS)); ++ findParms->EndofSearch = le16_to_cpu(findParms->EndofSearch); ++ findParms->LastNameOffset = ++ le16_to_cpu(findParms->LastNameOffset); ++ findParms->SearchCount = le16_to_cpu(findParms->SearchCount); ++ response_data = ++ (char *) &pSMBr->hdr.Protocol + ++ le16_to_cpu(pSMBr->DataOffset); ++ memcpy(findData, response_data, le16_to_cpu(pSMBr->DataCount)); ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ /* Note: On -EAGAIN error only caller can retry on handle based calls ++ since file handle passed in no longer valid */ ++ ++ return rc; ++} ++ ++int ++CIFSFindClose(const int xid, struct cifsTconInfo *tcon, const __u16 searchHandle) ++{ ++ int rc = 0; ++ FINDCLOSE_REQ *pSMB = NULL; ++ CLOSE_RSP *pSMBr = NULL; ++ int bytes_returned; ++ ++ cFYI(1, ("In CIFSSMBFindClose")); ++ rc = smb_init(SMB_COM_FIND_CLOSE2, 1, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ /* no sense returning error if session restarted ++ file handle has been closed */ ++ if(rc == -EAGAIN) ++ return 0; ++ if (rc) ++ return rc; ++ ++ pSMB->FileID = searchHandle; ++ pSMB->ByteCount = 0; ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cERROR(1, ("Send error in FindClose = %d", rc)); ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ /* Since session is dead, search handle closed on server already */ ++ if (rc == -EAGAIN) ++ rc = 0; ++ ++ return rc; ++} ++ ++int ++CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, ++ const unsigned char *searchName, ++ unsigned char **targetUNCs, ++ unsigned int *number_of_UNC_in_array, ++ const struct nls_table *nls_codepage) ++{ ++/* TRANS2_GET_DFS_REFERRAL */ ++ TRANSACTION2_GET_DFS_REFER_REQ *pSMB = NULL; ++ TRANSACTION2_GET_DFS_REFER_RSP *pSMBr = NULL; ++ struct dfs_referral_level_3 * referrals = NULL; ++ int rc = 0; ++ int bytes_returned; ++ int name_len; ++ unsigned int i; ++ char * temp; ++ *number_of_UNC_in_array = 0; ++ *targetUNCs = NULL; ++ ++ cFYI(1, ("In GetDFSRefer the path %s", searchName)); ++ if (ses == NULL) ++ return -ENODEV; ++getDFSRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, NULL, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->hdr.Tid = ses->ipc_tid; ++ pSMB->hdr.Uid = ses->Suid; ++ if (ses->capabilities & CAP_STATUS32) { ++ pSMB->hdr.Flags2 |= SMBFLG2_ERR_STATUS; ++ } ++ if (ses->capabilities & CAP_DFS) { ++ pSMB->hdr.Flags2 |= SMBFLG2_DFS; ++ } ++ ++ if (ses->capabilities & CAP_UNICODE) { ++ pSMB->hdr.Flags2 |= SMBFLG2_UNICODE; ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->RequestFileName, ++ searchName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(searchName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->RequestFileName, searchName, name_len); ++ } ++ ++ pSMB->ParameterCount = 2 /* level */ + name_len /*includes null */ ; ++ pSMB->TotalDataCount = 0; ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->MaxParameterCount = 0; ++ pSMB->MaxDataCount = cpu_to_le16(4000); /* BB find exact max SMB PDU from sess structure BB */ ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = cpu_to_le16(offsetof( ++ struct smb_com_transaction2_get_dfs_refer_req, MaxReferralLevel) - 4); ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_GET_DFS_REFERRAL); ++ pSMB->ByteCount = pSMB->ParameterCount + 3 /* pad */ ; ++ pSMB->ParameterCount = cpu_to_le16(pSMB->ParameterCount); ++ pSMB->TotalParameterCount = pSMB->ParameterCount; ++ pSMB->MaxReferralLevel = cpu_to_le16(3); ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Send error in GetDFSRefer = %d", rc)); ++ } else { /* decode response */ ++/* BB Add logic to parse referrals here */ ++ pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset); ++ pSMBr->DataCount = le16_to_cpu(pSMBr->DataCount); ++ cFYI(1, ++ ("Decoding GetDFSRefer response. BCC: %d Offset %d", ++ pSMBr->ByteCount, pSMBr->DataOffset)); ++ if ((pSMBr->ByteCount < 17) || (pSMBr->DataOffset > 512)) /* BB also check enough total bytes returned */ ++ rc = -EIO; /* bad smb */ ++ else { ++ referrals = ++ (struct dfs_referral_level_3 *) ++ (8 /* sizeof start of data block */ + ++ pSMBr->DataOffset + ++ (char *) &pSMBr->hdr.Protocol); ++ cFYI(1,("num_referrals: %d dfs flags: 0x%x ... \nfor referral one refer size: 0x%x srv type: 0x%x refer flags: 0x%x ttl: 0x%x",pSMBr->NumberOfReferrals,pSMBr->DFSFlags, referrals->ReferralSize,referrals->ServerType,referrals->ReferralFlags,referrals->TimeToLive)); ++ /* BB This field is actually two bytes in from start of ++ data block so we could do safety check that DataBlock ++ begins at address of pSMBr->NumberOfReferrals */ ++ *number_of_UNC_in_array = le16_to_cpu(pSMBr->NumberOfReferrals); ++ ++ /* BB Fix below so can return more than one referral */ ++ if(*number_of_UNC_in_array > 1) ++ *number_of_UNC_in_array = 1; ++ ++ /* get the length of the strings describing refs */ ++ name_len = 0; ++ for(i=0;i<*number_of_UNC_in_array;i++) { ++ /* make sure that DfsPathOffset not past end */ ++ referrals->DfsPathOffset = le16_to_cpu(referrals->DfsPathOffset); ++ if(referrals->DfsPathOffset > pSMBr->DataCount) { ++ /* if invalid referral, stop here and do ++ not try to copy any more */ ++ *number_of_UNC_in_array = i; ++ break; ++ } ++ temp = ((char *)referrals) + referrals->DfsPathOffset; ++ ++ if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len += UniStrnlen((wchar_t *)temp,pSMBr->DataCount); ++ } else { ++ name_len += strnlen(temp,pSMBr->DataCount); ++ } ++ referrals++; ++ /* BB add check that referral pointer does not fall off end PDU */ ++ ++ } ++ /* BB add check for name_len bigger than bcc */ ++ *targetUNCs = ++ kmalloc(name_len+1+ (*number_of_UNC_in_array),GFP_KERNEL); ++ /* copy the ref strings */ ++ referrals = ++ (struct dfs_referral_level_3 *) ++ (8 /* sizeof data hdr */ + ++ pSMBr->DataOffset + ++ (char *) &pSMBr->hdr.Protocol); ++ ++ for(i=0;i<*number_of_UNC_in_array;i++) { ++ temp = ((char *)referrals) + referrals->DfsPathOffset; ++ if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) { ++ cifs_strfromUCS_le(*targetUNCs, ++ (wchar_t *) temp, name_len, nls_codepage); ++ } else { ++ strncpy(*targetUNCs,temp,name_len); ++ } ++ /* BB update target_uncs pointers */ ++ referrals++; ++ } ++ temp = *targetUNCs; ++ temp[name_len] = 0; ++ } ++ ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ if (rc == -EAGAIN) ++ goto getDFSRetry; ++ ++ return rc; ++} ++ ++int ++CIFSSMBQFSInfo(const int xid, struct cifsTconInfo *tcon, ++ struct statfs *FSData, const struct nls_table *nls_codepage) ++{ ++/* level 0x103 SMB_QUERY_FILE_SYSTEM_INFO */ ++ TRANSACTION2_QFSI_REQ *pSMB = NULL; ++ TRANSACTION2_QFSI_RSP *pSMBr = NULL; ++ FILE_SYSTEM_INFO *response_data; ++ int rc = 0; ++ int bytes_returned = 0; ++ ++ cFYI(1, ("In QFSInfo")); ++QFSInfoRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->TotalParameterCount = 2; /* level */ ++ pSMB->TotalDataCount = 0; ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find exact max SMB PDU from sess structure BB */ ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ByteCount = pSMB->TotalParameterCount + 1 /* pad */ ; ++ pSMB->TotalParameterCount = cpu_to_le16(pSMB->TotalParameterCount); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ pSMB->ParameterOffset = cpu_to_le16(offsetof( ++ struct smb_com_transaction2_qfsi_req, InformationLevel) - 4); ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_FS_INFORMATION); ++ pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_FS_SIZE_INFO); ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cERROR(1, ("Send error in QFSInfo = %d", rc)); ++ } else { /* decode response */ ++ pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset); ++ cFYI(1, ++ ("Decoding qfsinfo response. BCC: %d Offset %d", ++ pSMBr->ByteCount, pSMBr->DataOffset)); ++ if ((pSMBr->ByteCount < 24) || (pSMBr->DataOffset > 512)) /* BB also check enough total bytes returned */ ++ rc = -EIO; /* bad smb */ ++ else { ++ response_data = ++ (FILE_SYSTEM_INFO ++ *) (((char *) &pSMBr->hdr.Protocol) + ++ pSMBr->DataOffset); ++ FSData->f_bsize = ++ le32_to_cpu(response_data->BytesPerSector) * ++ le32_to_cpu(response_data-> ++ SectorsPerAllocationUnit); ++ FSData->f_blocks = ++ le64_to_cpu(response_data->TotalAllocationUnits); ++ FSData->f_bfree = FSData->f_bavail = ++ le64_to_cpu(response_data->FreeAllocationUnits); ++ cFYI(1, ++ ("Blocks: %lld Free: %lld Block size %ld", ++ (unsigned long long)FSData->f_blocks, ++ (unsigned long long)FSData->f_bfree, ++ FSData->f_bsize)); ++ } ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ if (rc == -EAGAIN) ++ goto QFSInfoRetry; ++ ++ return rc; ++} ++ ++int ++CIFSSMBQFSAttributeInfo(int xid, struct cifsTconInfo *tcon, ++ const struct nls_table *nls_codepage) ++{ ++/* level 0x105 SMB_QUERY_FILE_SYSTEM_INFO */ ++ TRANSACTION2_QFSI_REQ *pSMB = NULL; ++ TRANSACTION2_QFSI_RSP *pSMBr = NULL; ++ FILE_SYSTEM_ATTRIBUTE_INFO *response_data; ++ int rc = 0; ++ int bytes_returned = 0; ++ ++ cFYI(1, ("In QFSAttributeInfo")); ++QFSAttributeRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->TotalParameterCount = 2; /* level */ ++ pSMB->TotalDataCount = 0; ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find exact max SMB PDU from sess structure BB */ ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ByteCount = pSMB->TotalParameterCount + 1 /* pad */ ; ++ pSMB->TotalParameterCount = cpu_to_le16(pSMB->TotalParameterCount); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ pSMB->ParameterOffset = cpu_to_le16(offsetof( ++ struct smb_com_transaction2_qfsi_req, InformationLevel) - 4); ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_FS_INFORMATION); ++ pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_FS_ATTRIBUTE_INFO); ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cERROR(1, ("Send error in QFSAttributeInfo = %d", rc)); ++ } else { /* decode response */ ++ pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset); ++ if ((pSMBr->ByteCount < 13) || (pSMBr->DataOffset > 512)) { /* BB also check enough bytes returned */ ++ rc = -EIO; /* bad smb */ ++ } else { ++ response_data = ++ (FILE_SYSTEM_ATTRIBUTE_INFO ++ *) (((char *) &pSMBr->hdr.Protocol) + ++ pSMBr->DataOffset); ++ response_data->Attributes = le32_to_cpu(response_data->Attributes); ++ response_data->MaxPathNameComponentLength = ++ le32_to_cpu(response_data->MaxPathNameComponentLength); ++ response_data->FileSystemNameLen = ++ le32_to_cpu(response_data->FileSystemNameLen); ++ memcpy(&tcon->fsAttrInfo, response_data, ++ sizeof (FILE_SYSTEM_ATTRIBUTE_INFO)); ++ } ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ if (rc == -EAGAIN) ++ goto QFSAttributeRetry; ++ ++ return rc; ++} ++ ++int ++CIFSSMBQFSDeviceInfo(int xid, struct cifsTconInfo *tcon, ++ const struct nls_table *nls_codepage) ++{ ++/* level 0x104 SMB_QUERY_FILE_SYSTEM_INFO */ ++ TRANSACTION2_QFSI_REQ *pSMB = NULL; ++ TRANSACTION2_QFSI_RSP *pSMBr = NULL; ++ FILE_SYSTEM_DEVICE_INFO *response_data; ++ int rc = 0; ++ int bytes_returned = 0; ++ ++ cFYI(1, ("In QFSDeviceInfo")); ++QFSDeviceRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->TotalParameterCount = 2; /* level */ ++ pSMB->TotalDataCount = 0; ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find exact max SMB PDU from sess structure BB */ ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ByteCount = pSMB->TotalParameterCount + 1 /* pad */ ; ++ pSMB->TotalParameterCount = cpu_to_le16(pSMB->TotalParameterCount); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ pSMB->ParameterOffset = cpu_to_le16(offsetof( ++ struct smb_com_transaction2_qfsi_req, InformationLevel) - 4); ++ ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_FS_INFORMATION); ++ pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_FS_DEVICE_INFO); ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Send error in QFSDeviceInfo = %d", rc)); ++ } else { /* decode response */ ++ pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset); ++ if ((pSMBr->ByteCount < sizeof (FILE_SYSTEM_DEVICE_INFO)) ++ || (pSMBr->DataOffset > 512)) ++ rc = -EIO; /* bad smb */ ++ else { ++ response_data = ++ (FILE_SYSTEM_DEVICE_INFO ++ *) (((char *) &pSMBr->hdr.Protocol) + ++ pSMBr->DataOffset); ++ response_data->DeviceType = ++ le32_to_cpu(response_data->DeviceType); ++ response_data->DeviceCharacteristics = ++ le32_to_cpu(response_data->DeviceCharacteristics); ++ memcpy(&tcon->fsDevInfo, response_data, ++ sizeof (FILE_SYSTEM_DEVICE_INFO)); ++ } ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ if (rc == -EAGAIN) ++ goto QFSDeviceRetry; ++ ++ return rc; ++} ++ ++int ++CIFSSMBQFSUnixInfo(int xid, struct cifsTconInfo *tcon, ++ const struct nls_table *nls_codepage) ++{ ++/* level 0x200 SMB_QUERY_CIFS_UNIX_INFO */ ++ TRANSACTION2_QFSI_REQ *pSMB = NULL; ++ TRANSACTION2_QFSI_RSP *pSMBr = NULL; ++ FILE_SYSTEM_UNIX_INFO *response_data; ++ int rc = 0; ++ int bytes_returned = 0; ++ ++ cFYI(1, ("In QFSUnixInfo")); ++QFSUnixRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->ParameterCount = 2; /* level */ ++ pSMB->TotalDataCount = 0; ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(100); /* BB find exact max SMB PDU from sess structure BB */ ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ByteCount = pSMB->ParameterCount + 1 /* pad */ ; ++ pSMB->ParameterCount = cpu_to_le16(pSMB->ParameterCount); ++ pSMB->TotalParameterCount = pSMB->ParameterCount; ++ pSMB->ParameterOffset = cpu_to_le16(offsetof(struct ++ smb_com_transaction2_qfsi_req, InformationLevel) - 4); ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_FS_INFORMATION); ++ pSMB->InformationLevel = cpu_to_le16(SMB_QUERY_CIFS_UNIX_INFO); ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cERROR(1, ("Send error in QFSUnixInfo = %d", rc)); ++ } else { /* decode response */ ++ pSMBr->DataOffset = cpu_to_le16(pSMBr->DataOffset); ++ if ((pSMBr->ByteCount < 13) || (pSMBr->DataOffset > 512)) { ++ rc = -EIO; /* bad smb */ ++ } else { ++ response_data = ++ (FILE_SYSTEM_UNIX_INFO ++ *) (((char *) &pSMBr->hdr.Protocol) + ++ pSMBr->DataOffset); ++ response_data->MajorVersionNumber = ++ le16_to_cpu(response_data->MajorVersionNumber); ++ response_data->MinorVersionNumber = ++ le16_to_cpu(response_data->MinorVersionNumber); ++ response_data->Capability = ++ le64_to_cpu(response_data->Capability); ++ memcpy(&tcon->fsUnixInfo, response_data, ++ sizeof (FILE_SYSTEM_UNIX_INFO)); ++ } ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ if (rc == -EAGAIN) ++ goto QFSUnixRetry; ++ ++ ++ return rc; ++} ++ ++/* We can not use write of zero bytes trick to ++ set file size due to need for large file support. Also note that ++ this SetPathInfo is preferred to SetFileInfo based method in next ++ routine which is only needed to work around a sharing violation bug ++ in Samba which this routine can run into */ ++ ++int ++CIFSSMBSetEOF(int xid, struct cifsTconInfo *tcon, char *fileName, ++ __u64 size, int SetAllocation, const struct nls_table *nls_codepage) ++{ ++ struct smb_com_transaction2_spi_req *pSMB = NULL; ++ struct smb_com_transaction2_spi_rsp *pSMBr = NULL; ++ struct file_end_of_file_info *parm_data; ++ int name_len; ++ int rc = 0; ++ int bytes_returned = 0; ++ ++ cFYI(1, ("In SetEOF")); ++SetEOFRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->FileName, fileName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(fileName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->FileName, fileName, name_len); ++ } ++ pSMB->ParameterCount = 6 + name_len; ++ pSMB->DataCount = sizeof (struct file_end_of_file_info); ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB size from sess */ ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = offsetof(struct smb_com_transaction2_spi_req, ++ InformationLevel) - 4; ++ pSMB->DataOffset = pSMB->ParameterOffset + pSMB->ParameterCount; ++ if(SetAllocation) { ++ if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU) ++ pSMB->InformationLevel = ++ cpu_to_le16(SMB_SET_FILE_ALLOCATION_INFO2); ++ else ++ pSMB->InformationLevel = ++ cpu_to_le16(SMB_SET_FILE_ALLOCATION_INFO); ++ } else /* Set File Size */ { ++ if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU) ++ pSMB->InformationLevel = ++ cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO2); ++ else ++ pSMB->InformationLevel = ++ cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO); ++ } ++ ++ parm_data = ++ (struct file_end_of_file_info *) (((char *) &pSMB->hdr.Protocol) + ++ pSMB->DataOffset); ++ pSMB->ParameterOffset = cpu_to_le16(pSMB->ParameterOffset); ++ pSMB->DataOffset = cpu_to_le16(pSMB->DataOffset); ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_SET_PATH_INFORMATION); ++ pSMB->ByteCount = 3 /* pad */ + pSMB->ParameterCount + pSMB->DataCount; ++ pSMB->DataCount = cpu_to_le16(pSMB->DataCount); ++ pSMB->TotalDataCount = pSMB->DataCount; ++ pSMB->ParameterCount = cpu_to_le16(pSMB->ParameterCount); ++ pSMB->TotalParameterCount = pSMB->ParameterCount; ++ pSMB->Reserved4 = 0; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ parm_data->FileSize = cpu_to_le64(size); ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("SetPathInfo (file size) returned %d", rc)); ++ } ++ ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ if (rc == -EAGAIN) ++ goto SetEOFRetry; ++ ++ return rc; ++} ++ ++int ++CIFSSMBSetFileSize(const int xid, struct cifsTconInfo *tcon, __u64 size, ++ __u16 fid, __u32 pid_of_opener, int SetAllocation) ++{ ++ struct smb_com_transaction2_sfi_req *pSMB = NULL; ++ struct smb_com_transaction2_sfi_rsp *pSMBr = NULL; ++ char *data_offset; ++ struct file_end_of_file_info *parm_data; ++ int rc = 0; ++ int bytes_returned = 0; ++ __u32 tmp; ++ ++ cFYI(1, ("SetFileSize (via SetFileInfo) %lld", ++ (long long)size)); ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ tmp = cpu_to_le32(pid_of_opener); /* override pid of current process ++ so network fid will be valid */ ++ pSMB->hdr.Pid = tmp & 0xFFFF; ++ tmp >>= 16; ++ pSMB->hdr.PidHigh = tmp & 0xFFFF; ++ ++ pSMB->ParameterCount = 6; ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = offsetof(struct smb_com_transaction2_sfi_req, ++ Fid) - 4; ++ pSMB->DataOffset = pSMB->ParameterOffset + pSMB->ParameterCount; ++ ++ data_offset = (char *) (&pSMB->hdr.Protocol) + pSMB->DataOffset; ++ ++ pSMB->DataCount = sizeof(struct file_end_of_file_info); ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB PDU from sess */ ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_SET_FILE_INFORMATION); ++ pSMB->ByteCount = 3 /* pad */ + pSMB->ParameterCount + pSMB->DataCount; ++ pSMB->DataCount = cpu_to_le16(pSMB->DataCount); ++ pSMB->ParameterCount = cpu_to_le16(pSMB->ParameterCount); ++ pSMB->TotalDataCount = pSMB->DataCount; ++ pSMB->TotalParameterCount = pSMB->ParameterCount; ++ pSMB->ParameterOffset = cpu_to_le16(pSMB->ParameterOffset); ++ parm_data = ++ (struct file_end_of_file_info *) (((char *) &pSMB->hdr.Protocol) + ++ pSMB->DataOffset); ++ pSMB->DataOffset = cpu_to_le16(pSMB->DataOffset); /* now safe to change to le */ ++ parm_data->FileSize = cpu_to_le64(size); ++ pSMB->Fid = fid; ++ if(SetAllocation) { ++ if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU) ++ pSMB->InformationLevel = ++ cpu_to_le16(SMB_SET_FILE_ALLOCATION_INFO2); ++ else ++ pSMB->InformationLevel = ++ cpu_to_le16(SMB_SET_FILE_ALLOCATION_INFO); ++ } else /* Set File Size */ { ++ if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU) ++ pSMB->InformationLevel = ++ cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO2); ++ else ++ pSMB->InformationLevel = ++ cpu_to_le16(SMB_SET_FILE_END_OF_FILE_INFO); ++ } ++ pSMB->Reserved4 = 0; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ++ ("Send error in SetFileInfo (SetFileSize) = %d", ++ rc)); ++ } ++ ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ /* Note: On -EAGAIN error only caller can retry on handle based calls ++ since file handle passed in no longer valid */ ++ ++ return rc; ++} ++ ++int ++CIFSSMBSetTimes(int xid, struct cifsTconInfo *tcon, char *fileName, ++ FILE_BASIC_INFO * data, const struct nls_table *nls_codepage) ++{ ++ TRANSACTION2_SPI_REQ *pSMB = NULL; ++ TRANSACTION2_SPI_RSP *pSMBr = NULL; ++ int name_len; ++ int rc = 0; ++ int bytes_returned = 0; ++ char *data_offset; ++ ++ cFYI(1, ("In SetTimes")); ++ ++SetTimesRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->FileName, fileName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(fileName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->FileName, fileName, name_len); ++ } ++ ++ pSMB->ParameterCount = 6 + name_len; ++ pSMB->DataCount = sizeof (FILE_BASIC_INFO); ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find exact max SMB PDU from sess structure BB */ ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = offsetof(struct smb_com_transaction2_spi_req, ++ InformationLevel) - 4; ++ pSMB->DataOffset = pSMB->ParameterOffset + pSMB->ParameterCount; ++ data_offset = (char *) (&pSMB->hdr.Protocol) + pSMB->DataOffset; ++ pSMB->ParameterOffset = cpu_to_le16(pSMB->ParameterOffset); ++ pSMB->DataOffset = cpu_to_le16(pSMB->DataOffset); ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_SET_PATH_INFORMATION); ++ pSMB->ByteCount = 3 /* pad */ + pSMB->ParameterCount + pSMB->DataCount; ++ ++ pSMB->DataCount = cpu_to_le16(pSMB->DataCount); ++ pSMB->ParameterCount = cpu_to_le16(pSMB->ParameterCount); ++ pSMB->TotalDataCount = pSMB->DataCount; ++ pSMB->TotalParameterCount = pSMB->ParameterCount; ++ if (tcon->ses->capabilities & CAP_INFOLEVEL_PASSTHRU) ++ pSMB->InformationLevel = cpu_to_le16(SMB_SET_FILE_BASIC_INFO2); ++ else ++ pSMB->InformationLevel = cpu_to_le16(SMB_SET_FILE_BASIC_INFO); ++ pSMB->Reserved4 = 0; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ memcpy(data_offset, data, sizeof (FILE_BASIC_INFO)); ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("SetPathInfo (times) returned %d", rc)); ++ } ++ ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ ++ if (rc == -EAGAIN) ++ goto SetTimesRetry; ++ ++ return rc; ++} ++ ++int ++CIFSSMBUnixSetPerms(const int xid, struct cifsTconInfo *tcon, ++ char *fileName, __u64 mode, __u64 uid, __u64 gid, ++ dev_t device, const struct nls_table *nls_codepage) ++{ ++ TRANSACTION2_SPI_REQ *pSMB = NULL; ++ TRANSACTION2_SPI_RSP *pSMBr = NULL; ++ int name_len; ++ int rc = 0; ++ int bytes_returned = 0; ++ FILE_UNIX_BASIC_INFO *data_offset; ++ ++ cFYI(1, ("In SetUID/GID/Mode")); ++setPermsRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->FileName, fileName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(fileName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->FileName, fileName, name_len); ++ } ++ ++ pSMB->ParameterCount = 6 + name_len; ++ pSMB->DataCount = sizeof (FILE_UNIX_BASIC_INFO); ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find exact max SMB PDU from sess structure BB */ ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = offsetof(struct smb_com_transaction2_spi_req, ++ InformationLevel) - 4; ++ pSMB->DataOffset = pSMB->ParameterOffset + pSMB->ParameterCount; ++ data_offset = ++ (FILE_UNIX_BASIC_INFO *) ((char *) &pSMB->hdr.Protocol + ++ pSMB->DataOffset); ++ pSMB->DataOffset = cpu_to_le16(pSMB->DataOffset); ++ pSMB->ParameterOffset = cpu_to_le16(pSMB->ParameterOffset); ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_SET_PATH_INFORMATION); ++ pSMB->ByteCount = 3 /* pad */ + pSMB->ParameterCount + pSMB->DataCount; ++ pSMB->ParameterCount = cpu_to_le16(pSMB->ParameterCount); ++ pSMB->DataCount = cpu_to_le16(pSMB->DataCount); ++ pSMB->TotalParameterCount = pSMB->ParameterCount; ++ pSMB->TotalDataCount = pSMB->DataCount; ++ pSMB->InformationLevel = cpu_to_le16(SMB_SET_FILE_UNIX_BASIC); ++ pSMB->Reserved4 = 0; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ data_offset->Uid = cpu_to_le64(uid); ++ data_offset->Gid = cpu_to_le64(gid); ++ /* better to leave device as zero when it is */ ++ data_offset->DevMajor = cpu_to_le64(MAJOR(device)); ++ data_offset->DevMinor = cpu_to_le64(MINOR(device)); ++ data_offset->Permissions = cpu_to_le64(mode); ++ ++ if(S_ISREG(mode)) ++ data_offset->Type = cpu_to_le32(UNIX_FILE); ++ else if(S_ISDIR(mode)) ++ data_offset->Type = cpu_to_le32(UNIX_DIR); ++ else if(S_ISLNK(mode)) ++ data_offset->Type = cpu_to_le32(UNIX_SYMLINK); ++ else if(S_ISCHR(mode)) ++ data_offset->Type = cpu_to_le32(UNIX_CHARDEV); ++ else if(S_ISBLK(mode)) ++ data_offset->Type = cpu_to_le32(UNIX_BLOCKDEV); ++ else if(S_ISFIFO(mode)) ++ data_offset->Type = cpu_to_le32(UNIX_FIFO); ++ else if(S_ISSOCK(mode)) ++ data_offset->Type = cpu_to_le32(UNIX_SOCKET); ++ ++ ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("SetPathInfo (perms) returned %d", rc)); ++ } ++ ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto setPermsRetry; ++ return rc; ++} ++ ++int CIFSSMBNotify(const int xid, struct cifsTconInfo *tcon, ++ const int notify_subdirs, const __u16 netfid, ++ __u32 filter, const struct nls_table *nls_codepage) ++{ ++ int rc = 0; ++ struct smb_com_transaction_change_notify_req * pSMB = NULL; ++ struct smb_com_transaction_change_notify_rsp * pSMBr = NULL; ++ int bytes_returned; ++ ++ cFYI(1, ("In CIFSSMBNotify for file handle %d",(int)netfid)); ++ rc = smb_init(SMB_COM_NT_TRANSACT, 23, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ pSMB->TotalParameterCount = 0 ; ++ pSMB->TotalDataCount = 0; ++ pSMB->MaxParameterCount = cpu_to_le32(2); ++ /* BB find exact data count max from sess structure BB */ ++ pSMB->MaxDataCount = 0; /* same in little endian or be */ ++ pSMB->MaxSetupCount = 4; ++ pSMB->Reserved = 0; ++ pSMB->ParameterOffset = 0; ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 4; /* single byte does not need le conversion */ ++ pSMB->SubCommand = cpu_to_le16(NT_TRANSACT_NOTIFY_CHANGE); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ if(notify_subdirs) ++ pSMB->WatchTree = 1; /* one byte - no le conversion needed */ ++ pSMB->Reserved2 = 0; ++ pSMB->CompletionFilter = cpu_to_le32(filter); ++ pSMB->Fid = netfid; /* file handle always le */ ++ pSMB->ByteCount = 0; ++ ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Error in Notify = %d", rc)); ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++/* if (rc == -EAGAIN) ++ goto NotifyRetry; */ ++ return rc; ++} ++#ifdef CONFIG_CIFS_XATTR ++int ++CIFSSMBQAllEAs(const int xid, struct cifsTconInfo *tcon, ++ const unsigned char *searchName, ++ char * EAData, size_t size, ++ const struct nls_table *nls_codepage) ++{ ++ /* BB assumes one setup word */ ++ TRANSACTION2_QPI_REQ *pSMB = NULL; ++ TRANSACTION2_QPI_RSP *pSMBr = NULL; ++ int rc = 0; ++ int bytes_returned; ++ int name_len; ++ ++ cFYI(1, ("In Query All EAs path %s", searchName)); ++QAllEAsRetry: ++ rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB, ++ (void **) &pSMBr); ++ if (rc) ++ return rc; ++ ++ if (pSMB->hdr.Flags2 & SMBFLG2_UNICODE) { ++ name_len = ++ cifs_strtoUCS((wchar_t *) pSMB->FileName, searchName, 530 ++ /* find define for this maxpathcomponent */ ++ , nls_codepage); ++ name_len++; /* trailing null */ ++ name_len *= 2; ++ } else { /* BB improve the check for buffer overruns BB */ ++ name_len = strnlen(searchName, 530); ++ name_len++; /* trailing null */ ++ strncpy(pSMB->FileName, searchName, name_len); ++ } ++ ++ pSMB->TotalParameterCount = 2 /* level */ + 4 /* reserved */ + ++ name_len /* includes null */ ; ++ pSMB->TotalDataCount = 0; ++ pSMB->MaxParameterCount = cpu_to_le16(2); ++ pSMB->MaxDataCount = cpu_to_le16(4000); /* BB find exact max SMB PDU from sess structure BB */ ++ pSMB->MaxSetupCount = 0; ++ pSMB->Reserved = 0; ++ pSMB->Flags = 0; ++ pSMB->Timeout = 0; ++ pSMB->Reserved2 = 0; ++ pSMB->ParameterOffset = cpu_to_le16(offsetof( ++ struct smb_com_transaction2_qpi_req ,InformationLevel) - 4); ++ pSMB->DataCount = 0; ++ pSMB->DataOffset = 0; ++ pSMB->SetupCount = 1; ++ pSMB->Reserved3 = 0; ++ pSMB->SubCommand = cpu_to_le16(TRANS2_QUERY_PATH_INFORMATION); ++ pSMB->ByteCount = pSMB->TotalParameterCount + 1 /* pad */ ; ++ pSMB->TotalParameterCount = cpu_to_le16(pSMB->TotalParameterCount); ++ pSMB->ParameterCount = pSMB->TotalParameterCount; ++ pSMB->InformationLevel = cpu_to_le16(SMB_INFO_QUERY_ALL_EAS); ++ pSMB->Reserved4 = 0; ++ pSMB->hdr.smb_buf_length += pSMB->ByteCount; ++ pSMB->ByteCount = cpu_to_le16(pSMB->ByteCount); ++ ++ rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB, ++ (struct smb_hdr *) pSMBr, &bytes_returned, 0); ++ if (rc) { ++ cFYI(1, ("Send error in QueryAllEAs = %d", rc)); ++ } else { /* decode response */ ++ pSMBr->DataOffset = le16_to_cpu(pSMBr->DataOffset); ++ /* BB also check enough total bytes returned */ ++ /* BB we need to improve the validity checking ++ of these trans2 responses */ ++ if ((pSMBr->ByteCount < 4) || (pSMBr->DataOffset > 512)) ++ rc = -EIO; /* bad smb */ ++ /* else if (pFindData){ ++ memcpy((char *) pFindData, ++ (char *) &pSMBr->hdr.Protocol + ++ pSMBr->DataOffset, kl); ++ }*/ else { ++ /* check that length of list is not more than bcc */ ++ /* check that each entry does not go beyond length ++ of list */ ++ /* check that each element of each entry does not ++ go beyond end of list */ ++ struct fealist * ea_response_data; ++ rc = 0; ++ /* validate_trans2_offsets() */ ++ /* BB to check if(start of smb + pSMBr->DataOffset > &bcc+ bcc)*/ ++ ea_response_data = (struct fealist *) ++ (((char *) &pSMBr->hdr.Protocol) + ++ pSMBr->DataOffset); ++ cFYI(1,("ea length %d",ea_response_data->list_len)); ++ } ++ } ++ if (pSMB) ++ cifs_buf_release(pSMB); ++ if (rc == -EAGAIN) ++ goto QAllEAsRetry; ++ ++ return rc; ++} ++#endif +diff -urN linux-2.4.29.old/fs/cifs/cifs_unicode.c linux-2.4.29/fs/cifs/cifs_unicode.c +--- linux-2.4.29.old/fs/cifs/cifs_unicode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifs_unicode.c 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,87 @@ ++/* ++ * fs/cifs/cifs_unicode.c ++ * ++ * Copyright (c) International Business Machines Corp., 2000,2002 ++ * Modified by Steve French (sfrench@us.ibm.com) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/fs.h> ++#include "cifs_unicode.h" ++#include "cifs_uniupr.h" ++#include "cifspdu.h" ++#include "cifs_debug.h" ++ ++/* ++ * NAME: cifs_strfromUCS() ++ * ++ * FUNCTION: Convert little-endian unicode string to character string ++ * ++ */ ++int ++cifs_strfromUCS_le(char *to, const wchar_t * from, /* LITTLE ENDIAN */ ++ int len, const struct nls_table *codepage) ++{ ++ int i; ++ int outlen = 0; ++ ++ for (i = 0; (i < len) && from[i]; i++) { ++ int charlen; ++ /* 2.4.0 kernel or greater */ ++ charlen = ++ codepage->uni2char(le16_to_cpu(from[i]), &to[outlen], ++ NLS_MAX_CHARSET_SIZE); ++ if (charlen > 0) { ++ outlen += charlen; ++ } else { ++ to[outlen++] = '?'; ++ } ++ } ++ to[outlen] = 0; ++ return outlen; ++} ++ ++/* ++ * NAME: cifs_strtoUCS() ++ * ++ * FUNCTION: Convert character string to unicode string ++ * ++ */ ++int ++cifs_strtoUCS(wchar_t * to, const char *from, int len, ++ const struct nls_table *codepage) ++{ ++ int charlen; ++ int i; ++ ++ for (i = 0; len && *from; i++, from += charlen, len -= charlen) { ++ ++ /* works for 2.4.0 kernel or later */ ++ charlen = codepage->char2uni(from, len, &to[i]); ++ if (charlen < 1) { ++ cERROR(1, ++ ("cifs_strtoUCS: char2uni returned %d", ++ charlen)); ++ to[i] = cpu_to_le16(0x003f); /* a question mark */ ++ charlen = 1; ++ } ++ to[i] = cpu_to_le16(to[i]); ++ ++ } ++ ++ to[i] = 0; ++ return i; ++} ++ +diff -urN linux-2.4.29.old/fs/cifs/cifs_unicode.h linux-2.4.29/fs/cifs/cifs_unicode.h +--- linux-2.4.29.old/fs/cifs/cifs_unicode.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifs_unicode.h 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,353 @@ ++/* ++ * cifs_unicode: Unicode kernel case support ++ * ++ * Function: ++ * Convert a unicode character to upper or lower case using ++ * compressed tables. ++ * ++ * Copyright (c) International Business Machines Corp., 2000,2002 ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * ++ * Notes: ++ * These APIs are based on the C library functions. The semantics ++ * should match the C functions but with expanded size operands. ++ * ++ * The upper/lower functions are based on a table created by mkupr. ++ * This is a compressed table of upper and lower case conversion. ++ * ++ */ ++ ++#include <asm/byteorder.h> ++#include <linux/types.h> ++#include <linux/nls.h> ++ ++#define UNIUPR_NOLOWER /* Example to not expand lower case tables */ ++ ++/* Just define what we want from uniupr.h. We don't want to define the tables ++ * in each source file. ++ */ ++#ifndef UNICASERANGE_DEFINED ++struct UniCaseRange { ++ wchar_t start; ++ wchar_t end; ++ signed char *table; ++}; ++#endif /* UNICASERANGE_DEFINED */ ++ ++#ifndef UNIUPR_NOUPPER ++extern signed char CifsUniUpperTable[512]; ++extern const struct UniCaseRange CifsUniUpperRange[]; ++#endif /* UNIUPR_NOUPPER */ ++ ++#ifndef UNIUPR_NOLOWER ++extern signed char UniLowerTable[512]; ++extern struct UniCaseRange UniLowerRange[]; ++#endif /* UNIUPR_NOLOWER */ ++ ++#ifdef __KERNEL__ ++int cifs_strfromUCS_le(char *, const wchar_t *, int, const struct nls_table *); ++int cifs_strtoUCS(wchar_t *, const char *, int, const struct nls_table *); ++#endif ++ ++/* ++ * UniStrcat: Concatenate the second string to the first ++ * ++ * Returns: ++ * Address of the first string ++ */ ++static inline wchar_t * ++UniStrcat(wchar_t * ucs1, const wchar_t * ucs2) ++{ ++ wchar_t *anchor = ucs1; /* save a pointer to start of ucs1 */ ++ ++ while (*ucs1++) ; /* To end of first string */ ++ ucs1--; /* Return to the null */ ++ while ((*ucs1++ = *ucs2++)) ; /* copy string 2 over */ ++ return anchor; ++} ++ ++/* ++ * UniStrchr: Find a character in a string ++ * ++ * Returns: ++ * Address of first occurrence of character in string ++ * or NULL if the character is not in the string ++ */ ++static inline wchar_t * ++UniStrchr(const wchar_t * ucs, wchar_t uc) ++{ ++ while ((*ucs != uc) && *ucs) ++ ucs++; ++ ++ if (*ucs == uc) ++ return (wchar_t *) ucs; ++ return NULL; ++} ++ ++/* ++ * UniStrcmp: Compare two strings ++ * ++ * Returns: ++ * < 0: First string is less than second ++ * = 0: Strings are equal ++ * > 0: First string is greater than second ++ */ ++static inline int ++UniStrcmp(const wchar_t * ucs1, const wchar_t * ucs2) ++{ ++ while ((*ucs1 == *ucs2) && *ucs1) { ++ ucs1++; ++ ucs2++; ++ } ++ return (int) *ucs1 - (int) *ucs2; ++} ++ ++/* ++ * UniStrcpy: Copy a string ++ */ ++static inline wchar_t * ++UniStrcpy(wchar_t * ucs1, const wchar_t * ucs2) ++{ ++ wchar_t *anchor = ucs1; /* save the start of result string */ ++ ++ while ((*ucs1++ = *ucs2++)) ; ++ return anchor; ++} ++ ++/* ++ * UniStrlen: Return the length of a string (in 16 bit Unicode chars not bytes) ++ */ ++static inline size_t ++UniStrlen(const wchar_t * ucs1) ++{ ++ int i = 0; ++ ++ while (*ucs1++) ++ i++; ++ return i; ++} ++ ++/* ++ * UniStrnlen: Return the length (in 16 bit Unicode chars not bytes) of a string (length limited) ++ */ ++static inline size_t ++UniStrnlen(const wchar_t * ucs1, int maxlen) ++{ ++ int i = 0; ++ ++ while (*ucs1++) { ++ i++; ++ if (i >= maxlen) ++ break; ++ } ++ return i; ++} ++ ++/* ++ * UniStrncat: Concatenate length limited string ++ */ ++static inline wchar_t * ++UniStrncat(wchar_t * ucs1, const wchar_t * ucs2, size_t n) ++{ ++ wchar_t *anchor = ucs1; /* save pointer to string 1 */ ++ ++ while (*ucs1++) ; ++ ucs1--; /* point to null terminator of s1 */ ++ while (n-- && (*ucs1 = *ucs2)) { /* copy s2 after s1 */ ++ ucs1++; ++ ucs2++; ++ } ++ *ucs1 = 0; /* Null terminate the result */ ++ return (anchor); ++} ++ ++/* ++ * UniStrncmp: Compare length limited string ++ */ ++static inline int ++UniStrncmp(const wchar_t * ucs1, const wchar_t * ucs2, size_t n) ++{ ++ if (!n) ++ return 0; /* Null strings are equal */ ++ while ((*ucs1 == *ucs2) && *ucs1 && --n) { ++ ucs1++; ++ ucs2++; ++ } ++ return (int) *ucs1 - (int) *ucs2; ++} ++ ++/* ++ * UniStrncmp_le: Compare length limited string - native to little-endian ++ */ ++static inline int ++UniStrncmp_le(const wchar_t * ucs1, const wchar_t * ucs2, size_t n) ++{ ++ if (!n) ++ return 0; /* Null strings are equal */ ++ while ((*ucs1 == __le16_to_cpu(*ucs2)) && *ucs1 && --n) { ++ ucs1++; ++ ucs2++; ++ } ++ return (int) *ucs1 - (int) __le16_to_cpu(*ucs2); ++} ++ ++/* ++ * UniStrncpy: Copy length limited string with pad ++ */ ++static inline wchar_t * ++UniStrncpy(wchar_t * ucs1, const wchar_t * ucs2, size_t n) ++{ ++ wchar_t *anchor = ucs1; ++ ++ while (n-- && *ucs2) /* Copy the strings */ ++ *ucs1++ = *ucs2++; ++ ++ n++; ++ while (n--) /* Pad with nulls */ ++ *ucs1++ = 0; ++ return anchor; ++} ++ ++/* ++ * UniStrncpy_le: Copy length limited string with pad to little-endian ++ */ ++static inline wchar_t * ++UniStrncpy_le(wchar_t * ucs1, const wchar_t * ucs2, size_t n) ++{ ++ wchar_t *anchor = ucs1; ++ ++ while (n-- && *ucs2) /* Copy the strings */ ++ *ucs1++ = __le16_to_cpu(*ucs2++); ++ ++ n++; ++ while (n--) /* Pad with nulls */ ++ *ucs1++ = 0; ++ return anchor; ++} ++ ++/* ++ * UniStrstr: Find a string in a string ++ * ++ * Returns: ++ * Address of first match found ++ * NULL if no matching string is found ++ */ ++static inline wchar_t * ++UniStrstr(const wchar_t * ucs1, const wchar_t * ucs2) ++{ ++ const wchar_t *anchor1 = ucs1; ++ const wchar_t *anchor2 = ucs2; ++ ++ while (*ucs1) { ++ if (*ucs1 == *ucs2) { /* Partial match found */ ++ ucs1++; ++ ucs2++; ++ } else { ++ if (!*ucs2) /* Match found */ ++ return (wchar_t *) anchor1; ++ ucs1 = ++anchor1; /* No match */ ++ ucs2 = anchor2; ++ } ++ } ++ ++ if (!*ucs2) /* Both end together */ ++ return (wchar_t *) anchor1; /* Match found */ ++ return NULL; /* No match */ ++} ++ ++#ifndef UNIUPR_NOUPPER ++/* ++ * UniToupper: Convert a unicode character to upper case ++ */ ++static inline wchar_t ++UniToupper(register wchar_t uc) ++{ ++ register const struct UniCaseRange *rp; ++ ++ if (uc < sizeof (CifsUniUpperTable)) { /* Latin characters */ ++ return uc + CifsUniUpperTable[uc]; /* Use base tables */ ++ } else { ++ rp = CifsUniUpperRange; /* Use range tables */ ++ while (rp->start) { ++ if (uc < rp->start) /* Before start of range */ ++ return uc; /* Uppercase = input */ ++ if (uc <= rp->end) /* In range */ ++ return uc + rp->table[uc - rp->start]; ++ rp++; /* Try next range */ ++ } ++ } ++ return uc; /* Past last range */ ++} ++ ++/* ++ * UniStrupr: Upper case a unicode string ++ */ ++static inline wchar_t * ++UniStrupr(register wchar_t * upin) ++{ ++ register wchar_t *up; ++ ++ up = upin; ++ while (*up) { /* For all characters */ ++ *up = UniToupper(*up); ++ up++; ++ } ++ return upin; /* Return input pointer */ ++} ++#endif /* UNIUPR_NOUPPER */ ++ ++#ifndef UNIUPR_NOLOWER ++/* ++ * UniTolower: Convert a unicode character to lower case ++ */ ++static inline wchar_t ++UniTolower(wchar_t uc) ++{ ++ register struct UniCaseRange *rp; ++ ++ if (uc < sizeof (UniLowerTable)) { /* Latin characters */ ++ return uc + UniLowerTable[uc]; /* Use base tables */ ++ } else { ++ rp = UniLowerRange; /* Use range tables */ ++ while (rp->start) { ++ if (uc < rp->start) /* Before start of range */ ++ return uc; /* Uppercase = input */ ++ if (uc <= rp->end) /* In range */ ++ return uc + rp->table[uc - rp->start]; ++ rp++; /* Try next range */ ++ } ++ } ++ return uc; /* Past last range */ ++} ++ ++/* ++ * UniStrlwr: Lower case a unicode string ++ */ ++static inline wchar_t * ++UniStrlwr(register wchar_t * upin) ++{ ++ register wchar_t *up; ++ ++ up = upin; ++ while (*up) { /* For all characters */ ++ *up = UniTolower(*up); ++ up++; ++ } ++ return upin; /* Return input pointer */ ++} ++ ++#endif +diff -urN linux-2.4.29.old/fs/cifs/cifs_uniupr.h linux-2.4.29/fs/cifs/cifs_uniupr.h +--- linux-2.4.29.old/fs/cifs/cifs_uniupr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/cifs_uniupr.h 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,253 @@ ++/* ++ * Copyright (c) International Business Machines Corp., 2000,2002 ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * uniupr.h - Unicode compressed case ranges ++ * ++*/ ++ ++#ifndef UNIUPR_NOUPPER ++/* ++ * Latin upper case ++ */ ++signed char CifsUniUpperTable[512] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 000-00f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 010-01f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 020-02f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 030-03f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 040-04f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 050-05f */ ++ 0, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, /* 060-06f */ ++ -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, 0, 0, 0, 0, 0, /* 070-07f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 080-08f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 090-09f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0a0-0af */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0b0-0bf */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0c0-0cf */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0d0-0df */ ++ -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, /* 0e0-0ef */ ++ -32, -32, -32, -32, -32, -32, -32, 0, -32, -32, -32, -32, -32, -32, -32, 121, /* 0f0-0ff */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 100-10f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 110-11f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 120-12f */ ++ 0, 0, 0, -1, 0, -1, 0, -1, 0, 0, -1, 0, -1, 0, -1, 0, /* 130-13f */ ++ -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, 0, -1, 0, -1, 0, -1, /* 140-14f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 150-15f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 160-16f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, 0, -1, 0, -1, 0, -1, 0, /* 170-17f */ ++ 0, 0, 0, -1, 0, -1, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, /* 180-18f */ ++ 0, 0, -1, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, /* 190-19f */ ++ 0, -1, 0, -1, 0, -1, 0, 0, -1, 0, 0, 0, 0, -1, 0, 0, /* 1a0-1af */ ++ -1, 0, 0, 0, -1, 0, -1, 0, 0, -1, 0, 0, 0, -1, 0, 0, /* 1b0-1bf */ ++ 0, 0, 0, 0, 0, -1, -2, 0, -1, -2, 0, -1, -2, 0, -1, 0, /* 1c0-1cf */ ++ -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, -79, 0, -1, /* 1d0-1df */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1e0-1ef */ ++ 0, 0, -1, -2, 0, -1, 0, 0, 0, -1, 0, -1, 0, -1, 0, -1, /* 1f0-1ff */ ++}; ++ ++/* Upper case range - Greek */ ++static signed char UniCaseRangeU03a0[47] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -38, -37, -37, -37, /* 3a0-3af */ ++ 0, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, /* 3b0-3bf */ ++ -32, -32, -31, -32, -32, -32, -32, -32, -32, -32, -32, -32, -64, ++ -63, -63, ++}; ++ ++/* Upper case range - Cyrillic */ ++static signed char UniCaseRangeU0430[48] = { ++ -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, /* 430-43f */ ++ -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, /* 440-44f */ ++ 0, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, 0, -80, -80, /* 450-45f */ ++}; ++ ++/* Upper case range - Extended cyrillic */ ++static signed char UniCaseRangeU0490[61] = { ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 490-49f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 4a0-4af */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 4b0-4bf */ ++ 0, 0, -1, 0, -1, 0, 0, 0, -1, 0, 0, 0, -1, ++}; ++ ++/* Upper case range - Extended latin and greek */ ++static signed char UniCaseRangeU1e00[509] = { ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1e00-1e0f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1e10-1e1f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1e20-1e2f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1e30-1e3f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1e40-1e4f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1e50-1e5f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1e60-1e6f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1e70-1e7f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1e80-1e8f */ ++ 0, -1, 0, -1, 0, -1, 0, 0, 0, 0, 0, -59, 0, -1, 0, -1, /* 1e90-1e9f */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1ea0-1eaf */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1eb0-1ebf */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1ec0-1ecf */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1ed0-1edf */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, /* 1ee0-1eef */ ++ 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, 0, 0, 0, 0, 0, /* 1ef0-1eff */ ++ 8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, /* 1f00-1f0f */ ++ 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1f10-1f1f */ ++ 8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, /* 1f20-1f2f */ ++ 8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, /* 1f30-1f3f */ ++ 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1f40-1f4f */ ++ 0, 8, 0, 8, 0, 8, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, /* 1f50-1f5f */ ++ 8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, /* 1f60-1f6f */ ++ 74, 74, 86, 86, 86, 86, 100, 100, 0, 0, 112, 112, 126, 126, 0, 0, /* 1f70-1f7f */ ++ 8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, /* 1f80-1f8f */ ++ 8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, /* 1f90-1f9f */ ++ 8, 8, 8, 8, 8, 8, 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, /* 1fa0-1faf */ ++ 8, 8, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1fb0-1fbf */ ++ 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1fc0-1fcf */ ++ 8, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1fd0-1fdf */ ++ 8, 8, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1fe0-1fef */ ++ 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++}; ++ ++/* Upper case range - Wide latin */ ++static signed char UniCaseRangeUff40[27] = { ++ 0, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, /* ff40-ff4f */ ++ -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, -32, ++}; ++ ++/* ++ * Upper Case Range ++ */ ++const struct UniCaseRange CifsUniUpperRange[] = { ++ {0x03a0, 0x03ce, UniCaseRangeU03a0}, ++ {0x0430, 0x045f, UniCaseRangeU0430}, ++ {0x0490, 0x04cc, UniCaseRangeU0490}, ++ {0x1e00, 0x1ffc, UniCaseRangeU1e00}, ++ {0xff40, 0xff5a, UniCaseRangeUff40}, ++ {0, 0, NULL} ++}; ++#endif ++ ++#ifndef UNIUPR_NOLOWER ++/* ++ * Latin lower case ++ */ ++static signed char CifsUniLowerTable[512] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 000-00f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 010-01f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 020-02f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 030-03f */ ++ 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, /* 040-04f */ ++ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 0, 0, 0, 0, 0, /* 050-05f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 060-06f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 070-07f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 080-08f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 090-09f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0a0-0af */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0b0-0bf */ ++ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, /* 0c0-0cf */ ++ 32, 32, 32, 32, 32, 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 0, /* 0d0-0df */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0e0-0ef */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0f0-0ff */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 100-10f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 110-11f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 120-12f */ ++ 0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, /* 130-13f */ ++ 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, /* 140-14f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 150-15f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 160-16f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, -121, 1, 0, 1, 0, 1, 0, 0, /* 170-17f */ ++ 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 79, 0, /* 180-18f */ ++ 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, /* 190-19f */ ++ 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, /* 1a0-1af */ ++ 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, /* 1b0-1bf */ ++ 0, 0, 0, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 1, 0, 1, /* 1c0-1cf */ ++ 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, /* 1d0-1df */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1e0-1ef */ ++ 0, 2, 1, 0, 1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1f0-1ff */ ++}; ++ ++/* Lower case range - Greek */ ++static signed char UniCaseRangeL0380[44] = { ++ 0, 0, 0, 0, 0, 0, 38, 0, 37, 37, 37, 0, 64, 0, 63, 63, /* 380-38f */ ++ 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, /* 390-39f */ ++ 32, 32, 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, ++}; ++ ++/* Lower case range - Cyrillic */ ++static signed char UniCaseRangeL0400[48] = { ++ 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 0, 80, 80, /* 400-40f */ ++ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, /* 410-41f */ ++ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, /* 420-42f */ ++}; ++ ++/* Lower case range - Extended cyrillic */ ++static signed char UniCaseRangeL0490[60] = { ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 490-49f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 4a0-4af */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 4b0-4bf */ ++ 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, ++}; ++ ++/* Lower case range - Extended latin and greek */ ++static signed char UniCaseRangeL1e00[504] = { ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1e00-1e0f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1e10-1e1f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1e20-1e2f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1e30-1e3f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1e40-1e4f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1e50-1e5f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1e60-1e6f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1e70-1e7f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1e80-1e8f */ ++ 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, /* 1e90-1e9f */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1ea0-1eaf */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1eb0-1ebf */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1ec0-1ecf */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1ed0-1edf */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, /* 1ee0-1eef */ ++ 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, /* 1ef0-1eff */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -8, -8, -8, -8, -8, -8, /* 1f00-1f0f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -8, -8, -8, -8, 0, 0, /* 1f10-1f1f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -8, -8, -8, -8, -8, -8, /* 1f20-1f2f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -8, -8, -8, -8, -8, -8, /* 1f30-1f3f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -8, -8, -8, -8, 0, 0, /* 1f40-1f4f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, -8, 0, -8, 0, -8, 0, -8, /* 1f50-1f5f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -8, -8, -8, -8, -8, -8, /* 1f60-1f6f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1f70-1f7f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -8, -8, -8, -8, -8, -8, /* 1f80-1f8f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -8, -8, -8, -8, -8, -8, /* 1f90-1f9f */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -8, -8, -8, -8, -8, -8, /* 1fa0-1faf */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -74, -74, -9, 0, 0, 0, /* 1fb0-1fbf */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -86, -86, -86, -86, -9, 0, 0, 0, /* 1fc0-1fcf */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -100, -100, 0, 0, 0, 0, /* 1fd0-1fdf */ ++ 0, 0, 0, 0, 0, 0, 0, 0, -8, -8, -112, -112, -7, 0, 0, 0, /* 1fe0-1fef */ ++ 0, 0, 0, 0, 0, 0, 0, 0, ++}; ++ ++/* Lower case range - Wide latin */ ++static signed char UniCaseRangeLff20[27] = { ++ 0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, /* ff20-ff2f */ ++ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, ++}; ++ ++/* ++ * Lower Case Range ++ */ ++const static struct UniCaseRange CifsUniLowerRange[] = { ++ 0x0380, 0x03ab, UniCaseRangeL0380, ++ 0x0400, 0x042f, UniCaseRangeL0400, ++ 0x0490, 0x04cb, UniCaseRangeL0490, ++ 0x1e00, 0x1ff7, UniCaseRangeL1e00, ++ 0xff20, 0xff3a, UniCaseRangeLff20, ++ 0, 0, 0 ++}; ++#endif +diff -urN linux-2.4.29.old/fs/cifs/connect.c linux-2.4.29/fs/cifs/connect.c +--- linux-2.4.29.old/fs/cifs/connect.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/connect.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,2924 @@ ++/* ++ * fs/cifs/connect.c ++ * ++ * Copyright (C) International Business Machines Corp., 2002,2004 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/fs.h> ++#include <linux/net.h> ++#include <linux/string.h> ++#include <linux/list.h> ++#include <linux/wait.h> ++#include <linux/version.h> ++#include <linux/ipv6.h> ++#include <linux/pagemap.h> ++#include <linux/ctype.h> ++#include <linux/utsname.h> ++#include <asm/uaccess.h> ++#include <asm/processor.h> ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifsproto.h" ++#include "cifs_unicode.h" ++#include "cifs_debug.h" ++#include "cifs_fs_sb.h" ++#include "ntlmssp.h" ++#include "nterr.h" ++#include "rfc1002pdu.h" ++ ++#define CIFS_PORT 445 ++#define RFC1001_PORT 139 ++ ++extern void SMBencrypt(unsigned char *passwd, unsigned char *c8, ++ unsigned char *p24); ++extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8, ++ unsigned char *p24); ++extern int cifs_inet_pton(int, const char *, void *dst); ++ ++struct smb_vol { ++ char *username; ++ char *password; ++ char *domainname; ++ char *UNC; ++ char *UNCip; ++ char *iocharset; /* local code page for mapping to and from Unicode */ ++ char source_rfc1001_name[16]; /* netbios name of client */ ++ uid_t linux_uid; ++ gid_t linux_gid; ++ mode_t file_mode; ++ mode_t dir_mode; ++ int rw:1; ++ int retry:1; ++ int intr:1; ++ unsigned int rsize; ++ unsigned int wsize; ++ unsigned int sockopt; ++ unsigned short int port; ++}; ++ ++static int ipv4_connect(struct sockaddr_in *psin_server, ++ struct socket **csocket, ++ char * netb_name); ++static int ipv6_connect(struct sockaddr_in6 *psin_server, ++ struct socket **csocket); ++ ++ ++ /* ++ * cifs tcp session reconnection ++ * ++ * mark tcp session as reconnecting so temporarily locked ++ * mark all smb sessions as reconnecting for tcp session ++ * reconnect tcp session ++ * wake up waiters on reconnection? - (not needed currently) ++ */ ++ ++int ++cifs_reconnect(struct TCP_Server_Info *server) ++{ ++ int rc = 0; ++ struct list_head *tmp; ++ struct cifsSesInfo *ses; ++ struct cifsTconInfo *tcon; ++ struct mid_q_entry * mid_entry; ++ ++ spin_lock(&GlobalMid_Lock); ++ if(server->tcpStatus == CifsExiting) { ++ /* the demux thread will exit normally ++ next time through the loop */ ++ spin_unlock(&GlobalMid_Lock); ++ return rc; ++ } else ++ server->tcpStatus = CifsNeedReconnect; ++ spin_unlock(&GlobalMid_Lock); ++ server->maxBuf = 0; ++ ++ cFYI(1, ("Reconnecting tcp session ")); ++ ++ /* before reconnecting the tcp session, mark the smb session (uid) ++ and the tid bad so they are not used until reconnected */ ++ read_lock(&GlobalSMBSeslock); ++ list_for_each(tmp, &GlobalSMBSessionList) { ++ ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList); ++ if (ses->server) { ++ if (ses->server == server) { ++ ses->status = CifsNeedReconnect; ++ ses->ipc_tid = 0; ++ } ++ } ++ /* else tcp and smb sessions need reconnection */ ++ } ++ list_for_each(tmp, &GlobalTreeConnectionList) { ++ tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList); ++ if((tcon) && (tcon->ses) && (tcon->ses->server == server)) { ++ tcon->tidStatus = CifsNeedReconnect; ++ } ++ } ++ read_unlock(&GlobalSMBSeslock); ++ /* do not want to be sending data on a socket we are freeing */ ++ down(&server->tcpSem); ++ if(server->ssocket) { ++ cFYI(1,("State: 0x%x Flags: 0x%lx", server->ssocket->state, ++ server->ssocket->flags)); ++ server->ssocket->ops->shutdown(server->ssocket,SEND_SHUTDOWN); ++ cFYI(1,("Post shutdown state: 0x%x Flags: 0x%lx", server->ssocket->state, ++ server->ssocket->flags)); ++ sock_release(server->ssocket); ++ server->ssocket = NULL; ++ } ++ ++ spin_lock(&GlobalMid_Lock); ++ list_for_each(tmp, &server->pending_mid_q) { ++ mid_entry = list_entry(tmp, struct ++ mid_q_entry, ++ qhead); ++ if(mid_entry) { ++ if(mid_entry->midState == MID_REQUEST_SUBMITTED) { ++ /* Mark other intransit requests as needing retry so ++ we do not immediately mark the session bad again ++ (ie after we reconnect below) as they timeout too */ ++ mid_entry->midState = MID_RETRY_NEEDED; ++ } ++ } ++ } ++ spin_unlock(&GlobalMid_Lock); ++ up(&server->tcpSem); ++ ++ while ((server->tcpStatus != CifsExiting) && (server->tcpStatus != CifsGood)) ++ { ++ if(server->protocolType == IPV6) { ++ rc = ipv6_connect(&server->addr.sockAddr6,&server->ssocket); ++ } else { ++ rc = ipv4_connect(&server->addr.sockAddr, ++ &server->ssocket, ++ server->workstation_RFC1001_name); ++ } ++ if(rc) { ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule_timeout(3 * HZ); ++ } else { ++ atomic_inc(&tcpSesReconnectCount); ++ spin_lock(&GlobalMid_Lock); ++ if(server->tcpStatus != CifsExiting) ++ server->tcpStatus = CifsGood; ++ spin_unlock(&GlobalMid_Lock); ++ /* atomic_set(&server->inFlight,0);*/ ++ wake_up(&server->response_q); ++ } ++ } ++ return rc; ++} ++ ++static int ++cifs_demultiplex_thread(struct TCP_Server_Info *server) ++{ ++ int length; ++ unsigned int pdu_length, total_read; ++ struct smb_hdr *smb_buffer = NULL; ++ struct msghdr smb_msg; ++ mm_segment_t temp_fs; ++ struct iovec iov; ++ struct socket *csocket = server->ssocket; ++ struct list_head *tmp; ++ struct cifsSesInfo *ses; ++ struct task_struct *task_to_wake = NULL; ++ struct mid_q_entry *mid_entry; ++ char *temp; ++ ++ daemonize(); ++ sprintf(current->comm,"cifsd"); ++ /* allow_signal(SIGKILL);*/ ++ current->flags |= PF_MEMALLOC; ++ server->tsk = current; /* save process info to wake at shutdown */ ++ cFYI(1, ("Demultiplex PID: %d", current->pid)); ++ ++ temp_fs = get_fs(); /* we must turn off socket api parm checking */ ++ set_fs(get_ds()); ++ ++ while (server->tcpStatus != CifsExiting) { ++ if (smb_buffer == NULL) ++ smb_buffer = cifs_buf_get(); ++ else ++ memset(smb_buffer, 0, sizeof (struct smb_hdr)); ++ ++ if (smb_buffer == NULL) { ++ cERROR(1,("Can not get memory for SMB response")); ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule_timeout(HZ * 3); /* give system time to free memory */ ++ continue; ++ } ++ iov.iov_base = smb_buffer; ++ iov.iov_len = sizeof (struct smb_hdr) - 1; ++ /* 1 byte less above since wct is not always returned in error cases */ ++ smb_msg.msg_iov = &iov; ++ smb_msg.msg_iovlen = 1; ++ smb_msg.msg_control = NULL; ++ smb_msg.msg_controllen = 0; ++ ++ length = ++ sock_recvmsg(csocket, &smb_msg, ++ sizeof (struct smb_hdr) - ++ 1 /* RFC1001 header and SMB header */ , ++ MSG_PEEK /* flags see socket.h */ ); ++ ++ if(server->tcpStatus == CifsExiting) { ++ break; ++ } else if (server->tcpStatus == CifsNeedReconnect) { ++ cFYI(1,("Reconnecting after server stopped responding")); ++ cifs_reconnect(server); ++ cFYI(1,("call to reconnect done")); ++ csocket = server->ssocket; ++ continue; ++ } else if ((length == -ERESTARTSYS) || (length == -EAGAIN)) { ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule_timeout(1); /* minimum sleep to prevent looping ++ allowing socket to clear and app threads to set ++ tcpStatus CifsNeedReconnect if server hung */ ++ continue; ++ } else if (length <= 0) { ++ if(server->tcpStatus == CifsNew) { ++ cFYI(1,("tcp session abended prematurely (after SMBnegprot)")); ++ /* some servers kill tcp session rather than returning ++ smb negprot error in which case reconnecting here is ++ not going to help - return error to mount */ ++ break; ++ } ++ if(length == -EINTR) { ++ cFYI(1,("cifsd thread killed")); ++ break; ++ } ++ cFYI(1,("Reconnecting after unexpected peek error %d",length)); ++ cifs_reconnect(server); ++ csocket = server->ssocket; ++ wake_up(&server->response_q); ++ continue; ++ } ++ ++ pdu_length = 4 + ntohl(smb_buffer->smb_buf_length); ++ /* Ony read pdu_length after below checks for too short (due ++ to e.g. int overflow) and too long ie beyond end of buf */ ++ cFYI(1, ("Peek length rcvd: 0x%x beginning 0x%x)", length, pdu_length)); ++ ++ temp = (char *) smb_buffer; ++ if (length > 3) { ++ if (temp[0] == (char) RFC1002_SESSION_KEEP_ALIVE) { ++ iov.iov_base = smb_buffer; ++ iov.iov_len = 4; ++ length = sock_recvmsg(csocket, &smb_msg, 4, 0); ++ cFYI(0,("Received 4 byte keep alive packet")); ++ } else if (temp[0] == (char) RFC1002_POSITIVE_SESSION_RESPONSE) { ++ iov.iov_base = smb_buffer; ++ iov.iov_len = 4; ++ length = sock_recvmsg(csocket, &smb_msg, 4, 0); ++ cFYI(1,("Good RFC 1002 session rsp")); ++ } else if ((temp[0] == (char)RFC1002_NEGATIVE_SESSION_RESPONSE) ++ && (length == 5)) { ++ /* we get this from Windows 98 instead of error on SMB negprot response */ ++ cFYI(1,("Negative RFC 1002 Session Response Error 0x%x)",temp[4])); ++ if(server->tcpStatus == CifsNew) { ++ /* if nack on negprot (rather than ++ ret of smb negprot error) reconnecting ++ not going to help, ret error to mount */ ++ break; ++ } else { ++ /* give server a second to ++ clean up before reconnect attempt */ ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule_timeout(HZ); ++ /* always try 445 first on reconnect ++ since we get NACK on some if we ever ++ connected to port 139 (the NACK is ++ since we do not begin with RFC1001 ++ session initialize frame) */ ++ server->addr.sockAddr.sin_port = CIFS_PORT; ++ cifs_reconnect(server); ++ csocket = server->ssocket; ++ wake_up(&server->response_q); ++ continue; ++ } ++ } else if (temp[0] != (char) 0) { ++ cERROR(1,("Unknown RFC 1002 frame")); ++ cifs_dump_mem(" Received Data: ", temp, length); ++ cifs_reconnect(server); ++ csocket = server->ssocket; ++ continue; ++ } else { ++ if ((length != sizeof (struct smb_hdr) - 1) ++ || (pdu_length > ++ CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE) ++ || (pdu_length < ++ sizeof (struct smb_hdr) - 1) ++ || ++ (checkSMBhdr ++ (smb_buffer, smb_buffer->Mid))) { ++ cERROR(1, ++ ("Invalid size or format for SMB found with length %d and pdu_lenght %d", ++ length, pdu_length)); ++ cifs_dump_mem("Received Data is: ",temp,sizeof(struct smb_hdr)); ++ /* could we fix this network corruption by finding next ++ smb header (instead of killing the session) and ++ restart reading from next valid SMB found? */ ++ cifs_reconnect(server); ++ csocket = server->ssocket; ++ continue; ++ } else { /* length ok */ ++ ++ length = 0; ++ iov.iov_base = smb_buffer; ++ iov.iov_len = pdu_length; ++ for (total_read = 0; ++ total_read < pdu_length; ++ total_read += length) { ++ length = sock_recvmsg(csocket, &smb_msg, ++ pdu_length - total_read, 0); ++ if (length == 0) { ++ cERROR(1, ++ ("Zero length receive when expecting %d ", ++ pdu_length - total_read)); ++ cifs_reconnect(server); ++ csocket = server->ssocket; ++ continue; ++ } ++ } ++ } ++ ++ dump_smb(smb_buffer, length); ++ if (checkSMB ++ (smb_buffer, smb_buffer->Mid, total_read)) { ++ cERROR(1, ("Bad SMB Received ")); ++ continue; ++ } ++ ++ task_to_wake = NULL; ++ spin_lock(&GlobalMid_Lock); ++ list_for_each(tmp, &server->pending_mid_q) { ++ mid_entry = list_entry(tmp, struct ++ mid_q_entry, ++ qhead); ++ ++ if ((mid_entry->mid == smb_buffer->Mid) && (mid_entry->midState == MID_REQUEST_SUBMITTED)) { ++ cFYI(1, ++ (" Mid 0x%x matched - waking up ",mid_entry->mid)); ++ task_to_wake = mid_entry->tsk; ++ mid_entry->resp_buf = ++ smb_buffer; ++ mid_entry->midState = ++ MID_RESPONSE_RECEIVED; ++ } ++ } ++ spin_unlock(&GlobalMid_Lock); ++ if (task_to_wake) { ++ smb_buffer = NULL; /* will be freed by users thread after he is done */ ++ wake_up_process(task_to_wake); ++ } else if (is_valid_oplock_break(smb_buffer) == FALSE) { ++ cERROR(1, ("No task to wake, unknown frame rcvd!")); ++ cifs_dump_mem("Received Data is: ",temp,sizeof(struct smb_hdr)); ++ } ++ } ++ } else { ++ cFYI(0, ++ ("Frame less than four bytes received %d bytes long.", ++ length)); ++ if (length > 0) { ++ length = sock_recvmsg(csocket, &smb_msg, length, 0); /* throw away junk frame */ ++ cFYI(1, ++ (" with junk 0x%x in it ", ++ *(__u32 *) smb_buffer)); ++ } ++ } ++ } ++ spin_lock(&GlobalMid_Lock); ++ server->tcpStatus = CifsExiting; ++ server->tsk = NULL; ++ atomic_set(&server->inFlight, 0); ++ spin_unlock(&GlobalMid_Lock); ++ /* Although there should not be any requests blocked on ++ this queue it can not hurt to be paranoid and try to wake up requests ++ that may haven been blocked when more than 50 at time were on the wire ++ to the same server - they now will see the session is in exit state ++ and get out of SendReceive. */ ++ wake_up_all(&server->request_q); ++ /* give those requests time to exit */ ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule_timeout(HZ/8); ++ ++ if(server->ssocket) { ++ sock_release(csocket); ++ server->ssocket = NULL; ++ } ++ set_fs(temp_fs); ++ if (smb_buffer) /* buffer usually freed in free_mid - need to free it on error or exit */ ++ cifs_buf_release(smb_buffer); ++ ++ read_lock(&GlobalSMBSeslock); ++ if (list_empty(&server->pending_mid_q)) { ++ /* loop through server session structures attached to this and mark them dead */ ++ list_for_each(tmp, &GlobalSMBSessionList) { ++ ses = ++ list_entry(tmp, struct cifsSesInfo, ++ cifsSessionList); ++ if (ses->server == server) { ++ ses->status = CifsExiting; ++ ses->server = NULL; ++ } ++ } ++ read_unlock(&GlobalSMBSeslock); ++ } else { ++ spin_lock(&GlobalMid_Lock); ++ list_for_each(tmp, &server->pending_mid_q) { ++ mid_entry = list_entry(tmp, struct mid_q_entry, qhead); ++ if (mid_entry->midState == MID_REQUEST_SUBMITTED) { ++ cFYI(1, ++ (" Clearing Mid 0x%x - waking up ",mid_entry->mid)); ++ task_to_wake = mid_entry->tsk; ++ if(task_to_wake) { ++ wake_up_process(task_to_wake); ++ } ++ } ++ } ++ spin_unlock(&GlobalMid_Lock); ++ read_unlock(&GlobalSMBSeslock); ++ set_current_state(TASK_INTERRUPTIBLE); ++ /* 1/8th of sec is more than enough time for them to exit */ ++ schedule_timeout(HZ/8); ++ } ++ ++ if (list_empty(&server->pending_mid_q)) { ++ /* mpx threads have not exited yet give them ++ at least the smb send timeout time for long ops */ ++ cFYI(1, ("Wait for exit from demultiplex thread")); ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule_timeout(46 * HZ); ++ /* if threads still have not exited they are probably never ++ coming home not much else we can do but free the memory */ ++ } ++ kfree(server); ++ ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule_timeout(HZ/4); ++ return 0; ++} ++ ++static void * ++cifs_kcalloc(size_t size, int type) ++{ ++ void *addr; ++ addr = kmalloc(size, type); ++ if (addr) ++ memset(addr, 0, size); ++ return addr; ++} ++ ++static int ++cifs_parse_mount_options(char *options, const char *devname, struct smb_vol *vol) ++{ ++ char *value; ++ char *data; ++ unsigned int temp_len, i, j; ++ char separator[2]; ++ ++ separator[0] = ','; ++ separator[1] = 0; ++ ++ memset(vol->source_rfc1001_name,0x20,15); ++ for(i=0;i < strnlen(system_utsname.nodename,15);i++) { ++ /* does not have to be a perfect mapping since the field is ++ informational, only used for servers that do not support ++ port 445 and it can be overridden at mount time */ ++ vol->source_rfc1001_name[i] = toupper(system_utsname.nodename[i]); ++ } ++ vol->source_rfc1001_name[15] = 0; ++ ++ vol->linux_uid = current->uid; /* current->euid instead? */ ++ vol->linux_gid = current->gid; ++ vol->dir_mode = S_IRWXUGO; ++ /* 2767 perms indicate mandatory locking support */ ++ vol->file_mode = S_IALLUGO & ~(S_ISUID | S_IXGRP); ++ ++ /* vol->retry default is 0 (i.e. "soft" limited retry not hard retry) */ ++ vol->rw = TRUE; ++ ++ if (!options) ++ return 1; ++ ++ if(strncmp(options,"sep=",4) == 0) { ++ if(options[4] != 0) { ++ separator[0] = options[4]; ++ options += 5; ++ } else { ++ cFYI(1,("Null separator not allowed")); ++ } ++ } ++ ++ while ((data = strsep(&options, separator)) != NULL) { ++ if (!*data) ++ continue; ++ if ((value = strchr(data, '=')) != NULL) ++ *value++ = '\0'; ++ if (strnicmp(data, "user", 4) == 0) { ++ if (!value || !*value) { ++ printk(KERN_WARNING ++ "CIFS: invalid or missing username\n"); ++ return 1; /* needs_arg; */ ++ } ++ if (strnlen(value, 200) < 200) { ++ vol->username = value; ++ } else { ++ printk(KERN_WARNING "CIFS: username too long\n"); ++ return 1; ++ } ++ } else if (strnicmp(data, "pass", 4) == 0) { ++ if (!value || !*value) { ++ vol->password = NULL; ++ continue; ++ } ++ temp_len = strlen(value); ++ /* removed password length check, NTLM passwords ++ can be arbitrarily long */ ++ ++ /* if comma in password, the string will be ++ prematurely null terminated. Commas in password are ++ specified across the cifs mount interface by a double ++ comma ie ,, and a comma used as in other cases ie ',' ++ as a parameter delimiter/separator is single and due ++ to the strsep above is temporarily zeroed. */ ++ ++ /* NB: password legally can have multiple commas and ++ the only illegal character in a password is null */ ++ ++ if ((value[temp_len] == 0) && (value[temp_len+1] == separator[0])) { ++ /* reinsert comma */ ++ value[temp_len] = separator[0]; ++ temp_len+=2; /* move after the second comma */ ++ while(value[temp_len] != 0) { ++ if((value[temp_len] == separator[0]) && (value[temp_len+1] != separator[0])) { ++ /* single comma indicating start of next parm */ ++ break; ++ } ++ temp_len++; ++ } ++ if(value[temp_len] == 0) { ++ options = NULL; ++ } else { ++ value[temp_len] = 0; ++ /* move options to point to start of next parm */ ++ options = value + temp_len + 1; ++ } ++ /* go from value to (value + temp_len) condensing double commas to singles */ ++ vol->password = cifs_kcalloc(temp_len, GFP_KERNEL); ++ for(i=0,j=0;i<temp_len;i++,j++) { ++ vol->password[j] = value[i]; ++ if(value[i] == separator[0] && value[i+1] == separator[0]) { ++ /* skip second comma */ ++ i++; ++ } ++ } ++ /* value[temp_len] is zeroed above so ++ vol->password[temp_len] guaranteed to be null */ ++ } else { ++ vol->password = cifs_kcalloc(temp_len + 1, GFP_KERNEL); ++ strcpy(vol->password, value); ++ } ++ } else if (strnicmp(data, "ip", 2) == 0) { ++ if (!value || !*value) { ++ vol->UNCip = NULL; ++ } else if (strnlen(value, 35) < 35) { ++ vol->UNCip = value; ++ } else { ++ printk(KERN_WARNING "CIFS: ip address too long\n"); ++ return 1; ++ } ++ } else if ((strnicmp(data, "unc", 3) == 0) ++ || (strnicmp(data, "target", 6) == 0) ++ || (strnicmp(data, "path", 4) == 0)) { ++ if (!value || !*value) { ++ printk(KERN_WARNING ++ "CIFS: invalid path to network resource\n"); ++ return 1; /* needs_arg; */ ++ } ++ if ((temp_len = strnlen(value, 300)) < 300) { ++ vol->UNC = kmalloc(temp_len+1,GFP_KERNEL); ++ if(vol->UNC == NULL) ++ return 1; ++ strcpy(vol->UNC,value); ++ if (strncmp(vol->UNC, "//", 2) == 0) { ++ vol->UNC[0] = '\\'; ++ vol->UNC[1] = '\\'; ++ } else if (strncmp(vol->UNC, "\\\\", 2) != 0) { ++ printk(KERN_WARNING ++ "CIFS: UNC Path does not begin with // or \\\\ \n"); ++ return 1; ++ } ++ } else { ++ printk(KERN_WARNING "CIFS: UNC name too long\n"); ++ return 1; ++ } ++ } else if ((strnicmp(data, "domain", 3) == 0) ++ || (strnicmp(data, "workgroup", 5) == 0)) { ++ if (!value || !*value) { ++ printk(KERN_WARNING "CIFS: invalid domain name\n"); ++ return 1; /* needs_arg; */ ++ } ++ /* BB are there cases in which a comma can be valid in ++ a domain name and need special handling? */ ++ if (strnlen(value, 65) < 65) { ++ vol->domainname = value; ++ cFYI(1, ("Domain name set")); ++ } else { ++ printk(KERN_WARNING "CIFS: domain name too long\n"); ++ return 1; ++ } ++ } else if (strnicmp(data, "iocharset", 9) == 0) { ++ if (!value || !*value) { ++ printk(KERN_WARNING "CIFS: invalid iocharset specified\n"); ++ return 1; /* needs_arg; */ ++ } ++ if (strnlen(value, 65) < 65) { ++ if(strnicmp(value,"default",7)) ++ vol->iocharset = value; ++ /* if iocharset not set load_nls_default used by caller */ ++ cFYI(1, ("iocharset set to %s",value)); ++ } else { ++ printk(KERN_WARNING "CIFS: iocharset name too long.\n"); ++ return 1; ++ } ++ } else if (strnicmp(data, "uid", 3) == 0) { ++ if (value && *value) { ++ vol->linux_uid = ++ simple_strtoul(value, &value, 0); ++ } ++ } else if (strnicmp(data, "gid", 3) == 0) { ++ if (value && *value) { ++ vol->linux_gid = ++ simple_strtoul(value, &value, 0); ++ } ++ } else if (strnicmp(data, "file_mode", 4) == 0) { ++ if (value && *value) { ++ vol->file_mode = ++ simple_strtoul(value, &value, 0); ++ } ++ } else if (strnicmp(data, "dir_mode", 3) == 0) { ++ if (value && *value) { ++ vol->dir_mode = ++ simple_strtoul(value, &value, 0); ++ } ++ } else if (strnicmp(data, "port", 4) == 0) { ++ if (value && *value) { ++ vol->port = ++ simple_strtoul(value, &value, 0); ++ } ++ } else if (strnicmp(data, "rsize", 5) == 0) { ++ if (value && *value) { ++ vol->rsize = ++ simple_strtoul(value, &value, 0); ++ } ++ } else if (strnicmp(data, "wsize", 5) == 0) { ++ if (value && *value) { ++ vol->wsize = ++ simple_strtoul(value, &value, 0); ++ } ++ } else if (strnicmp(data, "sockopt", 5) == 0) { ++ if (value && *value) { ++ vol->sockopt = ++ simple_strtoul(value, &value, 0); ++ } ++ } else if (strnicmp(data, "netbiosname", 4) == 0) { ++ if (!value || !*value || (*value == ' ')) { ++ cFYI(1,("invalid (empty) netbiosname specified")); ++ } else { ++ memset(vol->source_rfc1001_name,0x20,15); ++ for(i=0;i<15;i++) { ++ /* BB are there cases in which a comma can be ++ valid in this workstation netbios name (and need ++ special handling)? */ ++ ++ /* We do not uppercase netbiosname for user */ ++ if (value[i]==0) ++ break; ++ else ++ vol->source_rfc1001_name[i] = value[i]; ++ } ++ /* The string has 16th byte zero still from ++ set at top of the function */ ++ if((i==15) && (value[i] != 0)) ++ printk(KERN_WARNING "CIFS: netbiosname longer than 15 and was truncated.\n"); ++ } ++ } else if (strnicmp(data, "credentials", 4) == 0) { ++ /* ignore */ ++ } else if (strnicmp(data, "version", 3) == 0) { ++ /* ignore */ ++ } else if (strnicmp(data, "rw", 2) == 0) { ++ vol->rw = TRUE; ++ } else if ((strnicmp(data, "suid", 4) == 0) || ++ (strnicmp(data, "nosuid", 6) == 0) || ++ (strnicmp(data, "exec", 4) == 0) || ++ (strnicmp(data, "noexec", 6) == 0) || ++ (strnicmp(data, "nodev", 5) == 0) || ++ (strnicmp(data, "noauto", 6) == 0) || ++ (strnicmp(data, "dev", 3) == 0)) { ++ /* The mount tool or mount.cifs helper (if present) ++ uses these opts to set flags, and the flags are read ++ by the kernel vfs layer before we get here (ie ++ before read super) so there is no point trying to ++ parse these options again and set anything and it ++ is ok to just ignore them */ ++ continue; ++ } else if (strnicmp(data, "ro", 2) == 0) { ++ vol->rw = FALSE; ++ } else if (strnicmp(data, "hard", 4) == 0) { ++ vol->retry = 1; ++ } else if (strnicmp(data, "soft", 4) == 0) { ++ vol->retry = 0; ++ } else if (strnicmp(data, "nohard", 6) == 0) { ++ vol->retry = 0; ++ } else if (strnicmp(data, "nosoft", 6) == 0) { ++ vol->retry = 1; ++ } else if (strnicmp(data, "nointr", 6) == 0) { ++ vol->intr = 0; ++ } else if (strnicmp(data, "intr", 4) == 0) { ++ vol->intr = 1; ++ } else if (strnicmp(data, "noac", 4) == 0) { ++ printk(KERN_WARNING "CIFS: Mount option noac not supported. Instead set /proc/fs/cifs/LookupCacheEnabled to 0\n"); ++ } else ++ printk(KERN_WARNING "CIFS: Unknown mount option %s\n",data); ++ } ++ if (vol->UNC == NULL) { ++ if(devname == NULL) { ++ printk(KERN_WARNING "CIFS: Missing UNC name for mount target\n"); ++ return 1; ++ } ++ if ((temp_len = strnlen(devname, 300)) < 300) { ++ vol->UNC = kmalloc(temp_len+1,GFP_KERNEL); ++ if(vol->UNC == NULL) ++ return 1; ++ strcpy(vol->UNC,devname); ++ if (strncmp(vol->UNC, "//", 2) == 0) { ++ vol->UNC[0] = '\\'; ++ vol->UNC[1] = '\\'; ++ } else if (strncmp(vol->UNC, "\\\\", 2) != 0) { ++ printk(KERN_WARNING "CIFS: UNC Path does not begin with // or \\\\ \n"); ++ return 1; ++ } ++ } else { ++ printk(KERN_WARNING "CIFS: UNC name too long\n"); ++ return 1; ++ } ++ } ++ if(vol->UNCip == 0) ++ vol->UNCip = &vol->UNC[2]; ++ ++ return 0; ++} ++ ++static struct cifsSesInfo * ++cifs_find_tcp_session(__u32 new_target_ip_addr, ++ char *userName, struct TCP_Server_Info **psrvTcp) ++{ ++ struct list_head *tmp; ++ struct cifsSesInfo *ses; ++ ++ *psrvTcp = NULL; ++ read_lock(&GlobalSMBSeslock); ++ list_for_each(tmp, &GlobalSMBSessionList) { ++ ses = list_entry(tmp, struct cifsSesInfo, cifsSessionList); ++ if (ses->server) { ++ if (ses->server->addr.sockAddr.sin_addr.s_addr == ++ new_target_ip_addr) { ++ /* BB lock server and tcp session and increment use count here?? */ ++ *psrvTcp = ses->server; /* found a match on the TCP session */ ++ /* BB check if reconnection needed */ ++ if (strncmp ++ (ses->userName, userName, ++ MAX_USERNAME_SIZE) == 0){ ++ read_unlock(&GlobalSMBSeslock); ++ return ses; /* found exact match on both tcp and SMB sessions */ ++ } ++ } ++ } ++ /* else tcp and smb sessions need reconnection */ ++ } ++ read_unlock(&GlobalSMBSeslock); ++ return NULL; ++} ++ ++static struct cifsTconInfo * ++find_unc(__u32 new_target_ip_addr, char *uncName, char *userName) ++{ ++ struct list_head *tmp; ++ struct cifsTconInfo *tcon; ++ ++ read_lock(&GlobalSMBSeslock); ++ list_for_each(tmp, &GlobalTreeConnectionList) { ++ cFYI(1, ("Next tcon - ")); ++ tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList); ++ if (tcon->ses) { ++ if (tcon->ses->server) { ++ cFYI(1, ++ (" old ip addr: %x == new ip %x ?", ++ tcon->ses->server->addr.sockAddr.sin_addr. ++ s_addr, new_target_ip_addr)); ++ if (tcon->ses->server->addr.sockAddr.sin_addr. ++ s_addr == new_target_ip_addr) { ++ /* BB lock tcon and server and tcp session and increment use count here? */ ++ /* found a match on the TCP session */ ++ /* BB check if reconnection needed */ ++ cFYI(1,("Matched ip, old UNC: %s == new: %s ?", ++ tcon->treeName, uncName)); ++ if (strncmp ++ (tcon->treeName, uncName, ++ MAX_TREE_SIZE) == 0) { ++ cFYI(1, ++ ("Matched UNC, old user: %s == new: %s ?", ++ tcon->treeName, uncName)); ++ if (strncmp ++ (tcon->ses->userName, ++ userName, ++ MAX_USERNAME_SIZE) == 0) { ++ read_unlock(&GlobalSMBSeslock); ++ return tcon;/* also matched user (smb session)*/ ++ } ++ } ++ } ++ } ++ } ++ } ++ read_unlock(&GlobalSMBSeslock); ++ return NULL; ++} ++ ++int ++connect_to_dfs_path(int xid, struct cifsSesInfo *pSesInfo, ++ const char *old_path, const struct nls_table *nls_codepage) ++{ ++ unsigned char *referrals = NULL; ++ unsigned int num_referrals; ++ int rc = 0; ++ ++ rc = get_dfs_path(xid, pSesInfo,old_path, nls_codepage, ++ &num_referrals, &referrals); ++ ++ /* BB Add in code to: if valid refrl, if not ip address contact ++ the helper that resolves tcp names, mount to it, try to ++ tcon to it unmount it if fail */ ++ ++ if(referrals) ++ kfree(referrals); ++ ++ return rc; ++} ++ ++int ++get_dfs_path(int xid, struct cifsSesInfo *pSesInfo, ++ const char *old_path, const struct nls_table *nls_codepage, ++ unsigned int *pnum_referrals, unsigned char ** preferrals) ++{ ++ char *temp_unc; ++ int rc = 0; ++ ++ *pnum_referrals = 0; ++ ++ if (pSesInfo->ipc_tid == 0) { ++ temp_unc = kmalloc(2 /* for slashes */ + ++ strnlen(pSesInfo->serverName,SERVER_NAME_LEN_WITH_NULL * 2) ++ + 1 + 4 /* slash IPC$ */ + 2, ++ GFP_KERNEL); ++ if (temp_unc == NULL) ++ return -ENOMEM; ++ temp_unc[0] = '\\'; ++ temp_unc[1] = '\\'; ++ strcpy(temp_unc + 2, pSesInfo->serverName); ++ strcpy(temp_unc + 2 + strlen(pSesInfo->serverName), "\\IPC$"); ++ rc = CIFSTCon(xid, pSesInfo, temp_unc, NULL, nls_codepage); ++ cFYI(1, ++ ("CIFS Tcon rc = %d ipc_tid = %d", rc,pSesInfo->ipc_tid)); ++ kfree(temp_unc); ++ } ++ if (rc == 0) ++ rc = CIFSGetDFSRefer(xid, pSesInfo, old_path, preferrals, ++ pnum_referrals, nls_codepage); ++ ++ return rc; ++} ++ ++/* See RFC1001 section 14 on representation of Netbios names */ ++static void rfc1002mangle(char * target,char * source, unsigned int length) ++{ ++ unsigned int i,j; ++ ++ for(i=0,j=0;i<(length);i++) { ++ /* mask a nibble at a time and encode */ ++ target[j] = 'A' + (0x0F & (source[i] >> 4)); ++ target[j+1] = 'A' + (0x0F & source[i]); ++ j+=2; ++ } ++ ++} ++ ++ ++static int ++ipv4_connect(struct sockaddr_in *psin_server, struct socket **csocket, ++ char * netbios_name) ++{ ++ int rc = 0; ++ int connected = 0; ++ unsigned short int orig_port = 0; ++ ++ if(*csocket == NULL) { ++ rc = sock_create(PF_INET, SOCK_STREAM, IPPROTO_TCP, csocket); ++ if (rc < 0) { ++ cERROR(1, ("Error %d creating socket",rc)); ++ *csocket = NULL; ++ return rc; ++ } else { ++ /* BB other socket options to set KEEPALIVE, NODELAY? */ ++ cFYI(1,("Socket created")); ++ (*csocket)->sk->allocation = GFP_NOFS; ++ } ++ } ++ ++ psin_server->sin_family = AF_INET; ++ if(psin_server->sin_port) { /* user overrode default port */ ++ rc = (*csocket)->ops->connect(*csocket, ++ (struct sockaddr *) psin_server, ++ sizeof (struct sockaddr_in),0); ++ if (rc >= 0) ++ connected = 1; ++ } ++ ++ if(!connected) { ++ /* save original port so we can retry user specified port ++ later if fall back ports fail this time */ ++ orig_port = psin_server->sin_port; ++ ++ /* do not retry on the same port we just failed on */ ++ if(psin_server->sin_port != htons(CIFS_PORT)) { ++ psin_server->sin_port = htons(CIFS_PORT); ++ ++ rc = (*csocket)->ops->connect(*csocket, ++ (struct sockaddr *) psin_server, ++ sizeof (struct sockaddr_in),0); ++ if (rc >= 0) ++ connected = 1; ++ } ++ } ++ if (!connected) { ++ psin_server->sin_port = htons(RFC1001_PORT); ++ rc = (*csocket)->ops->connect(*csocket, (struct sockaddr *) ++ psin_server, sizeof (struct sockaddr_in),0); ++ if (rc >= 0) ++ connected = 1; ++ } ++ ++ /* give up here - unless we want to retry on different ++ protocol families some day */ ++ if (!connected) { ++ if(orig_port) ++ psin_server->sin_port = orig_port; ++ cFYI(1,("Error %d connecting to server via ipv4",rc)); ++ sock_release(*csocket); ++ *csocket = NULL; ++ return rc; ++ } ++ /* Eventually check for other socket options to change from ++ the default. sock_setsockopt not used because it expects ++ user space buffer */ ++ (*csocket)->sk->rcvtimeo = 7 * HZ; ++ ++ /* send RFC1001 sessinit */ ++ ++ if(psin_server->sin_port == htons(139)) { ++ /* some servers require RFC1001 sessinit before sending ++ negprot - BB check reconnection in case where second ++ sessinit is sent but no second negprot */ ++ struct rfc1002_session_packet * ses_init_buf; ++ struct smb_hdr * smb_buf; ++ ses_init_buf = cifs_kcalloc(sizeof(struct rfc1002_session_packet), GFP_KERNEL); ++ if(ses_init_buf) { ++ ses_init_buf->trailer.session_req.called_len = 32; ++ rfc1002mangle(ses_init_buf->trailer.session_req.called_name, ++ DEFAULT_CIFS_CALLED_NAME,16); ++ ses_init_buf->trailer.session_req.calling_len = 32; ++ /* calling name ends in null (byte 16) from old smb ++ convention. */ ++ if(netbios_name && (netbios_name[0] !=0)) { ++ rfc1002mangle(ses_init_buf->trailer.session_req.calling_name, ++ netbios_name,16); ++ } else { ++ rfc1002mangle(ses_init_buf->trailer.session_req.calling_name, ++ "LINUX_CIFS_CLNT",16); ++ } ++ ses_init_buf->trailer.session_req.scope1 = 0; ++ ses_init_buf->trailer.session_req.scope2 = 0; ++ smb_buf = (struct smb_hdr *)ses_init_buf; ++ /* sizeof RFC1002_SESSION_REQUEST with no scope */ ++ smb_buf->smb_buf_length = 0x81000044; ++ rc = smb_send(*csocket, smb_buf, 0x44, ++ (struct sockaddr *)psin_server); ++ kfree(ses_init_buf); ++ } ++ /* else the negprot may still work without this ++ even though malloc failed */ ++ ++ } ++ ++ return rc; ++} ++ ++static int ++ipv6_connect(struct sockaddr_in6 *psin_server, struct socket **csocket) ++{ ++ int rc = 0; ++ int connected = 0; ++ ++ if(*csocket == NULL) { ++ rc = sock_create(PF_INET6, SOCK_STREAM, IPPROTO_TCP, csocket); ++ if (rc < 0) { ++ cERROR(1, ("Error %d creating ipv6 socket",rc)); ++ *csocket = NULL; ++ return rc; ++ } else { ++ /* BB other socket options to set KEEPALIVE, NODELAY? */ ++ cFYI(1,("ipv6 Socket created")); ++ (*csocket)->sk->allocation = GFP_NOFS; ++ } ++ } ++ ++ psin_server->sin6_family = AF_INET6; ++ ++ if(psin_server->sin6_port) { /* user overrode default port */ ++ rc = (*csocket)->ops->connect(*csocket, ++ (struct sockaddr *) psin_server, ++ sizeof (struct sockaddr_in6),0); ++ if (rc >= 0) ++ connected = 1; ++ } ++ ++ if(!connected) { ++ /* do not retry on the same port we just failed on */ ++ if(psin_server->sin6_port != htons(CIFS_PORT)) { ++ psin_server->sin6_port = htons(CIFS_PORT); ++ ++ rc = (*csocket)->ops->connect(*csocket, ++ (struct sockaddr *) psin_server, ++ sizeof (struct sockaddr_in6),0); ++ if (rc >= 0) ++ connected = 1; ++ } ++ } ++ if (!connected) { ++ psin_server->sin6_port = htons(RFC1001_PORT); ++ rc = (*csocket)->ops->connect(*csocket, (struct sockaddr *) ++ psin_server, sizeof (struct sockaddr_in6),0); ++ if (rc >= 0) ++ connected = 1; ++ } ++ ++ /* give up here - unless we want to retry on different ++ protocol families some day */ ++ if (!connected) { ++ cFYI(1,("Error %d connecting to server via ipv6",rc)); ++ sock_release(*csocket); ++ *csocket = NULL; ++ return rc; ++ } ++ /* Eventually check for other socket options to change from ++ the default. sock_setsockopt not used because it expects ++ user space buffer */ ++ (*csocket)->sk->rcvtimeo = 7 * HZ; ++ ++ return rc; ++} ++ ++int ++cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, ++ char *mount_data, const char *devname) ++{ ++ int rc = 0; ++ int xid; ++ struct socket *csocket = NULL; ++ struct sockaddr_in sin_server; ++ struct sockaddr_in6 sin_server6; ++ struct smb_vol volume_info; ++ struct cifsSesInfo *pSesInfo = NULL; ++ struct cifsSesInfo *existingCifsSes = NULL; ++ struct cifsTconInfo *tcon = NULL; ++ struct TCP_Server_Info *srvTcp = NULL; ++ ++ xid = GetXid(); ++ ++ cFYI(1, ("Entering cifs_mount. Xid: %d with: %s", xid, mount_data)); /* BB removeme BB fixme */ ++ ++ memset(&volume_info,0,sizeof(struct smb_vol)); ++ if (cifs_parse_mount_options(mount_data, devname, &volume_info)) { ++ if(volume_info.UNC) ++ kfree(volume_info.UNC); ++ if(volume_info.password) ++ kfree(volume_info.password); ++ FreeXid(xid); ++ return -EINVAL; ++ } ++ ++ if (volume_info.username) { ++ cFYI(1, ("Username: %s ", volume_info.username)); ++ ++ } else { ++ cifserror("No username specified "); ++ /* In userspace mount helper we can get user name from alternate ++ locations such as env variables and files on disk */ ++ if(volume_info.UNC) ++ kfree(volume_info.UNC); ++ if(volume_info.password) ++ kfree(volume_info.password); ++ FreeXid(xid); ++ return -EINVAL; ++ } ++ ++ if (volume_info.UNCip && volume_info.UNC) { ++ rc = cifs_inet_pton(AF_INET, volume_info.UNCip,&sin_server.sin_addr.s_addr); ++ ++ if(rc == 0) { ++ /* not ipv4 address, try ipv6 */ ++ rc = cifs_inet_pton(AF_INET6,volume_info.UNCip,&sin_server6.sin6_addr.in6_u); ++ } ++ ++ if(rc != 1) { ++ /* we failed translating address */ ++ if(volume_info.UNC) ++ kfree(volume_info.UNC); ++ if(volume_info.password) ++ kfree(volume_info.password); ++ FreeXid(xid); ++ return -EINVAL; ++ } ++ ++ cFYI(1, ("UNC: %s ip: %s", volume_info.UNC, volume_info.UNCip)); ++ /* success */ ++ rc = 0; ++ } else if (volume_info.UNCip){ ++ /* BB using ip addr as server name connect to the DFS root below */ ++ cERROR(1,("Connecting to DFS root not implemented yet")); ++ if(volume_info.UNC) ++ kfree(volume_info.UNC); ++ if(volume_info.password) ++ kfree(volume_info.password); ++ FreeXid(xid); ++ return -EINVAL; ++ } else /* which servers DFS root would we conect to */ { ++ cERROR(1, ++ ("CIFS mount error: No UNC path (e.g. -o unc=//192.168.1.100/public) specified ")); ++ if(volume_info.UNC) ++ kfree(volume_info.UNC); ++ if(volume_info.password) ++ kfree(volume_info.password); ++ FreeXid(xid); ++ return -EINVAL; ++ } ++ ++ /* this is needed for ASCII cp to Unicode converts */ ++ if(volume_info.iocharset == NULL) { ++ cifs_sb->local_nls = load_nls_default(); ++ /* load_nls_default can not return null */ ++ } else { ++ cifs_sb->local_nls = load_nls(volume_info.iocharset); ++ if(cifs_sb->local_nls == NULL) { ++ cERROR(1,("CIFS mount error: iocharset %s not found",volume_info.iocharset)); ++ if(volume_info.UNC) ++ kfree(volume_info.UNC); ++ if(volume_info.password) ++ kfree(volume_info.password); ++ FreeXid(xid); ++ return -ELIBACC; ++ } ++ } ++ ++ existingCifsSes = ++ cifs_find_tcp_session(sin_server.sin_addr.s_addr, ++ volume_info.username, &srvTcp); ++ if (srvTcp) { ++ cFYI(1, ("Existing tcp session with server found ")); ++ } else { /* create socket */ ++ if(volume_info.port) ++ sin_server.sin_port = htons(volume_info.port); ++ else ++ sin_server.sin_port = 0; ++ rc = ipv4_connect(&sin_server,&csocket,volume_info.source_rfc1001_name); ++ if (rc < 0) { ++ cERROR(1, ++ ("Error connecting to IPv4 socket. Aborting operation")); ++ if(csocket != NULL) ++ sock_release(csocket); ++ if(volume_info.UNC) ++ kfree(volume_info.UNC); ++ if(volume_info.password) ++ kfree(volume_info.password); ++ FreeXid(xid); ++ return rc; ++ } ++ ++ srvTcp = kmalloc(sizeof (struct TCP_Server_Info), GFP_KERNEL); ++ if (srvTcp == NULL) { ++ rc = -ENOMEM; ++ sock_release(csocket); ++ if(volume_info.UNC) ++ kfree(volume_info.UNC); ++ if(volume_info.password) ++ kfree(volume_info.password); ++ FreeXid(xid); ++ return rc; ++ } else { ++ memset(srvTcp, 0, sizeof (struct TCP_Server_Info)); ++ memcpy(&srvTcp->addr.sockAddr, &sin_server, sizeof (struct sockaddr_in)); ++ atomic_set(&srvTcp->inFlight,0); ++ /* BB Add code for ipv6 case too */ ++ srvTcp->ssocket = csocket; ++ srvTcp->protocolType = IPV4; ++ init_waitqueue_head(&srvTcp->response_q); ++ init_waitqueue_head(&srvTcp->request_q); ++ INIT_LIST_HEAD(&srvTcp->pending_mid_q); ++ /* at this point we are the only ones with the pointer ++ to the struct since the kernel thread not created yet ++ so no need to spinlock this init of tcpStatus */ ++ srvTcp->tcpStatus = CifsNew; ++ init_MUTEX(&srvTcp->tcpSem); ++ kernel_thread((void *)(void *)cifs_demultiplex_thread, srvTcp, ++ CLONE_FS | CLONE_FILES | CLONE_VM); ++ memcpy(srvTcp->workstation_RFC1001_name, volume_info.source_rfc1001_name,16); ++ } ++ } ++ ++ if (existingCifsSes) { ++ pSesInfo = existingCifsSes; ++ cFYI(1, ("Existing smb sess found ")); ++ if(volume_info.password) ++ kfree(volume_info.password); ++ /* volume_info.UNC freed at end of function */ ++ } else if (!rc) { ++ cFYI(1, ("Existing smb sess not found ")); ++ pSesInfo = sesInfoAlloc(); ++ if (pSesInfo == NULL) ++ rc = -ENOMEM; ++ else { ++ pSesInfo->server = srvTcp; ++ sprintf(pSesInfo->serverName, "%u.%u.%u.%u", ++ NIPQUAD(sin_server.sin_addr.s_addr)); ++ } ++ ++ if (!rc){ ++ /* volume_info.password freed at unmount */ ++ if (volume_info.password) ++ pSesInfo->password = volume_info.password; ++ if (volume_info.username) ++ strncpy(pSesInfo->userName, ++ volume_info.username,MAX_USERNAME_SIZE); ++ if (volume_info.domainname) ++ strncpy(pSesInfo->domainName, ++ volume_info.domainname,MAX_USERNAME_SIZE); ++ pSesInfo->linux_uid = volume_info.linux_uid; ++ down(&pSesInfo->sesSem); ++ rc = cifs_setup_session(xid,pSesInfo, cifs_sb->local_nls); ++ up(&pSesInfo->sesSem); ++ if(!rc) ++ atomic_inc(&srvTcp->socketUseCount); ++ } else ++ if(volume_info.password) ++ kfree(volume_info.password); ++ } ++ ++ /* search for existing tcon to this server share */ ++ if (!rc) { ++ if((volume_info.rsize) && (volume_info.rsize + MAX_CIFS_HDR_SIZE < srvTcp->maxBuf)) ++ cifs_sb->rsize = volume_info.rsize; ++ else ++ cifs_sb->rsize = srvTcp->maxBuf - MAX_CIFS_HDR_SIZE; /* default */ ++ if((volume_info.wsize) && (volume_info.wsize + MAX_CIFS_HDR_SIZE < srvTcp->maxBuf)) ++ cifs_sb->wsize = volume_info.wsize; ++ else ++ cifs_sb->wsize = srvTcp->maxBuf - MAX_CIFS_HDR_SIZE; /* default */ ++ if(cifs_sb->rsize < PAGE_CACHE_SIZE) { ++ cifs_sb->rsize = PAGE_CACHE_SIZE; ++ cERROR(1,("Attempt to set readsize for mount to less than one page (4096)")); ++ } ++ cifs_sb->mnt_uid = volume_info.linux_uid; ++ cifs_sb->mnt_gid = volume_info.linux_gid; ++ cifs_sb->mnt_file_mode = volume_info.file_mode; ++ cifs_sb->mnt_dir_mode = volume_info.dir_mode; ++ cFYI(1,("file mode: 0x%x dir mode: 0x%x",cifs_sb->mnt_file_mode,cifs_sb->mnt_dir_mode)); ++ tcon = ++ find_unc(sin_server.sin_addr.s_addr, volume_info.UNC, ++ volume_info.username); ++ if (tcon) { ++ cFYI(1, ("Found match on UNC path ")); ++ /* we can have only one retry value for a connection ++ to a share so for resources mounted more than once ++ to the same server share the last value passed in ++ for the retry flag is used */ ++ tcon->retry = volume_info.retry; ++ } else { ++ tcon = tconInfoAlloc(); ++ if (tcon == NULL) ++ rc = -ENOMEM; ++ else { ++ /* check for null share name ie connect to dfs root */ ++ ++ /* BB check if this works for exactly length three strings */ ++ if ((strchr(volume_info.UNC + 3, '\\') == NULL) ++ && (strchr(volume_info.UNC + 3, '/') == ++ NULL)) { ++ rc = connect_to_dfs_path(xid, ++ pSesInfo, ++ "", ++ cifs_sb-> ++ local_nls); ++ if(volume_info.UNC) ++ kfree(volume_info.UNC); ++ FreeXid(xid); ++ return -ENODEV; ++ } else { ++ rc = CIFSTCon(xid, pSesInfo, ++ volume_info.UNC, ++ tcon, cifs_sb->local_nls); ++ cFYI(1, ("CIFS Tcon rc = %d", rc)); ++ } ++ if (!rc) { ++ atomic_inc(&pSesInfo->inUse); ++ tcon->retry = volume_info.retry; ++ } ++ } ++ } ++ } ++ if(pSesInfo) { ++ if (pSesInfo->capabilities & CAP_LARGE_FILES) { ++ sb->s_maxbytes = (u64) 1 << 63; ++ } else ++ sb->s_maxbytes = (u64) 1 << 31; /* 2 GB */ ++ } ++ ++/* on error free sesinfo and tcon struct if needed */ ++ if (rc) { ++ /* if session setup failed, use count is zero but ++ we still need to free cifsd thread */ ++ if(atomic_read(&srvTcp->socketUseCount) == 0) { ++ spin_lock(&GlobalMid_Lock); ++ srvTcp->tcpStatus = CifsExiting; ++ spin_unlock(&GlobalMid_Lock); ++ if(srvTcp->tsk) ++ send_sig(SIGKILL,srvTcp->tsk,1); ++ } ++ /* If find_unc succeeded then rc == 0 so we can not end */ ++ if (tcon) /* up accidently freeing someone elses tcon struct */ ++ tconInfoFree(tcon); ++ if (existingCifsSes == 0) { ++ if (pSesInfo) { ++ if ((pSesInfo->server) && ++ (pSesInfo->status == CifsGood)) { ++ int temp_rc; ++ temp_rc = CIFSSMBLogoff(xid, pSesInfo); ++ /* if the socketUseCount is now zero */ ++ if((temp_rc == -ESHUTDOWN) && ++ (pSesInfo->server->tsk)) ++ send_sig(SIGKILL,pSesInfo->server->tsk,1); ++ } else ++ cFYI(1, ("No session or bad tcon")); ++ sesInfoFree(pSesInfo); ++ /* pSesInfo = NULL; */ ++ } ++ } ++ } else { ++ atomic_inc(&tcon->useCount); ++ cifs_sb->tcon = tcon; ++ tcon->ses = pSesInfo; ++ ++ /* do not care if following two calls succeed - informational only */ ++ CIFSSMBQFSDeviceInfo(xid, tcon, cifs_sb->local_nls); ++ CIFSSMBQFSAttributeInfo(xid, tcon, cifs_sb->local_nls); ++ if (tcon->ses->capabilities & CAP_UNIX) ++ CIFSSMBQFSUnixInfo(xid, tcon, cifs_sb->local_nls); ++ } ++ ++ /* volume_info.password is freed above when existing session found ++ (in which case it is not needed anymore) but when new sesion is created ++ the password ptr is put in the new session structure (in which case the ++ password will be freed at unmount time) */ ++ if(volume_info.UNC) ++ kfree(volume_info.UNC); ++ FreeXid(xid); ++ return rc; ++} ++ ++static int ++CIFSSessSetup(unsigned int xid, struct cifsSesInfo *ses, ++ char session_key[CIFS_SESSION_KEY_SIZE], ++ const struct nls_table *nls_codepage) ++{ ++ struct smb_hdr *smb_buffer; ++ struct smb_hdr *smb_buffer_response; ++ SESSION_SETUP_ANDX *pSMB; ++ SESSION_SETUP_ANDX *pSMBr; ++ char *bcc_ptr; ++ char *user = ses->userName; ++ char *domain = ses->domainName; ++ int rc = 0; ++ int remaining_words = 0; ++ int bytes_returned = 0; ++ int len; ++ ++ cFYI(1, ("In sesssetup ")); ++ ++ smb_buffer = cifs_buf_get(); ++ if (smb_buffer == 0) { ++ return -ENOMEM; ++ } ++ smb_buffer_response = smb_buffer; ++ pSMBr = pSMB = (SESSION_SETUP_ANDX *) smb_buffer; ++ ++ /* send SMBsessionSetup here */ ++ header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, ++ NULL /* no tCon exists yet */ , 13 /* wct */ ); ++ ++ pSMB->req_no_secext.AndXCommand = 0xFF; ++ pSMB->req_no_secext.MaxBufferSize = cpu_to_le16(ses->server->maxBuf); ++ pSMB->req_no_secext.MaxMpxCount = cpu_to_le16(ses->server->maxReq); ++ ++ if(ses->server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) ++ smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE; ++ ++ pSMB->req_no_secext.Capabilities = ++ CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS; ++ if (ses->capabilities & CAP_UNICODE) { ++ smb_buffer->Flags2 |= SMBFLG2_UNICODE; ++ pSMB->req_no_secext.Capabilities |= CAP_UNICODE; ++ } ++ if (ses->capabilities & CAP_STATUS32) { ++ smb_buffer->Flags2 |= SMBFLG2_ERR_STATUS; ++ pSMB->req_no_secext.Capabilities |= CAP_STATUS32; ++ } ++ if (ses->capabilities & CAP_DFS) { ++ smb_buffer->Flags2 |= SMBFLG2_DFS; ++ pSMB->req_no_secext.Capabilities |= CAP_DFS; ++ } ++ pSMB->req_no_secext.Capabilities = ++ cpu_to_le32(pSMB->req_no_secext.Capabilities); ++ /* pSMB->req_no_secext.CaseInsensitivePasswordLength = ++ CIFS_SESSION_KEY_SIZE; */ ++ pSMB->req_no_secext.CaseInsensitivePasswordLength = 0; ++ pSMB->req_no_secext.CaseSensitivePasswordLength = ++ cpu_to_le16(CIFS_SESSION_KEY_SIZE); ++ bcc_ptr = pByteArea(smb_buffer); ++ /* memcpy(bcc_ptr, (char *) lm_session_key, CIFS_SESSION_KEY_SIZE); ++ bcc_ptr += CIFS_SESSION_KEY_SIZE; */ ++ memcpy(bcc_ptr, (char *) session_key, CIFS_SESSION_KEY_SIZE); ++ bcc_ptr += CIFS_SESSION_KEY_SIZE; ++ ++ if (ses->capabilities & CAP_UNICODE) { ++ if ((long) bcc_ptr % 2) { /* must be word aligned for Unicode */ ++ *bcc_ptr = 0; ++ bcc_ptr++; ++ } ++ if(user == NULL) ++ bytes_returned = 0; /* skill null user */ ++ else ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, user, 100, ++ nls_codepage); ++ bcc_ptr += 2 * bytes_returned; /* convert num 16 bit words to bytes */ ++ bcc_ptr += 2; /* trailing null */ ++ if (domain == NULL) ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, ++ "CIFS_LINUX_DOM", 32, nls_codepage); ++ else ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, domain, 64, ++ nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bcc_ptr += 2; ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, "Linux version ", ++ 32, nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, UTS_RELEASE, 32, ++ nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bcc_ptr += 2; ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, CIFS_NETWORK_OPSYS, ++ 64, nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bcc_ptr += 2; ++ } else { ++ if(user != NULL) { ++ strncpy(bcc_ptr, user, 200); ++ bcc_ptr += strnlen(user, 200); ++ } ++ *bcc_ptr = 0; ++ bcc_ptr++; ++ if (domain == NULL) { ++ strcpy(bcc_ptr, "CIFS_LINUX_DOM"); ++ bcc_ptr += strlen("CIFS_LINUX_DOM") + 1; ++ } else { ++ strncpy(bcc_ptr, domain, 64); ++ bcc_ptr += strnlen(domain, 64); ++ *bcc_ptr = 0; ++ bcc_ptr++; ++ } ++ strcpy(bcc_ptr, "Linux version "); ++ bcc_ptr += strlen("Linux version "); ++ strcpy(bcc_ptr, UTS_RELEASE); ++ bcc_ptr += strlen(UTS_RELEASE) + 1; ++ strcpy(bcc_ptr, CIFS_NETWORK_OPSYS); ++ bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1; ++ } ++ BCC(smb_buffer) = (long) bcc_ptr - (long) pByteArea(smb_buffer); ++ smb_buffer->smb_buf_length += BCC(smb_buffer); ++ BCC(smb_buffer) = cpu_to_le16(BCC(smb_buffer)); ++ ++ rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, ++ &bytes_returned, 1); ++ if (rc) { ++/* rc = map_smb_to_linux_error(smb_buffer_response); now done in SendReceive */ ++ } else if ((smb_buffer_response->WordCount == 3) ++ || (smb_buffer_response->WordCount == 4)) { ++ pSMBr->resp.Action = le16_to_cpu(pSMBr->resp.Action); ++ if (pSMBr->resp.Action & GUEST_LOGIN) ++ cFYI(1, (" Guest login")); /* do we want to mark SesInfo struct ? */ ++ if (ses) { ++ ses->Suid = smb_buffer_response->Uid; /* UID left in wire format (le) */ ++ cFYI(1, ("UID = %d ", ses->Suid)); ++ /* response can have either 3 or 4 word count - Samba sends 3 */ ++ bcc_ptr = pByteArea(smb_buffer_response); ++ if ((pSMBr->resp.hdr.WordCount == 3) ++ || ((pSMBr->resp.hdr.WordCount == 4) ++ && (pSMBr->resp.SecurityBlobLength < ++ pSMBr->resp.ByteCount))) { ++ if (pSMBr->resp.hdr.WordCount == 4) ++ bcc_ptr += ++ pSMBr->resp.SecurityBlobLength; ++ ++ if (smb_buffer->Flags2 & SMBFLG2_UNICODE) { ++ if ((long) (bcc_ptr) % 2) { ++ remaining_words = ++ (BCC(smb_buffer_response) ++ - 1) / 2; ++ bcc_ptr++; /* Unicode strings must be word aligned */ ++ } else { ++ remaining_words = ++ BCC ++ (smb_buffer_response) / 2; ++ } ++ len = ++ UniStrnlen((wchar_t *) bcc_ptr, ++ remaining_words - 1); ++/* We look for obvious messed up bcc or strings in response so we do not go off ++ the end since (at least) WIN2K and Windows XP have a major bug in not null ++ terminating last Unicode string in response */ ++ ses->serverOS = cifs_kcalloc(2 * (len + 1), GFP_KERNEL); ++ cifs_strfromUCS_le(ses->serverOS, ++ (wchar_t *)bcc_ptr, len,nls_codepage); ++ bcc_ptr += 2 * (len + 1); ++ remaining_words -= len + 1; ++ ses->serverOS[2 * len] = 0; ++ ses->serverOS[1 + (2 * len)] = 0; ++ if (remaining_words > 0) { ++ len = UniStrnlen((wchar_t *)bcc_ptr, ++ remaining_words ++ - 1); ++ ses->serverNOS =cifs_kcalloc(2 * (len + 1),GFP_KERNEL); ++ cifs_strfromUCS_le(ses->serverNOS, ++ (wchar_t *)bcc_ptr,len,nls_codepage); ++ bcc_ptr += 2 * (len + 1); ++ ses->serverNOS[2 * len] = 0; ++ ses->serverNOS[1 + (2 * len)] = 0; ++ remaining_words -= len + 1; ++ if (remaining_words > 0) { ++ len = UniStrnlen((wchar_t *) bcc_ptr, remaining_words); ++ /* last string is not always null terminated (for e.g. for Windows XP & 2000) */ ++ ses->serverDomain = ++ cifs_kcalloc(2*(len+1),GFP_KERNEL); ++ cifs_strfromUCS_le(ses->serverDomain, ++ (wchar_t *)bcc_ptr,len,nls_codepage); ++ bcc_ptr += 2 * (len + 1); ++ ses->serverDomain[2*len] = 0; ++ ses->serverDomain[1+(2*len)] = 0; ++ } /* else no more room so create dummy domain string */ ++ else ++ ses->serverDomain = ++ cifs_kcalloc(2, ++ GFP_KERNEL); ++ } else { /* no room so create dummy domain and NOS string */ ++ ses->serverDomain = ++ cifs_kcalloc(2, GFP_KERNEL); ++ ses->serverNOS = ++ cifs_kcalloc(2, GFP_KERNEL); ++ } ++ } else { /* ASCII */ ++ len = strnlen(bcc_ptr, 1024); ++ if (((long) bcc_ptr + len) - (long) ++ pByteArea(smb_buffer_response) ++ <= BCC(smb_buffer_response)) { ++ ses->serverOS = cifs_kcalloc(len + 1,GFP_KERNEL); ++ strncpy(ses->serverOS,bcc_ptr, len); ++ ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; /* null terminate the string */ ++ bcc_ptr++; ++ ++ len = strnlen(bcc_ptr, 1024); ++ ses->serverNOS = cifs_kcalloc(len + 1,GFP_KERNEL); ++ strncpy(ses->serverNOS, bcc_ptr, len); ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; ++ bcc_ptr++; ++ ++ len = strnlen(bcc_ptr, 1024); ++ ses->serverDomain = cifs_kcalloc(len + 1,GFP_KERNEL); ++ strncpy(ses->serverDomain, bcc_ptr, len); ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; ++ bcc_ptr++; ++ } else ++ cFYI(1, ++ ("Variable field of length %d extends beyond end of smb ", ++ len)); ++ } ++ } else { ++ cERROR(1, ++ (" Security Blob Length extends beyond end of SMB")); ++ } ++ } else { ++ cERROR(1, ("No session structure passed in.")); ++ } ++ } else { ++ cERROR(1, ++ (" Invalid Word count %d: ", ++ smb_buffer_response->WordCount)); ++ rc = -EIO; ++ } ++ ++ if (smb_buffer) ++ cifs_buf_release(smb_buffer); ++ ++ return rc; ++} ++ ++static int ++CIFSSpnegoSessSetup(unsigned int xid, struct cifsSesInfo *ses, ++ char *SecurityBlob,int SecurityBlobLength, ++ const struct nls_table *nls_codepage) ++{ ++ struct smb_hdr *smb_buffer; ++ struct smb_hdr *smb_buffer_response; ++ SESSION_SETUP_ANDX *pSMB; ++ SESSION_SETUP_ANDX *pSMBr; ++ char *bcc_ptr; ++ char *user = ses->userName; ++ char *domain = ses->domainName; ++ int rc = 0; ++ int remaining_words = 0; ++ int bytes_returned = 0; ++ int len; ++ ++ cFYI(1, ("In spnego sesssetup ")); ++ ++ smb_buffer = cifs_buf_get(); ++ if (smb_buffer == 0) { ++ return -ENOMEM; ++ } ++ smb_buffer_response = smb_buffer; ++ pSMBr = pSMB = (SESSION_SETUP_ANDX *) smb_buffer; ++ ++ /* send SMBsessionSetup here */ ++ header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, ++ NULL /* no tCon exists yet */ , 12 /* wct */ ); ++ pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC; ++ pSMB->req.AndXCommand = 0xFF; ++ pSMB->req.MaxBufferSize = cpu_to_le16(ses->server->maxBuf); ++ pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq); ++ ++ if(ses->server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) ++ smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE; ++ ++ pSMB->req.Capabilities = ++ CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS | ++ CAP_EXTENDED_SECURITY; ++ if (ses->capabilities & CAP_UNICODE) { ++ smb_buffer->Flags2 |= SMBFLG2_UNICODE; ++ pSMB->req.Capabilities |= CAP_UNICODE; ++ } ++ if (ses->capabilities & CAP_STATUS32) { ++ smb_buffer->Flags2 |= SMBFLG2_ERR_STATUS; ++ pSMB->req.Capabilities |= CAP_STATUS32; ++ } ++ if (ses->capabilities & CAP_DFS) { ++ smb_buffer->Flags2 |= SMBFLG2_DFS; ++ pSMB->req.Capabilities |= CAP_DFS; ++ } ++ pSMB->req.Capabilities = cpu_to_le32(pSMB->req.Capabilities); ++ ++ pSMB->req.SecurityBlobLength = cpu_to_le16(SecurityBlobLength); ++ bcc_ptr = pByteArea(smb_buffer); ++ memcpy(bcc_ptr, SecurityBlob, SecurityBlobLength); ++ bcc_ptr += SecurityBlobLength; ++ ++ if (ses->capabilities & CAP_UNICODE) { ++ if ((long) bcc_ptr % 2) { /* must be word aligned for Unicode strings */ ++ *bcc_ptr = 0; ++ bcc_ptr++; ++ } ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, user, 100, nls_codepage); ++ bcc_ptr += 2 * bytes_returned; /* convert num of 16 bit words to bytes */ ++ bcc_ptr += 2; /* trailing null */ ++ if (domain == NULL) ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, ++ "CIFS_LINUX_DOM", 32, nls_codepage); ++ else ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, domain, 64, ++ nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bcc_ptr += 2; ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, "Linux version ", ++ 32, nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, UTS_RELEASE, 32, ++ nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bcc_ptr += 2; ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, CIFS_NETWORK_OPSYS, ++ 64, nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bcc_ptr += 2; ++ } else { ++ strncpy(bcc_ptr, user, 200); ++ bcc_ptr += strnlen(user, 200); ++ *bcc_ptr = 0; ++ bcc_ptr++; ++ if (domain == NULL) { ++ strcpy(bcc_ptr, "CIFS_LINUX_DOM"); ++ bcc_ptr += strlen("CIFS_LINUX_DOM") + 1; ++ } else { ++ strncpy(bcc_ptr, domain, 64); ++ bcc_ptr += strnlen(domain, 64); ++ *bcc_ptr = 0; ++ bcc_ptr++; ++ } ++ strcpy(bcc_ptr, "Linux version "); ++ bcc_ptr += strlen("Linux version "); ++ strcpy(bcc_ptr, UTS_RELEASE); ++ bcc_ptr += strlen(UTS_RELEASE) + 1; ++ strcpy(bcc_ptr, CIFS_NETWORK_OPSYS); ++ bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1; ++ } ++ BCC(smb_buffer) = (long) bcc_ptr - (long) pByteArea(smb_buffer); ++ smb_buffer->smb_buf_length += BCC(smb_buffer); ++ BCC(smb_buffer) = cpu_to_le16(BCC(smb_buffer)); ++ ++ rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, ++ &bytes_returned, 1); ++ if (rc) { ++/* rc = map_smb_to_linux_error(smb_buffer_response); *//* done in SendReceive now */ ++ } else if ((smb_buffer_response->WordCount == 3) ++ || (smb_buffer_response->WordCount == 4)) { ++ pSMBr->resp.Action = le16_to_cpu(pSMBr->resp.Action); ++ pSMBr->resp.SecurityBlobLength = ++ le16_to_cpu(pSMBr->resp.SecurityBlobLength); ++ if (pSMBr->resp.Action & GUEST_LOGIN) ++ cFYI(1, (" Guest login")); /* BB do we want to set anything in SesInfo struct ? */ ++ if (ses) { ++ ses->Suid = smb_buffer_response->Uid; /* UID left in wire format (le) */ ++ cFYI(1, ("UID = %d ", ses->Suid)); ++ bcc_ptr = pByteArea(smb_buffer_response); /* response can have either 3 or 4 word count - Samba sends 3 */ ++ ++ /* BB Fix below to make endian neutral !! */ ++ ++ if ((pSMBr->resp.hdr.WordCount == 3) ++ || ((pSMBr->resp.hdr.WordCount == 4) ++ && (pSMBr->resp.SecurityBlobLength < ++ pSMBr->resp.ByteCount))) { ++ if (pSMBr->resp.hdr.WordCount == 4) { ++ bcc_ptr += ++ pSMBr->resp.SecurityBlobLength; ++ cFYI(1, ++ ("Security Blob Length %d ", ++ pSMBr->resp.SecurityBlobLength)); ++ } ++ ++ if (smb_buffer->Flags2 & SMBFLG2_UNICODE) { ++ if ((long) (bcc_ptr) % 2) { ++ remaining_words = ++ (BCC(smb_buffer_response) ++ - 1) / 2; ++ bcc_ptr++; /* Unicode strings must be word aligned */ ++ } else { ++ remaining_words = ++ BCC ++ (smb_buffer_response) / 2; ++ } ++ len = ++ UniStrnlen((wchar_t *) bcc_ptr, ++ remaining_words - 1); ++/* We look for obvious messed up bcc or strings in response so we do not go off ++ the end since (at least) WIN2K and Windows XP have a major bug in not null ++ terminating last Unicode string in response */ ++ ses->serverOS = ++ cifs_kcalloc(2 * (len + 1), GFP_KERNEL); ++ cifs_strfromUCS_le(ses->serverOS, ++ (wchar_t *) ++ bcc_ptr, len, ++ nls_codepage); ++ bcc_ptr += 2 * (len + 1); ++ remaining_words -= len + 1; ++ ses->serverOS[2 * len] = 0; ++ ses->serverOS[1 + (2 * len)] = 0; ++ if (remaining_words > 0) { ++ len = UniStrnlen((wchar_t *)bcc_ptr, ++ remaining_words ++ - 1); ++ ses->serverNOS = ++ cifs_kcalloc(2 * (len + 1), ++ GFP_KERNEL); ++ cifs_strfromUCS_le(ses->serverNOS, ++ (wchar_t *)bcc_ptr, ++ len, ++ nls_codepage); ++ bcc_ptr += 2 * (len + 1); ++ ses->serverNOS[2 * len] = 0; ++ ses->serverNOS[1 + (2 * len)] = 0; ++ remaining_words -= len + 1; ++ if (remaining_words > 0) { ++ len = UniStrnlen((wchar_t *) bcc_ptr, remaining_words); ++ /* last string is not always null terminated (for e.g. for Windows XP & 2000) */ ++ ses->serverDomain = cifs_kcalloc(2*(len+1),GFP_KERNEL); ++ cifs_strfromUCS_le(ses->serverDomain, ++ (wchar_t *)bcc_ptr, ++ len, ++ nls_codepage); ++ bcc_ptr += 2*(len+1); ++ ses->serverDomain[2*len] = 0; ++ ses->serverDomain[1+(2*len)] = 0; ++ } /* else no more room so create dummy domain string */ ++ else ++ ses->serverDomain = ++ cifs_kcalloc(2,GFP_KERNEL); ++ } else { /* no room so create dummy domain and NOS string */ ++ ses->serverDomain = cifs_kcalloc(2, GFP_KERNEL); ++ ses->serverNOS = cifs_kcalloc(2, GFP_KERNEL); ++ } ++ } else { /* ASCII */ ++ ++ len = strnlen(bcc_ptr, 1024); ++ if (((long) bcc_ptr + len) - (long) ++ pByteArea(smb_buffer_response) ++ <= BCC(smb_buffer_response)) { ++ ses->serverOS = cifs_kcalloc(len + 1, GFP_KERNEL); ++ strncpy(ses->serverOS, bcc_ptr, len); ++ ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; /* null terminate the string */ ++ bcc_ptr++; ++ ++ len = strnlen(bcc_ptr, 1024); ++ ses->serverNOS = cifs_kcalloc(len + 1,GFP_KERNEL); ++ strncpy(ses->serverNOS, bcc_ptr, len); ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; ++ bcc_ptr++; ++ ++ len = strnlen(bcc_ptr, 1024); ++ ses->serverDomain = cifs_kcalloc(len + 1, GFP_KERNEL); ++ strncpy(ses->serverDomain, bcc_ptr, len); ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; ++ bcc_ptr++; ++ } else ++ cFYI(1, ++ ("Variable field of length %d extends beyond end of smb ", ++ len)); ++ } ++ } else { ++ cERROR(1, ++ (" Security Blob Length extends beyond end of SMB")); ++ } ++ } else { ++ cERROR(1, ("No session structure passed in.")); ++ } ++ } else { ++ cERROR(1, ++ (" Invalid Word count %d: ", ++ smb_buffer_response->WordCount)); ++ rc = -EIO; ++ } ++ ++ if (smb_buffer) ++ cifs_buf_release(smb_buffer); ++ ++ return rc; ++} ++ ++static int ++CIFSNTLMSSPNegotiateSessSetup(unsigned int xid, ++ struct cifsSesInfo *ses, int * pNTLMv2_flag, ++ const struct nls_table *nls_codepage) ++{ ++ struct smb_hdr *smb_buffer; ++ struct smb_hdr *smb_buffer_response; ++ SESSION_SETUP_ANDX *pSMB; ++ SESSION_SETUP_ANDX *pSMBr; ++ char *bcc_ptr; ++ char *domain = ses->domainName; ++ int rc = 0; ++ int remaining_words = 0; ++ int bytes_returned = 0; ++ int len; ++ int SecurityBlobLength = sizeof (NEGOTIATE_MESSAGE); ++ PNEGOTIATE_MESSAGE SecurityBlob; ++ PCHALLENGE_MESSAGE SecurityBlob2; ++ ++ cFYI(1, ("In NTLMSSP sesssetup (negotiate) ")); ++ *pNTLMv2_flag = FALSE; ++ smb_buffer = cifs_buf_get(); ++ if (smb_buffer == 0) { ++ return -ENOMEM; ++ } ++ smb_buffer_response = smb_buffer; ++ pSMB = (SESSION_SETUP_ANDX *) smb_buffer; ++ pSMBr = (SESSION_SETUP_ANDX *) smb_buffer_response; ++ ++ /* send SMBsessionSetup here */ ++ header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, ++ NULL /* no tCon exists yet */ , 12 /* wct */ ); ++ pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC; ++ pSMB->req.hdr.Flags |= (SMBFLG_CASELESS | SMBFLG_CANONICAL_PATH_FORMAT); ++ ++ pSMB->req.AndXCommand = 0xFF; ++ pSMB->req.MaxBufferSize = cpu_to_le16(ses->server->maxBuf); ++ pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq); ++ ++ if(ses->server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) ++ smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE; ++ ++ pSMB->req.Capabilities = ++ CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS | ++ CAP_EXTENDED_SECURITY; ++ if (ses->capabilities & CAP_UNICODE) { ++ smb_buffer->Flags2 |= SMBFLG2_UNICODE; ++ pSMB->req.Capabilities |= CAP_UNICODE; ++ } ++ if (ses->capabilities & CAP_STATUS32) { ++ smb_buffer->Flags2 |= SMBFLG2_ERR_STATUS; ++ pSMB->req.Capabilities |= CAP_STATUS32; ++ } ++ if (ses->capabilities & CAP_DFS) { ++ smb_buffer->Flags2 |= SMBFLG2_DFS; ++ pSMB->req.Capabilities |= CAP_DFS; ++ } ++ pSMB->req.Capabilities = cpu_to_le32(pSMB->req.Capabilities); ++ ++ bcc_ptr = (char *) &pSMB->req.SecurityBlob; ++ SecurityBlob = (PNEGOTIATE_MESSAGE) bcc_ptr; ++ strncpy(SecurityBlob->Signature, NTLMSSP_SIGNATURE, 8); ++ SecurityBlob->MessageType = NtLmNegotiate; ++ SecurityBlob->NegotiateFlags = ++ NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_OEM | ++ NTLMSSP_REQUEST_TARGET | NTLMSSP_NEGOTIATE_NTLM | 0x80000000 | ++ /* NTLMSSP_NEGOTIATE_ALWAYS_SIGN | */ NTLMSSP_NEGOTIATE_128; ++ if(sign_CIFS_PDUs) ++ SecurityBlob->NegotiateFlags |= NTLMSSP_NEGOTIATE_SIGN; ++ if(ntlmv2_support) ++ SecurityBlob->NegotiateFlags |= NTLMSSP_NEGOTIATE_NTLMV2; ++ /* setup pointers to domain name and workstation name */ ++ bcc_ptr += SecurityBlobLength; ++ ++ SecurityBlob->WorkstationName.Buffer = 0; ++ SecurityBlob->WorkstationName.Length = 0; ++ SecurityBlob->WorkstationName.MaximumLength = 0; ++ ++ if (domain == NULL) { ++ SecurityBlob->DomainName.Buffer = 0; ++ SecurityBlob->DomainName.Length = 0; ++ SecurityBlob->DomainName.MaximumLength = 0; ++ } else { ++ SecurityBlob->NegotiateFlags |= ++ NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED; ++ strncpy(bcc_ptr, domain, 63); ++ SecurityBlob->DomainName.Length = strnlen(domain, 64); ++ SecurityBlob->DomainName.MaximumLength = ++ cpu_to_le16(SecurityBlob->DomainName.Length); ++ SecurityBlob->DomainName.Buffer = ++ cpu_to_le32((long) &SecurityBlob-> ++ DomainString - ++ (long) &SecurityBlob->Signature); ++ bcc_ptr += SecurityBlob->DomainName.Length; ++ SecurityBlobLength += SecurityBlob->DomainName.Length; ++ SecurityBlob->DomainName.Length = ++ cpu_to_le16(SecurityBlob->DomainName.Length); ++ } ++ if (ses->capabilities & CAP_UNICODE) { ++ if ((long) bcc_ptr % 2) { ++ *bcc_ptr = 0; ++ bcc_ptr++; ++ } ++ ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, "Linux version ", ++ 32, nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, UTS_RELEASE, 32, ++ nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bcc_ptr += 2; /* null terminate Linux version */ ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, CIFS_NETWORK_OPSYS, ++ 64, nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ *(bcc_ptr + 1) = 0; ++ *(bcc_ptr + 2) = 0; ++ bcc_ptr += 2; /* null terminate network opsys string */ ++ *(bcc_ptr + 1) = 0; ++ *(bcc_ptr + 2) = 0; ++ bcc_ptr += 2; /* null domain */ ++ } else { /* ASCII */ ++ strcpy(bcc_ptr, "Linux version "); ++ bcc_ptr += strlen("Linux version "); ++ strcpy(bcc_ptr, UTS_RELEASE); ++ bcc_ptr += strlen(UTS_RELEASE) + 1; ++ strcpy(bcc_ptr, CIFS_NETWORK_OPSYS); ++ bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1; ++ bcc_ptr++; /* empty domain field */ ++ *bcc_ptr = 0; ++ } ++ SecurityBlob->NegotiateFlags = ++ cpu_to_le32(SecurityBlob->NegotiateFlags); ++ pSMB->req.SecurityBlobLength = cpu_to_le16(SecurityBlobLength); ++ BCC(smb_buffer) = (long) bcc_ptr - (long) pByteArea(smb_buffer); ++ smb_buffer->smb_buf_length += BCC(smb_buffer); ++ BCC(smb_buffer) = cpu_to_le16(BCC(smb_buffer)); ++ ++ rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, ++ &bytes_returned, 1); ++ ++ if (smb_buffer_response->Status.CifsError == ++ (NT_STATUS_MORE_PROCESSING_REQUIRED)) ++ rc = 0; ++ ++ if (rc) { ++/* rc = map_smb_to_linux_error(smb_buffer_response); *//* done in SendReceive now */ ++ } else if ((smb_buffer_response->WordCount == 3) ++ || (smb_buffer_response->WordCount == 4)) { ++ pSMBr->resp.Action = le16_to_cpu(pSMBr->resp.Action); ++ pSMBr->resp.SecurityBlobLength = ++ le16_to_cpu(pSMBr->resp.SecurityBlobLength); ++ if (pSMBr->resp.Action & GUEST_LOGIN) ++ cFYI(1, (" Guest login")); ++ /* Do we want to set anything in SesInfo struct when guest login? */ ++ ++ bcc_ptr = pByteArea(smb_buffer_response); ++ /* response can have either 3 or 4 word count - Samba sends 3 */ ++ ++ SecurityBlob2 = (PCHALLENGE_MESSAGE) bcc_ptr; ++ if (SecurityBlob2->MessageType != NtLmChallenge) { ++ cFYI(1, ++ ("Unexpected NTLMSSP message type received %d", ++ SecurityBlob2->MessageType)); ++ } else if (ses) { ++ ses->Suid = smb_buffer_response->Uid; /* UID left in le format */ ++ cFYI(1, ("UID = %d ", ses->Suid)); ++ if ((pSMBr->resp.hdr.WordCount == 3) ++ || ((pSMBr->resp.hdr.WordCount == 4) ++ && (pSMBr->resp.SecurityBlobLength < ++ pSMBr->resp.ByteCount))) { ++ if (pSMBr->resp.hdr.WordCount == 4) { ++ bcc_ptr += ++ pSMBr->resp.SecurityBlobLength; ++ cFYI(1, ++ ("Security Blob Length %d ", ++ pSMBr->resp.SecurityBlobLength)); ++ } ++ ++ cFYI(1, ("NTLMSSP Challenge rcvd ")); ++ ++ memcpy(ses->server->cryptKey, ++ SecurityBlob2->Challenge, ++ CIFS_CRYPTO_KEY_SIZE); ++ if(SecurityBlob2->NegotiateFlags & NTLMSSP_NEGOTIATE_NTLMV2) ++ *pNTLMv2_flag = TRUE; ++ ++ if((SecurityBlob2->NegotiateFlags & ++ NTLMSSP_NEGOTIATE_ALWAYS_SIGN) ++ || (sign_CIFS_PDUs > 1)) ++ ses->server->secMode |= ++ SECMODE_SIGN_REQUIRED; ++ if ((SecurityBlob2->NegotiateFlags & ++ NTLMSSP_NEGOTIATE_SIGN) && (sign_CIFS_PDUs)) ++ ses->server->secMode |= ++ SECMODE_SIGN_ENABLED; ++ ++ if (smb_buffer->Flags2 & SMBFLG2_UNICODE) { ++ if ((long) (bcc_ptr) % 2) { ++ remaining_words = ++ (BCC(smb_buffer_response) ++ - 1) / 2; ++ bcc_ptr++; /* Unicode strings must be word aligned */ ++ } else { ++ remaining_words = ++ BCC ++ (smb_buffer_response) / 2; ++ } ++ len = ++ UniStrnlen((wchar_t *) bcc_ptr, ++ remaining_words - 1); ++/* We look for obvious messed up bcc or strings in response so we do not go off ++ the end since (at least) WIN2K and Windows XP have a major bug in not null ++ terminating last Unicode string in response */ ++ ses->serverOS = ++ cifs_kcalloc(2 * (len + 1), GFP_KERNEL); ++ cifs_strfromUCS_le(ses->serverOS, ++ (wchar_t *) ++ bcc_ptr, len, ++ nls_codepage); ++ bcc_ptr += 2 * (len + 1); ++ remaining_words -= len + 1; ++ ses->serverOS[2 * len] = 0; ++ ses->serverOS[1 + (2 * len)] = 0; ++ if (remaining_words > 0) { ++ len = UniStrnlen((wchar_t *) ++ bcc_ptr, ++ remaining_words ++ - 1); ++ ses->serverNOS = ++ cifs_kcalloc(2 * (len + 1), ++ GFP_KERNEL); ++ cifs_strfromUCS_le(ses-> ++ serverNOS, ++ (wchar_t *) ++ bcc_ptr, ++ len, ++ nls_codepage); ++ bcc_ptr += 2 * (len + 1); ++ ses->serverNOS[2 * len] = 0; ++ ses->serverNOS[1 + ++ (2 * len)] = 0; ++ remaining_words -= len + 1; ++ if (remaining_words > 0) { ++ len = UniStrnlen((wchar_t *) bcc_ptr, remaining_words); ++ /* last string is not always null terminated (for e.g. for Windows XP & 2000) */ ++ ses->serverDomain = ++ cifs_kcalloc(2 * ++ (len + ++ 1), ++ GFP_KERNEL); ++ cifs_strfromUCS_le ++ (ses-> ++ serverDomain, ++ (wchar_t *) ++ bcc_ptr, len, ++ nls_codepage); ++ bcc_ptr += ++ 2 * (len + 1); ++ ses-> ++ serverDomain[2 ++ * len] ++ = 0; ++ ses-> ++ serverDomain[1 ++ + ++ (2 ++ * ++ len)] ++ = 0; ++ } /* else no more room so create dummy domain string */ ++ else ++ ses->serverDomain = ++ cifs_kcalloc(2, ++ GFP_KERNEL); ++ } else { /* no room so create dummy domain and NOS string */ ++ ses->serverDomain = ++ cifs_kcalloc(2, GFP_KERNEL); ++ ses->serverNOS = ++ cifs_kcalloc(2, GFP_KERNEL); ++ } ++ } else { /* ASCII */ ++ len = strnlen(bcc_ptr, 1024); ++ if (((long) bcc_ptr + len) - (long) ++ pByteArea(smb_buffer_response) ++ <= BCC(smb_buffer_response)) { ++ ses->serverOS = ++ cifs_kcalloc(len + 1, ++ GFP_KERNEL); ++ strncpy(ses->serverOS, ++ bcc_ptr, len); ++ ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; /* null terminate string */ ++ bcc_ptr++; ++ ++ len = strnlen(bcc_ptr, 1024); ++ ses->serverNOS = ++ cifs_kcalloc(len + 1, ++ GFP_KERNEL); ++ strncpy(ses->serverNOS, bcc_ptr, len); ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; ++ bcc_ptr++; ++ ++ len = strnlen(bcc_ptr, 1024); ++ ses->serverDomain = ++ cifs_kcalloc(len + 1, ++ GFP_KERNEL); ++ strncpy(ses->serverDomain, bcc_ptr, len); ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; ++ bcc_ptr++; ++ } else ++ cFYI(1, ++ ("Variable field of length %d extends beyond end of smb ", ++ len)); ++ } ++ } else { ++ cERROR(1, ++ (" Security Blob Length extends beyond end of SMB")); ++ } ++ } else { ++ cERROR(1, ("No session structure passed in.")); ++ } ++ } else { ++ cERROR(1, ++ (" Invalid Word count %d: ", ++ smb_buffer_response->WordCount)); ++ rc = -EIO; ++ } ++ ++ if (smb_buffer) ++ cifs_buf_release(smb_buffer); ++ ++ return rc; ++} ++ ++static int ++CIFSNTLMSSPAuthSessSetup(unsigned int xid, struct cifsSesInfo *ses, ++ char *ntlm_session_key, int ntlmv2_flag, ++ const struct nls_table *nls_codepage) ++{ ++ struct smb_hdr *smb_buffer; ++ struct smb_hdr *smb_buffer_response; ++ SESSION_SETUP_ANDX *pSMB; ++ SESSION_SETUP_ANDX *pSMBr; ++ char *bcc_ptr; ++ char *user = ses->userName; ++ char *domain = ses->domainName; ++ int rc = 0; ++ int remaining_words = 0; ++ int bytes_returned = 0; ++ int len; ++ int SecurityBlobLength = sizeof (AUTHENTICATE_MESSAGE); ++ PAUTHENTICATE_MESSAGE SecurityBlob; ++ ++ cFYI(1, ("In NTLMSSPSessSetup (Authenticate)")); ++ ++ smb_buffer = cifs_buf_get(); ++ if (smb_buffer == 0) { ++ return -ENOMEM; ++ } ++ smb_buffer_response = smb_buffer; ++ pSMB = (SESSION_SETUP_ANDX *) smb_buffer; ++ pSMBr = (SESSION_SETUP_ANDX *) smb_buffer_response; ++ ++ /* send SMBsessionSetup here */ ++ header_assemble(smb_buffer, SMB_COM_SESSION_SETUP_ANDX, ++ NULL /* no tCon exists yet */ , 12 /* wct */ ); ++ pSMB->req.hdr.Flags |= (SMBFLG_CASELESS | SMBFLG_CANONICAL_PATH_FORMAT); ++ pSMB->req.hdr.Flags2 |= SMBFLG2_EXT_SEC; ++ pSMB->req.AndXCommand = 0xFF; ++ pSMB->req.MaxBufferSize = cpu_to_le16(ses->server->maxBuf); ++ pSMB->req.MaxMpxCount = cpu_to_le16(ses->server->maxReq); ++ ++ pSMB->req.hdr.Uid = ses->Suid; ++ ++ if(ses->server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) ++ smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE; ++ ++ pSMB->req.Capabilities = ++ CAP_LARGE_FILES | CAP_NT_SMBS | CAP_LEVEL_II_OPLOCKS | ++ CAP_EXTENDED_SECURITY; ++ if (ses->capabilities & CAP_UNICODE) { ++ smb_buffer->Flags2 |= SMBFLG2_UNICODE; ++ pSMB->req.Capabilities |= CAP_UNICODE; ++ } ++ if (ses->capabilities & CAP_STATUS32) { ++ smb_buffer->Flags2 |= SMBFLG2_ERR_STATUS; ++ pSMB->req.Capabilities |= CAP_STATUS32; ++ } ++ if (ses->capabilities & CAP_DFS) { ++ smb_buffer->Flags2 |= SMBFLG2_DFS; ++ pSMB->req.Capabilities |= CAP_DFS; ++ } ++ pSMB->req.Capabilities = cpu_to_le32(pSMB->req.Capabilities); ++ ++ bcc_ptr = (char *) &pSMB->req.SecurityBlob; ++ SecurityBlob = (PAUTHENTICATE_MESSAGE) bcc_ptr; ++ strncpy(SecurityBlob->Signature, NTLMSSP_SIGNATURE, 8); ++ SecurityBlob->MessageType = NtLmAuthenticate; ++ bcc_ptr += SecurityBlobLength; ++ SecurityBlob->NegotiateFlags = ++ NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_REQUEST_TARGET | ++ NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_TARGET_INFO | ++ 0x80000000 | NTLMSSP_NEGOTIATE_128; ++ if(sign_CIFS_PDUs) ++ SecurityBlob->NegotiateFlags |= /* NTLMSSP_NEGOTIATE_ALWAYS_SIGN |*/ NTLMSSP_NEGOTIATE_SIGN; ++ if(ntlmv2_flag) ++ SecurityBlob->NegotiateFlags |= NTLMSSP_NEGOTIATE_NTLMV2; ++ ++/* setup pointers to domain name and workstation name */ ++ ++ SecurityBlob->WorkstationName.Buffer = 0; ++ SecurityBlob->WorkstationName.Length = 0; ++ SecurityBlob->WorkstationName.MaximumLength = 0; ++ SecurityBlob->SessionKey.Length = 0; ++ SecurityBlob->SessionKey.MaximumLength = 0; ++ SecurityBlob->SessionKey.Buffer = 0; ++ ++ SecurityBlob->LmChallengeResponse.Length = 0; ++ SecurityBlob->LmChallengeResponse.MaximumLength = 0; ++ SecurityBlob->LmChallengeResponse.Buffer = 0; ++ ++ SecurityBlob->NtChallengeResponse.Length = ++ cpu_to_le16(CIFS_SESSION_KEY_SIZE); ++ SecurityBlob->NtChallengeResponse.MaximumLength = ++ cpu_to_le16(CIFS_SESSION_KEY_SIZE); ++ memcpy(bcc_ptr, ntlm_session_key, CIFS_SESSION_KEY_SIZE); ++ SecurityBlob->NtChallengeResponse.Buffer = ++ cpu_to_le32(SecurityBlobLength); ++ SecurityBlobLength += CIFS_SESSION_KEY_SIZE; ++ bcc_ptr += CIFS_SESSION_KEY_SIZE; ++ ++ if (ses->capabilities & CAP_UNICODE) { ++ if (domain == NULL) { ++ SecurityBlob->DomainName.Buffer = 0; ++ SecurityBlob->DomainName.Length = 0; ++ SecurityBlob->DomainName.MaximumLength = 0; ++ } else { ++ SecurityBlob->DomainName.Length = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, domain, 64, ++ nls_codepage); ++ SecurityBlob->DomainName.Length *= 2; ++ SecurityBlob->DomainName.MaximumLength = ++ cpu_to_le16(SecurityBlob->DomainName.Length); ++ SecurityBlob->DomainName.Buffer = ++ cpu_to_le32(SecurityBlobLength); ++ bcc_ptr += SecurityBlob->DomainName.Length; ++ SecurityBlobLength += SecurityBlob->DomainName.Length; ++ SecurityBlob->DomainName.Length = ++ cpu_to_le16(SecurityBlob->DomainName.Length); ++ } ++ if (user == NULL) { ++ SecurityBlob->UserName.Buffer = 0; ++ SecurityBlob->UserName.Length = 0; ++ SecurityBlob->UserName.MaximumLength = 0; ++ } else { ++ SecurityBlob->UserName.Length = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, user, 64, ++ nls_codepage); ++ SecurityBlob->UserName.Length *= 2; ++ SecurityBlob->UserName.MaximumLength = ++ cpu_to_le16(SecurityBlob->UserName.Length); ++ SecurityBlob->UserName.Buffer = ++ cpu_to_le32(SecurityBlobLength); ++ bcc_ptr += SecurityBlob->UserName.Length; ++ SecurityBlobLength += SecurityBlob->UserName.Length; ++ SecurityBlob->UserName.Length = ++ cpu_to_le16(SecurityBlob->UserName.Length); ++ } ++ ++ /* SecurityBlob->WorkstationName.Length = cifs_strtoUCS((wchar_t *) bcc_ptr, "AMACHINE",64, nls_codepage); ++ SecurityBlob->WorkstationName.Length *= 2; ++ SecurityBlob->WorkstationName.MaximumLength = cpu_to_le16(SecurityBlob->WorkstationName.Length); ++ SecurityBlob->WorkstationName.Buffer = cpu_to_le32(SecurityBlobLength); ++ bcc_ptr += SecurityBlob->WorkstationName.Length; ++ SecurityBlobLength += SecurityBlob->WorkstationName.Length; ++ SecurityBlob->WorkstationName.Length = cpu_to_le16(SecurityBlob->WorkstationName.Length); */ ++ ++ if ((long) bcc_ptr % 2) { ++ *bcc_ptr = 0; ++ bcc_ptr++; ++ } ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, "Linux version ", ++ 32, nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, UTS_RELEASE, 32, ++ nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ bcc_ptr += 2; /* null term version string */ ++ bytes_returned = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, CIFS_NETWORK_OPSYS, ++ 64, nls_codepage); ++ bcc_ptr += 2 * bytes_returned; ++ *(bcc_ptr + 1) = 0; ++ *(bcc_ptr + 2) = 0; ++ bcc_ptr += 2; /* null terminate network opsys string */ ++ *(bcc_ptr + 1) = 0; ++ *(bcc_ptr + 2) = 0; ++ bcc_ptr += 2; /* null domain */ ++ } else { /* ASCII */ ++ if (domain == NULL) { ++ SecurityBlob->DomainName.Buffer = 0; ++ SecurityBlob->DomainName.Length = 0; ++ SecurityBlob->DomainName.MaximumLength = 0; ++ } else { ++ SecurityBlob->NegotiateFlags |= ++ NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED; ++ strncpy(bcc_ptr, domain, 63); ++ SecurityBlob->DomainName.Length = strnlen(domain, 64); ++ SecurityBlob->DomainName.MaximumLength = ++ cpu_to_le16(SecurityBlob->DomainName.Length); ++ SecurityBlob->DomainName.Buffer = ++ cpu_to_le32(SecurityBlobLength); ++ bcc_ptr += SecurityBlob->DomainName.Length; ++ SecurityBlobLength += SecurityBlob->DomainName.Length; ++ SecurityBlob->DomainName.Length = ++ cpu_to_le16(SecurityBlob->DomainName.Length); ++ } ++ if (user == NULL) { ++ SecurityBlob->UserName.Buffer = 0; ++ SecurityBlob->UserName.Length = 0; ++ SecurityBlob->UserName.MaximumLength = 0; ++ } else { ++ strncpy(bcc_ptr, user, 63); ++ SecurityBlob->UserName.Length = strnlen(user, 64); ++ SecurityBlob->UserName.MaximumLength = ++ cpu_to_le16(SecurityBlob->UserName.Length); ++ SecurityBlob->UserName.Buffer = ++ cpu_to_le32(SecurityBlobLength); ++ bcc_ptr += SecurityBlob->UserName.Length; ++ SecurityBlobLength += SecurityBlob->UserName.Length; ++ SecurityBlob->UserName.Length = ++ cpu_to_le16(SecurityBlob->UserName.Length); ++ } ++ /* BB fill in our workstation name if known BB */ ++ ++ strcpy(bcc_ptr, "Linux version "); ++ bcc_ptr += strlen("Linux version "); ++ strcpy(bcc_ptr, UTS_RELEASE); ++ bcc_ptr += strlen(UTS_RELEASE) + 1; ++ strcpy(bcc_ptr, CIFS_NETWORK_OPSYS); ++ bcc_ptr += strlen(CIFS_NETWORK_OPSYS) + 1; ++ bcc_ptr++; /* null domain */ ++ *bcc_ptr = 0; ++ } ++ SecurityBlob->NegotiateFlags = ++ cpu_to_le32(SecurityBlob->NegotiateFlags); ++ pSMB->req.SecurityBlobLength = cpu_to_le16(SecurityBlobLength); ++ BCC(smb_buffer) = (long) bcc_ptr - (long) pByteArea(smb_buffer); ++ smb_buffer->smb_buf_length += BCC(smb_buffer); ++ BCC(smb_buffer) = cpu_to_le16(BCC(smb_buffer)); ++ ++ rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, ++ &bytes_returned, 1); ++ if (rc) { ++/* rc = map_smb_to_linux_error(smb_buffer_response); *//* done in SendReceive now */ ++ } else if ((smb_buffer_response->WordCount == 3) ++ || (smb_buffer_response->WordCount == 4)) { ++ pSMBr->resp.Action = le16_to_cpu(pSMBr->resp.Action); ++ pSMBr->resp.SecurityBlobLength = ++ le16_to_cpu(pSMBr->resp.SecurityBlobLength); ++ if (pSMBr->resp.Action & GUEST_LOGIN) ++ cFYI(1, (" Guest login")); /* BB do we want to set anything in SesInfo struct ? */ ++/* if(SecurityBlob2->MessageType != NtLm??){ ++ cFYI("Unexpected message type on auth response is %d ")); ++ } */ ++ if (ses) { ++ cFYI(1, ++ ("Does UID on challenge %d match auth response UID %d ", ++ ses->Suid, smb_buffer_response->Uid)); ++ ses->Suid = smb_buffer_response->Uid; /* UID left in wire format */ ++ bcc_ptr = pByteArea(smb_buffer_response); ++ /* response can have either 3 or 4 word count - Samba sends 3 */ ++ if ((pSMBr->resp.hdr.WordCount == 3) ++ || ((pSMBr->resp.hdr.WordCount == 4) ++ && (pSMBr->resp.SecurityBlobLength < ++ pSMBr->resp.ByteCount))) { ++ if (pSMBr->resp.hdr.WordCount == 4) { ++ bcc_ptr += ++ pSMBr->resp.SecurityBlobLength; ++ cFYI(1, ++ ("Security Blob Length %d ", ++ pSMBr->resp.SecurityBlobLength)); ++ } ++ ++ cFYI(1, ++ ("NTLMSSP response to Authenticate ")); ++ ++ if (smb_buffer->Flags2 & SMBFLG2_UNICODE) { ++ if ((long) (bcc_ptr) % 2) { ++ remaining_words = ++ (BCC(smb_buffer_response) ++ - 1) / 2; ++ bcc_ptr++; /* Unicode strings must be word aligned */ ++ } else { ++ remaining_words = BCC(smb_buffer_response) / 2; ++ } ++ len = ++ UniStrnlen((wchar_t *) bcc_ptr,remaining_words - 1); ++/* We look for obvious messed up bcc or strings in response so we do not go off ++ the end since (at least) WIN2K and Windows XP have a major bug in not null ++ terminating last Unicode string in response */ ++ ses->serverOS = ++ cifs_kcalloc(2 * (len + 1), GFP_KERNEL); ++ cifs_strfromUCS_le(ses->serverOS, ++ (wchar_t *) ++ bcc_ptr, len, ++ nls_codepage); ++ bcc_ptr += 2 * (len + 1); ++ remaining_words -= len + 1; ++ ses->serverOS[2 * len] = 0; ++ ses->serverOS[1 + (2 * len)] = 0; ++ if (remaining_words > 0) { ++ len = UniStrnlen((wchar_t *) ++ bcc_ptr, ++ remaining_words ++ - 1); ++ ses->serverNOS = ++ cifs_kcalloc(2 * (len + 1), ++ GFP_KERNEL); ++ cifs_strfromUCS_le(ses-> ++ serverNOS, ++ (wchar_t *) ++ bcc_ptr, ++ len, ++ nls_codepage); ++ bcc_ptr += 2 * (len + 1); ++ ses->serverNOS[2 * len] = 0; ++ ses->serverNOS[1+(2*len)] = 0; ++ remaining_words -= len + 1; ++ if (remaining_words > 0) { ++ len = UniStrnlen((wchar_t *) bcc_ptr, remaining_words); ++ /* last string not always null terminated (e.g. for Windows XP & 2000) */ ++ ses->serverDomain = ++ cifs_kcalloc(2 * ++ (len + ++ 1), ++ GFP_KERNEL); ++ cifs_strfromUCS_le ++ (ses-> ++ serverDomain, ++ (wchar_t *) ++ bcc_ptr, len, ++ nls_codepage); ++ bcc_ptr += ++ 2 * (len + 1); ++ ses-> ++ serverDomain[2 ++ * len] ++ = 0; ++ ses-> ++ serverDomain[1 ++ + ++ (2 ++ * ++ len)] ++ = 0; ++ } /* else no more room so create dummy domain string */ ++ else ++ ses->serverDomain = cifs_kcalloc(2,GFP_KERNEL); ++ } else { /* no room so create dummy domain and NOS string */ ++ ses->serverDomain = cifs_kcalloc(2, GFP_KERNEL); ++ ses->serverNOS = cifs_kcalloc(2, GFP_KERNEL); ++ } ++ } else { /* ASCII */ ++ len = strnlen(bcc_ptr, 1024); ++ if (((long) bcc_ptr + len) - ++ (long) pByteArea(smb_buffer_response) ++ <= BCC(smb_buffer_response)) { ++ ses->serverOS = cifs_kcalloc(len + 1,GFP_KERNEL); ++ strncpy(ses->serverOS,bcc_ptr, len); ++ ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; /* null terminate the string */ ++ bcc_ptr++; ++ ++ len = strnlen(bcc_ptr, 1024); ++ ses->serverNOS = cifs_kcalloc(len+1,GFP_KERNEL); ++ strncpy(ses->serverNOS, bcc_ptr, len); ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; ++ bcc_ptr++; ++ ++ len = strnlen(bcc_ptr, 1024); ++ ses->serverDomain = cifs_kcalloc(len+1,GFP_KERNEL); ++ strncpy(ses->serverDomain, bcc_ptr, len); ++ bcc_ptr += len; ++ bcc_ptr[0] = 0; ++ bcc_ptr++; ++ } else ++ cFYI(1, ++ ("Variable field of length %d extends beyond end of smb ", ++ len)); ++ } ++ } else { ++ cERROR(1, ++ (" Security Blob Length extends beyond end of SMB")); ++ } ++ } else { ++ cERROR(1, ("No session structure passed in.")); ++ } ++ } else { ++ cERROR(1, ++ (" Invalid Word count %d: ", ++ smb_buffer_response->WordCount)); ++ rc = -EIO; ++ } ++ ++ if (smb_buffer) ++ cifs_buf_release(smb_buffer); ++ ++ return rc; ++} ++ ++int ++CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, ++ const char *tree, struct cifsTconInfo *tcon, ++ const struct nls_table *nls_codepage) ++{ ++ struct smb_hdr *smb_buffer; ++ struct smb_hdr *smb_buffer_response; ++ TCONX_REQ *pSMB; ++ TCONX_RSP *pSMBr; ++ char *bcc_ptr; ++ int rc = 0; ++ int length; ++ ++ if (ses == NULL) ++ return -EIO; ++ ++ smb_buffer = cifs_buf_get(); ++ if (smb_buffer == 0) { ++ return -ENOMEM; ++ } ++ smb_buffer_response = smb_buffer; ++ ++ header_assemble(smb_buffer, SMB_COM_TREE_CONNECT_ANDX, ++ NULL /*no tid */ , 4 /*wct */ ); ++ smb_buffer->Uid = ses->Suid; ++ pSMB = (TCONX_REQ *) smb_buffer; ++ pSMBr = (TCONX_RSP *) smb_buffer_response; ++ ++ pSMB->AndXCommand = 0xFF; ++ pSMB->Flags = cpu_to_le16(TCON_EXTENDED_SECINFO); ++ pSMB->PasswordLength = cpu_to_le16(1); /* minimum */ ++ bcc_ptr = &(pSMB->Password[0]); ++ bcc_ptr++; /* skip password */ ++ ++ if(ses->server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) ++ smb_buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE; ++ ++ if (ses->capabilities & CAP_STATUS32) { ++ smb_buffer->Flags2 |= SMBFLG2_ERR_STATUS; ++ } ++ if (ses->capabilities & CAP_DFS) { ++ smb_buffer->Flags2 |= SMBFLG2_DFS; ++ } ++ if (ses->capabilities & CAP_UNICODE) { ++ smb_buffer->Flags2 |= SMBFLG2_UNICODE; ++ length = ++ cifs_strtoUCS((wchar_t *) bcc_ptr, tree, 100, nls_codepage); ++ bcc_ptr += 2 * length; /* convert num of 16 bit words to bytes */ ++ bcc_ptr += 2; /* skip trailing null */ ++ } else { /* ASCII */ ++ ++ strcpy(bcc_ptr, tree); ++ bcc_ptr += strlen(tree) + 1; ++ } ++ strcpy(bcc_ptr, "?????"); ++ bcc_ptr += strlen("?????"); ++ bcc_ptr += 1; ++ BCC(smb_buffer) = (long) bcc_ptr - (long) pByteArea(smb_buffer); ++ smb_buffer->smb_buf_length += BCC(smb_buffer); ++ BCC(smb_buffer) = cpu_to_le16(BCC(smb_buffer)); ++ ++ rc = SendReceive(xid, ses, smb_buffer, smb_buffer_response, &length, 0); ++ ++ /* if (rc) rc = map_smb_to_linux_error(smb_buffer_response); */ ++ /* above now done in SendReceive */ ++ if ((rc == 0) && (tcon != NULL)) { ++ tcon->tidStatus = CifsGood; ++ tcon->tid = smb_buffer_response->Tid; ++ bcc_ptr = pByteArea(smb_buffer_response); ++ length = strnlen(bcc_ptr, BCC(smb_buffer_response) - 2); ++ /* skip service field (NB: this field is always ASCII) */ ++ bcc_ptr += length + 1; ++ strncpy(tcon->treeName, tree, MAX_TREE_SIZE); ++ if (smb_buffer->Flags2 & SMBFLG2_UNICODE) { ++ length = UniStrnlen((wchar_t *) bcc_ptr, 512); ++ if (((long) bcc_ptr + (2 * length)) - ++ (long) pByteArea(smb_buffer_response) <= ++ BCC(smb_buffer_response)) { ++ if(tcon->nativeFileSystem) ++ kfree(tcon->nativeFileSystem); ++ tcon->nativeFileSystem = ++ cifs_kcalloc(length + 2, GFP_KERNEL); ++ cifs_strfromUCS_le(tcon->nativeFileSystem, ++ (wchar_t *) bcc_ptr, ++ length, nls_codepage); ++ bcc_ptr += 2 * length; ++ bcc_ptr[0] = 0; /* null terminate the string */ ++ bcc_ptr[1] = 0; ++ bcc_ptr += 2; ++ } ++ /* else do not bother copying these informational fields */ ++ } else { ++ length = strnlen(bcc_ptr, 1024); ++ if (((long) bcc_ptr + length) - ++ (long) pByteArea(smb_buffer_response) <= ++ BCC(smb_buffer_response)) { ++ if(tcon->nativeFileSystem) ++ kfree(tcon->nativeFileSystem); ++ tcon->nativeFileSystem = ++ cifs_kcalloc(length + 1, GFP_KERNEL); ++ strncpy(tcon->nativeFileSystem, bcc_ptr, ++ length); ++ } ++ /* else do not bother copying these informational fields */ ++ } ++ tcon->Flags = le16_to_cpu(pSMBr->OptionalSupport); ++ cFYI(1, ("Tcon flags: 0x%x ", tcon->Flags)); ++ } else if ((rc == 0) && tcon == NULL) { ++ /* all we need to save for IPC$ connection */ ++ ses->ipc_tid = smb_buffer_response->Tid; ++ } ++ ++ if (smb_buffer) ++ cifs_buf_release(smb_buffer); ++ return rc; ++} ++ ++int ++cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb) ++{ ++ int rc = 0; ++ int xid; ++ struct cifsSesInfo *ses = NULL; ++ struct task_struct *cifsd_task; ++ ++ xid = GetXid(); ++ ++ if (cifs_sb->tcon) { ++ ses = cifs_sb->tcon->ses; /* save ptr to ses before delete tcon!*/ ++ rc = CIFSSMBTDis(xid, cifs_sb->tcon); ++ if (rc == -EBUSY) { ++ FreeXid(xid); ++ return 0; ++ } ++ tconInfoFree(cifs_sb->tcon); ++ if ((ses) && (ses->server)) { ++ /* save off task so we do not refer to ses later */ ++ cifsd_task = ses->server->tsk; ++ cFYI(1, ("About to do SMBLogoff ")); ++ rc = CIFSSMBLogoff(xid, ses); ++ if (rc == -EBUSY) { ++ FreeXid(xid); ++ return 0; ++ } else if (rc == -ESHUTDOWN) { ++ cFYI(1,("Waking up socket by sending it signal")); ++ send_sig(SIGKILL,cifsd_task,1); ++ rc = 0; ++ } /* else - we have an smb session ++ left on this socket do not kill cifsd */ ++ } else ++ cFYI(1, ("No session or bad tcon")); ++ } ++ ++ cifs_sb->tcon = NULL; ++ if (ses) { ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule_timeout(HZ / 2); ++ } ++ if (ses) ++ sesInfoFree(ses); ++ ++ FreeXid(xid); ++ return rc; /* BB check if we should always return zero here */ ++} ++ ++int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, ++ struct nls_table * nls_info) ++{ ++ int rc = 0; ++ char ntlm_session_key[CIFS_SESSION_KEY_SIZE]; ++ int ntlmv2_flag = FALSE; ++ ++ /* what if server changes its buffer size after dropping the session? */ ++ if(pSesInfo->server->maxBuf == 0) /* no need to send on reconnect */ { ++ rc = CIFSSMBNegotiate(xid, pSesInfo); ++ if(rc == -EAGAIN) /* retry only once on 1st time connection */ { ++ rc = CIFSSMBNegotiate(xid, pSesInfo); ++ if(rc == -EAGAIN) ++ rc = -EHOSTDOWN; ++ } ++ if(rc == 0) { ++ spin_lock(&GlobalMid_Lock); ++ if(pSesInfo->server->tcpStatus != CifsExiting) ++ pSesInfo->server->tcpStatus = CifsGood; ++ else ++ rc = -EHOSTDOWN; ++ spin_unlock(&GlobalMid_Lock); ++ ++ } ++ } ++ if (!rc) { ++ pSesInfo->capabilities = pSesInfo->server->capabilities; ++ if(linuxExtEnabled == 0) ++ pSesInfo->capabilities &= (~CAP_UNIX); ++ pSesInfo->sequence_number = 0; ++ cFYI(1,("Security Mode: 0x%x Capabilities: 0x%x Time Zone: %d", ++ pSesInfo->server->secMode, ++ pSesInfo->server->capabilities, ++ pSesInfo->server->timeZone)); ++ if (extended_security ++ && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) ++ && (pSesInfo->server->secType == NTLMSSP)) { ++ cFYI(1, ("New style sesssetup ")); ++ rc = CIFSSpnegoSessSetup(xid, pSesInfo, ++ NULL /* security blob */, ++ 0 /* blob length */, ++ nls_info); ++ } else if (extended_security ++ && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) ++ && (pSesInfo->server->secType == RawNTLMSSP)) { ++ cFYI(1, ("NTLMSSP sesssetup ")); ++ rc = CIFSNTLMSSPNegotiateSessSetup(xid, ++ pSesInfo, ++ &ntlmv2_flag, ++ nls_info); ++ if (!rc) { ++ if(ntlmv2_flag) { ++ char * v2_response; ++ cFYI(1,("Can use more secure NTLM version 2 password hash")); ++ CalcNTLMv2_partial_mac_key(pSesInfo, ++ nls_info); ++ v2_response = kmalloc(16 + 64 /* blob */, GFP_KERNEL); ++ if(v2_response) { ++ CalcNTLMv2_response(pSesInfo,v2_response); ++/* cifs_calculate_ntlmv2_mac_key(pSesInfo->mac_signing_key, response, ntlm_session_key, */ ++ kfree(v2_response); ++ /* BB Put dummy sig in SessSetup PDU? */ ++ } else ++ rc = -ENOMEM; ++ ++ } else { ++ SMBNTencrypt(pSesInfo->password, ++ pSesInfo->server->cryptKey, ++ ntlm_session_key); ++ ++ cifs_calculate_mac_key(pSesInfo->mac_signing_key, ++ ntlm_session_key, ++ pSesInfo->password); ++ } ++ /* for better security the weaker lanman hash not sent ++ in AuthSessSetup so we no longer calculate it */ ++ ++ rc = CIFSNTLMSSPAuthSessSetup(xid, ++ pSesInfo, ++ ntlm_session_key, ++ ntlmv2_flag, ++ nls_info); ++ } ++ } else { /* old style NTLM 0.12 session setup */ ++ SMBNTencrypt(pSesInfo->password, ++ pSesInfo->server->cryptKey, ++ ntlm_session_key); ++ ++ cifs_calculate_mac_key(pSesInfo->mac_signing_key, ++ ntlm_session_key, pSesInfo->password); ++ rc = CIFSSessSetup(xid, pSesInfo, ++ ntlm_session_key, nls_info); ++ } ++ if (rc) { ++ cERROR(1,("Send error in SessSetup = %d",rc)); ++ } else { ++ cFYI(1,("CIFS Session Established successfully")); ++ pSesInfo->status = CifsGood; ++ } ++ } ++ return rc; ++} ++ +diff -urN linux-2.4.29.old/fs/cifs/dir.c linux-2.4.29/fs/cifs/dir.c +--- linux-2.4.29.old/fs/cifs/dir.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/dir.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,425 @@ ++/* ++ * fs/cifs/dir.c ++ * ++ * vfs operations that deal with dentries ++ * ++ * Copyright (C) International Business Machines Corp., 2002,2003 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/fs.h> ++#include <linux/stat.h> ++#include <linux/slab.h> ++#include "cifsfs.h" ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifsproto.h" ++#include "cifs_debug.h" ++#include "cifs_fs_sb.h" ++ ++void ++renew_parental_timestamps(struct dentry *direntry) ++{ ++ /* BB check if there is a way to get the kernel to do this or if we really need this */ ++ do { ++ direntry->d_time = jiffies; ++ direntry = direntry->d_parent; ++ } while (!IS_ROOT(direntry)); ++} ++ ++/* Note: caller must free return buffer */ ++char * ++build_path_from_dentry(struct dentry *direntry) ++{ ++ struct dentry *temp; ++ int namelen = 0; ++ char *full_path; ++ ++ if(direntry == NULL) ++ return NULL; /* not much we can do if dentry is freed and ++ we need to reopen the file after it was closed implicitly ++ when the server crashed */ ++ ++cifs_bp_rename_retry: ++ for (temp = direntry; !IS_ROOT(temp);) { ++ namelen += (1 + temp->d_name.len); ++ temp = temp->d_parent; ++ if(temp == NULL) { ++ cERROR(1,("corrupt dentry")); ++ return NULL; ++ } ++ } ++ ++ full_path = kmalloc(namelen+1, GFP_KERNEL); ++ if(full_path == NULL) ++ return full_path; ++ full_path[namelen] = 0; /* trailing null */ ++ ++ for (temp = direntry; !IS_ROOT(temp);) { ++ namelen -= 1 + temp->d_name.len; ++ if (namelen < 0) { ++ break; ++ } else { ++ full_path[namelen] = '\\'; ++ strncpy(full_path + namelen + 1, temp->d_name.name, ++ temp->d_name.len); ++ cFYI(0, (" name: %s ", full_path + namelen)); ++ } ++ temp = temp->d_parent; ++ if(temp == NULL) { ++ cERROR(1,("corrupt dentry")); ++ kfree(full_path); ++ return NULL; ++ } ++ } ++ if (namelen != 0) { ++ cERROR(1, ++ ("We did not end path lookup where we expected namelen is %d", ++ namelen)); ++ /* presumably this is only possible if we were racing with a rename ++ of one of the parent directories (we can not lock the dentries ++ above us to prevent this, but retrying should be harmless) */ ++ kfree(full_path); ++ namelen = 0; ++ goto cifs_bp_rename_retry; ++ } ++ ++ return full_path; ++} ++ ++/* Note: caller must free return buffer */ ++char * ++build_wildcard_path_from_dentry(struct dentry *direntry) ++{ ++ struct dentry *temp; ++ int namelen = 0; ++ char *full_path; ++ ++ if(direntry == NULL) ++ return NULL; /* not much we can do if dentry is freed and ++ we need to reopen the file after it was closed implicitly ++ when the server crashed */ ++ ++cifs_bwp_rename_retry: ++ for (temp = direntry; !IS_ROOT(temp);) { ++ namelen += (1 + temp->d_name.len); ++ temp = temp->d_parent; ++ if(temp == NULL) { ++ cERROR(1,("corrupt dentry")); ++ return NULL; ++ } ++ } ++ ++ full_path = kmalloc(namelen+3, GFP_KERNEL); ++ if(full_path == NULL) ++ return full_path; ++ ++ full_path[namelen] = '\\'; ++ full_path[namelen+1] = '*'; ++ full_path[namelen+2] = 0; /* trailing null */ ++ ++ for (temp = direntry; !IS_ROOT(temp);) { ++ namelen -= 1 + temp->d_name.len; ++ if (namelen < 0) { ++ break; ++ } else { ++ full_path[namelen] = '\\'; ++ strncpy(full_path + namelen + 1, temp->d_name.name, ++ temp->d_name.len); ++ cFYI(0, (" name: %s ", full_path + namelen)); ++ } ++ temp = temp->d_parent; ++ if(temp == NULL) { ++ cERROR(1,("corrupt dentry")); ++ kfree(full_path); ++ return NULL; ++ } ++ } ++ if (namelen != 0) { ++ cERROR(1, ++ ("We did not end path lookup where we expected namelen is %d", ++ namelen)); ++ /* presumably this is only possible if we were racing with a rename ++ of one of the parent directories (we can not lock the dentries ++ above us to prevent this, but retrying should be harmless) */ ++ kfree(full_path); ++ namelen = 0; ++ goto cifs_bwp_rename_retry; ++ } ++ ++ return full_path; ++} ++ ++/* Inode operations in similar order to how they appear in the Linux file fs.h */ ++ ++int ++cifs_create(struct inode *inode, struct dentry *direntry, int mode) ++{ ++ int rc = -ENOENT; ++ int xid; ++ int oplock = 0; /* no sense requested oplock if we are just going to ++ immediately close the file */ ++ __u16 fileHandle; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ char *full_path = NULL; ++ FILE_ALL_INFO * buf = NULL; ++ struct inode *newinode = NULL; ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++ down(&direntry->d_sb->s_vfs_rename_sem); ++ full_path = build_path_from_dentry(direntry); ++ up(&direntry->d_sb->s_vfs_rename_sem); ++ if(full_path == NULL) { ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ ++ /* BB add processing to set equivalent of mode - e.g. via CreateX with ACLs */ ++ ++ buf = kmalloc(sizeof(FILE_ALL_INFO),GFP_KERNEL); ++ rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OVERWRITE_IF, ++ GENERIC_WRITE, CREATE_NOT_DIR, ++ &fileHandle, &oplock, buf, cifs_sb->local_nls); ++ if (rc) { ++ cFYI(1, ("cifs_create returned 0x%x ", rc)); ++ } else { ++ /* BB for case of overwriting existing file can we use the inode that was ++ passed in rather than creating new one?? */ ++ if (pTcon->ses->capabilities & CAP_UNIX) ++ rc = cifs_get_inode_info_unix(&newinode, full_path, ++ inode->i_sb,xid); ++ else ++ rc = cifs_get_inode_info(&newinode, full_path, ++ buf, inode->i_sb,xid); ++ ++ if (rc != 0) { ++ cFYI(1,("Create worked but get_inode_info failed with rc = %d", ++ rc)); ++ } else { ++ direntry->d_op = &cifs_dentry_ops; ++ d_instantiate(direntry, newinode); ++ } ++ CIFSSMBClose(xid, pTcon, fileHandle); ++ ++ if(newinode) { ++ newinode->i_mode = mode; ++ if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) ++ CIFSSMBUnixSetPerms(xid, pTcon, full_path, inode->i_mode, ++ (__u64)-1, ++ (__u64)-1, ++ 0 /* dev */, ++ cifs_sb->local_nls); ++ else { /* BB implement via Windows security descriptors */ ++ /* eg CIFSSMBWinSetPerms(xid,pTcon,full_path,mode,-1,-1,local_nls);*/ ++ /* in the meantime could set r/o dos attribute when perms are eg: ++ mode & 0222 == 0 */ ++ } ++ } ++ } ++ ++ if (buf) ++ kfree(buf); ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ ++ return rc; ++} ++ ++int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, int device_number) ++{ ++ int rc = -EPERM; ++ int xid; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ char *full_path = NULL; ++ struct inode * newinode = NULL; ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++ down(&direntry->d_sb->s_vfs_rename_sem); ++ full_path = build_path_from_dentry(direntry); ++ up(&direntry->d_sb->s_vfs_rename_sem); ++ if(full_path == NULL) ++ rc = -ENOMEM; ++ ++ if (full_path && (pTcon->ses->capabilities & CAP_UNIX)) { ++ rc = CIFSSMBUnixSetPerms(xid, pTcon, ++ full_path, mode, current->euid, current->egid, ++ device_number, cifs_sb->local_nls); ++ if(!rc) { ++ rc = cifs_get_inode_info_unix(&newinode, full_path, ++ inode->i_sb,xid); ++ direntry->d_op = &cifs_dentry_ops; ++ if(rc == 0) ++ d_instantiate(direntry, newinode); ++ } ++ } ++ ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ ++ return rc; ++} ++ ++ ++struct dentry * ++cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry) ++{ ++ int xid; ++ int rc = 0; /* to get around spurious gcc warning, set to zero here */ ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ struct inode *newInode = NULL; ++ char *full_path = NULL; ++ ++ xid = GetXid(); ++ ++ cFYI(1, ++ (" parent inode = 0x%p name is: %s and dentry = 0x%p", ++ parent_dir_inode, direntry->d_name.name, direntry)); ++ ++ /* BB Add check of incoming data - e.g. frame not longer than maximum SMB - let server check the namelen BB */ ++ ++ /* check whether path exists */ ++ ++ cifs_sb = CIFS_SB(parent_dir_inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++ /* can not grab the rename sem here since it would ++ deadlock in the cases (beginning of sys_rename itself) ++ in which we already have the sb rename sem */ ++ full_path = build_path_from_dentry(direntry); ++ if(full_path == NULL) { ++ FreeXid(xid); ++ return ERR_PTR(-ENOMEM); ++ } ++ ++ if (direntry->d_inode != NULL) { ++ cFYI(1, (" non-NULL inode in lookup")); ++ } else { ++ cFYI(1, (" NULL inode in lookup")); ++ } ++ cFYI(1, ++ (" Full path: %s inode = 0x%p", full_path, direntry->d_inode)); ++ ++ if (pTcon->ses->capabilities & CAP_UNIX) ++ rc = cifs_get_inode_info_unix(&newInode, full_path, ++ parent_dir_inode->i_sb,xid); ++ else ++ rc = cifs_get_inode_info(&newInode, full_path, NULL, ++ parent_dir_inode->i_sb,xid); ++ ++ if ((rc == 0) && (newInode != NULL)) { ++ direntry->d_op = &cifs_dentry_ops; ++ d_add(direntry, newInode); ++ ++ /* since paths are not looked up by component - the parent directories are presumed to be good here */ ++ renew_parental_timestamps(direntry); ++ ++ } else if (rc == -ENOENT) { ++ rc = 0; ++ d_add(direntry, NULL); ++ } else { ++ cERROR(1,("Error 0x%x or on cifs_get_inode_info in lookup",rc)); ++ /* BB special case check for Access Denied - watch security ++ exposure of returning dir info implicitly via different rc ++ if file exists or not but no access BB */ ++ } ++ ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return ERR_PTR(rc); ++} ++ ++int ++cifs_dir_open(struct inode *inode, struct file *file) ++{ /* NB: currently unused since searches are opened in readdir */ ++ int rc = 0; ++ int xid; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ char *full_path = NULL; ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++ if(file->f_dentry) { ++ down(&file->f_dentry->d_sb->s_vfs_rename_sem); ++ full_path = build_wildcard_path_from_dentry(file->f_dentry); ++ up(&file->f_dentry->d_sb->s_vfs_rename_sem); ++ } else { ++ FreeXid(xid); ++ return -EIO; ++ } ++ ++ cFYI(1, ("inode = 0x%p and full path is %s", inode, full_path)); ++ ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return rc; ++} ++ ++static int ++cifs_d_revalidate(struct dentry *direntry, int flags) ++{ ++ int isValid = 1; ++ ++/* lock_kernel(); *//* surely we do not want to lock the kernel for a whole network round trip which could take seconds */ ++ ++ if (direntry->d_inode) { ++ if (cifs_revalidate(direntry)) { ++ /* unlock_kernel(); */ ++ return 0; ++ } ++ } else { ++ cFYI(1, ++ ("In cifs_d_revalidate with no inode but name = %s and dentry 0x%p", ++ direntry->d_name.name, direntry)); ++ } ++ ++/* unlock_kernel(); */ ++ ++ return isValid; ++} ++ ++/* static int cifs_d_delete(struct dentry *direntry) ++{ ++ int rc = 0; ++ ++ cFYI(1, ("In cifs d_delete, name = %s", direntry->d_name.name)); ++ ++ return rc; ++} */ ++ ++struct dentry_operations cifs_dentry_ops = { ++ .d_revalidate = cifs_d_revalidate, ++/* d_delete: cifs_d_delete, *//* not needed except for debugging */ ++ /* no need for d_hash, d_compare, d_release, d_iput ... yet. BB confirm this BB */ ++}; +diff -urN linux-2.4.29.old/fs/cifs/file.c linux-2.4.29/fs/cifs/file.c +--- linux-2.4.29.old/fs/cifs/file.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/file.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,2185 @@ ++/* ++ * fs/cifs/file.c ++ * ++ * vfs operations that deal with files ++ * ++ * Copyright (C) International Business Machines Corp., 2002,2003 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/fs.h> ++#include <linux/stat.h> ++#include <linux/fcntl.h> ++#include <linux/version.h> ++#include <linux/pagemap.h> ++#include <linux/smp_lock.h> ++#include <linux/list.h> ++#include <asm/div64.h> ++#include <linux/mm.h> ++#include <linux/types.h> ++#include "cifsfs.h" ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifsproto.h" ++#include "cifs_unicode.h" ++#include "cifs_debug.h" ++#include "cifs_fs_sb.h" ++ ++int ++cifs_open(struct inode *inode, struct file *file) ++{ ++ int rc = -EACCES; ++ int xid, oplock; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ struct cifsFileInfo *pCifsFile; ++ struct cifsInodeInfo *pCifsInode; ++ char *full_path = NULL; ++ int desiredAccess = 0x20197; ++ int disposition; ++ __u16 netfid; ++ FILE_ALL_INFO * buf = NULL; ++ time_t temp; ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++ down(&inode->i_sb->s_vfs_rename_sem); ++ full_path = build_path_from_dentry(file->f_dentry); ++ up(&inode->i_sb->s_vfs_rename_sem); ++ if(full_path == NULL) { ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ ++ cFYI(1, (" inode = 0x%p file flags are 0x%x for %s", inode, file->f_flags,full_path)); ++ if ((file->f_flags & O_ACCMODE) == O_RDONLY) ++ desiredAccess = GENERIC_READ; ++ else if ((file->f_flags & O_ACCMODE) == O_WRONLY) ++ desiredAccess = GENERIC_WRITE; ++ else if ((file->f_flags & O_ACCMODE) == O_RDWR) { ++ /* GENERIC_ALL is too much permission to request */ ++ /* can cause unnecessary access denied on create */ ++ /* desiredAccess = GENERIC_ALL; */ ++ desiredAccess = GENERIC_READ | GENERIC_WRITE; ++ } ++ ++/********************************************************************* ++ * open flag mapping table: ++ * ++ * POSIX Flag CIFS Disposition ++ * ---------- ---------------- ++ * O_CREAT FILE_OPEN_IF ++ * O_CREAT | O_EXCL FILE_CREATE ++ * O_CREAT | O_TRUNC FILE_OVERWRITE_IF ++ * O_TRUNC FILE_OVERWRITE ++ * none of the above FILE_OPEN ++ * ++ * Note that there is not a direct match between disposition ++ * FILE_SUPERSEDE (ie create whether or not file exists although ++ * O_CREAT | O_TRUNC is similar but truncates the existing ++ * file rather than creating a new file as FILE_SUPERSEDE does ++ * (which uses the attributes / metadata passed in on open call) ++ *? ++ *? O_SYNC is a reasonable match to CIFS writethrough flag ++ *? and the read write flags match reasonably. O_LARGEFILE ++ *? is irrelevant because largefile support is always used ++ *? by this client. Flags O_APPEND, O_DIRECT, O_DIRECTORY, ++ * O_FASYNC, O_NOFOLLOW, O_NONBLOCK need further investigation ++ *********************************************************************/ ++ ++ /* For 2.4 case, file was already checked for existence ++ before create by vfs lookup and created in create ++ entry point, we are now just opening the newly ++ created file with the right desiredAccess flags */ ++ ++ if((file->f_flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) ++ disposition = FILE_OPEN_IF; ++ else if((file->f_flags & (O_CREAT | O_TRUNC)) == (O_CREAT | O_TRUNC)) ++ disposition = FILE_OVERWRITE_IF; ++ else if((file->f_flags & O_CREAT) == O_CREAT) ++ disposition = FILE_OPEN_IF; ++ else ++ disposition = FILE_OPEN; ++ ++ if (oplockEnabled) ++ oplock = REQ_OPLOCK; ++ else ++ oplock = FALSE; ++ ++ /* BB pass O_SYNC flag through on file attributes .. BB */ ++ ++ /* Also refresh inode by passing in file_info buf returned by SMBOpen ++ and calling get_inode_info with returned buf (at least ++ helps non-Unix server case */ ++ ++ /* BB we can not do this if this is the second open of a file ++ and the first handle has writebehind data, we might be ++ able to simply do a filemap_fdatawrite/filemap_fdatawait first */ ++ buf = kmalloc(sizeof(FILE_ALL_INFO),GFP_KERNEL); ++ if(buf==0) { ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ rc = CIFSSMBOpen(xid, pTcon, full_path, disposition, desiredAccess, ++ CREATE_NOT_DIR, &netfid, &oplock, buf, cifs_sb->local_nls); ++ if (rc) { ++ cFYI(1, ("cifs_open returned 0x%x ", rc)); ++ cFYI(1, ("oplock: %d ", oplock)); ++ } else { ++ file->private_data = ++ kmalloc(sizeof (struct cifsFileInfo), GFP_KERNEL); ++ if (file->private_data) { ++ memset(file->private_data, 0, sizeof(struct cifsFileInfo)); ++ pCifsFile = (struct cifsFileInfo *) file->private_data; ++ pCifsFile->netfid = netfid; ++ pCifsFile->pid = current->pid; ++ init_MUTEX(&pCifsFile->fh_sem); ++ pCifsFile->pfile = file; /* needed for writepage */ ++ pCifsFile->pInode = inode; ++ pCifsFile->invalidHandle = FALSE; ++ pCifsFile->closePend = FALSE; ++ write_lock(&GlobalSMBSeslock); ++ spin_lock(&files_lock); ++ list_add(&pCifsFile->tlist,&pTcon->openFileList); ++ pCifsInode = CIFS_I(file->f_dentry->d_inode); ++ if(pCifsInode) { ++ /* want handles we can use to read with first */ ++ /* in the list so we do not have to walk the */ ++ /* list to search for one in prepare_write */ ++ if ((file->f_flags & O_ACCMODE) == O_WRONLY) { ++ list_add_tail(&pCifsFile->flist,&pCifsInode->openFileList); ++ } else { ++ list_add(&pCifsFile->flist,&pCifsInode->openFileList); ++ } ++ spin_unlock(&files_lock); ++ write_unlock(&GlobalSMBSeslock); ++ if(pCifsInode->clientCanCacheRead) { ++ /* we have the inode open somewhere else ++ no need to discard cache data */ ++ } else { ++ if(buf) { ++ /* BB need same check in cifs_create too? */ ++ ++ /* if not oplocked, invalidate inode pages if mtime ++ or file size changed */ ++ temp = cifs_NTtimeToUnix(le64_to_cpu(buf->LastWriteTime)); ++ if((file->f_dentry->d_inode->i_mtime == temp) && ++ (file->f_dentry->d_inode->i_size == (loff_t)le64_to_cpu(buf->EndOfFile))) { ++ cFYI(1,("inode unchanged on server")); ++ } else { ++ if(file->f_dentry->d_inode->i_mapping) { ++ /* BB no need to lock inode until after invalidate*/ ++ /* since namei code should already have it locked?*/ ++ filemap_fdatasync(file->f_dentry->d_inode->i_mapping); ++ } ++ cFYI(1,("invalidating remote inode since open detected it changed")); ++ invalidate_inode_pages(file->f_dentry->d_inode); ++ } ++ } ++ } ++ if (pTcon->ses->capabilities & CAP_UNIX) ++ rc = cifs_get_inode_info_unix(&file->f_dentry->d_inode, ++ full_path, inode->i_sb,xid); ++ else ++ rc = cifs_get_inode_info(&file->f_dentry->d_inode, ++ full_path, buf, inode->i_sb,xid); ++ ++ if((oplock & 0xF) == OPLOCK_EXCLUSIVE) { ++ pCifsInode->clientCanCacheAll = TRUE; ++ pCifsInode->clientCanCacheRead = TRUE; ++ cFYI(1,("Exclusive Oplock granted on inode %p",file->f_dentry->d_inode)); ++ } else if((oplock & 0xF) == OPLOCK_READ) ++ pCifsInode->clientCanCacheRead = TRUE; ++ } else { ++ spin_unlock(&files_lock); ++ write_unlock(&GlobalSMBSeslock); ++ } ++ if(oplock & CIFS_CREATE_ACTION) { ++ /* time to set mode which we can not set earlier due ++ to problems creating new read-only files */ ++ if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) ++ CIFSSMBUnixSetPerms(xid, pTcon, full_path, inode->i_mode, ++ (__u64)-1, ++ (__u64)-1, ++ 0 /* dev */, ++ cifs_sb->local_nls); ++ else {/* BB implement via Windows security descriptors */ ++ /* eg CIFSSMBWinSetPerms(xid,pTcon,full_path,mode,-1,-1,local_nls);*/ ++ /* in the meantime could set r/o dos attribute when perms are eg: ++ mode & 0222 == 0 */ ++ } ++ } ++ } ++ } ++ ++ if (buf) ++ kfree(buf); ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return rc; ++} ++ ++/* Try to reaquire byte range locks that were released when session */ ++/* to server was lost */ ++static int cifs_relock_file(struct cifsFileInfo * cifsFile) ++{ ++ int rc = 0; ++ ++/* BB list all locks open on this file and relock */ ++ ++ return rc; ++} ++ ++static int cifs_reopen_file(struct inode *inode, struct file *file, int can_flush) ++{ ++ int rc = -EACCES; ++ int xid, oplock; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ struct cifsFileInfo *pCifsFile; ++ struct cifsInodeInfo *pCifsInode; ++ char *full_path = NULL; ++ int desiredAccess = 0x20197; ++ int disposition = FILE_OPEN; ++ __u16 netfid; ++ ++ if(inode == NULL) ++ return -EBADF; ++ if (file->private_data) { ++ pCifsFile = (struct cifsFileInfo *) file->private_data; ++ } else ++ return -EBADF; ++ ++ xid = GetXid(); ++ down(&pCifsFile->fh_sem); ++ if(pCifsFile->invalidHandle == FALSE) { ++ up(&pCifsFile->fh_sem); ++ FreeXid(xid); ++ return 0; ++ } ++ ++ if(file->f_dentry == NULL) { ++ up(&pCifsFile->fh_sem); ++ cFYI(1,("failed file reopen, no valid name if dentry freed")); ++ FreeXid(xid); ++ return -EBADF; ++ } ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++/* can not grab rename sem here because various ops, including ++those that already have the rename sem can end up causing writepage ++to get called and if the server was down that means we end up here, ++and we can never tell if the caller already has the rename_sem */ ++ full_path = build_path_from_dentry(file->f_dentry); ++ if(full_path == NULL) { ++ up(&pCifsFile->fh_sem); ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ ++ cFYI(1, (" inode = 0x%p file flags are 0x%x for %s", inode, file->f_flags,full_path)); ++ if ((file->f_flags & O_ACCMODE) == O_RDONLY) ++ desiredAccess = GENERIC_READ; ++ else if ((file->f_flags & O_ACCMODE) == O_WRONLY) ++ desiredAccess = GENERIC_WRITE; ++ else if ((file->f_flags & O_ACCMODE) == O_RDWR) { ++ /* GENERIC_ALL is too much permission to request */ ++ /* can cause unnecessary access denied on create */ ++ /* desiredAccess = GENERIC_ALL; */ ++ desiredAccess = GENERIC_READ | GENERIC_WRITE; ++ } ++ ++ if (oplockEnabled) ++ oplock = REQ_OPLOCK; ++ else ++ oplock = FALSE; ++ ++ ++ /* Can not refresh inode by passing in file_info buf to be returned ++ by SMBOpen and then calling get_inode_info with returned buf ++ since file might have write behind data that needs to be flushed ++ and server version of file size can be stale. If we ++ knew for sure that inode was not dirty locally we could do this */ ++ ++/* buf = kmalloc(sizeof(FILE_ALL_INFO),GFP_KERNEL); ++ if(buf==0) { ++ up(&pCifsFile->fh_sem); ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return -ENOMEM; ++ }*/ ++ rc = CIFSSMBOpen(xid, pTcon, full_path, disposition, desiredAccess, ++ CREATE_NOT_DIR, &netfid, &oplock, NULL, cifs_sb->local_nls); ++ if (rc) { ++ up(&pCifsFile->fh_sem); ++ cFYI(1, ("cifs_open returned 0x%x ", rc)); ++ cFYI(1, ("oplock: %d ", oplock)); ++ } else { ++ pCifsFile->netfid = netfid; ++ pCifsFile->invalidHandle = FALSE; ++ up(&pCifsFile->fh_sem); ++ pCifsInode = CIFS_I(inode); ++ if(pCifsInode) { ++ if(can_flush) { ++ filemap_fdatasync(inode->i_mapping); ++ filemap_fdatawait(inode->i_mapping); ++ /* temporarily disable caching while we ++ go to server to get inode info */ ++ pCifsInode->clientCanCacheAll = FALSE; ++ pCifsInode->clientCanCacheRead = FALSE; ++ if (pTcon->ses->capabilities & CAP_UNIX) ++ rc = cifs_get_inode_info_unix(&inode, ++ full_path, inode->i_sb,xid); ++ else ++ rc = cifs_get_inode_info(&inode, ++ full_path, NULL, inode->i_sb,xid); ++ } /* else we are writing out data to server already ++ and could deadlock if we tried to flush data, and ++ since we do not know if we have data that would ++ invalidate the current end of file on the server ++ we can not go to the server to get the new ++ inod info */ ++ if((oplock & 0xF) == OPLOCK_EXCLUSIVE) { ++ pCifsInode->clientCanCacheAll = TRUE; ++ pCifsInode->clientCanCacheRead = TRUE; ++ cFYI(1,("Exclusive Oplock granted on inode %p",file->f_dentry->d_inode)); ++ } else if((oplock & 0xF) == OPLOCK_READ) { ++ pCifsInode->clientCanCacheRead = TRUE; ++ pCifsInode->clientCanCacheAll = FALSE; ++ } else { ++ pCifsInode->clientCanCacheRead = FALSE; ++ pCifsInode->clientCanCacheAll = FALSE; ++ } ++ cifs_relock_file(pCifsFile); ++ } ++ } ++ ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return rc; ++} ++ ++int ++cifs_close(struct inode *inode, struct file *file) ++{ ++ int rc = 0; ++ int xid; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ struct cifsFileInfo *pSMBFile = ++ (struct cifsFileInfo *) file->private_data; ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ if (pSMBFile) { ++ pSMBFile->closePend = TRUE; ++ spin_lock(&files_lock); ++ if(pTcon) { ++ /* no sense reconnecting to close a file that is ++ already closed */ ++ if (pTcon->tidStatus != CifsNeedReconnect) { ++ spin_unlock(&files_lock); ++ rc = CIFSSMBClose(xid,pTcon,pSMBFile->netfid); ++ spin_lock(&files_lock); ++ } ++ } ++ list_del(&pSMBFile->flist); ++ list_del(&pSMBFile->tlist); ++ spin_unlock(&files_lock); ++ if(pSMBFile->search_resume_name) ++ kfree(pSMBFile->search_resume_name); ++ kfree(file->private_data); ++ file->private_data = NULL; ++ } else ++ rc = -EBADF; ++ ++ if(list_empty(&(CIFS_I(inode)->openFileList))) { ++ cFYI(1,("closing last open instance for inode %p",inode)); ++ /* if the file is not open we do not know if we can cache ++ info on this inode, much less write behind and read ahead */ ++ CIFS_I(inode)->clientCanCacheRead = FALSE; ++ CIFS_I(inode)->clientCanCacheAll = FALSE; ++ } ++ if((rc ==0) && CIFS_I(inode)->write_behind_rc) ++ rc = CIFS_I(inode)->write_behind_rc; ++ FreeXid(xid); ++ return rc; ++} ++ ++int ++cifs_closedir(struct inode *inode, struct file *file) ++{ ++ int rc = 0; ++ int xid; ++ struct cifsFileInfo *pSMBFileStruct = ++ (struct cifsFileInfo *) file->private_data; ++ ++ cFYI(1, ("Closedir inode = 0x%p with ", inode)); ++ ++ xid = GetXid(); ++ ++ if (pSMBFileStruct) { ++ cFYI(1, ("Freeing private data in close dir")); ++ kfree(file->private_data); ++ file->private_data = NULL; ++ } ++ FreeXid(xid); ++ return rc; ++} ++ ++int ++cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) ++{ ++ int rc, xid; ++ __u32 lockType = LOCKING_ANDX_LARGE_FILES; ++ __u32 numLock = 0; ++ __u32 numUnlock = 0; ++ __u64 length; ++ int wait_flag = FALSE; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ length = 1 + pfLock->fl_end - pfLock->fl_start; ++ ++ rc = -EACCES; ++ ++ xid = GetXid(); ++ ++ cFYI(1, ++ ("Lock parm: 0x%x flockflags: 0x%x flocktype: 0x%x start: %lld end: %lld", ++ cmd, pfLock->fl_flags, pfLock->fl_type, pfLock->fl_start, ++ pfLock->fl_end)); ++ ++ if (pfLock->fl_flags & FL_POSIX) ++ cFYI(1, ("Posix ")); ++ if (pfLock->fl_flags & FL_FLOCK) ++ cFYI(1, ("Flock ")); ++/* if (pfLock->fl_flags & FL_SLEEP) { ++ cFYI(1, ("Blocking lock ")); ++ wait_flag = TRUE; ++ } */ ++ if (pfLock->fl_flags & FL_ACCESS) ++ cFYI(1, ("Process suspended by mandatory locking - not implemented yet ")); ++ if (pfLock->fl_flags & FL_LEASE) ++ cFYI(1, ("Lease on file - not implemented yet")); ++ if (pfLock->fl_flags & (~(FL_POSIX | FL_FLOCK | FL_ACCESS | FL_LEASE))) ++ cFYI(1, ("Unknown lock flags 0x%x",pfLock->fl_flags)); ++ ++ if (pfLock->fl_type == F_WRLCK) { ++ cFYI(1, ("F_WRLCK ")); ++ numLock = 1; ++ } else if (pfLock->fl_type == F_UNLCK) { ++ cFYI(1, ("F_UNLCK ")); ++ numUnlock = 1; ++ } else if (pfLock->fl_type == F_RDLCK) { ++ cFYI(1, ("F_RDLCK ")); ++ lockType |= LOCKING_ANDX_SHARED_LOCK; ++ numLock = 1; ++ } else if (pfLock->fl_type == F_EXLCK) { ++ cFYI(1, ("F_EXLCK ")); ++ numLock = 1; ++ } else if (pfLock->fl_type == F_SHLCK) { ++ cFYI(1, ("F_SHLCK ")); ++ lockType |= LOCKING_ANDX_SHARED_LOCK; ++ numLock = 1; ++ } else ++ cFYI(1, ("Unknown type of lock ")); ++ ++ cifs_sb = CIFS_SB(file->f_dentry->d_sb); ++ pTcon = cifs_sb->tcon; ++ ++ if (file->private_data == NULL) { ++ FreeXid(xid); ++ return -EBADF; ++ } ++ ++ if (IS_GETLK(cmd)) { ++ rc = CIFSSMBLock(xid, pTcon, ++ ((struct cifsFileInfo *) file-> ++ private_data)->netfid, ++ length, ++ pfLock->fl_start, 0, 1, lockType, ++ 0 /* wait flag */ ); ++ if (rc == 0) { ++ rc = CIFSSMBLock(xid, pTcon, ++ ((struct cifsFileInfo *) file-> ++ private_data)->netfid, ++ length, ++ pfLock->fl_start, 1 /* numUnlock */ , ++ 0 /* numLock */ , lockType, ++ 0 /* wait flag */ ); ++ pfLock->fl_type = F_UNLCK; ++ if (rc != 0) ++ cERROR(1, ++ ("Error unlocking previously locked range %d during test of lock ", ++ rc)); ++ rc = 0; ++ ++ } else { ++ /* if rc == ERR_SHARING_VIOLATION ? */ ++ rc = 0; /* do not change lock type to unlock since range in use */ ++ } ++ ++ FreeXid(xid); ++ return rc; ++ } ++ ++ rc = CIFSSMBLock(xid, pTcon, ++ ((struct cifsFileInfo *) file->private_data)-> ++ netfid, length, ++ pfLock->fl_start, numUnlock, numLock, lockType, ++ wait_flag); ++ FreeXid(xid); ++ return rc; ++} ++ ++ssize_t ++cifs_write(struct file * file, const char *write_data, ++ size_t write_size, loff_t * poffset) ++{ ++ int rc = 0; ++ unsigned int bytes_written = 0; ++ unsigned int total_written; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ int xid, long_op; ++ struct cifsFileInfo * open_file; ++ ++ if(file->f_dentry == NULL) ++ return -EBADF; ++ ++ cifs_sb = CIFS_SB(file->f_dentry->d_sb); ++ if(cifs_sb == NULL) { ++ return -EBADF; ++ } ++ pTcon = cifs_sb->tcon; ++ ++ /*cFYI(1, ++ (" write %d bytes to offset %lld of %s", write_size, ++ *poffset, file->f_dentry->d_name.name)); */ ++ ++ if (file->private_data == NULL) { ++ return -EBADF; ++ } else { ++ open_file = (struct cifsFileInfo *) file->private_data; ++ } ++ ++ xid = GetXid(); ++ if(file->f_dentry->d_inode == NULL) { ++ FreeXid(xid); ++ return -EBADF; ++ } ++ ++ if (*poffset > file->f_dentry->d_inode->i_size) ++ long_op = 2; /* writes past end of file can take a long time */ ++ else ++ long_op = 1; ++ ++ for (total_written = 0; write_size > total_written; ++ total_written += bytes_written) { ++ rc = -EAGAIN; ++ while(rc == -EAGAIN) { ++ if(file->private_data == NULL) { ++ /* file has been closed on us */ ++ FreeXid(xid); ++ /* if we have gotten here we have written some data ++ and blocked, and the file has been freed on us ++ while we blocked so return what we managed to write */ ++ return total_written; ++ } ++ if(open_file->closePend) { ++ FreeXid(xid); ++ if(total_written) ++ return total_written; ++ else ++ return -EBADF; ++ } ++ if (open_file->invalidHandle) { ++ if((file->f_dentry == NULL) || ++ (file->f_dentry->d_inode == NULL)) { ++ FreeXid(xid); ++ return total_written; ++ } ++ /* we could deadlock if we called ++ filemap_fdatawait from here so tell ++ reopen_file not to flush data to server now */ ++ rc = cifs_reopen_file(file->f_dentry->d_inode, ++ file,FALSE); ++ if(rc != 0) ++ break; ++ } ++ ++ rc = CIFSSMBWrite(xid, pTcon, ++ open_file->netfid, ++ write_size - total_written, *poffset, ++ &bytes_written, ++ write_data + total_written, long_op); ++ } ++ if (rc || (bytes_written == 0)) { ++ if (total_written) ++ break; ++ else { ++ FreeXid(xid); ++ return rc; ++ } ++ } else ++ *poffset += bytes_written; ++ long_op = FALSE; /* subsequent writes fast - 15 seconds is plenty */ ++ } ++ ++#ifdef CONFIG_CIFS_STATS ++ if(total_written > 0) { ++ atomic_inc(&pTcon->num_writes); ++ spin_lock(&pTcon->stat_lock); ++ pTcon->bytes_written += total_written; ++ spin_unlock(&pTcon->stat_lock); ++ } ++#endif ++ ++ /* since the write may have blocked check these pointers again */ ++ if(file->f_dentry) { ++ if(file->f_dentry->d_inode) { ++ file->f_dentry->d_inode->i_ctime = file->f_dentry->d_inode->i_mtime = ++ CURRENT_TIME; ++ if (total_written > 0) { ++ if (*poffset > file->f_dentry->d_inode->i_size) ++ file->f_dentry->d_inode->i_size = *poffset; ++ } ++ mark_inode_dirty_sync(file->f_dentry->d_inode); ++ } ++ } ++ FreeXid(xid); ++ return total_written; ++} ++ ++static int ++cifs_partialpagewrite(struct page *page,unsigned from, unsigned to) ++{ ++ struct address_space *mapping = page->mapping; ++ loff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT; ++ char * write_data; ++ int rc = -EFAULT; ++ int bytes_written = 0; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ struct inode *inode; ++ struct cifsInodeInfo *cifsInode; ++ struct cifsFileInfo *open_file = NULL; ++ struct list_head *tmp; ++ struct list_head *tmp1; ++ ++ if (!mapping) { ++ return -EFAULT; ++ } else if(!mapping->host) { ++ return -EFAULT; ++ } ++ ++ inode = page->mapping->host; ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++ offset += (loff_t)from; ++ write_data = kmap(page); ++ write_data += from; ++ ++ if((to > PAGE_CACHE_SIZE) || (from > to)) { ++ kunmap(page); ++ return -EIO; ++ } ++ ++ /* racing with truncate? */ ++ if(offset > mapping->host->i_size) { ++ kunmap(page); ++ return 0; /* don't care */ ++ } ++ ++ /* check to make sure that we are not extending the file */ ++ if(mapping->host->i_size - offset < (loff_t)to) ++ to = (unsigned)(mapping->host->i_size - offset); ++ ++ ++ cifsInode = CIFS_I(mapping->host); ++ read_lock(&GlobalSMBSeslock); ++ /* BB we should start at the end */ ++ list_for_each_safe(tmp, tmp1, &cifsInode->openFileList) { ++ open_file = list_entry(tmp,struct cifsFileInfo, flist); ++ if(open_file->closePend) ++ continue; ++ /* We check if file is open for writing first */ ++ if((open_file->pfile) && ++ ((open_file->pfile->f_flags & O_RDWR) || ++ (open_file->pfile->f_flags & O_WRONLY))) { ++ read_unlock(&GlobalSMBSeslock); ++ bytes_written = cifs_write(open_file->pfile, write_data, ++ to-from, &offset); ++ read_lock(&GlobalSMBSeslock); ++ /* Does mm or vfs already set times? */ ++ inode->i_atime = inode->i_mtime = CURRENT_TIME; ++ if ((bytes_written > 0) && (offset)) { ++ rc = 0; ++ } else if(bytes_written < 0) { ++ if(rc == -EBADF) { ++ /* have seen a case in which ++ kernel seemed to have closed/freed a file ++ even with writes active so we might as well ++ see if there are other file structs to try ++ for the same inode before giving up */ ++ continue; ++ } else ++ rc = bytes_written; ++ } ++ break; /* now that we found a valid file handle ++ and tried to write to it we are done, no ++ sense continuing to loop looking for another */ ++ } ++ if(tmp->next == NULL) { ++ cFYI(1,("File instance %p removed",tmp)); ++ break; ++ } ++ } ++ read_unlock(&GlobalSMBSeslock); ++ if(open_file == NULL) { ++ cFYI(1,("No writeable filehandles for inode")); ++ rc = -EIO; ++ } ++ ++ kunmap(page); ++ return rc; ++} ++ ++#if 0 ++static int ++cifs_writepages(struct address_space *mapping, struct writeback_control *wbc) ++{ ++ int rc = -EFAULT; ++ int xid; ++ ++ xid = GetXid(); ++/* call 16K write then Setpageuptodate */ ++ FreeXid(xid); ++ return rc; ++} ++#endif ++ ++static int ++cifs_writepage(struct page* page) ++{ ++ int rc = -EFAULT; ++ int xid; ++ ++ xid = GetXid(); ++/* BB add check for wbc flags */ ++ page_cache_get(page); ++ if (!Page_Uptodate(page)) { ++ cFYI(1,("ppw - page not up to date")); ++ } ++ ++ rc = cifs_partialpagewrite(page,0,PAGE_CACHE_SIZE); ++ SetPageUptodate(page); /* BB add check for error and Clearuptodate? */ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,20)) ++ unlock_page(page); ++#else ++ UnlockPage(page); ++#endif ++ page_cache_release(page); ++ FreeXid(xid); ++ return rc; ++} ++ ++static int ++cifs_commit_write(struct file *file, struct page *page, unsigned offset, ++ unsigned to) ++{ ++ int xid; ++ int rc = 0; ++ struct inode *inode = page->mapping->host; ++ loff_t position = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to; ++ char * page_data; ++ ++ xid = GetXid(); ++ cFYI(1,("commit write for page %p up to position %lld for %d",page,position,to)); ++ if (position > inode->i_size){ ++ inode->i_size = position; ++ /*if (file->private_data == NULL) { ++ rc = -EBADF; ++ } else { ++ open_file = (struct cifsFileInfo *)file->private_data; ++ cifs_sb = CIFS_SB(inode->i_sb); ++ rc = -EAGAIN; ++ while(rc == -EAGAIN) { ++ if((open_file->invalidHandle) && ++ (!open_file->closePend)) { ++ rc = cifs_reopen_file(file->f_dentry->d_inode,file); ++ if(rc != 0) ++ break; ++ } ++ if(!open_file->closePend) { ++ rc = CIFSSMBSetFileSize(xid, cifs_sb->tcon, ++ position, open_file->netfid, ++ open_file->pid,FALSE); ++ } else { ++ rc = -EBADF; ++ break; ++ } ++ } ++ cFYI(1,(" SetEOF (commit write) rc = %d",rc)); ++ }*/ ++ } ++ if (!Page_Uptodate(page)) { ++ position = ((loff_t)page->index << PAGE_CACHE_SHIFT) + offset; ++ /* can not rely on (or let) writepage write this data */ ++ if(to < offset) { ++ cFYI(1,("Illegal offsets, can not copy from %d to %d", ++ offset,to)); ++ FreeXid(xid); ++ return rc; ++ } ++ /* this is probably better than directly calling ++ partialpage_write since in this function ++ the file handle is known which we might as well ++ leverage */ ++ /* BB check if anything else missing out of ppw */ ++ /* such as updating last write time */ ++ page_data = kmap(page); ++ rc = cifs_write(file, page_data+offset,to-offset, ++ &position); ++ if(rc > 0) ++ rc = 0; ++ /* else if rc < 0 should we set writebehind rc? */ ++ kunmap(page); ++ } else { ++ set_page_dirty(page); ++ } ++ ++ FreeXid(xid); ++ return rc; ++} ++ ++int ++cifs_fsync(struct file *file, struct dentry *dentry, int datasync) ++{ ++ int xid; ++ int rc = 0; ++ struct inode * inode = file->f_dentry->d_inode; ++ ++ xid = GetXid(); ++ ++ cFYI(1, ("Sync file - name: %s datasync: 0x%x ", ++ dentry->d_name.name, datasync)); ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,17)) ++ rc = filemap_fdatasync(inode->i_mapping); ++#else ++ filemap_fdatasync(inode->i_mapping); ++#endif ++ if(rc == 0) ++ CIFS_I(inode)->write_behind_rc = 0; ++ FreeXid(xid); ++ return rc; ++} ++ ++static int ++cifs_sync_page(struct page *page) ++{ ++ struct address_space *mapping; ++ struct inode *inode; ++ unsigned long index = page->index; ++ unsigned int rpages = 0; ++ int rc = 0; ++ ++ cFYI(1,("sync page %p",page)); ++ mapping = page->mapping; ++ if (!mapping) ++ return 0; ++ inode = mapping->host; ++ if (!inode) ++ return 0; ++ ++/* fill in rpages then ++ result = cifs_pagein_inode(inode, index, rpages); *//* BB finish */ ++ ++ cFYI(1, ("rpages is %d for sync page of Index %ld ", rpages, index)); ++ ++ if (rc < 0) ++ return rc; ++ return 0; ++} ++ ++/* ++ * As file closes, flush all cached write data for this inode checking ++ * for write behind errors. ++ * ++ */ ++int cifs_flush(struct file *file) ++{ ++ struct inode * inode = file->f_dentry->d_inode; ++ int rc = 0; ++ ++ /* Rather than do the steps manually: */ ++ /* lock the inode for writing */ ++ /* loop through pages looking for write behind data (dirty pages) */ ++ /* coalesce into contiguous 16K (or smaller) chunks to write to server */ ++ /* send to server (prefer in parallel) */ ++ /* deal with writebehind errors */ ++ /* unlock inode for writing */ ++ /* filemapfdatawrite appears easier for the time being */ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,17)) ++ rc = filemap_fdatasync(inode->i_mapping); ++#else ++ filemap_fdatasync(inode->i_mapping); ++#endif ++ if(rc == 0) /* reset wb rc if we were able to write out dirty pages */ ++ CIFS_I(inode)->write_behind_rc = 0; ++ ++ cFYI(1,("Flush inode %p file %p rc %d",inode,file,rc)); ++ ++ return rc; ++} ++ ++ ++ssize_t ++cifs_read(struct file * file, char *read_data, size_t read_size, ++ loff_t * poffset) ++{ ++ int rc = -EACCES; ++ unsigned int bytes_read = 0; ++ unsigned int total_read; ++ unsigned int current_read_size; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ int xid; ++ char * current_offset; ++ struct cifsFileInfo * open_file; ++ ++ xid = GetXid(); ++ cifs_sb = CIFS_SB(file->f_dentry->d_sb); ++ pTcon = cifs_sb->tcon; ++ ++ if (file->private_data == NULL) { ++ FreeXid(xid); ++ return -EBADF; ++ } ++ open_file = (struct cifsFileInfo *)file->private_data; ++ ++ if((file->f_flags & O_ACCMODE) == O_WRONLY) { ++ cFYI(1,("attempting read on write only file instance")); ++ } ++ ++ for (total_read = 0,current_offset=read_data; read_size > total_read; ++ total_read += bytes_read,current_offset+=bytes_read) { ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15)) ++ current_read_size = min_t(const int,read_size - total_read,cifs_sb->rsize); ++#else ++ current_read_size = min(read_size - total_read,cifs_sb->rsize); ++#endif ++ rc = -EAGAIN; ++ while(rc == -EAGAIN) { ++ if ((open_file->invalidHandle) && (!open_file->closePend)) { ++ rc = cifs_reopen_file(file->f_dentry->d_inode, ++ file,TRUE); ++ if(rc != 0) ++ break; ++ } ++ ++ rc = CIFSSMBRead(xid, pTcon, ++ open_file->netfid, ++ current_read_size, *poffset, ++ &bytes_read, ¤t_offset); ++ } ++ if (rc || (bytes_read == 0)) { ++ if (total_read) { ++ break; ++ } else { ++ FreeXid(xid); ++ return rc; ++ } ++ } else { ++#ifdef CONFIG_CIFS_STATS ++ atomic_inc(&pTcon->num_reads); ++ spin_lock(&pTcon->stat_lock); ++ pTcon->bytes_read += total_read; ++ spin_unlock(&pTcon->stat_lock); ++#endif ++ *poffset += bytes_read; ++ } ++ } ++ FreeXid(xid); ++ return total_read; ++} ++ ++int cifs_file_mmap(struct file * file, struct vm_area_struct * vma) ++{ ++ struct dentry * dentry = file->f_dentry; ++ int rc, xid; ++ ++ xid = GetXid(); ++ rc = cifs_revalidate(dentry); ++ if (rc) { ++ cFYI(1,("Validation prior to mmap failed, error=%d", rc)); ++ FreeXid(xid); ++ return rc; ++ } ++ rc = generic_file_mmap(file, vma); ++ FreeXid(xid); ++ return rc; ++} ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)) ++static void cifs_copy_cache_pages(struct address_space *mapping, ++ struct list_head *pages, int bytes_read, ++ char *data,struct pagevec * plru_pvec) ++{ ++ struct page *page; ++ char * target; ++ ++ while (bytes_read > 0) { ++ if(list_empty(pages)) ++ break; ++ ++ page = list_entry(pages->prev, struct page, lru); ++ list_del(&page->lru); ++ ++ if (add_to_page_cache(page, mapping, page->index, GFP_KERNEL)) { ++ page_cache_release(page); ++ cFYI(1,("Add page cache failed")); ++ continue; ++ } ++ ++ target = kmap_atomic(page,KM_USER0); ++ ++ if(PAGE_CACHE_SIZE > bytes_read) { ++ memcpy(target,data,bytes_read); ++ /* zero the tail end of this partial page */ ++ memset(target+bytes_read,0,PAGE_CACHE_SIZE-bytes_read); ++ bytes_read = 0; ++ } else { ++ memcpy(target,data,PAGE_CACHE_SIZE); ++ bytes_read -= PAGE_CACHE_SIZE; ++ } ++ kunmap_atomic(target,KM_USER0); ++ ++ flush_dcache_page(page); ++ SetPageUptodate(page); ++ unlock_page(page); ++ if (!pagevec_add(plru_pvec, page)) ++ __pagevec_lru_add(plru_pvec); ++ data += PAGE_CACHE_SIZE; ++ } ++ return; ++} ++ ++ ++static int ++cifs_readpages(struct file *file, struct address_space *mapping, ++ struct list_head *page_list, unsigned num_pages) ++{ ++ int rc = -EACCES; ++ int xid; ++ loff_t offset; ++ struct page * page; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ int bytes_read = 0; ++ unsigned int read_size,i; ++ char * smb_read_data = NULL; ++ struct smb_com_read_rsp * pSMBr; ++ struct pagevec lru_pvec; ++ struct cifsFileInfo * open_file; ++ ++ xid = GetXid(); ++ if (file->private_data == NULL) { ++ FreeXid(xid); ++ return -EBADF; ++ } ++ open_file = (struct cifsFileInfo *)file->private_data; ++ cifs_sb = CIFS_SB(file->f_dentry->d_sb); ++ pTcon = cifs_sb->tcon; ++ ++ pagevec_init(&lru_pvec, 0); ++ ++ for(i = 0;i<num_pages;) { ++ unsigned contig_pages; ++ struct page * tmp_page; ++ unsigned long expected_index; ++ ++ if(list_empty(page_list)) { ++ break; ++ } ++ page = list_entry(page_list->prev, struct page, lru); ++ offset = (loff_t)page->index << PAGE_CACHE_SHIFT; ++ ++ /* count adjacent pages that we will read into */ ++ contig_pages = 0; ++ expected_index = list_entry(page_list->prev,struct page,lru)->index; ++ list_for_each_entry_reverse(tmp_page,page_list,lru) { ++ if(tmp_page->index == expected_index) { ++ contig_pages++; ++ expected_index++; ++ } else { ++ break; ++ } ++ } ++ if(contig_pages + i > num_pages) { ++ contig_pages = num_pages - i; ++ } ++ ++ /* for reads over a certain size could initiate async read ahead */ ++ ++ read_size = contig_pages * PAGE_CACHE_SIZE; ++ /* Read size needs to be in multiples of one page */ ++ read_size = min_t(const unsigned int,read_size,cifs_sb->rsize & PAGE_CACHE_MASK); ++ ++ rc = -EAGAIN; ++ while(rc == -EAGAIN) { ++ if ((open_file->invalidHandle) && (!open_file->closePend)) { ++ rc = cifs_reopen_file(file->f_dentry->d_inode, ++ file, TRUE); ++ if(rc != 0) ++ break; ++ } ++ ++ rc = CIFSSMBRead(xid, pTcon, ++ open_file->netfid, ++ read_size, offset, ++ &bytes_read, &smb_read_data); ++ /* BB need to check return code here */ ++ if(rc== -EAGAIN) { ++ if(smb_read_data) { ++ cifs_buf_release(smb_read_data); ++ smb_read_data = NULL; ++ } ++ } ++ } ++ if ((rc < 0) || (smb_read_data == NULL)) { ++ cFYI(1,("Read error in readpages: %d",rc)); ++ /* clean up remaing pages off list */ ++ while (!list_empty(page_list) && (i < num_pages)) { ++ page = list_entry(page_list->prev, struct page, lru); ++ list_del(&page->lru); ++ page_cache_release(page); ++ } ++ break; ++ } else if (bytes_read > 0) { ++ pSMBr = (struct smb_com_read_rsp *)smb_read_data; ++ cifs_copy_cache_pages(mapping, page_list, bytes_read, ++ smb_read_data + 4 /* RFC1001 hdr */ + ++ le16_to_cpu(pSMBr->DataOffset), &lru_pvec); ++ ++ i += bytes_read >> PAGE_CACHE_SHIFT; ++#ifdef CONFIG_CIFS_STATS ++ atomic_inc(&pTcon->num_reads); ++ spin_lock(&pTcon->stat_lock); ++ pTcon->bytes_read += bytes_read; ++ spin_unlock(&pTcon->stat_lock); ++#endif ++ if((int)(bytes_read & PAGE_CACHE_MASK) != bytes_read) { ++ cFYI(1,("Partial page %d of %d read to cache",i++,num_pages)); ++ ++ i++; /* account for partial page */ ++ ++ /* server copy of file can have smaller size than client */ ++ /* BB do we need to verify this common case ? this case is ok - ++ if we are at server EOF we will hit it on next read */ ++ ++ /* while(!list_empty(page_list) && (i < num_pages)) { ++ page = list_entry(page_list->prev,struct page, list); ++ list_del(&page->list); ++ page_cache_release(page); ++ } ++ break; */ ++ } ++ } else { ++ cFYI(1,("No bytes read (%d) at offset %lld . Cleaning remaining pages from readahead list",bytes_read,offset)); ++ /* BB turn off caching and do new lookup on file size at server? */ ++ while (!list_empty(page_list) && (i < num_pages)) { ++ page = list_entry(page_list->prev, struct page, lru); ++ list_del(&page->lru); ++ page_cache_release(page); /* BB removeme - replace with zero of page? */ ++ } ++ break; ++ } ++ if(smb_read_data) { ++ cifs_buf_release(smb_read_data); ++ smb_read_data = NULL; ++ } ++ bytes_read = 0; ++ } ++ ++ pagevec_lru_add(&lru_pvec); ++ ++/* need to free smb_read_data buf before exit */ ++ if(smb_read_data) { ++ cifs_buf_release(smb_read_data); ++ smb_read_data = NULL; ++ } ++ ++ FreeXid(xid); ++ return rc; ++} ++#endif ++ ++static int cifs_readpage_worker(struct file *file, struct page *page, loff_t * poffset) ++{ ++ char * read_data; ++ int rc; ++ ++ page_cache_get(page); ++ read_data = kmap(page); ++ /* for reads over a certain size could initiate async read ahead */ ++ ++ rc = cifs_read(file, read_data, PAGE_CACHE_SIZE, poffset); ++ ++ if (rc < 0) ++ goto io_error; ++ else { ++ cFYI(1,("Bytes read %d ",rc)); ++ } ++ ++ file->f_dentry->d_inode->i_atime = CURRENT_TIME; ++ ++ if(PAGE_CACHE_SIZE > rc) { ++ memset(read_data+rc, 0, PAGE_CACHE_SIZE - rc); ++ } ++ flush_dcache_page(page); ++ SetPageUptodate(page); ++ rc = 0; ++ ++io_error: ++ kunmap(page); ++ page_cache_release(page); ++ return rc; ++} ++ ++static int ++cifs_readpage(struct file *file, struct page *page) ++{ ++ loff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT; ++ int rc = -EACCES; ++ int xid; ++ ++ xid = GetXid(); ++ ++ if (file->private_data == NULL) { ++ FreeXid(xid); ++ return -EBADF; ++ } ++ ++ cFYI(1,("readpage %p at offset %d 0x%x\n",page,(int)offset,(int)offset)); ++ ++ rc = cifs_readpage_worker(file,page,&offset); ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,20)) ++ unlock_page(page); ++#else ++ UnlockPage(page); ++#endif ++ ++ FreeXid(xid); ++ return rc; ++} ++ ++/* We do not want to update the file size from server for inodes ++ open for write - to avoid races with writepage extending ++ the file - in the future we could consider allowing ++ refreshing the inode only on increases in the file size ++ but this is tricky to do without racing with writebehind ++ page caching in the current Linux kernel design */ ++ ++int is_size_safe_to_change(struct cifsInodeInfo * cifsInode) ++{ ++ struct list_head *tmp; ++ struct list_head *tmp1; ++ struct cifsFileInfo *open_file = NULL; ++ int rc = TRUE; ++ ++ if(cifsInode == NULL) ++ return rc; ++ ++ read_lock(&GlobalSMBSeslock); ++ list_for_each_safe(tmp, tmp1, &cifsInode->openFileList) { ++ open_file = list_entry(tmp,struct cifsFileInfo, flist); ++ if(open_file == NULL) ++ break; ++ if(open_file->closePend) ++ continue; ++ /* We check if file is open for writing, ++ BB we could supplement this with a check to see if file size ++ changes have been flushed to server - ie inode metadata dirty */ ++ if((open_file->pfile) && ++ ((open_file->pfile->f_flags & O_RDWR) || ++ (open_file->pfile->f_flags & O_WRONLY))) { ++ rc = FALSE; ++ break; ++ } ++ if(tmp->next == NULL) { ++ cFYI(1,("File instance %p removed",tmp)); ++ break; ++ } ++ } ++ read_unlock(&GlobalSMBSeslock); ++ return rc; ++} ++ ++ ++void ++fill_in_inode(struct inode *tmp_inode, ++ FILE_DIRECTORY_INFO * pfindData, int *pobject_type) ++{ ++ struct cifsInodeInfo *cifsInfo = CIFS_I(tmp_inode); ++ struct cifs_sb_info *cifs_sb = CIFS_SB(tmp_inode->i_sb); ++ ++ pfindData->ExtFileAttributes = ++ le32_to_cpu(pfindData->ExtFileAttributes); ++ pfindData->AllocationSize = le64_to_cpu(pfindData->AllocationSize); ++ pfindData->EndOfFile = le64_to_cpu(pfindData->EndOfFile); ++ cifsInfo->cifsAttrs = pfindData->ExtFileAttributes; ++ cifsInfo->time = jiffies; ++ ++ /* Linux can not store file creation time unfortunately so ignore it */ ++ tmp_inode->i_atime = ++ cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastAccessTime)); ++ tmp_inode->i_mtime = ++ cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastWriteTime)); ++ tmp_inode->i_ctime = ++ cifs_NTtimeToUnix(le64_to_cpu(pfindData->ChangeTime)); ++ /* treat dos attribute of read-only as read-only mode bit e.g. 555? */ ++ /* 2767 perms - indicate mandatory locking */ ++ /* BB fill in uid and gid here? with help from winbind? ++ or retrieve from NTFS stream extended attribute */ ++ if(atomic_read(&cifsInfo->inUse) == 0) { ++ tmp_inode->i_uid = cifs_sb->mnt_uid; ++ tmp_inode->i_gid = cifs_sb->mnt_gid; ++ /* set default mode. will override for dirs below */ ++ tmp_inode->i_mode = cifs_sb->mnt_file_mode; ++ } ++ ++ cFYI(0, ++ ("CIFS FFIRST: Attributes came in as 0x%x", ++ pfindData->ExtFileAttributes)); ++ if (pfindData->ExtFileAttributes & ATTR_REPARSE) { ++ *pobject_type = DT_LNK; ++ /* BB can this and S_IFREG or S_IFDIR be set as in Windows? */ ++ tmp_inode->i_mode |= S_IFLNK; ++ } else if (pfindData->ExtFileAttributes & ATTR_DIRECTORY) { ++ *pobject_type = DT_DIR; ++ /* override default perms since we do not lock dirs */ ++ if(atomic_read(&cifsInfo->inUse) == 0) { ++ tmp_inode->i_mode = cifs_sb->mnt_dir_mode; ++ } ++ tmp_inode->i_mode |= S_IFDIR; ++ } else { ++ *pobject_type = DT_REG; ++ tmp_inode->i_mode |= S_IFREG; ++ if(pfindData->ExtFileAttributes & ATTR_READONLY) ++ tmp_inode->i_mode &= ~(S_IWUGO); ++ ++ }/* could add code here - to validate if device or weird share type? */ ++ ++ /* can not fill in nlink here as in qpathinfo version and Unx search */ ++ if(atomic_read(&cifsInfo->inUse) == 0) { ++ atomic_set(&cifsInfo->inUse,1); ++ } ++ if(is_size_safe_to_change(cifsInfo)) { ++ /* can not safely change the file size here if the ++ client is writing to it due to potential races */ ++ tmp_inode->i_size = pfindData->EndOfFile; ++ ++ /* 512 bytes (2**9) is the fake blocksize that must be used */ ++ /* for this calculation, even though the reported blocksize is larger */ ++ tmp_inode->i_blocks = (512 - 1 + pfindData->AllocationSize) >> 9; ++ } ++ ++ if (pfindData->AllocationSize < pfindData->EndOfFile) ++ cFYI(1, ("Possible sparse file: allocation size less than end of file ")); ++ cFYI(1, ++ ("File Size %ld and blocks %ld and blocksize %ld", ++ (unsigned long) tmp_inode->i_size, tmp_inode->i_blocks, ++ tmp_inode->i_blksize)); ++ if (S_ISREG(tmp_inode->i_mode)) { ++ cFYI(1, (" File inode ")); ++ tmp_inode->i_op = &cifs_file_inode_ops; ++ tmp_inode->i_fop = &cifs_file_ops; ++ tmp_inode->i_data.a_ops = &cifs_addr_ops; ++ } else if (S_ISDIR(tmp_inode->i_mode)) { ++ cFYI(1, (" Directory inode")); ++ tmp_inode->i_op = &cifs_dir_inode_ops; ++ tmp_inode->i_fop = &cifs_dir_ops; ++ } else if (S_ISLNK(tmp_inode->i_mode)) { ++ cFYI(1, (" Symbolic Link inode ")); ++ tmp_inode->i_op = &cifs_symlink_inode_ops; ++ } else { ++ cFYI(1, (" Init special inode ")); ++ init_special_inode(tmp_inode, tmp_inode->i_mode, ++ kdev_t_to_nr(tmp_inode->i_rdev)); ++ } ++} ++ ++void ++unix_fill_in_inode(struct inode *tmp_inode, ++ FILE_UNIX_INFO * pfindData, int *pobject_type) ++{ ++ struct cifsInodeInfo *cifsInfo = CIFS_I(tmp_inode); ++ cifsInfo->time = jiffies; ++ atomic_inc(&cifsInfo->inUse); ++ ++ tmp_inode->i_atime = ++ cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastAccessTime)); ++ tmp_inode->i_mtime = ++ cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastModificationTime)); ++ tmp_inode->i_ctime = ++ cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastStatusChange)); ++ ++ tmp_inode->i_mode = le64_to_cpu(pfindData->Permissions); ++ pfindData->Type = le32_to_cpu(pfindData->Type); ++ if (pfindData->Type == UNIX_FILE) { ++ *pobject_type = DT_REG; ++ tmp_inode->i_mode |= S_IFREG; ++ } else if (pfindData->Type == UNIX_SYMLINK) { ++ *pobject_type = DT_LNK; ++ tmp_inode->i_mode |= S_IFLNK; ++ } else if (pfindData->Type == UNIX_DIR) { ++ *pobject_type = DT_DIR; ++ tmp_inode->i_mode |= S_IFDIR; ++ } else if (pfindData->Type == UNIX_CHARDEV) { ++ *pobject_type = DT_CHR; ++ tmp_inode->i_mode |= S_IFCHR; ++ tmp_inode->i_rdev = MKDEV(le64_to_cpu(pfindData->DevMajor), ++ le64_to_cpu(pfindData->DevMinor) & MINORMASK); ++ } else if (pfindData->Type == UNIX_BLOCKDEV) { ++ *pobject_type = DT_BLK; ++ tmp_inode->i_mode |= S_IFBLK; ++ tmp_inode->i_rdev = MKDEV(le64_to_cpu(pfindData->DevMajor), ++ le64_to_cpu(pfindData->DevMinor) & MINORMASK); ++ } else if (pfindData->Type == UNIX_FIFO) { ++ *pobject_type = DT_FIFO; ++ tmp_inode->i_mode |= S_IFIFO; ++ } else if (pfindData->Type == UNIX_SOCKET) { ++ *pobject_type = DT_SOCK; ++ tmp_inode->i_mode |= S_IFSOCK; ++ } ++ ++ tmp_inode->i_uid = le64_to_cpu(pfindData->Uid); ++ tmp_inode->i_gid = le64_to_cpu(pfindData->Gid); ++ tmp_inode->i_nlink = le64_to_cpu(pfindData->Nlinks); ++ ++ pfindData->NumOfBytes = le64_to_cpu(pfindData->NumOfBytes); ++ if(is_size_safe_to_change(cifsInfo)) { ++ /* can not safely change the file size here if the ++ client is writing to it due to potential races */ ++ pfindData->EndOfFile = le64_to_cpu(pfindData->EndOfFile); ++ tmp_inode->i_size = pfindData->EndOfFile; ++ ++ /* 512 bytes (2**9) is the fake blocksize that must be used */ ++ /* for this calculation, not the real blocksize */ ++ tmp_inode->i_blocks = (512 - 1 + pfindData->NumOfBytes) >> 9; ++ } ++ ++ if (S_ISREG(tmp_inode->i_mode)) { ++ cFYI(1, ("File inode")); ++ tmp_inode->i_op = &cifs_file_inode_ops; ++ tmp_inode->i_fop = &cifs_file_ops; ++ tmp_inode->i_data.a_ops = &cifs_addr_ops; ++ } else if (S_ISDIR(tmp_inode->i_mode)) { ++ cFYI(1, ("Directory inode")); ++ tmp_inode->i_op = &cifs_dir_inode_ops; ++ tmp_inode->i_fop = &cifs_dir_ops; ++ } else if (S_ISLNK(tmp_inode->i_mode)) { ++ cFYI(1, ("Symbolic Link inode")); ++ tmp_inode->i_op = &cifs_symlink_inode_ops; ++/* tmp_inode->i_fop = *//* do not need to set to anything */ ++ } else { ++ cFYI(1, ("Special inode")); ++ init_special_inode(tmp_inode, tmp_inode->i_mode, ++ kdev_t_to_nr(tmp_inode->i_rdev)); ++ } ++} ++ ++static void ++construct_dentry(struct qstr *qstring, struct file *file, ++ struct inode **ptmp_inode, struct dentry **pnew_dentry) ++{ ++ struct dentry *tmp_dentry; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ struct cifsInodeInfo *pCifsI; ++ ++ cFYI(1, ("For %s ", qstring->name)); ++ cifs_sb = CIFS_SB(file->f_dentry->d_sb); ++ pTcon = cifs_sb->tcon; ++ ++ qstring->hash = full_name_hash(qstring->name, qstring->len); ++ tmp_dentry = d_lookup(file->f_dentry, qstring); ++ if (tmp_dentry) { ++ cFYI(0, (" existing dentry with inode 0x%p", tmp_dentry->d_inode)); ++ *ptmp_inode = tmp_dentry->d_inode; ++ /* BB overwrite the old name? i.e. tmp_dentry->d_name and tmp_dentry->d_name.len ?? */ ++ if(*ptmp_inode == NULL) { ++ *ptmp_inode = new_inode(file->f_dentry->d_sb); ++ if(*ptmp_inode == NULL) ++ return; ++ d_instantiate(tmp_dentry, *ptmp_inode); ++ insert_inode_hash(*ptmp_inode); ++ pCifsI = CIFS_I(*ptmp_inode); ++ INIT_LIST_HEAD(&pCifsI->openFileList); ++ /* can not enable caching for this inode ++ until a file instance is open and we ++ can check the oplock flag on the open ++ response */ ++ (*ptmp_inode)->i_blksize = CIFS_MAX_MSGSIZE; ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15)) ++ (*ptmp_inode)->i_blkbits = 14; /* 2**14 = CIFS_MAX_MSGSIZE */ ++#endif ++ pCifsI->clientCanCacheRead = FALSE; ++ pCifsI->clientCanCacheAll = FALSE; ++ pCifsI->time = 0; ++ /* do not need to set cifs Attrs since ++ they are about to be overwritten ++ in fill_in_inode */ ++ atomic_set(&pCifsI->inUse, 0); ++ } ++ } else { ++ tmp_dentry = d_alloc(file->f_dentry, qstring); ++ if(tmp_dentry == NULL) { ++ cERROR(1,("Failed allocating dentry")); ++ return; ++ } ++ ++ if(ptmp_inode) { ++ *ptmp_inode = new_inode(file->f_dentry->d_sb); ++ if(*ptmp_inode == NULL) ++ return; ++ pCifsI = CIFS_I(*ptmp_inode); ++ insert_inode_hash(*ptmp_inode); ++ INIT_LIST_HEAD(&pCifsI->openFileList); ++ /* can not enable caching for this inode ++ until a file instance is open and we ++ can check the oplock flag on the open ++ response */ ++ (*ptmp_inode)->i_blksize = CIFS_MAX_MSGSIZE; ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15)) ++ (*ptmp_inode)->i_blkbits = 14; /* 2**14 = CIFS_MAX_MSGSIZE */ ++#endif ++ pCifsI->clientCanCacheRead = FALSE; ++ pCifsI->clientCanCacheAll = FALSE; ++ pCifsI->time = 0; ++ /* do not need to set cifs Attrs since ++ they are about to be overwritten ++ in fill_in_inode */ ++ atomic_set(&pCifsI->inUse, 0); ++ } ++ tmp_dentry->d_op = &cifs_dentry_ops; ++ d_instantiate(tmp_dentry, *ptmp_inode); ++ d_rehash(tmp_dentry); ++ } ++ ++ tmp_dentry->d_time = jiffies; ++ *pnew_dentry = tmp_dentry; ++} ++ ++static void reset_resume_key(struct file * dir_file, ++ unsigned char * filename, ++ unsigned int len,int Unicode,struct nls_table * nls_tab) { ++ struct cifsFileInfo *cifsFile; ++ ++ cifsFile = (struct cifsFileInfo *)dir_file->private_data; ++ if(cifsFile == NULL) ++ return; ++ if(cifsFile->search_resume_name) { ++ kfree(cifsFile->search_resume_name); ++ } ++ ++ if(Unicode) ++ len *= 2; ++ cifsFile->resume_name_length = len; ++ ++ cifsFile->search_resume_name = ++ kmalloc(cifsFile->resume_name_length, GFP_KERNEL); ++ ++ if(cifsFile->search_resume_name == NULL) { ++ cERROR(1,("failed new resume key allocate, length %d", ++ cifsFile->resume_name_length)); ++ return; ++ } ++ if(Unicode) ++ cifs_strtoUCS((wchar_t *) cifsFile->search_resume_name, ++ filename, len, nls_tab); ++ else ++ memcpy(cifsFile->search_resume_name, filename, ++ cifsFile->resume_name_length); ++ cFYI(1,("Reset resume key to: %s with len %d",filename,len)); ++ return; ++} ++ ++ ++ ++static int ++cifs_filldir(struct qstr *pqstring, FILE_DIRECTORY_INFO * pfindData, ++ struct file *file, filldir_t filldir, void *direntry) ++{ ++ struct inode *tmp_inode; ++ struct dentry *tmp_dentry; ++ int object_type,rc; ++ ++ pqstring->name = pfindData->FileName; ++ pqstring->len = pfindData->FileNameLength; ++ ++ construct_dentry(pqstring, file, &tmp_inode, &tmp_dentry); ++ if((tmp_inode == NULL) || (tmp_dentry == NULL)) { ++ return -ENOMEM; ++ } ++ fill_in_inode(tmp_inode, pfindData, &object_type); ++ rc = filldir(direntry, pfindData->FileName, pqstring->len, file->f_pos, ++ tmp_inode->i_ino, object_type); ++ if(rc) { ++ /* due to readdir error we need to recalculate resume ++ key so next readdir will restart on right entry */ ++ cFYI(1,("Error %d on filldir of %s",rc ,pfindData->FileName)); ++ } ++ dput(tmp_dentry); ++ return rc; ++} ++ ++static int ++cifs_filldir_unix(struct qstr *pqstring, ++ FILE_UNIX_INFO * pUnixFindData, struct file *file, ++ filldir_t filldir, void *direntry) ++{ ++ struct inode *tmp_inode; ++ struct dentry *tmp_dentry; ++ int object_type, rc; ++ ++ pqstring->name = pUnixFindData->FileName; ++ pqstring->len = strnlen(pUnixFindData->FileName, MAX_PATHCONF); ++ ++ construct_dentry(pqstring, file, &tmp_inode, &tmp_dentry); ++ if((tmp_inode == NULL) || (tmp_dentry == NULL)) { ++ return -ENOMEM; ++ } ++ ++ unix_fill_in_inode(tmp_inode, pUnixFindData, &object_type); ++ rc = filldir(direntry, pUnixFindData->FileName, pqstring->len, ++ file->f_pos, tmp_inode->i_ino, object_type); ++ if(rc) { ++ /* due to readdir error we need to recalculate resume ++ key so next readdir will restart on right entry */ ++ cFYI(1,("Error %d on filldir of %s",rc ,pUnixFindData->FileName)); ++ } ++ dput(tmp_dentry); ++ return rc; ++} ++ ++int ++cifs_readdir(struct file *file, void *direntry, filldir_t filldir) ++{ ++ int rc = 0; ++ int xid; ++ int Unicode = FALSE; ++ int UnixSearch = FALSE; ++ unsigned int bufsize, i; ++ __u16 searchHandle; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ struct cifsFileInfo *cifsFile = NULL; ++ char *full_path = NULL; ++ char *data; ++ struct qstr qstring; ++ T2_FFIRST_RSP_PARMS findParms; ++ T2_FNEXT_RSP_PARMS findNextParms; ++ FILE_DIRECTORY_INFO *pfindData; ++ FILE_DIRECTORY_INFO *lastFindData; ++ FILE_UNIX_INFO *pfindDataUnix; ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(file->f_dentry->d_sb); ++ pTcon = cifs_sb->tcon; ++ bufsize = pTcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE; ++ if(bufsize > CIFS_MAX_MSGSIZE) { ++ FreeXid(xid); ++ return -EIO; ++ } ++ data = kmalloc(bufsize, GFP_KERNEL); ++ pfindData = (FILE_DIRECTORY_INFO *) data; ++ ++ if(file->f_dentry == NULL) { ++ FreeXid(xid); ++ return -EIO; ++ } ++ down(&file->f_dentry->d_sb->s_vfs_rename_sem); ++ full_path = build_wildcard_path_from_dentry(file->f_dentry); ++ up(&file->f_dentry->d_sb->s_vfs_rename_sem); ++ ++ ++ cFYI(1, ("Full path: %s start at: %lld ", full_path, file->f_pos)); ++ ++ switch ((int) file->f_pos) { ++ case 0: ++ if (filldir(direntry, ".", 1, file->f_pos, ++ file->f_dentry->d_inode->i_ino, DT_DIR) < 0) { ++ cERROR(1, ("Filldir for current dir failed ")); ++ break; ++ } ++ file->f_pos++; ++ /* fallthrough */ ++ case 1: ++ if (filldir(direntry, "..", 2, file->f_pos, ++ file->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0) { ++ cERROR(1, ("Filldir for parent dir failed ")); ++ break; ++ } ++ file->f_pos++; ++ /* fallthrough */ ++ case 2: ++ if (file->private_data != NULL) { ++ cifsFile = ++ (struct cifsFileInfo *) file->private_data; ++ if (cifsFile->endOfSearch) { ++ if(cifsFile->emptyDir) { ++ cFYI(1, ("End of search, empty dir")); ++ rc = 0; ++ break; ++ } ++ } else { ++ cifsFile->invalidHandle = TRUE; ++ CIFSFindClose(xid, pTcon, cifsFile->netfid); ++ } ++ if(cifsFile->search_resume_name) { ++ kfree(cifsFile->search_resume_name); ++ cifsFile->search_resume_name = NULL; ++ } ++ } ++ rc = CIFSFindFirst(xid, pTcon, full_path, pfindData, ++ &findParms, cifs_sb->local_nls, ++ &Unicode, &UnixSearch); ++ cFYI(1, ("Count: %d End: %d ", findParms.SearchCount, ++ findParms.EndofSearch)); ++ ++ if (rc == 0) { ++ searchHandle = findParms.SearchHandle; ++ if(file->private_data == NULL) ++ file->private_data = ++ kmalloc(sizeof(struct cifsFileInfo),GFP_KERNEL); ++ if (file->private_data) { ++ memset(file->private_data, 0, ++ sizeof (struct cifsFileInfo)); ++ cifsFile = ++ (struct cifsFileInfo *) file->private_data; ++ cifsFile->netfid = searchHandle; ++ cifsFile->invalidHandle = FALSE; ++ init_MUTEX(&cifsFile->fh_sem); ++ } else { ++ rc = -ENOMEM; ++ break; ++ } ++ ++ renew_parental_timestamps(file->f_dentry); ++ lastFindData = ++ (FILE_DIRECTORY_INFO *) ((char *) pfindData + ++ findParms.LastNameOffset); ++ if((char *)lastFindData > (char *)pfindData + bufsize) { ++ cFYI(1,("last search entry past end of packet")); ++ rc = -EIO; ++ break; ++ } ++ /* Offset of resume key same for levels 257 and 514 */ ++ cifsFile->resume_key = lastFindData->FileIndex; ++ if(UnixSearch == FALSE) { ++ cifsFile->resume_name_length = ++ le32_to_cpu(lastFindData->FileNameLength); ++ if(cifsFile->resume_name_length > bufsize - 64) { ++ cFYI(1,("Illegal resume file name length %d", ++ cifsFile->resume_name_length)); ++ rc = -ENOMEM; ++ break; ++ } ++ cifsFile->search_resume_name = ++ kmalloc(cifsFile->resume_name_length, GFP_KERNEL); ++ cFYI(1,("Last file: %s with name %d bytes long", ++ lastFindData->FileName, ++ cifsFile->resume_name_length)); ++ memcpy(cifsFile->search_resume_name, ++ lastFindData->FileName, ++ cifsFile->resume_name_length); ++ } else { ++ pfindDataUnix = (FILE_UNIX_INFO *)lastFindData; ++ if (Unicode == TRUE) { ++ for(i=0;(pfindDataUnix->FileName[i] ++ | pfindDataUnix->FileName[i+1]); ++ i+=2) { ++ if(i > bufsize-64) ++ break; ++ } ++ cifsFile->resume_name_length = i + 2; ++ } else { ++ cifsFile->resume_name_length = ++ strnlen(pfindDataUnix->FileName, ++ bufsize-63); ++ } ++ if(cifsFile->resume_name_length > bufsize - 64) { ++ cFYI(1,("Illegal resume file name length %d", ++ cifsFile->resume_name_length)); ++ rc = -ENOMEM; ++ break; ++ } ++ cifsFile->search_resume_name = ++ kmalloc(cifsFile->resume_name_length, GFP_KERNEL); ++ cFYI(1,("Last file: %s with name %d bytes long", ++ pfindDataUnix->FileName, ++ cifsFile->resume_name_length)); ++ memcpy(cifsFile->search_resume_name, ++ pfindDataUnix->FileName, ++ cifsFile->resume_name_length); ++ } ++ for (i = 2; i < (unsigned int)findParms.SearchCount + 2; i++) { ++ if (UnixSearch == FALSE) { ++ pfindData->FileNameLength = ++ le32_to_cpu(pfindData->FileNameLength); ++ if (Unicode == TRUE) ++ pfindData->FileNameLength = ++ cifs_strfromUCS_le ++ (pfindData->FileName, ++ (wchar_t *) ++ pfindData->FileName, ++ (pfindData-> ++ FileNameLength) / 2, ++ cifs_sb->local_nls); ++ qstring.len = pfindData->FileNameLength; ++ if (((qstring.len != 1) ++ || (pfindData->FileName[0] != '.')) ++ && ((qstring.len != 2) ++ || (pfindData-> ++ FileName[0] != '.') ++ || (pfindData-> ++ FileName[1] != '.'))) { ++ if(cifs_filldir(&qstring, ++ pfindData, ++ file, filldir, ++ direntry)) { ++ /* do not end search if ++ kernel not ready to take ++ remaining entries yet */ ++ reset_resume_key(file, pfindData->FileName,qstring.len, ++ Unicode, cifs_sb->local_nls); ++ findParms.EndofSearch = 0; ++ break; ++ } ++ file->f_pos++; ++ } ++ } else { /* UnixSearch */ ++ pfindDataUnix = ++ (FILE_UNIX_INFO *) pfindData; ++ if (Unicode == TRUE) ++ qstring.len = ++ cifs_strfromUCS_le ++ (pfindDataUnix->FileName, ++ (wchar_t *) ++ pfindDataUnix->FileName, ++ MAX_PATHCONF, ++ cifs_sb->local_nls); ++ else ++ qstring.len = ++ strnlen(pfindDataUnix-> ++ FileName, ++ MAX_PATHCONF); ++ if (((qstring.len != 1) ++ || (pfindDataUnix-> ++ FileName[0] != '.')) ++ && ((qstring.len != 2) ++ || (pfindDataUnix-> ++ FileName[0] != '.') ++ || (pfindDataUnix-> ++ FileName[1] != '.'))) { ++ if(cifs_filldir_unix(&qstring, ++ pfindDataUnix, ++ file, ++ filldir, ++ direntry)) { ++ /* do not end search if ++ kernel not ready to take ++ remaining entries yet */ ++ findParms.EndofSearch = 0; ++ reset_resume_key(file, pfindDataUnix->FileName, ++ qstring.len,Unicode,cifs_sb->local_nls); ++ break; ++ } ++ file->f_pos++; ++ } ++ } ++ /* works also for Unix ff struct since first field of both */ ++ pfindData = ++ (FILE_DIRECTORY_INFO *) ((char *) pfindData ++ + le32_to_cpu(pfindData->NextEntryOffset)); ++ /* BB also should check to make sure that pointer is not beyond the end of the SMB */ ++ /* if(pfindData > lastFindData) rc = -EIO; break; */ ++ } /* end for loop */ ++ if ((findParms.EndofSearch != 0) && cifsFile) { ++ cifsFile->endOfSearch = TRUE; ++ if(findParms.SearchCount == 2) ++ cifsFile->emptyDir = TRUE; ++ } ++ } else { ++ if (cifsFile) ++ cifsFile->endOfSearch = TRUE; ++ /* unless parent directory gone do not return error */ ++ rc = 0; ++ } ++ break; ++ default: ++ if (file->private_data == NULL) { ++ rc = -EBADF; ++ cFYI(1, ++ ("Readdir on closed srch, pos = %lld", ++ file->f_pos)); ++ } else { ++ cifsFile = (struct cifsFileInfo *) file->private_data; ++ if (cifsFile->endOfSearch) { ++ rc = 0; ++ cFYI(1, ("End of search ")); ++ break; ++ } ++ searchHandle = cifsFile->netfid; ++ rc = CIFSFindNext(xid, pTcon, pfindData, ++ &findNextParms, searchHandle, ++ cifsFile->search_resume_name, ++ cifsFile->resume_name_length, ++ cifsFile->resume_key, ++ &Unicode, &UnixSearch); ++ cFYI(1,("Count: %d End: %d ", ++ findNextParms.SearchCount, ++ findNextParms.EndofSearch)); ++ if ((rc == 0) && (findNextParms.SearchCount != 0)) { ++ /* BB save off resume key, key name and name length */ ++ lastFindData = ++ (FILE_DIRECTORY_INFO *) ((char *) pfindData ++ + findNextParms.LastNameOffset); ++ if((char *)lastFindData > (char *)pfindData + bufsize) { ++ cFYI(1,("last search entry past end of packet")); ++ rc = -EIO; ++ break; ++ } ++ /* Offset of resume key same for levels 257 and 514 */ ++ cifsFile->resume_key = lastFindData->FileIndex; ++ ++ if(UnixSearch == FALSE) { ++ cifsFile->resume_name_length = ++ le32_to_cpu(lastFindData->FileNameLength); ++ if(cifsFile->resume_name_length > bufsize - 64) { ++ cFYI(1,("Illegal resume file name length %d", ++ cifsFile->resume_name_length)); ++ rc = -ENOMEM; ++ break; ++ } ++ /* Free the memory allocated by previous findfirst ++ or findnext call - we can not reuse the memory since ++ the resume name may not be same string length */ ++ if(cifsFile->search_resume_name) ++ kfree(cifsFile->search_resume_name); ++ cifsFile->search_resume_name = ++ kmalloc(cifsFile->resume_name_length, GFP_KERNEL); ++ cFYI(1,("Last file: %s with name %d bytes long", ++ lastFindData->FileName, ++ cifsFile->resume_name_length)); ++ memcpy(cifsFile->search_resume_name, ++ lastFindData->FileName, ++ cifsFile->resume_name_length); ++ } else { ++ pfindDataUnix = (FILE_UNIX_INFO *)lastFindData; ++ if (Unicode == TRUE) { ++ for(i=0;(pfindDataUnix->FileName[i] ++ | pfindDataUnix->FileName[i+1]); ++ i+=2) { ++ if(i > bufsize-64) ++ break; ++ } ++ cifsFile->resume_name_length = i + 2; ++ } else { ++ cifsFile->resume_name_length = ++ strnlen(pfindDataUnix-> ++ FileName, ++ MAX_PATHCONF); ++ } ++ if(cifsFile->resume_name_length > bufsize - 64) { ++ cFYI(1,("Illegal resume file name length %d", ++ cifsFile->resume_name_length)); ++ rc = -ENOMEM; ++ break; ++ } ++ /* Free the memory allocated by previous findfirst ++ or findnext call - we can not reuse the memory since ++ the resume name may not be same string length */ ++ if(cifsFile->search_resume_name) ++ kfree(cifsFile->search_resume_name); ++ cifsFile->search_resume_name = ++ kmalloc(cifsFile->resume_name_length, GFP_KERNEL); ++ cFYI(1,("fnext last file: %s with name %d bytes long", ++ pfindDataUnix->FileName, ++ cifsFile->resume_name_length)); ++ memcpy(cifsFile->search_resume_name, ++ pfindDataUnix->FileName, ++ cifsFile->resume_name_length); ++ } ++ ++ for (i = 0; i < findNextParms.SearchCount; i++) { ++ pfindData->FileNameLength = ++ le32_to_cpu(pfindData-> ++ FileNameLength); ++ if (UnixSearch == FALSE) { ++ if (Unicode == TRUE) ++ pfindData->FileNameLength = ++ cifs_strfromUCS_le ++ (pfindData->FileName, ++ (wchar_t *) ++ pfindData->FileName, ++ (pfindData->FileNameLength)/ 2, ++ cifs_sb->local_nls); ++ qstring.len = ++ pfindData->FileNameLength; ++ if (((qstring.len != 1) ++ || (pfindData->FileName[0] != '.')) ++ && ((qstring.len != 2) ++ || (pfindData->FileName[0] != '.') ++ || (pfindData->FileName[1] != ++ '.'))) { ++ if(cifs_filldir ++ (&qstring, ++ pfindData, ++ file, filldir, ++ direntry)) { ++ /* do not end search if ++ kernel not ready to take ++ remaining entries yet */ ++ findNextParms.EndofSearch = 0; ++ reset_resume_key(file, pfindData->FileName,qstring.len, ++ Unicode,cifs_sb->local_nls); ++ break; ++ } ++ file->f_pos++; ++ } ++ } else { /* UnixSearch */ ++ pfindDataUnix = ++ (FILE_UNIX_INFO *) ++ pfindData; ++ if (Unicode == TRUE) ++ qstring.len = ++ cifs_strfromUCS_le ++ (pfindDataUnix->FileName, ++ (wchar_t *) ++ pfindDataUnix->FileName, ++ MAX_PATHCONF, ++ cifs_sb->local_nls); ++ else ++ qstring.len = ++ strnlen ++ (pfindDataUnix-> ++ FileName, ++ MAX_PATHCONF); ++ if (((qstring.len != 1) ++ || (pfindDataUnix-> ++ FileName[0] != '.')) ++ && ((qstring.len != 2) ++ || (pfindDataUnix-> ++ FileName[0] != '.') ++ || (pfindDataUnix-> ++ FileName[1] != ++ '.'))) { ++ if(cifs_filldir_unix ++ (&qstring, ++ pfindDataUnix, ++ file, filldir, ++ direntry)) { ++ /* do not end search if ++ kernel not ready to take ++ remaining entries yet */ ++ findNextParms.EndofSearch = 0; ++ reset_resume_key(file, pfindDataUnix->FileName,qstring.len, ++ Unicode,cifs_sb->local_nls); ++ break; ++ } ++ file->f_pos++; ++ } ++ } ++ pfindData = (FILE_DIRECTORY_INFO *) ((char *) pfindData + le32_to_cpu(pfindData->NextEntryOffset)); /* works also for Unix find struct since this is the first field of both */ ++ /* BB also should check to make sure that pointer is not beyond the end of the SMB */ ++ } /* end for loop */ ++ if (findNextParms.EndofSearch != 0) { ++ cifsFile->endOfSearch = TRUE; ++ } ++ } else { ++ cifsFile->endOfSearch = TRUE; ++ rc = 0; /* unless parent directory disappeared - do not return error here (eg Access Denied or no more files) */ ++ } ++ } ++ } /* end switch */ ++ if (data) ++ kfree(data); ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ ++ return rc; ++} ++int cifs_prepare_write(struct file *file, struct page *page, ++ unsigned from, unsigned to) ++{ ++ int rc = 0; ++ loff_t offset = (loff_t)page->index << PAGE_CACHE_SHIFT; ++ cFYI(1,("prepare write for page %p from %d to %d",page,from,to)); ++ if (!Page_Uptodate(page)) { ++ /* if (to - from != PAGE_CACHE_SIZE) { ++ void *kaddr = kmap_atomic(page, KM_USER0); ++ memset(kaddr, 0, from); ++ memset(kaddr + to, 0, PAGE_CACHE_SIZE - to); ++ flush_dcache_page(page); ++ kunmap_atomic(kaddr, KM_USER0); ++ } */ ++ /* If we are writing a full page it will be up to date, ++ no need to read from the server */ ++ if((to==PAGE_CACHE_SIZE) && (from == 0)) ++ SetPageUptodate(page); ++ ++ /* might as well read a page, it is fast enough */ ++ if((file->f_flags & O_ACCMODE) != O_WRONLY) { ++ rc = cifs_readpage_worker(file,page,&offset); ++ } else { ++ /* should we try using another ++ file handle if there is one - how would we lock it ++ to prevent close of that handle racing with this read? */ ++ /* In any case this will be written out by commit_write */ ++ } ++ } ++ ++ /* BB should we pass any errors back? e.g. if we do not have read access to the file */ ++ return 0; ++} ++ ++ ++struct address_space_operations cifs_addr_ops = { ++ .readpage = cifs_readpage, ++/* .readpages = cifs_readpages, */ ++ .writepage = cifs_writepage, ++ .prepare_write = cifs_prepare_write, ++ .commit_write = cifs_commit_write, ++ .sync_page = cifs_sync_page, ++ /*.direct_IO = */ ++}; +diff -urN linux-2.4.29.old/fs/cifs/inode.c linux-2.4.29/fs/cifs/inode.c +--- linux-2.4.29.old/fs/cifs/inode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/inode.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,1079 @@ ++/* ++ * fs/cifs/inode.c ++ * ++ * Copyright (C) International Business Machines Corp., 2002,2003 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/fs.h> ++#include <linux/stat.h> ++#include <linux/pagemap.h> ++#include <linux/version.h> ++#include <asm/div64.h> ++#include "cifsfs.h" ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifsproto.h" ++#include "cifs_debug.h" ++#include "cifs_fs_sb.h" ++ ++extern int is_size_safe_to_change(struct cifsInodeInfo *); ++ ++struct inode * get_cifs_inode(struct super_block * sb) ++{ ++ struct inode * newinode; ++ newinode = new_inode(sb); ++ cFYI(1,("got new inode %p",newinode)); ++ if(newinode) { ++ struct cifsInodeInfo * cifsInfo = CIFS_I(newinode); ++ cifsInfo->clientCanCacheRead = FALSE; ++ cifsInfo->clientCanCacheAll = FALSE; ++ INIT_LIST_HEAD(&cifsInfo->openFileList); ++ cifsInfo->cifsAttrs = 0x20; /* default */ ++ newinode->i_blksize = CIFS_MAX_MSGSIZE; ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,15)) ++ newinode->i_blkbits = 14; /* 2**14 = CIFS_MAX_MSGSIZE */ ++#endif ++ atomic_set(&cifsInfo->inUse, 0); ++ cifsInfo->time = 0; ++ insert_inode_hash(newinode); ++ } ++ return newinode; ++ ++} ++ ++int ++cifs_get_inode_info_unix(struct inode **pinode, ++ const unsigned char *search_path, ++ struct super_block *sb,int xid) ++{ ++ int rc = 0; ++ FILE_UNIX_BASIC_INFO findData; ++ struct cifsTconInfo *pTcon; ++ struct inode *inode; ++ struct cifs_sb_info *cifs_sb = CIFS_SB(sb); ++ char *tmp_path; ++ ++ pTcon = cifs_sb->tcon; ++ cFYI(1, (" Getting info on %s ", search_path)); ++ /* we could have done a find first instead but this returns more info */ ++ rc = CIFSSMBUnixQPathInfo(xid, pTcon, search_path, &findData, ++ cifs_sb->local_nls); ++ /* dump_mem("\nUnixQPathInfo return data", &findData, sizeof(findData)); */ ++ if (rc) { ++ if (rc == -EREMOTE) { ++ tmp_path = ++ kmalloc(strnlen ++ (pTcon->treeName, ++ MAX_TREE_SIZE + 1) + ++ strnlen(search_path, MAX_PATHCONF) + 1, ++ GFP_KERNEL); ++ if (tmp_path == NULL) { ++ return -ENOMEM; ++ } ++ /* have to skip first of the double backslash of UNC name */ ++ strncpy(tmp_path, pTcon->treeName, MAX_TREE_SIZE); ++ strncat(tmp_path, search_path, MAX_PATHCONF); ++ rc = connect_to_dfs_path(xid, pTcon->ses, ++ /* treename + */ tmp_path, ++ cifs_sb->local_nls); ++ kfree(tmp_path); ++ ++ /* BB fix up inode etc. */ ++ } else if (rc) { ++ return rc; ++ } ++ ++ } else { ++ struct cifsInodeInfo *cifsInfo; ++ ++ /* get new inode */ ++ if (*pinode == NULL) { ++ *pinode = get_cifs_inode(sb); ++ } ++ if(*pinode == NULL) { ++ return -ENOMEM; ++ } ++ ++ inode = *pinode; ++ cifsInfo = CIFS_I(inode); ++ ++ cFYI(1, (" Old time %ld ", cifsInfo->time)); ++ cifsInfo->time = jiffies; ++ cFYI(1, (" New time %ld ", cifsInfo->time)); ++ atomic_set(&cifsInfo->inUse,1); /* ok to set on every refresh of inode */ ++ ++ inode->i_atime = ++ cifs_NTtimeToUnix(le64_to_cpu(findData.LastAccessTime)); ++ inode->i_mtime = ++ cifs_NTtimeToUnix(le64_to_cpu ++ (findData.LastModificationTime)); ++ inode->i_ctime = ++ cifs_NTtimeToUnix(le64_to_cpu(findData.LastStatusChange)); ++ inode->i_mode = le64_to_cpu(findData.Permissions); ++ findData.Type = le32_to_cpu(findData.Type); ++ if (findData.Type == UNIX_FILE) { ++ inode->i_mode |= S_IFREG; ++ } else if (findData.Type == UNIX_SYMLINK) { ++ inode->i_mode |= S_IFLNK; ++ } else if (findData.Type == UNIX_DIR) { ++ inode->i_mode |= S_IFDIR; ++ } else if (findData.Type == UNIX_CHARDEV) { ++ inode->i_mode |= S_IFCHR; ++ inode->i_rdev = MKDEV(le64_to_cpu(findData.DevMajor), ++ le64_to_cpu(findData.DevMinor) & MINORMASK); ++ } else if (findData.Type == UNIX_BLOCKDEV) { ++ inode->i_mode |= S_IFBLK; ++ inode->i_rdev = MKDEV(le64_to_cpu(findData.DevMajor), ++ le64_to_cpu(findData.DevMinor) & MINORMASK); ++ } else if (findData.Type == UNIX_FIFO) { ++ inode->i_mode |= S_IFIFO; ++ } else if (findData.Type == UNIX_SOCKET) { ++ inode->i_mode |= S_IFSOCK; ++ } ++ inode->i_uid = le64_to_cpu(findData.Uid); ++ inode->i_gid = le64_to_cpu(findData.Gid); ++ inode->i_nlink = le64_to_cpu(findData.Nlinks); ++ findData.NumOfBytes = le64_to_cpu(findData.NumOfBytes); ++ findData.EndOfFile = le64_to_cpu(findData.EndOfFile); ++ ++ if(is_size_safe_to_change(cifsInfo)) { ++ /* can not safely change the file size here if the ++ client is writing to it due to potential races */ ++ inode->i_size = findData.EndOfFile; ++/* blksize needs to be multiple of two. So safer to default to blksize ++ and blkbits set in superblock so 2**blkbits and blksize will match */ ++/* inode->i_blksize = ++ (pTcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE) & 0xFFFFFE00;*/ ++ ++ /* This seems incredibly stupid but it turns out that ++ i_blocks is not related to (i_size / i_blksize), instead a ++ size of 512 is required to be used for calculating num blocks */ ++ ++ ++/* inode->i_blocks = ++ (inode->i_blksize - 1 + findData.NumOfBytes) >> inode->i_blkbits;*/ ++ ++ /* 512 bytes (2**9) is the fake blocksize that must be used */ ++ /* for this calculation */ ++ inode->i_blocks = (512 - 1 + findData.NumOfBytes) >> 9; ++ } ++ ++ if (findData.NumOfBytes < findData.EndOfFile) ++ cFYI(1, ("Server inconsistency Error: it says allocation size less than end of file ")); ++ cFYI(1, ++ ("Size %ld and blocks %ld ", ++ (unsigned long) inode->i_size, inode->i_blocks)); ++ if (S_ISREG(inode->i_mode)) { ++ cFYI(1, (" File inode ")); ++ inode->i_op = &cifs_file_inode_ops; ++ inode->i_fop = &cifs_file_ops; ++ inode->i_data.a_ops = &cifs_addr_ops; ++ } else if (S_ISDIR(inode->i_mode)) { ++ cFYI(1, (" Directory inode")); ++ inode->i_op = &cifs_dir_inode_ops; ++ inode->i_fop = &cifs_dir_ops; ++ } else if (S_ISLNK(inode->i_mode)) { ++ cFYI(1, (" Symbolic Link inode ")); ++ inode->i_op = &cifs_symlink_inode_ops; ++/* tmp_inode->i_fop = *//* do not need to set to anything */ ++ } else { ++ cFYI(1, (" Init special inode ")); ++ init_special_inode(inode, inode->i_mode, ++ kdev_t_to_nr(inode->i_rdev)); ++ } ++ } ++ return rc; ++} ++ ++int ++cifs_get_inode_info(struct inode **pinode, const unsigned char *search_path, ++ FILE_ALL_INFO * pfindData, struct super_block *sb, int xid) ++{ ++ int rc = 0; ++ struct cifsTconInfo *pTcon; ++ struct inode *inode; ++ struct cifs_sb_info *cifs_sb = CIFS_SB(sb); ++ char *tmp_path; ++ char *buf = NULL; ++ ++ pTcon = cifs_sb->tcon; ++ cFYI(1,("Getting info on %s ", search_path)); ++ ++ if((pfindData == NULL) && (*pinode != NULL)) { ++ if(CIFS_I(*pinode)->clientCanCacheRead) { ++ cFYI(1,("No need to revalidate inode sizes on cached file ")); ++ return rc; ++ } ++ } ++ ++ /* if file info not passed in then get it from server */ ++ if(pfindData == NULL) { ++ buf = kmalloc(sizeof(FILE_ALL_INFO),GFP_KERNEL); ++ pfindData = (FILE_ALL_INFO *)buf; ++ /* could do find first instead but this returns more info */ ++ rc = CIFSSMBQPathInfo(xid, pTcon, search_path, pfindData, ++ cifs_sb->local_nls); ++ } ++ /* dump_mem("\nQPathInfo return data",&findData, sizeof(findData)); */ ++ if (rc) { ++ if (rc == -EREMOTE) { ++ tmp_path = ++ kmalloc(strnlen ++ (pTcon->treeName, ++ MAX_TREE_SIZE + 1) + ++ strnlen(search_path, MAX_PATHCONF) + 1, ++ GFP_KERNEL); ++ if (tmp_path == NULL) { ++ if(buf) ++ kfree(buf); ++ return -ENOMEM; ++ } ++ ++ strncpy(tmp_path, pTcon->treeName, MAX_TREE_SIZE); ++ strncat(tmp_path, search_path, MAX_PATHCONF); ++ rc = connect_to_dfs_path(xid, pTcon->ses, ++ /* treename + */ tmp_path, ++ cifs_sb->local_nls); ++ kfree(tmp_path); ++ /* BB fix up inode etc. */ ++ } else if (rc) { ++ if(buf) ++ kfree(buf); ++ return rc; ++ } ++ } else { ++ struct cifsInodeInfo *cifsInfo; ++ ++ /* get new inode */ ++ if (*pinode == NULL) { ++ *pinode = get_cifs_inode(sb); ++ } ++ if(*pinode == NULL) ++ return -ENOMEM; ++ inode = *pinode; ++ cifsInfo = CIFS_I(inode); ++ pfindData->Attributes = le32_to_cpu(pfindData->Attributes); ++ cifsInfo->cifsAttrs = pfindData->Attributes; ++ cFYI(1, (" Old time %ld ", cifsInfo->time)); ++ cifsInfo->time = jiffies; ++ cFYI(1, (" New time %ld ", cifsInfo->time)); ++ ++/* blksize needs to be multiple of two. So safer to default to blksize ++ and blkbits set in superblock so 2**blkbits and blksize will match */ ++/* inode->i_blksize = ++ (pTcon->ses->server->maxBuf - MAX_CIFS_HDR_SIZE) & 0xFFFFFE00;*/ ++ ++ /* Linux can not store file creation time unfortunately so we ignore it */ ++ inode->i_atime = ++ cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastAccessTime)); ++ inode->i_mtime = ++ cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastWriteTime)); ++ inode->i_ctime = ++ cifs_NTtimeToUnix(le64_to_cpu(pfindData->ChangeTime)); ++ cFYI(0, ++ (" Attributes came in as 0x%x ", pfindData->Attributes)); ++ ++ /* set default mode. will override for dirs below */ ++ if(atomic_read(&cifsInfo->inUse) == 0) ++ /* new inode, can safely set these fields */ ++ inode->i_mode = cifs_sb->mnt_file_mode; ++ ++ if (pfindData->Attributes & ATTR_REPARSE) { ++ /* Can IFLNK be set as it basically is on windows with IFREG or IFDIR? */ ++ inode->i_mode |= S_IFLNK; ++ } else if (pfindData->Attributes & ATTR_DIRECTORY) { ++ /* override default perms since we do not do byte range locking on dirs */ ++ inode->i_mode = cifs_sb->mnt_dir_mode; ++ inode->i_mode |= S_IFDIR; ++ } else { ++ inode->i_mode |= S_IFREG; ++ /* treat the dos attribute of read-only as read-only mode e.g. 555 */ ++ if(cifsInfo->cifsAttrs & ATTR_READONLY) ++ inode->i_mode &= ~(S_IWUGO); ++ /* BB add code here - validate if device or weird share or device type? */ ++ } ++ if(is_size_safe_to_change(cifsInfo)) { ++ /* can not safely change the file size here if the ++ client is writing to it due to potential races */ ++ inode->i_size = le64_to_cpu(pfindData->EndOfFile); ++ ++ /* 512 bytes (2**9) is the fake blocksize that must be used */ ++ /* for this calculation */ ++ inode->i_blocks = (512 - 1 + pfindData->AllocationSize) ++ >> 9; ++ } ++ pfindData->AllocationSize = le64_to_cpu(pfindData->AllocationSize); ++ ++ cFYI(1, ++ (" Size %ld and blocks %ld ", ++ (unsigned long) inode->i_size, inode->i_blocks)); ++ inode->i_nlink = le32_to_cpu(pfindData->NumberOfLinks); ++ ++ /* BB fill in uid and gid here? with help from winbind? ++ or retrieve from NTFS stream extended attribute */ ++ if(atomic_read(&cifsInfo->inUse) == 0) { ++ inode->i_uid = cifs_sb->mnt_uid; ++ inode->i_gid = cifs_sb->mnt_gid; ++ /* set so we do not keep refreshing these fields with ++ bad data after user has changed them in memory */ ++ atomic_set(&cifsInfo->inUse,1); ++ } ++ ++ if (S_ISREG(inode->i_mode)) { ++ cFYI(1, (" File inode ")); ++ inode->i_op = &cifs_file_inode_ops; ++ inode->i_fop = &cifs_file_ops; ++ inode->i_data.a_ops = &cifs_addr_ops; ++ } else if (S_ISDIR(inode->i_mode)) { ++ cFYI(1, (" Directory inode ")); ++ inode->i_op = &cifs_dir_inode_ops; ++ inode->i_fop = &cifs_dir_ops; ++ } else if (S_ISLNK(inode->i_mode)) { ++ cFYI(1, (" Symbolic Link inode ")); ++ inode->i_op = &cifs_symlink_inode_ops; ++ } else { ++ init_special_inode(inode, inode->i_mode, ++ kdev_t_to_nr(inode->i_rdev)); ++ } ++ } ++ if(buf) ++ kfree(buf); ++ return rc; ++} ++ ++void ++cifs_read_inode(struct inode *inode) ++{ /* gets root inode */ ++ int xid; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsInodeInfo *cifs_inode; ++ ++ cifs_sb = CIFS_SB(inode->i_sb); ++ xid = GetXid(); ++ ++ cifs_inode = CIFS_I(inode); ++ cifs_inode->cifsAttrs = ATTR_DIRECTORY; ++ atomic_set(&cifs_inode->inUse, 0); ++ cifs_inode->time = 0; ++ inode->i_blksize = CIFS_MAX_MSGSIZE; ++ inode->i_blkbits = 14; /* 2**14 = CIFS_MAX_MSGSIZE */ ++ ++ INIT_LIST_HEAD(&cifs_inode->openFileList); ++ ++ if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) ++ cifs_get_inode_info_unix(&inode, "", inode->i_sb,xid); ++ else ++ cifs_get_inode_info(&inode, "", NULL, inode->i_sb,xid); ++ /* can not call macro FreeXid here since in a void func */ ++ _FreeXid(xid); ++} ++ ++int ++cifs_unlink(struct inode *inode, struct dentry *direntry) ++{ ++ int rc = 0; ++ int xid; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ char *full_path = NULL; ++ struct cifsInodeInfo *cifsInode; ++ FILE_BASIC_INFO * pinfo_buf; ++ ++ cFYI(1, (" cifs_unlink, inode = 0x%p with ", inode)); ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++/* Unlink can be called from rename so we can not grab ++ the sem here since we deadlock otherwise */ ++/* down(&direntry->d_sb->s_vfs_rename_sem);*/ ++ full_path = build_path_from_dentry(direntry); ++/* up(&direntry->d_sb->s_vfs_rename_sem);*/ ++ if(full_path == NULL) { ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ rc = CIFSSMBDelFile(xid, pTcon, full_path, cifs_sb->local_nls); ++ ++ if (!rc) { ++ direntry->d_inode->i_nlink--; ++ } else if (rc == -ENOENT) { ++ d_drop(direntry); ++ } else if (rc == -ETXTBSY) { ++ int oplock = FALSE; ++ __u16 netfid; ++ ++ rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN, DELETE, ++ CREATE_NOT_DIR | CREATE_DELETE_ON_CLOSE, ++ &netfid, &oplock, NULL, cifs_sb->local_nls); ++ if(rc==0) { ++ CIFSSMBRenameOpenFile(xid,pTcon,netfid, ++ NULL, cifs_sb->local_nls); ++ CIFSSMBClose(xid, pTcon, netfid); ++ direntry->d_inode->i_nlink--; ++ } ++ } else if (rc == -EACCES) { ++ /* try only if r/o attribute set in local lookup data? */ ++ pinfo_buf = (FILE_BASIC_INFO *)kmalloc(sizeof(FILE_BASIC_INFO),GFP_KERNEL); ++ if(pinfo_buf) { ++ memset(pinfo_buf,0,sizeof(FILE_BASIC_INFO)); ++ /* ATTRS set to normal clears r/o bit */ ++ pinfo_buf->Attributes = cpu_to_le32(ATTR_NORMAL); ++ rc = CIFSSMBSetTimes(xid, pTcon, full_path, pinfo_buf, ++ cifs_sb->local_nls); ++ kfree(pinfo_buf); ++ } ++ if(rc==0) { ++ rc = CIFSSMBDelFile(xid, pTcon, full_path, cifs_sb->local_nls); ++ if (!rc) { ++ direntry->d_inode->i_nlink--; ++ } else if (rc == -ETXTBSY) { ++ int oplock = FALSE; ++ __u16 netfid; ++ ++ rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN, DELETE, ++ CREATE_NOT_DIR | CREATE_DELETE_ON_CLOSE, ++ &netfid, &oplock, NULL, cifs_sb->local_nls); ++ if(rc==0) { ++ CIFSSMBRenameOpenFile(xid,pTcon,netfid,NULL,cifs_sb->local_nls); ++ CIFSSMBClose(xid, pTcon, netfid); ++ direntry->d_inode->i_nlink--; ++ } ++ /* BB if rc = -ETXTBUSY goto the rename logic BB */ ++ } ++ } ++ } ++ cifsInode = CIFS_I(direntry->d_inode); ++ cifsInode->time = 0; /* will force revalidate to get info when needed */ ++ direntry->d_inode->i_ctime = inode->i_ctime = inode->i_mtime = ++ CURRENT_TIME; ++ cifsInode = CIFS_I(inode); ++ cifsInode->time = 0; /* force revalidate of dir as well */ ++ ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return rc; ++} ++ ++int ++cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode) ++{ ++ int rc = 0; ++ int xid; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ char *full_path = NULL; ++ struct inode *newinode = NULL; ++ ++ cFYI(1, ("In cifs_mkdir, mode = 0x%x inode = 0x%p ", mode, inode)); ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++ down(&inode->i_sb->s_vfs_rename_sem); ++ full_path = build_path_from_dentry(direntry); ++ up(&inode->i_sb->s_vfs_rename_sem); ++ if(full_path == NULL) { ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ /* BB add setting the equivalent of mode via CreateX w/ACLs */ ++ rc = CIFSSMBMkDir(xid, pTcon, full_path, cifs_sb->local_nls); ++ if (rc) { ++ cFYI(1, ("cifs_mkdir returned 0x%x ", rc)); ++ d_drop(direntry); ++ } else { ++ inode->i_nlink++; ++ if (pTcon->ses->capabilities & CAP_UNIX) ++ rc = cifs_get_inode_info_unix(&newinode, full_path, ++ inode->i_sb,xid); ++ else ++ rc = cifs_get_inode_info(&newinode, full_path,NULL, ++ inode->i_sb,xid); ++ ++ direntry->d_op = &cifs_dentry_ops; ++ d_instantiate(direntry, newinode); ++ if(direntry->d_inode) ++ direntry->d_inode->i_nlink = 2; ++ if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) ++ CIFSSMBUnixSetPerms(xid, pTcon, full_path, mode, ++ (__u64)-1, ++ (__u64)-1, ++ 0 /* dev_t */, ++ cifs_sb->local_nls); ++ else { /* BB to be implemented via Windows secrty descriptors*/ ++ /* eg CIFSSMBWinSetPerms(xid,pTcon,full_path,mode,-1,-1,local_nls);*/ ++ } ++ } ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ ++ return rc; ++} ++ ++int ++cifs_rmdir(struct inode *inode, struct dentry *direntry) ++{ ++ int rc = 0; ++ int xid; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ char *full_path = NULL; ++ struct cifsInodeInfo *cifsInode; ++ ++ cFYI(1, (" cifs_rmdir, inode = 0x%p with ", inode)); ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++ down(&inode->i_sb->s_vfs_rename_sem); ++ full_path = build_path_from_dentry(direntry); ++ up(&inode->i_sb->s_vfs_rename_sem); ++ if(full_path == NULL) { ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ ++ rc = CIFSSMBRmDir(xid, pTcon, full_path, cifs_sb->local_nls); ++ ++ if (!rc) { ++ inode->i_nlink--; ++ direntry->d_inode->i_size = 0; ++ direntry->d_inode->i_nlink = 0; ++ } ++ ++ cifsInode = CIFS_I(direntry->d_inode); ++ cifsInode->time = 0; /* force revalidate to go get info when needed */ ++ direntry->d_inode->i_ctime = inode->i_ctime = inode->i_mtime = ++ CURRENT_TIME; ++ ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return rc; ++} ++ ++int ++cifs_rename(struct inode *source_inode, struct dentry *source_direntry, ++ struct inode *target_inode, struct dentry *target_direntry) ++{ ++ char *fromName; ++ char *toName; ++ struct cifs_sb_info *cifs_sb_source; ++ struct cifs_sb_info *cifs_sb_target; ++ struct cifsTconInfo *pTcon; ++ int xid; ++ int rc = 0; ++ ++ xid = GetXid(); ++ ++ cifs_sb_target = CIFS_SB(target_inode->i_sb); ++ cifs_sb_source = CIFS_SB(source_inode->i_sb); ++ pTcon = cifs_sb_source->tcon; ++ ++ if (pTcon != cifs_sb_target->tcon) { ++ FreeXid(xid); ++ return -EXDEV; /* BB actually could be allowed if same server, but ++ different share. Might eventually add support for this */ ++ } ++ ++ /* we already have the rename sem so we do not need ++ to grab it again here to protect the path integrity */ ++ fromName = build_path_from_dentry(source_direntry); ++ toName = build_path_from_dentry(target_direntry); ++ if((fromName == NULL) || (toName == NULL)) { ++ rc = -ENOMEM; ++ goto cifs_rename_exit; ++ } ++ ++ rc = CIFSSMBRename(xid, pTcon, fromName, toName, ++ cifs_sb_source->local_nls); ++ if(rc == -EEXIST) { ++ /* check if they are the same file ++ because rename of hardlinked files is a noop */ ++ FILE_UNIX_BASIC_INFO * info_buf_source; ++ FILE_UNIX_BASIC_INFO * info_buf_target; ++ ++ info_buf_source = ++ kmalloc(2 * sizeof(FILE_UNIX_BASIC_INFO),GFP_KERNEL); ++ if(info_buf_source != NULL) { ++ info_buf_target = info_buf_source+1; ++ rc = CIFSSMBUnixQPathInfo(xid, pTcon, fromName, ++ info_buf_source, cifs_sb_source->local_nls); ++ if(rc == 0) { ++ rc = CIFSSMBUnixQPathInfo(xid,pTcon,toName, ++ info_buf_target, ++ cifs_sb_target->local_nls); ++ } ++ if((rc == 0) && ++ (info_buf_source->UniqueId == ++ info_buf_target->UniqueId)) { ++ /* do not rename since the files are hardlinked ++ which is a noop */ ++ } else { ++ /* we either can not tell the files are hardlinked ++ (as with Windows servers) or files are not hardlinked ++ so delete the target manually before renaming to ++ follow POSIX rather than Windows semantics */ ++ cifs_unlink(target_inode, target_direntry); ++ rc = CIFSSMBRename(xid, pTcon, fromName, toName, ++ cifs_sb_source->local_nls); ++ } ++ kfree(info_buf_source); ++ } /* if we can not get memory just leave rc as EEXIST */ ++ } ++ ++ if((rc == -EIO)||(rc == -EEXIST)) { ++ int oplock = FALSE; ++ __u16 netfid; ++ ++ rc = CIFSSMBOpen(xid, pTcon, fromName, FILE_OPEN, GENERIC_READ, ++ CREATE_NOT_DIR, ++ &netfid, &oplock, NULL, cifs_sb_source->local_nls); ++ if(rc==0) { ++ CIFSSMBRenameOpenFile(xid,pTcon,netfid, ++ toName, cifs_sb_source->local_nls); ++ CIFSSMBClose(xid, pTcon, netfid); ++ } ++ } ++ ++cifs_rename_exit: ++ if (fromName) ++ kfree(fromName); ++ if (toName) ++ kfree(toName); ++ ++ FreeXid(xid); ++ return rc; ++} ++ ++int ++cifs_revalidate(struct dentry *direntry) ++{ ++ int xid; ++ int rc = 0; ++ char *full_path; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsInodeInfo *cifsInode; ++ loff_t local_size; ++ time_t local_mtime; ++ int invalidate_inode = FALSE; ++ ++ if(direntry->d_inode == NULL) ++ return -ENOENT; ++ ++ cifsInode = CIFS_I(direntry->d_inode); ++ ++ if(cifsInode == NULL) ++ return -ENOENT; ++ ++ /* no sense revalidating inode info on file that no one can write */ ++ if(CIFS_I(direntry->d_inode)->clientCanCacheRead) ++ return rc; ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(direntry->d_sb); ++ ++ /* can not safely grab the rename sem here if ++ rename calls revalidate since that would deadlock */ ++ full_path = build_path_from_dentry(direntry); ++ if(full_path == NULL) { ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ cFYI(1, ++ ("Revalidate: %s inode 0x%p count %d dentry: 0x%p d_time %ld jiffies %ld", ++ full_path, direntry->d_inode, ++ direntry->d_inode->i_count.counter, direntry, ++ direntry->d_time, jiffies)); ++ ++ if (cifsInode->time == 0){ ++ /* was set to zero previously to force revalidate */ ++ } else if (time_before(jiffies, cifsInode->time + HZ) && lookupCacheEnabled) { ++ if((S_ISREG(direntry->d_inode->i_mode) == 0) || ++ (direntry->d_inode->i_nlink == 1)) { ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return rc; ++ } else { ++ cFYI(1,("Have to revalidate file due to hardlinks")); ++ } ++ } ++ ++ /* save mtime and size */ ++ local_mtime = direntry->d_inode->i_mtime; ++ local_size = direntry->d_inode->i_size; ++ ++ if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) { ++ rc = cifs_get_inode_info_unix(&direntry->d_inode, full_path, ++ direntry->d_sb,xid); ++ if(rc) { ++ cFYI(1,("error on getting revalidate info %d",rc)); ++/* if(rc != -ENOENT) ++ rc = 0; */ /* BB should we cache info on certain errors? */ ++ } ++ } else { ++ rc = cifs_get_inode_info(&direntry->d_inode, full_path, NULL, ++ direntry->d_sb,xid); ++ if(rc) { ++ cFYI(1,("error on getting revalidate info %d",rc)); ++/* if(rc != -ENOENT) ++ rc = 0; */ /* BB should we cache info on certain errors? */ ++ } ++ } ++ /* should we remap certain errors, access denied?, to zero */ ++ ++ /* if not oplocked, we invalidate inode pages if mtime ++ or file size had changed on server */ ++ ++ if((local_mtime == direntry->d_inode->i_mtime) && ++ (local_size == direntry->d_inode->i_size)) { ++ cFYI(1,("cifs_revalidate - inode unchanged")); ++ } else { ++ /* file may have changed on server */ ++ if(cifsInode->clientCanCacheRead) { ++ /* no need to invalidate inode pages since we were ++ the only ones who could have modified the file and ++ the server copy is staler than ours */ ++ } else { ++ invalidate_inode = TRUE; ++ } ++ } ++ ++ /* can not grab this sem since kernel filesys locking ++ documentation indicates i_sem may be taken by the kernel ++ on lookup and rename which could deadlock if we grab ++ the i_sem here as well */ ++/* down(&direntry->d_inode->i_sem);*/ ++ /* need to write out dirty pages here */ ++ if(direntry->d_inode->i_mapping) { ++ /* do we need to lock inode until after invalidate completes below? */ ++ filemap_fdatasync(direntry->d_inode->i_mapping); ++ } ++ if(invalidate_inode) { ++ filemap_fdatawait(direntry->d_inode->i_mapping); ++ /* may eventually have to do this for open files too */ ++ if(list_empty(&(cifsInode->openFileList))) { ++ /* Has changed on server - flush read ahead pages */ ++ cFYI(1,("Invalidating read ahead data on closed file")); ++ invalidate_inode_pages(direntry->d_inode); ++ } ++ } ++/* up(&direntry->d_inode->i_sem);*/ ++ ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ ++ return rc; ++} ++ ++/* int cifs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) ++{ ++ int err = cifs_revalidate(dentry); ++ if (!err) ++ generic_fillattr(dentry->d_inode, stat); ++ return err; ++} */ ++ ++void ++cifs_truncate_file(struct inode *inode) ++{ /* BB remove - may not need this function after all BB */ ++ int xid; ++ int rc = -EIO; ++ int found = FALSE; ++ struct cifsFileInfo *open_file = NULL; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ struct cifsInodeInfo *cifsInode; ++ struct dentry *dirent; ++ struct list_head * tmp; ++ char *full_path = NULL; ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++ /* To avoid spurious oplock breaks from server, in the case ++ of inodes that we already have open, avoid doing path ++ based setting of file size if we can do it by handle. ++ This keeps our caching token (oplock) and avoids ++ timeouts when the local oplock break takes longer to flush ++ writebehind data than the SMB timeout for the SetPathInfo ++ request would allow */ ++ read_lock(&GlobalSMBSeslock); ++ cifsInode = CIFS_I(inode); ++ list_for_each(tmp, &cifsInode->openFileList) { ++ open_file = list_entry(tmp,struct cifsFileInfo, flist); ++ /* We check if file is open for writing first */ ++ if((open_file->pfile) && (!open_file->invalidHandle) && ++ ((open_file->pfile->f_flags & O_RDWR) || ++ (open_file->pfile->f_flags & O_WRONLY))) { ++ read_unlock(&GlobalSMBSeslock); ++ found = TRUE; ++ rc = CIFSSMBSetFileSize(xid, pTcon, inode->i_size, ++ open_file->netfid,open_file->pid,FALSE); ++ if(rc == 0) { ++ FreeXid(xid); ++ return; ++ } ++ /* Do not need reopen and retry on EAGAIN since we will ++ retry by pathname below */ ++ if(rc == -EAGAIN) ++ rc = -EHOSTDOWN; ++ ++ break; /* now that we found one valid file handle no ++ sense continuing to loop trying others */ ++ } ++ } ++ if(found == FALSE) ++ read_unlock(&GlobalSMBSeslock); ++ ++ if (list_empty(&inode->i_dentry)) { ++ cERROR(1, ++ ("Can not get pathname from empty dentry in inode 0x%p ", ++ inode)); ++ FreeXid(xid); ++ return; ++ } ++ ++ dirent = list_entry(inode->i_dentry.next, struct dentry, d_alias); ++ if (dirent) { ++ full_path = build_path_from_dentry(dirent); ++ rc = CIFSSMBSetEOF(xid, pTcon, full_path, inode->i_size,FALSE, ++ cifs_sb->local_nls); ++ cFYI(1,(" SetEOF (truncate) rc = %d",rc)); ++ if (!rc) ++ CIFSSMBSetEOF(xid,pTcon,full_path,inode->i_size,TRUE,cifs_sb->local_nls); ++ /* allocation size setting seems optional so ignore return code */ ++ } ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return; ++} ++ ++static int cifs_truncate_page(struct address_space *mapping, loff_t from) ++{ ++ unsigned long index = from >> PAGE_CACHE_SHIFT; ++ unsigned offset = from & (PAGE_CACHE_SIZE-1); ++ struct page *page; ++ char *kaddr; ++ int rc = 0; ++ ++ page = grab_cache_page(mapping, index); ++ if (!page) ++ return -ENOMEM; ++ ++ kaddr = kmap_atomic(page, KM_USER0); ++ memset(kaddr + offset, 0, PAGE_CACHE_SIZE - offset); ++ flush_dcache_page(page); ++ kunmap_atomic(kaddr, KM_USER0); ++ unlock_page(page); ++ page_cache_release(page); ++ return rc; ++} ++ ++int ++cifs_setattr(struct dentry *direntry, struct iattr *attrs) ++{ ++ int xid; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ char *full_path = NULL; ++ int rc = -EACCES; ++ int found = FALSE; ++ struct cifsFileInfo *open_file = NULL; ++ FILE_BASIC_INFO time_buf; ++ int set_time = FALSE; ++ __u64 mode = 0xFFFFFFFFFFFFFFFFULL; ++ __u64 uid = 0xFFFFFFFFFFFFFFFFULL; ++ __u64 gid = 0xFFFFFFFFFFFFFFFFULL; ++ struct cifsInodeInfo *cifsInode; ++ struct list_head * tmp; ++ ++ xid = GetXid(); ++ ++ cFYI(1, ++ (" In cifs_setattr, name = %s attrs->iavalid 0x%x ", ++ direntry->d_name.name, attrs->ia_valid)); ++ cifs_sb = CIFS_SB(direntry->d_inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++ down(&direntry->d_sb->s_vfs_rename_sem); ++ full_path = build_path_from_dentry(direntry); ++ up(&direntry->d_sb->s_vfs_rename_sem); ++ if(full_path == NULL) { ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ cifsInode = CIFS_I(direntry->d_inode); ++ ++ /* BB check if we need to refresh inode from server now ? BB */ ++ ++ /* need to flush data before changing file size on server */ ++ filemap_fdatasync(direntry->d_inode->i_mapping); ++ ++ if (attrs->ia_valid & ATTR_SIZE) { ++ read_lock(&GlobalSMBSeslock); ++ /* To avoid spurious oplock breaks from server, in the case ++ of inodes that we already have open, avoid doing path ++ based setting of file size if we can do it by handle. ++ This keeps our caching token (oplock) and avoids ++ timeouts when the local oplock break takes longer to flush ++ writebehind data than the SMB timeout for the SetPathInfo ++ request would allow */ ++ list_for_each(tmp, &cifsInode->openFileList) { ++ open_file = list_entry(tmp,struct cifsFileInfo, flist); ++ /* We check if file is open for writing first */ ++ if((open_file->pfile) && ++ ((open_file->pfile->f_flags & O_RDWR) || ++ (open_file->pfile->f_flags & O_WRONLY))) { ++ if(open_file->invalidHandle == FALSE) { ++ /* we found a valid, writeable network file ++ handle to use to try to set the file size */ ++ __u16 nfid = open_file->netfid; ++ __u32 npid = open_file->pid; ++ read_unlock(&GlobalSMBSeslock); ++ found = TRUE; ++ rc = CIFSSMBSetFileSize(xid, pTcon, attrs->ia_size, ++ nfid,npid,FALSE); ++ cFYI(1,("SetFileSize by handle (setattrs) rc = %d",rc)); ++ /* Do not need reopen and retry on EAGAIN since we will ++ retry by pathname below */ ++ ++ break; /* now that we found one valid file handle no ++ sense continuing to loop trying others */ ++ } ++ } ++ } ++ if(found == FALSE) { ++ read_unlock(&GlobalSMBSeslock); ++ } ++ ++ ++ if(rc != 0) { ++ /* Set file size by pathname rather than by handle either ++ because no valid, writeable file handle for it was found or ++ because there was an error setting it by handle */ ++ rc = CIFSSMBSetEOF(xid, pTcon, full_path, attrs->ia_size,FALSE, ++ cifs_sb->local_nls); ++ cFYI(1,(" SetEOF by path (setattrs) rc = %d",rc)); ++ } ++ ++ /* Server is ok setting allocation size implicitly - no need to call: */ ++ /*CIFSSMBSetEOF(xid, pTcon, full_path, attrs->ia_size, TRUE, cifs_sb->local_nls);*/ ++ ++ if (rc == 0) { ++ rc = vmtruncate(direntry->d_inode, attrs->ia_size); ++ cifs_truncate_page(direntry->d_inode->i_mapping, direntry->d_inode->i_size); ++ } ++ } ++ if (attrs->ia_valid & ATTR_UID) { ++ cFYI(1, (" CIFS - UID changed to %d", attrs->ia_uid)); ++ uid = attrs->ia_uid; ++ /* entry->uid = cpu_to_le16(attr->ia_uid); */ ++ } ++ if (attrs->ia_valid & ATTR_GID) { ++ cFYI(1, (" CIFS - GID changed to %d", attrs->ia_gid)); ++ gid = attrs->ia_gid; ++ /* entry->gid = cpu_to_le16(attr->ia_gid); */ ++ } ++ ++ time_buf.Attributes = 0; ++ if (attrs->ia_valid & ATTR_MODE) { ++ cFYI(1, (" CIFS - Mode changed to 0x%x", attrs->ia_mode)); ++ mode = attrs->ia_mode; ++ /* entry->mode = cpu_to_le16(attr->ia_mode); */ ++ } ++ ++ if ((cifs_sb->tcon->ses->capabilities & CAP_UNIX) ++ && (attrs->ia_valid & (ATTR_MODE | ATTR_GID | ATTR_UID))) ++ rc = CIFSSMBUnixSetPerms(xid, pTcon, full_path, mode, uid, gid, ++ 0 /* dev_t */, cifs_sb->local_nls); ++ else if (attrs->ia_valid & ATTR_MODE) { ++ if((mode & S_IWUGO) == 0) /* not writeable */ { ++ if((cifsInode->cifsAttrs & ATTR_READONLY) == 0) ++ time_buf.Attributes = ++ cpu_to_le32(cifsInode->cifsAttrs | ATTR_READONLY); ++ } else if((mode & S_IWUGO) == S_IWUGO) { ++ if(cifsInode->cifsAttrs & ATTR_READONLY) ++ time_buf.Attributes = ++ cpu_to_le32(cifsInode->cifsAttrs & (~ATTR_READONLY)); ++ } ++ /* BB to be implemented - via Windows security descriptors or streams */ ++ /* CIFSSMBWinSetPerms(xid,pTcon,full_path,mode,uid,gid,cifs_sb->local_nls);*/ ++ } ++ ++ if (attrs->ia_valid & ATTR_ATIME) { ++ set_time = TRUE; ++ time_buf.LastAccessTime = ++ cpu_to_le64(cifs_UnixTimeToNT(attrs->ia_atime)); ++ } else ++ time_buf.LastAccessTime = 0; ++ ++ if (attrs->ia_valid & ATTR_MTIME) { ++ set_time = TRUE; ++ time_buf.LastWriteTime = ++ cpu_to_le64(cifs_UnixTimeToNT(attrs->ia_mtime)); ++ } else ++ time_buf.LastWriteTime = 0; ++ ++ if (attrs->ia_valid & ATTR_CTIME) { ++ set_time = TRUE; ++ time_buf.ChangeTime = ++ cpu_to_le64(cifs_UnixTimeToNT(attrs->ia_ctime)); ++ } else ++ time_buf.ChangeTime = 0; ++ ++ if (set_time | time_buf.Attributes) { ++ /* BB what if setting one attribute fails ++ (such as size) but time setting works */ ++ time_buf.CreationTime = 0; /* do not change */ ++ /* In the future we should experiment - try setting timestamps ++ via Handle (SetFileInfo) instead of by path */ ++ rc = CIFSSMBSetTimes(xid, pTcon, full_path, &time_buf, ++ cifs_sb->local_nls); ++ } ++ ++ /* do not need local check to inode_check_ok since the server does that */ ++ if (!rc) ++ rc = inode_setattr(direntry->d_inode, attrs); ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return rc; ++} ++ ++void ++cifs_delete_inode(struct inode *inode) ++{ ++ cFYI(1, ("In cifs_delete_inode, inode = 0x%p ", inode)); ++ /* may have to add back in if and when safe distributed caching of ++ directories added e.g. via FindNotify */ ++} +diff -urN linux-2.4.29.old/fs/cifs/link.c linux-2.4.29/fs/cifs/link.c +--- linux-2.4.29.old/fs/cifs/link.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/link.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,328 @@ ++/* ++ * fs/cifs/link.c ++ * ++ * Copyright (C) International Business Machines Corp., 2002,2003 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++#include <linux/fs.h> ++#include <linux/stat.h> ++#include "cifsfs.h" ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifsproto.h" ++#include "cifs_debug.h" ++#include "cifs_fs_sb.h" ++ ++int ++cifs_hardlink(struct dentry *old_file, struct inode *inode, ++ struct dentry *direntry) ++{ ++ int rc = -EACCES; ++ int xid; ++ char *fromName = NULL; ++ char *toName = NULL; ++ struct cifs_sb_info *cifs_sb_target; ++ struct cifsTconInfo *pTcon; ++ struct cifsInodeInfo *cifsInode; ++ ++ xid = GetXid(); ++ ++ cifs_sb_target = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb_target->tcon; ++ ++/* No need to check for cross device links since server will do that ++ BB note DFS case in future though (when we may have to check) */ ++ ++ down(&inode->i_sb->s_vfs_rename_sem); ++ fromName = build_path_from_dentry(old_file); ++ toName = build_path_from_dentry(direntry); ++ up(&inode->i_sb->s_vfs_rename_sem); ++ if((fromName == NULL) || (toName == NULL)) { ++ rc = -ENOMEM; ++ goto cifs_hl_exit; ++ } ++ ++ if (cifs_sb_target->tcon->ses->capabilities & CAP_UNIX) ++ rc = CIFSUnixCreateHardLink(xid, pTcon, fromName, toName, ++ cifs_sb_target->local_nls); ++ else { ++ rc = CIFSCreateHardLink(xid, pTcon, fromName, toName, ++ cifs_sb_target->local_nls); ++ if(rc == -EIO) ++ rc = -EOPNOTSUPP; ++ } ++ ++/* if (!rc) */ ++ { ++ /* renew_parental_timestamps(old_file); ++ inode->i_nlink++; ++ mark_inode_dirty(inode); ++ d_instantiate(direntry, inode); */ ++ /* BB add call to either mark inode dirty or refresh its data and timestamp to current time */ ++ } ++ d_drop(direntry); /* force new lookup from server */ ++ cifsInode = CIFS_I(old_file->d_inode); ++ cifsInode->time = 0; /* will force revalidate to go get info when needed */ ++ ++cifs_hl_exit: ++ if (fromName) ++ kfree(fromName); ++ if (toName) ++ kfree(toName); ++ FreeXid(xid); ++ return rc; ++} ++ ++int ++cifs_follow_link(struct dentry *direntry, struct nameidata *nd) ++{ ++ struct inode *inode = direntry->d_inode; ++ int rc = -EACCES; ++ int xid; ++ char *full_path = NULL; ++ char * target_path; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ ++ xid = GetXid(); ++ ++ down(&direntry->d_sb->s_vfs_rename_sem); ++ full_path = build_path_from_dentry(direntry); ++ up(&direntry->d_sb->s_vfs_rename_sem); ++ ++ if(full_path == NULL) { ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ cFYI(1, ("Full path: %s inode = 0x%p", full_path, inode)); ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ target_path = kmalloc(PATH_MAX, GFP_KERNEL); ++ if(target_path == NULL) { ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ /* can not call the following line due to EFAULT in vfs_readlink which is presumably expecting a user space buffer */ ++ /* length = cifs_readlink(direntry,target_path, sizeof(target_path) - 1); */ ++ ++/* BB add read reparse point symlink code and Unix extensions symlink code here BB */ ++ if (pTcon->ses->capabilities & CAP_UNIX) ++ rc = CIFSSMBUnixQuerySymLink(xid, pTcon, full_path, ++ target_path, ++ PATH_MAX-1, ++ cifs_sb->local_nls); ++ else { ++ /* rc = CIFSSMBQueryReparseLinkInfo */ ++ /* BB Add code to Query ReparsePoint info */ ++ } ++ /* BB Anything else to do to handle recursive links? */ ++ /* BB Should we be using page symlink ops here? */ ++ ++ if (rc == 0) { ++ ++/* BB Add special case check for Samba DFS symlinks */ ++ ++ target_path[PATH_MAX-1] = 0; ++ rc = vfs_follow_link(nd, target_path); ++ } ++ /* else EACCESS */ ++ ++ if (target_path) ++ kfree(target_path); ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return rc; ++} ++ ++int ++cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname) ++{ ++ int rc = -EOPNOTSUPP; ++ int xid; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ char *full_path = NULL; ++ struct inode *newinode = NULL; ++ ++ xid = GetXid(); ++ ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++ down(&inode->i_sb->s_vfs_rename_sem); ++ full_path = build_path_from_dentry(direntry); ++ up(&inode->i_sb->s_vfs_rename_sem); ++ ++ if(full_path == NULL) { ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ ++ cFYI(1, ("Full path: %s ", full_path)); ++ cFYI(1, ("symname is %s", symname)); ++ ++ /* BB what if DFS and this volume is on different share? BB */ ++ if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) ++ rc = CIFSUnixCreateSymLink(xid, pTcon, full_path, symname, ++ cifs_sb->local_nls); ++ /* else ++ rc = CIFSCreateReparseSymLink(xid, pTcon, fromName, toName,cifs_sb_target->local_nls); */ ++ ++ if (rc == 0) { ++ if (pTcon->ses->capabilities & CAP_UNIX) ++ rc = cifs_get_inode_info_unix(&newinode, full_path, ++ inode->i_sb,xid); ++ else ++ rc = cifs_get_inode_info(&newinode, full_path, NULL, ++ inode->i_sb,xid); ++ ++ if (rc != 0) { ++ cFYI(1, ++ ("Create symlink worked but get_inode_info failed with rc = %d ", ++ rc)); ++ } else { ++ direntry->d_op = &cifs_dentry_ops; ++ d_instantiate(direntry, newinode); ++ } ++ } ++ ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return rc; ++} ++ ++int ++cifs_readlink(struct dentry *direntry, char *pBuffer, int buflen) ++{ ++ struct inode *inode = direntry->d_inode; ++ int rc = -EACCES; ++ int xid; ++ int oplock = FALSE; ++ struct cifs_sb_info *cifs_sb; ++ struct cifsTconInfo *pTcon; ++ char *full_path = NULL; ++ char *tmp_path = NULL; ++ char * tmpbuffer; ++ unsigned char * referrals = NULL; ++ int num_referrals = 0; ++ int len; ++ __u16 fid; ++ ++ xid = GetXid(); ++ cifs_sb = CIFS_SB(inode->i_sb); ++ pTcon = cifs_sb->tcon; ++ ++/* BB would it be safe against deadlock to grab this sem ++ even though rename itself grabs the sem and calls lookup? */ ++/* down(&inode->i_sb->s_vfs_rename_sem);*/ ++ full_path = build_path_from_dentry(direntry); ++/* up(&inode->i_sb->s_vfs_rename_sem);*/ ++ ++ if(full_path == NULL) { ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ ++ cFYI(1, ++ ("Full path: %s inode = 0x%p pBuffer = 0x%p buflen = %d", ++ full_path, inode, pBuffer, buflen)); ++ if(buflen > PATH_MAX) ++ len = PATH_MAX; ++ else ++ len = buflen; ++ tmpbuffer = kmalloc(len,GFP_KERNEL); ++ if(tmpbuffer == NULL) { ++ if (full_path) ++ kfree(full_path); ++ FreeXid(xid); ++ return -ENOMEM; ++ } ++ ++/* BB add read reparse point symlink code and Unix extensions symlink code here BB */ ++ if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) ++ rc = CIFSSMBUnixQuerySymLink(xid, pTcon, full_path, ++ tmpbuffer, ++ len - 1, ++ cifs_sb->local_nls); ++ else { ++ rc = CIFSSMBOpen(xid, pTcon, full_path, FILE_OPEN, GENERIC_READ, ++ OPEN_REPARSE_POINT,&fid, &oplock, NULL, cifs_sb->local_nls); ++ if(!rc) { ++ rc = CIFSSMBQueryReparseLinkInfo(xid, pTcon, full_path, ++ tmpbuffer, ++ len - 1, ++ fid, ++ cifs_sb->local_nls); ++ if(CIFSSMBClose(xid, pTcon, fid)) { ++ cFYI(1,("Error closing junction point (open for ioctl)")); ++ } ++ if(rc == -EIO) { ++ /* Query if DFS Junction */ ++ tmp_path = ++ kmalloc(MAX_TREE_SIZE + MAX_PATHCONF + 1, ++ GFP_KERNEL); ++ if (tmp_path) { ++ strncpy(tmp_path, pTcon->treeName, MAX_TREE_SIZE); ++ strncat(tmp_path, full_path, MAX_PATHCONF); ++ rc = get_dfs_path(xid, pTcon->ses, tmp_path, ++ cifs_sb->local_nls, &num_referrals, &referrals); ++ cFYI(1,("Get DFS for %s rc = %d ",tmp_path, rc)); ++ if((num_referrals == 0) && (rc == 0)) ++ rc = -EACCES; ++ else { ++ cFYI(1,("num referral: %d",num_referrals)); ++ if(referrals) { ++ cFYI(1,("referral string: %s ",referrals)); ++ strncpy(tmpbuffer, referrals, len-1); ++ } ++ } ++ if(referrals) ++ kfree(referrals); ++ kfree(tmp_path); ++ if(referrals) { ++ kfree(referrals); ++ } ++ } ++ /* BB add code like else decode referrals then memcpy to ++ tmpbuffer and free referrals string array BB */ ++ } ++ } ++ } ++ /* BB Anything else to do to handle recursive links? */ ++ /* BB Should we be using page ops here? */ ++ ++ /* BB null terminate returned string in pBuffer? BB */ ++ if (rc == 0) { ++ rc = vfs_readlink(direntry, pBuffer, len, tmpbuffer); ++ cFYI(1, ++ ("vfs_readlink called from cifs_readlink returned %d", ++ rc)); ++ } ++ ++ if (tmpbuffer) { ++ kfree(tmpbuffer); ++ } ++ if (full_path) { ++ kfree(full_path); ++ } ++ FreeXid(xid); ++ return rc; ++} +diff -urN linux-2.4.29.old/fs/cifs/Makefile linux-2.4.29/fs/cifs/Makefile +--- linux-2.4.29.old/fs/cifs/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/Makefile 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,10 @@ ++# ++# Makefile for Linux CIFS VFS client ++# ++O_TARGET := cifs.o ++ ++obj-y := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o md4.o md5.o cifs_unicode.o nterr.o cifsencrypt.o ++ ++obj-m := $(O_TARGET) ++ ++include $(TOPDIR)/Rules.make +diff -urN linux-2.4.29.old/fs/cifs/md4.c linux-2.4.29/fs/cifs/md4.c +--- linux-2.4.29.old/fs/cifs/md4.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/md4.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,203 @@ ++/* ++ Unix SMB/Netbios implementation. ++ Version 1.9. ++ a implementation of MD4 designed for use in the SMB authentication protocol ++ Copyright (C) Andrew Tridgell 1997-1998. ++ Modified by Steve French (sfrench@us.ibm.com) 2002-2003 ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++*/ ++#include <linux/module.h> ++#include <linux/fs.h> ++/* NOTE: This code makes no attempt to be fast! */ ++ ++static __u32 ++F(__u32 X, __u32 Y, __u32 Z) ++{ ++ return (X & Y) | ((~X) & Z); ++} ++ ++static __u32 ++G(__u32 X, __u32 Y, __u32 Z) ++{ ++ return (X & Y) | (X & Z) | (Y & Z); ++} ++ ++static __u32 ++H(__u32 X, __u32 Y, __u32 Z) ++{ ++ return X ^ Y ^ Z; ++} ++ ++static __u32 ++lshift(__u32 x, int s) ++{ ++ x &= 0xFFFFFFFF; ++ return ((x << s) & 0xFFFFFFFF) | (x >> (32 - s)); ++} ++ ++#define ROUND1(a,b,c,d,k,s) (*a) = lshift((*a) + F(*b,*c,*d) + X[k], s) ++#define ROUND2(a,b,c,d,k,s) (*a) = lshift((*a) + G(*b,*c,*d) + X[k] + (__u32)0x5A827999,s) ++#define ROUND3(a,b,c,d,k,s) (*a) = lshift((*a) + H(*b,*c,*d) + X[k] + (__u32)0x6ED9EBA1,s) ++ ++/* this applies md4 to 64 byte chunks */ ++static void ++mdfour64(__u32 * M, __u32 * A, __u32 *B, __u32 * C, __u32 *D) ++{ ++ int j; ++ __u32 AA, BB, CC, DD; ++ __u32 X[16]; ++ ++ ++ for (j = 0; j < 16; j++) ++ X[j] = M[j]; ++ ++ AA = *A; ++ BB = *B; ++ CC = *C; ++ DD = *D; ++ ++ ROUND1(A, B, C, D, 0, 3); ++ ROUND1(D, A, B, C, 1, 7); ++ ROUND1(C, D, A, B, 2, 11); ++ ROUND1(B, C, D, A, 3, 19); ++ ROUND1(A, B, C, D, 4, 3); ++ ROUND1(D, A, B, C, 5, 7); ++ ROUND1(C, D, A, B, 6, 11); ++ ROUND1(B, C, D, A, 7, 19); ++ ROUND1(A, B, C, D, 8, 3); ++ ROUND1(D, A, B, C, 9, 7); ++ ROUND1(C, D, A, B, 10, 11); ++ ROUND1(B, C, D, A, 11, 19); ++ ROUND1(A, B, C, D, 12, 3); ++ ROUND1(D, A, B, C, 13, 7); ++ ROUND1(C, D, A, B, 14, 11); ++ ROUND1(B, C, D, A, 15, 19); ++ ++ ROUND2(A, B, C, D, 0, 3); ++ ROUND2(D, A, B, C, 4, 5); ++ ROUND2(C, D, A, B, 8, 9); ++ ROUND2(B, C, D, A, 12, 13); ++ ROUND2(A, B, C, D, 1, 3); ++ ROUND2(D, A, B, C, 5, 5); ++ ROUND2(C, D, A, B, 9, 9); ++ ROUND2(B, C, D, A, 13, 13); ++ ROUND2(A, B, C, D, 2, 3); ++ ROUND2(D, A, B, C, 6, 5); ++ ROUND2(C, D, A, B, 10, 9); ++ ROUND2(B, C, D, A, 14, 13); ++ ROUND2(A, B, C, D, 3, 3); ++ ROUND2(D, A, B, C, 7, 5); ++ ROUND2(C, D, A, B, 11, 9); ++ ROUND2(B, C, D, A, 15, 13); ++ ++ ROUND3(A, B, C, D, 0, 3); ++ ROUND3(D, A, B, C, 8, 9); ++ ROUND3(C, D, A, B, 4, 11); ++ ROUND3(B, C, D, A, 12, 15); ++ ROUND3(A, B, C, D, 2, 3); ++ ROUND3(D, A, B, C, 10, 9); ++ ROUND3(C, D, A, B, 6, 11); ++ ROUND3(B, C, D, A, 14, 15); ++ ROUND3(A, B, C, D, 1, 3); ++ ROUND3(D, A, B, C, 9, 9); ++ ROUND3(C, D, A, B, 5, 11); ++ ROUND3(B, C, D, A, 13, 15); ++ ROUND3(A, B, C, D, 3, 3); ++ ROUND3(D, A, B, C, 11, 9); ++ ROUND3(C, D, A, B, 7, 11); ++ ROUND3(B, C, D, A, 15, 15); ++ ++ *A += AA; ++ *B += BB; ++ *C += CC; ++ *D += DD; ++ ++ *A &= 0xFFFFFFFF; ++ *B &= 0xFFFFFFFF; ++ *C &= 0xFFFFFFFF; ++ *D &= 0xFFFFFFFF; ++ ++ for (j = 0; j < 16; j++) ++ X[j] = 0; ++} ++ ++static void ++copy64(__u32 * M, unsigned char *in) ++{ ++ int i; ++ ++ for (i = 0; i < 16; i++) ++ M[i] = (in[i * 4 + 3] << 24) | (in[i * 4 + 2] << 16) | ++ (in[i * 4 + 1] << 8) | (in[i * 4 + 0] << 0); ++} ++ ++static void ++copy4(unsigned char *out, __u32 x) ++{ ++ out[0] = x & 0xFF; ++ out[1] = (x >> 8) & 0xFF; ++ out[2] = (x >> 16) & 0xFF; ++ out[3] = (x >> 24) & 0xFF; ++} ++ ++/* produce a md4 message digest from data of length n bytes */ ++void ++mdfour(unsigned char *out, unsigned char *in, int n) ++{ ++ unsigned char buf[128]; ++ __u32 M[16]; ++ __u32 b = n * 8; ++ int i; ++ __u32 A = 0x67452301; ++ __u32 B = 0xefcdab89; ++ __u32 C = 0x98badcfe; ++ __u32 D = 0x10325476; ++ ++ while (n > 64) { ++ copy64(M, in); ++ mdfour64(M,&A,&B, &C, &D); ++ in += 64; ++ n -= 64; ++ } ++ ++ for (i = 0; i < 128; i++) ++ buf[i] = 0; ++ memcpy(buf, in, n); ++ buf[n] = 0x80; ++ ++ if (n <= 55) { ++ copy4(buf + 56, b); ++ copy64(M, buf); ++ mdfour64(M, &A, &B, &C, &D); ++ } else { ++ copy4(buf + 120, b); ++ copy64(M, buf); ++ mdfour64(M, &A, &B, &C, &D); ++ copy64(M, buf + 64); ++ mdfour64(M, &A, &B, &C, &D); ++ } ++ ++ for (i = 0; i < 128; i++) ++ buf[i] = 0; ++ copy64(M, buf); ++ ++ copy4(out, A); ++ copy4(out + 4, B); ++ copy4(out + 8, C); ++ copy4(out + 12, D); ++ ++ A = B = C = D = 0; ++} +diff -urN linux-2.4.29.old/fs/cifs/md5.c linux-2.4.29/fs/cifs/md5.c +--- linux-2.4.29.old/fs/cifs/md5.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/md5.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,363 @@ ++/* ++ * This code implements the MD5 message-digest algorithm. ++ * The algorithm is due to Ron Rivest. This code was ++ * written by Colin Plumb in 1993, no copyright is claimed. ++ * This code is in the public domain; do with it what you wish. ++ * ++ * Equivalent code is available from RSA Data Security, Inc. ++ * This code has been tested against that, and is equivalent, ++ * except that you don't need to include two pages of legalese ++ * with every copy. ++ * ++ * To compute the message digest of a chunk of bytes, declare an ++ * MD5Context structure, pass it to MD5Init, call MD5Update as ++ * needed on buffers full of bytes, and then call MD5Final, which ++ * will fill a supplied 16-byte array with the digest. ++ */ ++ ++/* This code slightly modified to fit into Samba by ++ abartlet@samba.org Jun 2001 ++ and to fit the cifs vfs by ++ Steve French sfrench@us.ibm.com */ ++ ++#include <linux/string.h> ++#include "md5.h" ++ ++static void MD5Transform(__u32 buf[4], __u32 const in[16]); ++ ++/* ++ * Note: this code is harmless on little-endian machines. ++ */ ++static void ++byteReverse(unsigned char *buf, unsigned longs) ++{ ++ __u32 t; ++ do { ++ t = (__u32) ((unsigned) buf[3] << 8 | buf[2]) << 16 | ++ ((unsigned) buf[1] << 8 | buf[0]); ++ *(__u32 *) buf = t; ++ buf += 4; ++ } while (--longs); ++} ++ ++/* ++ * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious ++ * initialization constants. ++ */ ++void ++MD5Init(struct MD5Context *ctx) ++{ ++ ctx->buf[0] = 0x67452301; ++ ctx->buf[1] = 0xefcdab89; ++ ctx->buf[2] = 0x98badcfe; ++ ctx->buf[3] = 0x10325476; ++ ++ ctx->bits[0] = 0; ++ ctx->bits[1] = 0; ++} ++ ++/* ++ * Update context to reflect the concatenation of another buffer full ++ * of bytes. ++ */ ++void ++MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len) ++{ ++ register __u32 t; ++ ++ /* Update bitcount */ ++ ++ t = ctx->bits[0]; ++ if ((ctx->bits[0] = t + ((__u32) len << 3)) < t) ++ ctx->bits[1]++; /* Carry from low to high */ ++ ctx->bits[1] += len >> 29; ++ ++ t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */ ++ ++ /* Handle any leading odd-sized chunks */ ++ ++ if (t) { ++ unsigned char *p = (unsigned char *) ctx->in + t; ++ ++ t = 64 - t; ++ if (len < t) { ++ memmove(p, buf, len); ++ return; ++ } ++ memmove(p, buf, t); ++ byteReverse(ctx->in, 16); ++ MD5Transform(ctx->buf, (__u32 *) ctx->in); ++ buf += t; ++ len -= t; ++ } ++ /* Process data in 64-byte chunks */ ++ ++ while (len >= 64) { ++ memmove(ctx->in, buf, 64); ++ byteReverse(ctx->in, 16); ++ MD5Transform(ctx->buf, (__u32 *) ctx->in); ++ buf += 64; ++ len -= 64; ++ } ++ ++ /* Handle any remaining bytes of data. */ ++ ++ memmove(ctx->in, buf, len); ++} ++ ++/* ++ * Final wrapup - pad to 64-byte boundary with the bit pattern ++ * 1 0* (64-bit count of bits processed, MSB-first) ++ */ ++void ++MD5Final(unsigned char digest[16], struct MD5Context *ctx) ++{ ++ unsigned int count; ++ unsigned char *p; ++ ++ /* Compute number of bytes mod 64 */ ++ count = (ctx->bits[0] >> 3) & 0x3F; ++ ++ /* Set the first char of padding to 0x80. This is safe since there is ++ always at least one byte free */ ++ p = ctx->in + count; ++ *p++ = 0x80; ++ ++ /* Bytes of padding needed to make 64 bytes */ ++ count = 64 - 1 - count; ++ ++ /* Pad out to 56 mod 64 */ ++ if (count < 8) { ++ /* Two lots of padding: Pad the first block to 64 bytes */ ++ memset(p, 0, count); ++ byteReverse(ctx->in, 16); ++ MD5Transform(ctx->buf, (__u32 *) ctx->in); ++ ++ /* Now fill the next block with 56 bytes */ ++ memset(ctx->in, 0, 56); ++ } else { ++ /* Pad block to 56 bytes */ ++ memset(p, 0, count - 8); ++ } ++ byteReverse(ctx->in, 14); ++ ++ /* Append length in bits and transform */ ++ ((__u32 *) ctx->in)[14] = ctx->bits[0]; ++ ((__u32 *) ctx->in)[15] = ctx->bits[1]; ++ ++ MD5Transform(ctx->buf, (__u32 *) ctx->in); ++ byteReverse((unsigned char *) ctx->buf, 4); ++ memmove(digest, ctx->buf, 16); ++ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ ++} ++ ++/* The four core functions - F1 is optimized somewhat */ ++ ++/* #define F1(x, y, z) (x & y | ~x & z) */ ++#define F1(x, y, z) (z ^ (x & (y ^ z))) ++#define F2(x, y, z) F1(z, x, y) ++#define F3(x, y, z) (x ^ y ^ z) ++#define F4(x, y, z) (y ^ (x | ~z)) ++ ++/* This is the central step in the MD5 algorithm. */ ++#define MD5STEP(f, w, x, y, z, data, s) \ ++ ( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x ) ++ ++/* ++ * The core of the MD5 algorithm, this alters an existing MD5 hash to ++ * reflect the addition of 16 longwords of new data. MD5Update blocks ++ * the data and converts bytes into longwords for this routine. ++ */ ++static void ++MD5Transform(__u32 buf[4], __u32 const in[16]) ++{ ++ register __u32 a, b, c, d; ++ ++ a = buf[0]; ++ b = buf[1]; ++ c = buf[2]; ++ d = buf[3]; ++ ++ MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); ++ MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); ++ MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); ++ MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); ++ MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); ++ MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); ++ MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); ++ MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); ++ MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); ++ MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); ++ MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); ++ MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); ++ MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); ++ MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); ++ MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); ++ MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); ++ ++ MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); ++ MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); ++ MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); ++ MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); ++ MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); ++ MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); ++ MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); ++ MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); ++ MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); ++ MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); ++ MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); ++ MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); ++ MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); ++ MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); ++ MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); ++ MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); ++ ++ MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); ++ MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); ++ MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); ++ MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); ++ MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); ++ MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); ++ MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); ++ MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); ++ MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); ++ MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); ++ MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); ++ MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); ++ MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); ++ MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); ++ MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); ++ MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); ++ ++ MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); ++ MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); ++ MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); ++ MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); ++ MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); ++ MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); ++ MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); ++ MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); ++ MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); ++ MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); ++ MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); ++ MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); ++ MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); ++ MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); ++ MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); ++ MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); ++ ++ buf[0] += a; ++ buf[1] += b; ++ buf[2] += c; ++ buf[3] += d; ++} ++ ++/*********************************************************************** ++ the rfc 2104 version of hmac_md5 initialisation. ++***********************************************************************/ ++void ++hmac_md5_init_rfc2104(unsigned char *key, int key_len, ++ struct HMACMD5Context *ctx) ++{ ++ int i; ++ ++ /* if key is longer than 64 bytes reset it to key=MD5(key) */ ++ if (key_len > 64) { ++ unsigned char tk[16]; ++ struct MD5Context tctx; ++ ++ MD5Init(&tctx); ++ MD5Update(&tctx, key, key_len); ++ MD5Final(tk, &tctx); ++ ++ key = tk; ++ key_len = 16; ++ } ++ ++ /* start out by storing key in pads */ ++ memset(ctx->k_ipad, 0, sizeof (ctx->k_ipad)); ++ memset(ctx->k_opad, 0, sizeof (ctx->k_opad)); ++ memcpy(ctx->k_ipad, key, key_len); ++ memcpy(ctx->k_opad, key, key_len); ++ ++ /* XOR key with ipad and opad values */ ++ for (i = 0; i < 64; i++) { ++ ctx->k_ipad[i] ^= 0x36; ++ ctx->k_opad[i] ^= 0x5c; ++ } ++ ++ MD5Init(&ctx->ctx); ++ MD5Update(&ctx->ctx, ctx->k_ipad, 64); ++} ++ ++/*********************************************************************** ++ the microsoft version of hmac_md5 initialisation. ++***********************************************************************/ ++void ++hmac_md5_init_limK_to_64(const unsigned char *key, int key_len, ++ struct HMACMD5Context *ctx) ++{ ++ int i; ++ ++ /* if key is longer than 64 bytes truncate it */ ++ if (key_len > 64) { ++ key_len = 64; ++ } ++ ++ /* start out by storing key in pads */ ++ memset(ctx->k_ipad, 0, sizeof (ctx->k_ipad)); ++ memset(ctx->k_opad, 0, sizeof (ctx->k_opad)); ++ memcpy(ctx->k_ipad, key, key_len); ++ memcpy(ctx->k_opad, key, key_len); ++ ++ /* XOR key with ipad and opad values */ ++ for (i = 0; i < 64; i++) { ++ ctx->k_ipad[i] ^= 0x36; ++ ctx->k_opad[i] ^= 0x5c; ++ } ++ ++ MD5Init(&ctx->ctx); ++ MD5Update(&ctx->ctx, ctx->k_ipad, 64); ++} ++ ++/*********************************************************************** ++ update hmac_md5 "inner" buffer ++***********************************************************************/ ++void ++hmac_md5_update(const unsigned char *text, int text_len, ++ struct HMACMD5Context *ctx) ++{ ++ MD5Update(&ctx->ctx, text, text_len); /* then text of datagram */ ++} ++ ++/*********************************************************************** ++ finish off hmac_md5 "inner" buffer and generate outer one. ++***********************************************************************/ ++void ++hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx) ++{ ++ struct MD5Context ctx_o; ++ ++ MD5Final(digest, &ctx->ctx); ++ ++ MD5Init(&ctx_o); ++ MD5Update(&ctx_o, ctx->k_opad, 64); ++ MD5Update(&ctx_o, digest, 16); ++ MD5Final(digest, &ctx_o); ++} ++ ++/*********************************************************** ++ single function to calculate an HMAC MD5 digest from data. ++ use the microsoft hmacmd5 init method because the key is 16 bytes. ++************************************************************/ ++void ++hmac_md5(unsigned char key[16], unsigned char *data, int data_len, ++ unsigned char *digest) ++{ ++ struct HMACMD5Context ctx; ++ hmac_md5_init_limK_to_64(key, 16, &ctx); ++ if (data_len != 0) { ++ hmac_md5_update(data, data_len, &ctx); ++ } ++ hmac_md5_final(digest, &ctx); ++} +diff -urN linux-2.4.29.old/fs/cifs/md5.h linux-2.4.29/fs/cifs/md5.h +--- linux-2.4.29.old/fs/cifs/md5.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/md5.h 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,38 @@ ++#ifndef MD5_H ++#define MD5_H ++#ifndef HEADER_MD5_H ++/* Try to avoid clashes with OpenSSL */ ++#define HEADER_MD5_H ++#endif ++ ++struct MD5Context { ++ __u32 buf[4]; ++ __u32 bits[2]; ++ unsigned char in[64]; ++}; ++#endif /* !MD5_H */ ++ ++#ifndef _HMAC_MD5_H ++struct HMACMD5Context { ++ struct MD5Context ctx; ++ unsigned char k_ipad[65]; ++ unsigned char k_opad[65]; ++}; ++#endif /* _HMAC_MD5_H */ ++ ++void MD5Init(struct MD5Context *context); ++void MD5Update(struct MD5Context *context, unsigned char const *buf, ++ unsigned len); ++void MD5Final(unsigned char digest[16], struct MD5Context *context); ++ ++/* The following definitions come from lib/hmacmd5.c */ ++ ++void hmac_md5_init_rfc2104(unsigned char *key, int key_len, ++ struct HMACMD5Context *ctx); ++void hmac_md5_init_limK_to_64(const unsigned char *key, int key_len, ++ struct HMACMD5Context *ctx); ++void hmac_md5_update(const unsigned char *text, int text_len, ++ struct HMACMD5Context *ctx); ++void hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx); ++void hmac_md5(unsigned char key[16], unsigned char *data, int data_len, ++ unsigned char *digest); +diff -urN linux-2.4.29.old/fs/cifs/misc.c linux-2.4.29/fs/cifs/misc.c +--- linux-2.4.29.old/fs/cifs/misc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/misc.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,463 @@ ++/* ++ * fs/cifs/misc.c ++ * ++ * Copyright (C) International Business Machines Corp., 2002,2003 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <linux/slab.h> ++#include <linux/ctype.h> ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifsproto.h" ++#include "cifs_debug.h" ++#include "smberr.h" ++#include "nterr.h" ++ ++extern kmem_cache_t *cifs_req_cachep; ++extern struct task_struct * oplockThread; ++ ++__u16 GlobalMid; /* multiplex id - rotating counter */ ++ ++/* The xid serves as a useful identifier for each incoming vfs request, ++ in a similar way to the mid which is useful to track each sent smb, ++ and CurrentXid can also provide a running counter (although it ++ will eventually wrap past zero) of the total vfs operations handled ++ since the cifs fs was mounted */ ++ ++unsigned int ++_GetXid(void) ++{ ++ unsigned int xid; ++ ++ spin_lock(&GlobalMid_Lock); ++ GlobalTotalActiveXid++; ++ if (GlobalTotalActiveXid > GlobalMaxActiveXid) ++ GlobalMaxActiveXid = GlobalTotalActiveXid; /* keep high water mark for number of simultaneous vfs ops in our filesystem */ ++ xid = GlobalCurrentXid++; ++ spin_unlock(&GlobalMid_Lock); ++ return xid; ++} ++ ++void ++_FreeXid(unsigned int xid) ++{ ++ spin_lock(&GlobalMid_Lock); ++ /* if(GlobalTotalActiveXid == 0) ++ BUG(); */ ++ GlobalTotalActiveXid--; ++ spin_unlock(&GlobalMid_Lock); ++} ++ ++struct cifsSesInfo * ++sesInfoAlloc(void) ++{ ++ struct cifsSesInfo *ret_buf; ++ ++ ret_buf = ++ (struct cifsSesInfo *) kmalloc(sizeof (struct cifsSesInfo), ++ GFP_KERNEL); ++ if (ret_buf) { ++ memset(ret_buf, 0, sizeof (struct cifsSesInfo)); ++ write_lock(&GlobalSMBSeslock); ++ atomic_inc(&sesInfoAllocCount); ++ ret_buf->status = CifsNew; ++ list_add(&ret_buf->cifsSessionList, &GlobalSMBSessionList); ++ init_MUTEX(&ret_buf->sesSem); ++ write_unlock(&GlobalSMBSeslock); ++ } ++ return ret_buf; ++} ++ ++void ++sesInfoFree(struct cifsSesInfo *buf_to_free) ++{ ++ if (buf_to_free == NULL) { ++ cFYI(1, ("Null buffer passed to sesInfoFree")); ++ return; ++ } ++ ++ write_lock(&GlobalSMBSeslock); ++ atomic_dec(&sesInfoAllocCount); ++ list_del(&buf_to_free->cifsSessionList); ++ write_unlock(&GlobalSMBSeslock); ++ if (buf_to_free->serverOS) ++ kfree(buf_to_free->serverOS); ++ if (buf_to_free->serverDomain) ++ kfree(buf_to_free->serverDomain); ++ if (buf_to_free->serverNOS) ++ kfree(buf_to_free->serverNOS); ++ if (buf_to_free->password) ++ kfree(buf_to_free->password); ++ kfree(buf_to_free); ++} ++ ++struct cifsTconInfo * ++tconInfoAlloc(void) ++{ ++ struct cifsTconInfo *ret_buf; ++ ret_buf = ++ (struct cifsTconInfo *) kmalloc(sizeof (struct cifsTconInfo), ++ GFP_KERNEL); ++ if (ret_buf) { ++ memset(ret_buf, 0, sizeof (struct cifsTconInfo)); ++ write_lock(&GlobalSMBSeslock); ++ atomic_inc(&tconInfoAllocCount); ++ list_add(&ret_buf->cifsConnectionList, ++ &GlobalTreeConnectionList); ++ ret_buf->tidStatus = CifsNew; ++ INIT_LIST_HEAD(&ret_buf->openFileList); ++ init_MUTEX(&ret_buf->tconSem); ++#ifdef CONFIG_CIFS_STATS ++ ret_buf->stat_lock = SPIN_LOCK_UNLOCKED; ++#endif ++ write_unlock(&GlobalSMBSeslock); ++ } ++ return ret_buf; ++} ++ ++void ++tconInfoFree(struct cifsTconInfo *buf_to_free) ++{ ++ if (buf_to_free == NULL) { ++ cFYI(1, ("Null buffer passed to tconInfoFree")); ++ return; ++ } ++ write_lock(&GlobalSMBSeslock); ++ atomic_dec(&tconInfoAllocCount); ++ list_del(&buf_to_free->cifsConnectionList); ++ write_unlock(&GlobalSMBSeslock); ++ if (buf_to_free->nativeFileSystem) ++ kfree(buf_to_free->nativeFileSystem); ++ kfree(buf_to_free); ++} ++ ++struct smb_hdr * ++cifs_buf_get(void) ++{ ++ struct smb_hdr *ret_buf = NULL; ++ ++/* We could use negotiated size instead of max_msgsize - ++ but it may be more efficient to always alloc same size ++ albeit slightly larger than necessary and maxbuffersize ++ defaults to this and can not be bigger */ ++ ret_buf = ++ (struct smb_hdr *) kmem_cache_alloc(cifs_req_cachep, SLAB_KERNEL); ++ ++ /* clear the first few header bytes */ ++ if (ret_buf) { ++ memset(ret_buf, 0, sizeof (struct smb_hdr)); ++ atomic_inc(&bufAllocCount); ++ } ++ ++ return ret_buf; ++} ++ ++void ++cifs_buf_release(void *buf_to_free) ++{ ++ ++ if (buf_to_free == NULL) { ++ cFYI(1, ("Null buffer passed to cifs_buf_release")); ++ return; ++ } ++ kmem_cache_free(cifs_req_cachep, buf_to_free); ++ ++ atomic_dec(&bufAllocCount); ++ return; ++} ++ ++void ++header_assemble(struct smb_hdr *buffer, char smb_command /* command */ , ++ const struct cifsTconInfo *treeCon, int word_count ++ /* length of fixed section (word count) in two byte units */ ++ ) ++{ ++ int i; ++ __u32 tmp; ++ struct list_head* temp_item; ++ struct cifsSesInfo * ses; ++ char *temp = (char *) buffer; ++ ++ for (i = 0; i < MAX_CIFS_HDR_SIZE; i++) { ++ temp[i] = 0; /* BB is this needed ?? */ ++ } ++ ++ buffer->smb_buf_length = ++ (2 * word_count) + sizeof (struct smb_hdr) - ++ 4 /* RFC 1001 length field does not count */ + ++ 2 /* for bcc field itself */ ; ++ /* Note that this is the only network field that has to be converted to big endian and it is done just before we send it */ ++ ++ buffer->Protocol[0] = 0xFF; ++ buffer->Protocol[1] = 'S'; ++ buffer->Protocol[2] = 'M'; ++ buffer->Protocol[3] = 'B'; ++ buffer->Command = smb_command; ++ buffer->Flags = 0x00; /* case sensitive */ ++ buffer->Flags2 = SMBFLG2_KNOWS_LONG_NAMES; ++ tmp = cpu_to_le32(current->pid); ++ buffer->Pid = tmp & 0xFFFF; ++ tmp >>= 16; ++ buffer->PidHigh = tmp & 0xFFFF; ++ spin_lock(&GlobalMid_Lock); ++ GlobalMid++; ++ buffer->Mid = GlobalMid; ++ spin_unlock(&GlobalMid_Lock); ++ if (treeCon) { ++ buffer->Tid = treeCon->tid; ++ if (treeCon->ses) { ++ if (treeCon->ses->capabilities & CAP_UNICODE) ++ buffer->Flags2 |= SMBFLG2_UNICODE; ++ if (treeCon->ses->capabilities & CAP_STATUS32) { ++ buffer->Flags2 |= SMBFLG2_ERR_STATUS; ++ } ++ ++ buffer->Uid = treeCon->ses->Suid; /* always in LE format */ ++ if(multiuser_mount != 0) { ++ /* For the multiuser case, there are few obvious technically */ ++ /* possible mechanisms to match the local linux user (uid) */ ++ /* to a valid remote smb user (smb_uid): */ ++ /* 1) Query Winbind (or other local pam/nss daemon */ ++ /* for userid/password/logon_domain or credential */ ++ /* 2) Query Winbind for uid to sid to username mapping */ ++ /* and see if we have a matching password for existing*/ ++ /* session for that user perhas getting password by */ ++ /* adding a new pam_cifs module that stores passwords */ ++ /* so that the cifs vfs can get at that for all logged*/ ++ /* on users */ ++ /* 3) (Which is the mechanism we have chosen) */ ++ /* Search through sessions to the same server for a */ ++ /* a match on the uid that was passed in on mount */ ++ /* with the current processes uid (or euid?) and use */ ++ /* that smb uid. If no existing smb session for */ ++ /* that uid found, use the default smb session ie */ ++ /* the smb session for the volume mounted which is */ ++ /* the same as would be used if the multiuser mount */ ++ /* flag were disabled. */ ++ ++ /* BB Add support for establishing new tCon and SMB Session */ ++ /* with userid/password pairs found on the smb session */ ++ /* for other target tcp/ip addresses BB */ ++ if(current->uid != treeCon->ses->linux_uid) { ++ cFYI(1,("Multiuser mode and UID did not match tcon uid ")); ++ read_lock(&GlobalSMBSeslock); ++ list_for_each(temp_item, &GlobalSMBSessionList) { ++ ses = list_entry(temp_item, struct cifsSesInfo, cifsSessionList); ++ if(ses->linux_uid == current->uid) { ++ if(ses->server == treeCon->ses->server) { ++ cFYI(1,("found matching uid substitute right smb_uid")); ++ buffer->Uid = ses->Suid; ++ break; ++ } else { ++ /* BB eventually call cifs_setup_session here */ ++ cFYI(1,("local UID found but smb sess with this server does not exist")); ++ } ++ } ++ } ++ read_unlock(&GlobalSMBSeslock); ++ } ++ } ++ } ++ if (treeCon->Flags & SMB_SHARE_IS_IN_DFS) ++ buffer->Flags2 |= SMBFLG2_DFS; ++ if(treeCon->ses->server) ++ if(treeCon->ses->server->secMode & ++ (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) ++ buffer->Flags2 |= SMBFLG2_SECURITY_SIGNATURE; ++ } ++ ++/* endian conversion of flags is now done just before sending */ ++ buffer->WordCount = (char) word_count; ++ return; ++} ++ ++int ++checkSMBhdr(struct smb_hdr *smb, __u16 mid) ++{ ++ /* Make sure that this really is an SMB, that it is a response, ++ and that the message ids match */ ++ if ((*(unsigned int *) smb->Protocol == cpu_to_le32(0x424d53ff)) && ++ (mid == smb->Mid)) { ++ if(smb->Flags & SMBFLG_RESPONSE) ++ return 0; ++ else { ++ /* only one valid case where server sends us request */ ++ if(smb->Command == SMB_COM_LOCKING_ANDX) ++ return 0; ++ else ++ cERROR(1, ("Rcvd Request not response ")); ++ } ++ } else { /* bad signature or mid */ ++ if (*(unsigned int *) smb->Protocol != cpu_to_le32(0x424d53ff)) ++ cERROR(1, ++ ("Bad protocol string signature header %x ", ++ *(unsigned int *) smb->Protocol)); ++ if (mid != smb->Mid) ++ cERROR(1, ("Mids do not match")); ++ } ++ cERROR(1, ("bad smb detected. The Mid=%d", smb->Mid)); ++ return 1; ++} ++ ++int ++checkSMB(struct smb_hdr *smb, __u16 mid, int length) ++{ ++ cFYI(0, ++ ("Entering checkSMB with Length: %x, smb_buf_length: %x ", ++ length, ntohl(smb->smb_buf_length))); ++ if (((unsigned int)length < 2 + sizeof (struct smb_hdr)) ++ || (ntohl(smb->smb_buf_length) > ++ CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE - 4)) { ++ if ((unsigned int)length < 2 + sizeof (struct smb_hdr)) { ++ cERROR(1, ("Length less than 2 + sizeof smb_hdr ")); ++ if (((unsigned int)length >= sizeof (struct smb_hdr) - 1) ++ && (smb->Status.CifsError != 0)) ++ return 0; /* some error cases do not return wct and bcc */ ++ ++ } ++ if (ntohl(smb->smb_buf_length) > ++ CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE - 4) ++ cERROR(1, ++ ("smb_buf_length greater than CIFS_MAX_MSGSIZE ... ")); ++ cERROR(1, ++ ("bad smb detected. Illegal length. The mid=%d", ++ smb->Mid)); ++ return 1; ++ } ++ ++ if (checkSMBhdr(smb, mid)) ++ return 1; ++ ++ if ((4 + ntohl(smb->smb_buf_length) != smbCalcSize(smb)) ++ || (4 + ntohl(smb->smb_buf_length) != (unsigned int)length)) { ++ return 0; ++ } else { ++ cERROR(1, ("smbCalcSize %x ", smbCalcSize(smb))); ++ cERROR(1, ++ ("bad smb size detected. The Mid=%d", smb->Mid)); ++ return 1; ++ } ++} ++int ++is_valid_oplock_break(struct smb_hdr *buf) ++{ ++ struct smb_com_lock_req * pSMB = (struct smb_com_lock_req *)buf; ++ struct list_head *tmp; ++ struct list_head *tmp1; ++ struct cifsTconInfo *tcon; ++ struct cifsFileInfo *netfile; ++ ++ /* could add check for smb response flag 0x80 */ ++ cFYI(1,("Checking for oplock break")); ++ if(pSMB->hdr.Command != SMB_COM_LOCKING_ANDX) ++ return FALSE; ++ if(pSMB->hdr.Flags & SMBFLG_RESPONSE) { ++ /* no sense logging error on invalid handle on oplock ++ break - harmless race between close request and oplock ++ break response is expected from time to time writing out ++ large dirty files cached on the client */ ++ if ((NT_STATUS_INVALID_HANDLE) == ++ le32_to_cpu(pSMB->hdr.Status.CifsError)) { ++ cFYI(1,("invalid handle on oplock break")); ++ return TRUE; ++ } else if (ERRbadfid == ++ le16_to_cpu(pSMB->hdr.Status.DosError.Error)) { ++ return TRUE; ++ } else { ++ return FALSE; /* on valid oplock brk we get "request" */ ++ } ++ } ++ if(pSMB->hdr.WordCount != 8) ++ return FALSE; ++ ++ cFYI(1,(" oplock type 0x%d level 0x%d",pSMB->LockType,pSMB->OplockLevel)); ++ if(!(pSMB->LockType & LOCKING_ANDX_OPLOCK_RELEASE)) ++ return FALSE; ++ ++ /* look up tcon based on tid & uid */ ++ read_lock(&GlobalSMBSeslock); ++ list_for_each(tmp, &GlobalTreeConnectionList) { ++ tcon = list_entry(tmp, struct cifsTconInfo, cifsConnectionList); ++ if (tcon->tid == buf->Tid) { ++#ifdef CONFIG_CIFS_STATS ++ atomic_inc(&tcon->num_oplock_brks); ++#endif ++ list_for_each(tmp1,&tcon->openFileList){ ++ netfile = list_entry(tmp1,struct cifsFileInfo,tlist); ++ if(pSMB->Fid == netfile->netfid) { ++ struct cifsInodeInfo *pCifsInode; ++ read_unlock(&GlobalSMBSeslock); ++ cFYI(1,("Matching file id, processing oplock break")); ++ pCifsInode = ++ CIFS_I(netfile->pInode); ++ pCifsInode->clientCanCacheAll = FALSE; ++ if(pSMB->OplockLevel == 0) ++ pCifsInode->clientCanCacheRead = FALSE; ++ pCifsInode->oplockPending = TRUE; ++ AllocOplockQEntry(netfile->pInode, netfile->netfid, tcon); ++ cFYI(1,("about to wake up oplock thd")); ++ wake_up_process(oplockThread); ++ return TRUE; ++ } ++ } ++ read_unlock(&GlobalSMBSeslock); ++ cFYI(1,("No matching file for oplock break on connection")); ++ return TRUE; ++ } ++ } ++ read_unlock(&GlobalSMBSeslock); ++ cFYI(1,("Can not process oplock break for non-existent connection")); ++ return TRUE; ++} ++ ++void ++dump_smb(struct smb_hdr *smb_buf, int smb_buf_length) ++{ ++ int i, j; ++ char debug_line[17]; ++ unsigned char *buffer; ++ ++ if (traceSMB == 0) ++ return; ++ ++ buffer = (unsigned char *) smb_buf; ++ for (i = 0, j = 0; i < smb_buf_length; i++, j++) { ++ if (i % 8 == 0) { /* we have reached the beginning of line */ ++ printk(KERN_DEBUG "| "); ++ j = 0; ++ } ++ printk("%0#4x ", buffer[i]); ++ debug_line[2 * j] = ' '; ++ if (isprint(buffer[i])) ++ debug_line[1 + (2 * j)] = buffer[i]; ++ else ++ debug_line[1 + (2 * j)] = '_'; ++ ++ if (i % 8 == 7) { /* we have reached end of line, time to print ascii */ ++ debug_line[16] = 0; ++ printk(" | %s\n", debug_line); ++ } ++ } ++ for (; j < 8; j++) { ++ printk(" "); ++ debug_line[2 * j] = ' '; ++ debug_line[1 + (2 * j)] = ' '; ++ } ++ printk( " | %s\n", debug_line); ++ return; ++} +diff -urN linux-2.4.29.old/fs/cifs/netmisc.c linux-2.4.29/fs/cifs/netmisc.c +--- linux-2.4.29.old/fs/cifs/netmisc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/netmisc.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,905 @@ ++/* ++ * fs/cifs/netmisc.c ++ * ++ * Copyright (c) International Business Machines Corp., 2002 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * Error mapping routines from Samba libsmb/errormap.c ++ * Copyright (C) Andrew Tridgell 2001 ++ * ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <linux/net.h> ++#include <linux/string.h> ++#include <linux/in.h> ++#include <linux/ctype.h> ++#include <linux/fs.h> ++#include <asm/div64.h> ++#include <asm/byteorder.h> ++#include "cifsfs.h" ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifsproto.h" ++#include "smberr.h" ++#include "cifs_debug.h" ++#include "nterr.h" ++ ++struct smb_to_posix_error { ++ __u16 smb_err; ++ int posix_code; ++}; ++ ++const struct smb_to_posix_error mapping_table_ERRDOS[] = { ++ {ERRbadfunc, -EINVAL}, ++ {ERRbadfile, -ENOENT}, ++ {ERRbadpath, -ENOTDIR}, ++ {ERRnofids, -EMFILE}, ++ {ERRnoaccess, -EACCES}, ++ {ERRbadfid, -EBADF}, ++ {ERRbadmcb, -EIO}, ++ {ERRnomem, -ENOMEM}, ++ {ERRbadmem, -EFAULT}, ++ {ERRbadenv, -EFAULT}, ++ {ERRbadformat, -EINVAL}, ++ {ERRbadaccess, -EACCES}, ++ {ERRbaddata, -EIO}, ++ {ERRbaddrive, -ENXIO}, ++ {ERRremcd, -EACCES}, ++ {ERRdiffdevice, -EXDEV}, ++ {ERRnofiles, -ENOENT}, ++ {ERRbadshare, -ETXTBSY}, ++ {ERRlock, -EACCES}, ++ {ERRunsup, -EINVAL}, ++ {ERRnosuchshare,-ENXIO}, ++ {ERRfilexists, -EEXIST}, ++ {ERRinvparm, -EINVAL}, ++ {ERRdiskfull, -ENOSPC}, ++ {ERRinvname, -ENOENT}, ++ {ERRdirnotempty, -ENOTEMPTY}, ++ {ERRnotlocked, -ENOLCK}, ++ {ERRalreadyexists, -EEXIST}, ++ {ERRmoredata, -EOVERFLOW}, ++ {ErrQuota, -EDQUOT}, ++ {ErrNotALink, -ENOLINK}, ++ {ERRnetlogonNotStarted,-ENOPROTOOPT}, ++ {0, 0} ++}; ++ ++const struct smb_to_posix_error mapping_table_ERRSRV[] = { ++ {ERRerror, -EIO}, ++ {ERRbadpw, -EPERM}, ++ {ERRbadtype, -EREMOTE}, ++ {ERRaccess, -EACCES}, ++ {ERRinvtid, -ENXIO}, ++ {ERRinvnetname, -ENODEV}, ++ {ERRinvdevice, -ENXIO}, ++ {ERRqfull, -ENOSPC}, ++ {ERRqtoobig, -ENOSPC}, ++ {ERRqeof, -EIO}, ++ {ERRinvpfid, -EBADF}, ++ {ERRsmbcmd, -EBADRQC}, ++ {ERRsrverror, -EIO}, ++ {ERRbadBID, -EIO}, ++ {ERRfilespecs, -EINVAL}, ++ {ERRbadLink, -EIO}, ++ {ERRbadpermits, -EINVAL}, ++ {ERRbadPID, -ESRCH}, ++ {ERRsetattrmode, -EINVAL}, ++ {ERRpaused, -EHOSTDOWN}, ++ {ERRmsgoff, -EHOSTDOWN}, ++ {ERRnoroom, -ENOSPC}, ++ {ERRrmuns, -EUSERS}, ++ {ERRtimeout, -ETIME}, ++ {ERRnoresource, -ENOBUFS}, ++ {ERRtoomanyuids, -EUSERS}, ++ {ERRbaduid, -EACCES}, ++ {ERRusempx, -EIO}, ++ {ERRusestd, -EIO}, ++ {ERR_NOTIFY_ENUM_DIR, -ENOBUFS}, ++ {ERRaccountexpired, -EACCES}, ++ {ERRbadclient, -EACCES}, ++ {ERRbadLogonTime, -EACCES}, ++ {ERRpasswordExpired, -EACCES}, ++ {ERRnosupport, -EINVAL}, ++ {0, 0} ++}; ++ ++const struct smb_to_posix_error mapping_table_ERRHRD[] = { ++ {0, 0} ++}; ++ ++/* Convert string containing dotted ip address to binary form */ ++/* returns 0 if invalid address */ ++ ++/* BB add address family, change rc to status flag and return union or for ipv6 */ ++/* will need parent to call something like inet_pton to convert ipv6 address BB */ ++int ++cifs_inet_pton(int address_family, char *cp,void *dst) ++{ ++ struct in_addr address; ++ int value; ++ int digit; ++ int i; ++ char temp; ++ char bytes[4]; ++ char *end = bytes; ++ static const int addr_class_max[4] = ++ { 0xffffffff, 0xffffff, 0xffff, 0xff }; ++ ++ if(address_family != AF_INET) ++ return -EAFNOSUPPORT; ++ ++ for (i = 0; i < 4; i++) { ++ bytes[i] = 0; ++ } ++ ++ temp = *cp; ++ ++ while (TRUE) { ++ if (!isdigit(temp)) ++ return 0; ++ ++ value = 0; ++ digit = 0; ++ for (;;) { ++ if (isascii(temp) && isdigit(temp)) { ++ value = (value * 10) + temp - '0'; ++ temp = *++cp; ++ digit = 1; ++ } else ++ break; ++ } ++ ++ if (temp == '.') { ++ if ((end > bytes + 2) || (value > 255)) ++ return 0; ++ *end++ = value; ++ temp = *++cp; ++ } else if (temp == ':') { ++ cFYI(1,("IPv6 addresses not supported for CIFS mounts yet")); ++ return -1; ++ } else ++ break; ++ } ++ ++ /* check for last characters */ ++ if (temp != '\0' && (!isascii(temp) || !isspace(temp))) ++ if (temp != '\\') { ++ if (temp != '/') ++ return 0; ++ else ++ (*cp = '\\'); /* switch the slash the expected way */ ++ } ++ if (value > addr_class_max[end - bytes]) ++ return 0; ++ ++ address.s_addr = *((int *) bytes) | htonl(value); ++ *((int *)dst) = address.s_addr; ++ return 1; /* success */ ++} ++ ++/***************************************************************************** ++convert a NT status code to a dos class/code ++ *****************************************************************************/ ++/* NT status -> dos error map */ ++static const struct { ++ __u8 dos_class; ++ __u16 dos_code; ++ __u32 ntstatus; ++} ntstatus_to_dos_map[] = { ++ { ++ ERRDOS, ERRgeneral, NT_STATUS_UNSUCCESSFUL}, { ++ ERRDOS, ERRbadfunc, NT_STATUS_NOT_IMPLEMENTED}, { ++ ERRDOS, 87, NT_STATUS_INVALID_INFO_CLASS}, { ++ ERRDOS, 24, NT_STATUS_INFO_LENGTH_MISMATCH}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ACCESS_VIOLATION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_IN_PAGE_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PAGEFILE_QUOTA}, { ++ ERRDOS, ERRbadfid, NT_STATUS_INVALID_HANDLE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_INITIAL_STACK}, { ++ ERRDOS, 193, NT_STATUS_BAD_INITIAL_PC}, { ++ ERRDOS, 87, NT_STATUS_INVALID_CID}, { ++ ERRHRD, ERRgeneral, NT_STATUS_TIMER_NOT_CANCELED}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER}, { ++ ERRDOS, ERRbadfile, NT_STATUS_NO_SUCH_DEVICE}, { ++ ERRDOS, ERRbadfile, NT_STATUS_NO_SUCH_FILE}, { ++ ERRDOS, ERRbadfunc, NT_STATUS_INVALID_DEVICE_REQUEST}, { ++ ERRDOS, 38, NT_STATUS_END_OF_FILE}, { ++ ERRDOS, 34, NT_STATUS_WRONG_VOLUME}, { ++ ERRDOS, 21, NT_STATUS_NO_MEDIA_IN_DEVICE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNRECOGNIZED_MEDIA}, { ++ ERRDOS, 27, NT_STATUS_NONEXISTENT_SECTOR}, ++/* { This NT error code was 'sqashed' ++ from NT_STATUS_MORE_PROCESSING_REQUIRED to NT_STATUS_OK ++ during the session setup } */ ++ { ++ ERRDOS, ERRnomem, NT_STATUS_NO_MEMORY}, { ++ ERRDOS, 487, NT_STATUS_CONFLICTING_ADDRESSES}, { ++ ERRDOS, 487, NT_STATUS_NOT_MAPPED_VIEW}, { ++ ERRDOS, 87, NT_STATUS_UNABLE_TO_FREE_VM}, { ++ ERRDOS, 87, NT_STATUS_UNABLE_TO_DELETE_SECTION}, { ++ ERRDOS, 2142, NT_STATUS_INVALID_SYSTEM_SERVICE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ILLEGAL_INSTRUCTION}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_INVALID_LOCK_SEQUENCE}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_INVALID_VIEW_SIZE}, { ++ ERRDOS, 193, NT_STATUS_INVALID_FILE_FOR_SECTION}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_ALREADY_COMMITTED}, ++/* { This NT error code was 'sqashed' ++ from NT_STATUS_ACCESS_DENIED to NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE ++ during the session setup } */ ++ { ++ ERRDOS, ERRnoaccess, NT_STATUS_ACCESS_DENIED}, { ++ ERRDOS, 111, NT_STATUS_BUFFER_TOO_SMALL}, { ++ ERRDOS, ERRbadfid, NT_STATUS_OBJECT_TYPE_MISMATCH}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NONCONTINUABLE_EXCEPTION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_DISPOSITION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNWIND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_STACK}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_UNWIND_TARGET}, { ++ ERRDOS, 158, NT_STATUS_NOT_LOCKED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PARITY_ERROR}, { ++ ERRDOS, 487, NT_STATUS_UNABLE_TO_DECOMMIT_VM}, { ++ ERRDOS, 487, NT_STATUS_NOT_COMMITTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_PORT_ATTRIBUTES}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PORT_MESSAGE_TOO_LONG}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_MIX}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_QUOTA_LOWER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DISK_CORRUPT_ERROR}, { ++ ERRDOS, ERRbadfile, NT_STATUS_OBJECT_NAME_INVALID}, { /* mapping changed since shell does lookup on * and expects file not found */ ++ ERRDOS, ERRbadfile, NT_STATUS_OBJECT_NAME_NOT_FOUND}, { ++ ERRDOS, ERRalreadyexists, NT_STATUS_OBJECT_NAME_COLLISION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_HANDLE_NOT_WAITABLE}, { ++ ERRDOS, ERRbadfid, NT_STATUS_PORT_DISCONNECTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DEVICE_ALREADY_ATTACHED}, { ++ ERRDOS, 161, NT_STATUS_OBJECT_PATH_INVALID}, { ++ ERRDOS, ERRbadpath, NT_STATUS_OBJECT_PATH_NOT_FOUND}, { ++ ERRDOS, 161, NT_STATUS_OBJECT_PATH_SYNTAX_BAD}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DATA_OVERRUN}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DATA_LATE_ERROR}, { ++ ERRDOS, 23, NT_STATUS_DATA_ERROR}, { ++ ERRDOS, 23, NT_STATUS_CRC_ERROR}, { ++ ERRDOS, ERRnomem, NT_STATUS_SECTION_TOO_BIG}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_PORT_CONNECTION_REFUSED}, { ++ ERRDOS, ERRbadfid, NT_STATUS_INVALID_PORT_HANDLE}, { ++ ERRDOS, ERRbadshare, NT_STATUS_SHARING_VIOLATION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_QUOTA_EXCEEDED}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PAGE_PROTECTION}, { ++ ERRDOS, 288, NT_STATUS_MUTANT_NOT_OWNED}, { ++ ERRDOS, 298, NT_STATUS_SEMAPHORE_LIMIT_EXCEEDED}, { ++ ERRDOS, 87, NT_STATUS_PORT_ALREADY_SET}, { ++ ERRDOS, 87, NT_STATUS_SECTION_NOT_IMAGE}, { ++ ERRDOS, 156, NT_STATUS_SUSPEND_COUNT_EXCEEDED}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_THREAD_IS_TERMINATING}, { ++ ERRDOS, 87, NT_STATUS_BAD_WORKING_SET_LIMIT}, { ++ ERRDOS, 87, NT_STATUS_INCOMPATIBLE_FILE_MAP}, { ++ ERRDOS, 87, NT_STATUS_SECTION_PROTECTION}, { ++ ERRDOS, 282, NT_STATUS_EAS_NOT_SUPPORTED}, { ++ ERRDOS, 255, NT_STATUS_EA_TOO_LARGE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NONEXISTENT_EA_ENTRY}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_EAS_ON_FILE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_EA_CORRUPT_ERROR}, { ++ ERRDOS, ERRlock, NT_STATUS_FILE_LOCK_CONFLICT}, { ++ ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED}, { ++ ERRDOS, ERRbadfile, NT_STATUS_DELETE_PENDING}, { ++ ERRDOS, ERRunsup, NT_STATUS_CTL_FILE_NOT_SUPPORTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNKNOWN_REVISION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_REVISION_MISMATCH}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_OWNER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_PRIMARY_GROUP}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_IMPERSONATION_TOKEN}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CANT_DISABLE_MANDATORY}, { ++ ERRDOS, 2215, NT_STATUS_NO_LOGON_SERVERS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_SUCH_LOGON_SESSION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_SUCH_PRIVILEGE}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_PRIVILEGE_NOT_HELD}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_ACCOUNT_NAME}, { ++ ERRHRD, ERRgeneral, NT_STATUS_USER_EXISTS}, ++/* { This NT error code was 'sqashed' ++ from NT_STATUS_NO_SUCH_USER to NT_STATUS_LOGON_FAILURE ++ during the session setup } */ ++ { ++ ERRDOS, ERRnoaccess, NT_STATUS_NO_SUCH_USER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_GROUP_EXISTS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_SUCH_GROUP}, { ++ ERRHRD, ERRgeneral, NT_STATUS_MEMBER_IN_GROUP}, { ++ ERRHRD, ERRgeneral, NT_STATUS_MEMBER_NOT_IN_GROUP}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LAST_ADMIN}, ++/* { This NT error code was 'sqashed' ++ from NT_STATUS_WRONG_PASSWORD to NT_STATUS_LOGON_FAILURE ++ during the session setup } */ ++ { ++ ERRSRV, ERRbadpw, NT_STATUS_WRONG_PASSWORD}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ILL_FORMED_PASSWORD}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PASSWORD_RESTRICTION}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_LOGON_FAILURE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ACCOUNT_RESTRICTION}, { ++ ERRSRV, 2241, NT_STATUS_INVALID_LOGON_HOURS}, { ++ ERRSRV, 2240, NT_STATUS_INVALID_WORKSTATION}, { ++ ERRSRV, 2242, NT_STATUS_PASSWORD_EXPIRED}, { ++ ERRSRV, 2239, NT_STATUS_ACCOUNT_DISABLED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NONE_MAPPED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_TOO_MANY_LUIDS_REQUESTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LUIDS_EXHAUSTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_SUB_AUTHORITY}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_ACL}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_SID}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_SECURITY_DESCR}, { ++ ERRDOS, 127, NT_STATUS_PROCEDURE_NOT_FOUND}, { ++ ERRDOS, 193, NT_STATUS_INVALID_IMAGE_FORMAT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_TOKEN}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_INHERITANCE_ACL}, { ++ ERRDOS, 158, NT_STATUS_RANGE_NOT_LOCKED}, { ++ ERRDOS, 112, NT_STATUS_DISK_FULL}, { ++ ERRHRD, ERRgeneral, NT_STATUS_SERVER_DISABLED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_SERVER_NOT_DISABLED}, { ++ ERRDOS, 68, NT_STATUS_TOO_MANY_GUIDS_REQUESTED}, { ++ ERRDOS, 259, NT_STATUS_GUIDS_EXHAUSTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_ID_AUTHORITY}, { ++ ERRDOS, 259, NT_STATUS_AGENTS_EXHAUSTED}, { ++ ERRDOS, 154, NT_STATUS_INVALID_VOLUME_LABEL}, { ++ ERRDOS, 14, NT_STATUS_SECTION_NOT_EXTENDED}, { ++ ERRDOS, 487, NT_STATUS_NOT_MAPPED_DATA}, { ++ ERRHRD, ERRgeneral, NT_STATUS_RESOURCE_DATA_NOT_FOUND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_RESOURCE_TYPE_NOT_FOUND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_RESOURCE_NAME_NOT_FOUND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ARRAY_BOUNDS_EXCEEDED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOAT_DENORMAL_OPERAND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOAT_DIVIDE_BY_ZERO}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOAT_INEXACT_RESULT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOAT_INVALID_OPERATION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOAT_OVERFLOW}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOAT_STACK_CHECK}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOAT_UNDERFLOW}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INTEGER_DIVIDE_BY_ZERO}, { ++ ERRDOS, 534, NT_STATUS_INTEGER_OVERFLOW}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PRIVILEGED_INSTRUCTION}, { ++ ERRDOS, ERRnomem, NT_STATUS_TOO_MANY_PAGING_FILES}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FILE_INVALID}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ALLOTTED_SPACE_EXCEEDED}, ++/* { This NT error code was 'sqashed' ++ from NT_STATUS_INSUFFICIENT_RESOURCES to NT_STATUS_INSUFF_SERVER_RESOURCES ++ during the session setup } */ ++ { ++ ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES}, { ++ ERRDOS, ERRbadpath, NT_STATUS_DFS_EXIT_PATH_FOUND}, { ++ ERRDOS, 23, NT_STATUS_DEVICE_DATA_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DEVICE_NOT_CONNECTED}, { ++ ERRDOS, 21, NT_STATUS_DEVICE_POWER_FAILURE}, { ++ ERRDOS, 487, NT_STATUS_FREE_VM_NOT_AT_BASE}, { ++ ERRDOS, 487, NT_STATUS_MEMORY_NOT_ALLOCATED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_WORKING_SET_QUOTA}, { ++ ERRDOS, 19, NT_STATUS_MEDIA_WRITE_PROTECTED}, { ++ ERRDOS, 21, NT_STATUS_DEVICE_NOT_READY}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_GROUP_ATTRIBUTES}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_IMPERSONATION_LEVEL}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CANT_OPEN_ANONYMOUS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_VALIDATION_CLASS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_TOKEN_TYPE}, { ++ ERRDOS, 87, NT_STATUS_BAD_MASTER_BOOT_RECORD}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INSTRUCTION_MISALIGNMENT}, { ++ ERRDOS, ERRpipebusy, NT_STATUS_INSTANCE_NOT_AVAILABLE}, { ++ ERRDOS, ERRpipebusy, NT_STATUS_PIPE_NOT_AVAILABLE}, { ++ ERRDOS, ERRbadpipe, NT_STATUS_INVALID_PIPE_STATE}, { ++ ERRDOS, ERRpipebusy, NT_STATUS_PIPE_BUSY}, { ++ ERRDOS, ERRbadfunc, NT_STATUS_ILLEGAL_FUNCTION}, { ++ ERRDOS, ERRnotconnected, NT_STATUS_PIPE_DISCONNECTED}, { ++ ERRDOS, ERRpipeclosing, NT_STATUS_PIPE_CLOSING}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PIPE_CONNECTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PIPE_LISTENING}, { ++ ERRDOS, ERRbadpipe, NT_STATUS_INVALID_READ_MODE}, { ++ ERRDOS, 121, NT_STATUS_IO_TIMEOUT}, { ++ ERRDOS, 38, NT_STATUS_FILE_FORCED_CLOSED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PROFILING_NOT_STARTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PROFILING_NOT_STOPPED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_COULD_NOT_INTERPRET}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_FILE_IS_A_DIRECTORY}, { ++ ERRDOS, ERRunsup, NT_STATUS_NOT_SUPPORTED}, { ++ ERRDOS, 51, NT_STATUS_REMOTE_NOT_LISTENING}, { ++ ERRDOS, 52, NT_STATUS_DUPLICATE_NAME}, { ++ ERRDOS, 53, NT_STATUS_BAD_NETWORK_PATH}, { ++ ERRDOS, 54, NT_STATUS_NETWORK_BUSY}, { ++ ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST}, { ++ ERRDOS, 56, NT_STATUS_TOO_MANY_COMMANDS}, { ++ ERRDOS, 57, NT_STATUS_ADAPTER_HARDWARE_ERROR}, { ++ ERRDOS, 58, NT_STATUS_INVALID_NETWORK_RESPONSE}, { ++ ERRDOS, 59, NT_STATUS_UNEXPECTED_NETWORK_ERROR}, { ++ ERRDOS, 60, NT_STATUS_BAD_REMOTE_ADAPTER}, { ++ ERRDOS, 61, NT_STATUS_PRINT_QUEUE_FULL}, { ++ ERRDOS, 62, NT_STATUS_NO_SPOOL_SPACE}, { ++ ERRDOS, 63, NT_STATUS_PRINT_CANCELLED}, { ++ ERRDOS, 64, NT_STATUS_NETWORK_NAME_DELETED}, { ++ ERRDOS, 65, NT_STATUS_NETWORK_ACCESS_DENIED}, { ++ ERRDOS, 66, NT_STATUS_BAD_DEVICE_TYPE}, { ++ ERRDOS, ERRnosuchshare, NT_STATUS_BAD_NETWORK_NAME}, { ++ ERRDOS, 68, NT_STATUS_TOO_MANY_NAMES}, { ++ ERRDOS, 69, NT_STATUS_TOO_MANY_SESSIONS}, { ++ ERRDOS, 70, NT_STATUS_SHARING_PAUSED}, { ++ ERRDOS, 71, NT_STATUS_REQUEST_NOT_ACCEPTED}, { ++ ERRDOS, 72, NT_STATUS_REDIRECTOR_PAUSED}, { ++ ERRDOS, 88, NT_STATUS_NET_WRITE_FAULT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PROFILING_AT_LIMIT}, { ++ ERRDOS, ERRdiffdevice, NT_STATUS_NOT_SAME_DEVICE}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_FILE_RENAMED}, { ++ ERRDOS, 240, NT_STATUS_VIRTUAL_CIRCUIT_CLOSED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_SECURITY_ON_OBJECT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CANT_WAIT}, { ++ ERRDOS, ERRpipeclosing, NT_STATUS_PIPE_EMPTY}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CANT_ACCESS_DOMAIN_INFO}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CANT_TERMINATE_SELF}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_SERVER_STATE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_DOMAIN_STATE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_DOMAIN_ROLE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_SUCH_DOMAIN}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DOMAIN_EXISTS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DOMAIN_LIMIT_EXCEEDED}, { ++ ERRDOS, 300, NT_STATUS_OPLOCK_NOT_GRANTED}, { ++ ERRDOS, 301, NT_STATUS_INVALID_OPLOCK_PROTOCOL}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INTERNAL_DB_CORRUPTION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INTERNAL_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_GENERIC_NOT_MAPPED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_DESCRIPTOR_FORMAT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_USER_BUFFER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNEXPECTED_IO_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNEXPECTED_MM_CREATE_ERR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNEXPECTED_MM_MAP_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNEXPECTED_MM_EXTEND_ERR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NOT_LOGON_PROCESS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LOGON_SESSION_EXISTS}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_1}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_2}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_3}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_4}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_5}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_6}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_7}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_8}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_9}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_10}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_11}, { ++ ERRDOS, 87, NT_STATUS_INVALID_PARAMETER_12}, { ++ ERRDOS, ERRbadpath, NT_STATUS_REDIRECTOR_NOT_STARTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_REDIRECTOR_STARTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_STACK_OVERFLOW}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_SUCH_PACKAGE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_FUNCTION_TABLE}, { ++ ERRDOS, 203, 0xc0000100}, { ++ ERRDOS, 145, NT_STATUS_DIRECTORY_NOT_EMPTY}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FILE_CORRUPT_ERROR}, { ++ ERRDOS, 267, NT_STATUS_NOT_A_DIRECTORY}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_LOGON_SESSION_STATE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LOGON_SESSION_COLLISION}, { ++ ERRDOS, 206, NT_STATUS_NAME_TOO_LONG}, { ++ ERRDOS, 2401, NT_STATUS_FILES_OPEN}, { ++ ERRDOS, 2404, NT_STATUS_CONNECTION_IN_USE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_MESSAGE_NOT_FOUND}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_PROCESS_IS_TERMINATING}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_LOGON_TYPE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_GUID_TRANSLATION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CANNOT_IMPERSONATE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_IMAGE_ALREADY_LOADED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ABIOS_NOT_PRESENT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ABIOS_LID_NOT_EXIST}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ABIOS_LID_ALREADY_OWNED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ABIOS_NOT_LID_OWNER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ABIOS_INVALID_COMMAND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ABIOS_INVALID_LID}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ABIOS_SELECTOR_NOT_AVAILABLE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ABIOS_INVALID_SELECTOR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_LDT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_LDT_SIZE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_LDT_OFFSET}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_LDT_DESCRIPTOR}, { ++ ERRDOS, 193, NT_STATUS_INVALID_IMAGE_NE_FORMAT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_RXACT_INVALID_STATE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_RXACT_COMMIT_FAILURE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_MAPPED_FILE_SIZE_ZERO}, { ++ ERRDOS, ERRnofids, NT_STATUS_TOO_MANY_OPENED_FILES}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CANCELLED}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_CANNOT_DELETE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_COMPUTER_NAME}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_FILE_DELETED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_SPECIAL_ACCOUNT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_SPECIAL_GROUP}, { ++ ERRHRD, ERRgeneral, NT_STATUS_SPECIAL_USER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_MEMBERS_PRIMARY_GROUP}, { ++ ERRDOS, ERRbadfid, NT_STATUS_FILE_CLOSED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_TOO_MANY_THREADS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_THREAD_NOT_IN_PROCESS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_TOKEN_ALREADY_IN_USE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PAGEFILE_QUOTA_EXCEEDED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_COMMITMENT_LIMIT}, { ++ ERRDOS, 193, NT_STATUS_INVALID_IMAGE_LE_FORMAT}, { ++ ERRDOS, 193, NT_STATUS_INVALID_IMAGE_NOT_MZ}, { ++ ERRDOS, 193, NT_STATUS_INVALID_IMAGE_PROTECT}, { ++ ERRDOS, 193, NT_STATUS_INVALID_IMAGE_WIN_16}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LOGON_SERVER_CONFLICT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_TIME_DIFFERENCE_AT_DC}, { ++ ERRHRD, ERRgeneral, NT_STATUS_SYNCHRONIZATION_REQUIRED}, { ++ ERRDOS, 126, NT_STATUS_DLL_NOT_FOUND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_OPEN_FAILED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_IO_PRIVILEGE_FAILED}, { ++ ERRDOS, 182, NT_STATUS_ORDINAL_NOT_FOUND}, { ++ ERRDOS, 127, NT_STATUS_ENTRYPOINT_NOT_FOUND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CONTROL_C_EXIT}, { ++ ERRDOS, 64, NT_STATUS_LOCAL_DISCONNECT}, { ++ ERRDOS, 64, NT_STATUS_REMOTE_DISCONNECT}, { ++ ERRDOS, 51, NT_STATUS_REMOTE_RESOURCES}, { ++ ERRDOS, 59, NT_STATUS_LINK_FAILED}, { ++ ERRDOS, 59, NT_STATUS_LINK_TIMEOUT}, { ++ ERRDOS, 59, NT_STATUS_INVALID_CONNECTION}, { ++ ERRDOS, 59, NT_STATUS_INVALID_ADDRESS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DLL_INIT_FAILED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_MISSING_SYSTEMFILE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNHANDLED_EXCEPTION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_APP_INIT_FAILURE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PAGEFILE_CREATE_FAILED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_PAGEFILE}, { ++ ERRDOS, 124, NT_STATUS_INVALID_LEVEL}, { ++ ERRDOS, 86, NT_STATUS_WRONG_PASSWORD_CORE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ILLEGAL_FLOAT_CONTEXT}, { ++ ERRDOS, 109, NT_STATUS_PIPE_BROKEN}, { ++ ERRHRD, ERRgeneral, NT_STATUS_REGISTRY_CORRUPT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_REGISTRY_IO_FAILED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_EVENT_PAIR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNRECOGNIZED_VOLUME}, { ++ ERRHRD, ERRgeneral, NT_STATUS_SERIAL_NO_DEVICE_INITED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_SUCH_ALIAS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_MEMBER_NOT_IN_ALIAS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_MEMBER_IN_ALIAS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ALIAS_EXISTS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LOGON_NOT_GRANTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_TOO_MANY_SECRETS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_SECRET_TOO_LONG}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INTERNAL_DB_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FULLSCREEN_MODE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_TOO_MANY_CONTEXT_IDS}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_LOGON_TYPE_NOT_GRANTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NOT_REGISTRY_FILE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NT_CROSS_ENCRYPTION_REQUIRED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DOMAIN_CTRLR_CONFIG_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FT_MISSING_MEMBER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ILL_FORMED_SERVICE_ENTRY}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ILLEGAL_CHARACTER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNMAPPABLE_CHARACTER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNDEFINED_CHARACTER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOPPY_VOLUME}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOPPY_ID_MARK_NOT_FOUND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOPPY_WRONG_CYLINDER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOPPY_UNKNOWN_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FLOPPY_BAD_REGISTERS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DISK_RECALIBRATE_FAILED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DISK_OPERATION_FAILED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DISK_RESET_FAILED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_SHARED_IRQ_BUSY}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FT_ORPHANING}, { ++ ERRHRD, ERRgeneral, 0xc000016e}, { ++ ERRHRD, ERRgeneral, 0xc000016f}, { ++ ERRHRD, ERRgeneral, 0xc0000170}, { ++ ERRHRD, ERRgeneral, 0xc0000171}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PARTITION_FAILURE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_BLOCK_LENGTH}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DEVICE_NOT_PARTITIONED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNABLE_TO_LOCK_MEDIA}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNABLE_TO_UNLOAD_MEDIA}, { ++ ERRHRD, ERRgeneral, NT_STATUS_EOM_OVERFLOW}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_MEDIA}, { ++ ERRHRD, ERRgeneral, 0xc0000179}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_SUCH_MEMBER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_MEMBER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_KEY_DELETED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_LOG_SPACE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_TOO_MANY_SIDS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_KEY_HAS_CHILDREN}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CHILD_MUST_BE_VOLATILE}, { ++ ERRDOS, 87, NT_STATUS_DEVICE_CONFIGURATION_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DRIVER_INTERNAL_ERROR}, { ++ ERRDOS, 22, NT_STATUS_INVALID_DEVICE_STATE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_IO_DEVICE_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DEVICE_PROTOCOL_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BACKUP_CONTROLLER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LOG_FILE_FULL}, { ++ ERRDOS, 19, NT_STATUS_TOO_LATE}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_NO_TRUST_LSA_SECRET}, ++/* { This NT error code was 'sqashed' ++ from NT_STATUS_NO_TRUST_SAM_ACCOUNT to NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE ++ during the session setup } */ ++ { ++ ERRDOS, ERRnoaccess, NT_STATUS_NO_TRUST_SAM_ACCOUNT}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_TRUSTED_DOMAIN_FAILURE}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_EVENTLOG_FILE_CORRUPT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_EVENTLOG_CANT_START}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_TRUST_FAILURE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_MUTANT_LIMIT_EXCEEDED}, { ++ ERRDOS, ERRnetlogonNotStarted, NT_STATUS_NETLOGON_NOT_STARTED}, { ++ ERRSRV, 2239, NT_STATUS_ACCOUNT_EXPIRED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_POSSIBLE_DEADLOCK}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NETWORK_CREDENTIAL_CONFLICT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_REMOTE_SESSION_LIMIT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_EVENTLOG_FILE_CHANGED}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT}, ++/* { This NT error code was 'sqashed' ++ from NT_STATUS_DOMAIN_TRUST_INCONSISTENT to NT_STATUS_LOGON_FAILURE ++ during the session setup } */ ++ { ++ ERRDOS, ERRnoaccess, NT_STATUS_DOMAIN_TRUST_INCONSISTENT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FS_DRIVER_REQUIRED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_USER_SESSION_KEY}, { ++ ERRDOS, 59, NT_STATUS_USER_SESSION_DELETED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_RESOURCE_LANG_NOT_FOUND}, { ++ ERRDOS, ERRnomem, NT_STATUS_INSUFF_SERVER_RESOURCES}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_BUFFER_SIZE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_ADDRESS_COMPONENT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_ADDRESS_WILDCARD}, { ++ ERRDOS, 68, NT_STATUS_TOO_MANY_ADDRESSES}, { ++ ERRDOS, 52, NT_STATUS_ADDRESS_ALREADY_EXISTS}, { ++ ERRDOS, 64, NT_STATUS_ADDRESS_CLOSED}, { ++ ERRDOS, 64, NT_STATUS_CONNECTION_DISCONNECTED}, { ++ ERRDOS, 64, NT_STATUS_CONNECTION_RESET}, { ++ ERRDOS, 68, NT_STATUS_TOO_MANY_NODES}, { ++ ERRDOS, 59, NT_STATUS_TRANSACTION_ABORTED}, { ++ ERRDOS, 59, NT_STATUS_TRANSACTION_TIMED_OUT}, { ++ ERRDOS, 59, NT_STATUS_TRANSACTION_NO_RELEASE}, { ++ ERRDOS, 59, NT_STATUS_TRANSACTION_NO_MATCH}, { ++ ERRDOS, 59, NT_STATUS_TRANSACTION_RESPONDED}, { ++ ERRDOS, 59, NT_STATUS_TRANSACTION_INVALID_ID}, { ++ ERRDOS, 59, NT_STATUS_TRANSACTION_INVALID_TYPE}, { ++ ERRDOS, ERRunsup, NT_STATUS_NOT_SERVER_SESSION}, { ++ ERRDOS, ERRunsup, NT_STATUS_NOT_CLIENT_SESSION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CANNOT_LOAD_REGISTRY_FILE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DEBUG_ATTACH_FAILED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_SYSTEM_PROCESS_TERMINATED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DATA_NOT_ACCEPTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_BROWSER_SERVERS_FOUND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_VDM_HARD_ERROR}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DRIVER_CANCEL_TIMEOUT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_REPLY_MESSAGE_MISMATCH}, { ++ ERRHRD, ERRgeneral, NT_STATUS_MAPPED_ALIGNMENT}, { ++ ERRDOS, 193, NT_STATUS_IMAGE_CHECKSUM_MISMATCH}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LOST_WRITEBEHIND_DATA}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CLIENT_SERVER_PARAMETERS_INVALID}, { ++ ERRSRV, 2242, NT_STATUS_PASSWORD_MUST_CHANGE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NOT_FOUND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NOT_TINY_STREAM}, { ++ ERRHRD, ERRgeneral, NT_STATUS_RECOVERY_FAILURE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_STACK_OVERFLOW_READ}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FAIL_CHECK}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DUPLICATE_OBJECTID}, { ++ ERRHRD, ERRgeneral, NT_STATUS_OBJECTID_EXISTS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CONVERT_TO_LARGE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_RETRY}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FOUND_OUT_OF_SCOPE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ALLOCATE_BUCKET}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PROPSET_NOT_FOUND}, { ++ ERRHRD, ERRgeneral, NT_STATUS_MARSHALL_OVERFLOW}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_VARIANT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND}, { ++ ERRDOS, ERRnoaccess, NT_STATUS_ACCOUNT_LOCKED_OUT}, { ++ ERRDOS, ERRbadfid, NT_STATUS_HANDLE_NOT_CLOSABLE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_REFUSED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_GRACEFUL_DISCONNECT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_ADDRESS_NOT_ASSOCIATED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_INVALID}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ACTIVE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NETWORK_UNREACHABLE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_HOST_UNREACHABLE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PROTOCOL_UNREACHABLE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PORT_UNREACHABLE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_REQUEST_ABORTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_COMPRESSION_BUFFER}, { ++ ERRHRD, ERRgeneral, NT_STATUS_USER_MAPPED_FILE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_AUDIT_FAILED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_TIMER_RESOLUTION_NOT_SET}, { ++ ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_COUNT_LIMIT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LOGIN_TIME_RESTRICTION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LOGIN_WKSTA_RESTRICTION}, { ++ ERRDOS, 193, NT_STATUS_IMAGE_MP_UP_MISMATCH}, { ++ ERRHRD, ERRgeneral, 0xc000024a}, { ++ ERRHRD, ERRgeneral, 0xc000024b}, { ++ ERRHRD, ERRgeneral, 0xc000024c}, { ++ ERRHRD, ERRgeneral, 0xc000024d}, { ++ ERRHRD, ERRgeneral, 0xc000024e}, { ++ ERRHRD, ERRgeneral, 0xc000024f}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INSUFFICIENT_LOGON_INFO}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_DLL_ENTRYPOINT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_BAD_SERVICE_ENTRYPOINT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LPC_REPLY_LOST}, { ++ ERRHRD, ERRgeneral, NT_STATUS_IP_ADDRESS_CONFLICT1}, { ++ ERRHRD, ERRgeneral, NT_STATUS_IP_ADDRESS_CONFLICT2}, { ++ ERRHRD, ERRgeneral, NT_STATUS_REGISTRY_QUOTA_LIMIT}, { ++ ERRSRV, 3, NT_STATUS_PATH_NOT_COVERED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_NO_CALLBACK_ACTIVE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_LICENSE_QUOTA_EXCEEDED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PWD_TOO_SHORT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PWD_TOO_RECENT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PWD_HISTORY_CONFLICT}, { ++ ERRHRD, ERRgeneral, 0xc000025d}, { ++ ERRHRD, ERRgeneral, NT_STATUS_PLUGPLAY_NO_DEVICE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_UNSUPPORTED_COMPRESSION}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_HW_PROFILE}, { ++ ERRHRD, ERRgeneral, NT_STATUS_INVALID_PLUGPLAY_DEVICE_PATH}, { ++ ERRDOS, 182, NT_STATUS_DRIVER_ORDINAL_NOT_FOUND}, { ++ ERRDOS, 127, NT_STATUS_DRIVER_ENTRYPOINT_NOT_FOUND}, { ++ ERRDOS, 288, NT_STATUS_RESOURCE_NOT_OWNED}, { ++ ERRHRD, ERRgeneral, NT_STATUS_TOO_MANY_LINKS}, { ++ ERRHRD, ERRgeneral, NT_STATUS_QUOTA_LIST_INCONSISTENT}, { ++ ERRHRD, ERRgeneral, NT_STATUS_FILE_IS_OFFLINE}, { ++ ERRDOS, 21, 0xc000026e}, { ++ ERRDOS, 161, 0xc0000281}, { ++ ERRDOS, ERRnoaccess, 0xc000028a}, { ++ ERRDOS, ERRnoaccess, 0xc000028b}, { ++ ERRHRD, ERRgeneral, 0xc000028c}, { ++ ERRDOS, ERRnoaccess, 0xc000028d}, { ++ ERRDOS, ERRnoaccess, 0xc000028e}, { ++ ERRDOS, ERRnoaccess, 0xc000028f}, { ++ ERRDOS, ERRnoaccess, 0xc0000290}, { ++ERRDOS, ERRbadfunc, 0xc000029c},}; ++ ++/***************************************************************************** ++ Print an error message from the status code ++ *****************************************************************************/ ++static void ++cifs_print_status(__u32 status_code) ++{ ++ int idx = 0; ++ ++ while (nt_errs[idx].nt_errstr != NULL) { ++ if (((nt_errs[idx].nt_errcode) & 0xFFFFFF) == ++ (status_code & 0xFFFFFF)) { ++ printk(KERN_NOTICE "Status code returned 0x%08x %s\n", ++ status_code,nt_errs[idx].nt_errstr); ++ } ++ idx++; ++ } ++ return; ++} ++ ++ ++static void ++ntstatus_to_dos(__u32 ntstatus, __u8 * eclass, __u16 * ecode) ++{ ++ int i; ++ if (ntstatus == 0) { ++ *eclass = 0; ++ *ecode = 0; ++ return; ++ } ++ for (i = 0; ntstatus_to_dos_map[i].ntstatus; i++) { ++ if (ntstatus == ntstatus_to_dos_map[i].ntstatus) { ++ *eclass = ntstatus_to_dos_map[i].dos_class; ++ *ecode = ntstatus_to_dos_map[i].dos_code; ++ return; ++ } ++ } ++ *eclass = ERRHRD; ++ *ecode = ERRgeneral; ++} ++ ++int ++map_smb_to_linux_error(struct smb_hdr *smb) ++{ ++ unsigned int i; ++ int rc = -EIO; /* if transport error smb error may not be set */ ++ __u8 smberrclass; ++ __u16 smberrcode; ++ ++ /* BB if NT Status codes - map NT BB */ ++ ++ /* old style smb error codes */ ++ if (smb->Status.CifsError == 0) ++ return 0; ++ ++ if (smb->Flags2 & SMBFLG2_ERR_STATUS) { ++ /* translate the newer STATUS codes to old style errors and then to POSIX errors */ ++ smb->Status.CifsError = le32_to_cpu(smb->Status.CifsError); ++ if(cifsFYI) ++ cifs_print_status(smb->Status.CifsError); ++ ntstatus_to_dos(smb->Status.CifsError, &smberrclass, ++ &smberrcode); ++ } else { ++ smberrclass = smb->Status.DosError.ErrorClass; ++ smb->Status.DosError.Error = ++ le16_to_cpu(smb->Status.DosError.Error); ++ smberrcode = smb->Status.DosError.Error; ++ } ++ ++ /* old style errors */ ++ ++ /* DOS class smb error codes - map DOS */ ++ if (smberrclass == ERRDOS) { /* one byte field no need to byte reverse */ ++ for (i = 0; ++ i < ++ sizeof (mapping_table_ERRDOS) / ++ sizeof (struct smb_to_posix_error); i++) { ++ if (mapping_table_ERRDOS[i].smb_err == 0) ++ break; ++ else if (mapping_table_ERRDOS[i].smb_err == smberrcode) { ++ rc = mapping_table_ERRDOS[i].posix_code; ++ break; ++ } ++ /* else try the next error mapping one to see if it will match */ ++ } ++ } else if (smberrclass == ERRSRV) { /* server class of error codes */ ++ for (i = 0; ++ i < ++ sizeof (mapping_table_ERRSRV) / ++ sizeof (struct smb_to_posix_error); i++) { ++ if (mapping_table_ERRSRV[i].smb_err == 0) ++ break; ++ else if (mapping_table_ERRSRV[i].smb_err == smberrcode) { ++ rc = mapping_table_ERRSRV[i].posix_code; ++ break; ++ } ++ /* else try the next error mapping one to see if it will match */ ++ } ++ } ++ /* else ERRHRD class errors or junk - return EIO */ ++ ++ cFYI(1, (" !!Mapping smb error code %d to POSIX err %d !!", smberrcode,rc)); ++ ++ /* generic corrective action e.g. reconnect SMB session on ERRbaduid could be added */ ++ ++ return rc; ++} ++ ++/* ++ * calculate the size of the SMB message based on the fixed header ++ * portion, the number of word parameters and the data portion of the message ++ */ ++unsigned int ++smbCalcSize(struct smb_hdr *ptr) ++{ ++ return (sizeof (struct smb_hdr) + (2 * ptr->WordCount) + ++ BCC(ptr)); ++} ++ ++/* The following are taken from fs/ntfs/util.c */ ++ ++#define NTFS_TIME_OFFSET ((u64)(369*365 + 89) * 24 * 3600 * 10000000) ++ ++ /* ++ * Convert the NT UTC (based 1601-01-01, in hundred nanosecond units) ++ * into Unix UTC (based 1970-01-01, in seconds). ++ */ ++time_t ++cifs_NTtimeToUnix(__u64 ntutc) ++{ ++ /* BB what about the timezone? BB */ ++ ++ /* Subtract the NTFS time offset, then convert to 1s intervals. */ ++ u64 t; ++ ++ t = ntutc - NTFS_TIME_OFFSET; ++ do_div(t, 10000000); ++ return (time_t)t; ++} ++ ++/* Convert the Unix UTC into NT UTC. */ ++__u64 ++cifs_UnixTimeToNT(time_t t) ++{ ++ __u64 dce_time; ++ /* Convert to 100ns intervals and then add the NTFS time offset. */ ++ dce_time = (__u64) t * 10000000; ++ dce_time += NTFS_TIME_OFFSET; ++ return dce_time; ++} +diff -urN linux-2.4.29.old/fs/cifs/nterr.c linux-2.4.29/fs/cifs/nterr.c +--- linux-2.4.29.old/fs/cifs/nterr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/nterr.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,687 @@ ++/* ++ * Unix SMB/Netbios implementation. ++ * Version 1.9. ++ * RPC Pipe client / server routines ++ * Copyright (C) Luke Kenneth Casson Leighton 1997-2001. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ */ ++ ++/* NT error codes - see nterr.h */ ++#include <linux/types.h> ++#include <linux/fs.h> ++#include "nterr.h" ++ ++const struct nt_err_code_struct nt_errs[] = { ++ {"NT_STATUS_OK", NT_STATUS_OK}, ++ {"NT_STATUS_UNSUCCESSFUL", NT_STATUS_UNSUCCESSFUL}, ++ {"NT_STATUS_NOT_IMPLEMENTED", NT_STATUS_NOT_IMPLEMENTED}, ++ {"NT_STATUS_INVALID_INFO_CLASS", NT_STATUS_INVALID_INFO_CLASS}, ++ {"NT_STATUS_INFO_LENGTH_MISMATCH", NT_STATUS_INFO_LENGTH_MISMATCH}, ++ {"NT_STATUS_ACCESS_VIOLATION", NT_STATUS_ACCESS_VIOLATION}, ++ {"STATUS_BUFFER_OVERFLOW", STATUS_BUFFER_OVERFLOW}, ++ {"NT_STATUS_IN_PAGE_ERROR", NT_STATUS_IN_PAGE_ERROR}, ++ {"NT_STATUS_PAGEFILE_QUOTA", NT_STATUS_PAGEFILE_QUOTA}, ++ {"NT_STATUS_INVALID_HANDLE", NT_STATUS_INVALID_HANDLE}, ++ {"NT_STATUS_BAD_INITIAL_STACK", NT_STATUS_BAD_INITIAL_STACK}, ++ {"NT_STATUS_BAD_INITIAL_PC", NT_STATUS_BAD_INITIAL_PC}, ++ {"NT_STATUS_INVALID_CID", NT_STATUS_INVALID_CID}, ++ {"NT_STATUS_TIMER_NOT_CANCELED", NT_STATUS_TIMER_NOT_CANCELED}, ++ {"NT_STATUS_INVALID_PARAMETER", NT_STATUS_INVALID_PARAMETER}, ++ {"NT_STATUS_NO_SUCH_DEVICE", NT_STATUS_NO_SUCH_DEVICE}, ++ {"NT_STATUS_NO_SUCH_FILE", NT_STATUS_NO_SUCH_FILE}, ++ {"NT_STATUS_INVALID_DEVICE_REQUEST", ++ NT_STATUS_INVALID_DEVICE_REQUEST}, ++ {"NT_STATUS_END_OF_FILE", NT_STATUS_END_OF_FILE}, ++ {"NT_STATUS_WRONG_VOLUME", NT_STATUS_WRONG_VOLUME}, ++ {"NT_STATUS_NO_MEDIA_IN_DEVICE", NT_STATUS_NO_MEDIA_IN_DEVICE}, ++ {"NT_STATUS_UNRECOGNIZED_MEDIA", NT_STATUS_UNRECOGNIZED_MEDIA}, ++ {"NT_STATUS_NONEXISTENT_SECTOR", NT_STATUS_NONEXISTENT_SECTOR}, ++ {"NT_STATUS_MORE_PROCESSING_REQUIRED", ++ NT_STATUS_MORE_PROCESSING_REQUIRED}, ++ {"NT_STATUS_NO_MEMORY", NT_STATUS_NO_MEMORY}, ++ {"NT_STATUS_CONFLICTING_ADDRESSES", ++ NT_STATUS_CONFLICTING_ADDRESSES}, ++ {"NT_STATUS_NOT_MAPPED_VIEW", NT_STATUS_NOT_MAPPED_VIEW}, ++ {"NT_STATUS_UNABLE_TO_FREE_VM", NT_STATUS_UNABLE_TO_FREE_VM}, ++ {"NT_STATUS_UNABLE_TO_DELETE_SECTION", ++ NT_STATUS_UNABLE_TO_DELETE_SECTION}, ++ {"NT_STATUS_INVALID_SYSTEM_SERVICE", ++ NT_STATUS_INVALID_SYSTEM_SERVICE}, ++ {"NT_STATUS_ILLEGAL_INSTRUCTION", NT_STATUS_ILLEGAL_INSTRUCTION}, ++ {"NT_STATUS_INVALID_LOCK_SEQUENCE", ++ NT_STATUS_INVALID_LOCK_SEQUENCE}, ++ {"NT_STATUS_INVALID_VIEW_SIZE", NT_STATUS_INVALID_VIEW_SIZE}, ++ {"NT_STATUS_INVALID_FILE_FOR_SECTION", ++ NT_STATUS_INVALID_FILE_FOR_SECTION}, ++ {"NT_STATUS_ALREADY_COMMITTED", NT_STATUS_ALREADY_COMMITTED}, ++ {"NT_STATUS_ACCESS_DENIED", NT_STATUS_ACCESS_DENIED}, ++ {"NT_STATUS_BUFFER_TOO_SMALL", NT_STATUS_BUFFER_TOO_SMALL}, ++ {"NT_STATUS_OBJECT_TYPE_MISMATCH", NT_STATUS_OBJECT_TYPE_MISMATCH}, ++ {"NT_STATUS_NONCONTINUABLE_EXCEPTION", ++ NT_STATUS_NONCONTINUABLE_EXCEPTION}, ++ {"NT_STATUS_INVALID_DISPOSITION", NT_STATUS_INVALID_DISPOSITION}, ++ {"NT_STATUS_UNWIND", NT_STATUS_UNWIND}, ++ {"NT_STATUS_BAD_STACK", NT_STATUS_BAD_STACK}, ++ {"NT_STATUS_INVALID_UNWIND_TARGET", ++ NT_STATUS_INVALID_UNWIND_TARGET}, ++ {"NT_STATUS_NOT_LOCKED", NT_STATUS_NOT_LOCKED}, ++ {"NT_STATUS_PARITY_ERROR", NT_STATUS_PARITY_ERROR}, ++ {"NT_STATUS_UNABLE_TO_DECOMMIT_VM", ++ NT_STATUS_UNABLE_TO_DECOMMIT_VM}, ++ {"NT_STATUS_NOT_COMMITTED", NT_STATUS_NOT_COMMITTED}, ++ {"NT_STATUS_INVALID_PORT_ATTRIBUTES", ++ NT_STATUS_INVALID_PORT_ATTRIBUTES}, ++ {"NT_STATUS_PORT_MESSAGE_TOO_LONG", ++ NT_STATUS_PORT_MESSAGE_TOO_LONG}, ++ {"NT_STATUS_INVALID_PARAMETER_MIX", ++ NT_STATUS_INVALID_PARAMETER_MIX}, ++ {"NT_STATUS_INVALID_QUOTA_LOWER", NT_STATUS_INVALID_QUOTA_LOWER}, ++ {"NT_STATUS_DISK_CORRUPT_ERROR", NT_STATUS_DISK_CORRUPT_ERROR}, ++ {"NT_STATUS_OBJECT_NAME_INVALID", NT_STATUS_OBJECT_NAME_INVALID}, ++ {"NT_STATUS_OBJECT_NAME_NOT_FOUND", ++ NT_STATUS_OBJECT_NAME_NOT_FOUND}, ++ {"NT_STATUS_OBJECT_NAME_COLLISION", ++ NT_STATUS_OBJECT_NAME_COLLISION}, ++ {"NT_STATUS_HANDLE_NOT_WAITABLE", NT_STATUS_HANDLE_NOT_WAITABLE}, ++ {"NT_STATUS_PORT_DISCONNECTED", NT_STATUS_PORT_DISCONNECTED}, ++ {"NT_STATUS_DEVICE_ALREADY_ATTACHED", ++ NT_STATUS_DEVICE_ALREADY_ATTACHED}, ++ {"NT_STATUS_OBJECT_PATH_INVALID", NT_STATUS_OBJECT_PATH_INVALID}, ++ {"NT_STATUS_OBJECT_PATH_NOT_FOUND", ++ NT_STATUS_OBJECT_PATH_NOT_FOUND}, ++ {"NT_STATUS_OBJECT_PATH_SYNTAX_BAD", ++ NT_STATUS_OBJECT_PATH_SYNTAX_BAD}, ++ {"NT_STATUS_DATA_OVERRUN", NT_STATUS_DATA_OVERRUN}, ++ {"NT_STATUS_DATA_LATE_ERROR", NT_STATUS_DATA_LATE_ERROR}, ++ {"NT_STATUS_DATA_ERROR", NT_STATUS_DATA_ERROR}, ++ {"NT_STATUS_CRC_ERROR", NT_STATUS_CRC_ERROR}, ++ {"NT_STATUS_SECTION_TOO_BIG", NT_STATUS_SECTION_TOO_BIG}, ++ {"NT_STATUS_PORT_CONNECTION_REFUSED", ++ NT_STATUS_PORT_CONNECTION_REFUSED}, ++ {"NT_STATUS_INVALID_PORT_HANDLE", NT_STATUS_INVALID_PORT_HANDLE}, ++ {"NT_STATUS_SHARING_VIOLATION", NT_STATUS_SHARING_VIOLATION}, ++ {"NT_STATUS_QUOTA_EXCEEDED", NT_STATUS_QUOTA_EXCEEDED}, ++ {"NT_STATUS_INVALID_PAGE_PROTECTION", ++ NT_STATUS_INVALID_PAGE_PROTECTION}, ++ {"NT_STATUS_MUTANT_NOT_OWNED", NT_STATUS_MUTANT_NOT_OWNED}, ++ {"NT_STATUS_SEMAPHORE_LIMIT_EXCEEDED", ++ NT_STATUS_SEMAPHORE_LIMIT_EXCEEDED}, ++ {"NT_STATUS_PORT_ALREADY_SET", NT_STATUS_PORT_ALREADY_SET}, ++ {"NT_STATUS_SECTION_NOT_IMAGE", NT_STATUS_SECTION_NOT_IMAGE}, ++ {"NT_STATUS_SUSPEND_COUNT_EXCEEDED", ++ NT_STATUS_SUSPEND_COUNT_EXCEEDED}, ++ {"NT_STATUS_THREAD_IS_TERMINATING", ++ NT_STATUS_THREAD_IS_TERMINATING}, ++ {"NT_STATUS_BAD_WORKING_SET_LIMIT", ++ NT_STATUS_BAD_WORKING_SET_LIMIT}, ++ {"NT_STATUS_INCOMPATIBLE_FILE_MAP", ++ NT_STATUS_INCOMPATIBLE_FILE_MAP}, ++ {"NT_STATUS_SECTION_PROTECTION", NT_STATUS_SECTION_PROTECTION}, ++ {"NT_STATUS_EAS_NOT_SUPPORTED", NT_STATUS_EAS_NOT_SUPPORTED}, ++ {"NT_STATUS_EA_TOO_LARGE", NT_STATUS_EA_TOO_LARGE}, ++ {"NT_STATUS_NONEXISTENT_EA_ENTRY", NT_STATUS_NONEXISTENT_EA_ENTRY}, ++ {"NT_STATUS_NO_EAS_ON_FILE", NT_STATUS_NO_EAS_ON_FILE}, ++ {"NT_STATUS_EA_CORRUPT_ERROR", NT_STATUS_EA_CORRUPT_ERROR}, ++ {"NT_STATUS_FILE_LOCK_CONFLICT", NT_STATUS_FILE_LOCK_CONFLICT}, ++ {"NT_STATUS_LOCK_NOT_GRANTED", NT_STATUS_LOCK_NOT_GRANTED}, ++ {"NT_STATUS_DELETE_PENDING", NT_STATUS_DELETE_PENDING}, ++ {"NT_STATUS_CTL_FILE_NOT_SUPPORTED", ++ NT_STATUS_CTL_FILE_NOT_SUPPORTED}, ++ {"NT_STATUS_UNKNOWN_REVISION", NT_STATUS_UNKNOWN_REVISION}, ++ {"NT_STATUS_REVISION_MISMATCH", NT_STATUS_REVISION_MISMATCH}, ++ {"NT_STATUS_INVALID_OWNER", NT_STATUS_INVALID_OWNER}, ++ {"NT_STATUS_INVALID_PRIMARY_GROUP", ++ NT_STATUS_INVALID_PRIMARY_GROUP}, ++ {"NT_STATUS_NO_IMPERSONATION_TOKEN", ++ NT_STATUS_NO_IMPERSONATION_TOKEN}, ++ {"NT_STATUS_CANT_DISABLE_MANDATORY", ++ NT_STATUS_CANT_DISABLE_MANDATORY}, ++ {"NT_STATUS_NO_LOGON_SERVERS", NT_STATUS_NO_LOGON_SERVERS}, ++ {"NT_STATUS_NO_SUCH_LOGON_SESSION", ++ NT_STATUS_NO_SUCH_LOGON_SESSION}, ++ {"NT_STATUS_NO_SUCH_PRIVILEGE", NT_STATUS_NO_SUCH_PRIVILEGE}, ++ {"NT_STATUS_PRIVILEGE_NOT_HELD", NT_STATUS_PRIVILEGE_NOT_HELD}, ++ {"NT_STATUS_INVALID_ACCOUNT_NAME", NT_STATUS_INVALID_ACCOUNT_NAME}, ++ {"NT_STATUS_USER_EXISTS", NT_STATUS_USER_EXISTS}, ++ {"NT_STATUS_NO_SUCH_USER", NT_STATUS_NO_SUCH_USER}, ++ {"NT_STATUS_GROUP_EXISTS", NT_STATUS_GROUP_EXISTS}, ++ {"NT_STATUS_NO_SUCH_GROUP", NT_STATUS_NO_SUCH_GROUP}, ++ {"NT_STATUS_MEMBER_IN_GROUP", NT_STATUS_MEMBER_IN_GROUP}, ++ {"NT_STATUS_MEMBER_NOT_IN_GROUP", NT_STATUS_MEMBER_NOT_IN_GROUP}, ++ {"NT_STATUS_LAST_ADMIN", NT_STATUS_LAST_ADMIN}, ++ {"NT_STATUS_WRONG_PASSWORD", NT_STATUS_WRONG_PASSWORD}, ++ {"NT_STATUS_ILL_FORMED_PASSWORD", NT_STATUS_ILL_FORMED_PASSWORD}, ++ {"NT_STATUS_PASSWORD_RESTRICTION", NT_STATUS_PASSWORD_RESTRICTION}, ++ {"NT_STATUS_LOGON_FAILURE", NT_STATUS_LOGON_FAILURE}, ++ {"NT_STATUS_ACCOUNT_RESTRICTION", NT_STATUS_ACCOUNT_RESTRICTION}, ++ {"NT_STATUS_INVALID_LOGON_HOURS", NT_STATUS_INVALID_LOGON_HOURS}, ++ {"NT_STATUS_INVALID_WORKSTATION", NT_STATUS_INVALID_WORKSTATION}, ++ {"NT_STATUS_PASSWORD_EXPIRED", NT_STATUS_PASSWORD_EXPIRED}, ++ {"NT_STATUS_ACCOUNT_DISABLED", NT_STATUS_ACCOUNT_DISABLED}, ++ {"NT_STATUS_NONE_MAPPED", NT_STATUS_NONE_MAPPED}, ++ {"NT_STATUS_TOO_MANY_LUIDS_REQUESTED", ++ NT_STATUS_TOO_MANY_LUIDS_REQUESTED}, ++ {"NT_STATUS_LUIDS_EXHAUSTED", NT_STATUS_LUIDS_EXHAUSTED}, ++ {"NT_STATUS_INVALID_SUB_AUTHORITY", ++ NT_STATUS_INVALID_SUB_AUTHORITY}, ++ {"NT_STATUS_INVALID_ACL", NT_STATUS_INVALID_ACL}, ++ {"NT_STATUS_INVALID_SID", NT_STATUS_INVALID_SID}, ++ {"NT_STATUS_INVALID_SECURITY_DESCR", ++ NT_STATUS_INVALID_SECURITY_DESCR}, ++ {"NT_STATUS_PROCEDURE_NOT_FOUND", NT_STATUS_PROCEDURE_NOT_FOUND}, ++ {"NT_STATUS_INVALID_IMAGE_FORMAT", NT_STATUS_INVALID_IMAGE_FORMAT}, ++ {"NT_STATUS_NO_TOKEN", NT_STATUS_NO_TOKEN}, ++ {"NT_STATUS_BAD_INHERITANCE_ACL", NT_STATUS_BAD_INHERITANCE_ACL}, ++ {"NT_STATUS_RANGE_NOT_LOCKED", NT_STATUS_RANGE_NOT_LOCKED}, ++ {"NT_STATUS_DISK_FULL", NT_STATUS_DISK_FULL}, ++ {"NT_STATUS_SERVER_DISABLED", NT_STATUS_SERVER_DISABLED}, ++ {"NT_STATUS_SERVER_NOT_DISABLED", NT_STATUS_SERVER_NOT_DISABLED}, ++ {"NT_STATUS_TOO_MANY_GUIDS_REQUESTED", ++ NT_STATUS_TOO_MANY_GUIDS_REQUESTED}, ++ {"NT_STATUS_GUIDS_EXHAUSTED", NT_STATUS_GUIDS_EXHAUSTED}, ++ {"NT_STATUS_INVALID_ID_AUTHORITY", NT_STATUS_INVALID_ID_AUTHORITY}, ++ {"NT_STATUS_AGENTS_EXHAUSTED", NT_STATUS_AGENTS_EXHAUSTED}, ++ {"NT_STATUS_INVALID_VOLUME_LABEL", NT_STATUS_INVALID_VOLUME_LABEL}, ++ {"NT_STATUS_SECTION_NOT_EXTENDED", NT_STATUS_SECTION_NOT_EXTENDED}, ++ {"NT_STATUS_NOT_MAPPED_DATA", NT_STATUS_NOT_MAPPED_DATA}, ++ {"NT_STATUS_RESOURCE_DATA_NOT_FOUND", ++ NT_STATUS_RESOURCE_DATA_NOT_FOUND}, ++ {"NT_STATUS_RESOURCE_TYPE_NOT_FOUND", ++ NT_STATUS_RESOURCE_TYPE_NOT_FOUND}, ++ {"NT_STATUS_RESOURCE_NAME_NOT_FOUND", ++ NT_STATUS_RESOURCE_NAME_NOT_FOUND}, ++ {"NT_STATUS_ARRAY_BOUNDS_EXCEEDED", ++ NT_STATUS_ARRAY_BOUNDS_EXCEEDED}, ++ {"NT_STATUS_FLOAT_DENORMAL_OPERAND", ++ NT_STATUS_FLOAT_DENORMAL_OPERAND}, ++ {"NT_STATUS_FLOAT_DIVIDE_BY_ZERO", NT_STATUS_FLOAT_DIVIDE_BY_ZERO}, ++ {"NT_STATUS_FLOAT_INEXACT_RESULT", NT_STATUS_FLOAT_INEXACT_RESULT}, ++ {"NT_STATUS_FLOAT_INVALID_OPERATION", ++ NT_STATUS_FLOAT_INVALID_OPERATION}, ++ {"NT_STATUS_FLOAT_OVERFLOW", NT_STATUS_FLOAT_OVERFLOW}, ++ {"NT_STATUS_FLOAT_STACK_CHECK", NT_STATUS_FLOAT_STACK_CHECK}, ++ {"NT_STATUS_FLOAT_UNDERFLOW", NT_STATUS_FLOAT_UNDERFLOW}, ++ {"NT_STATUS_INTEGER_DIVIDE_BY_ZERO", ++ NT_STATUS_INTEGER_DIVIDE_BY_ZERO}, ++ {"NT_STATUS_INTEGER_OVERFLOW", NT_STATUS_INTEGER_OVERFLOW}, ++ {"NT_STATUS_PRIVILEGED_INSTRUCTION", ++ NT_STATUS_PRIVILEGED_INSTRUCTION}, ++ {"NT_STATUS_TOO_MANY_PAGING_FILES", ++ NT_STATUS_TOO_MANY_PAGING_FILES}, ++ {"NT_STATUS_FILE_INVALID", NT_STATUS_FILE_INVALID}, ++ {"NT_STATUS_ALLOTTED_SPACE_EXCEEDED", ++ NT_STATUS_ALLOTTED_SPACE_EXCEEDED}, ++ {"NT_STATUS_INSUFFICIENT_RESOURCES", ++ NT_STATUS_INSUFFICIENT_RESOURCES}, ++ {"NT_STATUS_DFS_EXIT_PATH_FOUND", NT_STATUS_DFS_EXIT_PATH_FOUND}, ++ {"NT_STATUS_DEVICE_DATA_ERROR", NT_STATUS_DEVICE_DATA_ERROR}, ++ {"NT_STATUS_DEVICE_NOT_CONNECTED", NT_STATUS_DEVICE_NOT_CONNECTED}, ++ {"NT_STATUS_DEVICE_POWER_FAILURE", NT_STATUS_DEVICE_POWER_FAILURE}, ++ {"NT_STATUS_FREE_VM_NOT_AT_BASE", NT_STATUS_FREE_VM_NOT_AT_BASE}, ++ {"NT_STATUS_MEMORY_NOT_ALLOCATED", NT_STATUS_MEMORY_NOT_ALLOCATED}, ++ {"NT_STATUS_WORKING_SET_QUOTA", NT_STATUS_WORKING_SET_QUOTA}, ++ {"NT_STATUS_MEDIA_WRITE_PROTECTED", ++ NT_STATUS_MEDIA_WRITE_PROTECTED}, ++ {"NT_STATUS_DEVICE_NOT_READY", NT_STATUS_DEVICE_NOT_READY}, ++ {"NT_STATUS_INVALID_GROUP_ATTRIBUTES", ++ NT_STATUS_INVALID_GROUP_ATTRIBUTES}, ++ {"NT_STATUS_BAD_IMPERSONATION_LEVEL", ++ NT_STATUS_BAD_IMPERSONATION_LEVEL}, ++ {"NT_STATUS_CANT_OPEN_ANONYMOUS", NT_STATUS_CANT_OPEN_ANONYMOUS}, ++ {"NT_STATUS_BAD_VALIDATION_CLASS", NT_STATUS_BAD_VALIDATION_CLASS}, ++ {"NT_STATUS_BAD_TOKEN_TYPE", NT_STATUS_BAD_TOKEN_TYPE}, ++ {"NT_STATUS_BAD_MASTER_BOOT_RECORD", ++ NT_STATUS_BAD_MASTER_BOOT_RECORD}, ++ {"NT_STATUS_INSTRUCTION_MISALIGNMENT", ++ NT_STATUS_INSTRUCTION_MISALIGNMENT}, ++ {"NT_STATUS_INSTANCE_NOT_AVAILABLE", ++ NT_STATUS_INSTANCE_NOT_AVAILABLE}, ++ {"NT_STATUS_PIPE_NOT_AVAILABLE", NT_STATUS_PIPE_NOT_AVAILABLE}, ++ {"NT_STATUS_INVALID_PIPE_STATE", NT_STATUS_INVALID_PIPE_STATE}, ++ {"NT_STATUS_PIPE_BUSY", NT_STATUS_PIPE_BUSY}, ++ {"NT_STATUS_ILLEGAL_FUNCTION", NT_STATUS_ILLEGAL_FUNCTION}, ++ {"NT_STATUS_PIPE_DISCONNECTED", NT_STATUS_PIPE_DISCONNECTED}, ++ {"NT_STATUS_PIPE_CLOSING", NT_STATUS_PIPE_CLOSING}, ++ {"NT_STATUS_PIPE_CONNECTED", NT_STATUS_PIPE_CONNECTED}, ++ {"NT_STATUS_PIPE_LISTENING", NT_STATUS_PIPE_LISTENING}, ++ {"NT_STATUS_INVALID_READ_MODE", NT_STATUS_INVALID_READ_MODE}, ++ {"NT_STATUS_IO_TIMEOUT", NT_STATUS_IO_TIMEOUT}, ++ {"NT_STATUS_FILE_FORCED_CLOSED", NT_STATUS_FILE_FORCED_CLOSED}, ++ {"NT_STATUS_PROFILING_NOT_STARTED", ++ NT_STATUS_PROFILING_NOT_STARTED}, ++ {"NT_STATUS_PROFILING_NOT_STOPPED", ++ NT_STATUS_PROFILING_NOT_STOPPED}, ++ {"NT_STATUS_COULD_NOT_INTERPRET", NT_STATUS_COULD_NOT_INTERPRET}, ++ {"NT_STATUS_FILE_IS_A_DIRECTORY", NT_STATUS_FILE_IS_A_DIRECTORY}, ++ {"NT_STATUS_NOT_SUPPORTED", NT_STATUS_NOT_SUPPORTED}, ++ {"NT_STATUS_REMOTE_NOT_LISTENING", NT_STATUS_REMOTE_NOT_LISTENING}, ++ {"NT_STATUS_DUPLICATE_NAME", NT_STATUS_DUPLICATE_NAME}, ++ {"NT_STATUS_BAD_NETWORK_PATH", NT_STATUS_BAD_NETWORK_PATH}, ++ {"NT_STATUS_NETWORK_BUSY", NT_STATUS_NETWORK_BUSY}, ++ {"NT_STATUS_DEVICE_DOES_NOT_EXIST", ++ NT_STATUS_DEVICE_DOES_NOT_EXIST}, ++ {"NT_STATUS_TOO_MANY_COMMANDS", NT_STATUS_TOO_MANY_COMMANDS}, ++ {"NT_STATUS_ADAPTER_HARDWARE_ERROR", ++ NT_STATUS_ADAPTER_HARDWARE_ERROR}, ++ {"NT_STATUS_INVALID_NETWORK_RESPONSE", ++ NT_STATUS_INVALID_NETWORK_RESPONSE}, ++ {"NT_STATUS_UNEXPECTED_NETWORK_ERROR", ++ NT_STATUS_UNEXPECTED_NETWORK_ERROR}, ++ {"NT_STATUS_BAD_REMOTE_ADAPTER", NT_STATUS_BAD_REMOTE_ADAPTER}, ++ {"NT_STATUS_PRINT_QUEUE_FULL", NT_STATUS_PRINT_QUEUE_FULL}, ++ {"NT_STATUS_NO_SPOOL_SPACE", NT_STATUS_NO_SPOOL_SPACE}, ++ {"NT_STATUS_PRINT_CANCELLED", NT_STATUS_PRINT_CANCELLED}, ++ {"NT_STATUS_NETWORK_NAME_DELETED", NT_STATUS_NETWORK_NAME_DELETED}, ++ {"NT_STATUS_NETWORK_ACCESS_DENIED", ++ NT_STATUS_NETWORK_ACCESS_DENIED}, ++ {"NT_STATUS_BAD_DEVICE_TYPE", NT_STATUS_BAD_DEVICE_TYPE}, ++ {"NT_STATUS_BAD_NETWORK_NAME", NT_STATUS_BAD_NETWORK_NAME}, ++ {"NT_STATUS_TOO_MANY_NAMES", NT_STATUS_TOO_MANY_NAMES}, ++ {"NT_STATUS_TOO_MANY_SESSIONS", NT_STATUS_TOO_MANY_SESSIONS}, ++ {"NT_STATUS_SHARING_PAUSED", NT_STATUS_SHARING_PAUSED}, ++ {"NT_STATUS_REQUEST_NOT_ACCEPTED", NT_STATUS_REQUEST_NOT_ACCEPTED}, ++ {"NT_STATUS_REDIRECTOR_PAUSED", NT_STATUS_REDIRECTOR_PAUSED}, ++ {"NT_STATUS_NET_WRITE_FAULT", NT_STATUS_NET_WRITE_FAULT}, ++ {"NT_STATUS_PROFILING_AT_LIMIT", NT_STATUS_PROFILING_AT_LIMIT}, ++ {"NT_STATUS_NOT_SAME_DEVICE", NT_STATUS_NOT_SAME_DEVICE}, ++ {"NT_STATUS_FILE_RENAMED", NT_STATUS_FILE_RENAMED}, ++ {"NT_STATUS_VIRTUAL_CIRCUIT_CLOSED", ++ NT_STATUS_VIRTUAL_CIRCUIT_CLOSED}, ++ {"NT_STATUS_NO_SECURITY_ON_OBJECT", ++ NT_STATUS_NO_SECURITY_ON_OBJECT}, ++ {"NT_STATUS_CANT_WAIT", NT_STATUS_CANT_WAIT}, ++ {"NT_STATUS_PIPE_EMPTY", NT_STATUS_PIPE_EMPTY}, ++ {"NT_STATUS_CANT_ACCESS_DOMAIN_INFO", ++ NT_STATUS_CANT_ACCESS_DOMAIN_INFO}, ++ {"NT_STATUS_CANT_TERMINATE_SELF", NT_STATUS_CANT_TERMINATE_SELF}, ++ {"NT_STATUS_INVALID_SERVER_STATE", NT_STATUS_INVALID_SERVER_STATE}, ++ {"NT_STATUS_INVALID_DOMAIN_STATE", NT_STATUS_INVALID_DOMAIN_STATE}, ++ {"NT_STATUS_INVALID_DOMAIN_ROLE", NT_STATUS_INVALID_DOMAIN_ROLE}, ++ {"NT_STATUS_NO_SUCH_DOMAIN", NT_STATUS_NO_SUCH_DOMAIN}, ++ {"NT_STATUS_DOMAIN_EXISTS", NT_STATUS_DOMAIN_EXISTS}, ++ {"NT_STATUS_DOMAIN_LIMIT_EXCEEDED", ++ NT_STATUS_DOMAIN_LIMIT_EXCEEDED}, ++ {"NT_STATUS_OPLOCK_NOT_GRANTED", NT_STATUS_OPLOCK_NOT_GRANTED}, ++ {"NT_STATUS_INVALID_OPLOCK_PROTOCOL", ++ NT_STATUS_INVALID_OPLOCK_PROTOCOL}, ++ {"NT_STATUS_INTERNAL_DB_CORRUPTION", ++ NT_STATUS_INTERNAL_DB_CORRUPTION}, ++ {"NT_STATUS_INTERNAL_ERROR", NT_STATUS_INTERNAL_ERROR}, ++ {"NT_STATUS_GENERIC_NOT_MAPPED", NT_STATUS_GENERIC_NOT_MAPPED}, ++ {"NT_STATUS_BAD_DESCRIPTOR_FORMAT", ++ NT_STATUS_BAD_DESCRIPTOR_FORMAT}, ++ {"NT_STATUS_INVALID_USER_BUFFER", NT_STATUS_INVALID_USER_BUFFER}, ++ {"NT_STATUS_UNEXPECTED_IO_ERROR", NT_STATUS_UNEXPECTED_IO_ERROR}, ++ {"NT_STATUS_UNEXPECTED_MM_CREATE_ERR", ++ NT_STATUS_UNEXPECTED_MM_CREATE_ERR}, ++ {"NT_STATUS_UNEXPECTED_MM_MAP_ERROR", ++ NT_STATUS_UNEXPECTED_MM_MAP_ERROR}, ++ {"NT_STATUS_UNEXPECTED_MM_EXTEND_ERR", ++ NT_STATUS_UNEXPECTED_MM_EXTEND_ERR}, ++ {"NT_STATUS_NOT_LOGON_PROCESS", NT_STATUS_NOT_LOGON_PROCESS}, ++ {"NT_STATUS_LOGON_SESSION_EXISTS", NT_STATUS_LOGON_SESSION_EXISTS}, ++ {"NT_STATUS_INVALID_PARAMETER_1", NT_STATUS_INVALID_PARAMETER_1}, ++ {"NT_STATUS_INVALID_PARAMETER_2", NT_STATUS_INVALID_PARAMETER_2}, ++ {"NT_STATUS_INVALID_PARAMETER_3", NT_STATUS_INVALID_PARAMETER_3}, ++ {"NT_STATUS_INVALID_PARAMETER_4", NT_STATUS_INVALID_PARAMETER_4}, ++ {"NT_STATUS_INVALID_PARAMETER_5", NT_STATUS_INVALID_PARAMETER_5}, ++ {"NT_STATUS_INVALID_PARAMETER_6", NT_STATUS_INVALID_PARAMETER_6}, ++ {"NT_STATUS_INVALID_PARAMETER_7", NT_STATUS_INVALID_PARAMETER_7}, ++ {"NT_STATUS_INVALID_PARAMETER_8", NT_STATUS_INVALID_PARAMETER_8}, ++ {"NT_STATUS_INVALID_PARAMETER_9", NT_STATUS_INVALID_PARAMETER_9}, ++ {"NT_STATUS_INVALID_PARAMETER_10", NT_STATUS_INVALID_PARAMETER_10}, ++ {"NT_STATUS_INVALID_PARAMETER_11", NT_STATUS_INVALID_PARAMETER_11}, ++ {"NT_STATUS_INVALID_PARAMETER_12", NT_STATUS_INVALID_PARAMETER_12}, ++ {"NT_STATUS_REDIRECTOR_NOT_STARTED", ++ NT_STATUS_REDIRECTOR_NOT_STARTED}, ++ {"NT_STATUS_REDIRECTOR_STARTED", NT_STATUS_REDIRECTOR_STARTED}, ++ {"NT_STATUS_STACK_OVERFLOW", NT_STATUS_STACK_OVERFLOW}, ++ {"NT_STATUS_NO_SUCH_PACKAGE", NT_STATUS_NO_SUCH_PACKAGE}, ++ {"NT_STATUS_BAD_FUNCTION_TABLE", NT_STATUS_BAD_FUNCTION_TABLE}, ++ {"NT_STATUS_DIRECTORY_NOT_EMPTY", NT_STATUS_DIRECTORY_NOT_EMPTY}, ++ {"NT_STATUS_FILE_CORRUPT_ERROR", NT_STATUS_FILE_CORRUPT_ERROR}, ++ {"NT_STATUS_NOT_A_DIRECTORY", NT_STATUS_NOT_A_DIRECTORY}, ++ {"NT_STATUS_BAD_LOGON_SESSION_STATE", ++ NT_STATUS_BAD_LOGON_SESSION_STATE}, ++ {"NT_STATUS_LOGON_SESSION_COLLISION", ++ NT_STATUS_LOGON_SESSION_COLLISION}, ++ {"NT_STATUS_NAME_TOO_LONG", NT_STATUS_NAME_TOO_LONG}, ++ {"NT_STATUS_FILES_OPEN", NT_STATUS_FILES_OPEN}, ++ {"NT_STATUS_CONNECTION_IN_USE", NT_STATUS_CONNECTION_IN_USE}, ++ {"NT_STATUS_MESSAGE_NOT_FOUND", NT_STATUS_MESSAGE_NOT_FOUND}, ++ {"NT_STATUS_PROCESS_IS_TERMINATING", ++ NT_STATUS_PROCESS_IS_TERMINATING}, ++ {"NT_STATUS_INVALID_LOGON_TYPE", NT_STATUS_INVALID_LOGON_TYPE}, ++ {"NT_STATUS_NO_GUID_TRANSLATION", NT_STATUS_NO_GUID_TRANSLATION}, ++ {"NT_STATUS_CANNOT_IMPERSONATE", NT_STATUS_CANNOT_IMPERSONATE}, ++ {"NT_STATUS_IMAGE_ALREADY_LOADED", NT_STATUS_IMAGE_ALREADY_LOADED}, ++ {"NT_STATUS_ABIOS_NOT_PRESENT", NT_STATUS_ABIOS_NOT_PRESENT}, ++ {"NT_STATUS_ABIOS_LID_NOT_EXIST", NT_STATUS_ABIOS_LID_NOT_EXIST}, ++ {"NT_STATUS_ABIOS_LID_ALREADY_OWNED", ++ NT_STATUS_ABIOS_LID_ALREADY_OWNED}, ++ {"NT_STATUS_ABIOS_NOT_LID_OWNER", NT_STATUS_ABIOS_NOT_LID_OWNER}, ++ {"NT_STATUS_ABIOS_INVALID_COMMAND", ++ NT_STATUS_ABIOS_INVALID_COMMAND}, ++ {"NT_STATUS_ABIOS_INVALID_LID", NT_STATUS_ABIOS_INVALID_LID}, ++ {"NT_STATUS_ABIOS_SELECTOR_NOT_AVAILABLE", ++ NT_STATUS_ABIOS_SELECTOR_NOT_AVAILABLE}, ++ {"NT_STATUS_ABIOS_INVALID_SELECTOR", ++ NT_STATUS_ABIOS_INVALID_SELECTOR}, ++ {"NT_STATUS_NO_LDT", NT_STATUS_NO_LDT}, ++ {"NT_STATUS_INVALID_LDT_SIZE", NT_STATUS_INVALID_LDT_SIZE}, ++ {"NT_STATUS_INVALID_LDT_OFFSET", NT_STATUS_INVALID_LDT_OFFSET}, ++ {"NT_STATUS_INVALID_LDT_DESCRIPTOR", ++ NT_STATUS_INVALID_LDT_DESCRIPTOR}, ++ {"NT_STATUS_INVALID_IMAGE_NE_FORMAT", ++ NT_STATUS_INVALID_IMAGE_NE_FORMAT}, ++ {"NT_STATUS_RXACT_INVALID_STATE", NT_STATUS_RXACT_INVALID_STATE}, ++ {"NT_STATUS_RXACT_COMMIT_FAILURE", NT_STATUS_RXACT_COMMIT_FAILURE}, ++ {"NT_STATUS_MAPPED_FILE_SIZE_ZERO", ++ NT_STATUS_MAPPED_FILE_SIZE_ZERO}, ++ {"NT_STATUS_TOO_MANY_OPENED_FILES", ++ NT_STATUS_TOO_MANY_OPENED_FILES}, ++ {"NT_STATUS_CANCELLED", NT_STATUS_CANCELLED}, ++ {"NT_STATUS_CANNOT_DELETE", NT_STATUS_CANNOT_DELETE}, ++ {"NT_STATUS_INVALID_COMPUTER_NAME", ++ NT_STATUS_INVALID_COMPUTER_NAME}, ++ {"NT_STATUS_FILE_DELETED", NT_STATUS_FILE_DELETED}, ++ {"NT_STATUS_SPECIAL_ACCOUNT", NT_STATUS_SPECIAL_ACCOUNT}, ++ {"NT_STATUS_SPECIAL_GROUP", NT_STATUS_SPECIAL_GROUP}, ++ {"NT_STATUS_SPECIAL_USER", NT_STATUS_SPECIAL_USER}, ++ {"NT_STATUS_MEMBERS_PRIMARY_GROUP", ++ NT_STATUS_MEMBERS_PRIMARY_GROUP}, ++ {"NT_STATUS_FILE_CLOSED", NT_STATUS_FILE_CLOSED}, ++ {"NT_STATUS_TOO_MANY_THREADS", NT_STATUS_TOO_MANY_THREADS}, ++ {"NT_STATUS_THREAD_NOT_IN_PROCESS", ++ NT_STATUS_THREAD_NOT_IN_PROCESS}, ++ {"NT_STATUS_TOKEN_ALREADY_IN_USE", NT_STATUS_TOKEN_ALREADY_IN_USE}, ++ {"NT_STATUS_PAGEFILE_QUOTA_EXCEEDED", ++ NT_STATUS_PAGEFILE_QUOTA_EXCEEDED}, ++ {"NT_STATUS_COMMITMENT_LIMIT", NT_STATUS_COMMITMENT_LIMIT}, ++ {"NT_STATUS_INVALID_IMAGE_LE_FORMAT", ++ NT_STATUS_INVALID_IMAGE_LE_FORMAT}, ++ {"NT_STATUS_INVALID_IMAGE_NOT_MZ", NT_STATUS_INVALID_IMAGE_NOT_MZ}, ++ {"NT_STATUS_INVALID_IMAGE_PROTECT", ++ NT_STATUS_INVALID_IMAGE_PROTECT}, ++ {"NT_STATUS_INVALID_IMAGE_WIN_16", NT_STATUS_INVALID_IMAGE_WIN_16}, ++ {"NT_STATUS_LOGON_SERVER_CONFLICT", ++ NT_STATUS_LOGON_SERVER_CONFLICT}, ++ {"NT_STATUS_TIME_DIFFERENCE_AT_DC", ++ NT_STATUS_TIME_DIFFERENCE_AT_DC}, ++ {"NT_STATUS_SYNCHRONIZATION_REQUIRED", ++ NT_STATUS_SYNCHRONIZATION_REQUIRED}, ++ {"NT_STATUS_DLL_NOT_FOUND", NT_STATUS_DLL_NOT_FOUND}, ++ {"NT_STATUS_OPEN_FAILED", NT_STATUS_OPEN_FAILED}, ++ {"NT_STATUS_IO_PRIVILEGE_FAILED", NT_STATUS_IO_PRIVILEGE_FAILED}, ++ {"NT_STATUS_ORDINAL_NOT_FOUND", NT_STATUS_ORDINAL_NOT_FOUND}, ++ {"NT_STATUS_ENTRYPOINT_NOT_FOUND", NT_STATUS_ENTRYPOINT_NOT_FOUND}, ++ {"NT_STATUS_CONTROL_C_EXIT", NT_STATUS_CONTROL_C_EXIT}, ++ {"NT_STATUS_LOCAL_DISCONNECT", NT_STATUS_LOCAL_DISCONNECT}, ++ {"NT_STATUS_REMOTE_DISCONNECT", NT_STATUS_REMOTE_DISCONNECT}, ++ {"NT_STATUS_REMOTE_RESOURCES", NT_STATUS_REMOTE_RESOURCES}, ++ {"NT_STATUS_LINK_FAILED", NT_STATUS_LINK_FAILED}, ++ {"NT_STATUS_LINK_TIMEOUT", NT_STATUS_LINK_TIMEOUT}, ++ {"NT_STATUS_INVALID_CONNECTION", NT_STATUS_INVALID_CONNECTION}, ++ {"NT_STATUS_INVALID_ADDRESS", NT_STATUS_INVALID_ADDRESS}, ++ {"NT_STATUS_DLL_INIT_FAILED", NT_STATUS_DLL_INIT_FAILED}, ++ {"NT_STATUS_MISSING_SYSTEMFILE", NT_STATUS_MISSING_SYSTEMFILE}, ++ {"NT_STATUS_UNHANDLED_EXCEPTION", NT_STATUS_UNHANDLED_EXCEPTION}, ++ {"NT_STATUS_APP_INIT_FAILURE", NT_STATUS_APP_INIT_FAILURE}, ++ {"NT_STATUS_PAGEFILE_CREATE_FAILED", ++ NT_STATUS_PAGEFILE_CREATE_FAILED}, ++ {"NT_STATUS_NO_PAGEFILE", NT_STATUS_NO_PAGEFILE}, ++ {"NT_STATUS_INVALID_LEVEL", NT_STATUS_INVALID_LEVEL}, ++ {"NT_STATUS_WRONG_PASSWORD_CORE", NT_STATUS_WRONG_PASSWORD_CORE}, ++ {"NT_STATUS_ILLEGAL_FLOAT_CONTEXT", ++ NT_STATUS_ILLEGAL_FLOAT_CONTEXT}, ++ {"NT_STATUS_PIPE_BROKEN", NT_STATUS_PIPE_BROKEN}, ++ {"NT_STATUS_REGISTRY_CORRUPT", NT_STATUS_REGISTRY_CORRUPT}, ++ {"NT_STATUS_REGISTRY_IO_FAILED", NT_STATUS_REGISTRY_IO_FAILED}, ++ {"NT_STATUS_NO_EVENT_PAIR", NT_STATUS_NO_EVENT_PAIR}, ++ {"NT_STATUS_UNRECOGNIZED_VOLUME", NT_STATUS_UNRECOGNIZED_VOLUME}, ++ {"NT_STATUS_SERIAL_NO_DEVICE_INITED", ++ NT_STATUS_SERIAL_NO_DEVICE_INITED}, ++ {"NT_STATUS_NO_SUCH_ALIAS", NT_STATUS_NO_SUCH_ALIAS}, ++ {"NT_STATUS_MEMBER_NOT_IN_ALIAS", NT_STATUS_MEMBER_NOT_IN_ALIAS}, ++ {"NT_STATUS_MEMBER_IN_ALIAS", NT_STATUS_MEMBER_IN_ALIAS}, ++ {"NT_STATUS_ALIAS_EXISTS", NT_STATUS_ALIAS_EXISTS}, ++ {"NT_STATUS_LOGON_NOT_GRANTED", NT_STATUS_LOGON_NOT_GRANTED}, ++ {"NT_STATUS_TOO_MANY_SECRETS", NT_STATUS_TOO_MANY_SECRETS}, ++ {"NT_STATUS_SECRET_TOO_LONG", NT_STATUS_SECRET_TOO_LONG}, ++ {"NT_STATUS_INTERNAL_DB_ERROR", NT_STATUS_INTERNAL_DB_ERROR}, ++ {"NT_STATUS_FULLSCREEN_MODE", NT_STATUS_FULLSCREEN_MODE}, ++ {"NT_STATUS_TOO_MANY_CONTEXT_IDS", NT_STATUS_TOO_MANY_CONTEXT_IDS}, ++ {"NT_STATUS_LOGON_TYPE_NOT_GRANTED", ++ NT_STATUS_LOGON_TYPE_NOT_GRANTED}, ++ {"NT_STATUS_NOT_REGISTRY_FILE", NT_STATUS_NOT_REGISTRY_FILE}, ++ {"NT_STATUS_NT_CROSS_ENCRYPTION_REQUIRED", ++ NT_STATUS_NT_CROSS_ENCRYPTION_REQUIRED}, ++ {"NT_STATUS_DOMAIN_CTRLR_CONFIG_ERROR", ++ NT_STATUS_DOMAIN_CTRLR_CONFIG_ERROR}, ++ {"NT_STATUS_FT_MISSING_MEMBER", NT_STATUS_FT_MISSING_MEMBER}, ++ {"NT_STATUS_ILL_FORMED_SERVICE_ENTRY", ++ NT_STATUS_ILL_FORMED_SERVICE_ENTRY}, ++ {"NT_STATUS_ILLEGAL_CHARACTER", NT_STATUS_ILLEGAL_CHARACTER}, ++ {"NT_STATUS_UNMAPPABLE_CHARACTER", NT_STATUS_UNMAPPABLE_CHARACTER}, ++ {"NT_STATUS_UNDEFINED_CHARACTER", NT_STATUS_UNDEFINED_CHARACTER}, ++ {"NT_STATUS_FLOPPY_VOLUME", NT_STATUS_FLOPPY_VOLUME}, ++ {"NT_STATUS_FLOPPY_ID_MARK_NOT_FOUND", ++ NT_STATUS_FLOPPY_ID_MARK_NOT_FOUND}, ++ {"NT_STATUS_FLOPPY_WRONG_CYLINDER", ++ NT_STATUS_FLOPPY_WRONG_CYLINDER}, ++ {"NT_STATUS_FLOPPY_UNKNOWN_ERROR", NT_STATUS_FLOPPY_UNKNOWN_ERROR}, ++ {"NT_STATUS_FLOPPY_BAD_REGISTERS", NT_STATUS_FLOPPY_BAD_REGISTERS}, ++ {"NT_STATUS_DISK_RECALIBRATE_FAILED", ++ NT_STATUS_DISK_RECALIBRATE_FAILED}, ++ {"NT_STATUS_DISK_OPERATION_FAILED", ++ NT_STATUS_DISK_OPERATION_FAILED}, ++ {"NT_STATUS_DISK_RESET_FAILED", NT_STATUS_DISK_RESET_FAILED}, ++ {"NT_STATUS_SHARED_IRQ_BUSY", NT_STATUS_SHARED_IRQ_BUSY}, ++ {"NT_STATUS_FT_ORPHANING", NT_STATUS_FT_ORPHANING}, ++ {"NT_STATUS_PARTITION_FAILURE", NT_STATUS_PARTITION_FAILURE}, ++ {"NT_STATUS_INVALID_BLOCK_LENGTH", NT_STATUS_INVALID_BLOCK_LENGTH}, ++ {"NT_STATUS_DEVICE_NOT_PARTITIONED", ++ NT_STATUS_DEVICE_NOT_PARTITIONED}, ++ {"NT_STATUS_UNABLE_TO_LOCK_MEDIA", NT_STATUS_UNABLE_TO_LOCK_MEDIA}, ++ {"NT_STATUS_UNABLE_TO_UNLOAD_MEDIA", ++ NT_STATUS_UNABLE_TO_UNLOAD_MEDIA}, ++ {"NT_STATUS_EOM_OVERFLOW", NT_STATUS_EOM_OVERFLOW}, ++ {"NT_STATUS_NO_MEDIA", NT_STATUS_NO_MEDIA}, ++ {"NT_STATUS_NO_SUCH_MEMBER", NT_STATUS_NO_SUCH_MEMBER}, ++ {"NT_STATUS_INVALID_MEMBER", NT_STATUS_INVALID_MEMBER}, ++ {"NT_STATUS_KEY_DELETED", NT_STATUS_KEY_DELETED}, ++ {"NT_STATUS_NO_LOG_SPACE", NT_STATUS_NO_LOG_SPACE}, ++ {"NT_STATUS_TOO_MANY_SIDS", NT_STATUS_TOO_MANY_SIDS}, ++ {"NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED", ++ NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED}, ++ {"NT_STATUS_KEY_HAS_CHILDREN", NT_STATUS_KEY_HAS_CHILDREN}, ++ {"NT_STATUS_CHILD_MUST_BE_VOLATILE", ++ NT_STATUS_CHILD_MUST_BE_VOLATILE}, ++ {"NT_STATUS_DEVICE_CONFIGURATION_ERROR", ++ NT_STATUS_DEVICE_CONFIGURATION_ERROR}, ++ {"NT_STATUS_DRIVER_INTERNAL_ERROR", ++ NT_STATUS_DRIVER_INTERNAL_ERROR}, ++ {"NT_STATUS_INVALID_DEVICE_STATE", NT_STATUS_INVALID_DEVICE_STATE}, ++ {"NT_STATUS_IO_DEVICE_ERROR", NT_STATUS_IO_DEVICE_ERROR}, ++ {"NT_STATUS_DEVICE_PROTOCOL_ERROR", ++ NT_STATUS_DEVICE_PROTOCOL_ERROR}, ++ {"NT_STATUS_BACKUP_CONTROLLER", NT_STATUS_BACKUP_CONTROLLER}, ++ {"NT_STATUS_LOG_FILE_FULL", NT_STATUS_LOG_FILE_FULL}, ++ {"NT_STATUS_TOO_LATE", NT_STATUS_TOO_LATE}, ++ {"NT_STATUS_NO_TRUST_LSA_SECRET", NT_STATUS_NO_TRUST_LSA_SECRET}, ++ {"NT_STATUS_NO_TRUST_SAM_ACCOUNT", NT_STATUS_NO_TRUST_SAM_ACCOUNT}, ++ {"NT_STATUS_TRUSTED_DOMAIN_FAILURE", ++ NT_STATUS_TRUSTED_DOMAIN_FAILURE}, ++ {"NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE", ++ NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE}, ++ {"NT_STATUS_EVENTLOG_FILE_CORRUPT", ++ NT_STATUS_EVENTLOG_FILE_CORRUPT}, ++ {"NT_STATUS_EVENTLOG_CANT_START", NT_STATUS_EVENTLOG_CANT_START}, ++ {"NT_STATUS_TRUST_FAILURE", NT_STATUS_TRUST_FAILURE}, ++ {"NT_STATUS_MUTANT_LIMIT_EXCEEDED", ++ NT_STATUS_MUTANT_LIMIT_EXCEEDED}, ++ {"NT_STATUS_NETLOGON_NOT_STARTED", NT_STATUS_NETLOGON_NOT_STARTED}, ++ {"NT_STATUS_ACCOUNT_EXPIRED", NT_STATUS_ACCOUNT_EXPIRED}, ++ {"NT_STATUS_POSSIBLE_DEADLOCK", NT_STATUS_POSSIBLE_DEADLOCK}, ++ {"NT_STATUS_NETWORK_CREDENTIAL_CONFLICT", ++ NT_STATUS_NETWORK_CREDENTIAL_CONFLICT}, ++ {"NT_STATUS_REMOTE_SESSION_LIMIT", NT_STATUS_REMOTE_SESSION_LIMIT}, ++ {"NT_STATUS_EVENTLOG_FILE_CHANGED", ++ NT_STATUS_EVENTLOG_FILE_CHANGED}, ++ {"NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT", ++ NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT}, ++ {"NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT", ++ NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT}, ++ {"NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT", ++ NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT}, ++ {"NT_STATUS_DOMAIN_TRUST_INCONSISTENT", ++ NT_STATUS_DOMAIN_TRUST_INCONSISTENT}, ++ {"NT_STATUS_FS_DRIVER_REQUIRED", NT_STATUS_FS_DRIVER_REQUIRED}, ++ {"NT_STATUS_NO_USER_SESSION_KEY", NT_STATUS_NO_USER_SESSION_KEY}, ++ {"NT_STATUS_USER_SESSION_DELETED", NT_STATUS_USER_SESSION_DELETED}, ++ {"NT_STATUS_RESOURCE_LANG_NOT_FOUND", ++ NT_STATUS_RESOURCE_LANG_NOT_FOUND}, ++ {"NT_STATUS_INSUFF_SERVER_RESOURCES", ++ NT_STATUS_INSUFF_SERVER_RESOURCES}, ++ {"NT_STATUS_INVALID_BUFFER_SIZE", NT_STATUS_INVALID_BUFFER_SIZE}, ++ {"NT_STATUS_INVALID_ADDRESS_COMPONENT", ++ NT_STATUS_INVALID_ADDRESS_COMPONENT}, ++ {"NT_STATUS_INVALID_ADDRESS_WILDCARD", ++ NT_STATUS_INVALID_ADDRESS_WILDCARD}, ++ {"NT_STATUS_TOO_MANY_ADDRESSES", NT_STATUS_TOO_MANY_ADDRESSES}, ++ {"NT_STATUS_ADDRESS_ALREADY_EXISTS", ++ NT_STATUS_ADDRESS_ALREADY_EXISTS}, ++ {"NT_STATUS_ADDRESS_CLOSED", NT_STATUS_ADDRESS_CLOSED}, ++ {"NT_STATUS_CONNECTION_DISCONNECTED", ++ NT_STATUS_CONNECTION_DISCONNECTED}, ++ {"NT_STATUS_CONNECTION_RESET", NT_STATUS_CONNECTION_RESET}, ++ {"NT_STATUS_TOO_MANY_NODES", NT_STATUS_TOO_MANY_NODES}, ++ {"NT_STATUS_TRANSACTION_ABORTED", NT_STATUS_TRANSACTION_ABORTED}, ++ {"NT_STATUS_TRANSACTION_TIMED_OUT", ++ NT_STATUS_TRANSACTION_TIMED_OUT}, ++ {"NT_STATUS_TRANSACTION_NO_RELEASE", ++ NT_STATUS_TRANSACTION_NO_RELEASE}, ++ {"NT_STATUS_TRANSACTION_NO_MATCH", NT_STATUS_TRANSACTION_NO_MATCH}, ++ {"NT_STATUS_TRANSACTION_RESPONDED", ++ NT_STATUS_TRANSACTION_RESPONDED}, ++ {"NT_STATUS_TRANSACTION_INVALID_ID", ++ NT_STATUS_TRANSACTION_INVALID_ID}, ++ {"NT_STATUS_TRANSACTION_INVALID_TYPE", ++ NT_STATUS_TRANSACTION_INVALID_TYPE}, ++ {"NT_STATUS_NOT_SERVER_SESSION", NT_STATUS_NOT_SERVER_SESSION}, ++ {"NT_STATUS_NOT_CLIENT_SESSION", NT_STATUS_NOT_CLIENT_SESSION}, ++ {"NT_STATUS_CANNOT_LOAD_REGISTRY_FILE", ++ NT_STATUS_CANNOT_LOAD_REGISTRY_FILE}, ++ {"NT_STATUS_DEBUG_ATTACH_FAILED", NT_STATUS_DEBUG_ATTACH_FAILED}, ++ {"NT_STATUS_SYSTEM_PROCESS_TERMINATED", ++ NT_STATUS_SYSTEM_PROCESS_TERMINATED}, ++ {"NT_STATUS_DATA_NOT_ACCEPTED", NT_STATUS_DATA_NOT_ACCEPTED}, ++ {"NT_STATUS_NO_BROWSER_SERVERS_FOUND", ++ NT_STATUS_NO_BROWSER_SERVERS_FOUND}, ++ {"NT_STATUS_VDM_HARD_ERROR", NT_STATUS_VDM_HARD_ERROR}, ++ {"NT_STATUS_DRIVER_CANCEL_TIMEOUT", ++ NT_STATUS_DRIVER_CANCEL_TIMEOUT}, ++ {"NT_STATUS_REPLY_MESSAGE_MISMATCH", ++ NT_STATUS_REPLY_MESSAGE_MISMATCH}, ++ {"NT_STATUS_MAPPED_ALIGNMENT", NT_STATUS_MAPPED_ALIGNMENT}, ++ {"NT_STATUS_IMAGE_CHECKSUM_MISMATCH", ++ NT_STATUS_IMAGE_CHECKSUM_MISMATCH}, ++ {"NT_STATUS_LOST_WRITEBEHIND_DATA", ++ NT_STATUS_LOST_WRITEBEHIND_DATA}, ++ {"NT_STATUS_CLIENT_SERVER_PARAMETERS_INVALID", ++ NT_STATUS_CLIENT_SERVER_PARAMETERS_INVALID}, ++ {"NT_STATUS_PASSWORD_MUST_CHANGE", NT_STATUS_PASSWORD_MUST_CHANGE}, ++ {"NT_STATUS_NOT_FOUND", NT_STATUS_NOT_FOUND}, ++ {"NT_STATUS_NOT_TINY_STREAM", NT_STATUS_NOT_TINY_STREAM}, ++ {"NT_STATUS_RECOVERY_FAILURE", NT_STATUS_RECOVERY_FAILURE}, ++ {"NT_STATUS_STACK_OVERFLOW_READ", NT_STATUS_STACK_OVERFLOW_READ}, ++ {"NT_STATUS_FAIL_CHECK", NT_STATUS_FAIL_CHECK}, ++ {"NT_STATUS_DUPLICATE_OBJECTID", NT_STATUS_DUPLICATE_OBJECTID}, ++ {"NT_STATUS_OBJECTID_EXISTS", NT_STATUS_OBJECTID_EXISTS}, ++ {"NT_STATUS_CONVERT_TO_LARGE", NT_STATUS_CONVERT_TO_LARGE}, ++ {"NT_STATUS_RETRY", NT_STATUS_RETRY}, ++ {"NT_STATUS_FOUND_OUT_OF_SCOPE", NT_STATUS_FOUND_OUT_OF_SCOPE}, ++ {"NT_STATUS_ALLOCATE_BUCKET", NT_STATUS_ALLOCATE_BUCKET}, ++ {"NT_STATUS_PROPSET_NOT_FOUND", NT_STATUS_PROPSET_NOT_FOUND}, ++ {"NT_STATUS_MARSHALL_OVERFLOW", NT_STATUS_MARSHALL_OVERFLOW}, ++ {"NT_STATUS_INVALID_VARIANT", NT_STATUS_INVALID_VARIANT}, ++ {"NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND", ++ NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND}, ++ {"NT_STATUS_ACCOUNT_LOCKED_OUT", NT_STATUS_ACCOUNT_LOCKED_OUT}, ++ {"NT_STATUS_HANDLE_NOT_CLOSABLE", NT_STATUS_HANDLE_NOT_CLOSABLE}, ++ {"NT_STATUS_CONNECTION_REFUSED", NT_STATUS_CONNECTION_REFUSED}, ++ {"NT_STATUS_GRACEFUL_DISCONNECT", NT_STATUS_GRACEFUL_DISCONNECT}, ++ {"NT_STATUS_ADDRESS_ALREADY_ASSOCIATED", ++ NT_STATUS_ADDRESS_ALREADY_ASSOCIATED}, ++ {"NT_STATUS_ADDRESS_NOT_ASSOCIATED", ++ NT_STATUS_ADDRESS_NOT_ASSOCIATED}, ++ {"NT_STATUS_CONNECTION_INVALID", NT_STATUS_CONNECTION_INVALID}, ++ {"NT_STATUS_CONNECTION_ACTIVE", NT_STATUS_CONNECTION_ACTIVE}, ++ {"NT_STATUS_NETWORK_UNREACHABLE", NT_STATUS_NETWORK_UNREACHABLE}, ++ {"NT_STATUS_HOST_UNREACHABLE", NT_STATUS_HOST_UNREACHABLE}, ++ {"NT_STATUS_PROTOCOL_UNREACHABLE", NT_STATUS_PROTOCOL_UNREACHABLE}, ++ {"NT_STATUS_PORT_UNREACHABLE", NT_STATUS_PORT_UNREACHABLE}, ++ {"NT_STATUS_REQUEST_ABORTED", NT_STATUS_REQUEST_ABORTED}, ++ {"NT_STATUS_CONNECTION_ABORTED", NT_STATUS_CONNECTION_ABORTED}, ++ {"NT_STATUS_BAD_COMPRESSION_BUFFER", ++ NT_STATUS_BAD_COMPRESSION_BUFFER}, ++ {"NT_STATUS_USER_MAPPED_FILE", NT_STATUS_USER_MAPPED_FILE}, ++ {"NT_STATUS_AUDIT_FAILED", NT_STATUS_AUDIT_FAILED}, ++ {"NT_STATUS_TIMER_RESOLUTION_NOT_SET", ++ NT_STATUS_TIMER_RESOLUTION_NOT_SET}, ++ {"NT_STATUS_CONNECTION_COUNT_LIMIT", ++ NT_STATUS_CONNECTION_COUNT_LIMIT}, ++ {"NT_STATUS_LOGIN_TIME_RESTRICTION", ++ NT_STATUS_LOGIN_TIME_RESTRICTION}, ++ {"NT_STATUS_LOGIN_WKSTA_RESTRICTION", ++ NT_STATUS_LOGIN_WKSTA_RESTRICTION}, ++ {"NT_STATUS_IMAGE_MP_UP_MISMATCH", NT_STATUS_IMAGE_MP_UP_MISMATCH}, ++ {"NT_STATUS_INSUFFICIENT_LOGON_INFO", ++ NT_STATUS_INSUFFICIENT_LOGON_INFO}, ++ {"NT_STATUS_BAD_DLL_ENTRYPOINT", NT_STATUS_BAD_DLL_ENTRYPOINT}, ++ {"NT_STATUS_BAD_SERVICE_ENTRYPOINT", ++ NT_STATUS_BAD_SERVICE_ENTRYPOINT}, ++ {"NT_STATUS_LPC_REPLY_LOST", NT_STATUS_LPC_REPLY_LOST}, ++ {"NT_STATUS_IP_ADDRESS_CONFLICT1", NT_STATUS_IP_ADDRESS_CONFLICT1}, ++ {"NT_STATUS_IP_ADDRESS_CONFLICT2", NT_STATUS_IP_ADDRESS_CONFLICT2}, ++ {"NT_STATUS_REGISTRY_QUOTA_LIMIT", NT_STATUS_REGISTRY_QUOTA_LIMIT}, ++ {"NT_STATUS_PATH_NOT_COVERED", NT_STATUS_PATH_NOT_COVERED}, ++ {"NT_STATUS_NO_CALLBACK_ACTIVE", NT_STATUS_NO_CALLBACK_ACTIVE}, ++ {"NT_STATUS_LICENSE_QUOTA_EXCEEDED", ++ NT_STATUS_LICENSE_QUOTA_EXCEEDED}, ++ {"NT_STATUS_PWD_TOO_SHORT", NT_STATUS_PWD_TOO_SHORT}, ++ {"NT_STATUS_PWD_TOO_RECENT", NT_STATUS_PWD_TOO_RECENT}, ++ {"NT_STATUS_PWD_HISTORY_CONFLICT", NT_STATUS_PWD_HISTORY_CONFLICT}, ++ {"NT_STATUS_PLUGPLAY_NO_DEVICE", NT_STATUS_PLUGPLAY_NO_DEVICE}, ++ {"NT_STATUS_UNSUPPORTED_COMPRESSION", ++ NT_STATUS_UNSUPPORTED_COMPRESSION}, ++ {"NT_STATUS_INVALID_HW_PROFILE", NT_STATUS_INVALID_HW_PROFILE}, ++ {"NT_STATUS_INVALID_PLUGPLAY_DEVICE_PATH", ++ NT_STATUS_INVALID_PLUGPLAY_DEVICE_PATH}, ++ {"NT_STATUS_DRIVER_ORDINAL_NOT_FOUND", ++ NT_STATUS_DRIVER_ORDINAL_NOT_FOUND}, ++ {"NT_STATUS_DRIVER_ENTRYPOINT_NOT_FOUND", ++ NT_STATUS_DRIVER_ENTRYPOINT_NOT_FOUND}, ++ {"NT_STATUS_RESOURCE_NOT_OWNED", NT_STATUS_RESOURCE_NOT_OWNED}, ++ {"NT_STATUS_TOO_MANY_LINKS", NT_STATUS_TOO_MANY_LINKS}, ++ {"NT_STATUS_QUOTA_LIST_INCONSISTENT", ++ NT_STATUS_QUOTA_LIST_INCONSISTENT}, ++ {"NT_STATUS_FILE_IS_OFFLINE", NT_STATUS_FILE_IS_OFFLINE}, ++ {"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES}, ++ {"STATUS_MORE_ENTRIES", STATUS_MORE_ENTRIES}, ++ {"STATUS_SOME_UNMAPPED", STATUS_SOME_UNMAPPED}, ++ {NULL, 0} ++}; +diff -urN linux-2.4.29.old/fs/cifs/nterr.h linux-2.4.29/fs/cifs/nterr.h +--- linux-2.4.29.old/fs/cifs/nterr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/nterr.h 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,556 @@ ++/* ++ Unix SMB/Netbios implementation. ++ Version 1.9. ++ NT error code constants ++ Copyright (C) Andrew Tridgell 1992-2000 ++ Copyright (C) John H Terpstra 1996-2000 ++ Copyright (C) Luke Kenneth Casson Leighton 1996-2000 ++ Copyright (C) Paul Ashton 1998-2000 ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++*/ ++ ++ ++ ++#ifndef _NTERR_H ++#define _NTERR_H ++ ++struct nt_err_code_struct { ++ char *nt_errstr; ++ __u32 nt_errcode; ++}; ++ ++extern const struct nt_err_code_struct nt_errs[]; ++ ++/* Win32 Status codes. */ ++ ++#define STATUS_BUFFER_OVERFLOW 0x80000005 ++#define STATUS_MORE_ENTRIES 0x0105 ++#define ERROR_INVALID_PARAMETER 0x0057 ++#define ERROR_INSUFFICIENT_BUFFER 0x007a ++#define STATUS_1804 0x070c ++#define STATUS_NOTIFY_ENUM_DIR 0x010c ++ ++/* Win32 Error codes extracted using a loop in smbclient then printing a ++ netmon sniff to a file. */ ++ ++#define NT_STATUS_OK 0x0000 ++#define STATUS_SOME_UNMAPPED 0x0107 ++#define STATUS_BUFFER_OVERFLOW 0x80000005 ++#define NT_STATUS_NO_MORE_ENTRIES 0x8000001a ++#define NT_STATUS_UNSUCCESSFUL 0xC0000000 | 0x0001 ++#define NT_STATUS_NOT_IMPLEMENTED 0xC0000000 | 0x0002 ++#define NT_STATUS_INVALID_INFO_CLASS 0xC0000000 | 0x0003 ++#define NT_STATUS_INFO_LENGTH_MISMATCH 0xC0000000 | 0x0004 ++#define NT_STATUS_ACCESS_VIOLATION 0xC0000000 | 0x0005 ++#define NT_STATUS_IN_PAGE_ERROR 0xC0000000 | 0x0006 ++#define NT_STATUS_PAGEFILE_QUOTA 0xC0000000 | 0x0007 ++#define NT_STATUS_INVALID_HANDLE 0xC0000000 | 0x0008 ++#define NT_STATUS_BAD_INITIAL_STACK 0xC0000000 | 0x0009 ++#define NT_STATUS_BAD_INITIAL_PC 0xC0000000 | 0x000a ++#define NT_STATUS_INVALID_CID 0xC0000000 | 0x000b ++#define NT_STATUS_TIMER_NOT_CANCELED 0xC0000000 | 0x000c ++#define NT_STATUS_INVALID_PARAMETER 0xC0000000 | 0x000d ++#define NT_STATUS_NO_SUCH_DEVICE 0xC0000000 | 0x000e ++#define NT_STATUS_NO_SUCH_FILE 0xC0000000 | 0x000f ++#define NT_STATUS_INVALID_DEVICE_REQUEST 0xC0000000 | 0x0010 ++#define NT_STATUS_END_OF_FILE 0xC0000000 | 0x0011 ++#define NT_STATUS_WRONG_VOLUME 0xC0000000 | 0x0012 ++#define NT_STATUS_NO_MEDIA_IN_DEVICE 0xC0000000 | 0x0013 ++#define NT_STATUS_UNRECOGNIZED_MEDIA 0xC0000000 | 0x0014 ++#define NT_STATUS_NONEXISTENT_SECTOR 0xC0000000 | 0x0015 ++#define NT_STATUS_MORE_PROCESSING_REQUIRED 0xC0000000 | 0x0016 ++#define NT_STATUS_NO_MEMORY 0xC0000000 | 0x0017 ++#define NT_STATUS_CONFLICTING_ADDRESSES 0xC0000000 | 0x0018 ++#define NT_STATUS_NOT_MAPPED_VIEW 0xC0000000 | 0x0019 ++#define NT_STATUS_UNABLE_TO_FREE_VM 0x80000000 | 0x001a ++#define NT_STATUS_UNABLE_TO_DELETE_SECTION 0xC0000000 | 0x001b ++#define NT_STATUS_INVALID_SYSTEM_SERVICE 0xC0000000 | 0x001c ++#define NT_STATUS_ILLEGAL_INSTRUCTION 0xC0000000 | 0x001d ++#define NT_STATUS_INVALID_LOCK_SEQUENCE 0xC0000000 | 0x001e ++#define NT_STATUS_INVALID_VIEW_SIZE 0xC0000000 | 0x001f ++#define NT_STATUS_INVALID_FILE_FOR_SECTION 0xC0000000 | 0x0020 ++#define NT_STATUS_ALREADY_COMMITTED 0xC0000000 | 0x0021 ++#define NT_STATUS_ACCESS_DENIED 0xC0000000 | 0x0022 ++#define NT_STATUS_BUFFER_TOO_SMALL 0xC0000000 | 0x0023 ++#define NT_STATUS_OBJECT_TYPE_MISMATCH 0xC0000000 | 0x0024 ++#define NT_STATUS_NONCONTINUABLE_EXCEPTION 0xC0000000 | 0x0025 ++#define NT_STATUS_INVALID_DISPOSITION 0xC0000000 | 0x0026 ++#define NT_STATUS_UNWIND 0xC0000000 | 0x0027 ++#define NT_STATUS_BAD_STACK 0xC0000000 | 0x0028 ++#define NT_STATUS_INVALID_UNWIND_TARGET 0xC0000000 | 0x0029 ++#define NT_STATUS_NOT_LOCKED 0xC0000000 | 0x002a ++#define NT_STATUS_PARITY_ERROR 0xC0000000 | 0x002b ++#define NT_STATUS_UNABLE_TO_DECOMMIT_VM 0xC0000000 | 0x002c ++#define NT_STATUS_NOT_COMMITTED 0xC0000000 | 0x002d ++#define NT_STATUS_INVALID_PORT_ATTRIBUTES 0xC0000000 | 0x002e ++#define NT_STATUS_PORT_MESSAGE_TOO_LONG 0xC0000000 | 0x002f ++#define NT_STATUS_INVALID_PARAMETER_MIX 0xC0000000 | 0x0030 ++#define NT_STATUS_INVALID_QUOTA_LOWER 0xC0000000 | 0x0031 ++#define NT_STATUS_DISK_CORRUPT_ERROR 0xC0000000 | 0x0032 ++#define NT_STATUS_OBJECT_NAME_INVALID 0xC0000000 | 0x0033 ++#define NT_STATUS_OBJECT_NAME_NOT_FOUND 0xC0000000 | 0x0034 ++#define NT_STATUS_OBJECT_NAME_COLLISION 0xC0000000 | 0x0035 ++#define NT_STATUS_HANDLE_NOT_WAITABLE 0xC0000000 | 0x0036 ++#define NT_STATUS_PORT_DISCONNECTED 0xC0000000 | 0x0037 ++#define NT_STATUS_DEVICE_ALREADY_ATTACHED 0xC0000000 | 0x0038 ++#define NT_STATUS_OBJECT_PATH_INVALID 0xC0000000 | 0x0039 ++#define NT_STATUS_OBJECT_PATH_NOT_FOUND 0xC0000000 | 0x003a ++#define NT_STATUS_OBJECT_PATH_SYNTAX_BAD 0xC0000000 | 0x003b ++#define NT_STATUS_DATA_OVERRUN 0xC0000000 | 0x003c ++#define NT_STATUS_DATA_LATE_ERROR 0xC0000000 | 0x003d ++#define NT_STATUS_DATA_ERROR 0xC0000000 | 0x003e ++#define NT_STATUS_CRC_ERROR 0xC0000000 | 0x003f ++#define NT_STATUS_SECTION_TOO_BIG 0xC0000000 | 0x0040 ++#define NT_STATUS_PORT_CONNECTION_REFUSED 0xC0000000 | 0x0041 ++#define NT_STATUS_INVALID_PORT_HANDLE 0xC0000000 | 0x0042 ++#define NT_STATUS_SHARING_VIOLATION 0xC0000000 | 0x0043 ++#define NT_STATUS_QUOTA_EXCEEDED 0xC0000000 | 0x0044 ++#define NT_STATUS_INVALID_PAGE_PROTECTION 0xC0000000 | 0x0045 ++#define NT_STATUS_MUTANT_NOT_OWNED 0xC0000000 | 0x0046 ++#define NT_STATUS_SEMAPHORE_LIMIT_EXCEEDED 0xC0000000 | 0x0047 ++#define NT_STATUS_PORT_ALREADY_SET 0xC0000000 | 0x0048 ++#define NT_STATUS_SECTION_NOT_IMAGE 0xC0000000 | 0x0049 ++#define NT_STATUS_SUSPEND_COUNT_EXCEEDED 0xC0000000 | 0x004a ++#define NT_STATUS_THREAD_IS_TERMINATING 0xC0000000 | 0x004b ++#define NT_STATUS_BAD_WORKING_SET_LIMIT 0xC0000000 | 0x004c ++#define NT_STATUS_INCOMPATIBLE_FILE_MAP 0xC0000000 | 0x004d ++#define NT_STATUS_SECTION_PROTECTION 0xC0000000 | 0x004e ++#define NT_STATUS_EAS_NOT_SUPPORTED 0xC0000000 | 0x004f ++#define NT_STATUS_EA_TOO_LARGE 0xC0000000 | 0x0050 ++#define NT_STATUS_NONEXISTENT_EA_ENTRY 0xC0000000 | 0x0051 ++#define NT_STATUS_NO_EAS_ON_FILE 0xC0000000 | 0x0052 ++#define NT_STATUS_EA_CORRUPT_ERROR 0xC0000000 | 0x0053 ++#define NT_STATUS_FILE_LOCK_CONFLICT 0xC0000000 | 0x0054 ++#define NT_STATUS_LOCK_NOT_GRANTED 0xC0000000 | 0x0055 ++#define NT_STATUS_DELETE_PENDING 0xC0000000 | 0x0056 ++#define NT_STATUS_CTL_FILE_NOT_SUPPORTED 0xC0000000 | 0x0057 ++#define NT_STATUS_UNKNOWN_REVISION 0xC0000000 | 0x0058 ++#define NT_STATUS_REVISION_MISMATCH 0xC0000000 | 0x0059 ++#define NT_STATUS_INVALID_OWNER 0xC0000000 | 0x005a ++#define NT_STATUS_INVALID_PRIMARY_GROUP 0xC0000000 | 0x005b ++#define NT_STATUS_NO_IMPERSONATION_TOKEN 0xC0000000 | 0x005c ++#define NT_STATUS_CANT_DISABLE_MANDATORY 0xC0000000 | 0x005d ++#define NT_STATUS_NO_LOGON_SERVERS 0xC0000000 | 0x005e ++#define NT_STATUS_NO_SUCH_LOGON_SESSION 0xC0000000 | 0x005f ++#define NT_STATUS_NO_SUCH_PRIVILEGE 0xC0000000 | 0x0060 ++#define NT_STATUS_PRIVILEGE_NOT_HELD 0xC0000000 | 0x0061 ++#define NT_STATUS_INVALID_ACCOUNT_NAME 0xC0000000 | 0x0062 ++#define NT_STATUS_USER_EXISTS 0xC0000000 | 0x0063 ++#define NT_STATUS_NO_SUCH_USER 0xC0000000 | 0x0064 ++#define NT_STATUS_GROUP_EXISTS 0xC0000000 | 0x0065 ++#define NT_STATUS_NO_SUCH_GROUP 0xC0000000 | 0x0066 ++#define NT_STATUS_MEMBER_IN_GROUP 0xC0000000 | 0x0067 ++#define NT_STATUS_MEMBER_NOT_IN_GROUP 0xC0000000 | 0x0068 ++#define NT_STATUS_LAST_ADMIN 0xC0000000 | 0x0069 ++#define NT_STATUS_WRONG_PASSWORD 0xC0000000 | 0x006a ++#define NT_STATUS_ILL_FORMED_PASSWORD 0xC0000000 | 0x006b ++#define NT_STATUS_PASSWORD_RESTRICTION 0xC0000000 | 0x006c ++#define NT_STATUS_LOGON_FAILURE 0xC0000000 | 0x006d ++#define NT_STATUS_ACCOUNT_RESTRICTION 0xC0000000 | 0x006e ++#define NT_STATUS_INVALID_LOGON_HOURS 0xC0000000 | 0x006f ++#define NT_STATUS_INVALID_WORKSTATION 0xC0000000 | 0x0070 ++#define NT_STATUS_PASSWORD_EXPIRED 0xC0000000 | 0x0071 ++#define NT_STATUS_ACCOUNT_DISABLED 0xC0000000 | 0x0072 ++#define NT_STATUS_NONE_MAPPED 0xC0000000 | 0x0073 ++#define NT_STATUS_TOO_MANY_LUIDS_REQUESTED 0xC0000000 | 0x0074 ++#define NT_STATUS_LUIDS_EXHAUSTED 0xC0000000 | 0x0075 ++#define NT_STATUS_INVALID_SUB_AUTHORITY 0xC0000000 | 0x0076 ++#define NT_STATUS_INVALID_ACL 0xC0000000 | 0x0077 ++#define NT_STATUS_INVALID_SID 0xC0000000 | 0x0078 ++#define NT_STATUS_INVALID_SECURITY_DESCR 0xC0000000 | 0x0079 ++#define NT_STATUS_PROCEDURE_NOT_FOUND 0xC0000000 | 0x007a ++#define NT_STATUS_INVALID_IMAGE_FORMAT 0xC0000000 | 0x007b ++#define NT_STATUS_NO_TOKEN 0xC0000000 | 0x007c ++#define NT_STATUS_BAD_INHERITANCE_ACL 0xC0000000 | 0x007d ++#define NT_STATUS_RANGE_NOT_LOCKED 0xC0000000 | 0x007e ++#define NT_STATUS_DISK_FULL 0xC0000000 | 0x007f ++#define NT_STATUS_SERVER_DISABLED 0xC0000000 | 0x0080 ++#define NT_STATUS_SERVER_NOT_DISABLED 0xC0000000 | 0x0081 ++#define NT_STATUS_TOO_MANY_GUIDS_REQUESTED 0xC0000000 | 0x0082 ++#define NT_STATUS_GUIDS_EXHAUSTED 0xC0000000 | 0x0083 ++#define NT_STATUS_INVALID_ID_AUTHORITY 0xC0000000 | 0x0084 ++#define NT_STATUS_AGENTS_EXHAUSTED 0xC0000000 | 0x0085 ++#define NT_STATUS_INVALID_VOLUME_LABEL 0xC0000000 | 0x0086 ++#define NT_STATUS_SECTION_NOT_EXTENDED 0xC0000000 | 0x0087 ++#define NT_STATUS_NOT_MAPPED_DATA 0xC0000000 | 0x0088 ++#define NT_STATUS_RESOURCE_DATA_NOT_FOUND 0xC0000000 | 0x0089 ++#define NT_STATUS_RESOURCE_TYPE_NOT_FOUND 0xC0000000 | 0x008a ++#define NT_STATUS_RESOURCE_NAME_NOT_FOUND 0xC0000000 | 0x008b ++#define NT_STATUS_ARRAY_BOUNDS_EXCEEDED 0xC0000000 | 0x008c ++#define NT_STATUS_FLOAT_DENORMAL_OPERAND 0xC0000000 | 0x008d ++#define NT_STATUS_FLOAT_DIVIDE_BY_ZERO 0xC0000000 | 0x008e ++#define NT_STATUS_FLOAT_INEXACT_RESULT 0xC0000000 | 0x008f ++#define NT_STATUS_FLOAT_INVALID_OPERATION 0xC0000000 | 0x0090 ++#define NT_STATUS_FLOAT_OVERFLOW 0xC0000000 | 0x0091 ++#define NT_STATUS_FLOAT_STACK_CHECK 0xC0000000 | 0x0092 ++#define NT_STATUS_FLOAT_UNDERFLOW 0xC0000000 | 0x0093 ++#define NT_STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000000 | 0x0094 ++#define NT_STATUS_INTEGER_OVERFLOW 0xC0000000 | 0x0095 ++#define NT_STATUS_PRIVILEGED_INSTRUCTION 0xC0000000 | 0x0096 ++#define NT_STATUS_TOO_MANY_PAGING_FILES 0xC0000000 | 0x0097 ++#define NT_STATUS_FILE_INVALID 0xC0000000 | 0x0098 ++#define NT_STATUS_ALLOTTED_SPACE_EXCEEDED 0xC0000000 | 0x0099 ++#define NT_STATUS_INSUFFICIENT_RESOURCES 0xC0000000 | 0x009a ++#define NT_STATUS_DFS_EXIT_PATH_FOUND 0xC0000000 | 0x009b ++#define NT_STATUS_DEVICE_DATA_ERROR 0xC0000000 | 0x009c ++#define NT_STATUS_DEVICE_NOT_CONNECTED 0xC0000000 | 0x009d ++#define NT_STATUS_DEVICE_POWER_FAILURE 0xC0000000 | 0x009e ++#define NT_STATUS_FREE_VM_NOT_AT_BASE 0xC0000000 | 0x009f ++#define NT_STATUS_MEMORY_NOT_ALLOCATED 0xC0000000 | 0x00a0 ++#define NT_STATUS_WORKING_SET_QUOTA 0xC0000000 | 0x00a1 ++#define NT_STATUS_MEDIA_WRITE_PROTECTED 0xC0000000 | 0x00a2 ++#define NT_STATUS_DEVICE_NOT_READY 0xC0000000 | 0x00a3 ++#define NT_STATUS_INVALID_GROUP_ATTRIBUTES 0xC0000000 | 0x00a4 ++#define NT_STATUS_BAD_IMPERSONATION_LEVEL 0xC0000000 | 0x00a5 ++#define NT_STATUS_CANT_OPEN_ANONYMOUS 0xC0000000 | 0x00a6 ++#define NT_STATUS_BAD_VALIDATION_CLASS 0xC0000000 | 0x00a7 ++#define NT_STATUS_BAD_TOKEN_TYPE 0xC0000000 | 0x00a8 ++#define NT_STATUS_BAD_MASTER_BOOT_RECORD 0xC0000000 | 0x00a9 ++#define NT_STATUS_INSTRUCTION_MISALIGNMENT 0xC0000000 | 0x00aa ++#define NT_STATUS_INSTANCE_NOT_AVAILABLE 0xC0000000 | 0x00ab ++#define NT_STATUS_PIPE_NOT_AVAILABLE 0xC0000000 | 0x00ac ++#define NT_STATUS_INVALID_PIPE_STATE 0xC0000000 | 0x00ad ++#define NT_STATUS_PIPE_BUSY 0xC0000000 | 0x00ae ++#define NT_STATUS_ILLEGAL_FUNCTION 0xC0000000 | 0x00af ++#define NT_STATUS_PIPE_DISCONNECTED 0xC0000000 | 0x00b0 ++#define NT_STATUS_PIPE_CLOSING 0xC0000000 | 0x00b1 ++#define NT_STATUS_PIPE_CONNECTED 0xC0000000 | 0x00b2 ++#define NT_STATUS_PIPE_LISTENING 0xC0000000 | 0x00b3 ++#define NT_STATUS_INVALID_READ_MODE 0xC0000000 | 0x00b4 ++#define NT_STATUS_IO_TIMEOUT 0xC0000000 | 0x00b5 ++#define NT_STATUS_FILE_FORCED_CLOSED 0xC0000000 | 0x00b6 ++#define NT_STATUS_PROFILING_NOT_STARTED 0xC0000000 | 0x00b7 ++#define NT_STATUS_PROFILING_NOT_STOPPED 0xC0000000 | 0x00b8 ++#define NT_STATUS_COULD_NOT_INTERPRET 0xC0000000 | 0x00b9 ++#define NT_STATUS_FILE_IS_A_DIRECTORY 0xC0000000 | 0x00ba ++#define NT_STATUS_NOT_SUPPORTED 0xC0000000 | 0x00bb ++#define NT_STATUS_REMOTE_NOT_LISTENING 0xC0000000 | 0x00bc ++#define NT_STATUS_DUPLICATE_NAME 0xC0000000 | 0x00bd ++#define NT_STATUS_BAD_NETWORK_PATH 0xC0000000 | 0x00be ++#define NT_STATUS_NETWORK_BUSY 0xC0000000 | 0x00bf ++#define NT_STATUS_DEVICE_DOES_NOT_EXIST 0xC0000000 | 0x00c0 ++#define NT_STATUS_TOO_MANY_COMMANDS 0xC0000000 | 0x00c1 ++#define NT_STATUS_ADAPTER_HARDWARE_ERROR 0xC0000000 | 0x00c2 ++#define NT_STATUS_INVALID_NETWORK_RESPONSE 0xC0000000 | 0x00c3 ++#define NT_STATUS_UNEXPECTED_NETWORK_ERROR 0xC0000000 | 0x00c4 ++#define NT_STATUS_BAD_REMOTE_ADAPTER 0xC0000000 | 0x00c5 ++#define NT_STATUS_PRINT_QUEUE_FULL 0xC0000000 | 0x00c6 ++#define NT_STATUS_NO_SPOOL_SPACE 0xC0000000 | 0x00c7 ++#define NT_STATUS_PRINT_CANCELLED 0xC0000000 | 0x00c8 ++#define NT_STATUS_NETWORK_NAME_DELETED 0xC0000000 | 0x00c9 ++#define NT_STATUS_NETWORK_ACCESS_DENIED 0xC0000000 | 0x00ca ++#define NT_STATUS_BAD_DEVICE_TYPE 0xC0000000 | 0x00cb ++#define NT_STATUS_BAD_NETWORK_NAME 0xC0000000 | 0x00cc ++#define NT_STATUS_TOO_MANY_NAMES 0xC0000000 | 0x00cd ++#define NT_STATUS_TOO_MANY_SESSIONS 0xC0000000 | 0x00ce ++#define NT_STATUS_SHARING_PAUSED 0xC0000000 | 0x00cf ++#define NT_STATUS_REQUEST_NOT_ACCEPTED 0xC0000000 | 0x00d0 ++#define NT_STATUS_REDIRECTOR_PAUSED 0xC0000000 | 0x00d1 ++#define NT_STATUS_NET_WRITE_FAULT 0xC0000000 | 0x00d2 ++#define NT_STATUS_PROFILING_AT_LIMIT 0xC0000000 | 0x00d3 ++#define NT_STATUS_NOT_SAME_DEVICE 0xC0000000 | 0x00d4 ++#define NT_STATUS_FILE_RENAMED 0xC0000000 | 0x00d5 ++#define NT_STATUS_VIRTUAL_CIRCUIT_CLOSED 0xC0000000 | 0x00d6 ++#define NT_STATUS_NO_SECURITY_ON_OBJECT 0xC0000000 | 0x00d7 ++#define NT_STATUS_CANT_WAIT 0xC0000000 | 0x00d8 ++#define NT_STATUS_PIPE_EMPTY 0xC0000000 | 0x00d9 ++#define NT_STATUS_CANT_ACCESS_DOMAIN_INFO 0xC0000000 | 0x00da ++#define NT_STATUS_CANT_TERMINATE_SELF 0xC0000000 | 0x00db ++#define NT_STATUS_INVALID_SERVER_STATE 0xC0000000 | 0x00dc ++#define NT_STATUS_INVALID_DOMAIN_STATE 0xC0000000 | 0x00dd ++#define NT_STATUS_INVALID_DOMAIN_ROLE 0xC0000000 | 0x00de ++#define NT_STATUS_NO_SUCH_DOMAIN 0xC0000000 | 0x00df ++#define NT_STATUS_DOMAIN_EXISTS 0xC0000000 | 0x00e0 ++#define NT_STATUS_DOMAIN_LIMIT_EXCEEDED 0xC0000000 | 0x00e1 ++#define NT_STATUS_OPLOCK_NOT_GRANTED 0xC0000000 | 0x00e2 ++#define NT_STATUS_INVALID_OPLOCK_PROTOCOL 0xC0000000 | 0x00e3 ++#define NT_STATUS_INTERNAL_DB_CORRUPTION 0xC0000000 | 0x00e4 ++#define NT_STATUS_INTERNAL_ERROR 0xC0000000 | 0x00e5 ++#define NT_STATUS_GENERIC_NOT_MAPPED 0xC0000000 | 0x00e6 ++#define NT_STATUS_BAD_DESCRIPTOR_FORMAT 0xC0000000 | 0x00e7 ++#define NT_STATUS_INVALID_USER_BUFFER 0xC0000000 | 0x00e8 ++#define NT_STATUS_UNEXPECTED_IO_ERROR 0xC0000000 | 0x00e9 ++#define NT_STATUS_UNEXPECTED_MM_CREATE_ERR 0xC0000000 | 0x00ea ++#define NT_STATUS_UNEXPECTED_MM_MAP_ERROR 0xC0000000 | 0x00eb ++#define NT_STATUS_UNEXPECTED_MM_EXTEND_ERR 0xC0000000 | 0x00ec ++#define NT_STATUS_NOT_LOGON_PROCESS 0xC0000000 | 0x00ed ++#define NT_STATUS_LOGON_SESSION_EXISTS 0xC0000000 | 0x00ee ++#define NT_STATUS_INVALID_PARAMETER_1 0xC0000000 | 0x00ef ++#define NT_STATUS_INVALID_PARAMETER_2 0xC0000000 | 0x00f0 ++#define NT_STATUS_INVALID_PARAMETER_3 0xC0000000 | 0x00f1 ++#define NT_STATUS_INVALID_PARAMETER_4 0xC0000000 | 0x00f2 ++#define NT_STATUS_INVALID_PARAMETER_5 0xC0000000 | 0x00f3 ++#define NT_STATUS_INVALID_PARAMETER_6 0xC0000000 | 0x00f4 ++#define NT_STATUS_INVALID_PARAMETER_7 0xC0000000 | 0x00f5 ++#define NT_STATUS_INVALID_PARAMETER_8 0xC0000000 | 0x00f6 ++#define NT_STATUS_INVALID_PARAMETER_9 0xC0000000 | 0x00f7 ++#define NT_STATUS_INVALID_PARAMETER_10 0xC0000000 | 0x00f8 ++#define NT_STATUS_INVALID_PARAMETER_11 0xC0000000 | 0x00f9 ++#define NT_STATUS_INVALID_PARAMETER_12 0xC0000000 | 0x00fa ++#define NT_STATUS_REDIRECTOR_NOT_STARTED 0xC0000000 | 0x00fb ++#define NT_STATUS_REDIRECTOR_STARTED 0xC0000000 | 0x00fc ++#define NT_STATUS_STACK_OVERFLOW 0xC0000000 | 0x00fd ++#define NT_STATUS_NO_SUCH_PACKAGE 0xC0000000 | 0x00fe ++#define NT_STATUS_BAD_FUNCTION_TABLE 0xC0000000 | 0x00ff ++#define NT_STATUS_DIRECTORY_NOT_EMPTY 0xC0000000 | 0x0101 ++#define NT_STATUS_FILE_CORRUPT_ERROR 0xC0000000 | 0x0102 ++#define NT_STATUS_NOT_A_DIRECTORY 0xC0000000 | 0x0103 ++#define NT_STATUS_BAD_LOGON_SESSION_STATE 0xC0000000 | 0x0104 ++#define NT_STATUS_LOGON_SESSION_COLLISION 0xC0000000 | 0x0105 ++#define NT_STATUS_NAME_TOO_LONG 0xC0000000 | 0x0106 ++#define NT_STATUS_FILES_OPEN 0xC0000000 | 0x0107 ++#define NT_STATUS_CONNECTION_IN_USE 0xC0000000 | 0x0108 ++#define NT_STATUS_MESSAGE_NOT_FOUND 0xC0000000 | 0x0109 ++#define NT_STATUS_PROCESS_IS_TERMINATING 0xC0000000 | 0x010a ++#define NT_STATUS_INVALID_LOGON_TYPE 0xC0000000 | 0x010b ++#define NT_STATUS_NO_GUID_TRANSLATION 0xC0000000 | 0x010c ++#define NT_STATUS_CANNOT_IMPERSONATE 0xC0000000 | 0x010d ++#define NT_STATUS_IMAGE_ALREADY_LOADED 0xC0000000 | 0x010e ++#define NT_STATUS_ABIOS_NOT_PRESENT 0xC0000000 | 0x010f ++#define NT_STATUS_ABIOS_LID_NOT_EXIST 0xC0000000 | 0x0110 ++#define NT_STATUS_ABIOS_LID_ALREADY_OWNED 0xC0000000 | 0x0111 ++#define NT_STATUS_ABIOS_NOT_LID_OWNER 0xC0000000 | 0x0112 ++#define NT_STATUS_ABIOS_INVALID_COMMAND 0xC0000000 | 0x0113 ++#define NT_STATUS_ABIOS_INVALID_LID 0xC0000000 | 0x0114 ++#define NT_STATUS_ABIOS_SELECTOR_NOT_AVAILABLE 0xC0000000 | 0x0115 ++#define NT_STATUS_ABIOS_INVALID_SELECTOR 0xC0000000 | 0x0116 ++#define NT_STATUS_NO_LDT 0xC0000000 | 0x0117 ++#define NT_STATUS_INVALID_LDT_SIZE 0xC0000000 | 0x0118 ++#define NT_STATUS_INVALID_LDT_OFFSET 0xC0000000 | 0x0119 ++#define NT_STATUS_INVALID_LDT_DESCRIPTOR 0xC0000000 | 0x011a ++#define NT_STATUS_INVALID_IMAGE_NE_FORMAT 0xC0000000 | 0x011b ++#define NT_STATUS_RXACT_INVALID_STATE 0xC0000000 | 0x011c ++#define NT_STATUS_RXACT_COMMIT_FAILURE 0xC0000000 | 0x011d ++#define NT_STATUS_MAPPED_FILE_SIZE_ZERO 0xC0000000 | 0x011e ++#define NT_STATUS_TOO_MANY_OPENED_FILES 0xC0000000 | 0x011f ++#define NT_STATUS_CANCELLED 0xC0000000 | 0x0120 ++#define NT_STATUS_CANNOT_DELETE 0xC0000000 | 0x0121 ++#define NT_STATUS_INVALID_COMPUTER_NAME 0xC0000000 | 0x0122 ++#define NT_STATUS_FILE_DELETED 0xC0000000 | 0x0123 ++#define NT_STATUS_SPECIAL_ACCOUNT 0xC0000000 | 0x0124 ++#define NT_STATUS_SPECIAL_GROUP 0xC0000000 | 0x0125 ++#define NT_STATUS_SPECIAL_USER 0xC0000000 | 0x0126 ++#define NT_STATUS_MEMBERS_PRIMARY_GROUP 0xC0000000 | 0x0127 ++#define NT_STATUS_FILE_CLOSED 0xC0000000 | 0x0128 ++#define NT_STATUS_TOO_MANY_THREADS 0xC0000000 | 0x0129 ++#define NT_STATUS_THREAD_NOT_IN_PROCESS 0xC0000000 | 0x012a ++#define NT_STATUS_TOKEN_ALREADY_IN_USE 0xC0000000 | 0x012b ++#define NT_STATUS_PAGEFILE_QUOTA_EXCEEDED 0xC0000000 | 0x012c ++#define NT_STATUS_COMMITMENT_LIMIT 0xC0000000 | 0x012d ++#define NT_STATUS_INVALID_IMAGE_LE_FORMAT 0xC0000000 | 0x012e ++#define NT_STATUS_INVALID_IMAGE_NOT_MZ 0xC0000000 | 0x012f ++#define NT_STATUS_INVALID_IMAGE_PROTECT 0xC0000000 | 0x0130 ++#define NT_STATUS_INVALID_IMAGE_WIN_16 0xC0000000 | 0x0131 ++#define NT_STATUS_LOGON_SERVER_CONFLICT 0xC0000000 | 0x0132 ++#define NT_STATUS_TIME_DIFFERENCE_AT_DC 0xC0000000 | 0x0133 ++#define NT_STATUS_SYNCHRONIZATION_REQUIRED 0xC0000000 | 0x0134 ++#define NT_STATUS_DLL_NOT_FOUND 0xC0000000 | 0x0135 ++#define NT_STATUS_OPEN_FAILED 0xC0000000 | 0x0136 ++#define NT_STATUS_IO_PRIVILEGE_FAILED 0xC0000000 | 0x0137 ++#define NT_STATUS_ORDINAL_NOT_FOUND 0xC0000000 | 0x0138 ++#define NT_STATUS_ENTRYPOINT_NOT_FOUND 0xC0000000 | 0x0139 ++#define NT_STATUS_CONTROL_C_EXIT 0xC0000000 | 0x013a ++#define NT_STATUS_LOCAL_DISCONNECT 0xC0000000 | 0x013b ++#define NT_STATUS_REMOTE_DISCONNECT 0xC0000000 | 0x013c ++#define NT_STATUS_REMOTE_RESOURCES 0xC0000000 | 0x013d ++#define NT_STATUS_LINK_FAILED 0xC0000000 | 0x013e ++#define NT_STATUS_LINK_TIMEOUT 0xC0000000 | 0x013f ++#define NT_STATUS_INVALID_CONNECTION 0xC0000000 | 0x0140 ++#define NT_STATUS_INVALID_ADDRESS 0xC0000000 | 0x0141 ++#define NT_STATUS_DLL_INIT_FAILED 0xC0000000 | 0x0142 ++#define NT_STATUS_MISSING_SYSTEMFILE 0xC0000000 | 0x0143 ++#define NT_STATUS_UNHANDLED_EXCEPTION 0xC0000000 | 0x0144 ++#define NT_STATUS_APP_INIT_FAILURE 0xC0000000 | 0x0145 ++#define NT_STATUS_PAGEFILE_CREATE_FAILED 0xC0000000 | 0x0146 ++#define NT_STATUS_NO_PAGEFILE 0xC0000000 | 0x0147 ++#define NT_STATUS_INVALID_LEVEL 0xC0000000 | 0x0148 ++#define NT_STATUS_WRONG_PASSWORD_CORE 0xC0000000 | 0x0149 ++#define NT_STATUS_ILLEGAL_FLOAT_CONTEXT 0xC0000000 | 0x014a ++#define NT_STATUS_PIPE_BROKEN 0xC0000000 | 0x014b ++#define NT_STATUS_REGISTRY_CORRUPT 0xC0000000 | 0x014c ++#define NT_STATUS_REGISTRY_IO_FAILED 0xC0000000 | 0x014d ++#define NT_STATUS_NO_EVENT_PAIR 0xC0000000 | 0x014e ++#define NT_STATUS_UNRECOGNIZED_VOLUME 0xC0000000 | 0x014f ++#define NT_STATUS_SERIAL_NO_DEVICE_INITED 0xC0000000 | 0x0150 ++#define NT_STATUS_NO_SUCH_ALIAS 0xC0000000 | 0x0151 ++#define NT_STATUS_MEMBER_NOT_IN_ALIAS 0xC0000000 | 0x0152 ++#define NT_STATUS_MEMBER_IN_ALIAS 0xC0000000 | 0x0153 ++#define NT_STATUS_ALIAS_EXISTS 0xC0000000 | 0x0154 ++#define NT_STATUS_LOGON_NOT_GRANTED 0xC0000000 | 0x0155 ++#define NT_STATUS_TOO_MANY_SECRETS 0xC0000000 | 0x0156 ++#define NT_STATUS_SECRET_TOO_LONG 0xC0000000 | 0x0157 ++#define NT_STATUS_INTERNAL_DB_ERROR 0xC0000000 | 0x0158 ++#define NT_STATUS_FULLSCREEN_MODE 0xC0000000 | 0x0159 ++#define NT_STATUS_TOO_MANY_CONTEXT_IDS 0xC0000000 | 0x015a ++#define NT_STATUS_LOGON_TYPE_NOT_GRANTED 0xC0000000 | 0x015b ++#define NT_STATUS_NOT_REGISTRY_FILE 0xC0000000 | 0x015c ++#define NT_STATUS_NT_CROSS_ENCRYPTION_REQUIRED 0xC0000000 | 0x015d ++#define NT_STATUS_DOMAIN_CTRLR_CONFIG_ERROR 0xC0000000 | 0x015e ++#define NT_STATUS_FT_MISSING_MEMBER 0xC0000000 | 0x015f ++#define NT_STATUS_ILL_FORMED_SERVICE_ENTRY 0xC0000000 | 0x0160 ++#define NT_STATUS_ILLEGAL_CHARACTER 0xC0000000 | 0x0161 ++#define NT_STATUS_UNMAPPABLE_CHARACTER 0xC0000000 | 0x0162 ++#define NT_STATUS_UNDEFINED_CHARACTER 0xC0000000 | 0x0163 ++#define NT_STATUS_FLOPPY_VOLUME 0xC0000000 | 0x0164 ++#define NT_STATUS_FLOPPY_ID_MARK_NOT_FOUND 0xC0000000 | 0x0165 ++#define NT_STATUS_FLOPPY_WRONG_CYLINDER 0xC0000000 | 0x0166 ++#define NT_STATUS_FLOPPY_UNKNOWN_ERROR 0xC0000000 | 0x0167 ++#define NT_STATUS_FLOPPY_BAD_REGISTERS 0xC0000000 | 0x0168 ++#define NT_STATUS_DISK_RECALIBRATE_FAILED 0xC0000000 | 0x0169 ++#define NT_STATUS_DISK_OPERATION_FAILED 0xC0000000 | 0x016a ++#define NT_STATUS_DISK_RESET_FAILED 0xC0000000 | 0x016b ++#define NT_STATUS_SHARED_IRQ_BUSY 0xC0000000 | 0x016c ++#define NT_STATUS_FT_ORPHANING 0xC0000000 | 0x016d ++#define NT_STATUS_PARTITION_FAILURE 0xC0000000 | 0x0172 ++#define NT_STATUS_INVALID_BLOCK_LENGTH 0xC0000000 | 0x0173 ++#define NT_STATUS_DEVICE_NOT_PARTITIONED 0xC0000000 | 0x0174 ++#define NT_STATUS_UNABLE_TO_LOCK_MEDIA 0xC0000000 | 0x0175 ++#define NT_STATUS_UNABLE_TO_UNLOAD_MEDIA 0xC0000000 | 0x0176 ++#define NT_STATUS_EOM_OVERFLOW 0xC0000000 | 0x0177 ++#define NT_STATUS_NO_MEDIA 0xC0000000 | 0x0178 ++#define NT_STATUS_NO_SUCH_MEMBER 0xC0000000 | 0x017a ++#define NT_STATUS_INVALID_MEMBER 0xC0000000 | 0x017b ++#define NT_STATUS_KEY_DELETED 0xC0000000 | 0x017c ++#define NT_STATUS_NO_LOG_SPACE 0xC0000000 | 0x017d ++#define NT_STATUS_TOO_MANY_SIDS 0xC0000000 | 0x017e ++#define NT_STATUS_LM_CROSS_ENCRYPTION_REQUIRED 0xC0000000 | 0x017f ++#define NT_STATUS_KEY_HAS_CHILDREN 0xC0000000 | 0x0180 ++#define NT_STATUS_CHILD_MUST_BE_VOLATILE 0xC0000000 | 0x0181 ++#define NT_STATUS_DEVICE_CONFIGURATION_ERROR 0xC0000000 | 0x0182 ++#define NT_STATUS_DRIVER_INTERNAL_ERROR 0xC0000000 | 0x0183 ++#define NT_STATUS_INVALID_DEVICE_STATE 0xC0000000 | 0x0184 ++#define NT_STATUS_IO_DEVICE_ERROR 0xC0000000 | 0x0185 ++#define NT_STATUS_DEVICE_PROTOCOL_ERROR 0xC0000000 | 0x0186 ++#define NT_STATUS_BACKUP_CONTROLLER 0xC0000000 | 0x0187 ++#define NT_STATUS_LOG_FILE_FULL 0xC0000000 | 0x0188 ++#define NT_STATUS_TOO_LATE 0xC0000000 | 0x0189 ++#define NT_STATUS_NO_TRUST_LSA_SECRET 0xC0000000 | 0x018a ++#define NT_STATUS_NO_TRUST_SAM_ACCOUNT 0xC0000000 | 0x018b ++#define NT_STATUS_TRUSTED_DOMAIN_FAILURE 0xC0000000 | 0x018c ++#define NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE 0xC0000000 | 0x018d ++#define NT_STATUS_EVENTLOG_FILE_CORRUPT 0xC0000000 | 0x018e ++#define NT_STATUS_EVENTLOG_CANT_START 0xC0000000 | 0x018f ++#define NT_STATUS_TRUST_FAILURE 0xC0000000 | 0x0190 ++#define NT_STATUS_MUTANT_LIMIT_EXCEEDED 0xC0000000 | 0x0191 ++#define NT_STATUS_NETLOGON_NOT_STARTED 0xC0000000 | 0x0192 ++#define NT_STATUS_ACCOUNT_EXPIRED 0xC0000000 | 0x0193 ++#define NT_STATUS_POSSIBLE_DEADLOCK 0xC0000000 | 0x0194 ++#define NT_STATUS_NETWORK_CREDENTIAL_CONFLICT 0xC0000000 | 0x0195 ++#define NT_STATUS_REMOTE_SESSION_LIMIT 0xC0000000 | 0x0196 ++#define NT_STATUS_EVENTLOG_FILE_CHANGED 0xC0000000 | 0x0197 ++#define NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT 0xC0000000 | 0x0198 ++#define NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT 0xC0000000 | 0x0199 ++#define NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT 0xC0000000 | 0x019a ++#define NT_STATUS_DOMAIN_TRUST_INCONSISTENT 0xC0000000 | 0x019b ++#define NT_STATUS_FS_DRIVER_REQUIRED 0xC0000000 | 0x019c ++#define NT_STATUS_NO_USER_SESSION_KEY 0xC0000000 | 0x0202 ++#define NT_STATUS_USER_SESSION_DELETED 0xC0000000 | 0x0203 ++#define NT_STATUS_RESOURCE_LANG_NOT_FOUND 0xC0000000 | 0x0204 ++#define NT_STATUS_INSUFF_SERVER_RESOURCES 0xC0000000 | 0x0205 ++#define NT_STATUS_INVALID_BUFFER_SIZE 0xC0000000 | 0x0206 ++#define NT_STATUS_INVALID_ADDRESS_COMPONENT 0xC0000000 | 0x0207 ++#define NT_STATUS_INVALID_ADDRESS_WILDCARD 0xC0000000 | 0x0208 ++#define NT_STATUS_TOO_MANY_ADDRESSES 0xC0000000 | 0x0209 ++#define NT_STATUS_ADDRESS_ALREADY_EXISTS 0xC0000000 | 0x020a ++#define NT_STATUS_ADDRESS_CLOSED 0xC0000000 | 0x020b ++#define NT_STATUS_CONNECTION_DISCONNECTED 0xC0000000 | 0x020c ++#define NT_STATUS_CONNECTION_RESET 0xC0000000 | 0x020d ++#define NT_STATUS_TOO_MANY_NODES 0xC0000000 | 0x020e ++#define NT_STATUS_TRANSACTION_ABORTED 0xC0000000 | 0x020f ++#define NT_STATUS_TRANSACTION_TIMED_OUT 0xC0000000 | 0x0210 ++#define NT_STATUS_TRANSACTION_NO_RELEASE 0xC0000000 | 0x0211 ++#define NT_STATUS_TRANSACTION_NO_MATCH 0xC0000000 | 0x0212 ++#define NT_STATUS_TRANSACTION_RESPONDED 0xC0000000 | 0x0213 ++#define NT_STATUS_TRANSACTION_INVALID_ID 0xC0000000 | 0x0214 ++#define NT_STATUS_TRANSACTION_INVALID_TYPE 0xC0000000 | 0x0215 ++#define NT_STATUS_NOT_SERVER_SESSION 0xC0000000 | 0x0216 ++#define NT_STATUS_NOT_CLIENT_SESSION 0xC0000000 | 0x0217 ++#define NT_STATUS_CANNOT_LOAD_REGISTRY_FILE 0xC0000000 | 0x0218 ++#define NT_STATUS_DEBUG_ATTACH_FAILED 0xC0000000 | 0x0219 ++#define NT_STATUS_SYSTEM_PROCESS_TERMINATED 0xC0000000 | 0x021a ++#define NT_STATUS_DATA_NOT_ACCEPTED 0xC0000000 | 0x021b ++#define NT_STATUS_NO_BROWSER_SERVERS_FOUND 0xC0000000 | 0x021c ++#define NT_STATUS_VDM_HARD_ERROR 0xC0000000 | 0x021d ++#define NT_STATUS_DRIVER_CANCEL_TIMEOUT 0xC0000000 | 0x021e ++#define NT_STATUS_REPLY_MESSAGE_MISMATCH 0xC0000000 | 0x021f ++#define NT_STATUS_MAPPED_ALIGNMENT 0xC0000000 | 0x0220 ++#define NT_STATUS_IMAGE_CHECKSUM_MISMATCH 0xC0000000 | 0x0221 ++#define NT_STATUS_LOST_WRITEBEHIND_DATA 0xC0000000 | 0x0222 ++#define NT_STATUS_CLIENT_SERVER_PARAMETERS_INVALID 0xC0000000 | 0x0223 ++#define NT_STATUS_PASSWORD_MUST_CHANGE 0xC0000000 | 0x0224 ++#define NT_STATUS_NOT_FOUND 0xC0000000 | 0x0225 ++#define NT_STATUS_NOT_TINY_STREAM 0xC0000000 | 0x0226 ++#define NT_STATUS_RECOVERY_FAILURE 0xC0000000 | 0x0227 ++#define NT_STATUS_STACK_OVERFLOW_READ 0xC0000000 | 0x0228 ++#define NT_STATUS_FAIL_CHECK 0xC0000000 | 0x0229 ++#define NT_STATUS_DUPLICATE_OBJECTID 0xC0000000 | 0x022a ++#define NT_STATUS_OBJECTID_EXISTS 0xC0000000 | 0x022b ++#define NT_STATUS_CONVERT_TO_LARGE 0xC0000000 | 0x022c ++#define NT_STATUS_RETRY 0xC0000000 | 0x022d ++#define NT_STATUS_FOUND_OUT_OF_SCOPE 0xC0000000 | 0x022e ++#define NT_STATUS_ALLOCATE_BUCKET 0xC0000000 | 0x022f ++#define NT_STATUS_PROPSET_NOT_FOUND 0xC0000000 | 0x0230 ++#define NT_STATUS_MARSHALL_OVERFLOW 0xC0000000 | 0x0231 ++#define NT_STATUS_INVALID_VARIANT 0xC0000000 | 0x0232 ++#define NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND 0xC0000000 | 0x0233 ++#define NT_STATUS_ACCOUNT_LOCKED_OUT 0xC0000000 | 0x0234 ++#define NT_STATUS_HANDLE_NOT_CLOSABLE 0xC0000000 | 0x0235 ++#define NT_STATUS_CONNECTION_REFUSED 0xC0000000 | 0x0236 ++#define NT_STATUS_GRACEFUL_DISCONNECT 0xC0000000 | 0x0237 ++#define NT_STATUS_ADDRESS_ALREADY_ASSOCIATED 0xC0000000 | 0x0238 ++#define NT_STATUS_ADDRESS_NOT_ASSOCIATED 0xC0000000 | 0x0239 ++#define NT_STATUS_CONNECTION_INVALID 0xC0000000 | 0x023a ++#define NT_STATUS_CONNECTION_ACTIVE 0xC0000000 | 0x023b ++#define NT_STATUS_NETWORK_UNREACHABLE 0xC0000000 | 0x023c ++#define NT_STATUS_HOST_UNREACHABLE 0xC0000000 | 0x023d ++#define NT_STATUS_PROTOCOL_UNREACHABLE 0xC0000000 | 0x023e ++#define NT_STATUS_PORT_UNREACHABLE 0xC0000000 | 0x023f ++#define NT_STATUS_REQUEST_ABORTED 0xC0000000 | 0x0240 ++#define NT_STATUS_CONNECTION_ABORTED 0xC0000000 | 0x0241 ++#define NT_STATUS_BAD_COMPRESSION_BUFFER 0xC0000000 | 0x0242 ++#define NT_STATUS_USER_MAPPED_FILE 0xC0000000 | 0x0243 ++#define NT_STATUS_AUDIT_FAILED 0xC0000000 | 0x0244 ++#define NT_STATUS_TIMER_RESOLUTION_NOT_SET 0xC0000000 | 0x0245 ++#define NT_STATUS_CONNECTION_COUNT_LIMIT 0xC0000000 | 0x0246 ++#define NT_STATUS_LOGIN_TIME_RESTRICTION 0xC0000000 | 0x0247 ++#define NT_STATUS_LOGIN_WKSTA_RESTRICTION 0xC0000000 | 0x0248 ++#define NT_STATUS_IMAGE_MP_UP_MISMATCH 0xC0000000 | 0x0249 ++#define NT_STATUS_INSUFFICIENT_LOGON_INFO 0xC0000000 | 0x0250 ++#define NT_STATUS_BAD_DLL_ENTRYPOINT 0xC0000000 | 0x0251 ++#define NT_STATUS_BAD_SERVICE_ENTRYPOINT 0xC0000000 | 0x0252 ++#define NT_STATUS_LPC_REPLY_LOST 0xC0000000 | 0x0253 ++#define NT_STATUS_IP_ADDRESS_CONFLICT1 0xC0000000 | 0x0254 ++#define NT_STATUS_IP_ADDRESS_CONFLICT2 0xC0000000 | 0x0255 ++#define NT_STATUS_REGISTRY_QUOTA_LIMIT 0xC0000000 | 0x0256 ++#define NT_STATUS_PATH_NOT_COVERED 0xC0000000 | 0x0257 ++#define NT_STATUS_NO_CALLBACK_ACTIVE 0xC0000000 | 0x0258 ++#define NT_STATUS_LICENSE_QUOTA_EXCEEDED 0xC0000000 | 0x0259 ++#define NT_STATUS_PWD_TOO_SHORT 0xC0000000 | 0x025a ++#define NT_STATUS_PWD_TOO_RECENT 0xC0000000 | 0x025b ++#define NT_STATUS_PWD_HISTORY_CONFLICT 0xC0000000 | 0x025c ++#define NT_STATUS_PLUGPLAY_NO_DEVICE 0xC0000000 | 0x025e ++#define NT_STATUS_UNSUPPORTED_COMPRESSION 0xC0000000 | 0x025f ++#define NT_STATUS_INVALID_HW_PROFILE 0xC0000000 | 0x0260 ++#define NT_STATUS_INVALID_PLUGPLAY_DEVICE_PATH 0xC0000000 | 0x0261 ++#define NT_STATUS_DRIVER_ORDINAL_NOT_FOUND 0xC0000000 | 0x0262 ++#define NT_STATUS_DRIVER_ENTRYPOINT_NOT_FOUND 0xC0000000 | 0x0263 ++#define NT_STATUS_RESOURCE_NOT_OWNED 0xC0000000 | 0x0264 ++#define NT_STATUS_TOO_MANY_LINKS 0xC0000000 | 0x0265 ++#define NT_STATUS_QUOTA_LIST_INCONSISTENT 0xC0000000 | 0x0266 ++#define NT_STATUS_FILE_IS_OFFLINE 0xC0000000 | 0x0267 ++#define NT_STATUS_NO_SUCH_JOB 0xC0000000 | 0xEDE /* scheduler */ ++ ++#endif /* _NTERR_H */ +diff -urN linux-2.4.29.old/fs/cifs/ntlmssp.h linux-2.4.29/fs/cifs/ntlmssp.h +--- linux-2.4.29.old/fs/cifs/ntlmssp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/ntlmssp.h 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,101 @@ ++/* ++ * fs/cifs/ntlmssp.h ++ * ++ * Copyright (c) International Business Machines Corp., 2002 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#pragma pack(1) ++ ++#define NTLMSSP_SIGNATURE "NTLMSSP" ++/* Message Types */ ++#define NtLmNegotiate 1 ++#define NtLmChallenge 2 ++#define NtLmAuthenticate 3 ++#define UnknownMessage 8 ++ ++/* Negotiate Flags */ ++#define NTLMSSP_NEGOTIATE_UNICODE 0x01 // Text strings are in unicode ++#define NTLMSSP_NEGOTIATE_OEM 0x02 // Text strings are in OEM ++#define NTLMSSP_REQUEST_TARGET 0x04 // Server return its auth realm ++#define NTLMSSP_NEGOTIATE_SIGN 0x0010 // Request signature capability ++#define NTLMSSP_NEGOTIATE_SEAL 0x0020 // Request confidentiality ++#define NTLMSSP_NEGOTIATE_DGRAM 0x0040 ++#define NTLMSSP_NEGOTIATE_LM_KEY 0x0080 // Use LM session key for sign/seal ++#define NTLMSSP_NEGOTIATE_NTLM 0x0200 // NTLM authentication ++#define NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED 0x1000 ++#define NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED 0x2000 ++#define NTLMSSP_NEGOTIATE_LOCAL_CALL 0x4000 // client/server on same machine ++#define NTLMSSP_NEGOTIATE_ALWAYS_SIGN 0x8000 // Sign for all security levels ++#define NTLMSSP_TARGET_TYPE_DOMAIN 0x10000 ++#define NTLMSSP_TARGET_TYPE_SERVER 0x20000 ++#define NTLMSSP_TARGET_TYPE_SHARE 0x40000 ++#define NTLMSSP_NEGOTIATE_NTLMV2 0x80000 ++#define NTLMSSP_REQUEST_INIT_RESP 0x100000 ++#define NTLMSSP_REQUEST_ACCEPT_RESP 0x200000 ++#define NTLMSSP_REQUEST_NOT_NT_KEY 0x400000 ++#define NTLMSSP_NEGOTIATE_TARGET_INFO 0x800000 ++#define NTLMSSP_NEGOTIATE_128 0x20000000 ++#define NTLMSSP_NEGOTIATE_KEY_XCH 0x40000000 ++#define NTLMSSP_NEGOTIATE_56 0x80000000 ++ ++/* Although typedefs are not commonly used for structure definitions */ ++/* in the Linux kernel, in this particular case they are useful */ ++/* to more closely match the standards document for NTLMSSP from */ ++/* OpenGroup and to make the code more closely match the standard in */ ++/* appearance */ ++ ++typedef struct _SECURITY_BUFFER { ++ __u16 Length; ++ __u16 MaximumLength; ++ __u32 Buffer; /* offset to buffer */ ++} SECURITY_BUFFER; ++ ++typedef struct _NEGOTIATE_MESSAGE { ++ __u8 Signature[sizeof (NTLMSSP_SIGNATURE)]; ++ __u32 MessageType; /* 1 */ ++ __u32 NegotiateFlags; ++ SECURITY_BUFFER DomainName; /* RFC 1001 style and ASCII */ ++ SECURITY_BUFFER WorkstationName; /* RFC 1001 and ASCII */ ++ char DomainString[0]; ++ /* followed by WorkstationString */ ++} NEGOTIATE_MESSAGE, *PNEGOTIATE_MESSAGE; ++ ++typedef struct _CHALLENGE_MESSAGE { ++ __u8 Signature[sizeof (NTLMSSP_SIGNATURE)]; ++ __u32 MessageType; /* 2 */ ++ SECURITY_BUFFER TargetName; ++ __u32 NegotiateFlags; ++ __u8 Challenge[CIFS_CRYPTO_KEY_SIZE]; ++ __u8 Reserved[8]; ++ SECURITY_BUFFER TargetInfoArray; ++} CHALLENGE_MESSAGE, *PCHALLENGE_MESSAGE; ++ ++typedef struct _AUTHENTICATE_MESSAGE { ++ __u8 Signature[sizeof (NTLMSSP_SIGNATURE)]; ++ __u32 MessageType; /* 3 */ ++ SECURITY_BUFFER LmChallengeResponse; ++ SECURITY_BUFFER NtChallengeResponse; ++ SECURITY_BUFFER DomainName; ++ SECURITY_BUFFER UserName; ++ SECURITY_BUFFER WorkstationName; ++ SECURITY_BUFFER SessionKey; ++ __u32 NegotiateFlags; ++ char UserString[0]; ++} AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE; ++ ++#pragma pack() /* resume default structure packing */ +diff -urN linux-2.4.29.old/fs/cifs/README linux-2.4.29/fs/cifs/README +--- linux-2.4.29.old/fs/cifs/README 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/README 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,356 @@ ++The CIFS VFS support for Linux supports many advanced network filesystem ++features such as heirarchical dfs like namespace, hardlinks, locking and more. ++It was designed to comply with the SNIA CIFS Technical Reference (which ++supersedes the 1992 X/Open SMB Standard) as well as to perform best practice ++practical interoperability with Windows 2000, Windows XP, Samba and equivalent ++servers. ++ ++For questions or bug reports please contact: ++ sfrench@samba.org (sfrench@us.ibm.com) ++ ++Build instructions: ++================== ++For Linux 2.4: ++1) Get the kernel source (e.g.from http://www.kernel.org) ++and download the cifs vfs source (see the project page ++at http://us1.samba.org/samba/Linux_CIFS_client.html) ++and change directory into the top of the kernel directory ++then patch the kernel (e.g. "patch -p1 < cifs_24.patch") ++to add the cifs vfs to your kernel configure options if ++it has not already been added (e.g. current SuSE and UL ++users do not need to apply the cifs_24.patch since the cifs vfs is ++already in the kernel configure menu) and then ++mkdir linux/fs/cifs and then copy the current cifs vfs files from ++the cifs download to your kernel build directory e.g. ++ ++ cp <cifs_download_dir>/fs/cifs/* to <kernel_download_dir>/fs/cifs ++ ++2) make menuconfig (or make xconfig) ++3) select cifs from within the network filesystem choices ++4) save and exit ++5) make dep ++6) make modules (or "make" if CIFS VFS not to be built as a module) ++ ++For Linux 2.5: ++1) Download the kernel (e.g. from http://www.kernel.org or from bitkeeper ++at bk://linux.bkbits.net/linux-2.5) and change directory into the top ++of the kernel directory tree (e.g. /usr/src/linux-2.5.73) ++2) make menuconfig (or make xconfig) ++3) select cifs from within the network filesystem choices ++4) save and exit ++5) make ++ ++ ++Installation instructions: ++========================= ++If you have built the CIFS vfs as module (successfully) simply ++type "make modules_install" (or if you prefer, manually copy the file to ++the modules directory e.g. /lib/modules/2.4.10-4GB/kernel/fs/cifs/cifs.o). ++ ++If you have built the CIFS vfs into the kernel itself, follow the instructions ++for your distribution on how to install a new kernel (usually you ++would simply type "make install"). ++ ++If you do not have the utility mount.cifs (in the Samba 3.0 source tree and on ++the CIFS VFS web site) copy it to the same directory in which mount.smbfs and ++similar files reside (usually /sbin). Although the helper software is not ++required, mount.cifs is recommended. Eventually the Samba 3.0 utility program ++"net" may also be helpful since it may someday provide easier mount syntax for ++users who are used to Windows e.g. net use <mount point> <UNC name or cifs URL> ++Note that running the Winbind pam/nss module (logon service) on all of your ++Linux clients is useful in mapping Uids and Gids consistently across the ++domain to the proper network user. The mount.cifs mount helper can be ++trivially built from Samba 3.0 or later source e.g. by executing: ++ ++ gcc samba/source/client/mount.cifs.c -o mount.cifs ++ ++Note that when the mount.cifs utility is run suid (allowing user mounts), ++in order to reduce risks, the "nosuid" mount flag is passed in on mount to ++disallow execution of an suid program mounted on the remote target. ++When mount is executed as root, nosuid is not passed in by default, ++and execution of suid programs on the remote target would be enabled ++by default. This can be changed, as with nfs and other filesystems, ++by simply specifying "nosuid" among the mount options. For user mounts ++though to be able to pass the suid flag to mount requires rebuilding ++mount.cifs with the following flag: ++ ++ gcc samba/source/client/mount.cifs.c -DCIFS_ALLOW_USR_SUID -o mount.cifs ++ ++There is a corresponding manual page for cifs mounting in the Samba 3.0 and ++later source tree in docs/manpages/mount.cifs.8 ++ ++Samba Considerations ++==================== ++To get the maximum benefit from the CIFS VFS, we recommend using a server that ++supports the SNIA CIFS Unix Extensions standard (e.g. Samba 2.2.5 or later or ++Samba 3.0) but the CIFS vfs works fine with a wide variety of CIFS servers. ++Note that uid, gid and file permissions will display default values if you do ++not have a server that supports the Unix extensions for CIFS (such as Samba ++2.2.5 or later). To enable the Unix CIFS Extensions in the Samba server, add ++the line: ++ ++ unix extensions = yes ++ ++to your smb.conf file on the server. Note that the following smb.conf settings ++are also useful (on the Samba server) when the majority of clients are Unix or ++Linux: ++ ++ case sensitive = yes ++ delete readonly = yes ++ ea support = yes ++ ++Note that ea support is required for supporting Linux xattrs. ++Some administrators also change the "map archive" and the "create mask" ++parameters from their default values. Creating special devices (mknod) ++remotely may require specifying a mkdev function to Samba if you are not using ++Samba 3.0.5 or later. For more information on these see the manual pages ++("man smb.conf") on the Samba server system. Note that the cifs vfs, ++unlike the smbfs vfs, does not read the smb.conf on the client system ++(the few optional settings are passed in on mount via -o parameters instead). ++Note that Samba 2.2.7 or later includes a fix that allows the CIFS VFS to delete ++open files (required for strict POSIX compliance). Windows Servers already ++supported this feature. Samba server does not allow symlinks that refer to files ++outside of the share, so in Samba versions prior to 3.0.5, most symlinks to ++files with absolute paths (ie beginning with slash) such as: ++ ln -s /mnt/foo bar ++would be forbidden. Samba 3.0.5 server or later includes the ability to create ++such symlinks safely by converting unsafe symlinks (ie symlinks to server ++files that are outside of the share) to a samba specific format on the server ++that is ignored by local server applications and non-cifs clients and that will ++not be traversed by the Samba server). This is opaque to the Linux client ++application using the cifs vfs. Absolute symlinks will work to Samba 3.0.5 or ++later, but only for remote clients using the CIFS Unix extensions, and will ++be invisbile to Windows clients and typically will not affect local ++applications running on the same server as Samba. ++ ++Use instructions: ++================ ++Once the CIFS VFS support is built into the kernel or installed as a module ++(cifs.o), you can use mount syntax like the following to access Samba or Windows ++servers: ++ ++ mount -t cifs //9.53.216.11/e$ /mnt -o user=myname,pass=mypassword ++ ++Before -o the option -v may be specified to make the mount.cifs ++mount helper display the mount steps more verbosely. ++After -o the following commonly used cifs vfs specific options ++are supported: ++ ++ user=<username> ++ pass=<password> ++ domain=<domain name> ++ ++Other cifs mount options are described below. Use of TCP names (in addition to ++ip addresses) is available if the mount helper (mount.cifs) is installed. If ++you do not trust the server to which are mounted, or if you do not have ++cifs signing enabled (and the physical network is insecure), consider use ++of the standard mount options "noexec" and "nosuid" to reduce the risk of ++running an altered binary on your local system (downloaded from a hostile server ++or altered by a hostile router). ++ ++When using the mount helper mount.cifs, passwords may be specified via alternate ++mechanisms, instead of specifying it after -o using the normal "pass=" syntax ++on the command line: ++1) By including it in a credential file. Specify credentials=filename as one ++of the mount options. Credential files contain two lines ++ username=someuser ++ password=your_password ++2) By specifying the password in the PASSWD environment variable (similarly ++the user name can be taken from the USER environment variable). ++3) By specifying the password in a file by name via PASSWD_FILE ++4) By specifying the password in a file by file descriptor via PASSWD_FD ++ ++If no password is provided, mount.cifs will prompt for password entry ++ ++Restrictions ++============ ++Servers must support the NTLM SMB dialect (which is the most recent, supported ++by Samba and Windows NT version 4, 2000 and XP and many other SMB/CIFS servers) ++Servers must support either "pure-TCP" (port 445 TCP/IP CIFS connections) or RFC ++1001/1002 support for "Netbios-Over-TCP/IP." Neither of these is likely to be a ++problem as most servers support this. IPv6 support is planned for the future. ++ ++CIFS VFS Mount Options ++====================== ++A partial list of the supported mount options follows: ++ user The user name to use when trying to establish ++ the CIFS session. ++ password The user password. If the mount helper is ++ installed, the user will be prompted for password ++ if it is not supplied. ++ ip The ip address of the target server ++ unc The target server Universal Network Name (export) to ++ mount. ++ domain Set the SMB/CIFS workgroup name prepended to the ++ username during CIFS session establishment ++ uid If CIFS Unix extensions are not supported by the server ++ this overrides the default uid for inodes. For mounts to ++ servers which do support the CIFS Unix extensions, such ++ as a properly configured Samba server, the server provides ++ the uid, gid and mode. For servers which do not support ++ the Unix extensions, the default uid (and gid) returned on ++ lookup of existing files is the uid (gid) of the person ++ who executed the mount (root, except when mount.cifs ++ is configured setuid for user mounts) unless the "uid=" ++ (gid) mount option is specified. For the uid (gid) of newly ++ created files and directories, ie files created since ++ the last mount of the server share, the expected uid ++ (gid) is cached as as long as the inode remains in ++ memory on the client. Also note that permission ++ checks (authorization checks) on accesses to a file occur ++ at the server, but there are cases in which an administrator ++ may want to restrict at the client as well. For those ++ servers which do not report a uid/gid owner ++ (such as Windows), permissions can also be checked at the ++ client, and a crude form of client side permission checking ++ can be enabled by specifying file_mode and dir_mode on ++ the client ++ gid If CIFS Unix extensions are not supported by the server ++ this overrides the default gid for inodes. ++ file_mode If CIFS Unix extensions are not supported by the server ++ this overrides the default mode for file inodes. ++ dir_mode If CIFS Unix extensions are not supported by the server ++ this overrides the default mode for directory inodes. ++ port attempt to contact the server on this tcp port, before ++ trying the usual ports (port 445, then 139). ++ iocharset Codepage used to convert local path names to and from ++ Unicode. Unicode is used by default for network path ++ names if the server supports it. If iocharset is ++ not specified then the nls_default specified ++ during the local client kernel build will be used. ++ If server does not support Unicode, this parameter is ++ unused. ++ rsize default read size ++ wsize default write size ++ rw mount the network share read-write (note that the ++ server may still consider the share read-only) ++ ro mount network share read-only ++ version used to distinguish different versions of the ++ mount helper utility (not typically needed) ++ sep if first mount option (after the -o), overrides ++ the comma as the separator between the mount ++ parms. e.g. ++ -o user=myname,password=mypassword,domain=mydom ++ could be passed instead with period as the separator by ++ -o sep=.user=myname.password=mypassword.domain=mydom ++ this might be useful when comma is contained within username ++ or password or domain. This option is less important ++ when the cifs mount helper cifs.mount (version 1.1 or later) ++ is used. ++ nosuid Do not allow remote executables with the suid bit ++ program to be executed. This is only meaningful for mounts ++ to servers such as Samba which support the CIFS Unix Extensions. ++ If you do not trust the servers in your network (your mount ++ targets) it is recommended that you specify this option for ++ greater security. ++ suid Allow remote files on this mountpoint with suid enabled to ++ be executed (default for mounts when executed as root, ++ nosuid is default for user mounts). ++ credentials Although ignored by the cifs kernel component, it is used by ++ the mount helper, mount.cifs. When mount.cifs is installed it ++ opens and reads the credential file specified in order ++ to obtain the userid and password arguments which are passed to ++ the cifs vfs. ++ guest Although ignored by the kernel component, the mount.cifs ++ mount helper will not prompt the user for a password ++ if guest is specified on the mount options. If no ++ password is specified a null password will be used. ++ ++The mount.cifs mount helper also accepts a few mount options before -o ++including: ++ ++ -S take password from stdin (equivalent to setting the environment ++ variable "PASSWD_FD=0" ++ -V print mount.cifs version ++ -? display simple usage information ++ ++With recent 2.6 kernel versions of modutils, the version of the cifs kernel ++module can be displayed via modinfo. ++ ++Misc /proc/fs/cifs Flags and Debug Info ++======================================= ++Informational pseudo-files: ++DebugData Displays information about active CIFS sessions ++ and shares. ++Stats Lists summary resource usage information as well as per ++ share statistics, if CONFIG_CIFS_STATS in enabled ++ in the kernel configuration. ++ ++Configuration pseudo-files: ++MultiuserMount If set to one, more than one CIFS session to ++ the same server ip address can be established ++ if more than one uid accesses the same mount ++ point and if the uids user/password mapping ++ information is available. (default is 0) ++PacketSigningEnabled If set to one, cifs packet signing is enabled ++ and will be used if the server requires ++ it. If set to two, cifs packet signing is ++ required even if the server considers packet ++ signing optional. (default 1) ++cifsFYI If set to one, additional debug information is ++ logged to the system error log. (default 0) ++ExtendedSecurity If set to one, SPNEGO session establishment ++ is allowed which enables more advanced ++ secure CIFS session establishment (default 0) ++NTLMV2Enabled If set to one, more secure password hashes ++ are used when the server supports them and ++ when kerberos is not negotiated (default 0) ++traceSMB If set to one, debug information is logged to the ++ system error log with the start of smb requests ++ and responses (default 0) ++LookupCacheEnable If set to one, inode information is kept cached ++ for one second improving performance of lookups ++ (default 1) ++OplockEnabled If set to one, safe distributed caching enabled. ++ (default 1) ++LinuxExtensionsEnabled If set to one then the client will attempt to ++ use the CIFS "UNIX" extensions which are optional ++ protocol enhancements that allow CIFS servers ++ to return accurate UID/GID information as well ++ as support symbolic links. If you use servers ++ such as Samba that support the CIFS Unix ++ extensions but do not want to use symbolic link ++ support and want to map the uid and gid fields ++ to values supplied at mount (rather than the ++ actual values, then set this to zero. (default 1) ++ ++These experimental features and tracing can be enabled by changing flags in ++/proc/fs/cifs (after the cifs module has been installed or built into the ++kernel, e.g. insmod cifs). To enable a feature set it to 1 e.g. to enable ++tracing to the kernel message log type: ++ ++ echo 1 > /proc/fs/cifs/cifsFYI ++ ++and for more extensive tracing including the start of smb requests and responses ++ ++ echo 1 > /proc/fs/cifs/traceSMB ++ ++Three other experimental features are under development and to test ++require enabling an ifdef (e.g. by adding "#define CIFS_FCNTL" in cifsglob.h) ++ ++ CONFIG_CIFS_QUOTA ++ ++ CONFIG_CIFS_XATTR ++ ++ CONFIG_CIFS_FCNTL (fcntl needed for support of directory change ++ notification and perhaps later for file leases) ++ ++Per share (per client mount) statistics are available in /proc/fs/cifs/DebugData ++if the kernel was configured with cifs statistics enabled. The statistics ++represent the number of successful (ie non-zero return code from the server) ++SMB responses to some of the more common commands (open, delete, mkdir etc.). ++Also recorded is the total bytes read and bytes written to the server for ++that share. Note that due to client caching effects this can be less than the ++number of bytes read and written by the application running on the client. ++The statistics for the number of total SMBs and oplock breaks are different in ++that they represent all for that share, not just those for which the server ++returned success. ++ ++Also note that "cat /proc/fs/cifs/DebugData" will display information about ++the active sessions and the shares that are mounted. Note: NTLMv2 enablement ++will not work since they its implementation is not quite complete yet. ++Do not alter these configuration values unless you are doing specific testing. ++Enabling extended security works to Windows 2000 Workstations and XP but not to ++Windows 2000 server or Samba since it does not usually send "raw NTLMSSP" ++(instead it sends NTLMSSP encapsulated in SPNEGO/GSSAPI, which support is not ++complete in the CIFS VFS yet). +diff -urN linux-2.4.29.old/fs/cifs/rfc1002pdu.h linux-2.4.29/fs/cifs/rfc1002pdu.h +--- linux-2.4.29.old/fs/cifs/rfc1002pdu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/rfc1002pdu.h 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,79 @@ ++/* ++ * fs/cifs/rfc1002pdu.h ++ * ++ * Protocol Data Unit definitions for RFC 1001/1002 support ++ * ++ * Copyright (c) International Business Machines Corp., 2004 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#pragma pack(1) ++ ++/* NB: unlike smb/cifs packets, the RFC1002 structures are big endian */ ++ ++ /* RFC 1002 session packet types */ ++#define RFC1002_SESSION_MESASAGE 0x00 ++#define RFC1002_SESSION_REQUEST 0x81 ++#define RFC1002_POSITIVE_SESSION_RESPONSE 0x82 ++#define RFC1002_NEGATIVE_SESSION_RESPONSE 0x83 ++#define RFC1002_RETARGET_SESSION_RESPONSE 0x83 ++#define RFC1002_SESSION_KEEP_ALIVE 0x85 ++ ++ /* RFC 1002 flags (only one defined */ ++#define RFC1002_LENGTH_EXTEND 0x80 /* high order bit of length (ie +64K) */ ++ ++struct rfc1002_session_packet { ++ __u8 type; ++ __u8 flags; ++ __u16 length; ++ union { ++ struct { ++ __u8 called_len; ++ __u8 called_name[32]; ++ __u8 scope1; /* null */ ++ __u8 calling_len; ++ __u8 calling_name[32]; ++ __u8 scope2; /* null */ ++ } session_req; ++ struct { ++ __u32 retarget_ip_addr; ++ __u16 port; ++ } retarget_resp; ++ __u8 neg_ses_resp_error_code; ++ /* POSITIVE_SESSION_RESPONSE packet does not include trailer. ++ SESSION_KEEP_ALIVE packet also does not include a trailer. ++ Trailer for the SESSION_MESSAGE packet is SMB/CIFS header */ ++ } trailer; ++}; ++ ++/* Negative Session Response error codes */ ++#define RFC1002_NOT_LISTENING_CALLED 0x80 /* not listening on called name */ ++#define RFC1002_NOT_LISTENING_CALLING 0x81 /* not listening on calling name */ ++#define RFC1002_NOT_PRESENT 0x82 /* called name not present */ ++#define RFC1002_INSUFFICIENT_RESOURCE 0x83 ++#define RFC1002_UNSPECIFIED_ERROR 0x8F ++ ++/* RFC 1002 Datagram service packets are not defined here as they ++are not needed for the network filesystem client unless we plan on ++implementing broadcast resolution of the server ip address (from ++server netbios name). Currently server names are resolved only via DNS ++(tcp name) or ip address or an /etc/hosts equivalent mapping to ip address.*/ ++ ++#define DEFAULT_CIFS_CALLED_NAME "*SMBSERVER " ++ ++#pragma pack() /* resume default structure packing */ ++ +diff -urN linux-2.4.29.old/fs/cifs/smbdes.c linux-2.4.29/fs/cifs/smbdes.c +--- linux-2.4.29.old/fs/cifs/smbdes.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/smbdes.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,408 @@ ++/* ++ Unix SMB/Netbios implementation. ++ Version 1.9. ++ ++ a partial implementation of DES designed for use in the ++ SMB authentication protocol ++ ++ Copyright (C) Andrew Tridgell 1998 ++ Modified by Steve French (sfrench@us.ibm.com) 2002,2004 ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++*/ ++ ++/* NOTES: ++ ++ This code makes no attempt to be fast! In fact, it is a very ++ slow implementation ++ ++ This code is NOT a complete DES implementation. It implements only ++ the minimum necessary for SMB authentication, as used by all SMB ++ products (including every copy of Microsoft Windows95 ever sold) ++ ++ In particular, it can only do a unchained forward DES pass. This ++ means it is not possible to use this code for encryption/decryption ++ of data, instead it is only useful as a "hash" algorithm. ++ ++ There is no entry point into this code that allows normal DES operation. ++ ++ I believe this means that this code does not come under ITAR ++ regulations but this is NOT a legal opinion. If you are concerned ++ about the applicability of ITAR regulations to this code then you ++ should confirm it for yourself (and maybe let me know if you come ++ up with a different answer to the one above) ++*/ ++#include <linux/slab.h> ++#define uchar unsigned char ++ ++static uchar perm1[56] = { 57, 49, 41, 33, 25, 17, 9, ++ 1, 58, 50, 42, 34, 26, 18, ++ 10, 2, 59, 51, 43, 35, 27, ++ 19, 11, 3, 60, 52, 44, 36, ++ 63, 55, 47, 39, 31, 23, 15, ++ 7, 62, 54, 46, 38, 30, 22, ++ 14, 6, 61, 53, 45, 37, 29, ++ 21, 13, 5, 28, 20, 12, 4 ++}; ++ ++static uchar perm2[48] = { 14, 17, 11, 24, 1, 5, ++ 3, 28, 15, 6, 21, 10, ++ 23, 19, 12, 4, 26, 8, ++ 16, 7, 27, 20, 13, 2, ++ 41, 52, 31, 37, 47, 55, ++ 30, 40, 51, 45, 33, 48, ++ 44, 49, 39, 56, 34, 53, ++ 46, 42, 50, 36, 29, 32 ++}; ++ ++static uchar perm3[64] = { 58, 50, 42, 34, 26, 18, 10, 2, ++ 60, 52, 44, 36, 28, 20, 12, 4, ++ 62, 54, 46, 38, 30, 22, 14, 6, ++ 64, 56, 48, 40, 32, 24, 16, 8, ++ 57, 49, 41, 33, 25, 17, 9, 1, ++ 59, 51, 43, 35, 27, 19, 11, 3, ++ 61, 53, 45, 37, 29, 21, 13, 5, ++ 63, 55, 47, 39, 31, 23, 15, 7 ++}; ++ ++static uchar perm4[48] = { 32, 1, 2, 3, 4, 5, ++ 4, 5, 6, 7, 8, 9, ++ 8, 9, 10, 11, 12, 13, ++ 12, 13, 14, 15, 16, 17, ++ 16, 17, 18, 19, 20, 21, ++ 20, 21, 22, 23, 24, 25, ++ 24, 25, 26, 27, 28, 29, ++ 28, 29, 30, 31, 32, 1 ++}; ++ ++static uchar perm5[32] = { 16, 7, 20, 21, ++ 29, 12, 28, 17, ++ 1, 15, 23, 26, ++ 5, 18, 31, 10, ++ 2, 8, 24, 14, ++ 32, 27, 3, 9, ++ 19, 13, 30, 6, ++ 22, 11, 4, 25 ++}; ++ ++static uchar perm6[64] = { 40, 8, 48, 16, 56, 24, 64, 32, ++ 39, 7, 47, 15, 55, 23, 63, 31, ++ 38, 6, 46, 14, 54, 22, 62, 30, ++ 37, 5, 45, 13, 53, 21, 61, 29, ++ 36, 4, 44, 12, 52, 20, 60, 28, ++ 35, 3, 43, 11, 51, 19, 59, 27, ++ 34, 2, 42, 10, 50, 18, 58, 26, ++ 33, 1, 41, 9, 49, 17, 57, 25 ++}; ++ ++static uchar sc[16] = { 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1 }; ++ ++static uchar sbox[8][4][16] = { ++ {{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7}, ++ {0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8}, ++ {4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0}, ++ {15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13}}, ++ ++ {{15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10}, ++ {3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5}, ++ {0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15}, ++ {13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9}}, ++ ++ {{10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8}, ++ {13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1}, ++ {13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7}, ++ {1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12}}, ++ ++ {{7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15}, ++ {13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9}, ++ {10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4}, ++ {3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14}}, ++ ++ {{2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9}, ++ {14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6}, ++ {4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14}, ++ {11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3}}, ++ ++ {{12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11}, ++ {10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8}, ++ {9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6}, ++ {4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13}}, ++ ++ {{4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1}, ++ {13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6}, ++ {1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2}, ++ {6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12}}, ++ ++ {{13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7}, ++ {1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2}, ++ {7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8}, ++ {2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11}} ++}; ++ ++static void ++permute(char *out, char *in, uchar * p, int n) ++{ ++ int i; ++ for (i = 0; i < n; i++) ++ out[i] = in[p[i] - 1]; ++} ++ ++static void ++lshift(char *d, int count, int n) ++{ ++ char out[64]; ++ int i; ++ for (i = 0; i < n; i++) ++ out[i] = d[(i + count) % n]; ++ for (i = 0; i < n; i++) ++ d[i] = out[i]; ++} ++ ++static void ++concat(char *out, char *in1, char *in2, int l1, int l2) ++{ ++ while (l1--) ++ *out++ = *in1++; ++ while (l2--) ++ *out++ = *in2++; ++} ++ ++static void ++xor(char *out, char *in1, char *in2, int n) ++{ ++ int i; ++ for (i = 0; i < n; i++) ++ out[i] = in1[i] ^ in2[i]; ++} ++ ++static void ++dohash(char *out, char *in, char *key, int forw) ++{ ++ int i, j, k; ++ char *pk1; ++ char c[28]; ++ char d[28]; ++ char *cd; ++ char ki[16][48]; ++ char *pd1; ++ char l[32], r[32]; ++ char *rl; ++ ++ /* Have to reduce stack usage */ ++ pk1 = kmalloc(56+56+64+64,GFP_KERNEL); ++ if(pk1 == NULL) ++ return; ++ ++ cd = pk1 + 56; ++ pd1= cd + 56; ++ rl = pd1 + 64; ++ ++ permute(pk1, key, perm1, 56); ++ ++ for (i = 0; i < 28; i++) ++ c[i] = pk1[i]; ++ for (i = 0; i < 28; i++) ++ d[i] = pk1[i + 28]; ++ ++ for (i = 0; i < 16; i++) { ++ lshift(c, sc[i], 28); ++ lshift(d, sc[i], 28); ++ ++ concat(cd, c, d, 28, 28); ++ permute(ki[i], cd, perm2, 48); ++ } ++ ++ permute(pd1, in, perm3, 64); ++ ++ for (j = 0; j < 32; j++) { ++ l[j] = pd1[j]; ++ r[j] = pd1[j + 32]; ++ } ++ ++ for (i = 0; i < 16; i++) { ++ char *er; /* er[48] */ ++ char *erk; /* erk[48] */ ++ char b[8][6]; ++ char *cb; /* cb[32] */ ++ char *pcb; /* pcb[32] */ ++ char *r2; /* r2[32] */ ++ ++ er = kmalloc(48+48+32+32+32, GFP_KERNEL); ++ if(er == NULL) { ++ kfree(pk1); ++ return; ++ } ++ erk = er+48; ++ cb = erk+48; ++ pcb = cb+32; ++ r2 = pcb+32; ++ ++ permute(er, r, perm4, 48); ++ ++ xor(erk, er, ki[forw ? i : 15 - i], 48); ++ ++ for (j = 0; j < 8; j++) ++ for (k = 0; k < 6; k++) ++ b[j][k] = erk[j * 6 + k]; ++ ++ for (j = 0; j < 8; j++) { ++ int m, n; ++ m = (b[j][0] << 1) | b[j][5]; ++ ++ n = (b[j][1] << 3) | (b[j][2] << 2) | (b[j][3] << ++ 1) | b[j][4]; ++ ++ for (k = 0; k < 4; k++) ++ b[j][k] = ++ (sbox[j][m][n] & (1 << (3 - k))) ? 1 : 0; ++ } ++ ++ for (j = 0; j < 8; j++) ++ for (k = 0; k < 4; k++) ++ cb[j * 4 + k] = b[j][k]; ++ permute(pcb, cb, perm5, 32); ++ ++ xor(r2, l, pcb, 32); ++ ++ for (j = 0; j < 32; j++) ++ l[j] = r[j]; ++ ++ for (j = 0; j < 32; j++) ++ r[j] = r2[j]; ++ ++ kfree(er); ++ } ++ ++ concat(rl, r, l, 32, 32); ++ ++ permute(out, rl, perm6, 64); ++ kfree(pk1); ++} ++ ++static void ++str_to_key(unsigned char *str, unsigned char *key) ++{ ++ int i; ++ ++ key[0] = str[0] >> 1; ++ key[1] = ((str[0] & 0x01) << 6) | (str[1] >> 2); ++ key[2] = ((str[1] & 0x03) << 5) | (str[2] >> 3); ++ key[3] = ((str[2] & 0x07) << 4) | (str[3] >> 4); ++ key[4] = ((str[3] & 0x0F) << 3) | (str[4] >> 5); ++ key[5] = ((str[4] & 0x1F) << 2) | (str[5] >> 6); ++ key[6] = ((str[5] & 0x3F) << 1) | (str[6] >> 7); ++ key[7] = str[6] & 0x7F; ++ for (i = 0; i < 8; i++) { ++ key[i] = (key[i] << 1); ++ } ++} ++ ++static void ++smbhash(unsigned char *out, unsigned char *in, unsigned char *key, int forw) ++{ ++ int i; ++ char *outb; /* outb[64] */ ++ char *inb; /* inb[64] */ ++ char *keyb; /* keyb[64] */ ++ unsigned char key2[8]; ++ ++ outb = kmalloc(64 * 3,GFP_KERNEL); ++ if(outb == NULL) ++ return; ++ ++ inb = outb + 64; ++ keyb = inb + 64; ++ ++ str_to_key(key, key2); ++ ++ for (i = 0; i < 64; i++) { ++ inb[i] = (in[i / 8] & (1 << (7 - (i % 8)))) ? 1 : 0; ++ keyb[i] = (key2[i / 8] & (1 << (7 - (i % 8)))) ? 1 : 0; ++ outb[i] = 0; ++ } ++ ++ dohash(outb, inb, keyb, forw); ++ ++ for (i = 0; i < 8; i++) { ++ out[i] = 0; ++ } ++ ++ for (i = 0; i < 64; i++) { ++ if (outb[i]) ++ out[i / 8] |= (1 << (7 - (i % 8))); ++ } ++ kfree(outb); ++} ++ ++void ++E_P16(unsigned char *p14, unsigned char *p16) ++{ ++ unsigned char sp8[8] = ++ { 0x4b, 0x47, 0x53, 0x21, 0x40, 0x23, 0x24, 0x25 }; ++ smbhash(p16, sp8, p14, 1); ++ smbhash(p16 + 8, sp8, p14 + 7, 1); ++} ++ ++void ++E_P24(unsigned char *p21, unsigned char *c8, unsigned char *p24) ++{ ++ smbhash(p24, c8, p21, 1); ++ smbhash(p24 + 8, c8, p21 + 7, 1); ++ smbhash(p24 + 16, c8, p21 + 14, 1); ++} ++ ++void ++D_P16(unsigned char *p14, unsigned char *in, unsigned char *out) ++{ ++ smbhash(out, in, p14, 0); ++ smbhash(out + 8, in + 8, p14 + 7, 0); ++} ++ ++void ++E_old_pw_hash(unsigned char *p14, unsigned char *in, unsigned char *out) ++{ ++ smbhash(out, in, p14, 1); ++ smbhash(out + 8, in + 8, p14 + 7, 1); ++} ++ ++void ++cred_hash1(unsigned char *out, unsigned char *in, unsigned char *key) ++{ ++ unsigned char buf[8]; ++ ++ smbhash(buf, in, key, 1); ++ smbhash(out, buf, key + 9, 1); ++} ++ ++void ++cred_hash2(unsigned char *out, unsigned char *in, unsigned char *key) ++{ ++ unsigned char buf[8]; ++ static unsigned char key2[8]; ++ ++ smbhash(buf, in, key, 1); ++ key2[0] = key[7]; ++ smbhash(out, buf, key2, 1); ++} ++ ++void ++cred_hash3(unsigned char *out, unsigned char *in, unsigned char *key, int forw) ++{ ++ static unsigned char key2[8]; ++ ++ smbhash(out, in, key, forw); ++ key2[0] = key[7]; ++ smbhash(out + 8, in + 8, key2, forw); ++} +diff -urN linux-2.4.29.old/fs/cifs/smbencrypt.c linux-2.4.29/fs/cifs/smbencrypt.c +--- linux-2.4.29.old/fs/cifs/smbencrypt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/smbencrypt.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,295 @@ ++/* ++ Unix SMB/Netbios implementation. ++ Version 1.9. ++ SMB parameters and setup ++ Copyright (C) Andrew Tridgell 1992-2000 ++ Copyright (C) Luke Kenneth Casson Leighton 1996-2000 ++ Modified by Jeremy Allison 1995. ++ Copyright (C) Andrew Bartlett <abartlet@samba.org> 2002-2003 ++ Modified by Steve French (sfrench@us.ibm.com) 2002-2003 ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++*/ ++ ++#include <linux/module.h> ++#include <linux/fs.h> ++#include <linux/string.h> ++#include <linux/kernel.h> ++#include <linux/random.h> ++#include "cifs_unicode.h" ++#include "cifspdu.h" ++#include "md5.h" ++#include "cifs_debug.h" ++ ++#ifndef FALSE ++#define FALSE 0 ++#endif ++#ifndef TRUE ++#define TRUE 1 ++#endif ++ ++/* following came from the other byteorder.h to avoid include conflicts */ ++#define CVAL(buf,pos) (((unsigned char *)(buf))[pos]) ++#define SSVALX(buf,pos,val) (CVAL(buf,pos)=(val)&0xFF,CVAL(buf,pos+1)=(val)>>8) ++#define SSVAL(buf,pos,val) SSVALX((buf),(pos),((__u16)(val))) ++ ++/*The following definitions come from lib/md4.c */ ++ ++void mdfour(unsigned char *out, unsigned char *in, int n); ++ ++/*The following definitions come from libsmb/smbdes.c */ ++ ++void E_P16(unsigned char *p14, unsigned char *p16); ++void E_P24(unsigned char *p21, unsigned char *c8, unsigned char *p24); ++void D_P16(unsigned char *p14, unsigned char *in, unsigned char *out); ++void E_old_pw_hash(unsigned char *p14, unsigned char *in, unsigned char *out); ++void cred_hash1(unsigned char *out, unsigned char *in, unsigned char *key); ++void cred_hash2(unsigned char *out, unsigned char *in, unsigned char *key); ++void cred_hash3(unsigned char *out, unsigned char *in, unsigned char *key, ++ int forw); ++ ++/*The following definitions come from libsmb/smbencrypt.c */ ++ ++void SMBencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24); ++void E_md4hash(const unsigned char *passwd, unsigned char *p16); ++void nt_lm_owf_gen(char *pwd, unsigned char nt_p16[16], unsigned char p16[16]); ++void SMBOWFencrypt(unsigned char passwd[16], unsigned char *c8, ++ unsigned char p24[24]); ++void NTLMSSPOWFencrypt(unsigned char passwd[8], ++ unsigned char *ntlmchalresp, unsigned char p24[24]); ++void SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24); ++int decode_pw_buffer(char in_buffer[516], char *new_pwrd, ++ int new_pwrd_size, __u32 * new_pw_len); ++ ++/* ++ This implements the X/Open SMB password encryption ++ It takes a password, a 8 byte "crypt key" and puts 24 bytes of ++ encrypted password into p24 */ ++/* Note that password must be uppercased and null terminated */ ++void ++SMBencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24) ++{ ++ unsigned char p14[15], p21[21]; ++ ++ memset(p21, '\0', 21); ++ memset(p14, '\0', 14); ++ strncpy((char *) p14, (char *) passwd, 14); ++ ++/* strupper((char *)p14); *//* BB at least uppercase the easy range */ ++ E_P16(p14, p21); ++ ++ SMBOWFencrypt(p21, c8, p24); ++ ++ memset(p14,0,15); ++ memset(p21,0,21); ++} ++ ++/* Routines for Windows NT MD4 Hash functions. */ ++static int ++_my_wcslen(__u16 * str) ++{ ++ int len = 0; ++ while (*str++ != 0) ++ len++; ++ return len; ++} ++ ++/* ++ * Convert a string into an NT UNICODE string. ++ * Note that regardless of processor type ++ * this must be in intel (little-endian) ++ * format. ++ */ ++ ++static int ++_my_mbstowcs(__u16 * dst, const unsigned char *src, int len) ++{ /* not a very good conversion routine - change/fix */ ++ int i; ++ __u16 val; ++ ++ for (i = 0; i < len; i++) { ++ val = *src; ++ SSVAL(dst, 0, val); ++ dst++; ++ src++; ++ if (val == 0) ++ break; ++ } ++ return i; ++} ++ ++/* ++ * Creates the MD4 Hash of the users password in NT UNICODE. ++ */ ++ ++void ++E_md4hash(const unsigned char *passwd, unsigned char *p16) ++{ ++ int len; ++ __u16 wpwd[129]; ++ ++ /* Password cannot be longer than 128 characters */ ++ if(passwd) { ++ len = strlen((char *) passwd); ++ if (len > 128) { ++ len = 128; ++ } ++ /* Password must be converted to NT unicode */ ++ _my_mbstowcs(wpwd, passwd, len); ++ } else ++ len = 0; ++ ++ wpwd[len] = 0; /* Ensure string is null terminated */ ++ /* Calculate length in bytes */ ++ len = _my_wcslen(wpwd) * sizeof (__u16); ++ ++ mdfour(p16, (unsigned char *) wpwd, len); ++ memset(wpwd,0,129 * 2); ++} ++ ++/* Does both the NT and LM owfs of a user's password */ ++void ++nt_lm_owf_gen(char *pwd, unsigned char nt_p16[16], unsigned char p16[16]) ++{ ++ char passwd[514]; ++ ++ memset(passwd, '\0', 514); ++ if (strlen(pwd) < 513) ++ strcpy(passwd, pwd); ++ else ++ memcpy(passwd, pwd, 512); ++ /* Calculate the MD4 hash (NT compatible) of the password */ ++ memset(nt_p16, '\0', 16); ++ E_md4hash(passwd, nt_p16); ++ ++ /* Mangle the passwords into Lanman format */ ++ passwd[14] = '\0'; ++/* strupper(passwd); */ ++ ++ /* Calculate the SMB (lanman) hash functions of the password */ ++ ++ memset(p16, '\0', 16); ++ E_P16((unsigned char *) passwd, (unsigned char *) p16); ++ ++ /* clear out local copy of user's password (just being paranoid). */ ++ memset(passwd, '\0', sizeof (passwd)); ++} ++ ++/* Does the NTLMv2 owfs of a user's password */ ++void ++ntv2_owf_gen(const unsigned char owf[16], const char *user_n, ++ const char *domain_n, unsigned char kr_buf[16], ++ const struct nls_table *nls_codepage) ++{ ++ wchar_t * user_u; ++ wchar_t * dom_u; ++ int user_l, domain_l; ++ struct HMACMD5Context ctx; ++ ++ /* might as well do one alloc to hold both (user_u and dom_u) */ ++ user_u = kmalloc(2048 * sizeof(wchar_t),GFP_KERNEL); ++ if(user_u == NULL) ++ return; ++ dom_u = user_u + 1024; ++ ++ /* push_ucs2(NULL, user_u, user_n, (user_l+1)*2, STR_UNICODE|STR_NOALIGN|STR_TERMINATE|STR_UPPER); ++ push_ucs2(NULL, dom_u, domain_n, (domain_l+1)*2, STR_UNICODE|STR_NOALIGN|STR_TERMINATE|STR_UPPER); */ ++ ++ /* BB user and domain may need to be uppercased */ ++ user_l = cifs_strtoUCS(user_u, user_n, 511, nls_codepage); ++ domain_l = cifs_strtoUCS(dom_u, domain_n, 511, nls_codepage); ++ ++ user_l++; /* trailing null */ ++ domain_l++; ++ ++ hmac_md5_init_limK_to_64(owf, 16, &ctx); ++ hmac_md5_update((const unsigned char *) user_u, user_l * 2, &ctx); ++ hmac_md5_update((const unsigned char *) dom_u, domain_l * 2, &ctx); ++ hmac_md5_final(kr_buf, &ctx); ++ ++ kfree(user_u); ++} ++ ++/* Does the des encryption from the NT or LM MD4 hash. */ ++void ++SMBOWFencrypt(unsigned char passwd[16], unsigned char *c8, ++ unsigned char p24[24]) ++{ ++ unsigned char p21[21]; ++ ++ memset(p21, '\0', 21); ++ ++ memcpy(p21, passwd, 16); ++ E_P24(p21, c8, p24); ++} ++ ++/* Does the des encryption from the FIRST 8 BYTES of the NT or LM MD4 hash. */ ++void ++NTLMSSPOWFencrypt(unsigned char passwd[8], ++ unsigned char *ntlmchalresp, unsigned char p24[24]) ++{ ++ unsigned char p21[21]; ++ ++ memset(p21, '\0', 21); ++ memcpy(p21, passwd, 8); ++ memset(p21 + 8, 0xbd, 8); ++ ++ E_P24(p21, ntlmchalresp, p24); ++} ++ ++/* Does the NT MD4 hash then des encryption. */ ++ ++void ++SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24) ++{ ++ unsigned char p21[21]; ++ ++ memset(p21, '\0', 21); ++ ++ E_md4hash(passwd, p21); ++ SMBOWFencrypt(p21, c8, p24); ++} ++ ++/* Does the md5 encryption from the NT hash for NTLMv2. */ ++void ++SMBOWFencrypt_ntv2(const unsigned char kr[16], ++ const struct data_blob * srv_chal, ++ const struct data_blob * cli_chal, unsigned char resp_buf[16]) ++{ ++ struct HMACMD5Context ctx; ++ ++ hmac_md5_init_limK_to_64(kr, 16, &ctx); ++ hmac_md5_update(srv_chal->data, srv_chal->length, &ctx); ++ hmac_md5_update(cli_chal->data, cli_chal->length, &ctx); ++ hmac_md5_final(resp_buf, &ctx); ++} ++ ++void ++SMBsesskeygen_ntv2(const unsigned char kr[16], ++ const unsigned char *nt_resp, __u8 sess_key[16]) ++{ ++ struct HMACMD5Context ctx; ++ ++ hmac_md5_init_limK_to_64(kr, 16, &ctx); ++ hmac_md5_update(nt_resp, 16, &ctx); ++ hmac_md5_final((unsigned char *) sess_key, &ctx); ++} ++ ++void ++SMBsesskeygen_ntv1(const unsigned char kr[16], ++ const unsigned char *nt_resp, __u8 sess_key[16]) ++{ ++ mdfour((unsigned char *) sess_key, (unsigned char *) kr, 16); ++} +diff -urN linux-2.4.29.old/fs/cifs/smberr.c linux-2.4.29/fs/cifs/smberr.c +--- linux-2.4.29.old/fs/cifs/smberr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/smberr.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,240 @@ ++/* ++ Unix SMB/Netbios implementation. ++ Version 1.9. ++ Copyright (C) Andrew Tridgell 1998 ++ Copyright (C) Steve French (sfrench@us.ibm.com) 2002 ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++*/ ++include "smberr.h" ++#define NO_SYSLOG ++/* error code stuff - put together by Merik Karman ++ merik@blackadder.dsh.oz.au */ ++ typedef const struct { ++ char *name; ++ int code; ++ char *message; ++ int posix_code; ++} err_code_struct; ++ ++/* Dos Error Messages */ ++err_code_struct dos_msgs[] = { ++ {"ERRbadfunc", ERRbadfunc, "Invalid function.", -EINVAL}, ++ {"ERRbadfile", ERRbadfile, "File not found.", -ENOENT}, ++ {"ERRbadpath", ERRbadpath, "Directory invalid.", -ENOENT}, ++ {"ERRnofids", ERRnofids, "No file descriptors available", -EMFILE}, ++ {"ERRnoaccess", ERRnoaccess, "Access denied.", -EACCES}, ++ {"ERRbadfid", ERRbadfid, "Invalid file handle.", -EBADF}, ++ {"ERRbadmcb", 7, "Memory control blocks destroyed.", -EIO}, ++ {"ERRnomem", ERRnomem, ++ "Insufficient server memory to perform the requested function.", ++ -ENOMEM}, ++ {"ERRbadmem", ERRbadmem, "Invalid memory block address.", -EFAULT}, ++ {"ERRbadenv", ERRbadenv, "Invalid environment.", -EFAULT}, ++ {"ERRbadformat", 11, "Invalid format.", -EINVAL}, ++ {"ERRbadaccess", ERRbadaccess, "Invalid open mode." - EACCES}, ++ {"ERRbaddata", ERRbaddata, "Invalid data.", -EIO}, ++ {"ERR", ERRres, "reserved.", -EIO}, ++ {"ERRbaddrive", ERRbaddrive, "Invalid drive specified.", -ENXIO}, ++ {"ERRremcd", ERRremcd, ++ "A Delete Directory request attempted to remove the server's current directory.", ++ -EIO}, ++ {"ERRdiffdevice", ERRdiffdevice, "Not same device.", -EXDEV}, ++ {"ERRnofiles", ERRnofiles, "A File Search command can find no more files matching the specified criteria.", -ENOENT}, /* Note: must map to zero manually in some places such as readdir */ ++ {"ERRbadshare", ERRbadshare, ++ "The sharing mode specified for an Open conflicts with existing FIDs on the file.", ++ -EXTBSY}, ++ {"ERRlock", ERRlock, ++ "A Lock request conflicted with an existing lock or specified an invalid mode, or an Unlock requested attempted to remove a lock held by another process.", ++ -EACCES}, ++ {"ERRunsup", ERRunsup, "The operation is unsupported", -EINVAL}, ++ {"ERRnosuchshare", ERRnosuchshare, ++ "You specified an invalid share name", -ENXIO}, ++ {"ERRfilexists", ERRfilexists, ++ "The file named in a Create Directory, Make New File or Link request already exists.", ++ -EEXIST}, ++ {"ERRinvalidname", ERRinvalidname, "Invalid name", -ENOENT}, ++ {"ERRdiskfull", ERRdiskfull, "Disk full", -ENOSPC} ++ ++ {"ERRmoredata", ERRmoredata, ++ "There is more data to be returned.",}, ++ {"ERRinvgroup", 2455, "Invalid workgroup (try the -W option)"}, ++ {NULL, -1, NULL, -EIO} ++}; ++ ++/* Server Error Messages */ ++err_code_struct server_msgs[] = { ++ {"ERRerror", 1, "Non-specific error code."}, ++ {"ERRbadpw", 2, ++ "Bad password - name/password pair in a Tree Connect or Session Setup are invalid."}, ++ {"ERRbadtype", 3, "reserved."}, ++ {"ERRaccess", 4, ++ "The requester does not have the necessary access rights within the specified context for the requested function. The context is defined by the TID or the UID."}, ++ {"ERRinvnid", 5, ++ "The tree ID (TID) specified in a command was invalid."}, ++ {"ERRinvnetname", 6, "Invalid network name in tree connect."}, ++ {"ERRinvdevice", 7, ++ "Invalid device - printer request made to non-printer connection or non-printer request made to printer connection."}, ++ {"ERRqfull", 49, ++ "Print queue full (files) -- returned by open print file."}, ++ {"ERRqtoobig", 50, "Print queue full -- no space."}, ++ {"ERRqeof", 51, "EOF on print queue dump."}, ++ {"ERRinvpfid", 52, "Invalid print file FID."}, ++ {"ERRsmbcmd", 64, ++ "The server did not recognize the command received."}, ++ {"ERRsrverror", 65, ++ "The server encountered an internal error, e.g., system file unavailable."}, ++ {"ERRfilespecs", 67, ++ "The file handle (FID) and pathname parameters contained an invalid combination of values."}, ++ {"ERRreserved", 68, "reserved."}, ++ {"ERRbadpermits", 69, ++ "The access permissions specified for a file or directory are not a valid combination. The server cannot set the requested attribute."}, ++ {"ERRreserved", 70, "reserved."}, ++ {"ERRsetattrmode", 71, ++ "The attribute mode in the Set File Attribute request is invalid."}, ++ {"ERRpaused", 81, "Server is paused."}, ++ {"ERRmsgoff", 82, "Not receiving messages."}, ++ {"ERRnoroom", 83, "No room to buffer message."}, ++ {"ERRrmuns", 87, "Too many remote user names."}, ++ {"ERRtimeout", 88, "Operation timed out."}, ++ {"ERRnoresource", 89, ++ "No resources currently available for request."}, ++ {"ERRtoomanyuids", 90, "Too many UIDs active on this session."}, ++ {"ERRbaduid", 91, ++ "The UID is not known as a valid ID on this session."}, ++ {"ERRusempx", 250, "Temp unable to support Raw, use MPX mode."}, ++ {"ERRusestd", 251, ++ "Temp unable to support Raw, use standard read/write."}, ++ {"ERRcontmpx", 252, "Continue in MPX mode."}, ++ {"ERRreserved", 253, "reserved."}, ++ {"ERRreserved", 254, "reserved."}, ++ {"ERRnosupport", 0xFFFF, "Function not supported."}, ++ {NULL, -1, NULL} ++}; ++ ++/* Hard Error Messages */ ++err_code_struct hard_msgs[] = { ++ {"ERRnowrite", 19, ++ "Attempt to write on write-protected diskette."}, ++ {"ERRbadunit", 20, "Unknown unit."}, ++ {"ERRnotready", 21, "Drive not ready."}, ++ {"ERRbadcmd", 22, "Unknown command."}, ++ {"ERRdata", 23, "Data error (CRC)."}, ++ {"ERRbadreq", 24, "Bad request structure length."}, ++ {"ERRseek", 25, "Seek error."}, ++ {"ERRbadmedia", 26, "Unknown media type."}, ++ {"ERRbadsector", 27, "Sector not found."}, ++ {"ERRnopaper", 28, "Printer out of paper."}, ++ {"ERRwrite", 29, "Write fault."}, ++ {"ERRread", 30, "Read fault."}, ++ {"ERRgeneral", 31, "General failure."}, ++ {"ERRbadshare", 32, "An open conflicts with an existing open."}, ++ {"ERRlock", 33, ++ "A Lock request conflicted with an existing lock or specified an invalid mode, or an Unlock requested attempted to remove a lock held by another process."}, ++ {"ERRwrongdisk", 34, "The wrong disk was found in a drive."}, ++ {"ERRFCBUnavail", 35, "No FCBs are available to process request."}, ++ {"ERRsharebufexc", 36, "A sharing buffer has been exceeded."}, ++ {NULL, -1, NULL} ++}; ++ ++ ++const struct { ++ int code; ++ char *class; ++ err_code_struct *err_msgs; ++} err_classes[] = { ++ { ++ 0, "SUCCESS", NULL}, { ++ 0x01, "ERRDOS", dos_msgs}, { ++ 0x02, "ERRSRV", server_msgs}, { ++ 0x03, "ERRHRD", hard_msgs}, { ++ 0x04, "ERRXOS", NULL}, { ++ 0xE1, "ERRRMX1", NULL}, { ++ 0xE2, "ERRRMX2", NULL}, { ++ 0xE3, "ERRRMX3", NULL}, { ++ 0xFF, "ERRCMD", NULL}, { ++-1, NULL, NULL}}; ++ ++ ++/**************************************************************************** ++return a SMB error string from a SMB buffer ++****************************************************************************/ ++char *smb_dos_errstr(char *inbuf) ++{ ++ static pstring ret; ++ int class = CVAL(inbuf, smb_rcls); ++ int num = SVAL(inbuf, smb_err); ++ int i, j; ++ ++ for (i = 0; err_classes[i].class; i++) ++ if (err_classes[i].code == class) { ++ if (err_classes[i].err_msgs) { ++ err_code_struct *err = ++ err_classes[i].err_msgs; ++ for (j = 0; err[j].name; j++) ++ if (num == err[j].code) { ++ if (DEBUGLEVEL > 0) ++ slprintf(ret, ++ sizeof ++ (ret) - 1, ++ "%s - %s (%s)", ++ err_classes ++ [i].class, ++ err[j]. ++ name, ++ err[j]. ++ message); ++ else ++ slprintf(ret, ++ sizeof ++ (ret) - 1, ++ "%s - %s", ++ err_classes ++ [i].class, ++ err[j]. ++ name); ++ return ret; ++ } ++ } ++ ++ slprintf(ret, sizeof(ret) - 1, "%s - %d", ++ err_classes[i].class, num); ++ return ret; ++ } ++ ++ slprintf(ret, sizeof(ret) - 1, "Error: Unknown error (%d,%d)", ++ class, num); ++ return (ret); ++} ++ ++ ++/***************************************************************************** ++ returns an WERROR error message. ++ *****************************************************************************/ ++char *werror_str(WERROR status) ++{ ++ static fstring msg; ++ slprintf(msg, sizeof(msg), "WIN32 code 0x%08x", W_ERROR_V(status)); ++ return msg; ++} ++ ++ ++/***************************************************************************** ++map a unix errno to a win32 error ++ *****************************************************************************/ ++WERROR map_werror_from_unix(int error) ++{ ++ NTSTATUS status = map_nt_error_from_unix(error); ++ return ntstatus_to_werror(status); ++} +diff -urN linux-2.4.29.old/fs/cifs/smberr.h linux-2.4.29/fs/cifs/smberr.h +--- linux-2.4.29.old/fs/cifs/smberr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/smberr.h 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,113 @@ ++/* ++ * fs/cifs/smberr.h ++ * ++ * Copyright (c) International Business Machines Corp., 2002 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * See Error Codes section of the SNIA CIFS Specification ++ * for more information ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#define SUCCESS 0 /* The request was successful. */ ++#define ERRDOS 0x01 /* Error is from the core DOS operating system set */ ++#define ERRSRV 0x02 /* Error is generated by the file server daemon */ ++#define ERRHRD 0x03 /* Error is a hardware error. */ ++#define ERRCMD 0xFF /* Command was not in the "SMB" format. */ ++ ++/* The following error codes may be generated with the SUCCESS error class.*/ ++ ++#define SUCCESS 0 /* The request was successful. */ ++ ++/* The following error codes may be generated with the ERRDOS error class.*/ ++ ++#define ERRbadfunc 1 /* Invalid function. The server did not recognize or could not perform a system call generated by the server, e.g., set the DIRECTORY attribute on a data file, invalid seek mode. */ ++#define ERRbadfile 2 /*File not found. The last component of a file's pathname could not be found. */ ++#define ERRbadpath 3 /* Directory invalid. A directory component in a pathname could not be found. */ ++#define ERRnofids 4 /* Too many open files. The server has no file handles available. */ ++#define ERRnoaccess 5 /* Access denied, the client's context does not permit the requested function. This includes the following conditions: invalid rename command, write to Fid open for read only, read on Fid open for write only, attempt to delete a non-empty directory */ ++#define ERRbadfid 6 /* Invalid file handle. The file handle specified was not recognized by the server. */ ++#define ERRbadmcb 7 /* Memory control blocks destroyed. */ ++#define ERRnomem 8 /* Insufficient server memory to perform the requested function. */ ++#define ERRbadmem 9 /* Invalid memory block address. */ ++#define ERRbadenv 10 /* Invalid environment. */ ++#define ERRbadformat 11 /* Invalid format. */ ++#define ERRbadaccess 12 /* Invalid open mode. */ ++#define ERRbaddata 13 /* Invalid data (generated only by IOCTL calls within the server). */ ++#define ERRbaddrive 15 /* Invalid drive specified. */ ++#define ERRremcd 16 /* A Delete Directory request attempted to remove the server's current directory. */ ++#define ERRdiffdevice 17 /* Not same device (e.g., a cross volume rename was attempted */ ++#define ERRnofiles 18 /* A File Search command can find no more files matching the specified criteria. */ ++#define ERRgeneral 31 ++#define ERRbadshare 32 /* The sharing mode specified for an Open conflicts with existing FIDs on the file. */ ++#define ERRlock 33 /* A Lock request conflicted with an existing lock or specified an invalid mode, or an Unlock requested attempted to remove a lock held by another process. */ ++#define ERRunsup 50 ++#define ERRnosuchshare 67 ++#define ERRfilexists 80 /* The file named in the request already exists. */ ++#define ERRinvparm 87 ++#define ERRdiskfull 112 ++#define ERRinvname 123 ++#define ERRdirnotempty 145 ++#define ERRnotlocked 158 ++#define ERRalreadyexists 183 ++#define ERRbadpipe 230 ++#define ERRpipebusy 231 ++#define ERRpipeclosing 232 ++#define ERRnotconnected 233 ++#define ERRmoredata 234 ++#define ErrQuota 0x200 /* The operation would cause a quota limit to be exceeded. */ ++#define ErrNotALink 0x201 /* A link operation was performed on a pathname that ++ was not a link. */ ++ ++/* Following error codes may be generated with the ERRSRV error ++class.*/ ++ ++#define ERRerror 1 /* Non-specific error code. It is returned under the following conditions: resource other than disk space exhausted (e.g. TIDs), first SMB command was not negotiate, multiple negotiates attempted, and internal server error. */ ++#define ERRbadpw 2 /* Bad password - name/password pair in a TreeConnect or Session Setup are invalid. */ ++#define ERRbadtype 3 /* used for indicating DFS referral needed */ ++#define ERRaccess 4 /* The client does not have the necessary access rights within the specified context for requested function. */ ++#define ERRinvtid 5 /* The Tid specified in a command was invalid. */ ++#define ERRinvnetname 6 /* Invalid network name in tree connect. */ ++#define ERRinvdevice 7 /* Invalid device - printer request made to non-printer connection or non-printer request made to printer connection. */ ++#define ERRqfull 49 /* Print queue full (files) -- returned by open print file. */ ++#define ERRqtoobig 50 /* Print queue full -- no space. */ ++#define ERRqeof 51 /* EOF on print queue dump */ ++#define ERRinvpfid 52 /* Invalid print file FID. */ ++#define ERRsmbcmd 64 /* The server did not recognize the command received. */ ++#define ERRsrverror 65 /* The server encountered an internal error, e.g., system file unavailable. */ ++#define ERRbadBID 66 /* (obsolete) */ ++#define ERRfilespecs 67 /* The Fid and pathname parameters contained an invalid combination of values. */ ++#define ERRbadLink 68 /* (obsolete) */ ++#define ERRbadpermits 69 /* The access permissions specified for a file or directory are not a valid combination. */ ++#define ERRbadPID 70 ++#define ERRsetattrmode 71 /* attribute (mode) is invalid */ ++#define ERRpaused 81 /* Server is paused */ ++#define ERRmsgoff 82 /* reserved - messaging off */ ++#define ERRnoroom 83 /* reserved - no room for message */ ++#define ERRrmuns 87 /* reserved - too many remote names */ ++#define ERRtimeout 88 /* operation timed out */ ++#define ERRnoresource 89 /* No resources available for request */ ++#define ERRtoomanyuids 90 /* Too many UIDs active on this session */ ++#define ERRbaduid 91 /* The UID is not known as a valid user */ ++#define ERRusempx 250 /* temporarily unable to use raw */ ++#define ERRusestd 251 /* temporarily unable to use either raw or mpx */ ++#define ERR_NOTIFY_ENUM_DIR 1024 ++#define ERRaccountexpired 2239 ++#define ERRbadclient 2240 ++#define ERRbadLogonTime 2241 ++#define ERRpasswordExpired 2242 ++#define ERRnetlogonNotStarted 2455 ++#define ERRnosupport 0xFFFF +diff -urN linux-2.4.29.old/fs/cifs/TODO linux-2.4.29/fs/cifs/TODO +--- linux-2.4.29.old/fs/cifs/TODO 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/TODO 2004-07-14 00:25:04.000000000 +0200 +@@ -0,0 +1,106 @@ ++version 1.16 May 27, 2004 ++ ++A Partial List of Missing Features ++================================== ++ ++Contributions are welcome. There are plenty of opportunities ++for visible, important contributions to this module. Here ++is a partial list of the known problems and missing features: ++ ++a) Support for SecurityDescriptors for chmod/chgrp/chown so ++these can be supported for Windows servers ++ ++b) Better pam/winbind integration ++ ++c) multi-user mounts - multiplexed sessionsetups over single vc ++(ie tcp session) - prettying up needed ++ ++d) Kerberos/SPNEGO session setup support - (started) ++ ++e) NTLMv2 authentication (mostly implemented) ++ ++f) MD5-HMAC signing SMB PDUs when SPNEGO style SessionSetup ++used (Kerberos or NTLMSSP). Signing alreadyimplemented for NTLM ++and raw NTLMSSP already. This is important when enabling ++extended security and mounting to Windows 2003 Servers ++ ++f) Directory entry caching relies on a 1 second timer, rather than ++using FindNotify or equivalent. - (started) ++ ++g) A few byte range testcases fail due to POSIX vs. Windows/CIFS ++style byte range lock differences ++ ++h) quota support ++ ++i) support for the Linux 2.5 kernel new feature get_xattr and set_xattr ++which will allow us to expose dos attributes as well as real ++ACLs. This support has been started in the current code, but is ++ifdeffed out. ++ ++k) finish writepages support (multi-page write behind for improved ++performance) and syncpage ++ ++l) hook lower into the sockets api (as NFS/SunRPC does) to avoid the ++extra copy in/out of the socket buffers in some cases. ++ ++m) finish support for IPv6. This is mostly complete but ++needs a simple inet_pton like function to convert ipv6 ++addresses in string representation. ++ ++o) Better optimize open (and pathbased setfilesize) to reduce the ++oplock breaks coming from windows srv. Piggyback identical file ++opens on top of each other by incrementing reference count rather ++than resending (helps reduce server resource utilization and avoid ++spurious oplock breaks). ++ ++p) Improve performance of readpages by sending more than one read ++at a time when 8 pages or more are requested. Evaluate whether ++reads larger than 16K would be helpful. ++ ++q) For support of Windows9x/98 we need to retry failed mounts ++to *SMBSERVER (default server name) with the uppercase hostname ++in the RFC1001 session_init request. ++ ++r) Add Extended Attributed support (for storing UID/GID info ++to Windows servers) ++ ++s) Finish fcntl D_NOTIFY support so kde and gnome file list windows ++will autorefresh ++ ++t) Add GUI tool to configure /proc/fs/cifs settings and for display of ++the CIFS statistics ++ ++KNOWN BUGS (updated May 27, 2004) ++==================================== ++1) existing symbolic links (Windows reparse points) are recognized but ++can not be created remotely. They are implemented for Samba and those that ++support the CIFS Unix extensions but Samba has a bug currently handling ++symlink text beginning with slash ++2) follow_link and readdir code does not follow dfs junctions ++but recognizes them ++3) create of new files to FAT partitions on Windows servers can ++succeed but still return access denied (appears to be Windows ++server not cifs client problem) and has not been reproduced recently. ++NTFS partitions do not have this problem. ++4) debug connectathon lock test case 10 which fails against ++Samba (may be unmappable due to POSIX to Windows lock model ++differences but worth investigating). Also debug Samba to ++see why lock test case 7 takes longer to complete to Samba ++than to Windows. ++ ++Misc testing to do ++================== ++1) check out max path names and max path name components against various server ++types. Try nested symlinks. Return max path name in stat -f information ++ ++2) Modify file portion of ltp so it can run against a mounted network ++share and run it against cifs vfs. ++ ++3) Additional performance testing and optimization using iozone and similar - ++there are some easy changes that can be done to parallelize sequential writes, ++and when signing is disabled to request larger read sizes (larger than ++negotiated size) and send larger write sizes to modern servers. ++ ++4) More exhaustively test the recently added NT4 support against various ++NT4 service pack levels. ++ +diff -urN linux-2.4.29.old/fs/cifs/transport.c linux-2.4.29/fs/cifs/transport.c +--- linux-2.4.29.old/fs/cifs/transport.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/fs/cifs/transport.c 2004-07-14 00:25:05.000000000 +0200 +@@ -0,0 +1,434 @@ ++/* ++ * fs/cifs/transport.c ++ * ++ * Copyright (C) International Business Machines Corp., 2002,2004 ++ * Author(s): Steve French (sfrench@us.ibm.com) ++ * ++ * This library is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License as published ++ * by the Free Software Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include <linux/fs.h> ++#include <linux/list.h> ++#include <linux/wait.h> ++#include <linux/net.h> ++#include <linux/version.h> ++#include <asm/uaccess.h> ++#include <asm/processor.h> ++#include "cifspdu.h" ++#include "cifsglob.h" ++#include "cifsproto.h" ++#include "cifs_debug.h" ++ ++extern kmem_cache_t *cifs_mid_cachep; ++extern kmem_cache_t *cifs_oplock_cachep; ++ ++struct mid_q_entry * ++AllocMidQEntry(struct smb_hdr *smb_buffer, struct cifsSesInfo *ses) ++{ ++ struct mid_q_entry *temp; ++ ++ if (ses == NULL) { ++ cERROR(1, ("Null session passed in to AllocMidQEntry ")); ++ return NULL; ++ } ++ if (ses->server == NULL) { ++ cERROR(1, ("Null TCP session in AllocMidQEntry")); ++ return NULL; ++ } ++ ++ temp = (struct mid_q_entry *) kmem_cache_alloc(cifs_mid_cachep, ++ SLAB_KERNEL); ++ if (temp == NULL) ++ return temp; ++ else { ++ memset(temp, 0, sizeof (struct mid_q_entry)); ++ temp->mid = smb_buffer->Mid; /* always LE */ ++ temp->pid = current->pid; ++ temp->command = smb_buffer->Command; ++ cFYI(1, ("For smb_command %d", temp->command)); ++ do_gettimeofday(&temp->when_sent); ++ temp->ses = ses; ++ temp->tsk = current; ++ } ++ ++ spin_lock(&GlobalMid_Lock); ++ list_add_tail(&temp->qhead, &ses->server->pending_mid_q); ++ atomic_inc(&midCount); ++ temp->midState = MID_REQUEST_ALLOCATED; ++ spin_unlock(&GlobalMid_Lock); ++ return temp; ++} ++ ++void ++DeleteMidQEntry(struct mid_q_entry *midEntry) ++{ ++ spin_lock(&GlobalMid_Lock); ++ midEntry->midState = MID_FREE; ++ list_del(&midEntry->qhead); ++ atomic_dec(&midCount); ++ spin_unlock(&GlobalMid_Lock); ++ cifs_buf_release(midEntry->resp_buf); ++ kmem_cache_free(cifs_mid_cachep, midEntry); ++} ++ ++struct oplock_q_entry * ++AllocOplockQEntry(struct inode * pinode, __u16 fid, struct cifsTconInfo * tcon) ++{ ++ struct oplock_q_entry *temp; ++ if ((pinode== NULL) || (tcon == NULL)) { ++ cERROR(1, ("Null parms passed to AllocOplockQEntry")); ++ return NULL; ++ } ++ temp = (struct oplock_q_entry *) kmem_cache_alloc(cifs_oplock_cachep, ++ SLAB_KERNEL); ++ if (temp == NULL) ++ return temp; ++ else { ++ temp->pinode = pinode; ++ temp->tcon = tcon; ++ temp->netfid = fid; ++ spin_lock(&GlobalMid_Lock); ++ list_add_tail(&temp->qhead, &GlobalOplock_Q); ++ spin_unlock(&GlobalMid_Lock); ++ } ++ return temp; ++ ++} ++ ++void DeleteOplockQEntry(struct oplock_q_entry * oplockEntry) ++{ ++ spin_lock(&GlobalMid_Lock); ++ /* should we check if list empty first? */ ++ list_del(&oplockEntry->qhead); ++ spin_unlock(&GlobalMid_Lock); ++ kmem_cache_free(cifs_oplock_cachep, oplockEntry); ++} ++ ++int ++smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer, ++ unsigned int smb_buf_length, struct sockaddr *sin) ++{ ++ int rc = 0; ++ int i = 0; ++ struct msghdr smb_msg; ++ struct iovec iov; ++ mm_segment_t temp_fs; ++ ++ if(ssocket == NULL) ++ return -ENOTSOCK; /* BB eventually add reconnect code here */ ++ iov.iov_base = smb_buffer; ++ iov.iov_len = smb_buf_length + 4; ++ ++ smb_msg.msg_name = sin; ++ smb_msg.msg_namelen = sizeof (struct sockaddr); ++ smb_msg.msg_iov = &iov; ++ smb_msg.msg_iovlen = 1; ++ smb_msg.msg_control = NULL; ++ smb_msg.msg_controllen = 0; ++ smb_msg.msg_flags = MSG_DONTWAIT + MSG_NOSIGNAL; /* BB add more flags?*/ ++ ++ /* smb header is converted in header_assemble. bcc and rest of SMB word ++ area, and byte area if necessary, is converted to littleendian in ++ cifssmb.c and RFC1001 len is converted to bigendian in smb_send ++ Flags2 is converted in SendReceive */ ++ ++ smb_buffer->smb_buf_length = cpu_to_be32(smb_buffer->smb_buf_length); ++ cFYI(1, ("Sending smb of length %d ", smb_buf_length)); ++ dump_smb(smb_buffer, smb_buf_length + 4); ++ ++ temp_fs = get_fs(); /* we must turn off socket api parm checking */ ++ set_fs(get_ds()); ++ while(iov.iov_len > 0) { ++ rc = sock_sendmsg(ssocket, &smb_msg, smb_buf_length + 4); ++ if ((rc == -ENOSPC) || (rc == -EAGAIN)) { ++ i++; ++ if(i > 60) { ++ cERROR(1, ++ ("sends on sock %p stuck for 30 seconds", ++ ssocket)); ++ rc = -EAGAIN; ++ break; ++ } ++ set_current_state(TASK_INTERRUPTIBLE); ++ schedule_timeout(HZ/2); ++ continue; ++ } ++ if (rc < 0) ++ break; ++ iov.iov_base += rc; ++ iov.iov_len -= rc; ++ } ++ set_fs(temp_fs); ++ ++ if (rc < 0) { ++ cERROR(1,("Error %d sending data on socket to server.", rc)); ++ } else { ++ rc = 0; ++ } ++ ++ return rc; ++} ++ ++int ++SendReceive(const unsigned int xid, struct cifsSesInfo *ses, ++ struct smb_hdr *in_buf, struct smb_hdr *out_buf, ++ int *pbytes_returned, const int long_op) ++{ ++ int rc = 0; ++ unsigned int receive_len; ++ long timeout; ++ struct mid_q_entry *midQ; ++ ++ if (ses == NULL) { ++ cERROR(1,("Null smb session")); ++ return -EIO; ++ } ++ if(ses->server == NULL) { ++ cERROR(1,("Null tcp session")); ++ return -EIO; ++ } ++ ++ /* Ensure that we do not send more than 50 overlapping requests ++ to the same server. We may make this configurable later or ++ use ses->maxReq */ ++ if(long_op == -1) { ++ /* oplock breaks must not be held up */ ++ atomic_inc(&ses->server->inFlight); ++ } else { ++ spin_lock(&GlobalMid_Lock); ++ while(1) { ++ if(atomic_read(&ses->server->inFlight) >= CIFS_MAX_REQ){ ++ spin_unlock(&GlobalMid_Lock); ++ wait_event(ses->server->request_q, ++ atomic_read(&ses->server->inFlight) ++ < CIFS_MAX_REQ); ++ spin_lock(&GlobalMid_Lock); ++ } else { ++ if(ses->server->tcpStatus == CifsExiting) { ++ spin_unlock(&GlobalMid_Lock); ++ return -ENOENT; ++ } ++ ++ /* can not count locking commands against total since ++ they are allowed to block on server */ ++ ++ if(long_op < 3) { ++ /* update # of requests on the wire to server */ ++ atomic_inc(&ses->server->inFlight); ++ } ++ spin_unlock(&GlobalMid_Lock); ++ break; ++ } ++ } ++ } ++ /* make sure that we sign in the same order that we send on this socket ++ and avoid races inside tcp sendmsg code that could cause corruption ++ of smb data */ ++ ++ down(&ses->server->tcpSem); ++ ++ if (ses->server->tcpStatus == CifsExiting) { ++ rc = -ENOENT; ++ goto out_unlock; ++ } else if (ses->server->tcpStatus == CifsNeedReconnect) { ++ cFYI(1,("tcp session dead - return to caller to retry")); ++ rc = -EAGAIN; ++ goto out_unlock; ++ } else if (ses->status != CifsGood) { ++ /* check if SMB session is bad because we are setting it up */ ++ if((in_buf->Command != SMB_COM_SESSION_SETUP_ANDX) && ++ (in_buf->Command != SMB_COM_NEGOTIATE)) { ++ rc = -EAGAIN; ++ goto out_unlock; ++ } /* else ok - we are setting up session */ ++ } ++ midQ = AllocMidQEntry(in_buf, ses); ++ if (midQ == NULL) { ++ up(&ses->server->tcpSem); ++ /* If not lock req, update # of requests on wire to server */ ++ if(long_op < 3) { ++ atomic_dec(&ses->server->inFlight); ++ wake_up(&ses->server->request_q); ++ } ++ return -ENOMEM; ++ } ++ ++ if (in_buf->smb_buf_length > CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE - 4) { ++ up(&ses->server->tcpSem); ++ cERROR(1, ++ ("Illegal length, greater than maximum frame, %d ", ++ in_buf->smb_buf_length)); ++ DeleteMidQEntry(midQ); ++ /* If not lock req, update # of requests on wire to server */ ++ if(long_op < 3) { ++ atomic_dec(&ses->server->inFlight); ++ wake_up(&ses->server->request_q); ++ } ++ return -EIO; ++ } ++ ++ if (in_buf->smb_buf_length > 12) ++ in_buf->Flags2 = cpu_to_le16(in_buf->Flags2); ++ ++ rc = cifs_sign_smb(in_buf, ses, &midQ->sequence_number); ++ ++ midQ->midState = MID_REQUEST_SUBMITTED; ++ rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length, ++ (struct sockaddr *) &(ses->server->addr.sockAddr)); ++ if(rc < 0) { ++ DeleteMidQEntry(midQ); ++ up(&ses->server->tcpSem); ++ /* If not lock req, update # of requests on wire to server */ ++ if(long_op < 3) { ++ atomic_dec(&ses->server->inFlight); ++ wake_up(&ses->server->request_q); ++ } ++ return rc; ++ } else ++ up(&ses->server->tcpSem); ++ if (long_op == -1) ++ goto cifs_no_response_exit; ++ else if (long_op == 2) /* writes past end of file can take looooong time */ ++ timeout = 300 * HZ; ++ else if (long_op == 1) ++ timeout = 45 * HZ; /* should be greater than ++ servers oplock break timeout (about 43 seconds) */ ++ else if (long_op > 2) { ++ timeout = MAX_SCHEDULE_TIMEOUT; ++ } else ++ timeout = 15 * HZ; ++ /* wait for 15 seconds or until woken up due to response arriving or ++ due to last connection to this server being unmounted */ ++ if (signal_pending(current)) { ++ /* if signal pending do not hold up user for full smb timeout ++ but we still give response a change to complete */ ++ if(midQ->midState & MID_REQUEST_SUBMITTED) { ++ set_current_state(TASK_UNINTERRUPTIBLE); ++ timeout = sleep_on_timeout(&ses->server->response_q,2 * HZ); ++ } ++ } else { /* using normal timeout */ ++ /* timeout = wait_event_interruptible_timeout(ses->server->response_q, ++ (midQ->midState & MID_RESPONSE_RECEIVED) || ++ ((ses->server->tcpStatus != CifsGood) && ++ (ses->server->tcpStatus != CifsNew)), ++ timeout); */ ++ /* Can not allow user interrupts- wreaks havoc with performance */ ++ if(midQ->midState & MID_REQUEST_SUBMITTED) { ++ set_current_state(TASK_UNINTERRUPTIBLE); ++ timeout = sleep_on_timeout(&ses->server->response_q,timeout); ++ } ++ } ++ ++ spin_lock(&GlobalMid_Lock); ++ if (midQ->resp_buf) { ++ spin_unlock(&GlobalMid_Lock); ++ receive_len = be32_to_cpu(midQ->resp_buf->smb_buf_length); ++ } else { ++ cERROR(1,("No response buffer")); ++ if(midQ->midState == MID_REQUEST_SUBMITTED) { ++ if(ses->server->tcpStatus == CifsExiting) ++ rc = -EHOSTDOWN; ++ else { ++ ses->server->tcpStatus = CifsNeedReconnect; ++ midQ->midState = MID_RETRY_NEEDED; ++ } ++ } ++ ++ if (rc != -EHOSTDOWN) { ++ if(midQ->midState == MID_RETRY_NEEDED) { ++ rc = -EAGAIN; ++ cFYI(1,("marking request for retry")); ++ } else { ++ rc = -EIO; ++ } ++ } ++ spin_unlock(&GlobalMid_Lock); ++ DeleteMidQEntry(midQ); ++ /* If not lock req, update # of requests on wire to server */ ++ if(long_op < 3) { ++ atomic_dec(&ses->server->inFlight); ++ wake_up(&ses->server->request_q); ++ } ++ return rc; ++ } ++ ++ if (receive_len > CIFS_MAX_MSGSIZE + MAX_CIFS_HDR_SIZE) { ++ cERROR(1, ++ ("Frame too large received. Length: %d Xid: %d", ++ receive_len, xid)); ++ rc = -EIO; ++ } else { /* rcvd frame is ok */ ++ ++ if (midQ->resp_buf && out_buf ++ && (midQ->midState == MID_RESPONSE_RECEIVED)) { ++ memcpy(out_buf, midQ->resp_buf, ++ receive_len + ++ 4 /* include 4 byte RFC1001 header */ ); ++ ++ dump_smb(out_buf, 92); ++ /* convert the length into a more usable form */ ++ out_buf->smb_buf_length = ++ be32_to_cpu(out_buf->smb_buf_length); ++ if((out_buf->smb_buf_length > 24) && ++ (ses->server->secMode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))) { ++ rc = cifs_verify_signature(out_buf, ses->mac_signing_key,midQ->sequence_number); /* BB fix BB */ ++ if(rc) ++ cFYI(1,("Unexpected signature received from server")); ++ } ++ ++ if (out_buf->smb_buf_length > 12) ++ out_buf->Flags2 = le16_to_cpu(out_buf->Flags2); ++ if (out_buf->smb_buf_length > 28) ++ out_buf->Pid = le16_to_cpu(out_buf->Pid); ++ if (out_buf->smb_buf_length > 28) ++ out_buf->PidHigh = ++ le16_to_cpu(out_buf->PidHigh); ++ ++ *pbytes_returned = out_buf->smb_buf_length; ++ ++ /* BB special case reconnect tid and reconnect uid here? */ ++ rc = map_smb_to_linux_error(out_buf); ++ ++ /* convert ByteCount if necessary */ ++ if (receive_len >= ++ sizeof (struct smb_hdr) - ++ 4 /* do not count RFC1001 header */ + ++ (2 * out_buf->WordCount) + 2 /* bcc */ ) ++ BCC(out_buf) = le16_to_cpu(BCC(out_buf)); ++ } else { ++ rc = -EIO; ++ cFYI(1,("Bad MID state? ")); ++ } ++ } ++cifs_no_response_exit: ++ DeleteMidQEntry(midQ); ++ ++ if(long_op < 3) { ++ atomic_dec(&ses->server->inFlight); ++ wake_up(&ses->server->request_q); ++ } ++ ++ return rc; ++ ++out_unlock: ++ up(&ses->server->tcpSem); ++ /* If not lock req, update # of requests on wire to server */ ++ if(long_op < 3) { ++ atomic_dec(&ses->server->inFlight); ++ wake_up(&ses->server->request_q); ++ } ++ ++ return rc; ++} +diff -urN linux-2.4.29.old/fs/Config.in linux-2.4.29/fs/Config.in +--- linux-2.4.29.old/fs/Config.in 2005-03-21 19:30:22.000000000 +0100 ++++ linux-2.4.29/fs/Config.in 2005-03-21 19:36:51.000000000 +0100 +@@ -146,6 +146,10 @@ + define_bool CONFIG_LOCKD_V4 y + fi + ++ dep_tristate 'CIFS support (advanced network filesystem for Samba, Window and other CIFS compliant servers)' CONFIG_CIFS $CONFIG_INET ++ dep_mbool ' CIFS statistics' CONFIG_CIFS_STATS $CONFIG_CIFS ++ dep_mbool ' CIFS POSIX Protocol Extensions' CONFIG_CIFS_POSIX $CONFIG_CIFS ++ + dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET + if [ "$CONFIG_SMB_FS" != "n" ]; then + bool ' Use a default NLS' CONFIG_SMB_NLS_DEFAULT +diff -urN linux-2.4.29.old/fs/Makefile linux-2.4.29/fs/Makefile +--- linux-2.4.29.old/fs/Makefile 2005-03-21 19:30:22.000000000 +0100 ++++ linux-2.4.29/fs/Makefile 2005-03-21 19:36:51.000000000 +0100 +@@ -37,6 +37,7 @@ + subdir-$(CONFIG_VFAT_FS) += vfat + subdir-$(CONFIG_BFS_FS) += bfs + subdir-$(CONFIG_ISO9660_FS) += isofs ++subdir-$(CONFIG_CIFS) += cifs + subdir-$(CONFIG_DEVFS_FS) += devfs + subdir-$(CONFIG_HFSPLUS_FS) += hfsplus # Before hfs to find wrapped HFS+ + subdir-$(CONFIG_HFS_FS) += hfs +diff -urN linux-2.4.29.old/fs/nls/Config.in linux-2.4.29/fs/nls/Config.in +--- linux-2.4.29.old/fs/nls/Config.in 2003-08-25 13:44:43.000000000 +0200 ++++ linux-2.4.29/fs/nls/Config.in 2005-03-21 19:36:51.000000000 +0100 +@@ -11,6 +11,7 @@ + + # msdos and Joliet want NLS + if [ "$CONFIG_JOLIET" = "y" -o "$CONFIG_FAT_FS" != "n" \ ++ -o "$CONFIG_CIFS" != "n" \ + -o "$CONFIG_NTFS_FS" != "n" -o "$CONFIG_NCPFS_NLS" = "y" \ + -o "$CONFIG_SMB_NLS" = "y" -o "$CONFIG_JFS_FS" != "n" \ + -o "$CONFIG_BEFS_FS" != "n" -o "$CONFIG_HFSPLUS_FS" != "n" ]; then diff --git a/recipes/linux/linux-wrt-2.4.30/306-netfilter-layer7-0.9.1 b/recipes/linux/linux-wrt-2.4.30/306-netfilter-layer7-0.9.1 new file mode 100644 index 0000000000..4dd1fce2bd --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/306-netfilter-layer7-0.9.1 @@ -0,0 +1,2022 @@ +diff -Nurp linux-2.4.26-stock/Documentation/Configure.help linux-2.4.26-layer7-clean/Documentation/Configure.help +--- linux-2.4.26-stock/Documentation/Configure.help 2004-04-14 08:05:24.000000000 -0500 ++++ linux-2.4.26-layer7-clean/Documentation/Configure.help 2004-06-21 00:18:14.000000000 -0500 +@@ -28819,6 +28819,23 @@ CONFIG_SOUND_WM97XX + + If unsure, say N. + ++CONFIG_IP_NF_MATCH_LAYER7 ++ Say Y if you want to be able to classify connections (and their ++ packets) based on regular expression matching of their application ++ layer data. This is one way to classify applications such as ++ peer-to-peer filesharing systems that do not always use the same ++ port. ++ ++ To compile it as a module, choose M here. If unsure, say N. ++ ++CONFIG_IP_NF_MATCH_LAYER7_DEBUG ++ Say Y to get lots of debugging output. ++ ++CONFIG_IP_NF_MATCH_LAYER7_MAXDATALEN ++ Size of the buffer that the application layer data is stored in. ++ Unless you know what you're doing, leave it at the default of 2048 ++ Bytes. ++ + # + # A couple of things I keep forgetting: + # capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet, +diff -Nurp linux-2.4.26-stock/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.26-layer7-clean/include/linux/netfilter_ipv4/ip_conntrack.h +--- linux-2.4.26-stock/include/linux/netfilter_ipv4/ip_conntrack.h 2004-04-14 08:05:40.000000000 -0500 ++++ linux-2.4.26-layer7-clean/include/linux/netfilter_ipv4/ip_conntrack.h 2004-06-21 00:18:28.000000000 -0500 +@@ -207,6 +207,17 @@ struct ip_conntrack + } nat; + #endif /* CONFIG_IP_NF_NAT_NEEDED */ + ++#if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE) ++ struct { ++ unsigned int numpackets; /* surely this is kept track of somewhere else, right? I can't find it... */ ++ char * app_proto; /* "http", "ftp", etc. NULL if unclassifed */ ++ ++ /* the application layer data so far. NULL if ->numpackets > numpackets */ ++ char * app_data; ++ ++ unsigned int app_data_len; ++ } layer7; ++#endif + }; + + /* get master conntrack via master expectation */ +diff -Nurp linux-2.4.26-stock/include/linux/netfilter_ipv4/ipt_layer7.h linux-2.4.26-layer7-clean/include/linux/netfilter_ipv4/ipt_layer7.h +--- linux-2.4.26-stock/include/linux/netfilter_ipv4/ipt_layer7.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-2.4.26-layer7-clean/include/linux/netfilter_ipv4/ipt_layer7.h 2004-06-21 00:18:28.000000000 -0500 +@@ -0,0 +1,26 @@ ++/* ++ By Matthew Strait <quadong@users.sf.net>, Dec 2003. ++ http://l7-filter.sf.net ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of the GNU General Public License ++ as published by the Free Software Foundation; either version ++ 2 of the License, or (at your option) any later version. ++ http://www.gnu.org/licenses/gpl.txt ++*/ ++ ++#ifndef _IPT_LAYER7_H ++#define _IPT_LAYER7_H ++ ++#define MAX_PATTERN_LEN 8192 ++#define MAX_PROTOCOL_LEN 256 ++ ++typedef char *(*proc_ipt_search) (char *, char, char *); ++ ++struct ipt_layer7_info { ++ char protocol[MAX_PROTOCOL_LEN]; ++ char invert:1; ++ char pattern[MAX_PATTERN_LEN]; ++}; ++ ++#endif /* _IPT_LAYER7_H */ +diff -Nurp linux-2.4.26-stock/net/ipv4/netfilter/Config.in linux-2.4.26-layer7-clean/net/ipv4/netfilter/Config.in +--- linux-2.4.26-stock/net/ipv4/netfilter/Config.in 2003-08-25 06:44:44.000000000 -0500 ++++ linux-2.4.26-layer7-clean/net/ipv4/netfilter/Config.in 2004-06-21 00:15:23.000000000 -0500 +@@ -43,6 +43,10 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES + dep_tristate ' Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES ++ dep_tristate ' Layer 7 match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_LAYER7 $CONFIG_IP_NF_CONNTRACK ++ dep_mbool ' Layer 7 debugging output (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_LAYER7_DEBUG $CONFIG_IP_NF_MATCH_LAYER7 ++ int ' Buffer size for application layer data (256-65536)' CONFIG_IP_NF_MATCH_LAYER7_MAXDATALEN 2048 ++ + fi + # The targets + dep_tristate ' Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES +diff -Nurp linux-2.4.26-stock/net/ipv4/netfilter/Makefile linux-2.4.26-layer7-clean/net/ipv4/netfilter/Makefile +--- linux-2.4.26-stock/net/ipv4/netfilter/Makefile 2003-08-25 06:44:44.000000000 -0500 ++++ linux-2.4.26-layer7-clean/net/ipv4/netfilter/Makefile 2004-06-21 00:15:22.000000000 -0500 +@@ -87,6 +87,8 @@ obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += i + obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o + obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o + ++obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_layer7.o ++ + # targets + obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o + obj-$(CONFIG_IP_NF_TARGET_MIRROR) += ipt_MIRROR.o +diff -Nurp linux-2.4.26-stock/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.26-layer7-clean/net/ipv4/netfilter/ip_conntrack_core.c +--- linux-2.4.26-stock/net/ipv4/netfilter/ip_conntrack_core.c 2004-02-18 07:36:32.000000000 -0600 ++++ linux-2.4.26-layer7-clean/net/ipv4/netfilter/ip_conntrack_core.c 2004-06-21 00:15:22.000000000 -0500 +@@ -339,6 +339,15 @@ destroy_conntrack(struct nf_conntrack *n + } + kfree(ct->master); + } ++ ++ #if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE) ++ /* This ought to get free'd somewhere. How about here? */ ++ if(ct->layer7.app_proto) /* this is sufficient, right? */ ++ kfree(ct->layer7.app_proto); ++ if(ct->layer7.app_data) ++ kfree(ct->layer7.app_data); ++ #endif ++ + WRITE_UNLOCK(&ip_conntrack_lock); + + if (master) +diff -Nurp linux-2.4.26-stock/net/ipv4/netfilter/ip_conntrack_standalone.c linux-2.4.26-layer7-clean/net/ipv4/netfilter/ip_conntrack_standalone.c +--- linux-2.4.26-stock/net/ipv4/netfilter/ip_conntrack_standalone.c 2004-02-18 07:36:32.000000000 -0600 ++++ linux-2.4.26-layer7-clean/net/ipv4/netfilter/ip_conntrack_standalone.c 2004-06-21 00:15:22.000000000 -0500 +@@ -107,6 +107,13 @@ print_conntrack(char *buffer, struct ip_ + len += sprintf(buffer + len, "[ASSURED] "); + len += sprintf(buffer + len, "use=%u ", + atomic_read(&conntrack->ct_general.use)); ++ ++ #if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE) ++ if(conntrack->layer7.app_proto) ++ len += sprintf(buffer + len, "l7proto=%s ", ++ conntrack->layer7.app_proto); ++ #endif ++ + len += sprintf(buffer + len, "\n"); + + return len; +diff -Nurp linux-2.4.26-stock/net/ipv4/netfilter/ipt_layer7.c linux-2.4.26-layer7-clean/net/ipv4/netfilter/ipt_layer7.c +--- linux-2.4.26-stock/net/ipv4/netfilter/ipt_layer7.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-2.4.26-layer7-clean/net/ipv4/netfilter/ipt_layer7.c 2004-06-27 19:06:51.000000000 -0500 +@@ -0,0 +1,540 @@ ++/* ++ Kernel module to match application layer (OSI layer 7) ++ data in connections. ++ ++ http://l7-filter.sf.net ++ ++ By Matthew Strait and Ethan Sommer, 2003. ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of the GNU General Public License ++ as published by the Free Software Foundation; either version ++ 2 of the License, or (at your option) any later version. ++ http://www.gnu.org/licenses/gpl.txt ++ ++ Based on ipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be> ++ and cls_layer7.c (C) 2003 Matthew Strait, Ethan Sommer, Justin Levandoski ++*/ ++ ++#include <linux/module.h> ++#include <linux/skbuff.h> ++#include <linux/netfilter_ipv4/ip_conntrack.h> ++#include <linux/proc_fs.h> ++#include <linux/ctype.h> ++#include <net/ip.h> ++#include <net/tcp.h> ++ ++#include "regexp/regexp.c" ++ ++#include <linux/netfilter_ipv4/ipt_layer7.h> ++#include <linux/netfilter_ipv4/ip_tables.h> ++ ++MODULE_AUTHOR("Matthew Strait <quadong@users.sf.net>, Ethan Sommer <sommere@users.sf.net>"); ++MODULE_LICENSE("GPL"); ++MODULE_DESCRIPTION("iptables application layer match module"); ++ ++#if defined(CONFIG_IP_NF_MATCH_LAYER7_DEBUG) ++ #define DPRINTK(format,args...) printk(format,##args) ++#else ++ #define DPRINTK(format,args...) ++#endif ++ ++/* Number of packets whose data we look at. ++This can be modified through /proc/net/layer7_numpackets */ ++static int num_packets = 8; ++ ++static struct pattern_cache { ++ char * regex_string; ++ regexp * pattern; ++ struct pattern_cache * next; ++} * first_pattern_cache = NULL; ++ ++/* I'm new to locking. Here are my assumptions: ++ ++- No one is going to write to /proc/net/layer7_numpackets over and over ++ within a short period of time, and if they did, nothing awful would happen. ++ ++- This code will never be processing the same packet twice at the same time, ++ because iptables rules need to be traversed in order. ++ ++- It doesn't matter if two packets from different connections are in here at ++ the same time, because they don't share any data. ++ ++- It _does_ matter if two packets from the same connection are here at the same ++ time. In this case, the things we have to protect are the conntracks and ++ the list of compiled patterns. ++*/ ++DECLARE_RWLOCK(ct_lock); ++DECLARE_LOCK(list_lock); ++ ++/* Use instead of regcomp. As we expect to be seeing the same regexps over and ++over again, it make sense to cache the results. */ ++static regexp * compile_and_cache(char * regex_string, char * protocol) ++{ ++ struct pattern_cache * node = first_pattern_cache; ++ struct pattern_cache * last_pattern_cache = first_pattern_cache; ++ struct pattern_cache * tmp; ++ unsigned int len; ++ ++ while (node != NULL) { ++ if (!strcmp(node->regex_string, regex_string)) ++ return node->pattern; ++ ++ last_pattern_cache = node;/* points at the last non-NULL node */ ++ node = node->next; ++ } ++ ++ /* If we reach the end of the list, then we have not yet cached ++ the pattern for this regex. Let's do that now. ++ Be paranoid about running out of memory to avoid list corruption. */ ++ tmp = kmalloc(sizeof(struct pattern_cache), GFP_ATOMIC); ++ ++ if(!tmp) { ++ printk(KERN_ERR "layer7: out of memory in compile_and_cache, bailing.\n"); ++ return NULL; ++ } ++ ++ tmp->regex_string = kmalloc(strlen(regex_string) + 1, GFP_ATOMIC); ++ tmp->pattern = kmalloc(sizeof(struct regexp), GFP_ATOMIC); ++ ++ if(!tmp->regex_string || !tmp->pattern) { ++ printk(KERN_ERR "layer7: out of memory in compile_and_cache, bailing.\n"); ++ kfree(tmp->regex_string); ++ kfree(tmp->pattern); ++ kfree(tmp); ++ return NULL; ++ } ++ ++ tmp->next = NULL; ++ /* Ok. The new node is all ready now. */ ++ node = tmp; ++ ++ if(first_pattern_cache == NULL) /* list is empty */ ++ first_pattern_cache = node; /* make node the beginning */ ++ else ++ last_pattern_cache->next = node; /* attach node to the end */ ++ ++ /* copy the string and compile the regex */ ++ len = strlen(regex_string); ++ node->pattern = regcomp(regex_string, &len); ++ if ( !node->pattern ) { ++ printk(KERN_ERR "layer7: Error compiling regexp \"%s\" (%s)\n", ++ regex_string, protocol); ++ /* pattern is now cached as NULL, so we won't try again. */ ++ } ++ ++ strcpy(node->regex_string, regex_string); ++ return node->pattern; ++} ++ ++#if CONFIG_IP_NF_MATCH_LAYER7_DEBUG ++/* Converts an unfriendly string into a friendly one by ++replacing unprintables with periods and all whitespace with " ". */ ++static char * friendly_print(unsigned char * s) ++{ ++ char * f = kmalloc(strlen(s) + 1, GFP_ATOMIC); ++ int i; ++ ++ if(!f) { ++ printk(KERN_ERR "layer7: out of memory in friendly_print, bailing.\n"); ++ return NULL; ++ } ++ ++ for(i = 0; i < strlen(s); i++){ ++ if(isprint(s[i]) && s[i] < 128) f[i] = s[i]; ++ else if(isspace(s[i])) f[i] = ' '; ++ else f[i] = '.'; ++ } ++ f[i] = '\0'; ++ return f; ++} ++ ++static char dec2hex(int i) ++{ ++ switch (i) { ++ case 0 ... 9: ++ return (char)(i + '0'); ++ break; ++ case 10 ... 15: ++ return (char)(i - 10 + 'a'); ++ break; ++ default: ++ printk("Problem in dec2hex\n"); ++ return '\0'; ++ } ++} ++ ++static char * hex_print(unsigned char * s) ++{ ++ char * g = kmalloc(strlen(s)*3 + 1, GFP_ATOMIC); ++ int i; ++ ++ if(!g) { ++ printk(KERN_ERR "layer7: out of memory in hex_print, bailing.\n"); ++ return NULL; ++ } ++ ++ for(i = 0; i < strlen(s); i++) { ++ g[i*3 ] = dec2hex(s[i]/16); ++ g[i*3 + 1] = dec2hex(s[i]%16); ++ g[i*3 + 2] = ' '; ++ } ++ g[i*3] = '\0'; ++ ++ return g; ++} ++#endif // DEBUG ++ ++ ++/* The following functions are here in case we get ported into an environment ++(ebtables?) where skb->nh.iph->protocol isn't set. They assume that skb->data ++points at the beginning of the IP datagram, which is true for iptables (but in ++QoS it points to the beginning of the Ethernet frame). */ ++#if 0 ++#define IP_PROTO_OFFSET 9 ++static int is_tcp_over_ipv4 (const struct sk_buff *skb){return(skb->data[IP_PROTO_OFFSET]==IPPROTO_TCP );} ++static int is_udp_over_ipv4 (const struct sk_buff *skb){return(skb->data[IP_PROTO_OFFSET]==IPPROTO_UDP );} ++static int is_icmp_over_ipv4(const struct sk_buff *skb){return(skb->data[IP_PROTO_OFFSET]==IPPROTO_ICMP);} ++#endif ++ ++static int can_handle(const struct sk_buff *skb) ++{ ++ if(!skb->nh.iph) /* not IP */ ++ return 0; ++ if(skb->nh.iph->protocol != IPPROTO_TCP && ++ skb->nh.iph->protocol != IPPROTO_UDP && ++ skb->nh.iph->protocol != IPPROTO_ICMP) ++ return 0; ++ return 1; ++} ++ ++/* Returns offset the into the skb->data that the application data starts */ ++static int app_data_offset(const struct sk_buff *skb) ++{ ++ /* In case we are ported somewhere (ebtables?) where skb->nh.iph ++ isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */ ++ int ip_hl = 4*skb->nh.iph->ihl; ++ ++ if( skb->nh.iph->protocol == IPPROTO_TCP ) { ++ /* 12 == offset into TCP header for the header length field. ++ Can't get this with skb->h.th->doff because the tcphdr ++ struct doesn't get set when routing (this is confirmed to be ++ true in Netfilter as well as QoS.) */ ++ int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4); ++ ++ return ip_hl + tcp_hl; ++ } else if( skb->nh.iph->protocol == IPPROTO_UDP ) { ++ return ip_hl + 8; /* UDP header is always 8 bytes */ ++ } else if( skb->nh.iph->protocol == IPPROTO_ICMP ) { ++ return ip_hl + 8; /* ICMP header is 8 bytes */ ++ } else { ++ printk(KERN_ERR "layer7: tried to handle unknown protocol!\n"); ++ return ip_hl + 8; /* something reasonable */ ++ } ++} ++ ++/* handles whether there's a match when we aren't appending data anymore */ ++static int match_no_append(struct ip_conntrack * conntrack, ++ struct ip_conntrack * master_conntrack, ++ struct ipt_layer7_info * info) ++{ ++ /* If we're in here, we don't care about the app data anymore */ ++ WRITE_LOCK(&ct_lock); ++ if(master_conntrack->layer7.app_data != NULL) { ++ ++ #ifdef CONFIG_IP_NF_MATCH_LAYER7_DEBUG ++ if(!master_conntrack->layer7.app_proto) { ++ char * f = friendly_print(master_conntrack->layer7.app_data); ++ char * g = hex_print(master_conntrack->layer7.app_data); ++ DPRINTK("\nGave up on the %d length stream: \n%s\n", ++ master_conntrack->layer7.app_data_len, f); ++ DPRINTK("\nIn hex: %s\n", g); ++ kfree(f); ++ kfree(g); ++ } ++ #endif ++ ++ kfree(master_conntrack->layer7.app_data); ++ master_conntrack->layer7.app_data = NULL; /* don't free again */ ++ } ++ WRITE_UNLOCK(&ct_lock); ++ ++ /* Is top-level master (possibly self) classified? */ ++ if(master_conntrack->layer7.app_proto) { ++ if(!strcmp(master_conntrack->layer7.app_proto, info->protocol)) ++ { ++ /* set own .protocol (for /proc/net/ip_conntrack) */ ++ WRITE_LOCK(&ct_lock); ++ if(!conntrack->layer7.app_proto) { ++ conntrack->layer7.app_proto = kmalloc(strlen(info->protocol), GFP_ATOMIC); ++ if(!conntrack->layer7.app_proto){ ++ printk(KERN_ERR "layer7: out of memory in match_no_append, bailing.\n"); ++ WRITE_UNLOCK(&ct_lock); ++ return 1; ++ } ++ ++ strcpy(conntrack->layer7.app_proto, info->protocol); ++ } ++ WRITE_UNLOCK(&ct_lock); ++ ++ return 1; ++ } else return 0; ++ } else return 0; /* no clasification */ ++} ++ ++/* add the new app data to the conntrack. Return number of bytes added. */ ++static int add_data(struct ip_conntrack * master_conntrack, ++ char * app_data, int appdatalen) ++{ ++ int length = 0, i; ++ int oldlength = master_conntrack->layer7.app_data_len; ++ ++ /* Strip nulls. Make everything lower case (our regex lib doesn't ++ do case insensitivity). Add it to the end of the current data. */ ++ for(i = 0; i < CONFIG_IP_NF_MATCH_LAYER7_MAXDATALEN-oldlength-1 && ++ i < appdatalen; i++) { ++ if(app_data[i] != '\0') { ++ master_conntrack->layer7.app_data[length+oldlength] = ++ /* the kernel version of tolower mungs 'upper ascii' */ ++ isascii(app_data[i])? tolower(app_data[i]) : app_data[i]; ++ length++; ++ } ++ } ++ ++ master_conntrack->layer7.app_data[length+oldlength] = '\0'; ++ master_conntrack->layer7.app_data_len = length + oldlength; ++ ++ return length; ++} ++ ++/* Returns true on match and false otherwise. */ ++static int match(/* const */struct sk_buff *skb, const struct net_device *in, ++ const struct net_device *out, const void *matchinfo, ++ int offset, int *hotdrop) ++{ ++ struct ipt_layer7_info * info = (struct ipt_layer7_info *)matchinfo; ++ enum ip_conntrack_info master_ctinfo, ctinfo; ++ struct ip_conntrack *master_conntrack, *conntrack; ++ unsigned char * app_data; ++ unsigned int pattern_result, appdatalen; ++ regexp * comppattern; ++ ++ if(!can_handle(skb)){ ++ DPRINTK("layer7: This is some protocol I can't handle\n"); ++ return info->invert; ++ } ++ ++ LOCK_BH(&list_lock); ++ comppattern = compile_and_cache(info->pattern, info->protocol); ++ UNLOCK_BH(&list_lock); ++ /* the return value gets checked later, when we're ready to use it */ ++ ++ app_data = skb->data + app_data_offset(skb); ++ appdatalen = skb->tail - app_data; ++ ++ /* Treat the parent and all its children together as one connection, ++ except for the purpose of setting conntrack->layer7.pattern in the ++ actual connection. This makes /proc/net/ip_conntrack somewhat more ++ satisfying. */ ++ if(!(conntrack = ip_conntrack_get((struct sk_buff *)skb, &ctinfo)) || ++ !(master_conntrack = ip_conntrack_get((struct sk_buff *)skb, &master_ctinfo))) { ++ DPRINTK("layer7: packet is not from a known connection, giving up.\n"); ++ return info->invert; ++ } ++ ++ /* Try to get a master conntrack (and its master etc) for FTP, etc. */ ++ while (master_ct(master_conntrack) != NULL) ++ master_conntrack = master_ct(master_conntrack); ++ ++ /* skb->cb[0] == seen. Avoid doing things twice if there are two layer7 ++ rules. I'm not sure that using cb for this purpose is correct, although ++ it says "put your private variables there" and this seems to qualify. ++ But it doesn't look like it's being used for anything else in the ++ sk_buffs that make it here. I'm open to suggestions for how to be able ++ to write to cb without making the compiler angry. That I can't figure ++ this out is an argument against this being correct. */ ++ if(!skb->cb[0]){ ++ WRITE_LOCK(&ct_lock); ++ master_conntrack->layer7.numpackets++;/*starts at 0 via memset*/ ++ WRITE_UNLOCK(&ct_lock); ++ } ++ ++ /* On the first packet of a connection, allocate space for app data */ ++ WRITE_LOCK(&ct_lock); ++ if(master_conntrack->layer7.numpackets == 1 && !skb->cb[0]) { ++ master_conntrack->layer7.app_data = kmalloc(CONFIG_IP_NF_MATCH_LAYER7_MAXDATALEN, GFP_ATOMIC); ++ if(!master_conntrack->layer7.app_data){ ++ printk(KERN_ERR "layer7: out of memory in match, bailing.\n"); ++ WRITE_UNLOCK(&ct_lock); ++ return info->invert; ++ } ++ ++ master_conntrack->layer7.app_data[0] = '\0'; ++ } ++ WRITE_UNLOCK(&ct_lock); ++ ++ /* if we've classified it or seen too many packets */ ++ if(master_conntrack->layer7.numpackets > num_packets || ++ master_conntrack->layer7.app_proto) { ++ ++ pattern_result = match_no_append(conntrack, master_conntrack, info); ++ ++ /* mark the packet seen (probably irrelevant, but consistant) */ ++ skb->cb[0] = 1; ++ ++ return (pattern_result ^ info->invert); ++ } ++ ++ /* Can end up here, but unallocated, if numpackets is increased during ++ the beginning of a connection */ ++ if(master_conntrack->layer7.app_data == NULL) ++ return (info->invert); /* unmatched */ ++ ++ if(!skb->cb[0]) { ++ int newbytes; ++ WRITE_LOCK(&ct_lock); ++ newbytes = add_data(master_conntrack, app_data, appdatalen); ++ WRITE_UNLOCK(&ct_lock); ++ ++ if(newbytes == 0) { /* didn't add any data */ ++ skb->cb[0] = 1; ++ /* Didn't match before, not going to match now */ ++ return info->invert; ++ } ++ } ++ ++ /* If the regexp failed to compile, don't bother running it */ ++ if(comppattern && regexec(comppattern, master_conntrack->layer7.app_data)) { ++ DPRINTK("layer7: regexec positive: %s!\n", info->protocol); ++ pattern_result = 1; ++ } else pattern_result = 0; ++ ++ if(pattern_result) { ++ WRITE_LOCK(&ct_lock); ++ conntrack->layer7.app_proto = kmalloc(strlen(info->protocol), GFP_ATOMIC); ++ if(!conntrack->layer7.app_proto){ ++ printk(KERN_ERR "layer7: out of memory in match, bailing.\n"); ++ WRITE_UNLOCK(&ct_lock); ++ return (pattern_result ^ info->invert); ++ } ++ ++ strcpy(conntrack->layer7.app_proto, info->protocol); ++ WRITE_UNLOCK(&ct_lock); ++ } ++ ++ /* mark the packet seen */ ++ skb->cb[0] = 1; ++ ++ return (pattern_result ^ info->invert); ++} ++ ++static int checkentry(const char *tablename, const struct ipt_ip *ip, ++ void *matchinfo, unsigned int matchsize, unsigned int hook_mask) ++{ ++ if (matchsize != IPT_ALIGN(sizeof(struct ipt_layer7_info))) ++ return 0; ++ return 1; ++} ++ ++static struct ipt_match layer7_match = { ++ .name = "layer7", ++ .match = &match, ++ .checkentry = &checkentry, ++ .me = THIS_MODULE ++}; ++ ++/* taken from drivers/video/modedb.c */ ++static int my_atoi(const char *s) ++{ ++ int val = 0; ++ ++ for (;; s++) { ++ switch (*s) { ++ case '0'...'9': ++ val = 10*val+(*s-'0'); ++ break; ++ default: ++ return val; ++ } ++ } ++} ++ ++/* write out num_packets to userland. */ ++static int layer7_read_proc(char* page, char ** start, off_t off, int count, ++ int* eof, void * data) ++{ ++ if(num_packets > 99) ++ printk(KERN_ERR "layer7: NOT REACHED. num_packets too big\n"); ++ ++ page[0] = num_packets/10 + '0'; ++ page[1] = num_packets%10 + '0'; ++ page[2] = '\n'; ++ page[3] = '\0'; ++ ++ *eof=1; ++ ++ return 3; ++} ++ ++/* Read in num_packets from userland */ ++static int layer7_write_proc(struct file* file, const char* buffer, ++ unsigned long count, void *data) ++{ ++ char * foo = kmalloc(count, GFP_ATOMIC); ++ ++ if(!foo){ ++ printk(KERN_ERR "layer7: out of memory, bailing. num_packets unchanged.\n"); ++ return count; ++ } ++ ++ /* copy in the data from userland */ ++ copy_from_user(foo, buffer, count); ++ ++ num_packets = my_atoi(foo); ++ kfree (foo); ++ ++ /* This has an arbitrary limit to make the math easier. I'm lazy. ++ But anyway, 99 is a LOT! If you want more, you're doing it wrong! */ ++ if(num_packets > 99) { ++ printk(KERN_WARNING "layer7: num_packets can't be > 99.\n"); ++ num_packets = 99; ++ } else if(num_packets < 1) { ++ printk(KERN_WARNING "layer7: num_packets can't be < 1.\n"); ++ num_packets = 1; ++ } ++ ++ return count; ++} ++ ++/* register the proc file */ ++static void layer7_init_proc(void) ++{ ++ struct proc_dir_entry* entry; ++ ++ /* create the file */ ++ entry = create_proc_entry("layer7_numpackets", 0644, proc_net); ++ ++ /* set the callback functions */ ++ entry->read_proc = layer7_read_proc; ++ entry->write_proc = layer7_write_proc; ++} ++ ++static void layer7_cleanup_proc(void) ++{ ++ remove_proc_entry("layer7_numpackets", proc_net); ++} ++ ++static int __init init(void) ++{ ++ layer7_init_proc(); ++ return ipt_register_match(&layer7_match); ++} ++ ++static void __exit fini(void) ++{ ++ layer7_cleanup_proc(); ++ ipt_unregister_match(&layer7_match); ++} ++ ++module_init(init); ++module_exit(fini); +diff -Nurp linux-2.4.26-stock/net/ipv4/netfilter/regexp/regexp.c linux-2.4.26-layer7-clean/net/ipv4/netfilter/regexp/regexp.c +--- linux-2.4.26-stock/net/ipv4/netfilter/regexp/regexp.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-2.4.26-layer7-clean/net/ipv4/netfilter/regexp/regexp.c 2004-06-27 19:07:00.000000000 -0500 +@@ -0,0 +1,1195 @@ ++/* ++ * regcomp and regexec -- regsub and regerror are elsewhere ++ * @(#)regexp.c 1.3 of 18 April 87 ++ * ++ * Copyright (c) 1986 by University of Toronto. ++ * Written by Henry Spencer. Not derived from licensed software. ++ * ++ * Permission is granted to anyone to use this software for any ++ * purpose on any computer system, and to redistribute it freely, ++ * subject to the following restrictions: ++ * ++ * 1. The author is not responsible for the consequences of use of ++ * this software, no matter how awful, even if they arise ++ * from defects in it. ++ * ++ * 2. The origin of this software must not be misrepresented, either ++ * by explicit claim or by omission. ++ * ++ * 3. Altered versions must be plainly marked as such, and must not ++ * be misrepresented as being the original software. ++ * ++ * Beware that some of this code is subtly aware of the way operator ++ * precedence is structured in regular expressions. Serious changes in ++ * regular-expression syntax might require a total rethink. ++ * ++ * This code was modified by Ethan Sommer to work within the kernel ++ * (it now uses kmalloc etc..) ++ * ++ * Modified slightly by Matthew Strait to use more modern C. ++ */ ++ ++#include "regexp.h" ++#include "regmagic.h" ++ ++/* added by ethan and matt. Lets it work in both kernel and user space. ++(So iptables can use it, for instance.) Yea, it goes both ways... */ ++#if __KERNEL__ ++ #define malloc(foo) kmalloc(foo,GFP_ATOMIC) ++#else ++ #define printk(format,args...) printf(format,##args) ++#endif ++ ++void regerror(char * s) ++{ ++ printk("<3>Regexp: %s\n", s); ++ /* NOTREACHED */ ++} ++ ++/* ++ * The "internal use only" fields in regexp.h are present to pass info from ++ * compile to execute that permits the execute phase to run lots faster on ++ * simple cases. They are: ++ * ++ * regstart char that must begin a match; '\0' if none obvious ++ * reganch is the match anchored (at beginning-of-line only)? ++ * regmust string (pointer into program) that match must include, or NULL ++ * regmlen length of regmust string ++ * ++ * Regstart and reganch permit very fast decisions on suitable starting points ++ * for a match, cutting down the work a lot. Regmust permits fast rejection ++ * of lines that cannot possibly match. The regmust tests are costly enough ++ * that regcomp() supplies a regmust only if the r.e. contains something ++ * potentially expensive (at present, the only such thing detected is * or + ++ * at the start of the r.e., which can involve a lot of backup). Regmlen is ++ * supplied because the test in regexec() needs it and regcomp() is computing ++ * it anyway. ++ */ ++ ++/* ++ * Structure for regexp "program". This is essentially a linear encoding ++ * of a nondeterministic finite-state machine (aka syntax charts or ++ * "railroad normal form" in parsing technology). Each node is an opcode ++ * plus a "next" pointer, possibly plus an operand. "Next" pointers of ++ * all nodes except BRANCH implement concatenation; a "next" pointer with ++ * a BRANCH on both ends of it is connecting two alternatives. (Here we ++ * have one of the subtle syntax dependencies: an individual BRANCH (as ++ * opposed to a collection of them) is never concatenated with anything ++ * because of operator precedence.) The operand of some types of node is ++ * a literal string; for others, it is a node leading into a sub-FSM. In ++ * particular, the operand of a BRANCH node is the first node of the branch. ++ * (NB this is *not* a tree structure: the tail of the branch connects ++ * to the thing following the set of BRANCHes.) The opcodes are: ++ */ ++ ++/* definition number opnd? meaning */ ++#define END 0 /* no End of program. */ ++#define BOL 1 /* no Match "" at beginning of line. */ ++#define EOL 2 /* no Match "" at end of line. */ ++#define ANY 3 /* no Match any one character. */ ++#define ANYOF 4 /* str Match any character in this string. */ ++#define ANYBUT 5 /* str Match any character not in this string. */ ++#define BRANCH 6 /* node Match this alternative, or the next... */ ++#define BACK 7 /* no Match "", "next" ptr points backward. */ ++#define EXACTLY 8 /* str Match this string. */ ++#define NOTHING 9 /* no Match empty string. */ ++#define STAR 10 /* node Match this (simple) thing 0 or more times. */ ++#define PLUS 11 /* node Match this (simple) thing 1 or more times. */ ++#define OPEN 20 /* no Mark this point in input as start of #n. */ ++ /* OPEN+1 is number 1, etc. */ ++#define CLOSE 30 /* no Analogous to OPEN. */ ++ ++/* ++ * Opcode notes: ++ * ++ * BRANCH The set of branches constituting a single choice are hooked ++ * together with their "next" pointers, since precedence prevents ++ * anything being concatenated to any individual branch. The ++ * "next" pointer of the last BRANCH in a choice points to the ++ * thing following the whole choice. This is also where the ++ * final "next" pointer of each individual branch points; each ++ * branch starts with the operand node of a BRANCH node. ++ * ++ * BACK Normal "next" pointers all implicitly point forward; BACK ++ * exists to make loop structures possible. ++ * ++ * STAR,PLUS '?', and complex '*' and '+', are implemented as circular ++ * BRANCH structures using BACK. Simple cases (one character ++ * per match) are implemented with STAR and PLUS for speed ++ * and to minimize recursive plunges. ++ * ++ * OPEN,CLOSE ...are numbered at compile time. ++ */ ++ ++/* ++ * A node is one char of opcode followed by two chars of "next" pointer. ++ * "Next" pointers are stored as two 8-bit pieces, high order first. The ++ * value is a positive offset from the opcode of the node containing it. ++ * An operand, if any, simply follows the node. (Note that much of the ++ * code generation knows about this implicit relationship.) ++ * ++ * Using two bytes for the "next" pointer is vast overkill for most things, ++ * but allows patterns to get big without disasters. ++ */ ++#define OP(p) (*(p)) ++#define NEXT(p) (((*((p)+1)&0377)<<8) + (*((p)+2)&0377)) ++#define OPERAND(p) ((p) + 3) ++ ++/* ++ * See regmagic.h for one further detail of program structure. ++ */ ++ ++ ++/* ++ * Utility definitions. ++ */ ++#ifndef CHARBITS ++#define UCHARAT(p) ((int)*(unsigned char *)(p)) ++#else ++#define UCHARAT(p) ((int)*(p)&CHARBITS) ++#endif ++ ++#define FAIL(m) { regerror(m); return(NULL); } ++#define ISMULT(c) ((c) == '*' || (c) == '+' || (c) == '?') ++#define META "^$.[()|?+*\\" ++ ++/* ++ * Flags to be passed up and down. ++ */ ++#define HASWIDTH 01 /* Known never to match null string. */ ++#define SIMPLE 02 /* Simple enough to be STAR/PLUS operand. */ ++#define SPSTART 04 /* Starts with * or +. */ ++#define WORST 0 /* Worst case. */ ++ ++/* ++ * Global work variables for regcomp(). ++ */ ++static char *regparse; /* Input-scan pointer. */ ++static int regnpar; /* () count. */ ++static char regdummy; ++static char *regcode; /* Code-emit pointer; ®dummy = don't. */ ++static long regsize; /* Code size. */ ++ ++/* ++ * Forward declarations for regcomp()'s friends. ++ */ ++#ifndef STATIC ++#define STATIC static ++#endif ++STATIC char *reg(int paren,int *flagp); ++STATIC char *regbranch(int *flagp); ++STATIC char *regpiece(int *flagp); ++STATIC char *regatom(int *flagp); ++STATIC char *regnode(char op); ++STATIC char *regnext(char *p); ++STATIC void regc(char b); ++STATIC void reginsert(char op, char *opnd); ++STATIC void regtail(char *p, char *val); ++STATIC void regoptail(char *p, char *val); ++ ++ ++__kernel_size_t my_strcspn(const char *s1,const char *s2) ++{ ++ char *scan1; ++ char *scan2; ++ int count; ++ ++ count = 0; ++ for (scan1 = (char *)s1; *scan1 != '\0'; scan1++) { ++ for (scan2 = (char *)s2; *scan2 != '\0';) /* ++ moved down. */ ++ if (*scan1 == *scan2++) ++ return(count); ++ count++; ++ } ++ return(count); ++} ++ ++/* ++ - regcomp - compile a regular expression into internal code ++ * ++ * We can't allocate space until we know how big the compiled form will be, ++ * but we can't compile it (and thus know how big it is) until we've got a ++ * place to put the code. So we cheat: we compile it twice, once with code ++ * generation turned off and size counting turned on, and once "for real". ++ * This also means that we don't allocate space until we are sure that the ++ * thing really will compile successfully, and we never have to move the ++ * code and thus invalidate pointers into it. (Note that it has to be in ++ * one piece because free() must be able to free it all.) ++ * ++ * Beware that the optimization-preparation code in here knows about some ++ * of the structure of the compiled regexp. ++ */ ++regexp * ++regcomp(char *exp,int *patternsize) ++{ ++ register regexp *r; ++ register char *scan; ++ register char *longest; ++ register int len; ++ int flags; ++ /* commented out by ethan ++ extern char *malloc(); ++ */ ++ ++ if (exp == NULL) ++ FAIL("NULL argument"); ++ ++ /* First pass: determine size, legality. */ ++ regparse = exp; ++ regnpar = 1; ++ regsize = 0L; ++ regcode = ®dummy; ++ regc(MAGIC); ++ if (reg(0, &flags) == NULL) ++ return(NULL); ++ ++ /* Small enough for pointer-storage convention? */ ++ if (regsize >= 32767L) /* Probably could be 65535L. */ ++ FAIL("regexp too big"); ++ ++ /* Allocate space. */ ++ *patternsize=sizeof(regexp) + (unsigned)regsize; ++ r = (regexp *)malloc(sizeof(regexp) + (unsigned)regsize); ++ if (r == NULL) ++ FAIL("out of space"); ++ ++ /* Second pass: emit code. */ ++ regparse = exp; ++ regnpar = 1; ++ regcode = r->program; ++ regc(MAGIC); ++ if (reg(0, &flags) == NULL) ++ return(NULL); ++ ++ /* Dig out information for optimizations. */ ++ r->regstart = '\0'; /* Worst-case defaults. */ ++ r->reganch = 0; ++ r->regmust = NULL; ++ r->regmlen = 0; ++ scan = r->program+1; /* First BRANCH. */ ++ if (OP(regnext(scan)) == END) { /* Only one top-level choice. */ ++ scan = OPERAND(scan); ++ ++ /* Starting-point info. */ ++ if (OP(scan) == EXACTLY) ++ r->regstart = *OPERAND(scan); ++ else if (OP(scan) == BOL) ++ r->reganch++; ++ ++ /* ++ * If there's something expensive in the r.e., find the ++ * longest literal string that must appear and make it the ++ * regmust. Resolve ties in favor of later strings, since ++ * the regstart check works with the beginning of the r.e. ++ * and avoiding duplication strengthens checking. Not a ++ * strong reason, but sufficient in the absence of others. ++ */ ++ if (flags&SPSTART) { ++ longest = NULL; ++ len = 0; ++ for (; scan != NULL; scan = regnext(scan)) ++ if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len) { ++ longest = OPERAND(scan); ++ len = strlen(OPERAND(scan)); ++ } ++ r->regmust = longest; ++ r->regmlen = len; ++ } ++ } ++ ++ return(r); ++} ++ ++/* ++ - reg - regular expression, i.e. main body or parenthesized thing ++ * ++ * Caller must absorb opening parenthesis. ++ * ++ * Combining parenthesis handling with the base level of regular expression ++ * is a trifle forced, but the need to tie the tails of the branches to what ++ * follows makes it hard to avoid. ++ */ ++static char * ++reg(int paren, int *flagp /* Parenthesized? */ ) ++{ ++ register char *ret; ++ register char *br; ++ register char *ender; ++ register int parno = 0; /* 0 makes gcc happy */ ++ int flags; ++ ++ *flagp = HASWIDTH; /* Tentatively. */ ++ ++ /* Make an OPEN node, if parenthesized. */ ++ if (paren) { ++ if (regnpar >= NSUBEXP) ++ FAIL("too many ()"); ++ parno = regnpar; ++ regnpar++; ++ ret = regnode(OPEN+parno); ++ } else ++ ret = NULL; ++ ++ /* Pick up the branches, linking them together. */ ++ br = regbranch(&flags); ++ if (br == NULL) ++ return(NULL); ++ if (ret != NULL) ++ regtail(ret, br); /* OPEN -> first. */ ++ else ++ ret = br; ++ if (!(flags&HASWIDTH)) ++ *flagp &= ~HASWIDTH; ++ *flagp |= flags&SPSTART; ++ while (*regparse == '|') { ++ regparse++; ++ br = regbranch(&flags); ++ if (br == NULL) ++ return(NULL); ++ regtail(ret, br); /* BRANCH -> BRANCH. */ ++ if (!(flags&HASWIDTH)) ++ *flagp &= ~HASWIDTH; ++ *flagp |= flags&SPSTART; ++ } ++ ++ /* Make a closing node, and hook it on the end. */ ++ ender = regnode((paren) ? CLOSE+parno : END); ++ regtail(ret, ender); ++ ++ /* Hook the tails of the branches to the closing node. */ ++ for (br = ret; br != NULL; br = regnext(br)) ++ regoptail(br, ender); ++ ++ /* Check for proper termination. */ ++ if (paren && *regparse++ != ')') { ++ FAIL("unmatched ()"); ++ } else if (!paren && *regparse != '\0') { ++ if (*regparse == ')') { ++ FAIL("unmatched ()"); ++ } else ++ FAIL("junk on end"); /* "Can't happen". */ ++ /* NOTREACHED */ ++ } ++ ++ return(ret); ++} ++ ++/* ++ - regbranch - one alternative of an | operator ++ * ++ * Implements the concatenation operator. ++ */ ++static char * ++regbranch(int *flagp) ++{ ++ register char *ret; ++ register char *chain; ++ register char *latest; ++ int flags; ++ ++ *flagp = WORST; /* Tentatively. */ ++ ++ ret = regnode(BRANCH); ++ chain = NULL; ++ while (*regparse != '\0' && *regparse != '|' && *regparse != ')') { ++ latest = regpiece(&flags); ++ if (latest == NULL) ++ return(NULL); ++ *flagp |= flags&HASWIDTH; ++ if (chain == NULL) /* First piece. */ ++ *flagp |= flags&SPSTART; ++ else ++ regtail(chain, latest); ++ chain = latest; ++ } ++ if (chain == NULL) /* Loop ran zero times. */ ++ (void) regnode(NOTHING); ++ ++ return(ret); ++} ++ ++/* ++ - regpiece - something followed by possible [*+?] ++ * ++ * Note that the branching code sequences used for ? and the general cases ++ * of * and + are somewhat optimized: they use the same NOTHING node as ++ * both the endmarker for their branch list and the body of the last branch. ++ * It might seem that this node could be dispensed with entirely, but the ++ * endmarker role is not redundant. ++ */ ++static char * ++regpiece(int *flagp) ++{ ++ register char *ret; ++ register char op; ++ register char *next; ++ int flags; ++ ++ ret = regatom(&flags); ++ if (ret == NULL) ++ return(NULL); ++ ++ op = *regparse; ++ if (!ISMULT(op)) { ++ *flagp = flags; ++ return(ret); ++ } ++ ++ if (!(flags&HASWIDTH) && op != '?') ++ FAIL("*+ operand could be empty"); ++ *flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH); ++ ++ if (op == '*' && (flags&SIMPLE)) ++ reginsert(STAR, ret); ++ else if (op == '*') { ++ /* Emit x* as (x&|), where & means "self". */ ++ reginsert(BRANCH, ret); /* Either x */ ++ regoptail(ret, regnode(BACK)); /* and loop */ ++ regoptail(ret, ret); /* back */ ++ regtail(ret, regnode(BRANCH)); /* or */ ++ regtail(ret, regnode(NOTHING)); /* null. */ ++ } else if (op == '+' && (flags&SIMPLE)) ++ reginsert(PLUS, ret); ++ else if (op == '+') { ++ /* Emit x+ as x(&|), where & means "self". */ ++ next = regnode(BRANCH); /* Either */ ++ regtail(ret, next); ++ regtail(regnode(BACK), ret); /* loop back */ ++ regtail(next, regnode(BRANCH)); /* or */ ++ regtail(ret, regnode(NOTHING)); /* null. */ ++ } else if (op == '?') { ++ /* Emit x? as (x|) */ ++ reginsert(BRANCH, ret); /* Either x */ ++ regtail(ret, regnode(BRANCH)); /* or */ ++ next = regnode(NOTHING); /* null. */ ++ regtail(ret, next); ++ regoptail(ret, next); ++ } ++ regparse++; ++ if (ISMULT(*regparse)) ++ FAIL("nested *?+"); ++ ++ return(ret); ++} ++ ++/* ++ - regatom - the lowest level ++ * ++ * Optimization: gobbles an entire sequence of ordinary characters so that ++ * it can turn them into a single node, which is smaller to store and ++ * faster to run. Backslashed characters are exceptions, each becoming a ++ * separate node; the code is simpler that way and it's not worth fixing. ++ */ ++static char * ++regatom(int *flagp) ++{ ++ register char *ret; ++ int flags; ++ ++ *flagp = WORST; /* Tentatively. */ ++ ++ switch (*regparse++) { ++ case '^': ++ ret = regnode(BOL); ++ break; ++ case '$': ++ ret = regnode(EOL); ++ break; ++ case '.': ++ ret = regnode(ANY); ++ *flagp |= HASWIDTH|SIMPLE; ++ break; ++ case '[': { ++ register int class; ++ register int classend; ++ ++ if (*regparse == '^') { /* Complement of range. */ ++ ret = regnode(ANYBUT); ++ regparse++; ++ } else ++ ret = regnode(ANYOF); ++ if (*regparse == ']' || *regparse == '-') ++ regc(*regparse++); ++ while (*regparse != '\0' && *regparse != ']') { ++ if (*regparse == '-') { ++ regparse++; ++ if (*regparse == ']' || *regparse == '\0') ++ regc('-'); ++ else { ++ class = UCHARAT(regparse-2)+1; ++ classend = UCHARAT(regparse); ++ if (class > classend+1) ++ FAIL("invalid [] range"); ++ for (; class <= classend; class++) ++ regc(class); ++ regparse++; ++ } ++ } else ++ regc(*regparse++); ++ } ++ regc('\0'); ++ if (*regparse != ']') ++ FAIL("unmatched []"); ++ regparse++; ++ *flagp |= HASWIDTH|SIMPLE; ++ } ++ break; ++ case '(': ++ ret = reg(1, &flags); ++ if (ret == NULL) ++ return(NULL); ++ *flagp |= flags&(HASWIDTH|SPSTART); ++ break; ++ case '\0': ++ case '|': ++ case ')': ++ FAIL("internal urp"); /* Supposed to be caught earlier. */ ++ break; ++ case '?': ++ case '+': ++ case '*': ++ FAIL("?+* follows nothing"); ++ break; ++ case '\\': ++ if (*regparse == '\0') ++ FAIL("trailing \\"); ++ ret = regnode(EXACTLY); ++ regc(*regparse++); ++ regc('\0'); ++ *flagp |= HASWIDTH|SIMPLE; ++ break; ++ default: { ++ register int len; ++ register char ender; ++ ++ regparse--; ++ len = my_strcspn((const char *)regparse, (const char *)META); ++ if (len <= 0) ++ FAIL("internal disaster"); ++ ender = *(regparse+len); ++ if (len > 1 && ISMULT(ender)) ++ len--; /* Back off clear of ?+* operand. */ ++ *flagp |= HASWIDTH; ++ if (len == 1) ++ *flagp |= SIMPLE; ++ ret = regnode(EXACTLY); ++ while (len > 0) { ++ regc(*regparse++); ++ len--; ++ } ++ regc('\0'); ++ } ++ break; ++ } ++ ++ return(ret); ++} ++ ++/* ++ - regnode - emit a node ++ */ ++static char * /* Location. */ ++regnode(char op) ++{ ++ register char *ret; ++ register char *ptr; ++ ++ ret = regcode; ++ if (ret == ®dummy) { ++ regsize += 3; ++ return(ret); ++ } ++ ++ ptr = ret; ++ *ptr++ = op; ++ *ptr++ = '\0'; /* Null "next" pointer. */ ++ *ptr++ = '\0'; ++ regcode = ptr; ++ ++ return(ret); ++} ++ ++/* ++ - regc - emit (if appropriate) a byte of code ++ */ ++static void ++regc(char b) ++{ ++ if (regcode != ®dummy) ++ *regcode++ = b; ++ else ++ regsize++; ++} ++ ++/* ++ - reginsert - insert an operator in front of already-emitted operand ++ * ++ * Means relocating the operand. ++ */ ++static void ++reginsert(char op, char* opnd) ++{ ++ register char *src; ++ register char *dst; ++ register char *place; ++ ++ if (regcode == ®dummy) { ++ regsize += 3; ++ return; ++ } ++ ++ src = regcode; ++ regcode += 3; ++ dst = regcode; ++ while (src > opnd) ++ *--dst = *--src; ++ ++ place = opnd; /* Op node, where operand used to be. */ ++ *place++ = op; ++ *place++ = '\0'; ++ *place++ = '\0'; ++} ++ ++/* ++ - regtail - set the next-pointer at the end of a node chain ++ */ ++static void ++regtail(char *p, char *val) ++{ ++ register char *scan; ++ register char *temp; ++ register int offset; ++ ++ if (p == ®dummy) ++ return; ++ ++ /* Find last node. */ ++ scan = p; ++ for (;;) { ++ temp = regnext(scan); ++ if (temp == NULL) ++ break; ++ scan = temp; ++ } ++ ++ if (OP(scan) == BACK) ++ offset = scan - val; ++ else ++ offset = val - scan; ++ *(scan+1) = (offset>>8)&0377; ++ *(scan+2) = offset&0377; ++} ++ ++/* ++ - regoptail - regtail on operand of first argument; nop if operandless ++ */ ++static void ++regoptail(char *p, char *val) ++{ ++ /* "Operandless" and "op != BRANCH" are synonymous in practice. */ ++ if (p == NULL || p == ®dummy || OP(p) != BRANCH) ++ return; ++ regtail(OPERAND(p), val); ++} ++ ++/* ++ * regexec and friends ++ */ ++ ++/* ++ * Global work variables for regexec(). ++ */ ++static char *reginput; /* String-input pointer. */ ++static char *regbol; /* Beginning of input, for ^ check. */ ++static char **regstartp; /* Pointer to startp array. */ ++static char **regendp; /* Ditto for endp. */ ++ ++/* ++ * Forwards. ++ */ ++STATIC int regtry(regexp *prog, char *string); ++STATIC int regmatch(char *prog); ++STATIC int regrepeat(char *p); ++ ++#ifdef DEBUG ++int regnarrate = 0; ++void regdump(); ++STATIC char *regprop(char *op); ++#endif ++ ++/* ++ - regexec - match a regexp against a string ++ */ ++int ++regexec(regexp *prog, char *string) ++{ ++ register char *s; ++ ++ /* Be paranoid... */ ++ if (prog == NULL || string == NULL) { ++ printk("<3>Regexp: NULL parameter\n"); ++ return(0); ++ } ++ ++ /* Check validity of program. */ ++ if (UCHARAT(prog->program) != MAGIC) { ++ printk("<3>Regexp: corrupted program\n"); ++ return(0); ++ } ++ ++ /* If there is a "must appear" string, look for it. */ ++ if (prog->regmust != NULL) { ++ s = string; ++ while ((s = strchr(s, prog->regmust[0])) != NULL) { ++ if (strncmp(s, prog->regmust, prog->regmlen) == 0) ++ break; /* Found it. */ ++ s++; ++ } ++ if (s == NULL) /* Not present. */ ++ return(0); ++ } ++ ++ /* Mark beginning of line for ^ . */ ++ regbol = string; ++ ++ /* Simplest case: anchored match need be tried only once. */ ++ if (prog->reganch) ++ return(regtry(prog, string)); ++ ++ /* Messy cases: unanchored match. */ ++ s = string; ++ if (prog->regstart != '\0') ++ /* We know what char it must start with. */ ++ while ((s = strchr(s, prog->regstart)) != NULL) { ++ if (regtry(prog, s)) ++ return(1); ++ s++; ++ } ++ else ++ /* We don't -- general case. */ ++ do { ++ if (regtry(prog, s)) ++ return(1); ++ } while (*s++ != '\0'); ++ ++ /* Failure. */ ++ return(0); ++} ++ ++/* ++ - regtry - try match at specific point ++ */ ++static int /* 0 failure, 1 success */ ++regtry(regexp *prog, char *string) ++{ ++ register int i; ++ register char **sp; ++ register char **ep; ++ ++ reginput = string; ++ regstartp = prog->startp; ++ regendp = prog->endp; ++ ++ sp = prog->startp; ++ ep = prog->endp; ++ for (i = NSUBEXP; i > 0; i--) { ++ *sp++ = NULL; ++ *ep++ = NULL; ++ } ++ if (regmatch(prog->program + 1)) { ++ prog->startp[0] = string; ++ prog->endp[0] = reginput; ++ return(1); ++ } else ++ return(0); ++} ++ ++/* ++ - regmatch - main matching routine ++ * ++ * Conceptually the strategy is simple: check to see whether the current ++ * node matches, call self recursively to see whether the rest matches, ++ * and then act accordingly. In practice we make some effort to avoid ++ * recursion, in particular by going through "ordinary" nodes (that don't ++ * need to know whether the rest of the match failed) by a loop instead of ++ * by recursion. ++ */ ++static int /* 0 failure, 1 success */ ++regmatch(char *prog) ++{ ++ register char *scan = prog; /* Current node. */ ++ char *next; /* Next node. */ ++ ++#ifdef DEBUG ++ if (scan != NULL && regnarrate) ++ fprintf(stderr, "%s(\n", regprop(scan)); ++#endif ++ while (scan != NULL) { ++#ifdef DEBUG ++ if (regnarrate) ++ fprintf(stderr, "%s...\n", regprop(scan)); ++#endif ++ next = regnext(scan); ++ ++ switch (OP(scan)) { ++ case BOL: ++ if (reginput != regbol) ++ return(0); ++ break; ++ case EOL: ++ if (*reginput != '\0') ++ return(0); ++ break; ++ case ANY: ++ if (*reginput == '\0') ++ return(0); ++ reginput++; ++ break; ++ case EXACTLY: { ++ register int len; ++ register char *opnd; ++ ++ opnd = OPERAND(scan); ++ /* Inline the first character, for speed. */ ++ if (*opnd != *reginput) ++ return(0); ++ len = strlen(opnd); ++ if (len > 1 && strncmp(opnd, reginput, len) != 0) ++ return(0); ++ reginput += len; ++ } ++ break; ++ case ANYOF: ++ if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) == NULL) ++ return(0); ++ reginput++; ++ break; ++ case ANYBUT: ++ if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) != NULL) ++ return(0); ++ reginput++; ++ break; ++ case NOTHING: ++ case BACK: ++ break; ++ case OPEN+1: ++ case OPEN+2: ++ case OPEN+3: ++ case OPEN+4: ++ case OPEN+5: ++ case OPEN+6: ++ case OPEN+7: ++ case OPEN+8: ++ case OPEN+9: { ++ register int no; ++ register char *save; ++ ++ no = OP(scan) - OPEN; ++ save = reginput; ++ ++ if (regmatch(next)) { ++ /* ++ * Don't set startp if some later ++ * invocation of the same parentheses ++ * already has. ++ */ ++ if (regstartp[no] == NULL) ++ regstartp[no] = save; ++ return(1); ++ } else ++ return(0); ++ } ++ break; ++ case CLOSE+1: ++ case CLOSE+2: ++ case CLOSE+3: ++ case CLOSE+4: ++ case CLOSE+5: ++ case CLOSE+6: ++ case CLOSE+7: ++ case CLOSE+8: ++ case CLOSE+9: ++ { ++ register int no; ++ register char *save; ++ ++ no = OP(scan) - CLOSE; ++ save = reginput; ++ ++ if (regmatch(next)) { ++ /* ++ * Don't set endp if some later ++ * invocation of the same parentheses ++ * already has. ++ */ ++ if (regendp[no] == NULL) ++ regendp[no] = save; ++ return(1); ++ } else ++ return(0); ++ } ++ break; ++ case BRANCH: { ++ register char *save; ++ ++ if (OP(next) != BRANCH) /* No choice. */ ++ next = OPERAND(scan); /* Avoid recursion. */ ++ else { ++ do { ++ save = reginput; ++ if (regmatch(OPERAND(scan))) ++ return(1); ++ reginput = save; ++ scan = regnext(scan); ++ } while (scan != NULL && OP(scan) == BRANCH); ++ return(0); ++ /* NOTREACHED */ ++ } ++ } ++ break; ++ case STAR: ++ case PLUS: { ++ register char nextch; ++ register int no; ++ register char *save; ++ register int min; ++ ++ /* ++ * Lookahead to avoid useless match attempts ++ * when we know what character comes next. ++ */ ++ nextch = '\0'; ++ if (OP(next) == EXACTLY) ++ nextch = *OPERAND(next); ++ min = (OP(scan) == STAR) ? 0 : 1; ++ save = reginput; ++ no = regrepeat(OPERAND(scan)); ++ while (no >= min) { ++ /* If it could work, try it. */ ++ if (nextch == '\0' || *reginput == nextch) ++ if (regmatch(next)) ++ return(1); ++ /* Couldn't or didn't -- back up. */ ++ no--; ++ reginput = save + no; ++ } ++ return(0); ++ } ++ break; ++ case END: ++ return(1); /* Success! */ ++ break; ++ default: ++ printk("<3>Regexp: memory corruption\n"); ++ return(0); ++ break; ++ } ++ ++ scan = next; ++ } ++ ++ /* ++ * We get here only if there's trouble -- normally "case END" is ++ * the terminating point. ++ */ ++ printk("<3>Regexp: corrupted pointers\n"); ++ return(0); ++} ++ ++/* ++ - regrepeat - repeatedly match something simple, report how many ++ */ ++static int ++regrepeat(char *p) ++{ ++ register int count = 0; ++ register char *scan; ++ register char *opnd; ++ ++ scan = reginput; ++ opnd = OPERAND(p); ++ switch (OP(p)) { ++ case ANY: ++ count = strlen(scan); ++ scan += count; ++ break; ++ case EXACTLY: ++ while (*opnd == *scan) { ++ count++; ++ scan++; ++ } ++ break; ++ case ANYOF: ++ while (*scan != '\0' && strchr(opnd, *scan) != NULL) { ++ count++; ++ scan++; ++ } ++ break; ++ case ANYBUT: ++ while (*scan != '\0' && strchr(opnd, *scan) == NULL) { ++ count++; ++ scan++; ++ } ++ break; ++ default: /* Oh dear. Called inappropriately. */ ++ printk("<3>Regexp: internal foulup\n"); ++ count = 0; /* Best compromise. */ ++ break; ++ } ++ reginput = scan; ++ ++ return(count); ++} ++ ++/* ++ - regnext - dig the "next" pointer out of a node ++ */ ++static char* ++regnext(char *p) ++{ ++ register int offset; ++ ++ if (p == ®dummy) ++ return(NULL); ++ ++ offset = NEXT(p); ++ if (offset == 0) ++ return(NULL); ++ ++ if (OP(p) == BACK) ++ return(p-offset); ++ else ++ return(p+offset); ++} ++ ++#ifdef DEBUG ++ ++STATIC char *regprop(); ++ ++/* ++ - regdump - dump a regexp onto stdout in vaguely comprehensible form ++ */ ++void ++regdump(regexp *r) ++{ ++ register char *s; ++ register char op = EXACTLY; /* Arbitrary non-END op. */ ++ register char *next; ++ /* extern char *strchr(); */ ++ ++ ++ s = r->program + 1; ++ while (op != END) { /* While that wasn't END last time... */ ++ op = OP(s); ++ printf("%2d%s", s-r->program, regprop(s)); /* Where, what. */ ++ next = regnext(s); ++ if (next == NULL) /* Next ptr. */ ++ printf("(0)"); ++ else ++ printf("(%d)", (s-r->program)+(next-s)); ++ s += 3; ++ if (op == ANYOF || op == ANYBUT || op == EXACTLY) { ++ /* Literal string, where present. */ ++ while (*s != '\0') { ++ putchar(*s); ++ s++; ++ } ++ s++; ++ } ++ putchar('\n'); ++ } ++ ++ /* Header fields of interest. */ ++ if (r->regstart != '\0') ++ printf("start `%c' ", r->regstart); ++ if (r->reganch) ++ printf("anchored "); ++ if (r->regmust != NULL) ++ printf("must have \"%s\"", r->regmust); ++ printf("\n"); ++} ++ ++/* ++ - regprop - printable representation of opcode ++ */ ++static char * ++regprop(char *op) ++{ ++#define BUFLEN 50 ++ register char *p; ++ static char buf[BUFLEN]; ++ ++ strcpy(buf, ":"); ++ ++ switch (OP(op)) { ++ case BOL: ++ p = "BOL"; ++ break; ++ case EOL: ++ p = "EOL"; ++ break; ++ case ANY: ++ p = "ANY"; ++ break; ++ case ANYOF: ++ p = "ANYOF"; ++ break; ++ case ANYBUT: ++ p = "ANYBUT"; ++ break; ++ case BRANCH: ++ p = "BRANCH"; ++ break; ++ case EXACTLY: ++ p = "EXACTLY"; ++ break; ++ case NOTHING: ++ p = "NOTHING"; ++ break; ++ case BACK: ++ p = "BACK"; ++ break; ++ case END: ++ p = "END"; ++ break; ++ case OPEN+1: ++ case OPEN+2: ++ case OPEN+3: ++ case OPEN+4: ++ case OPEN+5: ++ case OPEN+6: ++ case OPEN+7: ++ case OPEN+8: ++ case OPEN+9: ++ snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "OPEN%d", OP(op)-OPEN); ++ p = NULL; ++ break; ++ case CLOSE+1: ++ case CLOSE+2: ++ case CLOSE+3: ++ case CLOSE+4: ++ case CLOSE+5: ++ case CLOSE+6: ++ case CLOSE+7: ++ case CLOSE+8: ++ case CLOSE+9: ++ snprintf(buf+strlen(buf),BUFLEN-strlen(buf), "CLOSE%d", OP(op)-CLOSE); ++ p = NULL; ++ break; ++ case STAR: ++ p = "STAR"; ++ break; ++ case PLUS: ++ p = "PLUS"; ++ break; ++ default: ++ printk("<3>Regexp: corrupted opcode\n"); ++ break; ++ } ++ if (p != NULL) ++ strncat(buf, p, BUFLEN-strlen(buf)); ++ return(buf); ++} ++#endif ++ ++ +diff -Nurp linux-2.4.26-stock/net/ipv4/netfilter/regexp/regexp.h linux-2.4.26-layer7-clean/net/ipv4/netfilter/regexp/regexp.h +--- linux-2.4.26-stock/net/ipv4/netfilter/regexp/regexp.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-2.4.26-layer7-clean/net/ipv4/netfilter/regexp/regexp.h 2004-06-27 19:07:00.000000000 -0500 +@@ -0,0 +1,27 @@ ++/* ++ * Definitions etc. for regexp(3) routines. ++ * ++ * Caveat: this is V8 regexp(3) [actually, a reimplementation thereof], ++ * not the System V one. ++ */ ++ ++#ifndef REGEXP_H ++#define REGEXP_H ++ ++#define NSUBEXP 10 ++typedef struct regexp { ++ char *startp[NSUBEXP]; ++ char *endp[NSUBEXP]; ++ char regstart; /* Internal use only. */ ++ char reganch; /* Internal use only. */ ++ char *regmust; /* Internal use only. */ ++ int regmlen; /* Internal use only. */ ++ char program[1]; /* Unwarranted chumminess with compiler. */ ++} regexp; ++ ++regexp * regcomp(char *exp, int *patternsize); ++int regexec(regexp *prog, char *string); ++void regsub(regexp *prog, char *source, char *dest); ++void regerror(char *s); ++ ++#endif +diff -Nurp linux-2.4.26-stock/net/ipv4/netfilter/regexp/regmagic.h linux-2.4.26-layer7-clean/net/ipv4/netfilter/regexp/regmagic.h +--- linux-2.4.26-stock/net/ipv4/netfilter/regexp/regmagic.h 1969-12-31 18:00:00.000000000 -0600 ++++ linux-2.4.26-layer7-clean/net/ipv4/netfilter/regexp/regmagic.h 2004-06-27 19:07:00.000000000 -0500 +@@ -0,0 +1,5 @@ ++/* ++ * The first byte of the regexp internal "program" is actually this magic ++ * number; the start node begins in the second byte. ++ */ ++#define MAGIC 0234 +diff -Nurp linux-2.4.26-stock/net/ipv4/netfilter/regexp/regsub.c linux-2.4.26-layer7-clean/net/ipv4/netfilter/regexp/regsub.c +--- linux-2.4.26-stock/net/ipv4/netfilter/regexp/regsub.c 1969-12-31 18:00:00.000000000 -0600 ++++ linux-2.4.26-layer7-clean/net/ipv4/netfilter/regexp/regsub.c 2004-06-27 19:07:00.000000000 -0500 +@@ -0,0 +1,95 @@ ++/* ++ * regsub ++ * @(#)regsub.c 1.3 of 2 April 86 ++ * ++ * Copyright (c) 1986 by University of Toronto. ++ * Written by Henry Spencer. Not derived from licensed software. ++ * ++ * Permission is granted to anyone to use this software for any ++ * purpose on any computer system, and to redistribute it freely, ++ * subject to the following restrictions: ++ * ++ * 1. The author is not responsible for the consequences of use of ++ * this software, no matter how awful, even if they arise ++ * from defects in it. ++ * ++ * 2. The origin of this software must not be misrepresented, either ++ * by explicit claim or by omission. ++ * ++ * 3. Altered versions must be plainly marked as such, and must not ++ * be misrepresented as being the original software. ++ * ++ * ++ * This code was modified by Ethan Sommer to work within the kernel ++ * (it now uses kmalloc etc..) ++ * ++ */ ++#include "regexp.h" ++#include "regmagic.h" ++#include <linux/string.h> ++ ++ ++#ifndef CHARBITS ++#define UCHARAT(p) ((int)*(unsigned char *)(p)) ++#else ++#define UCHARAT(p) ((int)*(p)&CHARBITS) ++#endif ++ ++#if 0 ++//void regerror(char * s) ++//{ ++// printk("regexp(3): %s", s); ++// /* NOTREACHED */ ++//} ++#endif ++ ++/* ++ - regsub - perform substitutions after a regexp match ++ */ ++void ++regsub(regexp * prog, char * source, char * dest) ++{ ++ register char *src; ++ register char *dst; ++ register char c; ++ register int no; ++ register int len; ++ ++ /* Not necessary and gcc doesn't like it -MLS */ ++ /*extern char *strncpy();*/ ++ ++ if (prog == NULL || source == NULL || dest == NULL) { ++ regerror("NULL parm to regsub"); ++ return; ++ } ++ if (UCHARAT(prog->program) != MAGIC) { ++ regerror("damaged regexp fed to regsub"); ++ return; ++ } ++ ++ src = source; ++ dst = dest; ++ while ((c = *src++) != '\0') { ++ if (c == '&') ++ no = 0; ++ else if (c == '\\' && '0' <= *src && *src <= '9') ++ no = *src++ - '0'; ++ else ++ no = -1; ++ ++ if (no < 0) { /* Ordinary character. */ ++ if (c == '\\' && (*src == '\\' || *src == '&')) ++ c = *src++; ++ *dst++ = c; ++ } else if (prog->startp[no] != NULL && prog->endp[no] != NULL) { ++ len = prog->endp[no] - prog->startp[no]; ++ (void) strncpy(dst, prog->startp[no], len); ++ dst += len; ++ if (len != 0 && *(dst-1) == '\0') { /* strncpy hit NUL. */ ++ regerror("damaged match string"); ++ return; ++ } ++ } ++ } ++ *dst++ = '\0'; ++} diff --git a/recipes/linux/linux-wrt-2.4.30/307-gcc-3.4-fix.patch b/recipes/linux/linux-wrt-2.4.30/307-gcc-3.4-fix.patch new file mode 100644 index 0000000000..27adbf163e --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/307-gcc-3.4-fix.patch @@ -0,0 +1,214 @@ +diff -Nur linux-2.4.29/arch/mips/kernel/signal.c linux-2.4.29-gcc3.4/arch/mips/kernel/signal.c +--- linux-2.4.29/arch/mips/kernel/signal.c 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.29-gcc3.4/arch/mips/kernel/signal.c 2005-03-27 23:09:57.000000000 +0200 +@@ -6,8 +6,10 @@ + * Copyright (C) 1991, 1992 Linus Torvalds + * Copyright (C) 1994 - 1999 Ralf Baechle + * Copyright (C) 1999 Silicon Graphics, Inc. ++ * Copyright (C) 2004 Maciej W. Rozycki + */ + #include <linux/config.h> ++#include <linux/compiler.h> + #include <linux/sched.h> + #include <linux/mm.h> + #include <linux/smp.h> +@@ -76,7 +78,9 @@ + * Atomically swap in the new signal mask, and wait for a signal. + */ + save_static_function(sys_sigsuspend); +-static_unused int _sys_sigsuspend(struct pt_regs regs) ++static int _sys_sigsuspend(struct pt_regs regs) ++ __asm__("_sys_sigsuspend") __attribute_used__; ++static int _sys_sigsuspend(struct pt_regs regs) + { + sigset_t *uset, saveset, newset; + +@@ -102,7 +106,9 @@ + } + + save_static_function(sys_rt_sigsuspend); +-static_unused int _sys_rt_sigsuspend(struct pt_regs regs) ++static int _sys_rt_sigsuspend(struct pt_regs regs) ++ __asm__("_sys_rt_sigsuspend") __attribute_used__; ++static int _sys_rt_sigsuspend(struct pt_regs regs) + { + sigset_t *unewset, saveset, newset; + size_t sigsetsize; +diff -Nur linux-2.4.29/arch/mips/kernel/syscall.c linux-2.4.29-gcc3.4/arch/mips/kernel/syscall.c +--- linux-2.4.29/arch/mips/kernel/syscall.c 2005-01-19 15:09:29.000000000 +0100 ++++ linux-2.4.29-gcc3.4/arch/mips/kernel/syscall.c 2005-03-27 23:09:57.000000000 +0200 +@@ -5,6 +5,7 @@ + * + * Copyright (C) 1995 - 2000 by Ralf Baechle + * Copyright (C) 2000 Silicon Graphics, Inc. ++ * Copyright (C) 2004 Maciej W. Rozycki + * + * TODO: Implement the compatibility syscalls. + * Don't waste that much memory for empty entries in the syscall +@@ -158,7 +159,9 @@ + } + + save_static_function(sys_fork); +-static_unused int _sys_fork(struct pt_regs regs) ++static int _sys_fork(struct pt_regs regs) ++ __asm__("_sys_fork") __attribute_used__; ++static int _sys_fork(struct pt_regs regs) + { + int res; + +@@ -168,7 +171,9 @@ + + + save_static_function(sys_clone); +-static_unused int _sys_clone(struct pt_regs regs) ++static int _sys_clone(struct pt_regs regs) ++ __asm__("_sys_clone") __attribute_used__; ++static int _sys_clone(struct pt_regs regs) + { + unsigned long clone_flags; + unsigned long newsp; +diff -Nur linux-2.4.29/arch/mips64/kernel/signal.c linux-2.4.29-gcc3.4/arch/mips64/kernel/signal.c +--- linux-2.4.29/arch/mips64/kernel/signal.c 2005-01-19 15:09:32.000000000 +0100 ++++ linux-2.4.29-gcc3.4/arch/mips64/kernel/signal.c 2005-03-27 23:09:57.000000000 +0200 +@@ -6,8 +6,10 @@ + * Copyright (C) 1991, 1992 Linus Torvalds + * Copyright (C) 1994 - 2000 Ralf Baechle + * Copyright (C) 1999, 2000 Silicon Graphics, Inc. ++ * Copyright (C) 2004 Maciej W. Rozycki + */ + #include <linux/config.h> ++#include <linux/compiler.h> + #include <linux/sched.h> + #include <linux/mm.h> + #include <linux/smp.h> +@@ -75,7 +77,9 @@ + * Atomically swap in the new signal mask, and wait for a signal. + */ + save_static_function(sys_rt_sigsuspend); +-static_unused int _sys_rt_sigsuspend(abi64_no_regargs, struct pt_regs regs) ++static int _sys_rt_sigsuspend(abi64_no_regargs, struct pt_regs regs) ++ __asm__("_sys_rt_sigsuspend") __attribute_used__; ++static int _sys_rt_sigsuspend(abi64_no_regargs, struct pt_regs regs) + { + sigset_t *unewset, saveset, newset; + size_t sigsetsize; +diff -Nur linux-2.4.29/arch/mips64/kernel/signal32.c linux-2.4.29-gcc3.4/arch/mips64/kernel/signal32.c +--- linux-2.4.29/arch/mips64/kernel/signal32.c 2005-01-19 15:09:33.000000000 +0100 ++++ linux-2.4.29-gcc3.4/arch/mips64/kernel/signal32.c 2005-03-27 23:09:57.000000000 +0200 +@@ -6,7 +6,9 @@ + * Copyright (C) 1991, 1992 Linus Torvalds + * Copyright (C) 1994 - 2000 Ralf Baechle + * Copyright (C) 1999, 2000 Silicon Graphics, Inc. ++ * Copyright (C) 2004 Maciej W. Rozycki + */ ++#include <linux/compiler.h> + #include <linux/sched.h> + #include <linux/mm.h> + #include <linux/smp.h> +@@ -192,7 +194,9 @@ + * Atomically swap in the new signal mask, and wait for a signal. + */ + save_static_function(sys32_sigsuspend); +-static_unused int _sys32_sigsuspend(abi64_no_regargs, struct pt_regs regs) ++static int _sys32_sigsuspend(abi64_no_regargs, struct pt_regs regs) ++ __asm__("_sys32_sigsuspend") __attribute_used__; ++static int _sys32_sigsuspend(abi64_no_regargs, struct pt_regs regs) + { + sigset32_t *uset; + sigset_t newset, saveset; +@@ -219,7 +223,9 @@ + } + + save_static_function(sys32_rt_sigsuspend); +-static_unused int _sys32_rt_sigsuspend(abi64_no_regargs, struct pt_regs regs) ++static int _sys32_rt_sigsuspend(abi64_no_regargs, struct pt_regs regs) ++ __asm__("_sys32_rt_sigsuspend") __attribute_used__; ++static int _sys32_rt_sigsuspend(abi64_no_regargs, struct pt_regs regs) + { + sigset32_t *uset; + sigset_t newset, saveset; +diff -Nur linux-2.4.29/arch/mips64/kernel/syscall.c linux-2.4.29-gcc3.4/arch/mips64/kernel/syscall.c +--- linux-2.4.29/arch/mips64/kernel/syscall.c 2005-01-19 15:09:33.000000000 +0100 ++++ linux-2.4.29-gcc3.4/arch/mips64/kernel/syscall.c 2005-03-27 23:09:57.000000000 +0200 +@@ -6,7 +6,9 @@ + * Copyright (C) 1995 - 2000, 2001 by Ralf Baechle + * Copyright (C) 1999, 2000 Silicon Graphics, Inc. + * Copyright (C) 2001 MIPS Technologies, Inc. ++ * Copyright (C) 2004 Maciej W. Rozycki + */ ++#include <linux/compiler.h> + #include <linux/errno.h> + #include <linux/linkage.h> + #include <linux/mm.h> +@@ -151,7 +153,9 @@ + } + + save_static_function(sys_fork); +-static_unused int _sys_fork(abi64_no_regargs, struct pt_regs regs) ++static int _sys_fork(abi64_no_regargs, struct pt_regs regs) ++ __asm__("_sys_fork") __attribute_used__; ++static int _sys_fork(abi64_no_regargs, struct pt_regs regs) + { + int res; + +@@ -160,7 +164,9 @@ + } + + save_static_function(sys_clone); +-static_unused int _sys_clone(abi64_no_regargs, struct pt_regs regs) ++static int _sys_clone(abi64_no_regargs, struct pt_regs regs) ++ __asm__("_sys_clone") __attribute_used__; ++static int _sys_clone(abi64_no_regargs, struct pt_regs regs) + { + unsigned long clone_flags; + unsigned long newsp; +diff -Nur linux-2.4.29/include/asm-mips/ptrace.h linux-2.4.29-gcc3.4/include/asm-mips/ptrace.h +--- linux-2.4.29/include/asm-mips/ptrace.h 2004-02-18 14:36:32.000000000 +0100 ++++ linux-2.4.29-gcc3.4/include/asm-mips/ptrace.h 2005-03-27 23:09:57.000000000 +0200 +@@ -4,6 +4,7 @@ + * for more details. + * + * Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000 by Ralf Baechle ++ * Copyright (C) 2004 Maciej W. Rozycki + * + * Machine dependent structs and defines to help the user use + * the ptrace system call. +@@ -64,12 +65,10 @@ + "sw\t$22,"__str(PT_R22)"($29)\n\t" \ + "sw\t$23,"__str(PT_R23)"($29)\n\t" \ + "sw\t$30,"__str(PT_R30)"($29)\n\t" \ ++ "j\t_" #symbol "\n\t" \ + ".end\t" #symbol "\n\t" \ + ".size\t" #symbol",. - " #symbol) + +-/* Used in declaration of save_static functions. */ +-#define static_unused static __attribute__((unused)) +- + #endif /* !__ASSEMBLY__ */ + + /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */ +diff -Nur linux-2.4.29/include/asm-mips64/ptrace.h linux-2.4.29-gcc3.4/include/asm-mips64/ptrace.h +--- linux-2.4.29/include/asm-mips64/ptrace.h 2004-02-18 14:36:32.000000000 +0100 ++++ linux-2.4.29-gcc3.4/include/asm-mips64/ptrace.h 2005-03-27 23:09:57.000000000 +0200 +@@ -5,6 +5,7 @@ + * + * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle + * Copyright (C) 1999, 2000 Silicon Graphics, Inc. ++ * Copyright (C) 2004 Maciej W. Rozycki + */ + #ifndef _ASM_PTRACE_H + #define _ASM_PTRACE_H +@@ -61,12 +62,10 @@ + "sd\t$22,"__str(PT_R22)"($29)\n\t" \ + "sd\t$23,"__str(PT_R23)"($29)\n\t" \ + "sd\t$30,"__str(PT_R30)"($29)\n\t" \ ++ "j\t_" #symbol "\n\t" \ + ".end\t" #symbol "\n\t" \ + ".size\t" #symbol",. - " #symbol) + +-/* Used in declaration of save_static functions. */ +-#define static_unused static __attribute__((unused)) +- + #define abi64_no_regargs \ + unsigned long __dummy0, \ + unsigned long __dummy1, \ diff --git a/recipes/linux/linux-wrt-2.4.30/308-netfilter-nat-pptp b/recipes/linux/linux-wrt-2.4.30/308-netfilter-nat-pptp new file mode 100644 index 0000000000..6c7d6e6f21 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/308-netfilter-nat-pptp @@ -0,0 +1,2412 @@ +diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack.h +--- linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack.h 2005-04-02 19:04:11.000000000 +0200 ++++ linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack.h 2005-04-02 19:41:05.000000000 +0200 +@@ -50,16 +50,19 @@ + + #include <linux/netfilter_ipv4/ip_conntrack_tcp.h> + #include <linux/netfilter_ipv4/ip_conntrack_icmp.h> ++#include <linux/netfilter_ipv4/ip_conntrack_proto_gre.h> + + /* per conntrack: protocol private data */ + union ip_conntrack_proto { + /* insert conntrack proto private data here */ + struct ip_ct_tcp tcp; + struct ip_ct_icmp icmp; ++ struct ip_ct_gre gre; + }; + + union ip_conntrack_expect_proto { + /* insert expect proto private data here */ ++ struct ip_ct_gre_expect gre; + }; + + /* Add protocol helper include file here */ +@@ -67,6 +70,7 @@ + + #include <linux/netfilter_ipv4/ip_conntrack_ftp.h> + #include <linux/netfilter_ipv4/ip_conntrack_irc.h> ++#include <linux/netfilter_ipv4/ip_conntrack_pptp.h> + + /* per expectation: application helper private data */ + union ip_conntrack_expect_help { +@@ -74,6 +78,7 @@ + struct ip_ct_amanda_expect exp_amanda_info; + struct ip_ct_ftp_expect exp_ftp_info; + struct ip_ct_irc_expect exp_irc_info; ++ struct ip_ct_pptp_expect exp_pptp_info; + + #ifdef CONFIG_IP_NF_NAT_NEEDED + union { +@@ -87,14 +92,17 @@ + /* insert conntrack helper private data (master) here */ + struct ip_ct_ftp_master ct_ftp_info; + struct ip_ct_irc_master ct_irc_info; ++ struct ip_ct_pptp_master ct_pptp_info; + }; + + #ifdef CONFIG_IP_NF_NAT_NEEDED + #include <linux/netfilter_ipv4/ip_nat.h> ++#include <linux/netfilter_ipv4/ip_nat_pptp.h> + + /* per conntrack: nat application helper private data */ + union ip_conntrack_nat_help { + /* insert nat helper private data here */ ++ struct ip_nat_pptp nat_pptp_info; + }; + #endif + +diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_pptp.h linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_pptp.h +--- linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_pptp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_pptp.h 2005-04-02 19:09:07.000000000 +0200 +@@ -0,0 +1,313 @@ ++/* PPTP constants and structs */ ++#ifndef _CONNTRACK_PPTP_H ++#define _CONNTRACK_PPTP_H ++ ++/* state of the control session */ ++enum pptp_ctrlsess_state { ++ PPTP_SESSION_NONE, /* no session present */ ++ PPTP_SESSION_ERROR, /* some session error */ ++ PPTP_SESSION_STOPREQ, /* stop_sess request seen */ ++ PPTP_SESSION_REQUESTED, /* start_sess request seen */ ++ PPTP_SESSION_CONFIRMED, /* session established */ ++}; ++ ++/* state of the call inside the control session */ ++enum pptp_ctrlcall_state { ++ PPTP_CALL_NONE, ++ PPTP_CALL_ERROR, ++ PPTP_CALL_OUT_REQ, ++ PPTP_CALL_OUT_CONF, ++ PPTP_CALL_IN_REQ, ++ PPTP_CALL_IN_REP, ++ PPTP_CALL_IN_CONF, ++ PPTP_CALL_CLEAR_REQ, ++}; ++ ++ ++/* conntrack private data */ ++struct ip_ct_pptp_master { ++ enum pptp_ctrlsess_state sstate; /* session state */ ++ ++ /* everything below is going to be per-expectation in newnat, ++ * since there could be more than one call within one session */ ++ enum pptp_ctrlcall_state cstate; /* call state */ ++ u_int16_t pac_call_id; /* call id of PAC, host byte order */ ++ u_int16_t pns_call_id; /* call id of PNS, host byte order */ ++}; ++ ++/* conntrack_expect private member */ ++struct ip_ct_pptp_expect { ++ enum pptp_ctrlcall_state cstate; /* call state */ ++ u_int16_t pac_call_id; /* call id of PAC */ ++ u_int16_t pns_call_id; /* call id of PNS */ ++}; ++ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/netfilter_ipv4/lockhelp.h> ++DECLARE_LOCK_EXTERN(ip_pptp_lock); ++ ++#define IP_CONNTR_PPTP PPTP_CONTROL_PORT ++ ++union pptp_ctrl_union { ++ void *rawreq; ++ struct PptpStartSessionRequest *sreq; ++ struct PptpStartSessionReply *srep; ++ struct PptpStopSessionRequest *streq; ++ struct PptpStopSessionReply *strep; ++ struct PptpOutCallRequest *ocreq; ++ struct PptpOutCallReply *ocack; ++ struct PptpInCallRequest *icreq; ++ struct PptpInCallReply *icack; ++ struct PptpInCallConnected *iccon; ++ struct PptpClearCallRequest *clrreq; ++ struct PptpCallDisconnectNotify *disc; ++ struct PptpWanErrorNotify *wanerr; ++ struct PptpSetLinkInfo *setlink; ++}; ++ ++ ++ ++#define PPTP_CONTROL_PORT 1723 ++ ++#define PPTP_PACKET_CONTROL 1 ++#define PPTP_PACKET_MGMT 2 ++ ++#define PPTP_MAGIC_COOKIE 0x1a2b3c4d ++ ++struct pptp_pkt_hdr { ++ __u16 packetLength; ++ __u16 packetType; ++ __u32 magicCookie; ++}; ++ ++/* PptpControlMessageType values */ ++#define PPTP_START_SESSION_REQUEST 1 ++#define PPTP_START_SESSION_REPLY 2 ++#define PPTP_STOP_SESSION_REQUEST 3 ++#define PPTP_STOP_SESSION_REPLY 4 ++#define PPTP_ECHO_REQUEST 5 ++#define PPTP_ECHO_REPLY 6 ++#define PPTP_OUT_CALL_REQUEST 7 ++#define PPTP_OUT_CALL_REPLY 8 ++#define PPTP_IN_CALL_REQUEST 9 ++#define PPTP_IN_CALL_REPLY 10 ++#define PPTP_IN_CALL_CONNECT 11 ++#define PPTP_CALL_CLEAR_REQUEST 12 ++#define PPTP_CALL_DISCONNECT_NOTIFY 13 ++#define PPTP_WAN_ERROR_NOTIFY 14 ++#define PPTP_SET_LINK_INFO 15 ++ ++#define PPTP_MSG_MAX 15 ++ ++/* PptpGeneralError values */ ++#define PPTP_ERROR_CODE_NONE 0 ++#define PPTP_NOT_CONNECTED 1 ++#define PPTP_BAD_FORMAT 2 ++#define PPTP_BAD_VALUE 3 ++#define PPTP_NO_RESOURCE 4 ++#define PPTP_BAD_CALLID 5 ++#define PPTP_REMOVE_DEVICE_ERROR 6 ++ ++struct PptpControlHeader { ++ __u16 messageType; ++ __u16 reserved; ++}; ++ ++/* FramingCapability Bitmap Values */ ++#define PPTP_FRAME_CAP_ASYNC 0x1 ++#define PPTP_FRAME_CAP_SYNC 0x2 ++ ++/* BearerCapability Bitmap Values */ ++#define PPTP_BEARER_CAP_ANALOG 0x1 ++#define PPTP_BEARER_CAP_DIGITAL 0x2 ++ ++struct PptpStartSessionRequest { ++ __u16 protocolVersion; ++ __u8 reserved1; ++ __u8 reserved2; ++ __u32 framingCapability; ++ __u32 bearerCapability; ++ __u16 maxChannels; ++ __u16 firmwareRevision; ++ __u8 hostName[64]; ++ __u8 vendorString[64]; ++}; ++ ++/* PptpStartSessionResultCode Values */ ++#define PPTP_START_OK 1 ++#define PPTP_START_GENERAL_ERROR 2 ++#define PPTP_START_ALREADY_CONNECTED 3 ++#define PPTP_START_NOT_AUTHORIZED 4 ++#define PPTP_START_UNKNOWN_PROTOCOL 5 ++ ++struct PptpStartSessionReply { ++ __u16 protocolVersion; ++ __u8 resultCode; ++ __u8 generalErrorCode; ++ __u32 framingCapability; ++ __u32 bearerCapability; ++ __u16 maxChannels; ++ __u16 firmwareRevision; ++ __u8 hostName[64]; ++ __u8 vendorString[64]; ++}; ++ ++/* PptpStopReasons */ ++#define PPTP_STOP_NONE 1 ++#define PPTP_STOP_PROTOCOL 2 ++#define PPTP_STOP_LOCAL_SHUTDOWN 3 ++ ++struct PptpStopSessionRequest { ++ __u8 reason; ++}; ++ ++/* PptpStopSessionResultCode */ ++#define PPTP_STOP_OK 1 ++#define PPTP_STOP_GENERAL_ERROR 2 ++ ++struct PptpStopSessionReply { ++ __u8 resultCode; ++ __u8 generalErrorCode; ++}; ++ ++struct PptpEchoRequest { ++ __u32 identNumber; ++}; ++ ++/* PptpEchoReplyResultCode */ ++#define PPTP_ECHO_OK 1 ++#define PPTP_ECHO_GENERAL_ERROR 2 ++ ++struct PptpEchoReply { ++ __u32 identNumber; ++ __u8 resultCode; ++ __u8 generalErrorCode; ++ __u16 reserved; ++}; ++ ++/* PptpFramingType */ ++#define PPTP_ASYNC_FRAMING 1 ++#define PPTP_SYNC_FRAMING 2 ++#define PPTP_DONT_CARE_FRAMING 3 ++ ++/* PptpCallBearerType */ ++#define PPTP_ANALOG_TYPE 1 ++#define PPTP_DIGITAL_TYPE 2 ++#define PPTP_DONT_CARE_BEARER_TYPE 3 ++ ++struct PptpOutCallRequest { ++ __u16 callID; ++ __u16 callSerialNumber; ++ __u32 minBPS; ++ __u32 maxBPS; ++ __u32 bearerType; ++ __u32 framingType; ++ __u16 packetWindow; ++ __u16 packetProcDelay; ++ __u16 reserved1; ++ __u16 phoneNumberLength; ++ __u16 reserved2; ++ __u8 phoneNumber[64]; ++ __u8 subAddress[64]; ++}; ++ ++/* PptpCallResultCode */ ++#define PPTP_OUTCALL_CONNECT 1 ++#define PPTP_OUTCALL_GENERAL_ERROR 2 ++#define PPTP_OUTCALL_NO_CARRIER 3 ++#define PPTP_OUTCALL_BUSY 4 ++#define PPTP_OUTCALL_NO_DIAL_TONE 5 ++#define PPTP_OUTCALL_TIMEOUT 6 ++#define PPTP_OUTCALL_DONT_ACCEPT 7 ++ ++struct PptpOutCallReply { ++ __u16 callID; ++ __u16 peersCallID; ++ __u8 resultCode; ++ __u8 generalErrorCode; ++ __u16 causeCode; ++ __u32 connectSpeed; ++ __u16 packetWindow; ++ __u16 packetProcDelay; ++ __u32 physChannelID; ++}; ++ ++struct PptpInCallRequest { ++ __u16 callID; ++ __u16 callSerialNumber; ++ __u32 callBearerType; ++ __u32 physChannelID; ++ __u16 dialedNumberLength; ++ __u16 dialingNumberLength; ++ __u8 dialedNumber[64]; ++ __u8 dialingNumber[64]; ++ __u8 subAddress[64]; ++}; ++ ++/* PptpInCallResultCode */ ++#define PPTP_INCALL_ACCEPT 1 ++#define PPTP_INCALL_GENERAL_ERROR 2 ++#define PPTP_INCALL_DONT_ACCEPT 3 ++ ++struct PptpInCallReply { ++ __u16 callID; ++ __u16 peersCallID; ++ __u8 resultCode; ++ __u8 generalErrorCode; ++ __u16 packetWindow; ++ __u16 packetProcDelay; ++ __u16 reserved; ++}; ++ ++struct PptpInCallConnected { ++ __u16 peersCallID; ++ __u16 reserved; ++ __u32 connectSpeed; ++ __u16 packetWindow; ++ __u16 packetProcDelay; ++ __u32 callFramingType; ++}; ++ ++struct PptpClearCallRequest { ++ __u16 callID; ++ __u16 reserved; ++}; ++ ++struct PptpCallDisconnectNotify { ++ __u16 callID; ++ __u8 resultCode; ++ __u8 generalErrorCode; ++ __u16 causeCode; ++ __u16 reserved; ++ __u8 callStatistics[128]; ++}; ++ ++struct PptpWanErrorNotify { ++ __u16 peersCallID; ++ __u16 reserved; ++ __u32 crcErrors; ++ __u32 framingErrors; ++ __u32 hardwareOverRuns; ++ __u32 bufferOverRuns; ++ __u32 timeoutErrors; ++ __u32 alignmentErrors; ++}; ++ ++struct PptpSetLinkInfo { ++ __u16 peersCallID; ++ __u16 reserved; ++ __u32 sendAccm; ++ __u32 recvAccm; ++}; ++ ++ ++struct pptp_priv_data { ++ __u16 call_id; ++ __u16 mcall_id; ++ __u16 pcall_id; ++}; ++ ++#endif /* __KERNEL__ */ ++#endif /* _CONNTRACK_PPTP_H */ +diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h +--- linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h 2005-04-02 19:10:45.000000000 +0200 +@@ -0,0 +1,123 @@ ++#ifndef _CONNTRACK_PROTO_GRE_H ++#define _CONNTRACK_PROTO_GRE_H ++#include <asm/byteorder.h> ++ ++/* GRE PROTOCOL HEADER */ ++ ++/* GRE Version field */ ++#define GRE_VERSION_1701 0x0 ++#define GRE_VERSION_PPTP 0x1 ++ ++/* GRE Protocol field */ ++#define GRE_PROTOCOL_PPTP 0x880B ++ ++/* GRE Flags */ ++#define GRE_FLAG_C 0x80 ++#define GRE_FLAG_R 0x40 ++#define GRE_FLAG_K 0x20 ++#define GRE_FLAG_S 0x10 ++#define GRE_FLAG_A 0x80 ++ ++#define GRE_IS_C(f) ((f)&GRE_FLAG_C) ++#define GRE_IS_R(f) ((f)&GRE_FLAG_R) ++#define GRE_IS_K(f) ((f)&GRE_FLAG_K) ++#define GRE_IS_S(f) ((f)&GRE_FLAG_S) ++#define GRE_IS_A(f) ((f)&GRE_FLAG_A) ++ ++/* GRE is a mess: Four different standards */ ++struct gre_hdr { ++#if defined(__LITTLE_ENDIAN_BITFIELD) ++ __u16 rec:3, ++ srr:1, ++ seq:1, ++ key:1, ++ routing:1, ++ csum:1, ++ version:3, ++ reserved:4, ++ ack:1; ++#elif defined(__BIG_ENDIAN_BITFIELD) ++ __u16 csum:1, ++ routing:1, ++ key:1, ++ seq:1, ++ srr:1, ++ rec:3, ++ ack:1, ++ reserved:4, ++ version:3; ++#else ++#error "Adjust your <asm/byteorder.h> defines" ++#endif ++ __u16 protocol; ++}; ++ ++/* modified GRE header for PPTP */ ++struct gre_hdr_pptp { ++ __u8 flags; /* bitfield */ ++ __u8 version; /* should be GRE_VERSION_PPTP */ ++ __u16 protocol; /* should be GRE_PROTOCOL_PPTP */ ++ __u16 payload_len; /* size of ppp payload, not inc. gre header */ ++ __u16 call_id; /* peer's call_id for this session */ ++ __u32 seq; /* sequence number. Present if S==1 */ ++ __u32 ack; /* seq number of highest packet recieved by */ ++ /* sender in this session */ ++}; ++ ++ ++/* this is part of ip_conntrack */ ++struct ip_ct_gre { ++ unsigned int stream_timeout; ++ unsigned int timeout; ++}; ++ ++/* this is part of ip_conntrack_expect */ ++struct ip_ct_gre_expect { ++ struct ip_ct_gre_keymap *keymap_orig, *keymap_reply; ++}; ++ ++#ifdef __KERNEL__ ++struct ip_conntrack_expect; ++ ++/* structure for original <-> reply keymap */ ++struct ip_ct_gre_keymap { ++ struct list_head list; ++ ++ struct ip_conntrack_tuple tuple; ++}; ++ ++ ++/* add new tuple->key_reply pair to keymap */ ++int ip_ct_gre_keymap_add(struct ip_conntrack_expect *exp, ++ struct ip_conntrack_tuple *t, ++ int reply); ++ ++/* change an existing keymap entry */ ++void ip_ct_gre_keymap_change(struct ip_ct_gre_keymap *km, ++ struct ip_conntrack_tuple *t); ++ ++/* delete keymap entries */ ++void ip_ct_gre_keymap_destroy(struct ip_conntrack_expect *exp); ++ ++ ++/* get pointer to gre key, if present */ ++static inline u_int32_t *gre_key(struct gre_hdr *greh) ++{ ++ if (!greh->key) ++ return NULL; ++ if (greh->csum || greh->routing) ++ return (u_int32_t *) (greh+sizeof(*greh)+4); ++ return (u_int32_t *) (greh+sizeof(*greh)); ++} ++ ++/* get pointer ot gre csum, if present */ ++static inline u_int16_t *gre_csum(struct gre_hdr *greh) ++{ ++ if (!greh->csum) ++ return NULL; ++ return (u_int16_t *) (greh+sizeof(*greh)); ++} ++ ++#endif /* __KERNEL__ */ ++ ++#endif /* _CONNTRACK_PROTO_GRE_H */ +diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_tuple.h +--- linux-2.4.29-old/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2003-11-28 19:26:21.000000000 +0100 ++++ linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2005-04-02 19:07:18.000000000 +0200 +@@ -14,7 +14,7 @@ + union ip_conntrack_manip_proto + { + /* Add other protocols here. */ +- u_int16_t all; ++ u_int32_t all; + + struct { + u_int16_t port; +@@ -25,6 +25,9 @@ + struct { + u_int16_t id; + } icmp; ++ struct { ++ u_int32_t key; ++ } gre; + }; + + /* The manipulable part of the tuple. */ +@@ -44,7 +47,7 @@ + u_int32_t ip; + union { + /* Add other protocols here. */ +- u_int16_t all; ++ u_int32_t all; + + struct { + u_int16_t port; +@@ -55,6 +58,9 @@ + struct { + u_int8_t type, code; + } icmp; ++ struct { ++ u_int32_t key; ++ } gre; + } u; + + /* The protocol. */ +@@ -80,10 +86,16 @@ + #ifdef __KERNEL__ + + #define DUMP_TUPLE(tp) \ +-DEBUGP("tuple %p: %u %u.%u.%u.%u:%hu -> %u.%u.%u.%u:%hu\n", \ ++DEBUGP("tuple %p: %u %u.%u.%u.%u:%u -> %u.%u.%u.%u:%u\n", \ + (tp), (tp)->dst.protonum, \ +- NIPQUAD((tp)->src.ip), ntohs((tp)->src.u.all), \ +- NIPQUAD((tp)->dst.ip), ntohs((tp)->dst.u.all)) ++ NIPQUAD((tp)->src.ip), ntohl((tp)->src.u.all), \ ++ NIPQUAD((tp)->dst.ip), ntohl((tp)->dst.u.all)) ++ ++#define DUMP_TUPLE_RAW(x) \ ++ DEBUGP("tuple %p: %u %u.%u.%u.%u:0x%08x -> %u.%u.%u.%u:0x%08x\n",\ ++ (x), (x)->dst.protonum, \ ++ NIPQUAD((x)->src.ip), ntohl((x)->src.u.all), \ ++ NIPQUAD((x)->dst.ip), ntohl((x)->dst.u.all)) + + #define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL) + +diff -urN linux-2.4.29-old/include/linux/netfilter_ipv4/ip_nat_pptp.h linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_nat_pptp.h +--- linux-2.4.29-old/include/linux/netfilter_ipv4/ip_nat_pptp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29-dev/include/linux/netfilter_ipv4/ip_nat_pptp.h 2005-04-02 19:07:18.000000000 +0200 +@@ -0,0 +1,11 @@ ++/* PPTP constants and structs */ ++#ifndef _NAT_PPTP_H ++#define _NAT_PPTP_H ++ ++/* conntrack private data */ ++struct ip_nat_pptp { ++ u_int16_t pns_call_id; /* NAT'ed PNS call id */ ++ u_int16_t pac_call_id; /* NAT'ed PAC call id */ ++}; ++ ++#endif /* _NAT_PPTP_H */ +diff -urN linux-2.4.29-old/net/ipv4/netfilter/Config.in linux-2.4.29-dev/net/ipv4/netfilter/Config.in +--- linux-2.4.29-old/net/ipv4/netfilter/Config.in 2005-04-02 19:04:11.000000000 +0200 ++++ linux-2.4.29-dev/net/ipv4/netfilter/Config.in 2005-04-02 19:07:18.000000000 +0200 +@@ -10,6 +10,8 @@ + dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK + dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK + dep_tristate ' IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK ++ dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK ++ dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE + fi + + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then +@@ -67,6 +69,20 @@ + define_bool CONFIG_IP_NF_NAT_NEEDED y + dep_tristate ' MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT + dep_tristate ' REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT ++ if [ "$CONFIG_IP_NF_PPTP" = "m" ]; then ++ define_tristate CONFIG_IP_NF_NAT_PPTP m ++ else ++ if [ "$CONFIG_IP_NF_PPTP" = "y" ]; then ++ define_tristate CONFIG_IP_NF_NAT_PPTP $CONFIG_IP_NF_NAT ++ fi ++ fi ++ if [ "$CONFIG_IP_NF_CT_PROTO_GRE" = "m" ]; then ++ define_tristate CONFIG_IP_NF_NAT_PROTO_GRE m ++ else ++ if [ "$CONFIG_IP_NF_CT_PROTO_GRE" = "y" ]; then ++ define_tristate CONFIG_IP_NF_NAT_PROTO_GRE $CONFIG_IP_NF_NAT ++ fi ++ fi + if [ "$CONFIG_IP_NF_AMANDA" = "m" ]; then + define_tristate CONFIG_IP_NF_NAT_AMANDA m + else +diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_core.c linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_core.c +--- linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_core.c 2005-04-02 19:04:11.000000000 +0200 ++++ linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_core.c 2005-04-02 19:07:18.000000000 +0200 +@@ -142,6 +142,8 @@ + tuple->dst.ip = iph->daddr; + tuple->dst.protonum = iph->protocol; + ++ tuple->src.u.all = tuple->dst.u.all = 0; ++ + ret = protocol->pkt_to_tuple((u_int32_t *)iph + iph->ihl, + len - 4*iph->ihl, + tuple); +@@ -157,6 +159,8 @@ + inverse->dst.ip = orig->src.ip; + inverse->dst.protonum = orig->dst.protonum; + ++ inverse->src.u.all = inverse->dst.u.all = 0; ++ + return protocol->invert_tuple(inverse, orig); + } + +@@ -954,8 +958,8 @@ + * so there is no need to use the tuple lock too */ + + DEBUGP("ip_conntrack_expect_related %p\n", related_to); +- DEBUGP("tuple: "); DUMP_TUPLE(&expect->tuple); +- DEBUGP("mask: "); DUMP_TUPLE(&expect->mask); ++ DEBUGP("tuple: "); DUMP_TUPLE_RAW(&expect->tuple); ++ DEBUGP("mask: "); DUMP_TUPLE_RAW(&expect->mask); + + old = LIST_FIND(&ip_conntrack_expect_list, resent_expect, + struct ip_conntrack_expect *, &expect->tuple, +@@ -1072,15 +1076,14 @@ + + MUST_BE_READ_LOCKED(&ip_conntrack_lock); + WRITE_LOCK(&ip_conntrack_expect_tuple_lock); +- + DEBUGP("change_expect:\n"); +- DEBUGP("exp tuple: "); DUMP_TUPLE(&expect->tuple); +- DEBUGP("exp mask: "); DUMP_TUPLE(&expect->mask); +- DEBUGP("newtuple: "); DUMP_TUPLE(newtuple); ++ DEBUGP("exp tuple: "); DUMP_TUPLE_RAW(&expect->tuple); ++ DEBUGP("exp mask: "); DUMP_TUPLE_RAW(&expect->mask); ++ DEBUGP("newtuple: "); DUMP_TUPLE_RAW(newtuple); + if (expect->ct_tuple.dst.protonum == 0) { + /* Never seen before */ + DEBUGP("change expect: never seen before\n"); +- if (!ip_ct_tuple_equal(&expect->tuple, newtuple) ++ if (!ip_ct_tuple_mask_cmp(&expect->tuple, newtuple, &expect->mask) + && LIST_FIND(&ip_conntrack_expect_list, expect_clash, + struct ip_conntrack_expect *, newtuple, &expect->mask)) { + /* Force NAT to find an unused tuple */ +diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_pptp.c linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_pptp.c +--- linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_pptp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_pptp.c 2005-04-02 19:13:21.000000000 +0200 +@@ -0,0 +1,633 @@ ++/* ++ * ip_conntrack_pptp.c - Version 1.9 ++ * ++ * Connection tracking support for PPTP (Point to Point Tunneling Protocol). ++ * PPTP is a a protocol for creating virtual private networks. ++ * It is a specification defined by Microsoft and some vendors ++ * working with Microsoft. PPTP is built on top of a modified ++ * version of the Internet Generic Routing Encapsulation Protocol. ++ * GRE is defined in RFC 1701 and RFC 1702. Documentation of ++ * PPTP can be found in RFC 2637 ++ * ++ * (C) 2000-2003 by Harald Welte <laforge@gnumonks.org> ++ * ++ * Development of this code funded by Astaro AG (http://www.astaro.com/) ++ * ++ * Limitations: ++ * - We blindly assume that control connections are always ++ * established in PNS->PAC direction. This is a violation ++ * of RFFC2673 ++ * ++ * TODO: - finish support for multiple calls within one session ++ * (needs expect reservations in newnat) ++ * - testing of incoming PPTP calls ++ * ++ * Changes: ++ * 2002-02-05 - Version 1.3 ++ * - Call ip_conntrack_unexpect_related() from ++ * pptp_timeout_related() to destroy expectations in case ++ * CALL_DISCONNECT_NOTIFY or tcp fin packet was seen ++ * (Philip Craig <philipc@snapgear.com>) ++ * - Add Version information at module loadtime ++ * 2002-02-10 - Version 1.6 ++ * - move to C99 style initializers ++ * - remove second expectation if first arrives ++ * ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/netfilter.h> ++#include <linux/ip.h> ++#include <net/checksum.h> ++#include <net/tcp.h> ++ ++#include <linux/netfilter_ipv4/lockhelp.h> ++#include <linux/netfilter_ipv4/ip_conntrack_helper.h> ++#include <linux/netfilter_ipv4/ip_conntrack_proto_gre.h> ++#include <linux/netfilter_ipv4/ip_conntrack_pptp.h> ++ ++#define IP_CT_PPTP_VERSION "1.9" ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>"); ++MODULE_DESCRIPTION("Netfilter connection tracking helper module for PPTP"); ++ ++DECLARE_LOCK(ip_pptp_lock); ++ ++#if 0 ++#include "ip_conntrack_pptp_priv.h" ++#define DEBUGP(format, args...) printk(KERN_DEBUG __FILE__ ":" __FUNCTION__ \ ++ ": " format, ## args) ++#else ++#define DEBUGP(format, args...) ++#endif ++ ++#define SECS *HZ ++#define MINS * 60 SECS ++#define HOURS * 60 MINS ++#define DAYS * 24 HOURS ++ ++#define PPTP_GRE_TIMEOUT (10 MINS) ++#define PPTP_GRE_STREAM_TIMEOUT (5 DAYS) ++ ++static int pptp_expectfn(struct ip_conntrack *ct) ++{ ++ struct ip_conntrack *master; ++ struct ip_conntrack_expect *exp; ++ ++ DEBUGP("increasing timeouts\n"); ++ /* increase timeout of GRE data channel conntrack entry */ ++ ct->proto.gre.timeout = PPTP_GRE_TIMEOUT; ++ ct->proto.gre.stream_timeout = PPTP_GRE_STREAM_TIMEOUT; ++ ++ master = master_ct(ct); ++ if (!master) { ++ DEBUGP(" no master!!!\n"); ++ return 0; ++ } ++ ++ exp = ct->master; ++ if (!exp) { ++ DEBUGP("no expectation!!\n"); ++ return 0; ++ } ++ ++ DEBUGP("completing tuples with ct info\n"); ++ /* we can do this, since we're unconfirmed */ ++ if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.gre.key == ++ htonl(master->help.ct_pptp_info.pac_call_id)) { ++ /* assume PNS->PAC */ ++ ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.gre.key = ++ htonl(master->help.ct_pptp_info.pns_call_id); ++ ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.gre.key = ++ htonl(master->help.ct_pptp_info.pns_call_id); ++ } else { ++ /* assume PAC->PNS */ ++ ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.gre.key = ++ htonl(master->help.ct_pptp_info.pac_call_id); ++ ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.gre.key = ++ htonl(master->help.ct_pptp_info.pac_call_id); ++ } ++ ++ /* delete other expectation */ ++ if (exp->expected_list.next != &exp->expected_list) { ++ struct ip_conntrack_expect *other_exp; ++ struct list_head *cur_item, *next; ++ ++ for (cur_item = master->sibling_list.next; ++ cur_item != &master->sibling_list; cur_item = next) { ++ next = cur_item->next; ++ other_exp = list_entry(cur_item, ++ struct ip_conntrack_expect, ++ expected_list); ++ /* remove only if occurred at same sequence number */ ++ if (other_exp != exp && other_exp->seq == exp->seq) { ++ DEBUGP("unexpecting other direction\n"); ++ ip_ct_gre_keymap_destroy(other_exp); ++ ip_conntrack_unexpect_related(other_exp); ++ } ++ } ++ } ++ ++ return 0; ++} ++ ++/* timeout GRE data connections */ ++static int pptp_timeout_related(struct ip_conntrack *ct) ++{ ++ struct list_head *cur_item, *next; ++ struct ip_conntrack_expect *exp; ++ ++ /* FIXME: do we have to lock something ? */ ++ for (cur_item = ct->sibling_list.next; ++ cur_item != &ct->sibling_list; cur_item = next) { ++ next = cur_item->next; ++ exp = list_entry(cur_item, struct ip_conntrack_expect, ++ expected_list); ++ ++ ip_ct_gre_keymap_destroy(exp); ++ if (!exp->sibling) { ++ ip_conntrack_unexpect_related(exp); ++ continue; ++ } ++ ++ DEBUGP("setting timeout of conntrack %p to 0\n", ++ exp->sibling); ++ exp->sibling->proto.gre.timeout = 0; ++ exp->sibling->proto.gre.stream_timeout = 0; ++ ip_ct_refresh(exp->sibling, 0); ++ } ++ ++ return 0; ++} ++ ++/* expect GRE connections (PNS->PAC and PAC->PNS direction) */ ++static inline int ++exp_gre(struct ip_conntrack *master, ++ u_int32_t seq, ++ u_int16_t callid, ++ u_int16_t peer_callid) ++{ ++ struct ip_conntrack_expect exp; ++ struct ip_conntrack_tuple inv_tuple; ++ ++ memset(&exp, 0, sizeof(exp)); ++ /* tuple in original direction, PNS->PAC */ ++ exp.tuple.src.ip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.ip; ++ exp.tuple.src.u.gre.key = htonl(ntohs(peer_callid)); ++ exp.tuple.dst.ip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.ip; ++ exp.tuple.dst.u.gre.key = htonl(ntohs(callid)); ++ exp.tuple.dst.protonum = IPPROTO_GRE; ++ ++ exp.mask.src.ip = 0xffffffff; ++ exp.mask.src.u.all = 0; ++ exp.mask.dst.u.all = 0; ++ exp.mask.dst.u.gre.key = 0xffffffff; ++ exp.mask.dst.ip = 0xffffffff; ++ exp.mask.dst.protonum = 0xffff; ++ ++ exp.seq = seq; ++ exp.expectfn = pptp_expectfn; ++ ++ exp.help.exp_pptp_info.pac_call_id = ntohs(callid); ++ exp.help.exp_pptp_info.pns_call_id = ntohs(peer_callid); ++ ++ DEBUGP("calling expect_related "); ++ DUMP_TUPLE_RAW(&exp.tuple); ++ ++ /* Add GRE keymap entries */ ++ if (ip_ct_gre_keymap_add(&exp, &exp.tuple, 0) != 0) ++ return 1; ++ ++ invert_tuplepr(&inv_tuple, &exp.tuple); ++ if (ip_ct_gre_keymap_add(&exp, &inv_tuple, 1) != 0) { ++ ip_ct_gre_keymap_destroy(&exp); ++ return 1; ++ } ++ ++ if (ip_conntrack_expect_related(master, &exp) != 0) { ++ ip_ct_gre_keymap_destroy(&exp); ++ DEBUGP("cannot expect_related()\n"); ++ return 1; ++ } ++ ++ /* tuple in reply direction, PAC->PNS */ ++ exp.tuple.src.ip = master->tuplehash[IP_CT_DIR_REPLY].tuple.src.ip; ++ exp.tuple.src.u.gre.key = htonl(ntohs(callid)); ++ exp.tuple.dst.ip = master->tuplehash[IP_CT_DIR_REPLY].tuple.dst.ip; ++ exp.tuple.dst.u.gre.key = htonl(ntohs(peer_callid)); ++ ++ DEBUGP("calling expect_related "); ++ DUMP_TUPLE_RAW(&exp.tuple); ++ ++ /* Add GRE keymap entries */ ++ ip_ct_gre_keymap_add(&exp, &exp.tuple, 0); ++ invert_tuplepr(&inv_tuple, &exp.tuple); ++ ip_ct_gre_keymap_add(&exp, &inv_tuple, 1); ++ /* FIXME: cannot handle error correctly, since we need to free ++ * the above keymap :( */ ++ ++ if (ip_conntrack_expect_related(master, &exp) != 0) { ++ /* free the second pair of keypmaps */ ++ ip_ct_gre_keymap_destroy(&exp); ++ DEBUGP("cannot expect_related():\n"); ++ return 1; ++ } ++ ++ return 0; ++} ++ ++static inline int ++pptp_inbound_pkt(struct tcphdr *tcph, ++ struct pptp_pkt_hdr *pptph, ++ size_t datalen, ++ struct ip_conntrack *ct, ++ enum ip_conntrack_info ctinfo) ++{ ++ struct PptpControlHeader *ctlh; ++ union pptp_ctrl_union pptpReq; ++ ++ struct ip_ct_pptp_master *info = &ct->help.ct_pptp_info; ++ u_int16_t msg, *cid, *pcid; ++ u_int32_t seq; ++ ++ ctlh = (struct PptpControlHeader *) ++ ((char *) pptph + sizeof(struct pptp_pkt_hdr)); ++ pptpReq.rawreq = (void *) ++ ((char *) ctlh + sizeof(struct PptpControlHeader)); ++ ++ msg = ntohs(ctlh->messageType); ++ DEBUGP("inbound control message %s\n", strMName[msg]); ++ ++ switch (msg) { ++ case PPTP_START_SESSION_REPLY: ++ /* server confirms new control session */ ++ if (info->sstate < PPTP_SESSION_REQUESTED) { ++ DEBUGP("%s without START_SESS_REQUEST\n", ++ strMName[msg]); ++ break; ++ } ++ if (pptpReq.srep->resultCode == PPTP_START_OK) ++ info->sstate = PPTP_SESSION_CONFIRMED; ++ else ++ info->sstate = PPTP_SESSION_ERROR; ++ break; ++ ++ case PPTP_STOP_SESSION_REPLY: ++ /* server confirms end of control session */ ++ if (info->sstate > PPTP_SESSION_STOPREQ) { ++ DEBUGP("%s without STOP_SESS_REQUEST\n", ++ strMName[msg]); ++ break; ++ } ++ if (pptpReq.strep->resultCode == PPTP_STOP_OK) ++ info->sstate = PPTP_SESSION_NONE; ++ else ++ info->sstate = PPTP_SESSION_ERROR; ++ break; ++ ++ case PPTP_OUT_CALL_REPLY: ++ /* server accepted call, we now expect GRE frames */ ++ if (info->sstate != PPTP_SESSION_CONFIRMED) { ++ DEBUGP("%s but no session\n", strMName[msg]); ++ break; ++ } ++ if (info->cstate != PPTP_CALL_OUT_REQ && ++ info->cstate != PPTP_CALL_OUT_CONF) { ++ DEBUGP("%s without OUTCALL_REQ\n", strMName[msg]); ++ break; ++ } ++ if (pptpReq.ocack->resultCode != PPTP_OUTCALL_CONNECT) { ++ info->cstate = PPTP_CALL_NONE; ++ break; ++ } ++ ++ cid = &pptpReq.ocack->callID; ++ pcid = &pptpReq.ocack->peersCallID; ++ ++ info->pac_call_id = ntohs(*cid); ++ ++ if (htons(info->pns_call_id) != *pcid) { ++ DEBUGP("%s for unknown callid %u\n", ++ strMName[msg], ntohs(*pcid)); ++ break; ++ } ++ ++ DEBUGP("%s, CID=%X, PCID=%X\n", strMName[msg], ++ ntohs(*cid), ntohs(*pcid)); ++ ++ info->cstate = PPTP_CALL_OUT_CONF; ++ ++ seq = ntohl(tcph->seq) + ((void *)pcid - (void *)pptph); ++ if (exp_gre(ct, seq, *cid, *pcid) != 0) ++ printk("ip_conntrack_pptp: error during exp_gre\n"); ++ break; ++ ++ case PPTP_IN_CALL_REQUEST: ++ /* server tells us about incoming call request */ ++ if (info->sstate != PPTP_SESSION_CONFIRMED) { ++ DEBUGP("%s but no session\n", strMName[msg]); ++ break; ++ } ++ pcid = &pptpReq.icack->peersCallID; ++ DEBUGP("%s, PCID=%X\n", strMName[msg], ntohs(*pcid)); ++ info->cstate = PPTP_CALL_IN_REQ; ++ info->pac_call_id= ntohs(*pcid); ++ break; ++ ++ case PPTP_IN_CALL_CONNECT: ++ /* server tells us about incoming call established */ ++ if (info->sstate != PPTP_SESSION_CONFIRMED) { ++ DEBUGP("%s but no session\n", strMName[msg]); ++ break; ++ } ++ if (info->sstate != PPTP_CALL_IN_REP ++ && info->sstate != PPTP_CALL_IN_CONF) { ++ DEBUGP("%s but never sent IN_CALL_REPLY\n", ++ strMName[msg]); ++ break; ++ } ++ ++ pcid = &pptpReq.iccon->peersCallID; ++ cid = &info->pac_call_id; ++ ++ if (info->pns_call_id != ntohs(*pcid)) { ++ DEBUGP("%s for unknown CallID %u\n", ++ strMName[msg], ntohs(*cid)); ++ break; ++ } ++ ++ DEBUGP("%s, PCID=%X\n", strMName[msg], ntohs(*pcid)); ++ info->cstate = PPTP_CALL_IN_CONF; ++ ++ /* we expect a GRE connection from PAC to PNS */ ++ seq = ntohl(tcph->seq) + ((void *)pcid - (void *)pptph); ++ if (exp_gre(ct, seq, *cid, *pcid) != 0) ++ printk("ip_conntrack_pptp: error during exp_gre\n"); ++ ++ break; ++ ++ case PPTP_CALL_DISCONNECT_NOTIFY: ++ /* server confirms disconnect */ ++ cid = &pptpReq.disc->callID; ++ DEBUGP("%s, CID=%X\n", strMName[msg], ntohs(*cid)); ++ info->cstate = PPTP_CALL_NONE; ++ ++ /* untrack this call id, unexpect GRE packets */ ++ pptp_timeout_related(ct); ++ break; ++ ++ case PPTP_WAN_ERROR_NOTIFY: ++ break; ++ ++ case PPTP_ECHO_REQUEST: ++ case PPTP_ECHO_REPLY: ++ /* I don't have to explain these ;) */ ++ break; ++ default: ++ DEBUGP("invalid %s (TY=%d)\n", (msg <= PPTP_MSG_MAX) ++ ? strMName[msg]:strMName[0], msg); ++ break; ++ } ++ ++ return NF_ACCEPT; ++ ++} ++ ++static inline int ++pptp_outbound_pkt(struct tcphdr *tcph, ++ struct pptp_pkt_hdr *pptph, ++ size_t datalen, ++ struct ip_conntrack *ct, ++ enum ip_conntrack_info ctinfo) ++{ ++ struct PptpControlHeader *ctlh; ++ union pptp_ctrl_union pptpReq; ++ struct ip_ct_pptp_master *info = &ct->help.ct_pptp_info; ++ u_int16_t msg, *cid, *pcid; ++ ++ ctlh = (struct PptpControlHeader *) ((void *) pptph + sizeof(*pptph)); ++ pptpReq.rawreq = (void *) ((void *) ctlh + sizeof(*ctlh)); ++ ++ msg = ntohs(ctlh->messageType); ++ DEBUGP("outbound control message %s\n", strMName[msg]); ++ ++ switch (msg) { ++ case PPTP_START_SESSION_REQUEST: ++ /* client requests for new control session */ ++ if (info->sstate != PPTP_SESSION_NONE) { ++ DEBUGP("%s but we already have one", ++ strMName[msg]); ++ } ++ info->sstate = PPTP_SESSION_REQUESTED; ++ break; ++ case PPTP_STOP_SESSION_REQUEST: ++ /* client requests end of control session */ ++ info->sstate = PPTP_SESSION_STOPREQ; ++ break; ++ ++ case PPTP_OUT_CALL_REQUEST: ++ /* client initiating connection to server */ ++ if (info->sstate != PPTP_SESSION_CONFIRMED) { ++ DEBUGP("%s but no session\n", ++ strMName[msg]); ++ break; ++ } ++ info->cstate = PPTP_CALL_OUT_REQ; ++ /* track PNS call id */ ++ cid = &pptpReq.ocreq->callID; ++ DEBUGP("%s, CID=%X\n", strMName[msg], ntohs(*cid)); ++ info->pns_call_id = ntohs(*cid); ++ break; ++ case PPTP_IN_CALL_REPLY: ++ /* client answers incoming call */ ++ if (info->cstate != PPTP_CALL_IN_REQ ++ && info->cstate != PPTP_CALL_IN_REP) { ++ DEBUGP("%s without incall_req\n", ++ strMName[msg]); ++ break; ++ } ++ if (pptpReq.icack->resultCode != PPTP_INCALL_ACCEPT) { ++ info->cstate = PPTP_CALL_NONE; ++ break; ++ } ++ pcid = &pptpReq.icack->peersCallID; ++ if (info->pac_call_id != ntohs(*pcid)) { ++ DEBUGP("%s for unknown call %u\n", ++ strMName[msg], ntohs(*pcid)); ++ break; ++ } ++ DEBUGP("%s, CID=%X\n", strMName[msg], ntohs(*pcid)); ++ /* part two of the three-way handshake */ ++ info->cstate = PPTP_CALL_IN_REP; ++ info->pns_call_id = ntohs(pptpReq.icack->callID); ++ break; ++ ++ case PPTP_CALL_CLEAR_REQUEST: ++ /* client requests hangup of call */ ++ if (info->sstate != PPTP_SESSION_CONFIRMED) { ++ DEBUGP("CLEAR_CALL but no session\n"); ++ break; ++ } ++ /* FUTURE: iterate over all calls and check if ++ * call ID is valid. We don't do this without newnat, ++ * because we only know about last call */ ++ info->cstate = PPTP_CALL_CLEAR_REQ; ++ break; ++ case PPTP_SET_LINK_INFO: ++ break; ++ case PPTP_ECHO_REQUEST: ++ case PPTP_ECHO_REPLY: ++ /* I don't have to explain these ;) */ ++ break; ++ default: ++ DEBUGP("invalid %s (TY=%d)\n", (msg <= PPTP_MSG_MAX)? ++ strMName[msg]:strMName[0], msg); ++ /* unknown: no need to create GRE masq table entry */ ++ break; ++ } ++ ++ return NF_ACCEPT; ++} ++ ++ ++/* track caller id inside control connection, call expect_related */ ++static int ++conntrack_pptp_help(const struct iphdr *iph, size_t len, ++ struct ip_conntrack *ct, enum ip_conntrack_info ctinfo) ++ ++{ ++ struct pptp_pkt_hdr *pptph; ++ ++ struct tcphdr *tcph = (void *) iph + iph->ihl * 4; ++ u_int32_t tcplen = len - iph->ihl * 4; ++ u_int32_t datalen = tcplen - tcph->doff * 4; ++ void *datalimit; ++ int dir = CTINFO2DIR(ctinfo); ++ struct ip_ct_pptp_master *info = &ct->help.ct_pptp_info; ++ ++ int oldsstate, oldcstate; ++ int ret; ++ ++ /* don't do any tracking before tcp handshake complete */ ++ if (ctinfo != IP_CT_ESTABLISHED ++ && ctinfo != IP_CT_ESTABLISHED+IP_CT_IS_REPLY) { ++ DEBUGP("ctinfo = %u, skipping\n", ctinfo); ++ return NF_ACCEPT; ++ } ++ ++ /* not a complete TCP header? */ ++ if (tcplen < sizeof(struct tcphdr) || tcplen < tcph->doff * 4) { ++ DEBUGP("tcplen = %u\n", tcplen); ++ return NF_ACCEPT; ++ } ++ ++ /* checksum invalid? */ ++ if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr, ++ csum_partial((char *) tcph, tcplen, 0))) { ++ printk(KERN_NOTICE __FILE__ ": bad csum\n"); ++ /* W2K PPTP server sends TCP packets with wrong checksum :(( */ ++ //return NF_ACCEPT; ++ } ++ ++ if (tcph->fin || tcph->rst) { ++ DEBUGP("RST/FIN received, timeouting GRE\n"); ++ /* can't do this after real newnat */ ++ info->cstate = PPTP_CALL_NONE; ++ ++ /* untrack this call id, unexpect GRE packets */ ++ pptp_timeout_related(ct); ++ } ++ ++ ++ pptph = (struct pptp_pkt_hdr *) ((void *) tcph + tcph->doff * 4); ++ datalimit = (void *) pptph + datalen; ++ ++ /* not a full pptp packet header? */ ++ if ((void *) pptph+sizeof(*pptph) >= datalimit) { ++ DEBUGP("no full PPTP header, can't track\n"); ++ return NF_ACCEPT; ++ } ++ ++ /* if it's not a control message we can't do anything with it */ ++ if (ntohs(pptph->packetType) != PPTP_PACKET_CONTROL || ++ ntohl(pptph->magicCookie) != PPTP_MAGIC_COOKIE) { ++ DEBUGP("not a control packet\n"); ++ return NF_ACCEPT; ++ } ++ ++ oldsstate = info->sstate; ++ oldcstate = info->cstate; ++ ++ LOCK_BH(&ip_pptp_lock); ++ ++ /* FIXME: We just blindly assume that the control connection is always ++ * established from PNS->PAC. However, RFC makes no guarantee */ ++ if (dir == IP_CT_DIR_ORIGINAL) ++ /* client -> server (PNS -> PAC) */ ++ ret = pptp_outbound_pkt(tcph, pptph, datalen, ct, ctinfo); ++ else ++ /* server -> client (PAC -> PNS) */ ++ ret = pptp_inbound_pkt(tcph, pptph, datalen, ct, ctinfo); ++ DEBUGP("sstate: %d->%d, cstate: %d->%d\n", ++ oldsstate, info->sstate, oldcstate, info->cstate); ++ UNLOCK_BH(&ip_pptp_lock); ++ ++ return ret; ++} ++ ++/* control protocol helper */ ++static struct ip_conntrack_helper pptp = { ++ .list = { NULL, NULL }, ++ .name = "pptp", ++ .flags = IP_CT_HELPER_F_REUSE_EXPECT, ++ .me = THIS_MODULE, ++ .max_expected = 2, ++ .timeout = 0, ++ .tuple = { .src = { .ip = 0, ++ .u = { .tcp = { .port = ++ __constant_htons(PPTP_CONTROL_PORT) } } ++ }, ++ .dst = { .ip = 0, ++ .u = { .all = 0 }, ++ .protonum = IPPROTO_TCP ++ } ++ }, ++ .mask = { .src = { .ip = 0, ++ .u = { .tcp = { .port = 0xffff } } ++ }, ++ .dst = { .ip = 0, ++ .u = { .all = 0 }, ++ .protonum = 0xffff ++ } ++ }, ++ .help = conntrack_pptp_help ++}; ++ ++/* ip_conntrack_pptp initialization */ ++static int __init init(void) ++{ ++ int retcode; ++ ++ DEBUGP(__FILE__ ": registering helper\n"); ++ if ((retcode = ip_conntrack_helper_register(&pptp))) { ++ printk(KERN_ERR "Unable to register conntrack application " ++ "helper for pptp: %d\n", retcode); ++ return -EIO; ++ } ++ ++ printk("ip_conntrack_pptp version %s loaded\n", IP_CT_PPTP_VERSION); ++ return 0; ++} ++ ++static void __exit fini(void) ++{ ++ ip_conntrack_helper_unregister(&pptp); ++ printk("ip_conntrack_pptp version %s unloaded\n", IP_CT_PPTP_VERSION); ++} ++ ++module_init(init); ++module_exit(fini); ++ ++EXPORT_SYMBOL(ip_pptp_lock); +diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_pptp_priv.h linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_pptp_priv.h +--- linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_pptp_priv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_pptp_priv.h 2005-04-02 19:14:10.000000000 +0200 +@@ -0,0 +1,24 @@ ++#ifndef _IP_CT_PPTP_PRIV_H ++#define _IP_CT_PPTP_PRIV_H ++ ++/* PptpControlMessageType names */ ++static const char *strMName[] = { ++ "UNKNOWN_MESSAGE", ++ "START_SESSION_REQUEST", ++ "START_SESSION_REPLY", ++ "STOP_SESSION_REQUEST", ++ "STOP_SESSION_REPLY", ++ "ECHO_REQUEST", ++ "ECHO_REPLY", ++ "OUT_CALL_REQUEST", ++ "OUT_CALL_REPLY", ++ "IN_CALL_REQUEST", ++ "IN_CALL_REPLY", ++ "IN_CALL_CONNECT", ++ "CALL_CLEAR_REQUEST", ++ "CALL_DISCONNECT_NOTIFY", ++ "WAN_ERROR_NOTIFY", ++ "SET_LINK_INFO" ++}; ++ ++#endif +diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_proto_gre.c linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_proto_gre.c +--- linux-2.4.29-old/net/ipv4/netfilter/ip_conntrack_proto_gre.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29-dev/net/ipv4/netfilter/ip_conntrack_proto_gre.c 2005-04-02 19:14:31.000000000 +0200 +@@ -0,0 +1,333 @@ ++/* ++ * ip_conntrack_proto_gre.c - Version 1.2 ++ * ++ * Connection tracking protocol helper module for GRE. ++ * ++ * GRE is a generic encapsulation protocol, which is generally not very ++ * suited for NAT, as it has no protocol-specific part as port numbers. ++ * ++ * It has an optional key field, which may help us distinguishing two ++ * connections between the same two hosts. ++ * ++ * GRE is defined in RFC 1701 and RFC 1702, as well as RFC 2784 ++ * ++ * PPTP is built on top of a modified version of GRE, and has a mandatory ++ * field called "CallID", which serves us for the same purpose as the key ++ * field in plain GRE. ++ * ++ * Documentation about PPTP can be found in RFC 2637 ++ * ++ * (C) 2000-2003 by Harald Welte <laforge@gnumonks.org> ++ * ++ * Development of this code funded by Astaro AG (http://www.astaro.com/) ++ * ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/types.h> ++#include <linux/timer.h> ++#include <linux/netfilter.h> ++#include <linux/ip.h> ++#include <linux/in.h> ++#include <linux/list.h> ++ ++#include <linux/netfilter_ipv4/lockhelp.h> ++ ++DECLARE_RWLOCK(ip_ct_gre_lock); ++#define ASSERT_READ_LOCK(x) MUST_BE_READ_LOCKED(&ip_ct_gre_lock) ++#define ASSERT_WRITE_LOCK(x) MUST_BE_WRITE_LOCKED(&ip_ct_gre_lock) ++ ++#include <linux/netfilter_ipv4/listhelp.h> ++#include <linux/netfilter_ipv4/ip_conntrack_protocol.h> ++#include <linux/netfilter_ipv4/ip_conntrack_helper.h> ++#include <linux/netfilter_ipv4/ip_conntrack_core.h> ++ ++#include <linux/netfilter_ipv4/ip_conntrack_proto_gre.h> ++#include <linux/netfilter_ipv4/ip_conntrack_pptp.h> ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>"); ++MODULE_DESCRIPTION("netfilter connection tracking protocol helper for GRE"); ++ ++/* shamelessly stolen from ip_conntrack_proto_udp.c */ ++#define GRE_TIMEOUT (30*HZ) ++#define GRE_STREAM_TIMEOUT (180*HZ) ++ ++#if 0 ++#define DEBUGP(format, args...) printk(KERN_DEBUG __FILE__ ":" __FUNCTION__ \ ++ ": " format, ## args) ++#define DUMP_TUPLE_GRE(x) printk("%u.%u.%u.%u:0x%x -> %u.%u.%u.%u:0x%x:%u:0x%x\n", \ ++ NIPQUAD((x)->src.ip), ntohl((x)->src.u.gre.key), \ ++ NIPQUAD((x)->dst.ip), ntohl((x)->dst.u.gre.key)) ++#else ++#define DEBUGP(x, args...) ++#define DUMP_TUPLE_GRE(x) ++#endif ++ ++/* GRE KEYMAP HANDLING FUNCTIONS */ ++static LIST_HEAD(gre_keymap_list); ++ ++static inline int gre_key_cmpfn(const struct ip_ct_gre_keymap *km, ++ const struct ip_conntrack_tuple *t) ++{ ++ return ((km->tuple.src.ip == t->src.ip) && ++ (km->tuple.dst.ip == t->dst.ip) && ++ (km->tuple.dst.protonum == t->dst.protonum) && ++ (km->tuple.dst.u.all == t->dst.u.all)); ++} ++ ++/* look up the source key for a given tuple */ ++static u_int32_t gre_keymap_lookup(struct ip_conntrack_tuple *t) ++{ ++ struct ip_ct_gre_keymap *km; ++ u_int32_t key; ++ ++ READ_LOCK(&ip_ct_gre_lock); ++ km = LIST_FIND(&gre_keymap_list, gre_key_cmpfn, ++ struct ip_ct_gre_keymap *, t); ++ if (!km) { ++ READ_UNLOCK(&ip_ct_gre_lock); ++ return 0; ++ } ++ ++ key = km->tuple.src.u.gre.key; ++ READ_UNLOCK(&ip_ct_gre_lock); ++ ++ return key; ++} ++ ++/* add a single keymap entry, associate with specified expect */ ++int ip_ct_gre_keymap_add(struct ip_conntrack_expect *exp, ++ struct ip_conntrack_tuple *t, int reply) ++{ ++ struct ip_ct_gre_keymap *km; ++ ++ km = kmalloc(sizeof(*km), GFP_ATOMIC); ++ if (!km) ++ return -1; ++ ++ /* initializing list head should be sufficient */ ++ memset(km, 0, sizeof(*km)); ++ ++ memcpy(&km->tuple, t, sizeof(*t)); ++ ++ if (!reply) ++ exp->proto.gre.keymap_orig = km; ++ else ++ exp->proto.gre.keymap_reply = km; ++ ++ DEBUGP("adding new entry %p: ", km); ++ DUMP_TUPLE_GRE(&km->tuple); ++ ++ WRITE_LOCK(&ip_ct_gre_lock); ++ list_append(&gre_keymap_list, km); ++ WRITE_UNLOCK(&ip_ct_gre_lock); ++ ++ return 0; ++} ++ ++/* change the tuple of a keymap entry (used by nat helper) */ ++void ip_ct_gre_keymap_change(struct ip_ct_gre_keymap *km, ++ struct ip_conntrack_tuple *t) ++{ ++ DEBUGP("changing entry %p to: ", km); ++ DUMP_TUPLE_GRE(t); ++ ++ WRITE_LOCK(&ip_ct_gre_lock); ++ memcpy(&km->tuple, t, sizeof(km->tuple)); ++ WRITE_UNLOCK(&ip_ct_gre_lock); ++} ++ ++/* destroy the keymap entries associated with specified expect */ ++void ip_ct_gre_keymap_destroy(struct ip_conntrack_expect *exp) ++{ ++ DEBUGP("entering for exp %p\n", exp); ++ WRITE_LOCK(&ip_ct_gre_lock); ++ if (exp->proto.gre.keymap_orig) { ++ DEBUGP("removing %p from list\n", exp->proto.gre.keymap_orig); ++ list_del(&exp->proto.gre.keymap_orig->list); ++ kfree(exp->proto.gre.keymap_orig); ++ exp->proto.gre.keymap_orig = NULL; ++ } ++ if (exp->proto.gre.keymap_reply) { ++ DEBUGP("removing %p from list\n", exp->proto.gre.keymap_reply); ++ list_del(&exp->proto.gre.keymap_reply->list); ++ kfree(exp->proto.gre.keymap_reply); ++ exp->proto.gre.keymap_reply = NULL; ++ } ++ WRITE_UNLOCK(&ip_ct_gre_lock); ++} ++ ++ ++/* PUBLIC CONNTRACK PROTO HELPER FUNCTIONS */ ++ ++/* invert gre part of tuple */ ++static int gre_invert_tuple(struct ip_conntrack_tuple *tuple, ++ const struct ip_conntrack_tuple *orig) ++{ ++ tuple->dst.u.gre.key = orig->src.u.gre.key; ++ tuple->src.u.gre.key = orig->dst.u.gre.key; ++ ++ return 1; ++} ++ ++/* gre hdr info to tuple */ ++static int gre_pkt_to_tuple(const void *datah, size_t datalen, ++ struct ip_conntrack_tuple *tuple) ++{ ++ struct gre_hdr *grehdr = (struct gre_hdr *) datah; ++ struct gre_hdr_pptp *pgrehdr = (struct gre_hdr_pptp *) datah; ++ u_int32_t srckey; ++ ++ /* core guarantees 8 protocol bytes, no need for size check */ ++ ++ switch (grehdr->version) { ++ case GRE_VERSION_1701: ++ if (!grehdr->key) { ++ DEBUGP("Can't track GRE without key\n"); ++ return 0; ++ } ++ tuple->dst.u.gre.key = *(gre_key(grehdr)); ++ break; ++ ++ case GRE_VERSION_PPTP: ++ if (ntohs(grehdr->protocol) != GRE_PROTOCOL_PPTP) { ++ DEBUGP("GRE_VERSION_PPTP but unknown proto\n"); ++ return 0; ++ } ++ tuple->dst.u.gre.key = htonl(ntohs(pgrehdr->call_id)); ++ break; ++ ++ default: ++ printk(KERN_WARNING "unknown GRE version %hu\n", ++ grehdr->version); ++ return 0; ++ } ++ ++ srckey = gre_keymap_lookup(tuple); ++ ++#if 0 ++ DEBUGP("found src key %x for tuple ", ntohl(srckey)); ++ DUMP_TUPLE_GRE(tuple); ++#endif ++ tuple->src.u.gre.key = srckey; ++ ++ return 1; ++} ++ ++/* print gre part of tuple */ ++static unsigned int gre_print_tuple(char *buffer, ++ const struct ip_conntrack_tuple *tuple) ++{ ++ return sprintf(buffer, "srckey=0x%x dstkey=0x%x ", ++ ntohl(tuple->src.u.gre.key), ++ ntohl(tuple->dst.u.gre.key)); ++} ++ ++/* print private data for conntrack */ ++static unsigned int gre_print_conntrack(char *buffer, ++ const struct ip_conntrack *ct) ++{ ++ return sprintf(buffer, "timeout=%u, stream_timeout=%u ", ++ (ct->proto.gre.timeout / HZ), ++ (ct->proto.gre.stream_timeout / HZ)); ++} ++ ++/* Returns verdict for packet, and may modify conntrack */ ++static int gre_packet(struct ip_conntrack *ct, ++ struct iphdr *iph, size_t len, ++ enum ip_conntrack_info conntrackinfo) ++{ ++ /* If we've seen traffic both ways, this is a GRE connection. ++ * Extend timeout. */ ++ if (ct->status & IPS_SEEN_REPLY) { ++ ip_ct_refresh(ct, ct->proto.gre.stream_timeout); ++ /* Also, more likely to be important, and not a probe. */ ++ set_bit(IPS_ASSURED_BIT, &ct->status); ++ } else ++ ip_ct_refresh(ct, ct->proto.gre.timeout); ++ ++ return NF_ACCEPT; ++} ++ ++/* Called when a new connection for this protocol found. */ ++static int gre_new(struct ip_conntrack *ct, ++ struct iphdr *iph, size_t len) ++{ ++ DEBUGP(": "); ++ DUMP_TUPLE_GRE(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple); ++ ++ /* initialize to sane value. Ideally a conntrack helper ++ * (e.g. in case of pptp) is increasing them */ ++ ct->proto.gre.stream_timeout = GRE_STREAM_TIMEOUT; ++ ct->proto.gre.timeout = GRE_TIMEOUT; ++ ++ return 1; ++} ++ ++/* Called when a conntrack entry has already been removed from the hashes ++ * and is about to be deleted from memory */ ++static void gre_destroy(struct ip_conntrack *ct) ++{ ++ struct ip_conntrack_expect *master = ct->master; ++ ++ DEBUGP(" entering\n"); ++ ++ if (!master) { ++ DEBUGP("no master exp for ct %p\n", ct); ++ return; ++ } ++ ++ ip_ct_gre_keymap_destroy(master); ++} ++ ++/* protocol helper struct */ ++static struct ip_conntrack_protocol gre = { { NULL, NULL }, IPPROTO_GRE, ++ "gre", ++ gre_pkt_to_tuple, ++ gre_invert_tuple, ++ gre_print_tuple, ++ gre_print_conntrack, ++ gre_packet, ++ gre_new, ++ gre_destroy, ++ NULL, ++ THIS_MODULE }; ++ ++/* ip_conntrack_proto_gre initialization */ ++static int __init init(void) ++{ ++ int retcode; ++ ++ if ((retcode = ip_conntrack_protocol_register(&gre))) { ++ printk(KERN_ERR "Unable to register conntrack protocol " ++ "helper for gre: %d\n", retcode); ++ return -EIO; ++ } ++ ++ return 0; ++} ++ ++static void __exit fini(void) ++{ ++ struct list_head *pos, *n; ++ ++ /* delete all keymap entries */ ++ WRITE_LOCK(&ip_ct_gre_lock); ++ list_for_each_safe(pos, n, &gre_keymap_list) { ++ DEBUGP("deleting keymap %p at module unload time\n", pos); ++ list_del(pos); ++ kfree(pos); ++ } ++ WRITE_UNLOCK(&ip_ct_gre_lock); ++ ++ ip_conntrack_protocol_unregister(&gre); ++} ++ ++EXPORT_SYMBOL(ip_ct_gre_keymap_add); ++EXPORT_SYMBOL(ip_ct_gre_keymap_change); ++EXPORT_SYMBOL(ip_ct_gre_keymap_destroy); ++ ++module_init(init); ++module_exit(fini); +diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_core.c linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_core.c +--- linux-2.4.29-old/net/ipv4/netfilter/ip_nat_core.c 2005-01-19 15:10:13.000000000 +0100 ++++ linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_core.c 2005-04-02 19:07:18.000000000 +0200 +@@ -424,7 +424,7 @@ + *tuple = *orig_tuple; + while ((rptr = find_best_ips_proto_fast(tuple, mr, conntrack, hooknum)) + != NULL) { +- DEBUGP("Found best for "); DUMP_TUPLE(tuple); ++ DEBUGP("Found best for "); DUMP_TUPLE_RAW(tuple); + /* 3) The per-protocol part of the manip is made to + map into the range to make a unique tuple. */ + +@@ -564,9 +564,9 @@ + HOOK2MANIP(hooknum)==IP_NAT_MANIP_SRC ? "SRC" : "DST", + conntrack); + DEBUGP("Original: "); +- DUMP_TUPLE(&orig_tp); ++ DUMP_TUPLE_RAW(&orig_tp); + DEBUGP("New: "); +- DUMP_TUPLE(&new_tuple); ++ DUMP_TUPLE_RAW(&new_tuple); + #endif + + /* We now have two tuples (SRCIP/SRCPT/DSTIP/DSTPT): +diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_pptp.c linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_pptp.c +--- linux-2.4.29-old/net/ipv4/netfilter/ip_nat_pptp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_pptp.c 2005-04-02 19:14:52.000000000 +0200 +@@ -0,0 +1,475 @@ ++/* ++ * ip_nat_pptp.c - Version 1.5 ++ * ++ * NAT support for PPTP (Point to Point Tunneling Protocol). ++ * PPTP is a a protocol for creating virtual private networks. ++ * It is a specification defined by Microsoft and some vendors ++ * working with Microsoft. PPTP is built on top of a modified ++ * version of the Internet Generic Routing Encapsulation Protocol. ++ * GRE is defined in RFC 1701 and RFC 1702. Documentation of ++ * PPTP can be found in RFC 2637 ++ * ++ * (C) 2000-2003 by Harald Welte <laforge@gnumonks.org> ++ * ++ * Development of this code funded by Astaro AG (http://www.astaro.com/) ++ * ++ * TODO: - Support for multiple calls within one session ++ * (needs netfilter newnat code) ++ * - NAT to a unique tuple, not to TCP source port ++ * (needs netfilter tuple reservation) ++ * ++ * Changes: ++ * 2002-02-10 - Version 1.3 ++ * - Use ip_nat_mangle_tcp_packet() because of cloned skb's ++ * in local connections (Philip Craig <philipc@snapgear.com>) ++ * - add checks for magicCookie and pptp version ++ * - make argument list of pptp_{out,in}bound_packet() shorter ++ * - move to C99 style initializers ++ * - print version number at module loadtime ++ * 2003-09-22 - Version 1.5 ++ * - use SNATed tcp sourceport as callid, since we get called before ++ * TCP header is mangled (Philip Craig <philipc@snapgear.com>) ++ * ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/ip.h> ++#include <linux/tcp.h> ++#include <net/tcp.h> ++#include <linux/netfilter_ipv4/ip_nat.h> ++#include <linux/netfilter_ipv4/ip_nat_rule.h> ++#include <linux/netfilter_ipv4/ip_nat_helper.h> ++#include <linux/netfilter_ipv4/ip_nat_pptp.h> ++#include <linux/netfilter_ipv4/ip_conntrack_helper.h> ++#include <linux/netfilter_ipv4/ip_conntrack_proto_gre.h> ++#include <linux/netfilter_ipv4/ip_conntrack_pptp.h> ++ ++#define IP_NAT_PPTP_VERSION "1.5" ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>"); ++MODULE_DESCRIPTION("Netfilter NAT helper module for PPTP"); ++ ++ ++#if 0 ++#include "ip_conntrack_pptp_priv.h" ++#define DEBUGP(format, args...) printk(KERN_DEBUG __FILE__ ":" __FUNCTION__ \ ++ ": " format, ## args) ++#else ++#define DEBUGP(format, args...) ++#endif ++ ++static unsigned int ++pptp_nat_expected(struct sk_buff **pskb, ++ unsigned int hooknum, ++ struct ip_conntrack *ct, ++ struct ip_nat_info *info) ++{ ++ struct ip_conntrack *master = master_ct(ct); ++ struct ip_nat_multi_range mr; ++ struct ip_ct_pptp_master *ct_pptp_info; ++ struct ip_nat_pptp *nat_pptp_info; ++ u_int32_t newip, newcid; ++ int ret; ++ ++ IP_NF_ASSERT(info); ++ IP_NF_ASSERT(master); ++ IP_NF_ASSERT(!(info->initialized & (1 << HOOK2MANIP(hooknum)))); ++ ++ DEBUGP("we have a connection!\n"); ++ ++ LOCK_BH(&ip_pptp_lock); ++ ct_pptp_info = &master->help.ct_pptp_info; ++ nat_pptp_info = &master->nat.help.nat_pptp_info; ++ ++ /* need to alter GRE tuple because conntrack expectfn() used 'wrong' ++ * (unmanipulated) values */ ++ if (HOOK2MANIP(hooknum) == IP_NAT_MANIP_DST) { ++ DEBUGP("completing tuples with NAT info \n"); ++ /* we can do this, since we're unconfirmed */ ++ if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.gre.key == ++ htonl(ct_pptp_info->pac_call_id)) { ++ /* assume PNS->PAC */ ++ ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.gre.key = ++ htonl(nat_pptp_info->pns_call_id); ++ ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.gre.key = ++ htonl(nat_pptp_info->pns_call_id); ++ newip = master->tuplehash[IP_CT_DIR_REPLY].tuple.src.ip; ++ newcid = htonl(nat_pptp_info->pac_call_id); ++ } else { ++ /* assume PAC->PNS */ ++ ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.gre.key = ++ htonl(nat_pptp_info->pac_call_id); ++ ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.gre.key = ++ htonl(nat_pptp_info->pac_call_id); ++ newip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.ip; ++ newcid = htonl(nat_pptp_info->pns_call_id); ++ } ++ } else { ++ if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.gre.key == ++ htonl(ct_pptp_info->pac_call_id)) { ++ /* assume PNS->PAC */ ++ newip = master->tuplehash[IP_CT_DIR_REPLY].tuple.dst.ip; ++ newcid = htonl(ct_pptp_info->pns_call_id); ++ } ++ else { ++ /* assume PAC->PNS */ ++ newip = master->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.ip; ++ newcid = htonl(ct_pptp_info->pac_call_id); ++ } ++ } ++ ++ mr.rangesize = 1; ++ mr.range[0].flags = IP_NAT_RANGE_MAP_IPS | IP_NAT_RANGE_PROTO_SPECIFIED; ++ mr.range[0].min_ip = mr.range[0].max_ip = newip; ++ mr.range[0].min = mr.range[0].max = ++ ((union ip_conntrack_manip_proto ) { newcid }); ++ DEBUGP("change ip to %u.%u.%u.%u\n", ++ NIPQUAD(newip)); ++ DEBUGP("change key to 0x%x\n", ntohl(newcid)); ++ ret = ip_nat_setup_info(ct, &mr, hooknum); ++ ++ UNLOCK_BH(&ip_pptp_lock); ++ ++ return ret; ++ ++} ++ ++/* outbound packets == from PNS to PAC */ ++static inline unsigned int ++pptp_outbound_pkt(struct sk_buff **pskb, ++ struct ip_conntrack *ct, ++ enum ip_conntrack_info ctinfo, ++ struct ip_conntrack_expect *exp) ++ ++{ ++ struct iphdr *iph = (*pskb)->nh.iph; ++ struct tcphdr *tcph = (void *) iph + iph->ihl*4; ++ struct pptp_pkt_hdr *pptph = (struct pptp_pkt_hdr *) ++ ((void *)tcph + tcph->doff*4); ++ ++ struct PptpControlHeader *ctlh; ++ union pptp_ctrl_union pptpReq; ++ struct ip_ct_pptp_master *ct_pptp_info = &ct->help.ct_pptp_info; ++ struct ip_nat_pptp *nat_pptp_info = &ct->nat.help.nat_pptp_info; ++ ++ u_int16_t msg, *cid = NULL, new_callid; ++ ++ /* FIXME: size checks !!! */ ++ ctlh = (struct PptpControlHeader *) ((void *) pptph + sizeof(*pptph)); ++ pptpReq.rawreq = (void *) ((void *) ctlh + sizeof(*ctlh)); ++ ++ new_callid = htons(ct_pptp_info->pns_call_id); ++ ++ switch (msg = ntohs(ctlh->messageType)) { ++ case PPTP_OUT_CALL_REQUEST: ++ cid = &pptpReq.ocreq->callID; ++ /* FIXME: ideally we would want to reserve a call ID ++ * here. current netfilter NAT core is not able to do ++ * this :( For now we use TCP source port. This breaks ++ * multiple calls within one control session */ ++ ++ /* save original call ID in nat_info */ ++ nat_pptp_info->pns_call_id = ct_pptp_info->pns_call_id; ++ ++ /* don't use tcph->source since we are at a DSTmanip ++ * hook (e.g. PREROUTING) and pkt is not mangled yet */ ++ new_callid = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.tcp.port; ++ ++ /* save new call ID in ct info */ ++ ct_pptp_info->pns_call_id = ntohs(new_callid); ++ break; ++ case PPTP_IN_CALL_REPLY: ++ cid = &pptpReq.icreq->callID; ++ break; ++ case PPTP_CALL_CLEAR_REQUEST: ++ cid = &pptpReq.clrreq->callID; ++ break; ++ default: ++ DEBUGP("unknown outbound packet 0x%04x:%s\n", msg, ++ (msg <= PPTP_MSG_MAX)? strMName[msg]:strMName[0]); ++ /* fall through */ ++ ++ case PPTP_SET_LINK_INFO: ++ /* only need to NAT in case PAC is behind NAT box */ ++ case PPTP_START_SESSION_REQUEST: ++ case PPTP_START_SESSION_REPLY: ++ case PPTP_STOP_SESSION_REQUEST: ++ case PPTP_STOP_SESSION_REPLY: ++ case PPTP_ECHO_REQUEST: ++ case PPTP_ECHO_REPLY: ++ /* no need to alter packet */ ++ return NF_ACCEPT; ++ } ++ ++ IP_NF_ASSERT(cid); ++ ++ DEBUGP("altering call id from 0x%04x to 0x%04x\n", ++ ntohs(*cid), ntohs(new_callid)); ++ ++ /* mangle packet */ ++ ip_nat_mangle_tcp_packet(pskb, ct, ctinfo, (void *)cid - (void *)pptph, ++ sizeof(new_callid), (char *)&new_callid, ++ sizeof(new_callid)); ++ ++ return NF_ACCEPT; ++} ++ ++/* inbound packets == from PAC to PNS */ ++static inline unsigned int ++pptp_inbound_pkt(struct sk_buff **pskb, ++ struct ip_conntrack *ct, ++ enum ip_conntrack_info ctinfo, ++ struct ip_conntrack_expect *oldexp) ++{ ++ struct iphdr *iph = (*pskb)->nh.iph; ++ struct tcphdr *tcph = (void *) iph + iph->ihl*4; ++ struct pptp_pkt_hdr *pptph = (struct pptp_pkt_hdr *) ++ ((void *)tcph + tcph->doff*4); ++ ++ struct PptpControlHeader *ctlh; ++ union pptp_ctrl_union pptpReq; ++ struct ip_ct_pptp_master *ct_pptp_info = &ct->help.ct_pptp_info; ++ struct ip_nat_pptp *nat_pptp_info = &ct->nat.help.nat_pptp_info; ++ ++ u_int16_t msg, new_cid = 0, new_pcid, *pcid = NULL, *cid = NULL; ++ u_int32_t old_dst_ip; ++ ++ struct ip_conntrack_tuple t, inv_t; ++ struct ip_conntrack_tuple *orig_t, *reply_t; ++ ++ /* FIXME: size checks !!! */ ++ ctlh = (struct PptpControlHeader *) ((void *) pptph + sizeof(*pptph)); ++ pptpReq.rawreq = (void *) ((void *) ctlh + sizeof(*ctlh)); ++ ++ new_pcid = htons(nat_pptp_info->pns_call_id); ++ ++ switch (msg = ntohs(ctlh->messageType)) { ++ case PPTP_OUT_CALL_REPLY: ++ pcid = &pptpReq.ocack->peersCallID; ++ cid = &pptpReq.ocack->callID; ++ if (!oldexp) { ++ DEBUGP("outcall but no expectation\n"); ++ break; ++ } ++ old_dst_ip = oldexp->tuple.dst.ip; ++ t = oldexp->tuple; ++ invert_tuplepr(&inv_t, &t); ++ ++ /* save original PAC call ID in nat_info */ ++ nat_pptp_info->pac_call_id = ct_pptp_info->pac_call_id; ++ ++ /* alter expectation */ ++ orig_t = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple; ++ reply_t = &ct->tuplehash[IP_CT_DIR_REPLY].tuple; ++ if (t.src.ip == orig_t->src.ip && t.dst.ip == orig_t->dst.ip) { ++ /* expectation for PNS->PAC direction */ ++ t.src.u.gre.key = htonl(nat_pptp_info->pns_call_id); ++ t.dst.u.gre.key = htonl(ct_pptp_info->pac_call_id); ++ inv_t.src.ip = reply_t->src.ip; ++ inv_t.dst.ip = reply_t->dst.ip; ++ inv_t.src.u.gre.key = htonl(nat_pptp_info->pac_call_id); ++ inv_t.dst.u.gre.key = htonl(ct_pptp_info->pns_call_id); ++ } else { ++ /* expectation for PAC->PNS direction */ ++ t.src.u.gre.key = htonl(nat_pptp_info->pac_call_id); ++ t.dst.u.gre.key = htonl(ct_pptp_info->pns_call_id); ++ inv_t.src.ip = orig_t->src.ip; ++ inv_t.dst.ip = orig_t->dst.ip; ++ inv_t.src.u.gre.key = htonl(nat_pptp_info->pns_call_id); ++ inv_t.dst.u.gre.key = htonl(ct_pptp_info->pac_call_id); ++ } ++ ++ if (!ip_conntrack_change_expect(oldexp, &t)) { ++ DEBUGP("successfully changed expect\n"); ++ } else { ++ DEBUGP("can't change expect\n"); ++ } ++ ip_ct_gre_keymap_change(oldexp->proto.gre.keymap_orig, &t); ++ ip_ct_gre_keymap_change(oldexp->proto.gre.keymap_reply, &inv_t); ++ break; ++ case PPTP_IN_CALL_CONNECT: ++ pcid = &pptpReq.iccon->peersCallID; ++ if (!oldexp) ++ break; ++ old_dst_ip = oldexp->tuple.dst.ip; ++ t = oldexp->tuple; ++ ++ /* alter expectation, no need for callID */ ++ if (t.dst.ip == ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.ip) { ++ /* expectation for PNS->PAC direction */ ++ t.src.ip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.ip; ++ } else { ++ /* expectation for PAC->PNS direction */ ++ t.dst.ip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.ip; ++ } ++ ++ if (!ip_conntrack_change_expect(oldexp, &t)) { ++ DEBUGP("successfully changed expect\n"); ++ } else { ++ DEBUGP("can't change expect\n"); ++ } ++ break; ++ case PPTP_IN_CALL_REQUEST: ++ /* only need to nat in case PAC is behind NAT box */ ++ break; ++ case PPTP_WAN_ERROR_NOTIFY: ++ pcid = &pptpReq.wanerr->peersCallID; ++ break; ++ case PPTP_CALL_DISCONNECT_NOTIFY: ++ pcid = &pptpReq.disc->callID; ++ break; ++ ++ default: ++ DEBUGP("unknown inbound packet %s\n", ++ (msg <= PPTP_MSG_MAX)? strMName[msg]:strMName[0]); ++ /* fall through */ ++ ++ case PPTP_START_SESSION_REQUEST: ++ case PPTP_START_SESSION_REPLY: ++ case PPTP_STOP_SESSION_REQUEST: ++ case PPTP_STOP_SESSION_REPLY: ++ case PPTP_ECHO_REQUEST: ++ case PPTP_ECHO_REPLY: ++ /* no need to alter packet */ ++ return NF_ACCEPT; ++ } ++ ++ /* mangle packet */ ++ IP_NF_ASSERT(pcid); ++ DEBUGP("altering peer call id from 0x%04x to 0x%04x\n", ++ ntohs(*pcid), ntohs(new_pcid)); ++ ip_nat_mangle_tcp_packet(pskb, ct, ctinfo, (void *)pcid - (void *)pptph, ++ sizeof(new_pcid), (char *)&new_pcid, ++ sizeof(new_pcid)); ++ ++ if (new_cid) { ++ IP_NF_ASSERT(cid); ++ DEBUGP("altering call id from 0x%04x to 0x%04x\n", ++ ntohs(*cid), ntohs(new_cid)); ++ ip_nat_mangle_tcp_packet(pskb, ct, ctinfo, ++ (void *)cid - (void *)pptph, ++ sizeof(new_cid), (char *)&new_cid, ++ sizeof(new_cid)); ++ } ++ ++ /* great, at least we don't need to resize packets */ ++ return NF_ACCEPT; ++} ++ ++ ++static unsigned int tcp_help(struct ip_conntrack *ct, ++ struct ip_conntrack_expect *exp, ++ struct ip_nat_info *info, ++ enum ip_conntrack_info ctinfo, ++ unsigned int hooknum, struct sk_buff **pskb) ++{ ++ struct iphdr *iph = (*pskb)->nh.iph; ++ struct tcphdr *tcph = (void *) iph + iph->ihl*4; ++ unsigned int datalen = (*pskb)->len - iph->ihl*4 - tcph->doff*4; ++ struct pptp_pkt_hdr *pptph; ++ ++ int dir; ++ ++ DEBUGP("entering\n"); ++ ++ /* Only mangle things once: DST for original direction ++ and SRC for reply direction. */ ++ dir = CTINFO2DIR(ctinfo); ++ if (!((HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC ++ && dir == IP_CT_DIR_ORIGINAL) ++ || (HOOK2MANIP(hooknum) == IP_NAT_MANIP_DST ++ && dir == IP_CT_DIR_REPLY))) { ++ DEBUGP("Not touching dir %s at hook %s\n", ++ dir == IP_CT_DIR_ORIGINAL ? "ORIG" : "REPLY", ++ hooknum == NF_IP_POST_ROUTING ? "POSTROUTING" ++ : hooknum == NF_IP_PRE_ROUTING ? "PREROUTING" ++ : hooknum == NF_IP_LOCAL_OUT ? "OUTPUT" ++ : hooknum == NF_IP_LOCAL_IN ? "INPUT" : "???"); ++ return NF_ACCEPT; ++ } ++ ++ /* if packet is too small, just skip it */ ++ if (datalen < sizeof(struct pptp_pkt_hdr)+ ++ sizeof(struct PptpControlHeader)) { ++ DEBUGP("pptp packet too short\n"); ++ return NF_ACCEPT; ++ } ++ ++ pptph = (struct pptp_pkt_hdr *) ((void *)tcph + tcph->doff*4); ++ ++ /* if it's not a control message, we can't handle it */ ++ if (ntohs(pptph->packetType) != PPTP_PACKET_CONTROL || ++ ntohl(pptph->magicCookie) != PPTP_MAGIC_COOKIE) { ++ DEBUGP("not a pptp control packet\n"); ++ return NF_ACCEPT; ++ } ++ ++ LOCK_BH(&ip_pptp_lock); ++ ++ if (dir == IP_CT_DIR_ORIGINAL) { ++ /* reuqests sent by client to server (PNS->PAC) */ ++ pptp_outbound_pkt(pskb, ct, ctinfo, exp); ++ } else { ++ /* response from the server to the client (PAC->PNS) */ ++ pptp_inbound_pkt(pskb, ct, ctinfo, exp); ++ } ++ ++ UNLOCK_BH(&ip_pptp_lock); ++ ++ return NF_ACCEPT; ++} ++ ++/* nat helper struct for control connection */ ++static struct ip_nat_helper pptp_tcp_helper = { ++ .list = { NULL, NULL }, ++ .name = "pptp", ++ .flags = IP_NAT_HELPER_F_ALWAYS, ++ .me = THIS_MODULE, ++ .tuple = { .src = { .ip = 0, ++ .u = { .tcp = { .port = ++ __constant_htons(PPTP_CONTROL_PORT) } ++ } ++ }, ++ .dst = { .ip = 0, ++ .u = { .all = 0 }, ++ .protonum = IPPROTO_TCP ++ } ++ }, ++ ++ .mask = { .src = { .ip = 0, ++ .u = { .tcp = { .port = 0xFFFF } } ++ }, ++ .dst = { .ip = 0, ++ .u = { .all = 0 }, ++ .protonum = 0xFFFF ++ } ++ }, ++ .help = tcp_help, ++ .expect = pptp_nat_expected ++}; ++ ++ ++static int __init init(void) ++{ ++ DEBUGP("%s: registering NAT helper\n", __FILE__); ++ if (ip_nat_helper_register(&pptp_tcp_helper)) { ++ printk(KERN_ERR "Unable to register NAT application helper " ++ "for pptp\n"); ++ return -EIO; ++ } ++ ++ printk("ip_nat_pptp version %s loaded\n", IP_NAT_PPTP_VERSION); ++ return 0; ++} ++ ++static void __exit fini(void) ++{ ++ DEBUGP("cleanup_module\n" ); ++ ip_nat_helper_unregister(&pptp_tcp_helper); ++ printk("ip_nat_pptp version %s unloaded\n", IP_NAT_PPTP_VERSION); ++} ++ ++module_init(init); ++module_exit(fini); +Binary files linux-2.4.29-old/net/ipv4/netfilter/.ip_nat_pptp.c.swp and linux-2.4.29-dev/net/ipv4/netfilter/.ip_nat_pptp.c.swp differ +diff -urN linux-2.4.29-old/net/ipv4/netfilter/ip_nat_proto_gre.c linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_proto_gre.c +--- linux-2.4.29-old/net/ipv4/netfilter/ip_nat_proto_gre.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29-dev/net/ipv4/netfilter/ip_nat_proto_gre.c 2005-04-02 19:15:10.000000000 +0200 +@@ -0,0 +1,202 @@ ++/* ++ * ip_nat_proto_gre.c - Version 1.2 ++ * ++ * NAT protocol helper module for GRE. ++ * ++ * GRE is a generic encapsulation protocol, which is generally not very ++ * suited for NAT, as it has no protocol-specific part as port numbers. ++ * ++ * It has an optional key field, which may help us distinguishing two ++ * connections between the same two hosts. ++ * ++ * GRE is defined in RFC 1701 and RFC 1702, as well as RFC 2784 ++ * ++ * PPTP is built on top of a modified version of GRE, and has a mandatory ++ * field called "CallID", which serves us for the same purpose as the key ++ * field in plain GRE. ++ * ++ * Documentation about PPTP can be found in RFC 2637 ++ * ++ * (C) 2000-2003 by Harald Welte <laforge@gnumonks.org> ++ * ++ * Development of this code funded by Astaro AG (http://www.astaro.com/) ++ * ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/ip.h> ++#include <linux/netfilter_ipv4/ip_nat.h> ++#include <linux/netfilter_ipv4/ip_nat_rule.h> ++#include <linux/netfilter_ipv4/ip_nat_protocol.h> ++#include <linux/netfilter_ipv4/ip_conntrack_proto_gre.h> ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>"); ++MODULE_DESCRIPTION("Netfilter NAT protocol helper module for GRE"); ++ ++#if 0 ++#define DEBUGP(format, args...) printk(KERN_DEBUG __FILE__ ":" __FUNCTION__ \ ++ ": " format, ## args) ++#else ++#define DEBUGP(x, args...) ++#endif ++ ++/* is key in given range between min and max */ ++static int ++gre_in_range(const struct ip_conntrack_tuple *tuple, ++ enum ip_nat_manip_type maniptype, ++ const union ip_conntrack_manip_proto *min, ++ const union ip_conntrack_manip_proto *max) ++{ ++ u_int32_t key; ++ ++ if (maniptype == IP_NAT_MANIP_SRC) ++ key = tuple->src.u.gre.key; ++ else ++ key = tuple->dst.u.gre.key; ++ ++ return ntohl(key) >= ntohl(min->gre.key) ++ && ntohl(key) <= ntohl(max->gre.key); ++} ++ ++/* generate unique tuple ... */ ++static int ++gre_unique_tuple(struct ip_conntrack_tuple *tuple, ++ const struct ip_nat_range *range, ++ enum ip_nat_manip_type maniptype, ++ const struct ip_conntrack *conntrack) ++{ ++ u_int32_t min, i, range_size; ++ u_int32_t key = 0, *keyptr; ++ ++ if (maniptype == IP_NAT_MANIP_SRC) ++ keyptr = &tuple->src.u.gre.key; ++ else ++ keyptr = &tuple->dst.u.gre.key; ++ ++ if (!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED)) { ++ ++ DEBUGP("%p: NATing GRE PPTP\n", conntrack); ++ min = 1; ++ range_size = 0xffff; ++ ++ } else { ++ min = ntohl(range->min.gre.key); ++ range_size = ntohl(range->max.gre.key) - min + 1; ++ } ++ ++ DEBUGP("min = %u, range_size = %u\n", min, range_size); ++ ++ for (i = 0; i < range_size; i++, key++) { ++ *keyptr = htonl(min + key % range_size); ++ if (!ip_nat_used_tuple(tuple, conntrack)) ++ return 1; ++ } ++ ++ DEBUGP("%p: no NAT mapping\n", conntrack); ++ ++ return 0; ++} ++ ++/* manipulate a GRE packet according to maniptype */ ++static void ++gre_manip_pkt(struct iphdr *iph, size_t len, ++ const struct ip_conntrack_manip *manip, ++ enum ip_nat_manip_type maniptype) ++{ ++ struct gre_hdr *greh = (struct gre_hdr *)((u_int32_t *)iph+iph->ihl); ++ struct gre_hdr_pptp *pgreh = (struct gre_hdr_pptp *) greh; ++ ++ /* we only have destination manip of a packet, since 'source key' ++ * is not present in the packet itself */ ++ if (maniptype == IP_NAT_MANIP_DST) { ++ /* key manipulation is always dest */ ++ switch (greh->version) { ++ case 0: ++ if (!greh->key) { ++ DEBUGP("can't nat GRE w/o key\n"); ++ break; ++ } ++ if (greh->csum) { ++ /* FIXME: Never tested this code... */ ++ *(gre_csum(greh)) = ++ ip_nat_cheat_check(~*(gre_key(greh)), ++ manip->u.gre.key, ++ *(gre_csum(greh))); ++ } ++ *(gre_key(greh)) = manip->u.gre.key; ++ break; ++ case GRE_VERSION_PPTP: ++ DEBUGP("call_id -> 0x%04x\n", ++ ntohl(manip->u.gre.key)); ++ pgreh->call_id = htons(ntohl(manip->u.gre.key)); ++ break; ++ default: ++ DEBUGP("can't nat unknown GRE version\n"); ++ break; ++ } ++ } ++} ++ ++/* print out a nat tuple */ ++static unsigned int ++gre_print(char *buffer, ++ const struct ip_conntrack_tuple *match, ++ const struct ip_conntrack_tuple *mask) ++{ ++ unsigned int len = 0; ++ ++ if (mask->src.u.gre.key) ++ len += sprintf(buffer + len, "srckey=0x%x ", ++ ntohl(match->src.u.gre.key)); ++ ++ if (mask->dst.u.gre.key) ++ len += sprintf(buffer + len, "dstkey=0x%x ", ++ ntohl(match->src.u.gre.key)); ++ ++ return len; ++} ++ ++/* print a range of keys */ ++static unsigned int ++gre_print_range(char *buffer, const struct ip_nat_range *range) ++{ ++ if (range->min.gre.key != 0 ++ || range->max.gre.key != 0xFFFF) { ++ if (range->min.gre.key == range->max.gre.key) ++ return sprintf(buffer, "key 0x%x ", ++ ntohl(range->min.gre.key)); ++ else ++ return sprintf(buffer, "keys 0x%u-0x%u ", ++ ntohl(range->min.gre.key), ++ ntohl(range->max.gre.key)); ++ } else ++ return 0; ++} ++ ++/* nat helper struct */ ++static struct ip_nat_protocol gre = ++ { { NULL, NULL }, "GRE", IPPROTO_GRE, ++ gre_manip_pkt, ++ gre_in_range, ++ gre_unique_tuple, ++ gre_print, ++ gre_print_range ++ }; ++ ++static int __init init(void) ++{ ++ if (ip_nat_protocol_register(&gre)) ++ return -EIO; ++ ++ return 0; ++} ++ ++static void __exit fini(void) ++{ ++ ip_nat_protocol_unregister(&gre); ++} ++ ++module_init(init); ++module_exit(fini); +diff -urN linux-2.4.29-old/net/ipv4/netfilter/Makefile linux-2.4.29-dev/net/ipv4/netfilter/Makefile +--- linux-2.4.29-old/net/ipv4/netfilter/Makefile 2005-04-02 19:04:11.000000000 +0200 ++++ linux-2.4.29-dev/net/ipv4/netfilter/Makefile 2005-04-02 19:07:18.000000000 +0200 +@@ -36,23 +36,32 @@ + ifdef CONFIG_IP_NF_AMANDA + export-objs += ip_conntrack_amanda.o + endif +- + obj-$(CONFIG_IP_NF_TFTP) += ip_conntrack_tftp.o + obj-$(CONFIG_IP_NF_FTP) += ip_conntrack_ftp.o + ifdef CONFIG_IP_NF_FTP + export-objs += ip_conntrack_ftp.o + endif +- + obj-$(CONFIG_IP_NF_IRC) += ip_conntrack_irc.o + ifdef CONFIG_IP_NF_IRC + export-objs += ip_conntrack_irc.o + endif ++obj-$(CONFIG_IP_NF_CT_PROTO_GRE) += ip_conntrack_proto_gre.o ++ifdef CONFIG_IP_NF_CT_PROTO_GRE ++ export-objs += ip_conntrack_proto_gre.o ++endif ++obj-$(CONFIG_IP_NF_PPTP) += ip_conntrack_pptp.o ++ifdef CONFIG_IP_NF_NAT_PPTP ++ export-objs += ip_conntrack_pptp.o ++endif ++ + + # NAT helpers + obj-$(CONFIG_IP_NF_NAT_AMANDA) += ip_nat_amanda.o + obj-$(CONFIG_IP_NF_NAT_TFTP) += ip_nat_tftp.o + obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ftp.o + obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_irc.o ++obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_nat_proto_gre.o ++obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o + + # generic IP tables + obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o diff --git a/recipes/linux/linux-wrt-2.4.30/309-drivers_net_b44_c.patch b/recipes/linux/linux-wrt-2.4.30/309-drivers_net_b44_c.patch new file mode 100644 index 0000000000..2794706260 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/309-drivers_net_b44_c.patch @@ -0,0 +1,272 @@ +--- linux-2.4.30/drivers/net/b44.c 2004-08-08 01:26:05.000000000 +0200 ++++ openwrt/build_mipsel/linux-2.4.30/drivers/net/b44.c 2005-05-01 20:10:19.193354917 +0200 +@@ -1,7 +1,8 @@ + /* b44.c: Broadcom 4400 device driver. + * + * Copyright (C) 2002 David S. Miller (davem@redhat.com) +- * Fixed by Pekka Pietikainen (pp@ee.oulu.fi) ++ * Copyright (C) 2004 Pekka Pietikainen (pp@ee.oulu.fi) ++ * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org) + * + * Distribute under GPL. + */ +@@ -25,6 +26,16 @@ + + #include "b44.h" + ++#include <typedefs.h> ++#include <bcmdevs.h> ++#include <bcmutils.h> ++#include <osl.h> ++#include <bcmutils.h> ++#include <bcmnvram.h> ++#include <sbconfig.h> ++#include <sbchipc.h> ++#include <sflash.h> ++ + #define DRV_MODULE_NAME "b44" + #define PFX DRV_MODULE_NAME ": " + #define DRV_MODULE_VERSION "0.93" +@@ -75,7 +86,7 @@ + DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; + + MODULE_AUTHOR("David S. Miller (davem@redhat.com)"); +-MODULE_DESCRIPTION("Broadcom 4400 10/100 PCI ethernet driver"); ++MODULE_DESCRIPTION("Broadcom 4400/47xx 10/100 PCI ethernet driver"); + MODULE_LICENSE("GPL"); + MODULE_PARM(b44_debug, "i"); + MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value"); +@@ -89,6 +100,8 @@ + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401B1, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, ++ { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4713, ++ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { } /* terminate list with empty entry */ + }; + +@@ -236,6 +249,8 @@ + udelay(1); + } + ++static int b44_4713_instance; ++ + static int ssb_core_unit(struct b44 *bp) + { + #if 0 +@@ -258,6 +273,9 @@ + break; + }; + #endif ++ if (bp->pdev->device == PCI_DEVICE_ID_BCM4713) ++ return b44_4713_instance++; ++ else + return 0; + } + +@@ -267,6 +285,28 @@ + == SBTMSLOW_CLOCK); + } + ++static void __b44_cam_read(struct b44 *bp, unsigned char *data, int index) ++{ ++ u32 val; ++ ++ bw32(B44_CAM_CTRL, (CAM_CTRL_READ | ++ (index << CAM_CTRL_INDEX_SHIFT))); ++ ++ b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1); ++ ++ val = br32(B44_CAM_DATA_LO); ++ ++ data[2] = (val >> 24) & 0xFF; ++ data[3] = (val >> 16) & 0xFF; ++ data[4] = (val >> 8) & 0xFF; ++ data[5] = (val >> 0) & 0xFF; ++ ++ val = br32(B44_CAM_DATA_HI); ++ ++ data[0] = (val >> 8) & 0xFF; ++ data[1] = (val >> 0) & 0xFF; ++} ++ + static void __b44_cam_write(struct b44 *bp, unsigned char *data, int index) + { + u32 val; +@@ -307,6 +347,9 @@ + { + int err; + ++ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) ++ return 0; ++ + bw32(B44_EMAC_ISTAT, EMAC_INT_MII); + bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START | + (MDIO_OP_READ << MDIO_DATA_OP_SHIFT) | +@@ -321,6 +364,9 @@ + + static int b44_writephy(struct b44 *bp, int reg, u32 val) + { ++ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) ++ return 0; ++ + bw32(B44_EMAC_ISTAT, EMAC_INT_MII); + bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START | + (MDIO_OP_WRITE << MDIO_DATA_OP_SHIFT) | +@@ -336,6 +382,9 @@ + u32 val; + int err; + ++ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) ++ return 0; ++ + err = b44_writephy(bp, MII_BMCR, BMCR_RESET); + if (err) + return err; +@@ -406,6 +455,9 @@ + u32 val; + int err; + ++ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) ++ return 0; ++ + if ((err = b44_readphy(bp, B44_MII_ALEDCTRL, &val)) != 0) + goto out; + if ((err = b44_writephy(bp, B44_MII_ALEDCTRL, +@@ -498,6 +550,19 @@ + { + u32 bmsr, aux; + ++ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) { ++ bp->flags |= B44_FLAG_100_BASE_T; ++ bp->flags |= B44_FLAG_FULL_DUPLEX; ++ if (!netif_carrier_ok(bp->dev)) { ++ u32 val = br32(B44_TX_CTRL); ++ val |= TX_CTRL_DUPLEX; ++ bw32(B44_TX_CTRL, val); ++ netif_carrier_on(bp->dev); ++ b44_link_report(bp); ++ } ++ return; ++ } ++ + if (!b44_readphy(bp, MII_BMSR, &bmsr) && + !b44_readphy(bp, B44_MII_AUXCTRL, &aux) && + (bmsr != 0xffff)) { +@@ -1092,6 +1157,8 @@ + /* bp->lock is held. */ + static void b44_chip_reset(struct b44 *bp) + { ++ unsigned int sb_clock; ++ + if (ssb_is_core_up(bp)) { + bw32(B44_RCV_LAZY, 0); + bw32(B44_ENET_CTRL, ENET_CTRL_DISABLE); +@@ -1105,9 +1172,10 @@ + bw32(B44_DMARX_CTRL, 0); + bp->rx_prod = bp->rx_cons = 0; + } else { +- ssb_pci_setup(bp, (bp->core_unit == 0 ? +- SBINTVEC_ENET0 : +- SBINTVEC_ENET1)); ++ /*if (bp->pdev->device != PCI_DEVICE_ID_BCM4713)*/ ++ ssb_pci_setup(bp, (bp->core_unit == 0 ? ++ SBINTVEC_ENET0 : ++ SBINTVEC_ENET1)); + } + + ssb_core_reset(bp); +@@ -1115,6 +1183,11 @@ + b44_clear_stats(bp); + + /* Make PHY accessible. */ ++ if (bp->pdev->device == PCI_DEVICE_ID_BCM4713) ++ sb_clock = 100000000; /* 100 MHz */ ++ else ++ sb_clock = 62500000; /* 62.5 MHz */ ++ + bw32(B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE | + (0x0d & MDIO_CTRL_MAXF_MASK))); + br32(B44_MDIO_CTRL); +@@ -1669,20 +1742,42 @@ + { + u8 eeprom[128]; + int err; ++ unsigned long flags; + +- err = b44_read_eeprom(bp, &eeprom[0]); +- if (err) +- goto out; +- +- bp->dev->dev_addr[0] = eeprom[79]; +- bp->dev->dev_addr[1] = eeprom[78]; +- bp->dev->dev_addr[2] = eeprom[81]; +- bp->dev->dev_addr[3] = eeprom[80]; +- bp->dev->dev_addr[4] = eeprom[83]; +- bp->dev->dev_addr[5] = eeprom[82]; +- +- bp->phy_addr = eeprom[90] & 0x1f; +- bp->mdc_port = (eeprom[90] >> 14) & 0x1; ++ if (bp->pdev->device == PCI_DEVICE_ID_BCM4713) { ++ /* ++ * BCM47xx boards don't have a EEPROM. The MAC is stored in ++ * a NVRAM area somewhere in the flash memory. As we don't ++ * know the location and/or the format of the NVRAM area ++ * here, we simply rely on the bootloader to write the ++ * MAC into the CAM. ++ */ ++ spin_lock_irqsave(&bp->lock, flags); ++ __b44_cam_read(bp, bp->dev->dev_addr, 0); ++ spin_unlock_irqrestore(&bp->lock, flags); ++ ++ /* ++ * BCM47xx boards don't have a PHY. Usually there is a switch ++ * chip with multiple PHYs connected to the PHY port. ++ */ ++ bp->phy_addr = B44_PHY_ADDR_NO_PHY; ++ bp->dma_offset = 0; ++ } else { ++ err = b44_read_eeprom(bp, &eeprom[0]); ++ if (err) ++ return err; ++ ++ bp->dev->dev_addr[0] = eeprom[79]; ++ bp->dev->dev_addr[1] = eeprom[78]; ++ bp->dev->dev_addr[2] = eeprom[81]; ++ bp->dev->dev_addr[3] = eeprom[80]; ++ bp->dev->dev_addr[4] = eeprom[83]; ++ bp->dev->dev_addr[5] = eeprom[82]; ++ ++ bp->phy_addr = eeprom[90] & 0x1f; ++ bp->dma_offset = SB_PCI_DMA; ++ bp->mdc_port = (eeprom[90] >> 14) & 0x1; ++ } + + /* With this, plus the rx_header prepended to the data by the + * hardware, we'll land the ethernet header on a 2-byte boundary. +@@ -1692,13 +1787,12 @@ + bp->imask = IMASK_DEF; + + bp->core_unit = ssb_core_unit(bp); +- bp->dma_offset = ssb_get_addr(bp, SBID_PCI_DMA, 0); + + /* XXX - really required? + bp->flags |= B44_FLAG_BUGGY_TXPTR; + */ +-out: +- return err; ++ ++ return 0; + } + + static int __devinit b44_init_one(struct pci_dev *pdev, +@@ -1819,7 +1913,8 @@ + + pci_save_state(bp->pdev, bp->pci_cfg_state); + +- printk(KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet ", dev->name); ++ printk(KERN_INFO "%s: Broadcom %s 10/100BaseT Ethernet ", dev->name, ++ (pdev->device == PCI_DEVICE_ID_BCM4713) ? "47xx" : "4400"); + for (i = 0; i < 6; i++) + printk("%2.2x%c", dev->dev_addr[i], + i == 5 ? '\n' : ':'); diff --git a/recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn b/recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn new file mode 100644 index 0000000000..87be89d72f --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/310-netfilter-maxconn @@ -0,0 +1,20 @@ +--- ../../buildroot-unpacked/build_mipsel/linux/net/ipv4/netfilter/ip_conntrack_core.c 2004-11-28 22:59:36.000000000 -0500 ++++ linux/net/ipv4/netfilter/ip_conntrack_core.c 2004-11-30 05:05:32.000000000 -0500 +@@ -1386,7 +1386,7 @@ + nf_unregister_sockopt(&so_getorigdst); + } + +-static int hashsize = 0; ++static int hashsize = 5953 + MODULE_PARM(hashsize, "i"); + + int __init ip_conntrack_init(void) +@@ -1407,7 +1407,7 @@ + if (ip_conntrack_htable_size < 16) + ip_conntrack_htable_size = 16; + } +- ip_conntrack_max = 8 * ip_conntrack_htable_size; ++ ip_conntrack_max = ip_conntrack_htable_size; + + printk("ip_conntrack version %s (%u buckets, %d max)" + " - %Zd bytes per conntrack\n", IP_CONNTRACK_VERSION, diff --git a/recipes/linux/linux-wrt-2.4.30/311-ipsec-nat-traversal b/recipes/linux/linux-wrt-2.4.30/311-ipsec-nat-traversal new file mode 100644 index 0000000000..fc4c29d27e --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/311-ipsec-nat-traversal @@ -0,0 +1,140 @@ +packaging/utils/nattpatch 2.4 +--- linux/include/net/sock.h 2002/02/06 15:25:10 1.1 ++++ linux/include/net/sock.h 2002/05/22 12:14:56 +@@ -488,7 +488,13 @@ + } bictcp; + }; + +- ++#if 1 ++#define UDP_OPT_IN_SOCK 1 ++struct udp_opt { ++ __u32 esp_in_udp; ++}; ++#endif ++ + /* + * This structure really needs to be cleaned up. + * Most of it is for TCP, and not used by any of +@@ -655,6 +661,9 @@ + #if defined(CONFIG_SPX) || defined (CONFIG_SPX_MODULE) + struct spx_opt af_spx; + #endif /* CONFIG_SPX */ ++#if 1 ++ struct udp_opt af_udp; ++#endif + + } tp_pinfo; + +--- linux/net/Config.in.orig Fri Feb 9 14:34:13 2001 ++++ linux/net/Config.in Thu Feb 22 19:40:08 2001 +@@ -88,3 +88,5 @@ + endmenu + ++bool 'IPSEC NAT-Traversal' CONFIG_IPSEC_NAT_TRAVERSAL ++ + endmenu +--- linux/net/ipv4/udp.c.1 Wed Jan 28 15:57:05 2004 ++++ linux/net/ipv4/udp.c Wed Jan 28 15:58:56 2004 +@@ -787,6 +787,9 @@ + + static int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb) + { ++#ifdef CONFIG_IPSEC_NAT_TRAVERSAL ++ struct udp_opt *tp = &(sk->tp_pinfo.af_udp); ++#endif + /* + * Charge it to the socket, dropping if the queue is full. + */ +@@ -804,6 +807,40 @@ + } + #endif + ++#ifdef CONFIG_IPSEC_NAT_TRAVERSAL ++ if (tp->esp_in_udp) { ++ /* ++ * Set skb->sk and xmit packet to ipsec_rcv. ++ * ++ * If ret != 0, ipsec_rcv refused the packet (not ESPinUDP), ++ * restore skb->sk and fall back to sock_queue_rcv_skb ++ */ ++ struct inet_protocol *esp = NULL; ++ ++#if defined(CONFIG_KLIPS) && !defined(CONFIG_KLIPS_MODULE) ++ /* optomize only when we know it is statically linked */ ++ extern struct inet_protocol esp_protocol; ++ esp = &esp_protocol; ++#else ++ for (esp = (struct inet_protocol *)inet_protos[IPPROTO_ESP & (MAX_INET_PROTOS - 1)]; ++ (esp) && (esp->protocol != IPPROTO_ESP); ++ esp = esp->next); ++#endif ++ ++ if (esp && esp->handler) { ++ struct sock *sav_sk = skb->sk; ++ skb->sk = sk; ++ if (esp->handler(skb) == 0) { ++ skb->sk = sav_sk; ++ /*not sure we might count ESPinUDP as UDP...*/ ++ UDP_INC_STATS_BH(UdpInDatagrams); ++ return 0; ++ } ++ skb->sk = sav_sk; ++ } ++ } ++#endif ++ + if (sock_queue_rcv_skb(sk,skb)<0) { + UDP_INC_STATS_BH(UdpInErrors); + IP_INC_STATS_BH(IpInDiscards); +@@ -1027,13 +1064,49 @@ + return len; + } + ++static int udp_setsockopt(struct sock *sk, int level, int optname, ++ char *optval, int optlen) ++{ ++ struct udp_opt *tp = &(sk->tp_pinfo.af_udp); ++ int val; ++ int err = 0; ++ ++ if (level != SOL_UDP) ++ return ip_setsockopt(sk, level, optname, optval, optlen); ++ ++ if(optlen<sizeof(int)) ++ return -EINVAL; ++ ++ if (get_user(val, (int *)optval)) ++ return -EFAULT; ++ ++ lock_sock(sk); ++ ++ switch(optname) { ++#ifdef CONFIG_IPSEC_NAT_TRAVERSAL ++#ifndef UDP_ESPINUDP ++#define UDP_ESPINUDP 100 ++#endif ++ case UDP_ESPINUDP: ++ tp->esp_in_udp = val; ++ break; ++#endif ++ default: ++ err = -ENOPROTOOPT; ++ break; ++ } ++ ++ release_sock(sk); ++ return err; ++} ++ + struct proto udp_prot = { + name: "UDP", + close: udp_close, + connect: udp_connect, + disconnect: udp_disconnect, + ioctl: udp_ioctl, +- setsockopt: ip_setsockopt, ++ setsockopt: udp_setsockopt, + getsockopt: ip_getsockopt, + sendmsg: udp_sendmsg, + recvmsg: udp_recvmsg, diff --git a/recipes/linux/linux-wrt-2.4.30/312-netfilter-TTL b/recipes/linux/linux-wrt-2.4.30/312-netfilter-TTL new file mode 100644 index 0000000000..0aa3c80432 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/312-netfilter-TTL @@ -0,0 +1,180 @@ +diff -urN linux-2.4.30.old/Documentation/Configure.help linux-2.4.30.dev/Documentation/Configure.help +--- linux-2.4.30.old/Documentation/Configure.help 2005-04-27 11:35:46.000000000 +0200 ++++ linux-2.4.30.dev/Documentation/Configure.help 2005-04-27 11:43:49.000000000 +0200 +@@ -3209,6 +3209,15 @@ + If you want to compile it as a module, say M here and read + <file:Documentation/modules.txt>. If unsure, say `N'. + ++TTL target support ++CONFIG_IP_NF_TARGET_TTL ++ This option adds a `TTL' target, which enables the user to set ++ the TTL value or increment / decrement the TTL value by a given ++ amount. ++ ++ If you want to compile it as a module, say M here and read ++ Documentation/modules.txt. If unsure, say `N'. ++ + ipchains (2.2-style) support + CONFIG_IP_NF_COMPAT_IPCHAINS + This option places ipchains (with masquerading and redirection +diff -urN linux-2.4.30.old/include/linux/netfilter_ipv4/ipt_TTL.h linux-2.4.30.dev/include/linux/netfilter_ipv4/ipt_TTL.h +--- linux-2.4.30.old/include/linux/netfilter_ipv4/ipt_TTL.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30.dev/include/linux/netfilter_ipv4/ipt_TTL.h 2005-04-27 11:43:49.000000000 +0200 +@@ -0,0 +1,21 @@ ++/* TTL modification module for IP tables ++ * (C) 2000 by Harald Welte <laforge@gnumonks.org> */ ++ ++#ifndef _IPT_TTL_H ++#define _IPT_TTL_H ++ ++enum { ++ IPT_TTL_SET = 0, ++ IPT_TTL_INC, ++ IPT_TTL_DEC ++}; ++ ++#define IPT_TTL_MAXMODE IPT_TTL_DEC ++ ++struct ipt_TTL_info { ++ u_int8_t mode; ++ u_int8_t ttl; ++}; ++ ++ ++#endif +diff -urN linux-2.4.30.old/net/ipv4/netfilter/Config.in linux-2.4.30.dev/net/ipv4/netfilter/Config.in +--- linux-2.4.30.old/net/ipv4/netfilter/Config.in 2005-04-27 11:35:45.000000000 +0200 ++++ linux-2.4.30.dev/net/ipv4/netfilter/Config.in 2005-04-27 11:43:49.000000000 +0200 +@@ -129,6 +129,7 @@ + dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE + fi + dep_tristate ' LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES ++ dep_tristate ' TTL target support' CONFIG_IP_NF_TARGET_TTL $CONFIG_IP_NF_IPTABLES + dep_tristate ' ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES + dep_tristate ' TCPMSS target support' CONFIG_IP_NF_TARGET_TCPMSS $CONFIG_IP_NF_IPTABLES + fi +diff -urN linux-2.4.30.old/net/ipv4/netfilter/ipt_TTL.c linux-2.4.30.dev/net/ipv4/netfilter/ipt_TTL.c +--- linux-2.4.30.old/net/ipv4/netfilter/ipt_TTL.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.30.dev/net/ipv4/netfilter/ipt_TTL.c 2005-04-27 11:43:49.000000000 +0200 +@@ -0,0 +1,110 @@ ++/* TTL modification target for IP tables ++ * (C) 2000 by Harald Welte <laforge@gnumonks.org> ++ * ++ * Version: $Revision: 1.1 $ ++ * ++ * This software is distributed under the terms of GNU GPL ++ */ ++ ++#include <linux/module.h> ++#include <linux/skbuff.h> ++#include <linux/ip.h> ++#include <net/checksum.h> ++ ++#include <linux/netfilter_ipv4/ip_tables.h> ++#include <linux/netfilter_ipv4/ipt_TTL.h> ++ ++MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>"); ++MODULE_DESCRIPTION("IP tables TTL modification module"); ++MODULE_LICENSE("GPL"); ++ ++static unsigned int ipt_ttl_target(struct sk_buff **pskb, unsigned int hooknum, ++ const struct net_device *in, const struct net_device *out, ++ const void *targinfo, void *userinfo) ++{ ++ struct iphdr *iph = (*pskb)->nh.iph; ++ const struct ipt_TTL_info *info = targinfo; ++ u_int16_t diffs[2]; ++ int new_ttl; ++ ++ switch (info->mode) { ++ case IPT_TTL_SET: ++ new_ttl = info->ttl; ++ break; ++ case IPT_TTL_INC: ++ new_ttl = iph->ttl + info->ttl; ++ if (new_ttl > 255) ++ new_ttl = 255; ++ break; ++ case IPT_TTL_DEC: ++ new_ttl = iph->ttl - info->ttl; ++ if (new_ttl < 0) ++ new_ttl = 0; ++ break; ++ default: ++ new_ttl = iph->ttl; ++ break; ++ } ++ ++ if (new_ttl != iph->ttl) { ++ diffs[0] = htons(((unsigned)iph->ttl) << 8) ^ 0xFFFF; ++ iph->ttl = new_ttl; ++ diffs[1] = htons(((unsigned)iph->ttl) << 8); ++ iph->check = csum_fold(csum_partial((char *)diffs, ++ sizeof(diffs), ++ iph->check^0xFFFF)); ++ (*pskb)->nfcache |= NFC_ALTERED; ++ } ++ ++ return IPT_CONTINUE; ++} ++ ++static int ipt_ttl_checkentry(const char *tablename, ++ const struct ipt_entry *e, ++ void *targinfo, ++ unsigned int targinfosize, ++ unsigned int hook_mask) ++{ ++ struct ipt_TTL_info *info = targinfo; ++ ++ if (targinfosize != IPT_ALIGN(sizeof(struct ipt_TTL_info))) { ++ printk(KERN_WARNING "TTL: targinfosize %u != %Zu\n", ++ targinfosize, ++ IPT_ALIGN(sizeof(struct ipt_TTL_info))); ++ return 0; ++ } ++ ++ if (strcmp(tablename, "mangle")) { ++ printk(KERN_WARNING "TTL: can only be called from \"mangle\" table, not \"%s\"\n", tablename); ++ return 0; ++ } ++ ++ if (info->mode > IPT_TTL_MAXMODE) { ++ printk(KERN_WARNING "TTL: invalid or unknown Mode %u\n", ++ info->mode); ++ return 0; ++ } ++ ++ if ((info->mode != IPT_TTL_SET) && (info->ttl == 0)) { ++ printk(KERN_WARNING "TTL: increment/decrement doesn't make sense with value 0\n"); ++ return 0; ++ } ++ ++ return 1; ++} ++ ++static struct ipt_target ipt_TTL = { { NULL, NULL }, "TTL", ++ ipt_ttl_target, ipt_ttl_checkentry, NULL, THIS_MODULE }; ++ ++static int __init init(void) ++{ ++ return ipt_register_target(&ipt_TTL); ++} ++ ++static void __exit fini(void) ++{ ++ ipt_unregister_target(&ipt_TTL); ++} ++ ++module_init(init); ++module_exit(fini); +diff -urN linux-2.4.30.old/net/ipv4/netfilter/Makefile linux-2.4.30.dev/net/ipv4/netfilter/Makefile +--- linux-2.4.30.old/net/ipv4/netfilter/Makefile 2005-04-27 11:35:45.000000000 +0200 ++++ linux-2.4.30.dev/net/ipv4/netfilter/Makefile 2005-04-27 11:43:49.000000000 +0200 +@@ -112,6 +112,7 @@ + obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o + obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o + obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o ++obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o + obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o + obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o + diff --git a/recipes/linux/linux-wrt-2.4.30/313-gcc-4.0-fixes b/recipes/linux/linux-wrt-2.4.30/313-gcc-4.0-fixes new file mode 100644 index 0000000000..e6703680e1 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/313-gcc-4.0-fixes @@ -0,0 +1,198 @@ +diff -urN linux-2.4.30.old/drivers/i2c/i2c-core.c linux-2.4.30.dev/drivers/i2c/i2c-core.c +--- linux-2.4.30.old/drivers/i2c/i2c-core.c 2005-04-29 17:59:04.000000000 +0200 ++++ linux-2.4.30.dev/drivers/i2c/i2c-core.c 2005-04-29 18:42:37.000000000 +0200 +@@ -750,7 +750,7 @@ + msg.addr = client->addr; + msg.flags = client->flags & I2C_M_TEN; + msg.len = count; +- (const char *)msg.buf = buf; ++ msg.buf = (__u8 *)buf; + + DEB2(printk(KERN_DEBUG "i2c-core.o: master_send: writing %d bytes on %s.\n", + count,client->adapter->name)); +@@ -780,7 +780,7 @@ + msg.flags = client->flags & I2C_M_TEN; + msg.flags |= I2C_M_RD; + msg.len = count; +- msg.buf = buf; ++ msg.buf = (__u8 *)buf; + + DEB2(printk(KERN_DEBUG "i2c-core.o: master_recv: reading %d bytes on %s.\n", + count,client->adapter->name)); +diff -urN linux-2.4.30.old/drivers/usb/inode.c linux-2.4.30.dev/drivers/usb/inode.c +--- linux-2.4.30.old/drivers/usb/inode.c 2004-02-18 14:36:31.000000000 +0100 ++++ linux-2.4.30.dev/drivers/usb/inode.c 2005-04-29 18:42:37.000000000 +0200 +@@ -42,6 +42,8 @@ + #include <asm/uaccess.h> + + /* --------------------------------------------------------------------- */ ++static struct file_operations usbdevfs_bus_file_operations; ++static struct inode_operations usbdevfs_bus_inode_operations; + + /* + * This list of superblocks is still used, +diff -urN linux-2.4.30.old/include/asm-mips/uaccess.h linux-2.4.30.dev/include/asm-mips/uaccess.h +--- linux-2.4.30.old/include/asm-mips/uaccess.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux-2.4.30.dev/include/asm-mips/uaccess.h 2005-04-29 18:42:37.000000000 +0200 +@@ -149,7 +149,7 @@ + * Returns zero on success, or -EFAULT on error. + */ + #define put_user(x,ptr) \ +- __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr))) ++ __put_user_check((x),(ptr),sizeof(*(ptr))) + + /* + * get_user: - Get a simple variable from user space. +@@ -169,7 +169,7 @@ + * On error, the variable @x is set to zero. + */ + #define get_user(x,ptr) \ +- __get_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr))) ++ __get_user_check((x),(ptr),sizeof(*(ptr))) + + /* + * __put_user: - Write a simple value into user space, with less checking. +@@ -191,7 +191,7 @@ + * Returns zero on success, or -EFAULT on error. + */ + #define __put_user(x,ptr) \ +- __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr))) ++ __put_user_nocheck((x),(ptr),sizeof(*(ptr))) + + /* + * __get_user: - Get a simple variable from user space, with less checking. +@@ -214,7 +214,7 @@ + * On error, the variable @x is set to zero. + */ + #define __get_user(x,ptr) \ +- __get_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr))) ++ __get_user_nocheck((x),(ptr),sizeof(*(ptr))) + + struct __large_struct { unsigned long buf[100]; }; + #define __m(x) (*(struct __large_struct *)(x)) +@@ -232,7 +232,7 @@ + #define __get_user_nocheck(x,ptr,size) \ + ({ \ + long __gu_err = 0; \ +- __typeof(*(ptr)) __gu_val = 0; \ ++ __typeof(*(ptr)) __gu_val = (__typeof(*(ptr))) 0; \ + long __gu_addr; \ + __gu_addr = (long) (ptr); \ + switch (size) { \ +diff -urN linux-2.4.30.old/include/linux/byteorder/swab.h linux-2.4.30.dev/include/linux/byteorder/swab.h +--- linux-2.4.30.old/include/linux/byteorder/swab.h 2002-11-29 00:53:15.000000000 +0100 ++++ linux-2.4.30.dev/include/linux/byteorder/swab.h 2005-04-29 18:42:37.000000000 +0200 +@@ -156,7 +156,7 @@ + #endif /* OPTIMIZE */ + + +-static __inline__ __const__ __u16 __fswab16(__u16 x) ++static __inline__ __u16 __fswab16(__u16 x) + { + return __arch__swab16(x); + } +@@ -169,7 +169,7 @@ + __arch__swab16s(addr); + } + +-static __inline__ __const__ __u32 __fswab24(__u32 x) ++static __inline__ __u32 __fswab24(__u32 x) + { + return __arch__swab24(x); + } +@@ -182,7 +182,7 @@ + __arch__swab24s(addr); + } + +-static __inline__ __const__ __u32 __fswab32(__u32 x) ++static __inline__ __u32 __fswab32(__u32 x) + { + return __arch__swab32(x); + } +@@ -196,7 +196,7 @@ + } + + #ifdef __BYTEORDER_HAS_U64__ +-static __inline__ __const__ __u64 __fswab64(__u64 x) ++static __inline__ __u64 __fswab64(__u64 x) + { + # ifdef __SWAB_64_THRU_32__ + __u32 h = x >> 32; +diff -urN linux-2.4.30.old/include/linux/fs.h linux-2.4.30.dev/include/linux/fs.h +--- linux-2.4.30.old/include/linux/fs.h 2005-04-29 17:59:08.000000000 +0200 ++++ linux-2.4.30.dev/include/linux/fs.h 2005-04-29 18:42:37.000000000 +0200 +@@ -1563,7 +1563,6 @@ + unsigned long generate_cluster(kdev_t, int b[], int); + unsigned long generate_cluster_swab32(kdev_t, int b[], int); + extern kdev_t ROOT_DEV; +-extern char root_device_name[]; + + + extern void show_buffers(void); +diff -urN linux-2.4.30.old/include/linux/i2c.h linux-2.4.30.dev/include/linux/i2c.h +--- linux-2.4.30.old/include/linux/i2c.h 2005-01-19 15:10:12.000000000 +0100 ++++ linux-2.4.30.dev/include/linux/i2c.h 2005-04-29 18:42:37.000000000 +0200 +@@ -70,7 +70,7 @@ + + /* Transfer num messages. + */ +-extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num); ++extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num); + + /* + * Some adapter types (i.e. PCF 8584 based ones) may support slave behaviuor. +@@ -197,7 +197,7 @@ + to NULL. If an adapter algorithm can do SMBus access, set + smbus_xfer. If set to NULL, the SMBus protocol is simulated + using common I2C messages */ +- int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[], ++ int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, + int num); + int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr, + unsigned short flags, char read_write, +diff -urN linux-2.4.30.old/include/linux/usbdevice_fs.h linux-2.4.30.dev/include/linux/usbdevice_fs.h +--- linux-2.4.30.old/include/linux/usbdevice_fs.h 2003-11-28 19:26:21.000000000 +0100 ++++ linux-2.4.30.dev/include/linux/usbdevice_fs.h 2005-04-29 18:42:37.000000000 +0200 +@@ -185,8 +185,6 @@ + extern struct file_operations usbdevfs_devices_fops; + extern struct file_operations usbdevfs_device_file_operations; + extern struct inode_operations usbdevfs_device_inode_operations; +-extern struct inode_operations usbdevfs_bus_inode_operations; +-extern struct file_operations usbdevfs_bus_file_operations; + extern void usbdevfs_conn_disc_event(void); + + #endif /* __KERNEL__ */ +diff -urN linux-2.4.30.old/include/net/icmp.h linux-2.4.30.dev/include/net/icmp.h +--- linux-2.4.30.old/include/net/icmp.h 2001-11-22 20:47:15.000000000 +0100 ++++ linux-2.4.30.dev/include/net/icmp.h 2005-04-29 18:42:37.000000000 +0200 +@@ -23,6 +23,7 @@ + + #include <net/sock.h> + #include <net/protocol.h> ++#include <net/snmp.h> + + struct icmp_err { + int errno; +diff -urN linux-2.4.30.old/include/net/ipv6.h linux-2.4.30.dev/include/net/ipv6.h +--- linux-2.4.30.old/include/net/ipv6.h 2004-11-17 12:54:22.000000000 +0100 ++++ linux-2.4.30.dev/include/net/ipv6.h 2005-04-29 18:42:37.000000000 +0200 +@@ -19,6 +19,7 @@ + #include <asm/hardirq.h> + #include <net/ndisc.h> + #include <net/flow.h> ++#include <net/snmp.h> + + #define SIN6_LEN_RFC2133 24 + +diff -urN linux-2.4.30.old/include/linux/netfilter_ipv4/ip_tables.h linux-2.4.30.dev/include/linux/netfilter_ipv4/ip_tables.h +--- linux-2.4.30.old/include/linux/netfilter_ipv4/ip_tables.h 2005-04-29 17:59:08.000000000 +0200 ++++ linux-2.4.30.dev/include/linux/netfilter_ipv4/ip_tables.h 2005-04-29 19:06:36.000000000 +0200 +@@ -283,7 +283,7 @@ + struct ipt_entry entrytable[0]; + }; + +-extern struct semaphore ipt_mutex; ++// extern struct semaphore ipt_mutex; + + /* Standard return verdict, or do jump. */ + #define IPT_STANDARD_TARGET "" diff --git a/recipes/linux/linux-wrt-2.4.30/314-drivers_net_b44_h.patch b/recipes/linux/linux-wrt-2.4.30/314-drivers_net_b44_h.patch new file mode 100644 index 0000000000..992c66ef89 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/314-drivers_net_b44_h.patch @@ -0,0 +1,11 @@ +--- linux-2.4.30/drivers/net/b44.h 2003-08-25 13:44:42.000000000 +0200 ++++ openwrt/build_mipsel/linux-2.4.30/drivers/net/b44.h 2005-05-01 14:43:20.000000000 +0200 +@@ -461,6 +461,8 @@ + }; + + #define B44_MCAST_TABLE_SIZE 32 ++#define B44_PHY_ADDR_NO_PHY 30 ++#define B44_MDC_RATIO 5000000 + + /* SW copy of device statistics, kept up to date by periodic timer + * which probes HW values. Must have same relative layout as HW diff --git a/recipes/linux/linux-wrt-2.4.30/315-include_linux_pci_ids_h.patch b/recipes/linux/linux-wrt-2.4.30/315-include_linux_pci_ids_h.patch new file mode 100644 index 0000000000..88e56979f3 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/315-include_linux_pci_ids_h.patch @@ -0,0 +1,10 @@ +--- linux-2.4.30/include/linux/pci_ids.h 2005-04-04 03:42:20.000000000 +0200 ++++ openwrt/build_mipsel/linux-2.4.30/include/linux/pci_ids.h 2005-05-01 14:43:20.000000000 +0200 +@@ -1735,6 +1735,7 @@ + #define PCI_DEVICE_ID_TIGON3_5901_2 0x170e + #define PCI_DEVICE_ID_BCM4401 0x4401 + #define PCI_DEVICE_ID_BCM4401B0 0x4402 ++#define PCI_DEVICE_ID_BCM4713 0x4713 + + #define PCI_VENDOR_ID_ENE 0x1524 + #define PCI_DEVICE_ID_ENE_1211 0x1211 diff --git a/recipes/linux/linux-wrt-2.4.30/316-b44_mii_phy.patch b/recipes/linux/linux-wrt-2.4.30/316-b44_mii_phy.patch new file mode 100644 index 0000000000..524f7eda31 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/316-b44_mii_phy.patch @@ -0,0 +1,89 @@ +--- linux-2.4.30.old/drivers/net/b44.c 2005-05-01 23:30:22.000000000 +0400 ++++ linux-2.4.30/drivers/net/b44.c 2005-05-10 16:51:24.410654488 +0400 +@@ -343,17 +343,14 @@ + bw32(B44_IMASK, bp->imask); + } + +-static int b44_readphy(struct b44 *bp, int reg, u32 *val) ++static int __b44_readphy(struct b44 *bp, int phy_addr, int reg, u32 *val) + { + int err; + +- if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) +- return 0; +- + bw32(B44_EMAC_ISTAT, EMAC_INT_MII); + bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START | + (MDIO_OP_READ << MDIO_DATA_OP_SHIFT) | +- (bp->phy_addr << MDIO_DATA_PMD_SHIFT) | ++ (phy_addr << MDIO_DATA_PMD_SHIFT) | + (reg << MDIO_DATA_RA_SHIFT) | + (MDIO_TA_VALID << MDIO_DATA_TA_SHIFT))); + err = b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0); +@@ -362,21 +359,34 @@ + return err; + } + +-static int b44_writephy(struct b44 *bp, int reg, u32 val) ++static int b44_readphy(struct b44 *bp, int reg, u32 *val) + { + if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) + return 0; + ++ return __b44_readphy(bp, bp->phy_addr, reg, val); ++} ++ ++static int __b44_writephy(struct b44 *bp, int phy_addr, int reg, u32 val) ++{ + bw32(B44_EMAC_ISTAT, EMAC_INT_MII); + bw32(B44_MDIO_DATA, (MDIO_DATA_SB_START | + (MDIO_OP_WRITE << MDIO_DATA_OP_SHIFT) | +- (bp->phy_addr << MDIO_DATA_PMD_SHIFT) | ++ (phy_addr << MDIO_DATA_PMD_SHIFT) | + (reg << MDIO_DATA_RA_SHIFT) | + (MDIO_TA_VALID << MDIO_DATA_TA_SHIFT) | + (val & MDIO_DATA_DATA))); + return b44_wait_bit(bp, B44_EMAC_ISTAT, EMAC_INT_MII, 100, 0); + } + ++static int b44_writephy(struct b44 *bp, int reg, u32 val) ++{ ++ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) ++ return 0; ++ ++ return __b44_writephy(bp, bp->phy_addr, reg, val); ++} ++ + static int b44_phy_reset(struct b44 *bp) + { + u32 val; +@@ -1701,7 +1711,7 @@ + u32 mii_regval; + + spin_lock_irq(&bp->lock); +- err = b44_readphy(bp, data->reg_num & 0x1f, &mii_regval); ++ err = __b44_readphy(bp, data->phy_id & 0x1f, data->reg_num & 0x1f, &mii_regval); + spin_unlock_irq(&bp->lock); + + data->val_out = mii_regval; +@@ -1714,7 +1724,7 @@ + return -EPERM; + + spin_lock_irq(&bp->lock); +- err = b44_writephy(bp, data->reg_num & 0x1f, data->val_in); ++ err = __b44_writephy(bp, data->phy_id & 0x1f, data->reg_num & 0x1f, data->val_in); + spin_unlock_irq(&bp->lock); + + return err; +@@ -1919,6 +1929,11 @@ + printk("%2.2x%c", dev->dev_addr[i], + i == 5 ? '\n' : ':'); + ++ /* Initialize phy */ ++ spin_lock_irq(&bp->lock); ++ b44_chip_reset(bp); ++ spin_unlock_irq(&bp->lock); ++ + return 0; + + err_out_iounmap: diff --git a/recipes/linux/linux-wrt-2.4.30/400-i4l-cvs-2-4-29 b/recipes/linux/linux-wrt-2.4.30/400-i4l-cvs-2-4-29 new file mode 100644 index 0000000000..c9833e2a30 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/400-i4l-cvs-2-4-29 @@ -0,0 +1,20247 @@ +diff -rNu linux-2.4.29.old/Documentation/isdn/CREDITS linux-2.4.29/Documentation/isdn/CREDITS +--- linux-2.4.29.old/Documentation/isdn/CREDITS 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/CREDITS 2005-03-22 15:06:50.246454160 +0100 +@@ -37,7 +37,7 @@ + Andreas Kool (akool@Kool.f.EUnet.de) + For contribution of the isdnlog/isdnrep-tool + +-Pedro Roque Marques (pedro_m@yahoo.com) ++Pedro Roque Marques (roque@di.fc.ul.pt) + For lot of new ideas and the pcbit driver. + + Eberhard Moenkeberg (emoenke@gwdg.de) +diff -rNu linux-2.4.29.old/Documentation/isdn/HiSax.cert linux-2.4.29/Documentation/isdn/HiSax.cert +--- linux-2.4.29.old/Documentation/isdn/HiSax.cert 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/HiSax.cert 2005-03-22 15:06:50.264451424 +0100 +@@ -68,6 +68,8 @@ + drivers/isdn/hisax/elsa.c + drivers/isdn/hisax/diva.c + drivers/isdn/hisax/hfc_pci.c ++drivers/isdn/hisax/hfc_usbr.c ++drivers/isdn/hisax/hfc_usb.c + + Please send any changes, bugfixes and patches to me rather than implementing + them directly into the HiSax sources. +diff -rNu linux-2.4.29.old/Documentation/isdn/INTERFACE linux-2.4.29/Documentation/isdn/INTERFACE +--- linux-2.4.29.old/Documentation/isdn/INTERFACE 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/INTERFACE 2005-03-22 15:06:50.288447776 +0100 +@@ -1,4 +1,4 @@ +-$Id: INTERFACE,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ ++$Id: INTERFACE,v 1.17 2002/01/31 13:26:35 keil Exp $ + + Description of the Interface between Linklevel and Hardwarelevel + of isdn4linux: +@@ -399,7 +399,7 @@ + protocol-Id is one of the constants ISDN_PROTO_L3... + parm.fax = Pointer to T30_s fax struct. (fax usage only) + +- ISDN_CMD_GETL2: (currently unused) ++ ISDN_CMD_GETL3: (currently unused) + + With this command, the HL-driver is told to return the current + setting of the Layer-3-protocol. +@@ -781,3 +781,22 @@ + arg = channel-number, locally to the driver. (starting with 0) + parm = unused. + ++ ISDN_STAT_ALERT: ++ ++ With this call, the HL-driver signals the receive of an ALERTING message to the LL. ++ ++ Parameter: ++ driver = driver-Id ++ command = ISDN_STAT_ALERT ++ arg = channel-number, locally to the driver. (starting with 0) ++ ++ ISDN_STAT_PROCEED: ++ ++ With this call, the HL-driver signals the receive of an CALL PROCEEDING message ++ to the LL. ++ ++ Parameter: ++ driver = driver-Id ++ command = ISDN_STAT_PROCEED ++ arg = channel-number, locally to the driver. (starting with 0) ++ +diff -rNu linux-2.4.29.old/Documentation/isdn/INTERFACE.fax linux-2.4.29/Documentation/isdn/INTERFACE.fax +--- linux-2.4.29.old/Documentation/isdn/INTERFACE.fax 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/INTERFACE.fax 2005-03-22 15:06:50.312444128 +0100 +@@ -1,4 +1,4 @@ +-$Id: INTERFACE.fax,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ ++$Id: INTERFACE.fax,v 1.2 2000/08/06 09:22:50 armin Exp $ + + + Description of the fax-subinterface between linklevel and hardwarelevel of +diff -rNu linux-2.4.29.old/Documentation/isdn/README linux-2.4.29/Documentation/isdn/README +--- linux-2.4.29.old/Documentation/isdn/README 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/README 2005-03-22 15:06:50.340439872 +0100 +@@ -278,6 +278,12 @@ + 1 = Add CPN to FCON message on + Bit 2: 0 = Add CDN to RING/FCON message off + 1 = Add CDN to RING/FCON message on ++ Bit 3: 0 = Do not signal RINGING ++ 1 = Signal RINGING if ALERT was received ++ Bit 4: 0 = Do not signal PROCEEDING ++ 1 = Signal PROCEEDING if CALL PROCEEDING ++ was received ++ + + Last but not least a (at the moment fairly primitive) device to request + the line-status (/dev/isdninfo) is made available. +diff -rNu linux-2.4.29.old/Documentation/isdn/README.HiSax linux-2.4.29/Documentation/isdn/README.HiSax +--- linux-2.4.29.old/Documentation/isdn/README.HiSax 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/README.HiSax 2005-03-22 15:06:50.372435008 +0100 +@@ -41,10 +41,9 @@ + ELSA Quickstep 3000PCI + ELSA PCMCIA + ITK ix1-micro Rev.2 +-Eicon Diva 2.0 ISA and PCI (S0 and U interface, no PRO version) +-Eicon Diva 2.01 ISA and PCI +-Eicon Diva 2.02 PCI +-Eicon Diva Piccola ++Eicon.Diehl Diva 2.0 ISA and PCI (S0 and U interface, no PRO version) ++Eicon.Diehl Diva 2.01 ISA and PCI ++Eicon.Diehl Diva Piccola + ASUSCOM NETWORK INC. ISDNLink 128K PC adapter (order code I-IN100-ST-D) + Dynalink IS64PH (OEM version of ASUSCOM NETWORK INC. ISDNLink 128K adapter) + PCBIT-DP (OEM version of ASUSCOM NETWORK INC. ISDNLink) +@@ -53,7 +52,6 @@ + Sedlbauer Speed Star/Speed Star2 (PCMCIA) + Sedlbauer ISDN-Controller PC/104 + USR Sportster internal TA (compatible Stollmann tina-pp V3) +-USR internal TA PCI + ith Kommunikationstechnik GmbH MIC 16 ISA card + Traverse Technologie NETjet PCI S0 card and NETspider U card + Ovislink ISDN sc100-p card (NETjet driver) +@@ -68,14 +66,14 @@ + HFC-PCI based cards + Winbond W6692 based cards + HFC-S+, HFC-SP/PCMCIA cards +-formula-n enternow +-Gerdes Power ISDN ++HFC-USB ISDN TAs + + Note: PCF, PCF-Pro: up to now, only the ISDN part is supported + PCC-8: not tested yet + Eicon.Diehl Diva U interface not tested + + If you know other passive cards with the Siemens chipset, please let me know. ++To use the PNP cards you need the isapnptools. + You can combine any card, if there is no conflict between the resources + (io, mem, irq). + +@@ -91,15 +89,8 @@ + modules. It is included in the normal "make [menu]config" target at the + kernel. Don't forget it, especially to select the right D-channel protocol. + +-Please note: In older versions of the HiSax driver, all PnP cards +-needed to be configured with isapnp and worked only with the HiSax +-driver used as a module. +- +-In the current version, HiSax will automatically use the in-kernel +-ISAPnP support, provided you selected it during kernel configuration +-(CONFIG_ISAPNP), if you don't give the io=, irq= command line parameters. +- +-The affected card types are: 4,7,12,14,19,27-30 ++Please note: All PnP cards need to be configured with isapnp and will work ++only with the HiSax driver used as a module. + + a) when built as a module + ------------------------- +@@ -200,8 +191,6 @@ + 37 HFC 2BDS0 S+, SP irq,io + 38 NETspider U PCI card none + 39 HFC 2BDS0 SP/PCMCIA irq,io (set with cardmgr) +- 40 hotplug interface +- 41 Formula-n enter:now PCI none + + At the moment IRQ sharing is only possible with PCI cards. Please make sure + that your IRQ is free and enabled for ISA use. +@@ -227,13 +216,6 @@ + (IO 1 (BASE 0x0180)) + modprobe hisax type=4 protocol=2 irq=10 io0=0x580 io1=0x180 + +- In the current version of HiSax, you can instead simply use +- +- modprobe hisax type=4 protocol=2 +- +- if you configured your kernel for ISAPnP. Don't run isapnp in +- this case! +- + 6. Teles 16.3, Euro ISDN, I/O base 280 hex, IRQ 12 and + Teles 16.0, 1TR6, IRQ 5, Memory d0000 hex + modprobe hisax type=3,1 protocol=2,1 io=0x280 mem=0,0xd0000 +@@ -314,9 +296,7 @@ + 36 W6692 based PCI cards none + 37 HFC 2BDS0 S+,SP/PCMCIA ONLY WORKS AS A MODULE ! + 38 NETspider U PCI card none +- 39 HFC 2BDS0 SP/PCMCIA ONLY WORKS AS A MODULE ! +- 40 hotplug interface ONLY WORKS AS A MODULE ! +- 41 Formula-n enter:now PCI none ++ + + Running the driver + ------------------ +diff -rNu linux-2.4.29.old/Documentation/isdn/README.act2000 linux-2.4.29/Documentation/isdn/README.act2000 +--- linux-2.4.29.old/Documentation/isdn/README.act2000 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/README.act2000 2005-03-22 15:06:50.388432576 +0100 +@@ -1,4 +1,4 @@ +-$Id: README.act2000,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ ++$Id: README.act2000,v 1.3 2000/08/06 09:22:51 armin Exp $ + + This document describes the ACT2000 driver for the + IBM Active 2000 ISDN card. +diff -rNu linux-2.4.29.old/Documentation/isdn/README.audio linux-2.4.29/Documentation/isdn/README.audio +--- linux-2.4.29.old/Documentation/isdn/README.audio 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/README.audio 2005-03-22 15:06:50.404430144 +0100 +@@ -1,4 +1,4 @@ +-$Id: README.audio,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ ++$Id: README.audio,v 1.8 1999/07/11 17:17:29 armin Exp $ + + ISDN subsystem for Linux. + Description of audio mode. +diff -rNu linux-2.4.29.old/Documentation/isdn/README.eicon linux-2.4.29/Documentation/isdn/README.eicon +--- linux-2.4.29.old/Documentation/isdn/README.eicon 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/README.eicon 2005-03-22 15:06:50.479418744 +0100 +@@ -1,4 +1,4 @@ +-$Id: README.eicon,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ ++$Id: README.eicon,v 1.10 2000/08/13 12:19:15 armin Exp $ + + (c) 1999,2000 Armin Schindler (mac@melware.de) + (c) 1999,2000 Cytronics & Melware (info@melware.de) +diff -rNu linux-2.4.29.old/Documentation/isdn/README.hysdn linux-2.4.29/Documentation/isdn/README.hysdn +--- linux-2.4.29.old/Documentation/isdn/README.hysdn 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/README.hysdn 2005-03-22 15:06:50.522412208 +0100 +@@ -1,4 +1,4 @@ +-$Id: README.hysdn,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ ++$Id: README.hysdn,v 1.3.6.1 2001/02/10 14:41:19 kai Exp $ + The hysdn driver has been written by + by Werner Cornelius (werner@isdn4linux.de or werner@titro.de) + for Hypercope GmbH Aachen Germany. Hypercope agreed to publish this driver +diff -rNu linux-2.4.29.old/Documentation/isdn/README.icn linux-2.4.29/Documentation/isdn/README.icn +--- linux-2.4.29.old/Documentation/isdn/README.icn 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/README.icn 2005-03-22 15:06:50.550407952 +0100 +@@ -1,4 +1,4 @@ +-$Id: README.icn,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ ++$Id: README.icn,v 1.7 2000/08/06 09:22:51 armin Exp $ + + You can get the ICN-ISDN-card from: + +diff -rNu linux-2.4.29.old/Documentation/isdn/README.pcbit linux-2.4.29/Documentation/isdn/README.pcbit +--- linux-2.4.29.old/Documentation/isdn/README.pcbit 2005-03-22 14:48:26.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/README.pcbit 2005-03-22 15:06:50.567405368 +0100 +@@ -37,4 +37,4 @@ + regards, + Pedro. + +-<pedro_m@yahoo.com> ++<roque@di.fc.ul.pt> +diff -rNu linux-2.4.29.old/Documentation/isdn/abcext_kernel.help linux-2.4.29/Documentation/isdn/abcext_kernel.help +--- linux-2.4.29.old/Documentation/isdn/abcext_kernel.help 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/Documentation/isdn/abcext_kernel.help 2005-03-22 15:06:50.600400352 +0100 +@@ -0,0 +1,166 @@ ++ ++ISDN-ABC-DW Extension ++CONFIG_ISDN_WITH_ABC ++ These are many brand new Options and Features for the ++ ISDN SUBSYSTEM. Including Logical Device bindings, ++ Compression and other good stuff for Optimizing your ++ ISDN System. ++ ++ To Use this Extensions you MUST HAVE THE NEWEST ++ ISDN4K-UTILS. You must have Version 3.1-Beta6 or ++ higher. Elsewhere you can not configure this Extensions. ++ ++ WARNING ! THIS STUF IS NOT PRODUCTION RELEASE THE ++ FUNCTION ARE UNDER DEVELOPMENT. This ist BETA-CODE. ++ You can use it at you Own Risk. ++ ++ For more Information on these Extensions take a look at ++ "linux/Documentation/isdn/dw-abc-extension-howto.txt or ++ Online at the Web "http://www.mediatronix.de/i4l/index.html" ++ ++ Please Report Bugs to "mario@mediatronix.de" or ++ "delefw@isdn4linux.de" ++ ++D-Channel-Callback with Channel in use check ++CONFIG_ISDN_WITH_ABC_CALLB ++ When a Interface is declared as an Callback Interface, ++ the Interface is checking that the other Side is not ++ Calling on the same time before the Interface is Dialing. ++ ++ See "linux/Documentation/isdn/dw-abc-extension-howto.txt" ++ for more Information ++ ++ In most case answer with "Yes" when you have Callback devices, ++ otherwise leave it "No" ++ ++Outgoing-EAZ-Support ++CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ Enables the Feature to Define an other EAZ or MSN for ++ Outgoing calls on an Interface. ++ ++ See "linux/Documentation/isdn/dw-abc-extension-howto.txt" ++ for more Information ++ ++Least Cost Router Support ++CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ This is the final Kernel Code for configuring an Least ++ Cost Router Softwarebased. The other Job is to do the ++ action in ISDNLOG. You need the ISDNLOG to use this ++ function. Currently the ISDNLOG have not the Support for ++ this Option. ++ So in most situations let the Option off. ++ ++TCP keepalive detect and response ++CONFIG_ISDN_WITH_ABC_IPV4_TCP_KEEPALIVE ++ This Option works only with the TCP/IP V4. It enables ++ the Function that ISDN Devices are Answering TCP_KEEPALIVE Pakets ++ localy. So that TCP KEEPALIVE Pakets not longer takes the Line ++ open. ++ ++Drop frames Sourceadresse is not Interfaceadress ++CONFIG_ISDN_WITH_ABC_IPV4_DYNADDR ++ This Option works only with the TCP/IP V4. It will allow only ++ the Transmitt of Pakets where the Sourceadresse is the Interface ++ adress. It is usefull when you have Lines with Dynamic IP. ++ ++ See "linux/Documentation/isdn/dw-abc-extension-howto.txt" ++ for more Information ++ ++Receive do not reset the Hanguptimer ++CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER ++ When you activate this option than the reiceive of pakets do ++ not reset the Hanguptimer. It is very usefull because if the ++ Paket vor your Network your Network generate an Response and ++ the Transmit is reseting the HUPTIMER. But when the Paket is ++ Rejected at your firewall your network generate no Response ++ and no Sendtraffic is generated. So in this case there is no ++ need to Reset the Huptimer because you have only received Data. ++ With that option only Transmitted Data/Pakets will reset the ++ HUPTIMER. ++ ++Support of (device-channel) and Binding Groups ++CONFIG_ISDN_WITH_ABC_ICALL_BIND ++ This Option enables the Feature to Bind logical ISDN Interfaces ++ to an prefered ISDN Card or ISDN Card plus Channel. So you have ++ the Chance to keep Channels exclusively for one (or more) ++ Connection. Very usefull when you have more channels and Use ++ Calling Line Identification, because you can organize that your ++ call is going out over the Line with the right EAZ for the CLI. ++ ++Skip channel if used external (Dial Only) ++CONFIG_ISDN_WITH_ABC_CH_EXTINUSE ++ When you have more than One ISDN Card in your System and you ++ will Dialout with an Interface you can become the Situation ++ that an External Device such a Telephone or Fax is Using the ++ B-Channels. Normaly ISDN4Linux does not detect this Situation ++ and dial everytime of the "External Busy" line out. With this ++ Option Enabled the I4L will detect that he can not dialout on ++ This Card and dial over the next Card out. ++ ++ See "linux/Documentation/isdn/dw-abc-extension-howto.txt" ++ for more Information ++ ++Interface autodisable if Config error ++CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ This Option will detect an Device which generate Telephone ++ Cost but does not Function correctly because there are ++ Configerrors on one of the Site. In this Situation the ++ Interface will be marked as Unsuably for some time to do ++ not call every time this Site. ++ ++ See "linux/Documentation/isdn/dw-abc-extension-howto.txt" ++ for more Information ++ ++UDP-Info-Support ++CONFIG_ISDN_WITH_ABC_UDP_CHECK ++ This is the Mainoption to Enable or Disable the UDP ++ Info Support. An Option to Controll ISDN-Interfaces ++ Remotely. For this very Complex thing take a look at ++ ++ "linux/Documentation/isdn/dw-abc-extension-howto.txt" ++ for more Information. ++ ++UDP Hangup Support ++CONFIG_ISDN_WITH_ABC_UDP_CHECK_HANGUP ++ ++ Sorry no more Information! ++ ++ See "linux/Documentation/isdn/dw-abc-extension-howto.txt" ++ for more Information ++ ++UDP Dial Support ++CONFIG_ISDN_WITH_ABC_UDP_CHECK_DIAL ++ ++ Sorry no more Information! ++ ++ See "linux/Documentation/isdn/dw-abc-extension-howto.txt" ++ for more Information ++ ++Limit on the line frames to two ++CONFIG_ISDN_WITH_ABC_FRAME_LIMIT ++ ++ This Option enables support for sending only 2 Pakets on ++ the Fly to the ISDN Driver. It is very usefull when you ++ will use the new RAW-IP Compression. Because of sending ++ Only 2 Pakets on the Fly makes the risk of overflowing ++ the ISDN Driver very smaller. ++ ++ See "linux/Documentation/isdn/dw-abc-extension-howto.txt" ++ for more Information ++ ++Compression with RAWIP and X75I ++CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS ++ ++ With this Option you have the ability to make Datacompression ++ on RAW-IP Lines. It is function on HDLC and X75I Connection, ++ but the Prefered L2-Protocol for Compression is X75I because ++ the HDLC Protocol have no Errorcorrection. ++ ++ To Use this Option YOU MUST HAVE ENABLED THE OPTION: ++ Support synchronous PPP ++ and must load after loading the main isdndrivers the ++ Modul "isdn_bsdcomp". ++ ++ See "linux/Documentation/isdn/dw-abc-extension-howto.txt" ++ for more Information ++ +diff -rNu linux-2.4.29.old/drivers/isdn/Config.in linux-2.4.29/drivers/isdn/Config.in +--- linux-2.4.29.old/drivers/isdn/Config.in 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/Config.in 2005-03-22 15:06:44.259364336 +0100 +@@ -4,11 +4,9 @@ + + # only included if CONFIG_ISDN != n + +-define_bool CONFIG_ISDN_BOOL y + if [ "$CONFIG_INET" != "n" ]; then + bool ' Support synchronous PPP' CONFIG_ISDN_PPP + if [ "$CONFIG_ISDN_PPP" != "n" ]; then +- dep_bool ' PPP filtering for ISDN' CONFIG_IPPP_FILTER $CONFIG_FILTER + bool ' Use VJ-compression with synchronous PPP' CONFIG_ISDN_PPP_VJ + bool ' Support generic MP (RFC 1717)' CONFIG_ISDN_MPP + dep_tristate ' Support BSD compression' CONFIG_ISDN_PPP_BSDCOMP $CONFIG_ISDN +@@ -23,6 +21,30 @@ + fi + + mainmenu_option next_comment ++comment 'ISDN abc-dw-extension' ++bool 'Enable isdn-abc-dw-extension' CONFIG_ISDN_WITH_ABC ++if [ "$CONFIG_ISDN_WITH_ABC" != "n" ]; then ++ bool ' Use D-Channel-Callback with Channel in use check' CONFIG_ISDN_WITH_ABC_CALLB ++ bool ' Enable Outgoing-EAZ-Support' CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ bool ' Enable LCR-Support (need isdnlog)' CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ bool ' RX dont reset hanguptimeout' CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER ++ if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then ++ bool ' Enable UDP-Info-Support' CONFIG_ISDN_WITH_ABC_UDP_CHECK ++ if [ "$CONFIG_ISDN_WITH_ABC_UDP_CHECK" != "n" ]; then ++ bool ' Enable Hangup-Support with UDP-INFO' CONFIG_ISDN_WITH_ABC_UDP_CHECK_HANGUP ++ bool ' Enable Dial-Support with UDP-INFO' CONFIG_ISDN_WITH_ABC_UDP_CHECK_DIAL ++ fi ++ fi ++ ++ bool ' Skip channel if used external (dial only)' CONFIG_ISDN_WITH_ABC_CH_EXTINUSE ++ bool ' Support interface-auto-disable if config-error' CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ if [ "$CONFIG_ISDN_PPP" != "n" ]; then ++ bool ' Enable Compression with rawip and x75i' CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS ++ fi ++fi ++endmenu ++ ++mainmenu_option next_comment + comment 'ISDN feature submodules' + dep_tristate 'isdnloop support' CONFIG_ISDN_DRV_LOOP $CONFIG_ISDN + dep_tristate 'Support isdn diversion services' CONFIG_ISDN_DIVERSION $CONFIG_ISDN +@@ -34,7 +56,6 @@ + comment 'Passive ISDN cards' + dep_tristate 'HiSax SiemensChipSet driver support' CONFIG_ISDN_DRV_HISAX $CONFIG_ISDN + if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then +- define_bool CONFIG_ISDN_HISAX y + comment ' D-channel protocol features' + bool ' HiSax Support for EURO/DSS1' CONFIG_HISAX_EURO + if [ "$CONFIG_HISAX_EURO" != "n" ]; then +@@ -45,31 +66,28 @@ + fi + bool ' HiSax Support for german 1TR6' CONFIG_HISAX_1TR6 + bool ' HiSax Support for US NI1' CONFIG_HISAX_NI1 +- int ' Maximum number of cards supported by HiSax' CONFIG_HISAX_MAX_CARDS 8 + comment ' HiSax supported cards' +- if [ "$CONFIG_ISA" != "n" ]; then +- bool ' Teles 16.0/8.0' CONFIG_HISAX_16_0 +- bool ' Teles 16.3 or PNP or PCMCIA' CONFIG_HISAX_16_3 +- bool ' AVM A1 (Fritz)' CONFIG_HISAX_AVM_A1 +- bool ' ITK ix1-micro Revision 2' CONFIG_HISAX_IX1MICROR2 +- bool ' ASUSCOM ISA cards' CONFIG_HISAX_ASUSCOM +- bool ' TELEINT cards' CONFIG_HISAX_TELEINT +- bool ' HFC-S based cards' CONFIG_HISAX_HFCS +- bool ' USR Sportster internal TA' CONFIG_HISAX_SPORTSTER +- bool ' MIC card' CONFIG_HISAX_MIC +- bool ' Siemens I-Surf card' CONFIG_HISAX_ISURF +- bool ' HST Saphir card' CONFIG_HISAX_HSTSAPHIR +- fi ++ bool ' Teles 16.0/8.0' CONFIG_HISAX_16_0 ++ bool ' Teles 16.3 or PNP or PCMCIA' CONFIG_HISAX_16_3 + bool ' Teles PCI' CONFIG_HISAX_TELESPCI + bool ' Teles S0Box' CONFIG_HISAX_S0BOX ++ bool ' AVM A1 (Fritz)' CONFIG_HISAX_AVM_A1 + bool ' AVM PnP/PCI (Fritz!PnP/PCI)' CONFIG_HISAX_FRITZPCI + bool ' AVM A1 PCMCIA (Fritz)' CONFIG_HISAX_AVM_A1_PCMCIA + bool ' Elsa cards' CONFIG_HISAX_ELSA ++ bool ' ITK ix1-micro Revision 2' CONFIG_HISAX_IX1MICROR2 + bool ' Eicon.Diehl Diva cards' CONFIG_HISAX_DIEHLDIVA ++ bool ' ASUSCOM ISA cards' CONFIG_HISAX_ASUSCOM ++ bool ' TELEINT cards' CONFIG_HISAX_TELEINT ++ bool ' HFC-S based cards' CONFIG_HISAX_HFCS + bool ' Sedlbauer cards' CONFIG_HISAX_SEDLBAUER ++ bool ' USR Sportster internal TA' CONFIG_HISAX_SPORTSTER ++ bool ' MIC card' CONFIG_HISAX_MIC + bool ' NETjet card' CONFIG_HISAX_NETJET + bool ' NETspider U card' CONFIG_HISAX_NETJET_U + bool ' Niccy PnP/PCI card' CONFIG_HISAX_NICCY ++ bool ' Siemens I-Surf card' CONFIG_HISAX_ISURF ++ bool ' HST Saphir card' CONFIG_HISAX_HSTSAPHIR + bool ' Telekom A4T card' CONFIG_HISAX_BKM_A4T + bool ' Scitel Quadro card' CONFIG_HISAX_SCT_QUADRO + bool ' Gazel cards' CONFIG_HISAX_GAZEL +@@ -78,20 +96,27 @@ + bool ' HFC-S+, HFC-SP, HFC-PCMCIA cards' CONFIG_HISAX_HFC_SX + if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then + # bool ' TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU +- bool ' Formula-n enter:now PCI card' CONFIG_HISAX_ENTERNOW_PCI + if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then + bool ' Am7930' CONFIG_HISAX_AMD7930 + fi + fi + bool ' HiSax debugging' CONFIG_HISAX_DEBUG + +- dep_tristate 'Sedlbauer PCMCIA cards' CONFIG_HISAX_SEDLBAUER_CS $CONFIG_ISDN_DRV_HISAX $CONFIG_PCMCIA +- dep_tristate 'ELSA PCMCIA MicroLink cards' CONFIG_HISAX_ELSA_CS $CONFIG_ISDN_DRV_HISAX $CONFIG_PCMCIA +- dep_tristate 'AVM A1 PCMCIA cards' CONFIG_HISAX_AVM_A1_CS $CONFIG_ISDN_DRV_HISAX $CONFIG_PCMCIA $CONFIG_HISAX_AVM_A1_PCMCIA +- dep_tristate 'ST5481 USB ISDN modem (EXPERIMENTAL)' CONFIG_HISAX_ST5481 $CONFIG_ISDN_DRV_HISAX $CONFIG_EXPERIMENTAL +- dep_tristate 'AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_PCIPNP $CONFIG_ISDN_DRV_HISAX $CONFIG_EXPERIMENTAL +- dep_tristate 'Auerswald devices ISDN support' CONFIG_USB_AUERISDN $CONFIG_ISDN_DRV_HISAX ++ dep_tristate 'Sedlbauer PCMCIA cards' CONFIG_HISAX_SEDLBAUER_CS $CONFIG_PCMCIA ++ dep_tristate 'ELSA PCMCIA MicroLink cards' CONFIG_HISAX_ELSA_CS $CONFIG_PCMCIA ++ dep_tristate 'Colognechip HFC-USB support' CONFIG_HISAX_HFC_USB_CS $CONFIG_HISAX $CONFIG_USB ++ dep_tristate 'ST5481 USB ISDN modem (EXPERIMENTAL)' CONFIG_HISAX_ST5481 $CONFIG_HISAX $CONFIG_USB $CONFIG_EXPERIMENTAL ++ dep_tristate 'Fritz!PCIv2 support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_PCIPNP $CONFIG_HISAX $CONFIG_EXPERIMENTAL + ++ if [ "$CONFIG_HISAX_SEDLBAUER_CS" != "n" ]; then ++ define_bool CONFIG_HISAX_SEDLBAUER y ++ fi ++ if [ "$CONFIG_HISAX_ELSA_CS" != "n" ]; then ++ define_bool CONFIG_HISAX_ELSA y ++ fi ++ if [ "$CONFIG_HISAX_HFC_USB_CS" != "n" ]; then ++ define_bool CONFIG_HISAX_HFC_USB y ++ fi + fi + endmenu + +diff -rNu linux-2.4.29.old/drivers/isdn/Makefile linux-2.4.29/drivers/isdn/Makefile +--- linux-2.4.29.old/drivers/isdn/Makefile 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/Makefile 2005-03-22 15:06:44.277361600 +0100 +@@ -2,7 +2,7 @@ + + # The target object and module list name. + +-O_TARGET := vmlinux-obj.o ++O_TARGET := isdn.a + + # Objects that export symbols. + +@@ -32,9 +32,9 @@ + + # Object files in subdirectories + +-mod-subdirs := avmb1 eicon hisax ++mod-subdirs := avmb1 eicon + subdir-$(CONFIG_ISDN_DIVERSION) += divert +-subdir-$(CONFIG_ISDN_HISAX) += hisax ++subdir-$(CONFIG_ISDN_DRV_HISAX) += hisax + subdir-$(CONFIG_ISDN_DRV_ICN) += icn + subdir-$(CONFIG_ISDN_DRV_PCBIT) += pcbit + subdir-$(CONFIG_ISDN_DRV_SC) += sc +diff -rNu linux-2.4.29.old/drivers/isdn/act2000/act2000.h linux-2.4.29/drivers/isdn/act2000/act2000.h +--- linux-2.4.29.old/drivers/isdn/act2000/act2000.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/act2000/act2000.h 2005-03-22 15:06:44.103388048 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: act2000.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id$ + * + * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000. + * +@@ -178,19 +178,19 @@ + char regname[35]; /* Name used for request_region */ + } act2000_card; + +-static inline void act2000_schedule_tx(act2000_card *card) ++extern __inline__ void act2000_schedule_tx(act2000_card *card) + { + queue_task(&card->snd_tq, &tq_immediate); + mark_bh(IMMEDIATE_BH); + } + +-static inline void act2000_schedule_rx(act2000_card *card) ++extern __inline__ void act2000_schedule_rx(act2000_card *card) + { + queue_task(&card->rcv_tq, &tq_immediate); + mark_bh(IMMEDIATE_BH); + } + +-static inline void act2000_schedule_poll(act2000_card *card) ++extern __inline__ void act2000_schedule_poll(act2000_card *card) + { + queue_task(&card->poll_tq, &tq_immediate); + mark_bh(IMMEDIATE_BH); +diff -rNu linux-2.4.29.old/drivers/isdn/act2000/act2000_isa.c linux-2.4.29/drivers/isdn/act2000/act2000_isa.c +--- linux-2.4.29.old/drivers/isdn/act2000/act2000_isa.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/act2000/act2000_isa.c 2005-03-22 15:06:44.135383184 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: act2000_isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id$ + * + * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000 (ISA-Version). + * +@@ -178,8 +178,7 @@ + card->flags &= ~ACT2000_FLAGS_PVALID; + } + if (!check_region(portbase, ISA_REGION)) { +- if (request_region(portbase, ACT2000_PORTLEN, card->regname) == NULL) +- return -EIO; ++ request_region(portbase, ACT2000_PORTLEN, card->regname); + card->port = portbase; + card->flags |= ACT2000_FLAGS_PVALID; + return 0; +@@ -341,6 +340,9 @@ + while (skb->len) { + if (act2000_isa_writeb(card, *(skb->data))) { + /* Fifo is full, but more data to send */ ++#if 0 ++ printk(KERN_DEBUG "act2000_isa_send: %d bytes\n", l); ++#endif + test_and_clear_bit(ACT2000_LOCK_TX, (void *) &card->ilock); + /* Schedule myself */ + act2000_schedule_tx(card); +@@ -363,6 +365,9 @@ + } else + dev_kfree_skb(skb); + card->sbuf = NULL; ++#if 0 ++ printk(KERN_DEBUG "act2000_isa_send: %d bytes\n", l); ++#endif + } + } + +diff -rNu linux-2.4.29.old/drivers/isdn/act2000/act2000_isa.h linux-2.4.29/drivers/isdn/act2000/act2000_isa.h +--- linux-2.4.29.old/drivers/isdn/act2000/act2000_isa.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/act2000/act2000_isa.h 2005-03-22 15:06:44.152380600 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: act2000_isa.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id$ + * + * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000 (ISA-Version). + * +diff -rNu linux-2.4.29.old/drivers/isdn/act2000/capi.c linux-2.4.29/drivers/isdn/act2000/capi.c +--- linux-2.4.29.old/drivers/isdn/act2000/capi.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/act2000/capi.c 2005-03-22 15:06:44.172377560 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capi.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id$ + * + * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000. + * CAPI encoder/decoder +@@ -76,6 +76,10 @@ + {{ 0x84, 0x03}, "DISCONNECT_B3_RESP"}, + {{ 0x86, 0x03}, "DATA_B3_RESP"}, + {{ 0xff, 0x03}, "MANUFACTURER_RESP"}, ++#if 0 ++/* CAPI 2.0 */ ++ {{ 0x05, 0x80}, "LISTEN_REQ (CAPI 2.0)"}, ++#endif + #endif + {{ 0x00, 0x00}, NULL}, + }; +diff -rNu linux-2.4.29.old/drivers/isdn/act2000/capi.h linux-2.4.29/drivers/isdn/act2000/capi.h +--- linux-2.4.29.old/drivers/isdn/act2000/capi.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/act2000/capi.h 2005-03-22 15:06:44.187375280 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capi.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id$ + * + * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000. + * +@@ -294,6 +294,19 @@ + __u16 plci; + __u16 info; + } select_b3_protocol_conf; ++#if 0 ++ struct listen_req { ++ __u32 controller; ++ __u32 infomask; ++ __u32 cipmask; ++ __u32 cipmask2; ++ __u16 dummy; /* 2 Length-bytes of 2 Structs MUST always be 0!!! */ ++ } listen_req; ++ struct listen_conf { ++ __u32 controller; ++ __u16 info; ++ } listen_conf; ++#else + struct listen_req { + __u8 controller; + __u32 infomask __attribute__ ((packed)); +@@ -304,6 +317,7 @@ + __u8 controller; + __u16 info __attribute__ ((packed)); + } listen_conf; ++#endif + struct data_b3_req { + __u16 fakencci; + __u16 datalen; +@@ -330,7 +344,7 @@ + } msg; + } actcapi_msg; + +-static inline unsigned short ++extern __inline__ unsigned short + actcapi_nextsmsg(act2000_card *card) + { + unsigned long flags; +diff -rNu linux-2.4.29.old/drivers/isdn/act2000/module.c linux-2.4.29/drivers/isdn/act2000/module.c +--- linux-2.4.29.old/drivers/isdn/act2000/module.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/act2000/module.c 2005-03-22 15:06:44.202373000 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: module.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id$ + * + * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000. + * +@@ -630,6 +630,10 @@ + card->interface.features = + ISDN_FEATURE_L2_X75I | + ISDN_FEATURE_L2_HDLC | ++#if 0 ++/* Not yet! New Firmware is on the way ... */ ++ ISDN_FEATURE_L2_TRANS | ++#endif + ISDN_FEATURE_L3_TRANS | + ISDN_FEATURE_P_UNKNOWN; + card->interface.hl_hdrlen = 20; +@@ -843,6 +847,39 @@ + } + printk(KERN_INFO "%s unloaded\n", DRIVERNAME); + } ++#if 0 ++#ifndef MODULE ++void ++act2000_setup(char *str, int *ints) ++{ ++ int i, j, argc, port, irq, bus; ++ ++ argc = ints[0]; ++ i = 1; ++ if (argc) ++ while (argc) { ++ port = irq = -1; ++ bus = 0; ++ if (argc) { ++ bus = ints[i]; ++ i++; ++ argc--; ++ } ++ if (argc) { ++ port = ints[i]; ++ i++; ++ argc--; ++ } ++ if (argc) { ++ irq = ints[i]; ++ i++; ++ argc--; ++ } ++ act2000_addcard(bus, port, irq, act_id); ++ } ++} ++#endif ++#endif + + module_init(act2000_init); + module_exit(act2000_exit); +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/avm_cs.c linux-2.4.29/drivers/isdn/avmb1/avm_cs.c +--- linux-2.4.29.old/drivers/isdn/avmb1/avm_cs.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/avm_cs.c 2005-03-22 15:06:44.696297912 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: avm_cs.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: avm_cs.c,v 1.6 2001/09/24 13:22:44 kai Exp $ + * + * A PCMCIA client driver for AVM B1/M1/M2 + * +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/avmcard.h linux-2.4.29/drivers/isdn/avmb1/avmcard.h +--- linux-2.4.29.old/drivers/isdn/avmb1/avmcard.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/avmcard.h 2005-03-22 15:06:44.711295632 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: avmcard.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: avmcard.h,v 1.12 2001/09/24 13:22:44 kai Exp $ + * + * Copyright 1999 by Carsten Paeth <calle@calle.de> + * +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1.c linux-2.4.29/drivers/isdn/avmb1/b1.c +--- linux-2.4.29.old/drivers/isdn/avmb1/b1.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/b1.c 2005-03-22 15:06:44.733292288 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: b1.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: b1.c,v 1.26 2001/09/24 13:22:44 kai Exp $ + * + * Common module for AVM B1 cards. + * +@@ -20,6 +20,7 @@ + #include <linux/kernelcapi.h> + #include <asm/io.h> + #include <linux/init.h> ++#include <linux/isdn_compat.h> + #include <asm/uaccess.h> + #include <linux/netdevice.h> + #include "capilli.h" +@@ -27,7 +28,7 @@ + #include "capicmd.h" + #include "capiutil.h" + +-static char *revision = "$Revision: 1.1.4.1 $"; ++static char *revision = "$Revision: 1.26 $"; + + /* ------------------------------------------------------------- */ + +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1dma.c linux-2.4.29/drivers/isdn/avmb1/b1dma.c +--- linux-2.4.29.old/drivers/isdn/avmb1/b1dma.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/b1dma.c 2005-03-22 15:06:44.750289704 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: b1dma.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: b1dma.c,v 1.18 2001/09/24 13:22:44 kai Exp $ + * + * Common module for AVM B1 cards that support dma with AMCC + * +@@ -21,6 +21,7 @@ + #include <linux/kernelcapi.h> + #include <asm/io.h> + #include <linux/init.h> ++#include <linux/isdn_compat.h> + #include <asm/uaccess.h> + #include <linux/netdevice.h> + #include "capilli.h" +@@ -28,7 +29,11 @@ + #include "capicmd.h" + #include "capiutil.h" + +-static char *revision = "$Revision: 1.1.4.1 $"; ++#if BITS_PER_LONG != 32 ++#error FIXME: driver requires 32-bit platform ++#endif ++ ++static char *revision = "$Revision: 1.18 $"; + + /* ------------------------------------------------------------- */ + +@@ -851,7 +856,7 @@ + __u8 flag; + int len = 0; + char *s; +- u_long txaddr, txlen, rxaddr, rxlen, csr; ++ __u32 txaddr, txlen, rxaddr, rxlen, csr; + + len += sprintf(page+len, "%-16s %s\n", "name", card->name); + len += sprintf(page+len, "%-16s 0x%x\n", "io", card->port); +@@ -907,12 +912,12 @@ + save_flags(flags); + cli(); + +- txaddr = (u_long)phys_to_virt(b1dmainmeml(card->mbase+0x2c)); +- txaddr -= (u_long)card->dma->sendbuf; ++ txaddr = (__u32)phys_to_virt(b1dmainmeml(card->mbase+0x2c)); ++ txaddr -= (__u32)card->dma->sendbuf; + txlen = b1dmainmeml(card->mbase+0x30); + +- rxaddr = (u_long)phys_to_virt(b1dmainmeml(card->mbase+0x24)); +- rxaddr -= (u_long)card->dma->recvbuf; ++ rxaddr = (__u32)phys_to_virt(b1dmainmeml(card->mbase+0x24)); ++ rxaddr -= (__u32)card->dma->recvbuf; + rxlen = b1dmainmeml(card->mbase+0x28); + + csr = b1dmainmeml(card->mbase+AMCC_INTCSR); +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1isa.c linux-2.4.29/drivers/isdn/avmb1/b1isa.c +--- linux-2.4.29.old/drivers/isdn/avmb1/b1isa.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/b1isa.c 2005-03-22 15:06:44.766287272 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: b1isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: b1isa.c,v 1.14 2001/09/24 13:22:44 kai Exp $ + * + * Module for AVM B1 ISA-card. + * +@@ -19,12 +19,13 @@ + #include <linux/capi.h> + #include <linux/init.h> + #include <asm/io.h> ++#include <linux/isdn_compat.h> + #include "capicmd.h" + #include "capiutil.h" + #include "capilli.h" + #include "avmcard.h" + +-static char *revision = "$Revision: 1.1.4.1 $"; ++static char *revision = "$Revision: 1.14 $"; + + /* ------------------------------------------------------------- */ + +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1pci.c linux-2.4.29/drivers/isdn/avmb1/b1pci.c +--- linux-2.4.29.old/drivers/isdn/avmb1/b1pci.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/b1pci.c 2005-03-22 15:06:44.781284992 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: b1pci.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: b1pci.c,v 1.40 2001/09/24 13:22:44 kai Exp $ + * + * Module for AVM B1 PCI-card. + * +@@ -21,21 +21,24 @@ + #include <linux/capi.h> + #include <asm/io.h> + #include <linux/init.h> ++#include <linux/isdn_compat.h> + #include "capicmd.h" + #include "capiutil.h" + #include "capilli.h" + #include "avmcard.h" + +-static char *revision = "$Revision: 1.1.4.1 $"; ++static char *revision = "$Revision: 1.40 $"; + + /* ------------------------------------------------------------- */ + ++#ifndef COMPAT_HAS_2_2_PCI + static struct pci_device_id b1pci_pci_tbl[] __initdata = { + { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_B1, PCI_ANY_ID, PCI_ANY_ID }, + { } /* Terminating entry */ + }; + + MODULE_DEVICE_TABLE(pci, b1pci_pci_tbl); ++#endif + MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM B1 PCI card"); + MODULE_AUTHOR("Carsten Paeth"); + MODULE_LICENSE("GPL"); +@@ -416,14 +419,14 @@ + } + param.irq = dev->irq; + +- if (pci_resource_start(dev, 2)) { /* B1 PCI V4 */ ++ if (pci_resource_start_io(dev, 2)) { /* B1 PCI V4 */ + #ifdef CONFIG_ISDN_DRV_AVMB1_B1PCIV4 + driver = &b1pciv4_driver; + + pci_set_master(dev); + #endif +- param.membase = pci_resource_start(dev, 0); +- param.port = pci_resource_start(dev, 2); ++ param.membase = pci_resource_start_mem(dev, 0); ++ param.port = pci_resource_start_io(dev, 2); + + printk(KERN_INFO + "%s: PCI BIOS reports AVM-B1 V4 at i/o %#x, irq %d, mem %#x\n", +@@ -440,7 +443,7 @@ + } + } else { + param.membase = 0; +- param.port = pci_resource_start(dev, 1); ++ param.port = pci_resource_start_io(dev, 1); + + printk(KERN_INFO + "%s: PCI BIOS reports AVM-B1 at i/o %#x, irq %d\n", +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/b1pcmcia.c linux-2.4.29/drivers/isdn/avmb1/b1pcmcia.c +--- linux-2.4.29.old/drivers/isdn/avmb1/b1pcmcia.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/b1pcmcia.c 2005-03-22 15:06:44.796282712 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: b1pcmcia.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: b1pcmcia.c,v 1.17 2001/09/24 13:22:44 kai Exp $ + * + * Module for AVM B1/M1/M2 PCMCIA-card. + * +@@ -25,7 +25,7 @@ + #include "capilli.h" + #include "avmcard.h" + +-static char *revision = "$Revision: 1.1.4.1 $"; ++static char *revision = "$Revision: 1.17 $"; + + /* ------------------------------------------------------------- */ + +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/c4.c linux-2.4.29/drivers/isdn/avmb1/c4.c +--- linux-2.4.29.old/drivers/isdn/avmb1/c4.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/c4.c 2005-03-22 15:06:44.812280280 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: c4.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: c4.c,v 1.38 2001/09/24 13:22:44 kai Exp $ + * + * Module for AVM C4 & C2 card. + * +@@ -18,6 +18,7 @@ + #include <linux/interrupt.h> + #include <linux/ioport.h> + #include <linux/pci.h> ++#include <linux/isdn_compat.h> + #include <linux/capi.h> + #include <linux/kernelcapi.h> + #include <linux/init.h> +@@ -29,7 +30,7 @@ + #include "capilli.h" + #include "avmcard.h" + +-static char *revision = "$Revision: 1.1.4.1 $"; ++static char *revision = "$Revision: 1.38 $"; + + #undef CONFIG_C4_DEBUG + #undef CONFIG_C4_POLLDEBUG +@@ -38,6 +39,7 @@ + + static int suppress_pollack; + ++#ifndef COMPAT_HAS_2_2_PCI + static struct pci_device_id c4_pci_tbl[] __initdata = { + { PCI_VENDOR_ID_DEC,PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C4 }, + { PCI_VENDOR_ID_DEC,PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C2 }, +@@ -45,6 +47,7 @@ + }; + + MODULE_DEVICE_TABLE(pci, c4_pci_tbl); ++#endif + MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM C2/C4 cards"); + MODULE_AUTHOR("Carsten Paeth"); + MODULE_LICENSE("GPL"); +@@ -1328,9 +1331,9 @@ + } + pci_set_master(dev); + +- param.port = pci_resource_start(dev, 1); ++ param.port = pci_resource_start_io(dev, 1); + param.irq = dev->irq; +- param.membase = pci_resource_start(dev, 0); ++ param.membase = pci_resource_start_mem(dev, 0); + + printk(KERN_INFO + "%s: PCI BIOS reports AVM-C%d at i/o %#x, irq %d, mem %#x\n", +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capi.c linux-2.4.29/drivers/isdn/avmb1/capi.c +--- linux-2.4.29.old/drivers/isdn/avmb1/capi.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/capi.c 2005-03-22 15:06:44.849274656 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capi.c,v 1.1.4.2 2001/12/09 18:45:13 kai Exp $ ++/* $Id: capi.c,v 1.59 2001/11/07 22:35:48 kai Exp $ + * + * CAPI 2.0 Interface for Linux + * +@@ -23,6 +23,7 @@ + #include <linux/smp_lock.h> + #include <linux/timer.h> + #include <linux/wait.h> ++#include <linux/isdn_compat.h> + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE + #include <linux/tty.h> + #ifdef CONFIG_PPP +@@ -30,6 +31,9 @@ + #include <linux/ppp_defs.h> + #include <linux/if_ppp.h> + #undef CAPI_PPP_ON_RAW_DEVICE ++#ifdef CAPI_PPP_ON_RAW_DEVICE ++#include <linux/ppp_channel.h> ++#endif /* CAPI_PPP_ON_RAW_DEVICE */ + #endif /* CONFIG_PPP */ + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ + #include <linux/skbuff.h> +@@ -38,14 +42,16 @@ + #include <linux/capi.h> + #include <linux/kernelcapi.h> + #include <linux/init.h> ++#ifdef HAVE_DEVFS_FS + #include <linux/devfs_fs_kernel.h> ++#endif /* HAVE_DEVFS_FS */ + #include "capiutil.h" + #include "capicmd.h" + #if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE) + #include "capifs.h" + #endif + +-static char *revision = "$Revision: 1.1.4.2 $"; ++static char *revision = "$Revision: 1.59 $"; + + MODULE_DESCRIPTION("CAPI4Linux: Userspace /dev/capi20 interface"); + MODULE_AUTHOR("Carsten Paeth"); +@@ -87,10 +93,10 @@ + struct capincci *nccip; + unsigned int minor; + +- u16 applid; +- u32 ncci; +- u16 datahandle; +- u16 msgid; ++ __u16 applid; ++ __u32 ncci; ++ __u16 datahandle; ++ __u16 msgid; + + struct file *file; + struct tty_struct *tty; +@@ -112,16 +118,22 @@ + /* transmit path */ + struct datahandle_queue { + struct datahandle_queue *next; +- u16 datahandle; ++ __u16 datahandle; + } *ackqueue; + int nack; + ++#ifdef CAPI_PPP_ON_RAW_DEVICE ++ /* interface to generic ppp layer */ ++ struct ppp_channel chan; ++ int chan_connected; ++ int chan_index; ++#endif + }; + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ + + struct capincci { + struct capincci *next; +- u32 ncci; ++ __u32 ncci; + struct capidev *cdev; + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE + struct capiminor *minorp; +@@ -131,8 +143,8 @@ + struct capidev { + struct capidev *next; + struct file *file; +- u16 applid; +- u16 errcode; ++ __u16 applid; ++ __u16 errcode; + unsigned int minor; + unsigned userflags; + +@@ -156,22 +168,28 @@ + static struct capiminor *minors = 0; + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ + ++#ifdef COMPAT_HAS_kmem_cache + static kmem_cache_t *capidev_cachep = 0; + static kmem_cache_t *capincci_cachep = 0; + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE + static kmem_cache_t *capiminor_cachep = 0; + static kmem_cache_t *capidh_cachep = 0; + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ ++#endif + + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE + /* -------- datahandles --------------------------------------------- */ + +-static int capincci_add_ack(struct capiminor *mp, u16 datahandle) ++int capincci_add_ack(struct capiminor *mp, __u16 datahandle) + { + struct datahandle_queue *n, **pp; + + n = (struct datahandle_queue *) ++#ifdef COMPAT_HAS_kmem_cache + kmem_cache_alloc(capidh_cachep, GFP_ATOMIC); ++#else ++ kmalloc(sizeof(struct datahandle_queue), GFP_ATOMIC); ++#endif + if (!n) { + printk(KERN_ERR "capi: alloc datahandle failed\n"); + return -1; +@@ -184,7 +202,7 @@ + return 0; + } + +-static int capiminor_del_ack(struct capiminor *mp, u16 datahandle) ++int capiminor_del_ack(struct capiminor *mp, __u16 datahandle) + { + struct datahandle_queue **pp, *p; + +@@ -192,7 +210,11 @@ + if ((*pp)->datahandle == datahandle) { + p = *pp; + *pp = (*pp)->next; ++#ifdef COMPAT_HAS_kmem_cache + kmem_cache_free(capidh_cachep, p); ++#else ++ kfree(p); ++#endif + mp->nack--; + return 0; + } +@@ -200,7 +222,7 @@ + return -1; + } + +-static void capiminor_del_all_ack(struct capiminor *mp) ++void capiminor_del_all_ack(struct capiminor *mp) + { + struct datahandle_queue **pp, *p; + +@@ -208,7 +230,11 @@ + while (*pp) { + p = *pp; + *pp = (*pp)->next; ++#ifdef COMPAT_HAS_kmem_cache + kmem_cache_free(capidh_cachep, p); ++#else ++ kfree(p); ++#endif + mp->nack--; + } + } +@@ -216,13 +242,17 @@ + + /* -------- struct capiminor ---------------------------------------- */ + +-static struct capiminor *capiminor_alloc(u16 applid, u32 ncci) ++struct capiminor *capiminor_alloc(__u16 applid, __u32 ncci) + { + struct capiminor *mp, **pp; + unsigned int minor = 0; + + MOD_INC_USE_COUNT; ++#ifdef COMPAT_HAS_kmem_cache + mp = (struct capiminor *)kmem_cache_alloc(capiminor_cachep, GFP_ATOMIC); ++#else ++ mp = (struct capiminor *)kmalloc(sizeof(struct capiminor), GFP_ATOMIC); ++#endif + if (!mp) { + MOD_DEC_USE_COUNT; + printk(KERN_ERR "capi: can't alloc capiminor\n"); +@@ -257,7 +287,7 @@ + return mp; + } + +-static void capiminor_free(struct capiminor *mp) ++void capiminor_free(struct capiminor *mp) + { + struct capiminor **pp; + +@@ -271,7 +301,11 @@ + skb_queue_purge(&mp->inqueue); + skb_queue_purge(&mp->outqueue); + capiminor_del_all_ack(mp); ++#ifdef COMPAT_HAS_kmem_cache + kmem_cache_free(capiminor_cachep, mp); ++#else ++ kfree(mp); ++#endif + MOD_DEC_USE_COUNT; + #ifdef _DEBUG_REFCOUNT + printk(KERN_DEBUG "capiminor_free %d\n", GET_USE_COUNT(THIS_MODULE)); +@@ -283,7 +317,7 @@ + } + } + +-static struct capiminor *capiminor_find(unsigned int minor) ++struct capiminor *capiminor_find(unsigned int minor) + { + struct capiminor *p; + for (p = minors; p && p->minor != minor; p = p->next) +@@ -294,7 +328,7 @@ + + /* -------- struct capincci ----------------------------------------- */ + +-static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci) ++static struct capincci *capincci_alloc(struct capidev *cdev, __u32 ncci) + { + struct capincci *np, **pp; + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE +@@ -302,7 +336,11 @@ + kdev_t kdev; + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ + ++#ifdef COMPAT_HAS_kmem_cache + np = (struct capincci *)kmem_cache_alloc(capincci_cachep, GFP_ATOMIC); ++#else ++ np = (struct capincci *)kmalloc(sizeof(struct capincci), GFP_ATOMIC); ++#endif + if (!np) + return 0; + memset(np, 0, sizeof(struct capincci)); +@@ -331,7 +369,7 @@ + return np; + } + +-static void capincci_free(struct capidev *cdev, u32 ncci) ++static void capincci_free(struct capidev *cdev, __u32 ncci) + { + struct capincci *np, **pp; + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE +@@ -367,7 +405,11 @@ + } + } + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ ++#ifdef COMPAT_HAS_kmem_cache + kmem_cache_free(capincci_cachep, np); ++#else ++ kfree(np); ++#endif + if (*pp == 0) return; + } else { + pp = &(*pp)->next; +@@ -375,7 +417,7 @@ + } + } + +-static struct capincci *capincci_find(struct capidev *cdev, u32 ncci) ++struct capincci *capincci_find(struct capidev *cdev, __u32 ncci) + { + struct capincci *p; + +@@ -393,7 +435,11 @@ + struct capidev *cdev; + struct capidev **pp; + ++#ifdef COMPAT_HAS_kmem_cache + cdev = (struct capidev *)kmem_cache_alloc(capidev_cachep, GFP_KERNEL); ++#else ++ cdev = (struct capidev *)kmalloc(sizeof(struct capidev), GFP_KERNEL); ++#endif + if (!cdev) + return 0; + memset(cdev, 0, sizeof(struct capidev)); +@@ -423,10 +469,14 @@ + if (*pp) + *pp = cdev->next; + ++#ifdef COMPAT_HAS_kmem_cache + kmem_cache_free(capidev_cachep, cdev); ++#else ++ kfree(cdev); ++#endif + } + +-static struct capidev *capidev_find(u16 applid) ++static struct capidev *capidev_find(__u16 applid) + { + struct capidev *p; + for (p=capidev_openlist; p; p = p->next) { +@@ -439,13 +489,13 @@ + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE + /* -------- handle data queue --------------------------------------- */ + +-static struct sk_buff * ++struct sk_buff * + gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb) + { + struct sk_buff *nskb; + nskb = alloc_skb(CAPI_DATA_B3_RESP_LEN, GFP_ATOMIC); + if (nskb) { +- u16 datahandle = CAPIMSG_U16(skb->data,CAPIMSG_BASELEN+4+4+2); ++ __u16 datahandle = CAPIMSG_U16(skb->data,CAPIMSG_BASELEN+4+4+2); + unsigned char *s = skb_put(nskb, CAPI_DATA_B3_RESP_LEN); + capimsg_setu16(s, 0, CAPI_DATA_B3_RESP_LEN); + capimsg_setu16(s, 2, mp->applid); +@@ -458,11 +508,11 @@ + return nskb; + } + +-static int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb) ++int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb) + { + struct sk_buff *nskb; + unsigned int datalen; +- u16 errcode, datahandle; ++ __u16 errcode, datahandle; + + datalen = skb->len - CAPIMSG_LEN(skb->data); + if (mp->tty) { +@@ -504,6 +554,28 @@ + kfree_skb(skb); + return 0; + ++#ifdef CAPI_PPP_ON_RAW_DEVICE ++ } else if (mp->chan_connected) { ++ if ((nskb = gen_data_b3_resp_for(mp, skb)) == 0) { ++ printk(KERN_ERR "capi: gen_data_b3_resp failed\n"); ++ return -1; ++ } ++ datahandle = CAPIMSG_U16(skb->data,CAPIMSG_BASELEN+4); ++ errcode = (*capifuncs->capi_put_message)(mp->applid, nskb); ++ if (errcode != CAPI_NOERROR) { ++ printk(KERN_ERR "capi: send DATA_B3_RESP failed=%x\n", ++ errcode); ++ kfree_skb(nskb); ++ return -1; ++ } ++ (void)skb_pull(skb, CAPIMSG_LEN(skb->data)); ++#ifdef _DEBUG_DATAFLOW ++ printk(KERN_DEBUG "capi: DATA_B3_RESP %u len=%d => ppp\n", ++ datahandle, skb->len); ++#endif ++ ppp_input(&mp->chan, skb); ++ return 0; ++#endif + } else if (mp->file) { + if (skb_queue_len(&mp->recvqueue) > CAPINC_MAX_RECVQUEUE) { + #if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS) +@@ -538,7 +610,7 @@ + return -1; + } + +-static void handle_minor_recv(struct capiminor *mp) ++void handle_minor_recv(struct capiminor *mp) + { + struct sk_buff *skb; + while ((skb = skb_dequeue(&mp->inqueue)) != 0) { +@@ -552,13 +624,13 @@ + } + } + +-static int handle_minor_send(struct capiminor *mp) ++int handle_minor_send(struct capiminor *mp) + { + struct sk_buff *skb; +- u16 len; ++ __u16 len; + int count = 0; +- u16 errcode; +- u16 datahandle; ++ __u16 errcode; ++ __u16 datahandle; + + if (mp->tty && mp->ttyoutstop) { + #if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS) +@@ -569,7 +641,7 @@ + + while ((skb = skb_dequeue(&mp->outqueue)) != 0) { + datahandle = mp->datahandle; +- len = (u16)skb->len; ++ len = (__u16)skb->len; + skb_push(skb, CAPI_DATA_B3_REQ_LEN); + memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN); + capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN); +@@ -578,7 +650,7 @@ + capimsg_setu8 (skb->data, 5, CAPI_REQ); + capimsg_setu16(skb->data, 6, mp->msgid++); + capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */ +- capimsg_setu32(skb->data, 12, (u32) skb->data); /* Data32 */ ++ capimsg_setu32(skb->data, 12, (__u32) skb->data); /* Data32 */ + capimsg_setu16(skb->data, 16, len); /* Data length */ + capimsg_setu16(skb->data, 18, datahandle); + capimsg_setu16(skb->data, 20, 0); /* Flags */ +@@ -620,16 +692,16 @@ + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ + /* -------- function called by lower level -------------------------- */ + +-static void capi_signal(u16 applid, void *param) ++static void capi_signal(__u16 applid, void *param) + { + struct capidev *cdev = (struct capidev *)param; + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE + struct capiminor *mp; +- u16 datahandle; ++ __u16 datahandle; + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ + struct capincci *np; + struct sk_buff *skb = 0; +- u32 ncci; ++ __u32 ncci; + + (void) (*capifuncs->capi_get_message) (applid, &skb); + if (!skb) { +@@ -683,6 +755,12 @@ + #endif + kfree_skb(skb); + (void)capiminor_del_ack(mp, datahandle); ++#ifdef CAPI_PPP_ON_RAW_DEVICE ++ if (mp->chan_connected) { ++ ppp_output_wakeup(&mp->chan); ++ return; ++ } ++#endif + if (mp->tty) { + if (mp->tty->ldisc.write_wakeup) + mp->tty->ldisc.write_wakeup(mp->tty); +@@ -758,7 +836,7 @@ + struct capidev *cdev = (struct capidev *)file->private_data; + struct sk_buff *skb; + int retval; +- u16 mlen; ++ __u16 mlen; + + if (ppos != &file->f_pos) + return -ESPIPE; +@@ -998,7 +1076,7 @@ + sizeof(ncci)); + if (retval) + return -EFAULT; +- nccip = capincci_find(cdev, (u32) ncci); ++ nccip = capincci_find(cdev, (__u32) ncci); + if (!nccip) + return 0; + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE +@@ -1023,7 +1101,7 @@ + sizeof(ncci)); + if (retval) + return -EFAULT; +- nccip = capincci_find(cdev, (u32) ncci); ++ nccip = capincci_find(cdev, (__u32) ncci); + if (!nccip || (mp = nccip->minorp) == 0) + return -ESRCH; + return mp->minor; +@@ -1070,7 +1148,9 @@ + + static struct file_operations capi_fops = + { ++#ifdef COMPAT_HAS_FILEOP_OWNER + owner: THIS_MODULE, ++#endif + llseek: no_llseek, + read: capi_read, + write: capi_write, +@@ -1233,6 +1313,45 @@ + return -EINVAL; + + switch (cmd) { ++#ifdef CAPI_PPP_ON_RAW_DEVICE ++ case PPPIOCATTACH: ++ { ++ int retval, val; ++ if (get_user(val, (int *) arg)) ++ break; ++ if (mp->chan_connected) ++ return -EALREADY; ++ mp->chan.private = mp; ++#if 1 ++ return -EINVAL; ++#else ++ mp->chan.ops = &ppp_ops; ++#endif ++ ++ retval = ppp_register_channel(&mp->chan, val); ++ if (retval) ++ return retval; ++ mp->chan_connected = 1; ++ mp->chan_index = val; ++ } ++ return 0; ++ case PPPIOCDETACH: ++ { ++ if (!mp->chan_connected) ++ return -ENXIO; ++ ppp_unregister_channel(&mp->chan); ++ mp->chan_connected = 0; ++ } ++ return 0; ++ case PPPIOCGUNIT: ++ { ++ if (!mp->chan_connected) ++ return -ENXIO; ++ if (put_user(mp->chan_index, (int *) arg)) ++ return -EFAULT; ++ } ++ return 0; ++#endif + } + return -EINVAL; + } +@@ -1260,7 +1379,9 @@ + + static struct file_operations capinc_raw_fops = + { ++#ifdef COMPAT_HAS_FILEOP_OWNER + owner: THIS_MODULE, ++#endif + llseek: no_llseek, + read: capinc_raw_read, + write: capinc_raw_write, +@@ -1272,7 +1393,7 @@ + + /* -------- tty_operations for capincci ----------------------------- */ + +-static int capinc_tty_open(struct tty_struct * tty, struct file * file) ++int capinc_tty_open(struct tty_struct * tty, struct file * file) + { + struct capiminor *mp; + +@@ -1300,7 +1421,7 @@ + return 0; + } + +-static void capinc_tty_close(struct tty_struct * tty, struct file * file) ++void capinc_tty_close(struct tty_struct * tty, struct file * file) + { + struct capiminor *mp; + +@@ -1325,8 +1446,8 @@ + #endif + } + +-static int capinc_tty_write(struct tty_struct * tty, int from_user, +- const unsigned char *buf, int count) ++int capinc_tty_write(struct tty_struct * tty, int from_user, ++ const unsigned char *buf, int count) + { + struct capiminor *mp = (struct capiminor *)tty->driver_data; + struct sk_buff *skb; +@@ -1377,7 +1498,7 @@ + return count; + } + +-static void capinc_tty_put_char(struct tty_struct *tty, unsigned char ch) ++void capinc_tty_put_char(struct tty_struct *tty, unsigned char ch) + { + struct capiminor *mp = (struct capiminor *)tty->driver_data; + struct sk_buff *skb; +@@ -1414,7 +1535,7 @@ + } + } + +-static void capinc_tty_flush_chars(struct tty_struct *tty) ++void capinc_tty_flush_chars(struct tty_struct *tty) + { + struct capiminor *mp = (struct capiminor *)tty->driver_data; + struct sk_buff *skb; +@@ -1440,7 +1561,7 @@ + (void)handle_minor_recv(mp); + } + +-static int capinc_tty_write_room(struct tty_struct *tty) ++int capinc_tty_write_room(struct tty_struct *tty) + { + struct capiminor *mp = (struct capiminor *)tty->driver_data; + int room; +@@ -1458,7 +1579,7 @@ + return room; + } + +-static int capinc_tty_chars_in_buffer(struct tty_struct *tty) ++int capinc_tty_chars_in_buffer(struct tty_struct *tty) + { + struct capiminor *mp = (struct capiminor *)tty->driver_data; + if (!mp || !mp->nccip) { +@@ -1476,7 +1597,7 @@ + return mp->outbytes; + } + +-static int capinc_tty_ioctl(struct tty_struct *tty, struct file * file, ++int capinc_tty_ioctl(struct tty_struct *tty, struct file * file, + unsigned int cmd, unsigned long arg) + { + int error = 0; +@@ -1488,14 +1609,14 @@ + return error; + } + +-static void capinc_tty_set_termios(struct tty_struct *tty, struct termios * old) ++void capinc_tty_set_termios(struct tty_struct *tty, struct termios * old) + { + #ifdef _DEBUG_TTYFUNCS + printk(KERN_DEBUG "capinc_tty_set_termios\n"); + #endif + } + +-static void capinc_tty_throttle(struct tty_struct * tty) ++void capinc_tty_throttle(struct tty_struct * tty) + { + struct capiminor *mp = (struct capiminor *)tty->driver_data; + #ifdef _DEBUG_TTYFUNCS +@@ -1505,7 +1626,7 @@ + mp->ttyinstop = 1; + } + +-static void capinc_tty_unthrottle(struct tty_struct * tty) ++void capinc_tty_unthrottle(struct tty_struct * tty) + { + struct capiminor *mp = (struct capiminor *)tty->driver_data; + #ifdef _DEBUG_TTYFUNCS +@@ -1517,7 +1638,7 @@ + } + } + +-static void capinc_tty_stop(struct tty_struct *tty) ++void capinc_tty_stop(struct tty_struct *tty) + { + struct capiminor *mp = (struct capiminor *)tty->driver_data; + #ifdef _DEBUG_TTYFUNCS +@@ -1528,7 +1649,7 @@ + } + } + +-static void capinc_tty_start(struct tty_struct *tty) ++void capinc_tty_start(struct tty_struct *tty) + { + struct capiminor *mp = (struct capiminor *)tty->driver_data; + #ifdef _DEBUG_TTYFUNCS +@@ -1540,43 +1661,49 @@ + } + } + +-static void capinc_tty_hangup(struct tty_struct *tty) ++void capinc_tty_hangup(struct tty_struct *tty) + { + #ifdef _DEBUG_TTYFUNCS + printk(KERN_DEBUG "capinc_tty_hangup\n"); + #endif + } + +-static void capinc_tty_break_ctl(struct tty_struct *tty, int state) ++void capinc_tty_break_ctl(struct tty_struct *tty, int state) + { + #ifdef _DEBUG_TTYFUNCS + printk(KERN_DEBUG "capinc_tty_break_ctl(%d)\n", state); + #endif + } + +-static void capinc_tty_flush_buffer(struct tty_struct *tty) ++void capinc_tty_flush_buffer(struct tty_struct *tty) + { + #ifdef _DEBUG_TTYFUNCS + printk(KERN_DEBUG "capinc_tty_flush_buffer\n"); + #endif + } + +-static void capinc_tty_set_ldisc(struct tty_struct *tty) ++void capinc_tty_set_ldisc(struct tty_struct *tty) + { + #ifdef _DEBUG_TTYFUNCS + printk(KERN_DEBUG "capinc_tty_set_ldisc\n"); + #endif + } + +-static void capinc_tty_send_xchar(struct tty_struct *tty, char ch) ++void capinc_tty_send_xchar(struct tty_struct *tty, char ch) + { + #ifdef _DEBUG_TTYFUNCS + printk(KERN_DEBUG "capinc_tty_send_xchar(%d)\n", ch); + #endif + } + +-static int capinc_tty_read_proc(char *page, char **start, off_t off, +- int count, int *eof, void *data) ++int capinc_tty_read_proc(char *page, char **start, off_t off, ++ int count, int *eof, void *data) ++{ ++ return 0; ++} ++ ++int capinc_write_proc(struct file *file, const char *buffer, ++ unsigned long count, void *data) + { + return 0; + } +@@ -1588,7 +1715,7 @@ + static struct termios *capinc_tty_termios[CAPINC_NR_PORTS]; + static struct termios *capinc_tty_termios_locked[CAPINC_NR_PORTS]; + +-static int capinc_tty_init(void) ++int capinc_tty_init(void) + { + struct tty_driver *drv = &capinc_tty_driver; + +@@ -1646,7 +1773,7 @@ + return 0; + } + +-static void capinc_tty_exit(void) ++void capinc_tty_exit(void) + { + struct tty_driver *drv = &capinc_tty_driver; + int retval; +@@ -1771,8 +1898,9 @@ + + /* -------- init function and module interface ---------------------- */ + ++#ifdef COMPAT_HAS_kmem_cache + +-static void alloc_exit(void) ++static void __exit alloc_exit(void) + { + if (capidev_cachep) { + (void)kmem_cache_destroy(capidev_cachep); +@@ -1837,8 +1965,9 @@ + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ + return 0; + } ++#endif + +-static void lower_callback(unsigned int cmd, u32 contr, void *data) ++static void lower_callback(unsigned int cmd, __u32 contr, void *data) + { + struct capi_ncciinfo *np; + struct capidev *cdev; +@@ -1900,15 +2029,19 @@ + MOD_DEC_USE_COUNT; + return -EIO; + } ++#ifdef HAVE_DEVFS_FS + devfs_register_series (NULL, "capi/r%u", CAPINC_NR_PORTS, + DEVFS_FL_DEFAULT, + capi_rawmajor, 0, + S_IFCHR | S_IRUSR | S_IWUSR, + &capinc_raw_fops, NULL); ++#endif + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ ++#ifdef HAVE_DEVFS_FS + devfs_register (NULL, "isdn/capi20", DEVFS_FL_DEFAULT, + capi_major, 0, S_IFCHR | S_IRUSR | S_IWUSR, + &capi_fops, NULL); ++#endif + printk(KERN_NOTICE "capi20: started up with major %d\n", capi_major); + + if ((capifuncs = attach_capi_interface(&cuser)) == 0) { +@@ -1918,9 +2051,11 @@ + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE + devfs_unregister_chrdev(capi_rawmajor, "capi/r%d"); + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ ++#ifdef HAVE_DEVFS_FS + devfs_unregister(devfs_find_handle(NULL, "capi20", + capi_major, 0, + DEVFS_SPECIAL_CHR, 0)); ++#endif + return -EIO; + } + +@@ -1934,8 +2069,10 @@ + } + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ + ++#ifdef COMPAT_HAS_kmem_cache + if (alloc_init() < 0) { + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE ++#ifdef HAVE_DEVFS_FS + unsigned int j; + devfs_unregister_chrdev(capi_rawmajor, "capi/r%d"); + for (j = 0; j < CAPINC_NR_PORTS; j++) { +@@ -1943,16 +2080,20 @@ + sprintf(devname, "capi/r%u", j); + devfs_unregister(devfs_find_handle(NULL, devname, capi_rawmajor, j, DEVFS_SPECIAL_CHR, 0)); + } ++#endif + capinc_tty_exit(); + #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ + (void) detach_capi_interface(&cuser); + devfs_unregister_chrdev(capi_major, "capi20"); ++#ifdef HAVE_DEVFS_FS + devfs_unregister(devfs_find_handle(NULL, "capi20", + capi_major, 0, + DEVFS_SPECIAL_CHR, 0)); ++#endif + MOD_DEC_USE_COUNT; + return -ENOMEM; + } ++#endif /* COMPAT_HAS_kmem_cache */ + + (void)proc_init(); + +@@ -1975,23 +2116,31 @@ + static void __exit capi_exit(void) + { + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE ++#ifdef HAVE_DEVFS_FS + unsigned int j; + #endif ++#endif ++#ifdef COMPAT_HAS_kmem_cache + alloc_exit(); ++#endif + (void)proc_exit(); + + devfs_unregister_chrdev(capi_major, "capi20"); ++#ifdef HAVE_DEVFS_FS + devfs_unregister(devfs_find_handle(NULL, "isdn/capi20", capi_major, 0, DEVFS_SPECIAL_CHR, 0)); ++#endif + + #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE + capinc_tty_exit(); + devfs_unregister_chrdev(capi_rawmajor, "capi/r%d"); ++#ifdef HAVE_DEVFS_FS + for (j = 0; j < CAPINC_NR_PORTS; j++) { + char devname[32]; + sprintf(devname, "capi/r%u", j); + devfs_unregister(devfs_find_handle(NULL, devname, capi_rawmajor, j, DEVFS_SPECIAL_CHR, 0)); + } + #endif ++#endif + (void) detach_capi_interface(&cuser); + printk(KERN_NOTICE "capi: Rev %s: unloaded\n", rev); + } +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capicmd.h linux-2.4.29/drivers/isdn/avmb1/capicmd.h +--- linux-2.4.29.old/drivers/isdn/avmb1/capicmd.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/capicmd.h 2005-03-22 15:06:44.865272224 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capicmd.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: capicmd.h,v 1.4 2001/09/24 13:22:44 kai Exp $ + * + * CAPI 2.0 Interface for Linux + * +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capidev.h linux-2.4.29/drivers/isdn/avmb1/capidev.h +--- linux-2.4.29.old/drivers/isdn/avmb1/capidev.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/capidev.h 2005-03-22 15:06:44.880269944 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capidev.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: capidev.h,v 1.8 2001/09/24 13:22:44 kai Exp $ + * + * CAPI 2.0 Interface for Linux + * +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capidrv.c linux-2.4.29/drivers/isdn/avmb1/capidrv.c +--- linux-2.4.29.old/drivers/isdn/avmb1/capidrv.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/capidrv.c 2005-03-22 15:06:44.918264168 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capidrv.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: capidrv.c,v 1.45 2001/09/24 13:22:44 kai Exp $ + * + * ISDN4Linux Driver, using capi20 interface (kernelcapi) + * +@@ -35,7 +35,7 @@ + #include "capicmd.h" + #include "capidrv.h" + +-static char *revision = "$Revision: 1.1.4.1 $"; ++static char *revision = "$Revision: 1.45 $"; + static int debugmode = 0; + + MODULE_DESCRIPTION("CAPI4Linux: Interface to ISDN4Linux"); +@@ -105,7 +105,6 @@ + int oldstate; + /* */ + __u16 datahandle; +- spinlock_t lock; + struct ncci_datahandle_queue { + struct ncci_datahandle_queue *next; + __u16 datahandle; +@@ -423,7 +422,6 @@ + nccip->plcip = plcip; + nccip->chan = plcip->chan; + nccip->datahandle = 0; +- nccip->lock = SPIN_LOCK_UNLOCKED; + + nccip->next = plcip->ncci_list; + plcip->ncci_list = nccip; +@@ -480,7 +478,6 @@ + __u16 datahandle, int len) + { + struct ncci_datahandle_queue *n, **pp; +- unsigned long flags; + + n = (struct ncci_datahandle_queue *) + kmalloc(sizeof(struct ncci_datahandle_queue), GFP_ATOMIC); +@@ -491,31 +488,25 @@ + n->next = 0; + n->datahandle = datahandle; + n->len = len; +- spin_lock_irqsave(&nccip->lock, flags); + for (pp = &nccip->ackqueue; *pp; pp = &(*pp)->next) ; + *pp = n; +- spin_unlock_irqrestore(&nccip->lock, flags); + return 0; + } + + static int capidrv_del_ack(struct capidrv_ncci *nccip, __u16 datahandle) + { + struct ncci_datahandle_queue **pp, *p; +- unsigned long flags; + int len; + +- spin_lock_irqsave(&nccip->lock, flags); + for (pp = &nccip->ackqueue; *pp; pp = &(*pp)->next) { + if ((*pp)->datahandle == datahandle) { + p = *pp; + len = p->len; + *pp = (*pp)->next; +- spin_unlock_irqrestore(&nccip->lock, flags); + kfree(p); + return len; + } + } +- spin_unlock_irqrestore(&nccip->lock, flags); + return -1; + } + +@@ -523,25 +514,13 @@ + + static void send_message(capidrv_contr * card, _cmsg * cmsg) + { +- struct sk_buff *skb; +- size_t len; +- u16 err; +- ++ struct sk_buff *skb; ++ size_t len; + capi_cmsg2message(cmsg, cmsg->buf); + len = CAPIMSG_LEN(cmsg->buf); + skb = alloc_skb(len, GFP_ATOMIC); +- if(!skb) { +- printk(KERN_ERR "no skb len(%d) memory\n", len); +- return; +- } + memcpy(skb_put(skb, len), cmsg->buf, len); +- err = (*capifuncs->capi_put_message) (global.appid, skb); +- if (err) { +- printk(KERN_WARNING "%s: capi_put_message error: %04x\n", +- __FUNCTION__, err); +- kfree_skb(skb); +- return; +- } ++ (*capifuncs->capi_put_message) (global.appid, skb); + global.nsentctlpkt++; + } + +@@ -1932,8 +1911,10 @@ + (void)capidrv_del_ack(nccip, datahandle); + return 0; + } ++#if 1 + printk(KERN_DEBUG "capidrv-%d: only %d bytes headroom, need %d\n", + card->contrnr, skb_headroom(skb), msglen); ++#endif + memcpy(skb_push(nskb, msglen), sendcmsg.buf, msglen); + errcode = (*capifuncs->capi_put_message) (global.appid, nskb); + if (errcode == CAPI_NOERROR) { +@@ -2035,6 +2016,52 @@ + send_message(card, &cmdcmsg); + } + ++#if 0 ++static void disable_dchannel_trace(capidrv_contr *card) ++{ ++ __u8 manufacturer[CAPI_MANUFACTURER_LEN]; ++ capi_version version; ++ __u16 contr = card->contrnr; ++ __u16 errcode; ++ __u16 avmversion[3]; ++ ++ errcode = (*capifuncs->capi_get_manufacturer)(contr, manufacturer); ++ if (errcode != CAPI_NOERROR) { ++ printk(KERN_ERR "%s: can't get manufacturer (0x%x)\n", ++ card->name, errcode); ++ return; ++ } ++ if (strstr(manufacturer, "AVM") == 0) { ++ printk(KERN_ERR "%s: not from AVM, no d-channel trace possible (%s)\n", ++ card->name, manufacturer); ++ return; ++ } ++ errcode = (*capifuncs->capi_get_version)(contr, &version); ++ if (errcode != CAPI_NOERROR) { ++ printk(KERN_ERR "%s: can't get version (0x%x)\n", ++ card->name, errcode); ++ return; ++ } ++ avmversion[0] = (version.majormanuversion >> 4) & 0x0f; ++ avmversion[1] = (version.majormanuversion << 4) & 0xf0; ++ avmversion[1] |= (version.minormanuversion >> 4) & 0x0f; ++ avmversion[2] |= version.minormanuversion & 0x0f; ++ ++ if (avmversion[0] > 3 || (avmversion[0] == 3 && avmversion[1] > 5)) { ++ printk(KERN_INFO "%s: D2 trace disabled\n", card->name); ++ } else { ++ printk(KERN_INFO "%s: D3 trace disabled\n", card->name); ++ } ++ capi_fill_MANUFACTURER_REQ(&cmdcmsg, global.appid, ++ card->msgid++, ++ contr, ++ 0x214D5641, /* ManuID */ ++ 0, /* Class */ ++ 1, /* Function */ ++ (_cstruct)"\004\000\000\000\000"); ++ send_message(card, &cmdcmsg); ++} ++#endif + + static void send_listen(capidrv_contr *card) + { +@@ -2200,10 +2227,10 @@ + free_ncci(card, card->bchans[card->nbchan-1].nccip); + if (card->bchans[card->nbchan-1].plcip) + free_plci(card, card->bchans[card->nbchan-1].plcip); ++ if (card->plci_list) ++ printk(KERN_ERR "capidrv: bug in free_plci()\n"); + card->nbchan--; + } +- if (card->plci_list) +- printk(KERN_ERR "capidrv: bug in free_plci()\n"); + kfree(card->bchans); + card->bchans = 0; + +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capidrv.h linux-2.4.29/drivers/isdn/avmb1/capidrv.h +--- linux-2.4.29.old/drivers/isdn/avmb1/capidrv.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/capidrv.h 2005-03-22 15:06:44.935261584 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capidrv.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: capidrv.h,v 1.4 2001/09/24 13:22:44 kai Exp $ + * + * ISDN4Linux Driver, using capi20 interface (kernelcapi) + * +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capifs.c linux-2.4.29/drivers/isdn/avmb1/capifs.c +--- linux-2.4.29.old/drivers/isdn/avmb1/capifs.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/capifs.c 2005-03-22 15:06:44.950259304 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capifs.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: capifs.c,v 1.22 2001/09/24 13:22:44 kai Exp $ + * + * Copyright 2000 by Carsten Paeth <calle@calle.de> + * +@@ -25,6 +25,7 @@ + #include <linux/major.h> + #include <linux/slab.h> + #include <linux/ctype.h> ++#include <linux/isdn_compat.h> + #include <asm/bitops.h> + #include <asm/uaccess.h> + +@@ -32,7 +33,7 @@ + MODULE_AUTHOR("Carsten Paeth"); + MODULE_LICENSE("GPL"); + +-static char *revision = "$Revision: 1.1.4.1 $"; ++static char *revision = "$Revision: 1.22 $"; + + struct capifs_ncci { + struct inode *inode; +@@ -69,14 +70,21 @@ + static int capifs_root_readdir(struct file *,void *,filldir_t); + static struct dentry *capifs_root_lookup(struct inode *,struct dentry *); + static int capifs_revalidate(struct dentry *, int); ++#ifdef COMPAT_VFS_2_4 + static struct inode *capifs_new_inode(struct super_block *sb); ++#endif + + static struct file_operations capifs_root_operations = { ++#ifdef COMPAT_VFS_2_4 + read: generic_read_dir, ++#endif + readdir: capifs_root_readdir, + }; + + struct inode_operations capifs_root_inode_operations = { ++#ifndef COMPAT_VFS_2_4 ++ default_file_ops: &capifs_root_operations, /* file operations */ ++#endif + lookup: capifs_root_lookup, + }; + +@@ -101,12 +109,20 @@ + switch(nr) + { + case 0: ++#ifdef COMPAT_VFS_2_4 + if (filldir(dirent, ".", 1, nr, inode->i_ino, DT_DIR) < 0) ++#else ++ if (filldir(dirent, ".", 1, nr, inode->i_ino) < 0) ++#endif + return 0; + filp->f_pos = ++nr; + /* fall through */ + case 1: ++#ifdef COMPAT_VFS_2_4 + if (filldir(dirent, "..", 2, nr, inode->i_ino, DT_DIR) < 0) ++#else ++ if (filldir(dirent, "..", 2, nr, inode->i_ino) < 0) ++#endif + return 0; + filp->f_pos = ++nr; + /* fall through */ +@@ -118,7 +134,11 @@ + char *p = numbuf; + if (np->type) *p++ = np->type; + sprintf(p, "%u", np->num); ++#ifdef COMPAT_VFS_2_4 + if ( filldir(dirent, numbuf, strlen(numbuf), nr, nr, DT_UNKNOWN) < 0 ) ++#else ++ if ( filldir(dirent, numbuf, strlen(numbuf), nr, nr) < 0 ) ++#endif + return 0; + } + filp->f_pos = ++nr; +@@ -180,7 +200,7 @@ + + dentry->d_inode = np->inode; + if ( dentry->d_inode ) +- atomic_inc(&dentry->d_inode->i_count); ++ i_count_inc(dentry->d_inode->i_count); + + d_add(dentry, dentry->d_inode); + +@@ -199,9 +219,9 @@ + + for ( i = 0 ; i < sbi->max_ncci ; i++ ) { + if ( (inode = sbi->nccis[i].inode) ) { +- if (atomic_read(&inode->i_count) != 1 ) ++ if (i_count_read(inode->i_count) != 1 ) + printk("capifs_put_super: badness: entry %d count %d\n", +- i, (unsigned)atomic_read(&inode->i_count)); ++ i, (unsigned)i_count_read(inode->i_count)); + inode->i_nlink--; + iput(inode); + } +@@ -213,11 +233,24 @@ + + kfree(sbi->nccis); + kfree(sbi); ++#ifndef COMPAT_VFS_2_4 ++ MOD_DEC_USE_COUNT; ++#endif + } + ++#ifdef COMPAT_VFS_2_4 + static int capifs_statfs(struct super_block *sb, struct statfs *buf); ++#else ++static int capifs_statfs(struct super_block *sb, struct statfs *buf, int bufsiz); ++static void capifs_write_inode(struct inode *inode) { }; ++static void capifs_read_inode(struct inode *inode); ++#endif + + static struct super_operations capifs_sops = { ++#ifndef COMPAT_VFS_2_4 ++ read_inode: capifs_read_inode, ++ write_inode: capifs_write_inode, ++#endif + put_super: capifs_put_super, + statfs: capifs_statfs, + }; +@@ -288,6 +321,10 @@ + struct dentry * root; + struct capifs_sb_info *sbi; + ++#ifndef COMPAT_VFS_2_4 ++ MOD_INC_USE_COUNT; ++ lock_super(s); ++#endif + /* Super block already completed? */ + if (s->s_root) + goto out; +@@ -322,6 +359,7 @@ + /* + * Get the root inode and dentry, but defer checking for errors. + */ ++#ifdef COMPAT_VFS_2_4 + root_inode = capifs_new_inode(s); + if (root_inode) { + root_inode->i_ino = 1; +@@ -331,6 +369,10 @@ + root_inode->i_nlink = 2; + } + root = d_alloc_root(root_inode); ++#else ++ root_inode = iget(s, 1); /* inode 1 == root directory */ ++ root = d_alloc_root(root_inode, NULL); ++#endif + + /* + * Check whether somebody else completed the super block. +@@ -370,11 +412,34 @@ + mounts = s; + + out: /* Success ... somebody else completed the super block for us. */ ++#ifndef COMPAT_VFS_2_4 ++ unlock_super(s); ++#endif + return s; + fail: ++#ifndef COMPAT_VFS_2_4 ++ unlock_super(s); ++ MOD_DEC_USE_COUNT; ++#endif + return NULL; + } + ++#ifndef COMPAT_VFS_2_4 ++static int capifs_statfs(struct super_block *sb, struct statfs *buf, int bufsiz) ++{ ++ struct statfs tmp; ++ ++ tmp.f_type = CAPIFS_SUPER_MAGIC; ++ tmp.f_bsize = 1024; ++ tmp.f_blocks = 0; ++ tmp.f_bfree = 0; ++ tmp.f_bavail = 0; ++ tmp.f_files = 0; ++ tmp.f_ffree = 0; ++ tmp.f_namelen = NAME_MAX; ++ return copy_to_user(buf, &tmp, bufsiz) ? -EFAULT : 0; ++} ++#else + static int capifs_statfs(struct super_block *sb, struct statfs *buf) + { + buf->f_type = CAPIFS_SUPER_MAGIC; +@@ -387,7 +452,9 @@ + buf->f_namelen = NAME_MAX; + return 0; + } ++#endif + ++#ifdef COMPAT_VFS_2_4 + static struct inode *capifs_new_inode(struct super_block *sb) + { + struct inode *inode = new_inode(sb); +@@ -399,8 +466,51 @@ + } + return inode; + } ++#else ++static void capifs_read_inode(struct inode *inode) ++{ ++ ino_t ino = inode->i_ino; ++ struct capifs_sb_info *sbi = SBI(inode->i_sb); ++ ++ inode->i_mode = 0; ++ inode->i_nlink = 0; ++ inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; ++ inode->i_blocks = 0; ++ inode->i_blksize = 1024; ++ inode->i_uid = inode->i_gid = 0; ++ ++ if ( ino == 1 ) { ++ inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; ++ inode->i_op = &capifs_root_inode_operations; ++ inode->i_nlink = 2; ++ return; ++ } + ++ ino -= 2; ++ if ( ino >= sbi->max_ncci ) ++ return; /* Bogus */ ++ ++#ifdef COMPAT_VFS_2_4 ++ init_special_inode(inode, S_IFCHR, 0); ++#else ++ inode->i_mode = S_IFCHR; ++ inode->i_op = &chrdev_inode_operations; ++#endif ++ ++ return; ++} ++#endif ++ ++#ifndef COMPAT_VFS_2_4 ++static struct file_system_type capifs_fs_type = { ++ "capifs", ++ 0, ++ capifs_read_super, ++ NULL ++}; ++#else + static DECLARE_FSTYPE(capifs_fs_type, "capifs", capifs_read_super, 0); ++#endif + + void capifs_new_ncci(char type, unsigned int num, kdev_t device) + { +@@ -421,16 +531,26 @@ + break; + } + } ++#ifdef COMPAT_VFS_2_4 + if ( ino >= sbi->max_ncci ) + continue; + + if ((np->inode = capifs_new_inode(sb)) != NULL) { ++#else ++ if ((np->inode = iget(sb, ino+2)) != NULL) { ++#endif + struct inode *inode = np->inode; + inode->i_uid = sbi->setuid ? sbi->uid : current->fsuid; + inode->i_gid = sbi->setgid ? sbi->gid : current->fsgid; ++#ifdef COMPAT_VFS_2_4 + inode->i_nlink = 1; + inode->i_ino = ino + 2; + init_special_inode(inode, sbi->mode|S_IFCHR, np->kdev); ++#else ++ inode->i_mode = sbi->mode | S_IFCHR; ++ inode->i_rdev = np->kdev; ++ inode->i_nlink++; ++#endif + } + } + } +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capifs.h linux-2.4.29/drivers/isdn/avmb1/capifs.h +--- linux-2.4.29.old/drivers/isdn/avmb1/capifs.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/capifs.h 2005-03-22 15:06:44.965257024 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capifs.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: capifs.h,v 1.4 2001/09/24 13:22:44 kai Exp $ + * + * Copyright 2000 by Carsten Paeth <calle@calle.de> + * +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capilli.h linux-2.4.29/drivers/isdn/avmb1/capilli.h +--- linux-2.4.29.old/drivers/isdn/avmb1/capilli.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/capilli.h 2005-03-22 15:06:44.980254744 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capilli.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: capilli.h,v 1.5 2001/09/24 13:22:44 kai Exp $ + * + * Kernel CAPI 2.0 Driver Interface for Linux + * +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capiutil.c linux-2.4.29/drivers/isdn/avmb1/capiutil.c +--- linux-2.4.29.old/drivers/isdn/avmb1/capiutil.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/capiutil.c 2005-03-22 15:06:44.997252160 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capiutil.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: capiutil.c,v 1.16 2001/09/24 13:22:44 kai Exp $ + * + * CAPI 2.0 convert capi message to capi message struct + * +@@ -19,6 +19,7 @@ + #include <linux/init.h> + #include <asm/segment.h> + #include <linux/config.h> ++#include <linux/isdn_compat.h> + #include "capiutil.h" + + MODULE_DESCRIPTION("CAPI4Linux: CAPI message conversion support"); +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/capiutil.h linux-2.4.29/drivers/isdn/avmb1/capiutil.h +--- linux-2.4.29.old/drivers/isdn/avmb1/capiutil.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/capiutil.h 2005-03-22 15:06:45.040245624 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capiutil.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: capiutil.h,v 1.7 2001/09/24 13:22:44 kai Exp $ + * + * CAPI 2.0 defines & types + * +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/kcapi.c linux-2.4.29/drivers/isdn/avmb1/kcapi.c +--- linux-2.4.29.old/drivers/isdn/avmb1/kcapi.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/kcapi.c 2005-03-22 15:06:45.062242280 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: kcapi.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: kcapi.c,v 1.28 2001/09/24 13:22:44 kai Exp $ + * + * Kernel CAPI 2.0 Module + * +@@ -21,6 +21,7 @@ + #include <linux/proc_fs.h> + #include <linux/skbuff.h> + #include <linux/tqueue.h> ++#include <linux/isdn_compat.h> + #include <linux/capi.h> + #include <linux/kernelcapi.h> + #include <linux/locks.h> +@@ -33,7 +34,7 @@ + #include <linux/b1lli.h> + #endif + +-static char *revision = "$Revision: 1.1.4.1 $"; ++static char *revision = "$Revision: 1.28 $"; + + /* ------------------------------------------------------------- */ + +@@ -64,7 +65,6 @@ + __u32 ncci; + __u32 winsize; + int nmsg; +- spinlock_t lock; + struct msgidqueue *msgidqueue; + struct msgidqueue *msgidlast; + struct msgidqueue *msgidfree; +@@ -104,14 +104,14 @@ + #define APPL(a) (&applications[(a)-1]) + #define VALID_APPLID(a) ((a) && (a) <= CAPI_MAXAPPL && APPL(a)->applid == a) + #define APPL_IS_FREE(a) (APPL(a)->applid == 0) +-#define APPL_MARK_FREE(a) do{ APPL(a)->applid=0; MOD_DEC_USE_COUNT; }while(0) +-#define APPL_MARK_USED(a) do{ APPL(a)->applid=(a); MOD_INC_USE_COUNT; }while(0) ++#define APPL_MARK_FREE(a) do{ APPL(a)->applid=0; MOD_DEC_USE_COUNT; }while(0); ++#define APPL_MARK_USED(a) do{ APPL(a)->applid=(a); MOD_INC_USE_COUNT; }while(0); + + #define NCCI2CTRL(ncci) (((ncci) >> 24) & 0x7f) + + #define VALID_CARD(c) ((c) > 0 && (c) <= CAPI_MAXCONTR) + #define CARD(c) (&cards[(c)-1]) +-#define CARDNR(cp) ((((cp)-cards)+1) & 0xff) ++#define CARDNR(cp) (((cp)-cards)+1) + + static struct capi_appl applications[CAPI_MAXAPPL]; + static struct capi_ctr cards[CAPI_MAXCONTR]; +@@ -535,9 +535,13 @@ + * of devices. Devices can only removed in + * user process, not in bh. + */ ++#ifdef COMPAT_HAS_SCHEDULE_TASK + MOD_INC_USE_COUNT; + if (schedule_task(&tq_state_notify) == 0) + MOD_DEC_USE_COUNT; ++#else ++ queue_task(&tq_state_notify, &tq_scheduler); ++#endif + return 0; + } + +@@ -546,13 +550,7 @@ + static void notify_up(__u32 contr) + { + struct capi_interface_user *p; +- __u16 appl; + +- for (appl = 1; appl <= CAPI_MAXAPPL; appl++) { +- if (!VALID_APPLID(appl)) continue; +- if (APPL(appl)->releasing) continue; +- CARD(contr)->driver->register_appl(CARD(contr), appl, &APPL(appl)->rparam); +- } + printk(KERN_NOTICE "kcapi: notify up contr %d\n", contr); + spin_lock(&capi_users_lock); + for (p = capi_users; p; p = p->next) { +@@ -639,7 +637,9 @@ + kfree(np); + MOD_DEC_USE_COUNT; + } ++#ifdef COMPAT_HAS_SCHEDULE_TASK + MOD_DEC_USE_COUNT; ++#endif + } + + /* -------- NCCI Handling ------------------------------------- */ +@@ -647,7 +647,6 @@ + static inline void mq_init(struct capi_ncci * np) + { + int i; +- np->lock = SPIN_LOCK_UNLOCKED; + np->msgidqueue = 0; + np->msgidlast = 0; + np->nmsg = 0; +@@ -662,11 +661,8 @@ + static inline int mq_enqueue(struct capi_ncci * np, __u16 msgid) + { + struct msgidqueue *mq; +- spin_lock_bh(&np->lock); +- if ((mq = np->msgidfree) == 0) { +- spin_unlock_bh(&np->lock); ++ if ((mq = np->msgidfree) == 0) + return 0; +- } + np->msgidfree = mq->next; + mq->msgid = msgid; + mq->next = 0; +@@ -676,14 +672,12 @@ + if (!np->msgidqueue) + np->msgidqueue = mq; + np->nmsg++; +- spin_unlock_bh(&np->lock); + return 1; + } + + static inline int mq_dequeue(struct capi_ncci * np, __u16 msgid) + { + struct msgidqueue **pp; +- spin_lock_bh(&np->lock); + for (pp = &np->msgidqueue; *pp; pp = &(*pp)->next) { + if ((*pp)->msgid == msgid) { + struct msgidqueue *mq = *pp; +@@ -693,11 +687,9 @@ + mq->next = np->msgidfree; + np->msgidfree = mq; + np->nmsg--; +- spin_unlock_bh(&np->lock); + return 1; + } + } +- spin_unlock_bh(&np->lock); + return 0; + } + +@@ -720,16 +712,12 @@ + nextpp = &(*pp)->next; + } + } +- if (APPL(appl)->releasing) { /* only release if the application was marked for release */ +- printk(KERN_DEBUG "kcapi: appl %d releasing(%d)\n", appl, APPL(appl)->releasing); +- APPL(appl)->releasing--; +- if (APPL(appl)->releasing <= 0) { +- APPL(appl)->signal = 0; +- APPL_MARK_FREE(appl); +- printk(KERN_INFO "kcapi: appl %d down\n", appl); +- } +- } else +- printk(KERN_WARNING "kcapi: appl %d card%d released without request\n", appl, card->cnr); ++ APPL(appl)->releasing--; ++ if (APPL(appl)->releasing <= 0) { ++ APPL(appl)->signal = 0; ++ APPL_MARK_FREE(appl); ++ printk(KERN_INFO "kcapi: appl %d down\n", appl); ++ } + } + /* + * ncci management +@@ -882,7 +870,16 @@ + + static void controllercb_ready(struct capi_ctr * card) + { ++ __u16 appl; ++ + card->cardstate = CARD_RUNNING; ++ ++ for (appl = 1; appl <= CAPI_MAXAPPL; appl++) { ++ if (!VALID_APPLID(appl)) continue; ++ if (APPL(appl)->releasing) continue; ++ card->driver->register_appl(card, appl, &APPL(appl)->rparam); ++ } ++ + printk(KERN_NOTICE "kcapi: card %d \"%s\" ready.\n", + CARDNR(card), card->name); + +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/t1isa.c linux-2.4.29/drivers/isdn/avmb1/t1isa.c +--- linux-2.4.29.old/drivers/isdn/avmb1/t1isa.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/t1isa.c 2005-03-22 15:06:45.078239848 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: t1isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: t1isa.c,v 1.22 2001/09/24 13:22:44 kai Exp $ + * + * Module for AVM T1 HEMA-card. + * +@@ -19,13 +19,14 @@ + #include <linux/capi.h> + #include <linux/kernelcapi.h> + #include <linux/init.h> ++#include <linux/isdn_compat.h> + #include <asm/io.h> + #include "capicmd.h" + #include "capiutil.h" + #include "capilli.h" + #include "avmcard.h" + +-static char *revision = "$Revision: 1.1.4.1 $"; ++static char *revision = "$Revision: 1.22 $"; + + /* ------------------------------------------------------------- */ + +diff -rNu linux-2.4.29.old/drivers/isdn/avmb1/t1pci.c linux-2.4.29/drivers/isdn/avmb1/t1pci.c +--- linux-2.4.29.old/drivers/isdn/avmb1/t1pci.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/avmb1/t1pci.c 2005-03-22 15:06:45.094237416 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: t1pci.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: t1pci.c,v 1.25 2001/09/24 13:22:44 kai Exp $ + * + * Module for AVM T1 PCI-card. + * +@@ -18,6 +18,7 @@ + #include <linux/interrupt.h> + #include <linux/ioport.h> + #include <linux/pci.h> ++#include <linux/isdn_compat.h> + #include <linux/capi.h> + #include <linux/init.h> + #include <asm/io.h> +@@ -26,19 +27,21 @@ + #include "capilli.h" + #include "avmcard.h" + +-static char *revision = "$Revision: 1.1.4.1 $"; ++static char *revision = "$Revision: 1.25 $"; + + #undef CONFIG_T1PCI_DEBUG + #undef CONFIG_T1PCI_POLLDEBUG + + /* ------------------------------------------------------------- */ + ++#ifndef COMPAT_HAS_2_2_PCI + static struct pci_device_id t1pci_pci_tbl[] __initdata = { + { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_T1, PCI_ANY_ID, PCI_ANY_ID }, + { } /* Terminating entry */ + }; + + MODULE_DEVICE_TABLE(pci, t1pci_pci_tbl); ++#endif + MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM T1 PCI card"); + MODULE_AUTHOR("Carsten Paeth"); + MODULE_LICENSE("GPL"); +@@ -264,9 +267,9 @@ + } + pci_set_master(dev); + +- param.port = pci_resource_start(dev, 1); ++ param.port = pci_resource_start_io(dev, 1); + param.irq = dev->irq; +- param.membase = pci_resource_start(dev, 0); ++ param.membase = pci_resource_start_mem(dev, 0); + + printk(KERN_INFO + "%s: PCI BIOS reports AVM-T1-PCI at i/o %#x, irq %d, mem %#x\n", +diff -rNu linux-2.4.29.old/drivers/isdn/divert/divert_procfs.c linux-2.4.29/drivers/isdn/divert/divert_procfs.c +--- linux-2.4.29.old/drivers/isdn/divert/divert_procfs.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/divert/divert_procfs.c 2005-03-22 15:06:45.158227688 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: divert_procfs.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id$ + * + * Filesystem handling for the diversion supplementary services. + * +@@ -14,13 +14,16 @@ + #include <linux/module.h> + #include <linux/version.h> + #include <linux/poll.h> ++#ifndef COMPAT_USE_MODCOUNT_LOCK + #include <linux/smp_lock.h> ++#endif + #ifdef CONFIG_PROC_FS + #include <linux/proc_fs.h> + #else + #include <linux/fs.h> + #endif + #include <linux/isdnif.h> ++#include <linux/isdn_compat.h> + #include "isdn_divert.h" + + /*********************************/ +@@ -80,7 +83,6 @@ + isdn_divert_read(struct file *file, char *buf, size_t count, loff_t * off) + { + struct divert_info *inf; +- loff_t pos = *off; + int len; + + if (!*((struct divert_info **) file->private_data)) { +@@ -92,11 +94,11 @@ + return (0); + + inf->usage_cnt--; /* new usage count */ +- file->private_data = &inf->next; /* next structure */ ++ (struct divert_info **) file->private_data = &inf->next; /* next structure */ + if ((len = strlen(inf->info_start)) <= count) { + if (copy_to_user(buf, inf->info_start, len)) + return -EFAULT; +- *off = pos + len; ++ file->f_pos += len; + return (len); + } + return (0); +@@ -136,17 +138,23 @@ + { + unsigned long flags; + ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_INC_USE_COUNT; ++#else + lock_kernel(); ++#endif + save_flags(flags); + cli(); + if_used++; + if (divert_info_head) +- filep->private_data = &(divert_info_tail->next); ++ (struct divert_info **) filep->private_data = &(divert_info_tail->next); + else +- filep->private_data = &divert_info_head; ++ (struct divert_info **) filep->private_data = &divert_info_head; + restore_flags(flags); + /* start_divert(); */ ++#ifndef COMPAT_USE_MODCOUNT_LOCK + unlock_kernel(); ++#endif + return (0); + } /* isdn_divert_open */ + +@@ -159,7 +167,9 @@ + struct divert_info *inf; + unsigned long flags; + ++#ifndef COMPAT_USE_MODCOUNT_LOCK + lock_kernel(); ++#endif + save_flags(flags); + cli(); + if_used--; +@@ -175,7 +185,11 @@ + divert_info_head = divert_info_head->next; + kfree(inf); + } ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_DEC_USE_COUNT; ++#else + unlock_kernel(); ++#endif + return (0); + } /* isdn_divert_close */ + +@@ -276,6 +290,9 @@ + open: isdn_divert_open, + release: isdn_divert_close, + }; ++#ifdef COMPAT_NO_SOFTNET ++struct inode_operations divert_file_inode_operations; ++#endif + + /****************************/ + /* isdn subdir in /proc/net */ +@@ -302,8 +319,16 @@ + remove_proc_entry("isdn", proc_net); + return (-1); + } ++#ifdef COMPAT_NO_SOFTNET ++ memset(&divert_file_inode_operations, 0, sizeof(struct inode_operations)); ++ divert_file_inode_operations.default_file_ops = &isdn_fops; ++ isdn_divert_entry->ops = &divert_file_inode_operations; ++#else + isdn_divert_entry->proc_fops = &isdn_fops; ++#ifdef COMPAT_HAS_FILEOP_OWNER + isdn_divert_entry->owner = THIS_MODULE; ++#endif ++#endif /* COMPAT_NO_SOFTNET */ + #endif /* CONFIG_PROC_FS */ + + return (0); +diff -rNu linux-2.4.29.old/drivers/isdn/divert/isdn_divert.c linux-2.4.29/drivers/isdn/divert/isdn_divert.c +--- linux-2.4.29.old/drivers/isdn/divert/isdn_divert.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/divert/isdn_divert.c 2005-03-22 15:06:45.173225408 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_divert.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id$ + * + * DSS1 main diversion supplementary handling for i4l. + * +@@ -84,6 +84,9 @@ + restore_flags(flags); + break; + ++ case NETWORK_DIAL: ++ divert_if.dial_net_name(cs->deflect_dest); ++ + case DEFLECT_AUTODEL: + default: + save_flags(flags); +@@ -452,6 +455,7 @@ + case DEFLECT_PROCEED: + case DEFLECT_REPORT: + case DEFLECT_REJECT: ++ case NETWORK_DIAL: + if (dv->rule.action == DEFLECT_PROCEED) + if ((!if_used) || ((!extern_wait_max) && (!dv->rule.waittime))) + return(0); /* no external deflection needed */ +@@ -495,6 +499,11 @@ + else + { cs->deflect_dest[0] = '\0'; + retval = 4; /* only proceed */ ++ if (cs->akt_state == NETWORK_DIAL) { ++ strcpy(cs->deflect_dest,dv->rule.to_nr); ++ cs->timer.expires = jiffies + 10; ++ retval = 0; ++ } + } + sprintf(cs->info,"%d 0x%lx %s %s %s %s 0x%x 0x%x %d %d %s\n", + cs->akt_state, +@@ -739,6 +748,18 @@ + } + + ++#if 0 ++ sprintf(st, "0x%lx 0x%lx",ic->arg, ic->parm.dss1_io.ll_id); ++ p = st + strlen(st); ++ p1 = ic->parm.dss1_io.data; ++ i = ic->parm.dss1_io.datalen; ++ while ((i > 0) && (p - st < 530)) ++ { p += sprintf(p," %02x",(*p1++) & 0xFF); ++ i--; ++ } ++ sprintf(p, "\n"); ++ put_info_buffer(st); ++#endif + break; + + default: +diff -rNu linux-2.4.29.old/drivers/isdn/divert/isdn_divert.h linux-2.4.29/drivers/isdn/divert/isdn_divert.h +--- linux-2.4.29.old/drivers/isdn/divert/isdn_divert.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/divert/isdn_divert.h 2005-03-22 15:06:45.189222976 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_divert.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id$ + * + * Header for the diversion supplementary ioctl interface. + * +@@ -36,9 +36,10 @@ + #define DEFLECT_PROCEED 2 /* deflect when externally triggered */ + #define DEFLECT_ALERT 3 /* alert and deflect after delay */ + #define DEFLECT_REJECT 4 /* reject immediately */ +-#define DIVERT_ACTIVATE 5 /* diversion activate */ +-#define DIVERT_DEACTIVATE 6 /* diversion deactivate */ +-#define DIVERT_REPORT 7 /* interrogation result */ ++#define NETWORK_DIAL 5 /* dial a network interface */ ++#define DIVERT_ACTIVATE 16 /* diversion activate */ ++#define DIVERT_DEACTIVATE 17 /* diversion deactivate */ ++#define DIVERT_REPORT 18 /* interrogation result */ + #define DEFLECT_AUTODEL 255 /* only for internal use */ + + #define DEFLECT_ALL_IDS 0xFFFFFFFF /* all drivers selected */ +@@ -60,6 +61,7 @@ + 2 = report call, send proceed, wait max waittime secs + 3 = report call, alert and deflect after waittime + 4 = report call, reject immediately ++ 5 = dial net interface specified in to_nr + actions 1-2 only take place if interface is opened + */ + u_char waittime; /* maximum wait time for proceeding */ +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/Divas_mod.c linux-2.4.29/drivers/isdn/eicon/Divas_mod.c +--- linux-2.4.29.old/drivers/isdn/eicon/Divas_mod.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/Divas_mod.c 2005-03-22 15:06:45.229216896 +0100 +@@ -20,6 +20,7 @@ + #include "adapter.h" + #include "uxio.h" + ++#include <linux/isdn_compat.h> + + MODULE_DESCRIPTION("ISDN4Linux: Driver for Eicon Diva Server cards"); + MODULE_AUTHOR("Armin Schindler"); +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/common.c linux-2.4.29/drivers/isdn/eicon/common.c +--- linux-2.4.29.old/drivers/isdn/eicon/common.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/common.c 2005-03-22 15:06:45.301205952 +0100 +@@ -808,9 +808,7 @@ + + while(i--) + { +- if (card->state == DIA_RUNNING) +- DivaDoCardDpc(card); +- card++; ++ DivaDoCardDpc(card++); + } + } + +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon.h linux-2.4.29/drivers/isdn/eicon/eicon.h +--- linux-2.4.29.old/drivers/isdn/eicon/eicon.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/eicon.h 2005-03-22 15:06:45.371195312 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: eicon.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: eicon.h,v 1.26 2001/09/24 13:22:47 kai Exp $ + * + * ISDN low-level module for Eicon active ISDN-Cards. + * +@@ -348,19 +348,19 @@ + extern char *eicon_ctype_name[]; + + +-static inline void eicon_schedule_tx(eicon_card *card) ++extern __inline__ void eicon_schedule_tx(eicon_card *card) + { + queue_task(&card->snd_tq, &tq_immediate); + mark_bh(IMMEDIATE_BH); + } + +-static inline void eicon_schedule_rx(eicon_card *card) ++extern __inline__ void eicon_schedule_rx(eicon_card *card) + { + queue_task(&card->rcv_tq, &tq_immediate); + mark_bh(IMMEDIATE_BH); + } + +-static inline void eicon_schedule_ack(eicon_card *card) ++extern __inline__ void eicon_schedule_ack(eicon_card *card) + { + queue_task(&card->ack_tq, &tq_immediate); + mark_bh(IMMEDIATE_BH); +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_dsp.h linux-2.4.29/drivers/isdn/eicon/eicon_dsp.h +--- linux-2.4.29.old/drivers/isdn/eicon/eicon_dsp.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/eicon_dsp.h 2005-03-22 15:06:45.386193032 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: eicon_dsp.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: eicon_dsp.h,v 1.8 2001/09/24 13:22:47 kai Exp $ + * + * ISDN lowlevel-module for Eicon active cards. + * DSP definitions +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_idi.c linux-2.4.29/drivers/isdn/eicon/eicon_idi.c +--- linux-2.4.29.old/drivers/isdn/eicon/eicon_idi.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/eicon_idi.c 2005-03-22 15:06:45.421187712 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: eicon_idi.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: eicon_idi.c,v 1.45 2001/11/07 22:35:48 kai Exp $ + * + * ISDN lowlevel-module for Eicon active cards. + * IDI interface +@@ -25,7 +25,7 @@ + + #undef EICON_FULL_SERVICE_OKTETT + +-char *eicon_idi_revision = "$Revision: 1.1.4.1 $"; ++char *eicon_idi_revision = "$Revision: 1.45 $"; + + eicon_manifbuf *manbuf; + +@@ -1583,6 +1583,37 @@ + return; + } + ++#if 0 ++ eicon_sff_dochead *doc = (eicon_sff_dochead *)skb->data; ++ eicon_sff_pagehead *page = (eicon_sff_pagehead *)skb->data + sizeof(eicon_sff_dochead); ++ ++ printk(KERN_DEBUG"SFF: doc %d / page %d (skb : %d)\n", ++ sizeof(eicon_sff_dochead), ++ sizeof(eicon_sff_pagehead), skb->len); ++ ++ if (skb->len >= sizeof(eicon_sff_dochead)) { ++ printk(KERN_DEBUG"SFF: id = 0x%x\n", doc->id); ++ printk(KERN_DEBUG"SFF: version = 0x%x\n", doc->version); ++ printk(KERN_DEBUG"SFF: reserved1 = 0x%x\n", doc->reserved1); ++ printk(KERN_DEBUG"SFF: userinfo = 0x%x\n", doc->userinfo); ++ printk(KERN_DEBUG"SFF: pagecount = 0x%x\n", doc->pagecount); ++ printk(KERN_DEBUG"SFF: off1pagehead = 0x%x\n", doc->off1pagehead); ++ printk(KERN_DEBUG"SFF: offnpagehead = 0x%x\n", doc->offnpagehead); ++ printk(KERN_DEBUG"SFF: offdocend = 0x%x\n", doc->offdocend); ++ } ++ if (skb->len >= (sizeof(eicon_sff_dochead) + sizeof(eicon_sff_pagehead))) { ++ printk(KERN_DEBUG"SFFp: id = 0x%x\n", page->pageheadid); ++ printk(KERN_DEBUG"SFFp: len = 0x%x\n", page->pageheadlen); ++ printk(KERN_DEBUG"SFFp: resvert = 0x%x\n", page->resvert); ++ printk(KERN_DEBUG"SFFp: reshoriz = 0x%x\n", page->reshoriz); ++ printk(KERN_DEBUG"SFFp: coding = 0x%x\n", page->coding); ++ printk(KERN_DEBUG"SFFp: reserved2 = 0x%x\n", page->reserved2); ++ printk(KERN_DEBUG"SFFp: linelength = 0x%x\n", page->linelength); ++ printk(KERN_DEBUG"SFFp: pagelength = 0x%x\n", page->pagelength); ++ printk(KERN_DEBUG"SFFp: offprevpage = 0x%x\n", page->offprevpage); ++ printk(KERN_DEBUG"SFFp: offnextpage = 0x%x\n", page->offnextpage); ++ } ++#endif + + + if (chan->fax->direction == ISDN_TTY_FAX_CONN_IN) { +@@ -2054,8 +2085,7 @@ + OutBuf.Len++; + } else { + *OutBuf.Next++ = 0; +- *(__u16 *) OutBuf.Next = (__u16) LineBuf.Len; +- OutBuf.Next += sizeof(__u16); ++ *((__u16 *) OutBuf.Next)++ = (__u16) LineBuf.Len; + OutBuf.Len += 3; + } + memcpy(OutBuf.Next, LineBuf.Data, LineBuf.Len); +@@ -2385,6 +2415,12 @@ + } else { + if (chan->e.B2Id) + idi_do_req(ccard, chan, REMOVE, 1); ++#if 0 ++ if (chan->e.D3Id) { ++ idi_do_req(ccard, chan, REMOVE, 0); ++ idi_do_req(ccard, chan, ASSIGN, 0); ++ } ++#endif + chan->statectrl &= ~WAITING_FOR_HANGUP; + chan->statectrl &= ~IN_HOLD; + if (chan->statectrl & HAVE_CONN_REQ) { +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_idi.h linux-2.4.29/drivers/isdn/eicon/eicon_idi.h +--- linux-2.4.29.old/drivers/isdn/eicon/eicon_idi.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/eicon_idi.h 2005-03-22 15:06:45.437185280 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: eicon_idi.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: eicon_idi.h,v 1.12 2001/09/24 13:22:47 kai Exp $ + * + * ISDN lowlevel-module for the Eicon active cards. + * IDI-Interface +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_io.c linux-2.4.29/drivers/isdn/eicon/eicon_io.c +--- linux-2.4.29.old/drivers/isdn/eicon/eicon_io.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/eicon_io.c 2005-03-22 15:06:45.453182848 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: eicon_io.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: eicon_io.c,v 1.15 2001/09/24 13:22:47 kai Exp $ + * + * ISDN low-level module for Eicon active ISDN-Cards. + * Code for communicating with hardware. +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_isa.c linux-2.4.29/drivers/isdn/eicon/eicon_isa.c +--- linux-2.4.29.old/drivers/isdn/eicon/eicon_isa.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/eicon_isa.c 2005-03-22 15:06:45.469180416 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: eicon_isa.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: eicon_isa.c,v 1.18 2001/11/07 22:35:48 kai Exp $ + * + * ISDN low-level module for Eicon active ISDN-Cards. + * Hardware-specific code for old ISA cards. +@@ -20,7 +20,7 @@ + #define release_shmem release_region + #define request_shmem request_region + +-char *eicon_isa_revision = "$Revision: 1.1.4.1 $"; ++char *eicon_isa_revision = "$Revision: 1.18 $"; + + #undef EICON_MCA_DEBUG + +@@ -38,8 +38,12 @@ + static void + eicon_isa_release_shmem(eicon_isa_card *card) { + if (card->mvalid) { ++#ifdef COMPAT_HAS_ISA_IOREMAP + iounmap(card->shmem); + release_mem_region(card->physmem, card->ramsize); ++#else ++ release_shmem((unsigned long)card->shmem, card->ramsize); ++#endif + } + card->mvalid = 0; + } +@@ -94,12 +98,20 @@ + Mem, Id); + return -1; + } ++#ifdef COMPAT_HAS_ISA_IOREMAP + if (check_mem_region(Mem, RAMSIZE)) { ++#else ++ if (check_shmem(Mem, RAMSIZE)) { ++#endif + printk(KERN_WARNING "eicon_isa_boot: memory at 0x%x already in use.\n", Mem); + return -1; + } + ++#ifdef COMPAT_HAS_ISA_IOREMAP + amem = (unsigned long) ioremap(Mem, RAMSIZE); ++#else ++ amem = (unsigned long) Mem; ++#endif + writew(0x55aa, amem + 0x402); + if (readw(amem + 0x402) != 0x55aa) primary = 0; + writew(0, amem + 0x402); +@@ -109,12 +121,16 @@ + if (primary) { + printk(KERN_INFO "Eicon: assuming pri card at 0x%x\n", Mem); + writeb(0, amem + 0x3ffe); ++#ifdef COMPAT_HAS_ISA_IOREMAP + iounmap((unsigned char *)amem); ++#endif + return EICON_CTYPE_ISAPRI; + } else { + printk(KERN_INFO "Eicon: assuming bri card at 0x%x\n", Mem); + writeb(0, amem + 0x400); ++#ifdef COMPAT_HAS_ISA_IOREMAP + iounmap((unsigned char *)amem); ++#endif + return EICON_CTYPE_ISABRI; + } + return -1; +@@ -151,6 +167,7 @@ + else + card->ramsize = RAMSIZE; + ++#ifdef COMPAT_HAS_ISA_IOREMAP + if (check_mem_region(card->physmem, card->ramsize)) { + printk(KERN_WARNING "eicon_isa_boot: memory at 0x%lx already in use.\n", + card->physmem); +@@ -159,6 +176,16 @@ + } + request_mem_region(card->physmem, card->ramsize, "Eicon ISA ISDN"); + card->shmem = (eicon_isa_shmem *) ioremap(card->physmem, card->ramsize); ++#else ++ /* Register shmem */ ++ if (check_shmem((unsigned long)card->shmem, card->ramsize)) { ++ printk(KERN_WARNING "eicon_isa_boot: memory at 0x%lx already in use.\n", ++ (unsigned long)card->shmem); ++ kfree(code); ++ return -EBUSY; ++ } ++ request_shmem((unsigned long)card->shmem, card->ramsize, "Eicon ISA ISDN"); ++#endif + #ifdef EICON_MCA_DEBUG + printk(KERN_INFO "eicon_isa_boot: card->ramsize = %d.\n", card->ramsize); + #endif +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_isa.h linux-2.4.29/drivers/isdn/eicon/eicon_isa.h +--- linux-2.4.29.old/drivers/isdn/eicon/eicon_isa.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/eicon_isa.h 2005-03-22 15:06:45.485177984 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: eicon_isa.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: eicon_isa.h,v 1.11 2001/09/24 13:22:47 kai Exp $ + * + * ISDN low-level module for Eicon active ISDN-Cards. + * +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_mod.c linux-2.4.29/drivers/isdn/eicon/eicon_mod.c +--- linux-2.4.29.old/drivers/isdn/eicon/eicon_mod.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/eicon_mod.c 2005-03-22 15:06:45.505174944 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: eicon_mod.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: eicon_mod.c,v 1.44 2001/11/20 09:48:25 armin Exp $ + * + * ISDN lowlevel-module for Eicon active cards. + * +@@ -44,7 +44,7 @@ + static eicon_card *cards = (eicon_card *) NULL; /* glob. var , contains + start of card-list */ + +-static char *eicon_revision = "$Revision: 1.1.4.1 $"; ++static char *eicon_revision = "$Revision: 1.44 $"; + + extern char *eicon_pci_revision; + extern char *eicon_isa_revision; +@@ -639,6 +639,18 @@ + static int + if_writecmd(const u_char * buf, int len, int user, int id, int channel) + { ++#if 0 ++ /* Not yet used */ ++ eicon_card *card = eicon_findcard(id); ++ ++ if (card) { ++ if (!card->flags & EICON_FLAGS_RUNNING) ++ return (len); ++ return (len); ++ } ++ printk(KERN_ERR ++ "eicon: if_writecmd called with invalid driverId!\n"); ++#endif + return (len); + } + +@@ -665,11 +677,8 @@ + else + cnt = skb->len; + +- if (user) { +- spin_unlock_irqrestore(&eicon_lock, flags); ++ if (user) + copy_to_user(p, skb->data, cnt); +- spin_lock_irqsave(&eicon_lock, flags); +- } + else + memcpy(p, skb->data, cnt); + +@@ -1459,6 +1468,7 @@ + + #ifndef MODULE + ++#ifdef COMPAT_HAS_NEW_SETUP + static int __init + eicon_setup(char *line) + { +@@ -1467,6 +1477,12 @@ + char *str; + + str = get_options(line, 4, ints); ++#else ++void ++eicon_setup(char *str, int *ints) ++{ ++ int i, argc; ++#endif + + argc = ints[0]; + i = 1; +@@ -1494,9 +1510,13 @@ + #else + printk(KERN_INFO "Eicon ISDN active driver setup\n"); + #endif ++#ifdef COMPAT_HAS_NEW_SETUP + return(1); + } + __setup("eicon=", eicon_setup); ++#else ++} ++#endif + + #endif /* MODULE */ + +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_pci.c linux-2.4.29/drivers/isdn/eicon/eicon_pci.c +--- linux-2.4.29.old/drivers/isdn/eicon/eicon_pci.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/eicon_pci.c 2005-03-22 15:06:45.522172360 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: eicon_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: eicon_pci.c,v 1.18 2001/09/24 13:22:47 kai Exp $ + * + * ISDN low-level module for Eicon active ISDN-Cards. + * Hardware-specific code for PCI cards. +@@ -24,7 +24,7 @@ + #include "adapter.h" + #include "uxio.h" + +-char *eicon_pci_revision = "$Revision: 1.1.4.1 $"; ++char *eicon_pci_revision = "$Revision: 1.18 $"; + + #if CONFIG_PCI /* intire stuff is only for PCI */ + #ifdef CONFIG_ISDN_DRV_EICON_PCI +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/eicon_pci.h linux-2.4.29/drivers/isdn/eicon/eicon_pci.h +--- linux-2.4.29.old/drivers/isdn/eicon/eicon_pci.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/eicon_pci.h 2005-03-22 15:06:45.538169928 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: eicon_pci.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: eicon_pci.h,v 1.7 2001/09/24 13:22:47 kai Exp $ + * + * ISDN low-level module for Eicon active ISDN-Cards (PCI part). + * +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/fourbri.c linux-2.4.29/drivers/isdn/eicon/fourbri.c +--- linux-2.4.29.old/drivers/isdn/eicon/fourbri.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/fourbri.c 2005-03-22 15:06:45.553167648 +0100 +@@ -337,8 +337,7 @@ + static int diva_server_4bri_start(card_t *card, byte *channels) + { + byte *ctl; +- byte *shared; +- int i; ++ byte *shared, i; + int adapter_num; + + DPRINTF(("divas: start Diva Server 4BRI")); +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/kprintf.c linux-2.4.29/drivers/isdn/eicon/kprintf.c +--- linux-2.4.29.old/drivers/isdn/eicon/kprintf.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/kprintf.c 2005-03-22 15:06:45.601160352 +0100 +@@ -18,6 +18,468 @@ + #include "divalog.h" + #include "uxio.h" + ++/* ++ * Implementation of printf and sprintf for kernel ++ */ ++ ++#define MAX_BUFF (80) /* limit size of temporary buffers */ ++ ++#define WRITE_CHAR(BUFFER, SIZE, C) \ ++ if (--(SIZE) < 0) { (BUFFER)--; *(BUFFER) = '\0'; return; } *(BUFFER)++ = (C) ++ ++ ++/* ++ * convert a number to decimal ASCII ++ */ ++ ++static ++void do_decimal( char *temp, ++ int temp_len, ++ unsigned int value, ++ char *s) ++ ++{ ++ int i; ++ ++ temp[0] = '\0'; ++ ++ for (i = 1; i < temp_len; i++) ++ { ++ temp[i] = (char) ((value % 10) + (int) '0'); ++ value /= 10; ++ } ++ ++ for (i = (temp_len - 1); temp[i] == '0'; i--) ++ { ++ ; ++ } ++ ++ if (i == 0) ++ { ++ i++; ++ } ++ ++ while (i >= 0) ++ { ++ *s++ = temp[i--]; ++ } ++ ++ return; ++} ++ ++/* ++ * convert a number to octal ASCII ++ */ ++ ++static ++void do_octal( char *temp, ++ unsigned int value, ++ char *s) ++ ++{ ++ int i; ++ ++ temp[0] = '\0'; ++ ++ for (i = 1; i <= 11; i++) ++ { ++ temp[i] = (char) ((value & 07) + (int) '0'); ++ value >>= 3; ++ } ++ temp[11] &= '3'; ++ ++ for (i = 11; temp[i] == '0'; i--) ++ { ++ ; ++ } ++ ++ if (i == 0) ++ { ++ i++; ++ } ++ ++ while (i >= 0) ++ { ++ *s++ = temp[i--]; ++ } ++ ++ return; ++} ++ ++/* ++ * convert a number to hex ASCII ++ */ ++ ++static ++void do_hex( char *temp, ++ unsigned int value, ++ char *s) ++ ++{ ++ int i; ++ static ++ char *dec_to_hex = "0123456789abcdef"; ++ ++ temp[0] = '\0'; ++ ++ for (i = 1; i <= 8; i++) ++ { ++ temp[i] = dec_to_hex[value & 0x0f]; ++ value >>= 4; ++ } ++ ++ for (i = 8; temp[i] == '0'; i--) ++ { ++ ; ++ } ++ ++ if (i == 0) ++ { ++ i++; ++ } ++ ++ while (i >= 0) ++ { ++ *s++ = temp[i--]; ++ } ++ ++ return; ++} ++ ++/* ++ * convert a buffer to ASCII HEX ++ */ ++ ++static ++void do_buffer( char *buffer, ++ int length, ++ char *s) ++ ++{ ++ static ++ char hex_char [] = "0123456789abcdef"; ++ char *b = buffer; ++ int hex_byte; ++ int nybble; ++ ++ length = (length >= ((MAX_BUFF / 3) + 1)) ? (MAX_BUFF / 3) : length; ++ ++ while (length) ++ { ++ hex_byte = (int) *b++; ++ nybble = (hex_byte >> 4) & 0xf; ++ *s++ = hex_char[nybble]; ++ nybble = hex_byte & 0xf; ++ *s++ = hex_char[nybble]; ++ *s++ = ' '; ++ length--; ++ } ++ *s = '\0'; ++ ++ return; ++} ++ ++/* ++ * Body of sprintf function: behaves just like standard sprintf, except we ++ * have an extra argument (buffer size) which we use to ensure we don't ++ * overflow ++ */ ++ ++void Divas_vsprintf( char *buffer, ++ int size, ++ char *fmt, ++ va_list argptr) ++ ++{ ++ char c; /* single character buffer */ ++ int i; /* handy scratch counter */ ++ int f; /* format character (after %) */ ++ char *str; /* pointer into string */ ++ char temp[20]; /* temp buffer used in printing numbers */ ++ char string[MAX_BUFF]; /* output from number conversion */ ++ int length; /* length of string "str" */ ++ char fill; /* fill character ' ' or '0' */ ++ boolean_t leftjust; /* TRUE if left justified, else right justified */ ++ int fmax, fmin; /* field specifiers % MIN . MAX s */ ++ int leading; /* number of leading/trailing fill characters */ ++ char sign; /* set to '-' for negative decimals */ ++ int number; /* numeric argument */ ++ ++ char *buff_ptr; /* pointer to user's buffer of hex data */ ++ int buff_len; /* length of hex data */ ++ ++ /* make sure we have somthing to write into */ ++ ++ if ((!buffer) || (size <= 0)) ++ { ++ return; ++ } ++ ++ while (TRUE) ++ { ++ /* echo characters until end or '%' encountered */ ++ ++ while ((c = *fmt++) != '%') ++ { ++ if (!c) ++ { ++ *buffer = '\0'; ++ return; ++ } ++ WRITE_CHAR(buffer, size, c); ++ } ++ ++ /* echo %% as % */ ++ ++ if (*fmt == '%') ++ { ++ WRITE_CHAR(buffer, size, *fmt); ++ continue; ++ } ++ ++ /* %- turns on left-justify */ ++ ++ if ((leftjust = (boolean_t) ((*fmt == '-') ? TRUE : FALSE))) ++ { ++ fmt++; ++ } ++ ++ /* %0 turns on zero filling */ ++ ++ if (*fmt == '0') ++ { ++ fill = '0'; ++ } ++ else ++ { ++ fill = ' '; ++ } ++ ++ /* minium field width specifier for %d, u, x, c, s */ ++ ++ fmin = 0; ++ ++ if (*fmt == '*') ++ { ++ fmin = va_arg(argptr, int); ++ fmt++; ++ } ++ else ++ { ++ while ('0' <= *fmt && *fmt <= '9') ++ { ++ fmin = (fmin * 10) + (*fmt++ - '0'); ++ } ++ } ++ ++ /* maximum string width specifier for %s */ ++ ++ fmax = 0; ++ ++ if (*fmt == '.') ++ { ++ if (*(++fmt) == '*') ++ { ++ fmax = va_arg(argptr, int); ++ fmt++; ++ } ++ else ++ { ++ while ('0' <= *fmt && *fmt <= '9') ++ { ++ fmax = (fmax * 10) + (*fmt++ - '0'); ++ } ++ } ++ } ++ ++ /* skip over 'l' option (ints are assumed same size as longs) */ ++ ++ if (*fmt == 'l') ++ { ++ fmt++; ++ } ++ ++ /* get the format chacater */ ++ ++ if (!(f = *fmt++)) ++ { ++ WRITE_CHAR(buffer, size, '%'); ++ *buffer = '\0'; ++ return; ++ } ++ ++ sign = '\0'; /* sign == '-' for negative decimal */ ++ ++ str = string; ++ ++ switch (f) ++ { ++ case 'c' : ++ string[0] = (char) va_arg(argptr, int); ++ string[1] = '\0'; ++ fmax = 0; ++ fill = ' '; ++ break; ++ ++ case 's' : ++ str = va_arg(argptr, char *); ++ fill = ' '; ++ break; ++ ++ case 'D' : ++ case 'd' : ++ number = va_arg(argptr, int); ++ if (number < 0) ++ { ++ sign = '-'; ++ number = -number; ++ } ++ do_decimal(temp, DIM(temp), (unsigned int) number, str); ++ fmax = 0; ++ break; ++ ++ case 'U' : ++ case 'u' : ++ number = va_arg(argptr, int); ++ do_decimal(temp, DIM(temp), (unsigned int) number, str); ++ fmax = 0; ++ break; ++ ++ case 'O' : ++ case 'o' : ++ number = va_arg(argptr, int); ++ do_octal(temp, (unsigned int) number, str); ++ fmax = 0; ++ break; ++ ++ case 'X' : ++ case 'x' : ++ number = va_arg(argptr, int); ++ do_hex(temp, (unsigned int) number, str); ++ fmax = 0; ++ break; ++ ++ case 'H' : ++ case 'h' : ++ buff_ptr = va_arg(argptr, char *); ++ buff_len = va_arg(argptr, int); ++ do_buffer(buff_ptr, buff_len, str); ++ fmax = 0; ++ break; ++ ++ default : ++ WRITE_CHAR(buffer, size, ((char) f)); ++ break; ++ } ++ ++ /* get the length of the string */ ++ ++ length = 0; ++ while (str[length]) ++ { ++ length++; ++ } ++ ++ /* make sure we have fmax and fmin values that are O.K. */ ++ ++ if (fmin > DIM(string) || fmin < 0) ++ { ++ fmin = 0; ++ } ++ ++ if (fmax > DIM(string) || fmax < 0) ++ { ++ fmax = 0; ++ } ++ ++ /* figure out how many leading characters thare are */ ++ ++ leading = 0; ++ ++ if (fmax || fmin) ++ { ++ if (fmax) ++ { ++ if (length > fmax) ++ { ++ length = fmax; ++ } ++ } ++ ++ if (fmin) ++ { ++ leading = fmin - length; ++ } ++ ++ if (sign == '-') ++ { ++ leading--; ++ } ++ } ++ ++ /* output sign now, if fill is numeric */ ++ ++ if (sign == '-' && fill == '0') ++ { ++ WRITE_CHAR(buffer, size, '-'); ++ } ++ ++ /* if right justified, output fill characters */ ++ ++ if (!leftjust) ++ { ++ for (i = 0; i < leading; i++) ++ { ++ WRITE_CHAR(buffer, size, fill); ++ } ++ } ++ ++ /* output sign now, if fill is spaces */ ++ ++ if (sign == '-' && fill == ' ') ++ { ++ WRITE_CHAR(buffer, size, '-'); ++ } ++ ++ /* now the actual value */ ++ ++ for (i = 0; i < length; i++) ++ { ++ WRITE_CHAR(buffer, size, str[i]); ++ } ++ ++ /* if left justified, fill out with the fill character */ ++ ++ if (leftjust) ++ { ++ for (i = 0; i < leading; i++) ++ { ++ WRITE_CHAR(buffer, size, fill); ++ } ++ } ++ } ++} ++ ++/* ++ * sprintf for kernel ++ * ++ * call our vsprintf assuming user has a big buffer.... ++ */ ++ ++void DivasSprintf(char *buffer, char *fmt, ...) ++ ++{ ++ va_list argptr; /* pointer to additional args */ ++ ++ va_start(argptr, fmt); ++ ++ Divas_vsprintf(buffer, 1024, fmt, argptr); ++ ++ va_end(argptr); ++ ++ return; ++} ++ + void DivasPrintf(char *fmt, ...) + + { +@@ -40,7 +502,7 @@ + + /* call vsprintf to format the user's information */ + +- vsnprintf(log.buffer, DIM(log.buffer), fmt, argptr); ++ Divas_vsprintf(log.buffer, DIM(log.buffer), fmt, argptr); + + va_end(argptr); + +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/lincfg.c linux-2.4.29/drivers/isdn/eicon/lincfg.c +--- linux-2.4.29.old/drivers/isdn/eicon/lincfg.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/lincfg.c 2005-03-22 15:06:45.620157464 +0100 +@@ -26,6 +26,9 @@ + #include "uxio.h" + + #include <linux/pci.h> ++#ifndef COMPAT_HAS_2_2_PCI ++#include <linux/pci_ids.h> ++#endif + #include <linux/kernel.h> + #include <linux/ioport.h> + +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/linchr.c linux-2.4.29/drivers/isdn/eicon/linchr.c +--- linux-2.4.29.old/drivers/isdn/eicon/linchr.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/linchr.c 2005-03-22 15:06:45.635155184 +0100 +@@ -154,17 +154,17 @@ + klog_t *pHeadItem; + + if (BufferSize < sizeof(klog_t)) ++ { ++ printk(KERN_WARNING "Divas: Divalog buffer specifed a size that is too small (%d - %d required)\n", ++ BufferSize, sizeof(klog_t)); + return -EIO; ++ } + + pHeadItem = (klog_t *) DivasLogFifoRead(); + + if (pHeadItem) + { +- if(copy_to_user(pClientLogBuffer, pHeadItem, sizeof(klog_t))) +- { +- kfree(pHeadItem); +- return -EFAULT; +- } ++ memcpy(pClientLogBuffer, pHeadItem, sizeof(klog_t)); + kfree(pHeadItem); + return sizeof(klog_t); + } +diff -rNu linux-2.4.29.old/drivers/isdn/eicon/linio.c linux-2.4.29/drivers/isdn/eicon/linio.c +--- linux-2.4.29.old/drivers/isdn/eicon/linio.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/eicon/linio.c 2005-03-22 15:06:45.651152752 +0100 +@@ -15,6 +15,7 @@ + #include <linux/slab.h> + #include <linux/pci.h> + #include <linux/delay.h> ++#include <linux/isdn_compat.h> + #undef N_DATA + + #include "uxio.h" +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/Makefile linux-2.4.29/drivers/isdn/hisax/Makefile +--- linux-2.4.29.old/drivers/isdn/hisax/Makefile 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/Makefile 2005-03-22 15:06:45.819127216 +0100 +@@ -4,20 +4,17 @@ + + O_TARGET := vmlinux-obj.o + +-# Define maximum number of cards +- +-EXTRA_CFLAGS += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS) +- + # Objects that export symbols. + +-export-objs := config.o hisax_isac.o isdnhdlc.o ++export-objs := config.o fsm.o hisax_isac.o + + # Multipart objects. + + list-multi := hisax.o hisax_st5481.o + hisax-objs := config.o isdnl1.o tei.o isdnl2.o isdnl3.o \ + lmgr.o q931.o callc.o fsm.o cert.o +-hisax_st5481-objs := st5481_init.o st5481_usb.o st5481_d.o st5481_b.o ++hisax_st5481-objs := st5481_init.o st5481_usb.o st5481_d.o st5481_b.o \ ++ st5481_hdlc.o + + # Optional parts of multipart objects. + hisax-objs-$(CONFIG_HISAX_EURO) += l3dss1.o +@@ -33,7 +30,7 @@ + hisax-objs-$(CONFIG_HISAX_FRITZPCI) += avm_pci.o isac.o arcofi.o + hisax-objs-$(CONFIG_HISAX_ELSA) += elsa.o isac.o arcofi.o hscx.o + hisax-objs-$(CONFIG_HISAX_IX1MICROR2) += ix1_micro.o isac.o arcofi.o hscx.o +-hisax-objs-$(CONFIG_HISAX_DIEHLDIVA) += diva.o isac.o arcofi.o hscx.o ipacx.o ++hisax-objs-$(CONFIG_HISAX_DIEHLDIVA) += diva.o isac.o arcofi.o hscx.o + hisax-objs-$(CONFIG_HISAX_ASUSCOM) += asuscom.o isac.o arcofi.o hscx.o + hisax-objs-$(CONFIG_HISAX_TELEINT) += teleint.o isac.o arcofi.o hfc_2bs0.o + hisax-objs-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o isac.o arcofi.o hscx.o isar.o +@@ -44,6 +41,7 @@ + hisax-objs-$(CONFIG_HISAX_HFCS) += hfcscard.o hfc_2bds0.o + hisax-objs-$(CONFIG_HISAX_HFC_PCI) += hfc_pci.o + hisax-objs-$(CONFIG_HISAX_HFC_SX) += hfc_sx.o ++hisax-objs-$(CONFIG_HISAX_HFC_USB) += hfc_usbr.o + hisax-objs-$(CONFIG_HISAX_NICCY) += niccy.o isac.o arcofi.o hscx.o + hisax-objs-$(CONFIG_HISAX_ISURF) += isurf.o isac.o arcofi.o isar.o + hisax-objs-$(CONFIG_HISAX_HSTSAPHIR) += saphir.o isac.o arcofi.o hscx.o +@@ -51,7 +49,6 @@ + hisax-objs-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o isac.o arcofi.o hscx.o + hisax-objs-$(CONFIG_HISAX_GAZEL) += gazel.o isac.o arcofi.o hscx.o + hisax-objs-$(CONFIG_HISAX_W6692) += w6692.o +-hisax-objs-$(CONFIG_HISAX_ENTERNOW_PCI) += enternow_pci.o amd7930_fn.o + #hisax-objs-$(CONFIG_HISAX_TESTEMU) += testemu.o + + hisax-objs += $(sort $(hisax-objs-y)) +@@ -61,10 +58,9 @@ + obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o + obj-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o + obj-$(CONFIG_HISAX_ELSA_CS) += elsa_cs.o +-obj-$(CONFIG_HISAX_AVM_A1_CS) += avma1_cs.o +-obj-$(CONFIG_HISAX_ST5481) += hisax_st5481.o isdnhdlc.o +-obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o +-obj-$(CONFIG_USB_AUERISDN) += isdnhdlc.o ++obj-$(CONFIG_HISAX_HFC_USB_CS) += hfc_usb.o ++obj-$(CONFIG_HISAX_ST5481) += hisax_st5481.o ++obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_fcpcipnp.o hisax_isac.o + + CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?) + CFLAGS_cert.o := -DCERTIFICATION=$(CERT) +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/amd7930.c linux-2.4.29/drivers/isdn/hisax/amd7930.c +--- linux-2.4.29.old/drivers/isdn/hisax/amd7930.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/amd7930.c 2005-03-22 15:06:45.837124480 +0100 +@@ -0,0 +1,755 @@ ++/* $Id: amd7930.c,v 1.8 2001/09/24 13:22:55 kai Exp $ ++ * ++ * HiSax ISDN driver - chip specific routines for AMD 7930 ++ * ++ * Author Brent Baccala ++ * Copyright by Brent Baccala <baccala@FreeSoft.org> ++ * ++ * This software may be used and distributed according to the terms ++ * of the GNU General Public License, incorporated herein by reference. ++ * ++ * - Existing ISDN HiSax driver provides all the smarts ++ * - it compiles, runs, talks to an isolated phone switch, connects ++ * to a Cisco, pings go through ++ * - AMD 7930 support only (no DBRI yet) ++ * - no US NI-1 support (may not work on US phone system - untested) ++ * - periodic packet loss, apparently due to lost interrupts ++ * - ISDN sometimes freezes, requiring reboot before it will work again ++ * ++ * The code is unreliable enough to be consider alpha ++ * ++ * This file is (c) under GNU General Public License ++ * ++ * Advanced Micro Devices' Am79C30A is an ISDN/audio chip used in the ++ * SparcStation 1+. The chip provides microphone and speaker interfaces ++ * which provide mono-channel audio at 8K samples per second via either ++ * 8-bit A-law or 8-bit mu-law encoding. Also, the chip features an ++ * ISDN BRI Line Interface Unit (LIU), I.430 S/T physical interface, ++ * which performs basic D channel LAPD processing and provides raw ++ * B channel data. The digital audio channel, the two ISDN B channels, ++ * and two 64 Kbps channels to the microprocessor are all interconnected ++ * via a multiplexer. ++ * ++ * This driver interfaces to the Linux HiSax ISDN driver, which performs ++ * all high-level Q.921 and Q.931 ISDN functions. The file is not ++ * itself a hardware driver; rather it uses functions exported by ++ * the AMD7930 driver in the sparcaudio subsystem (drivers/sbus/audio), ++ * allowing the chip to be simultaneously used for both audio and ISDN data. ++ * The hardware driver does _no_ buffering, but provides several callbacks ++ * which are called during interrupt service and should therefore run quickly. ++ * ++ * D channel transmission is performed by passing the hardware driver the ++ * address and size of an skb's data area, then waiting for a callback ++ * to signal successful transmission of the packet. A task is then ++ * queued to notify the HiSax driver that another packet may be transmitted. ++ * ++ * D channel reception is quite simple, mainly because of: ++ * 1) the slow speed of the D channel - 16 kbps, and ++ * 2) the presence of an 8- or 32-byte (depending on chip version) FIFO ++ * to buffer the D channel data on the chip ++ * Worst case scenario of back-to-back packets with the 8 byte buffer ++ * at 16 kbps yields an service time of 4 ms - long enough to preclude ++ * the need for fancy buffering. We queue a background task that copies ++ * data out of the receive buffer into an skb, and the hardware driver ++ * simply does nothing until we're done with the receive buffer and ++ * reset it for a new packet. ++ * ++ * B channel processing is more complex, because of: ++ * 1) the faster speed - 64 kbps, ++ * 2) the lack of any on-chip buffering (it interrupts for every byte), and ++ * 3) the lack of any chip support for HDLC encapsulation ++ * ++ * The HiSax driver can put each B channel into one of three modes - ++ * L1_MODE_NULL (channel disabled), L1_MODE_TRANS (transparent data relay), ++ * and L1_MODE_HDLC (HDLC encapsulation by low-level driver). ++ * L1_MODE_HDLC is the most common, used for almost all "pure" digital ++ * data sessions. L1_MODE_TRANS is used for ISDN audio. ++ * ++ * HDLC B channel transmission is performed via a large buffer into ++ * which the skb is copied while performing HDLC bit-stuffing. A CRC ++ * is computed and attached to the end of the buffer, which is then ++ * passed to the low-level routines for raw transmission. Once ++ * transmission is complete, the hardware driver is set to enter HDLC ++ * idle by successive transmission of mark (all 1) bytes, waiting for ++ * the ISDN driver to prepare another packet for transmission and ++ * deliver it. ++ * ++ * HDLC B channel reception is performed via an X-byte ring buffer ++ * divided into N sections of X/N bytes each. Defaults: X=256 bytes, N=4. ++ * As the hardware driver notifies us that each section is full, we ++ * hand it the next section and schedule a background task to peruse ++ * the received section, bit-by-bit, with an HDLC decoder. As ++ * packets are detected, they are copied into a large buffer while ++ * decoding HDLC bit-stuffing. The ending CRC is verified, and if ++ * it is correct, we alloc a new skb of the correct length (which we ++ * now know), copy the packet into it, and hand it to the upper layers. ++ * Optimization: for large packets, we hand the buffer (which also ++ * happens to be an skb) directly to the upper layer after an skb_trim, ++ * and alloc a new large buffer for future packets, thus avoiding a copy. ++ * Then we return to HDLC processing; state is saved between calls. ++ * ++ */ ++ ++#define __NO_VERSION__ ++#include "hisax.h" ++#include "../../sbus/audio/amd7930.h" ++#include "isac.h" ++#include "isdnl1.h" ++#include "rawhdlc.h" ++#include <linux/interrupt.h> ++ ++static const char *amd7930_revision = "$Revision: 1.8 $"; ++ ++#define RCV_BUFSIZE 1024 /* Size of raw receive buffer in bytes */ ++#define RCV_BUFBLKS 4 /* Number of blocks to divide buffer into ++ * (must divide RCV_BUFSIZE) */ ++ ++static void Bchan_fill_fifo(struct BCState *, struct sk_buff *); ++ ++static void ++Bchan_xmt_bh(struct BCState *bcs) ++{ ++ struct sk_buff *skb; ++ ++ if (bcs->hw.amd7930.tx_skb != NULL) { ++ dev_kfree_skb(bcs->hw.amd7930.tx_skb); ++ bcs->hw.amd7930.tx_skb = NULL; ++ } ++ ++ if ((skb = skb_dequeue(&bcs->squeue))) { ++ Bchan_fill_fifo(bcs, skb); ++ } else { ++ clear_bit(BC_FLG_BUSY, &bcs->Flag); ++ bcs->event |= 1 << B_XMTBUFREADY; ++ queue_task(&bcs->tqueue, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++ } ++} ++ ++static void ++Bchan_xmit_callback(struct BCState *bcs) ++{ ++ queue_task(&bcs->hw.amd7930.tq_xmt, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++} ++ ++/* B channel transmission: two modes (three, if you count L1_MODE_NULL) ++ * ++ * L1_MODE_HDLC - We need to do HDLC encapsulation before transmiting ++ * the packet (i.e. make_raw_hdlc_data). Since this can be a ++ * time-consuming operation, our completion callback just schedules ++ * a bottom half to do encapsulation for the next packet. In between, ++ * the link will just idle ++ * ++ * L1_MODE_TRANS - Data goes through, well, transparent. No HDLC encap, ++ * and we can't just let the link idle, so the "bottom half" actually ++ * gets called during the top half (it's our callback routine in this case), ++ * but it's a lot faster now since we don't call make_raw_hdlc_data ++ */ ++ ++static void ++Bchan_fill_fifo(struct BCState *bcs, struct sk_buff *skb) ++{ ++ struct IsdnCardState *cs = bcs->cs; ++ int len; ++ ++ if ((cs->debug & L1_DEB_HSCX) || (cs->debug & L1_DEB_HSCX_FIFO)) { ++ char tmp[1024]; ++ char *t = tmp; ++ ++ t += sprintf(t, "amd7930_fill_fifo %c cnt %d", ++ bcs->channel ? 'B' : 'A', skb->len); ++ if (cs->debug & L1_DEB_HSCX_FIFO) ++ QuickHex(t, skb->data, skb->len); ++ debugl1(cs, tmp); ++ } ++ ++ if (bcs->mode == L1_MODE_HDLC) { ++ len = make_raw_hdlc_data(skb->data, skb->len, ++ bcs->hw.amd7930.tx_buff, RAW_BUFMAX); ++ if (len > 0) ++ amd7930_bxmit(0, bcs->channel, ++ bcs->hw.amd7930.tx_buff, len, ++ (void *) &Bchan_xmit_callback, ++ (void *) bcs); ++ dev_kfree_skb(skb); ++ } else if (bcs->mode == L1_MODE_TRANS) { ++ amd7930_bxmit(0, bcs->channel, ++ bcs->hw.amd7930.tx_buff, skb->len, ++ (void *) &Bchan_xmt_bh, ++ (void *) bcs); ++ bcs->hw.amd7930.tx_skb = skb; ++ } else { ++ dev_kfree_skb(skb); ++ } ++} ++ ++static void ++Bchan_mode(struct BCState *bcs, int mode, int bc) ++{ ++ struct IsdnCardState *cs = bcs->cs; ++ ++ if (cs->debug & L1_DEB_HSCX) { ++ char tmp[40]; ++ sprintf(tmp, "AMD 7930 mode %d bchan %d/%d", ++ mode, bc, bcs->channel); ++ debugl1(cs, tmp); ++ } ++ bcs->mode = mode; ++} ++ ++/* Bchan_l2l1 is the entry point for upper layer routines that want to ++ * transmit on the B channel. PH_DATA_REQ is a normal packet that ++ * we either start transmitting (if idle) or queue (if busy). ++ * PH_PULL_REQ can be called to request a callback message (PH_PULL_CNF) ++ * once the link is idle. After a "pull" callback, the upper layer ++ * routines can use PH_PULL_IND to send data. ++ */ ++ ++static void ++Bchan_l2l1(struct PStack *st, int pr, void *arg) ++{ ++ struct sk_buff *skb = arg; ++ ++ switch (pr) { ++ case (PH_DATA_REQ): ++ if (test_bit(BC_FLG_BUSY, &st->l1.bcs->Flag)) { ++ skb_queue_tail(&st->l1.bcs->squeue, skb); ++ } else { ++ test_and_set_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); ++ Bchan_fill_fifo(st->l1.bcs, skb); ++ } ++ break; ++ case (PH_PULL_IND): ++ if (test_bit(BC_FLG_BUSY, &st->l1.bcs->Flag)) { ++ printk(KERN_WARNING "amd7930: this shouldn't happen\n"); ++ break; ++ } ++ test_and_set_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); ++ Bchan_fill_fifo(st->l1.bcs, skb); ++ break; ++ case (PH_PULL_REQ): ++ if (!test_bit(BC_FLG_BUSY, &st->l1.bcs->Flag)) { ++ clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); ++ st->l1.l1l2(st, PH_PULL_CNF, NULL); ++ } else ++ set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); ++ break; ++ } ++} ++ ++/* Receiver callback and bottom half - decodes HDLC at leisure (if ++ * L1_MODE_HDLC) and passes newly received skb on via bcs->rqueue. If ++ * a large packet is received, stick rv_skb (the buffer that the ++ * packet has been decoded into) on the receive queue and alloc a new ++ * (large) skb to act as buffer for future receives. If a small ++ * packet is received, leave rv_skb alone, alloc a new skb of the ++ * correct size, and copy the packet into it ++ */ ++ ++static void ++Bchan_recv_callback(struct BCState *bcs) ++{ ++ struct amd7930_hw *hw = &bcs->hw.amd7930; ++ ++ hw->rv_buff_in += RCV_BUFSIZE/RCV_BUFBLKS; ++ hw->rv_buff_in %= RCV_BUFSIZE; ++ ++ if (hw->rv_buff_in != hw->rv_buff_out) { ++ amd7930_brecv(0, bcs->channel, ++ hw->rv_buff + hw->rv_buff_in, ++ RCV_BUFSIZE/RCV_BUFBLKS, ++ (void *) &Bchan_recv_callback, (void *) bcs); ++ } ++ ++ queue_task(&hw->tq_rcv, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++} ++ ++static void ++Bchan_rcv_bh(struct BCState *bcs) ++{ ++ struct IsdnCardState *cs = bcs->cs; ++ struct amd7930_hw *hw = &bcs->hw.amd7930; ++ struct sk_buff *skb; ++ int len; ++ ++ if (cs->debug & L1_DEB_HSCX) { ++ char tmp[1024]; ++ ++ sprintf(tmp, "amd7930_Bchan_rcv (%d/%d)", ++ hw->rv_buff_in, hw->rv_buff_out); ++ debugl1(cs, tmp); ++ QuickHex(tmp, hw->rv_buff + hw->rv_buff_out, ++ RCV_BUFSIZE/RCV_BUFBLKS); ++ debugl1(cs, tmp); ++ } ++ ++ do { ++ if (bcs->mode == L1_MODE_HDLC) { ++ while ((len = read_raw_hdlc_data(hw->hdlc_state, ++ hw->rv_buff + hw->rv_buff_out, RCV_BUFSIZE/RCV_BUFBLKS, ++ hw->rv_skb->tail, HSCX_BUFMAX))) { ++ if (len > 0 && (cs->debug & L1_DEB_HSCX_FIFO)) { ++ char tmp[1024]; ++ char *t = tmp; ++ ++ t += sprintf(t, "amd7930_Bchan_rcv %c cnt %d", bcs->channel ? 'B' : 'A', len); ++ QuickHex(t, hw->rv_skb->tail, len); ++ debugl1(cs, tmp); ++ } ++ ++ if (len > HSCX_BUFMAX/2) { ++ /* Large packet received */ ++ ++ if (!(skb = dev_alloc_skb(HSCX_BUFMAX))) { ++ printk(KERN_WARNING "amd7930: receive out of memory"); ++ } else { ++ skb_put(hw->rv_skb, len); ++ skb_queue_tail(&bcs->rqueue, hw->rv_skb); ++ hw->rv_skb = skb; ++ bcs->event |= 1 << B_RCVBUFREADY; ++ queue_task(&bcs->tqueue, &tq_immediate); ++ } ++ } else if (len > 0) { ++ /* Small packet received */ ++ ++ if (!(skb = dev_alloc_skb(len))) { ++ printk(KERN_WARNING "amd7930: receive out of memory\n"); ++ } else { ++ memcpy(skb_put(skb, len), hw->rv_skb->tail, len); ++ skb_queue_tail(&bcs->rqueue, skb); ++ bcs->event |= 1 << B_RCVBUFREADY; ++ queue_task(&bcs->tqueue, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++ } ++ } else { ++ /* Reception Error */ ++ /* printk("amd7930: B channel receive error\n"); */ ++ } ++ } ++ } else if (bcs->mode == L1_MODE_TRANS) { ++ if (!(skb = dev_alloc_skb(RCV_BUFSIZE/RCV_BUFBLKS))) { ++ printk(KERN_WARNING "amd7930: receive out of memory\n"); ++ } else { ++ memcpy(skb_put(skb, RCV_BUFSIZE/RCV_BUFBLKS), ++ hw->rv_buff + hw->rv_buff_out, ++ RCV_BUFSIZE/RCV_BUFBLKS); ++ skb_queue_tail(&bcs->rqueue, skb); ++ bcs->event |= 1 << B_RCVBUFREADY; ++ queue_task(&bcs->tqueue, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++ } ++ } ++ ++ if (hw->rv_buff_in == hw->rv_buff_out) { ++ /* Buffer was filled up - need to restart receiver */ ++ amd7930_brecv(0, bcs->channel, ++ hw->rv_buff + hw->rv_buff_in, ++ RCV_BUFSIZE/RCV_BUFBLKS, ++ (void *) &Bchan_recv_callback, ++ (void *) bcs); ++ } ++ ++ hw->rv_buff_out += RCV_BUFSIZE/RCV_BUFBLKS; ++ hw->rv_buff_out %= RCV_BUFSIZE; ++ ++ } while (hw->rv_buff_in != hw->rv_buff_out); ++} ++ ++static void ++Bchan_close(struct BCState *bcs) ++{ ++ struct sk_buff *skb; ++ ++ Bchan_mode(bcs, 0, 0); ++ amd7930_bclose(0, bcs->channel); ++ ++ if (test_bit(BC_FLG_INIT, &bcs->Flag)) { ++ skb_queue_purge(&bcs->rqueue); ++ skb_queue_purge(&bcs->squeue); ++ } ++ test_and_clear_bit(BC_FLG_INIT, &bcs->Flag); ++} ++ ++static int ++Bchan_open(struct BCState *bcs) ++{ ++ struct amd7930_hw *hw = &bcs->hw.amd7930; ++ ++ if (!test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) { ++ skb_queue_head_init(&bcs->rqueue); ++ skb_queue_head_init(&bcs->squeue); ++ } ++ test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); ++ ++ amd7930_bopen(0, bcs->channel, 0xff); ++ hw->rv_buff_in = 0; ++ hw->rv_buff_out = 0; ++ hw->tx_skb = NULL; ++ init_hdlc_state(hw->hdlc_state, 0); ++ amd7930_brecv(0, bcs->channel, ++ hw->rv_buff + hw->rv_buff_in, RCV_BUFSIZE/RCV_BUFBLKS, ++ (void *) &Bchan_recv_callback, (void *) bcs); ++ ++ bcs->event = 0; ++ bcs->tx_cnt = 0; ++ return (0); ++} ++ ++static void ++Bchan_init(struct BCState *bcs) ++{ ++ if (!(bcs->hw.amd7930.tx_buff = kmalloc(RAW_BUFMAX, GFP_ATOMIC))) { ++ printk(KERN_WARNING ++ "HiSax: No memory for amd7930.tx_buff\n"); ++ return; ++ } ++ if (!(bcs->hw.amd7930.rv_buff = kmalloc(RCV_BUFSIZE, GFP_ATOMIC))) { ++ printk(KERN_WARNING ++ "HiSax: No memory for amd7930.rv_buff\n"); ++ return; ++ } ++ if (!(bcs->hw.amd7930.rv_skb = dev_alloc_skb(HSCX_BUFMAX))) { ++ printk(KERN_WARNING ++ "HiSax: No memory for amd7930.rv_skb\n"); ++ return; ++ } ++ if (!(bcs->hw.amd7930.hdlc_state = kmalloc(sizeof(struct hdlc_state), ++ GFP_ATOMIC))) { ++ printk(KERN_WARNING ++ "HiSax: No memory for amd7930.hdlc_state\n"); ++ return; ++ } ++ ++ bcs->hw.amd7930.tq_rcv.sync = 0; ++ bcs->hw.amd7930.tq_rcv.routine = (void (*)(void *)) &Bchan_rcv_bh; ++ bcs->hw.amd7930.tq_rcv.data = (void *) bcs; ++ ++ bcs->hw.amd7930.tq_xmt.sync = 0; ++ bcs->hw.amd7930.tq_xmt.routine = (void (*)(void *)) &Bchan_xmt_bh; ++ bcs->hw.amd7930.tq_xmt.data = (void *) bcs; ++} ++ ++static void ++Bchan_manl1(struct PStack *st, int pr, ++ void *arg) ++{ ++ switch (pr) { ++ case (PH_ACTIVATE_REQ): ++ test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); ++ Bchan_mode(st->l1.bcs, st->l1.mode, st->l1.bc); ++ st->l1.l1man(st, PH_ACTIVATE_CNF, NULL); ++ break; ++ case (PH_DEACTIVATE_REQ): ++ if (!test_bit(BC_FLG_BUSY, &st->l1.bcs->Flag)) ++ Bchan_mode(st->l1.bcs, 0, 0); ++ test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); ++ break; ++ } ++} ++ ++int ++setstack_amd7930(struct PStack *st, struct BCState *bcs) ++{ ++ if (Bchan_open(bcs)) ++ return (-1); ++ st->l1.bcs = bcs; ++ st->l2.l2l1 = Bchan_l2l1; ++ st->ma.manl1 = Bchan_manl1; ++ setstack_manager(st); ++ bcs->st = st; ++ return (0); ++} ++ ++ ++static void ++amd7930_drecv_callback(void *arg, int error, unsigned int count) ++{ ++ struct IsdnCardState *cs = (struct IsdnCardState *) arg; ++ static struct tq_struct task; ++ struct sk_buff *skb; ++ ++ /* NOTE: This function is called directly from an interrupt handler */ ++ ++ if (1) { ++ if (!(skb = alloc_skb(count, GFP_ATOMIC))) ++ printk(KERN_WARNING "HiSax: D receive out of memory\n"); ++ else { ++ memcpy(skb_put(skb, count), cs->rcvbuf, count); ++ skb_queue_tail(&cs->rq, skb); ++ } ++ ++ task.routine = (void *) DChannel_proc_rcv; ++ task.data = (void *) cs; ++ queue_task(&task, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++ } ++ ++ if (cs->debug & L1_DEB_ISAC_FIFO) { ++ char tmp[128]; ++ char *t = tmp; ++ ++ t += sprintf(t, "amd7930 Drecv cnt %d", count); ++ if (error) t += sprintf(t, " ERR %x", error); ++ QuickHex(t, cs->rcvbuf, count); ++ debugl1(cs, tmp); ++ } ++ ++ amd7930_drecv(0, cs->rcvbuf, MAX_DFRAME_LEN, ++ &amd7930_drecv_callback, cs); ++} ++ ++static void ++amd7930_dxmit_callback(void *arg, int error) ++{ ++ struct IsdnCardState *cs = (struct IsdnCardState *) arg; ++ static struct tq_struct task; ++ ++ /* NOTE: This function is called directly from an interrupt handler */ ++ ++ /* may wish to do retransmission here, if error indicates collision */ ++ ++ if (cs->debug & L1_DEB_ISAC_FIFO) { ++ char tmp[128]; ++ char *t = tmp; ++ ++ t += sprintf(t, "amd7930 Dxmit cnt %d", cs->tx_skb->len); ++ if (error) t += sprintf(t, " ERR %x", error); ++ QuickHex(t, cs->tx_skb->data, cs->tx_skb->len); ++ debugl1(cs, tmp); ++ } ++ ++ cs->tx_skb = NULL; ++ ++ task.routine = (void *) DChannel_proc_xmt; ++ task.data = (void *) cs; ++ queue_task(&task, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++} ++ ++static void ++amd7930_Dchan_l2l1(struct PStack *st, int pr, void *arg) ++{ ++ struct IsdnCardState *cs = (struct IsdnCardState *) st->l1.hardware; ++ struct sk_buff *skb = arg; ++ char str[64]; ++ ++ switch (pr) { ++ case (PH_DATA_REQ): ++ if (cs->tx_skb) { ++ skb_queue_tail(&cs->sq, skb); ++#ifdef L2FRAME_DEBUG /* psa */ ++ if (cs->debug & L1_DEB_LAPD) ++ Logl2Frame(cs, skb, "PH_DATA Queued", 0); ++#endif ++ } else { ++ if ((cs->dlogflag) && (!(skb->data[2] & 1))) { ++ /* I-FRAME */ ++ LogFrame(cs, skb->data, skb->len); ++ sprintf(str, "Q.931 frame user->network tei %d", st->l2.tei); ++ dlogframe(cs, skb->data+4, skb->len-4, ++ str); ++ } ++ cs->tx_skb = skb; ++ cs->tx_cnt = 0; ++#ifdef L2FRAME_DEBUG /* psa */ ++ if (cs->debug & L1_DEB_LAPD) ++ Logl2Frame(cs, skb, "PH_DATA", 0); ++#endif ++ amd7930_dxmit(0, skb->data, skb->len, ++ &amd7930_dxmit_callback, cs); ++ } ++ break; ++ case (PH_PULL_IND): ++ if (cs->tx_skb) { ++ if (cs->debug & L1_DEB_WARN) ++ debugl1(cs, " l2l1 tx_skb exist this shouldn't happen"); ++ skb_queue_tail(&cs->sq, skb); ++ break; ++ } ++ if ((cs->dlogflag) && (!(skb->data[2] & 1))) { /* I-FRAME */ ++ LogFrame(cs, skb->data, skb->len); ++ sprintf(str, "Q.931 frame user->network tei %d", st->l2.tei); ++ dlogframe(cs, skb->data + 4, skb->len - 4, ++ str); ++ } ++ cs->tx_skb = skb; ++ cs->tx_cnt = 0; ++#ifdef L2FRAME_DEBUG /* psa */ ++ if (cs->debug & L1_DEB_LAPD) ++ Logl2Frame(cs, skb, "PH_DATA_PULLED", 0); ++#endif ++ amd7930_dxmit(0, cs->tx_skb->data, cs->tx_skb->len, ++ &amd7930_dxmit_callback, cs); ++ break; ++ case (PH_PULL_REQ): ++#ifdef L2FRAME_DEBUG /* psa */ ++ if (cs->debug & L1_DEB_LAPD) ++ debugl1(cs, "-> PH_REQUEST_PULL"); ++#endif ++ if (!cs->tx_skb) { ++ test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags); ++ st->l1.l1l2(st, PH_PULL_CNF, NULL); ++ } else ++ test_and_set_bit(FLG_L1_PULL_REQ, &st->l1.Flags); ++ break; ++ } ++} ++ ++int ++setDstack_amd7930(struct PStack *st, struct IsdnCardState *cs) ++{ ++ st->l2.l2l1 = amd7930_Dchan_l2l1; ++ if (! cs->rcvbuf) { ++ printk("setDstack_amd7930: No cs->rcvbuf!\n"); ++ } else { ++ amd7930_drecv(0, cs->rcvbuf, MAX_DFRAME_LEN, ++ &amd7930_drecv_callback, cs); ++ } ++ return (0); ++} ++ ++static void ++manl1_msg(struct IsdnCardState *cs, int msg, void *arg) { ++ struct PStack *st; ++ ++ st = cs->stlist; ++ while (st) { ++ st->ma.manl1(st, msg, arg); ++ st = st->next; ++ } ++} ++ ++static void ++amd7930_new_ph(struct IsdnCardState *cs) ++{ ++ switch (amd7930_get_liu_state(0)) { ++ case 3: ++ manl1_msg(cs, PH_POWERUP_CNF, NULL); ++ break; ++ ++ case 7: ++ manl1_msg(cs, PH_I4_P8_IND, NULL); ++ break; ++ ++ case 8: ++ manl1_msg(cs, PH_RSYNC_IND, NULL); ++ break; ++ } ++} ++ ++/* amd7930 LIU state change callback */ ++ ++static void ++amd7930_liu_callback(struct IsdnCardState *cs) ++{ ++ static struct tq_struct task; ++ ++ if (!cs) ++ return; ++ ++ if (cs->debug & L1_DEB_ISAC) { ++ char tmp[32]; ++ sprintf(tmp, "amd7930_liu state %d", amd7930_get_liu_state(0)); ++ debugl1(cs, tmp); ++ } ++ ++ task.sync = 0; ++ task.routine = (void *) &amd7930_new_ph; ++ task.data = (void *) cs; ++ queue_task(&task, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++} ++ ++void ++amd7930_l1cmd(struct IsdnCardState *cs, int msg, void *arg) ++{ ++ u_char val; ++ char tmp[32]; ++ ++ if (cs->debug & L1_DEB_ISAC) { ++ char tmp[32]; ++ sprintf(tmp, "amd7930_l1cmd msg %x", msg); ++ debugl1(cs, tmp); ++ } ++ ++ switch(msg) { ++ case PH_RESET_REQ: ++ if (amd7930_get_liu_state(0) <= 3) ++ amd7930_liu_activate(0,0); ++ else ++ amd7930_liu_deactivate(0); ++ break; ++ case PH_ENABLE_REQ: ++ break; ++ case PH_INFO3_REQ: ++ amd7930_liu_activate(0,0); ++ break; ++ case PH_TESTLOOP_REQ: ++ break; ++ default: ++ if (cs->debug & L1_DEB_WARN) { ++ sprintf(tmp, "amd7930_l1cmd unknown %4x", msg); ++ debugl1(cs, tmp); ++ } ++ break; ++ } ++} ++ ++static void init_amd7930(struct IsdnCardState *cs) ++{ ++ Bchan_init(&cs->bcs[0]); ++ Bchan_init(&cs->bcs[1]); ++ cs->bcs[0].BC_SetStack = setstack_amd7930; ++ cs->bcs[1].BC_SetStack = setstack_amd7930; ++ cs->bcs[0].BC_Close = Bchan_close; ++ cs->bcs[1].BC_Close = Bchan_close; ++ Bchan_mode(cs->bcs, 0, 0); ++ Bchan_mode(cs->bcs + 1, 0, 0); ++} ++ ++void ++release_amd7930(struct IsdnCardState *cs) ++{ ++} ++ ++static int ++amd7930_card_msg(struct IsdnCardState *cs, int mt, void *arg) ++{ ++ switch (mt) { ++ case CARD_RESET: ++ return(0); ++ case CARD_RELEASE: ++ release_amd7930(cs); ++ return(0); ++ case CARD_INIT: ++ cs->l1cmd = amd7930_l1cmd; ++ amd7930_liu_init(0, &amd7930_liu_callback, (void *)cs); ++ init_amd7930(cs); ++ return(0); ++ case CARD_TEST: ++ return(0); ++ } ++ return(0); ++} ++ ++int __init ++setup_amd7930(struct IsdnCard *card) ++{ ++ struct IsdnCardState *cs = card->cs; ++ char tmp[64]; ++ ++ strcpy(tmp, amd7930_revision); ++ printk(KERN_INFO "HiSax: AMD7930 driver Rev. %s\n", HiSax_getrev(tmp)); ++ if (cs->typ != ISDN_CTYPE_AMD7930) ++ return (0); ++ ++ cs->irq = amd7930_get_irqnum(0); ++ if (cs->irq == 0) ++ return (0); ++ ++ cs->cardmsg = &amd7930_card_msg; ++ ++ return (1); ++} +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/arcofi.c linux-2.4.29/drivers/isdn/hisax/arcofi.c +--- linux-2.4.29.old/drivers/isdn/hisax/arcofi.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/arcofi.c 2005-03-22 15:06:45.852122200 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: arcofi.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: arcofi.c,v 1.14 2001/09/24 13:22:55 kai Exp $ + * + * Ansteuerung ARCOFI 2165 + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/arcofi.h linux-2.4.29/drivers/isdn/hisax/arcofi.h +--- linux-2.4.29.old/drivers/isdn/hisax/arcofi.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/arcofi.h 2005-03-22 15:06:45.872119160 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: arcofi.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id$ + * + * Ansteuerung ARCOFI 2165 + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/asuscom.c linux-2.4.29/drivers/isdn/hisax/asuscom.c +--- linux-2.4.29.old/drivers/isdn/hisax/asuscom.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/asuscom.c 2005-03-22 15:06:45.889116576 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: asuscom.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: asuscom.c,v 1.14 2001/09/24 13:22:55 kai Exp $ + * + * low level stuff for ASUSCOM NETWORK INC. ISDNLink cards + * +@@ -14,7 +14,6 @@ + + #define __NO_VERSION__ + #include <linux/init.h> +-#include <linux/isapnp.h> + #include "hisax.h" + #include "isac.h" + #include "ipac.h" +@@ -23,7 +22,7 @@ + + extern const char *CardType[]; + +-const char *Asuscom_revision = "$Revision: 1.1.4.1 $"; ++const char *Asuscom_revision = "$Revision: 1.14 $"; + + #define byteout(addr,val) outb(val,addr) + #define bytein(addr) inb(addr) +@@ -310,27 +309,6 @@ + return(0); + } + +-#ifdef __ISAPNP__ +-static struct isapnp_device_id asus_ids[] __initdata = { +- { ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688), +- ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1688), +- (unsigned long) "Asus1688 PnP" }, +- { ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1690), +- ISAPNP_VENDOR('A', 'S', 'U'), ISAPNP_FUNCTION(0x1690), +- (unsigned long) "Asus1690 PnP" }, +- { ISAPNP_VENDOR('S', 'I', 'E'), ISAPNP_FUNCTION(0x0020), +- ISAPNP_VENDOR('S', 'I', 'E'), ISAPNP_FUNCTION(0x0020), +- (unsigned long) "Isurf2 PnP" }, +- { ISAPNP_VENDOR('E', 'L', 'F'), ISAPNP_FUNCTION(0x0000), +- ISAPNP_VENDOR('E', 'L', 'F'), ISAPNP_FUNCTION(0x0000), +- (unsigned long) "Iscas TE320" }, +- { 0, } +-}; +- +-static struct isapnp_device_id *adev = &asus_ids[0]; +-static struct pci_bus *pnp_c __devinitdata = NULL; +-#endif +- + int __init + setup_asuscom(struct IsdnCard *card) + { +@@ -343,45 +321,7 @@ + printk(KERN_INFO "HiSax: Asuscom ISDNLink driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_ASUSCOM) + return (0); +-#ifdef __ISAPNP__ +- if (!card->para[1] && isapnp_present()) { +- struct pci_bus *pb; +- struct pci_dev *pd; +- +- while(adev->card_vendor) { +- if ((pb = isapnp_find_card(adev->card_vendor, +- adev->card_device, pnp_c))) { +- pnp_c = pb; +- pd = NULL; +- if ((pd = isapnp_find_dev(pnp_c, +- adev->vendor, adev->function, pd))) { +- printk(KERN_INFO "HiSax: %s detected\n", +- (char *)adev->driver_data); +- pd->prepare(pd); +- pd->deactivate(pd); +- pd->activate(pd); +- card->para[1] = pd->resource[0].start; +- card->para[0] = pd->irq_resource[0].start; +- if (!card->para[0] || !card->para[1]) { +- printk(KERN_ERR "AsusPnP:some resources are missing %ld/%lx\n", +- card->para[0], card->para[1]); +- pd->deactivate(pd); +- return(0); +- } +- break; +- } else { +- printk(KERN_ERR "AsusPnP: PnP error card found, no device\n"); +- } +- } +- adev++; +- pnp_c=NULL; +- } +- if (!adev->card_vendor) { +- printk(KERN_INFO "AsusPnP: no ISAPnP card found\n"); +- return(0); +- } +- } +-#endif ++ + bytecnt = 8; + cs->hw.asus.cfg_reg = card->para[1]; + cs->irq = card->para[0]; +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/avm_a1.c linux-2.4.29/drivers/isdn/hisax/avm_a1.c +--- linux-2.4.29.old/drivers/isdn/hisax/avm_a1.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/avm_a1.c 2005-03-22 15:06:45.904114296 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: avm_a1.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: avm_a1.c,v 2.15 2001/09/24 13:22:55 kai Exp $ + * + * low level stuff for AVM A1 (Fritz) isdn cards + * +@@ -18,7 +18,7 @@ + #include "isdnl1.h" + + extern const char *CardType[]; +-static const char *avm_revision = "$Revision: 1.1.4.1 $"; ++static const char *avm_revision = "$Revision: 2.15 $"; + + #define AVM_A1_STAT_ISAC 0x01 + #define AVM_A1_STAT_HSCX 0x02 +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/avm_a1p.c linux-2.4.29/drivers/isdn/hisax/avm_a1p.c +--- linux-2.4.29.old/drivers/isdn/hisax/avm_a1p.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/avm_a1p.c 2005-03-22 15:06:45.919112016 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: avm_a1p.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: avm_a1p.c,v 2.9 2001/09/24 13:22:55 kai Exp $ + * + * low level stuff for the following AVM cards: + * A1 PCMCIA +@@ -57,7 +57,7 @@ + #define byteout(addr,val) outb(val,addr) + #define bytein(addr) inb(addr) + +-static const char *avm_revision = "$Revision: 1.1.4.1 $"; ++static const char *avm_revision = "$Revision: 2.9 $"; + + static inline u_char + ReadISAC(struct IsdnCardState *cs, u_char offset) +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/avm_pci.c linux-2.4.29/drivers/isdn/hisax/avm_pci.c +--- linux-2.4.29.old/drivers/isdn/hisax/avm_pci.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/avm_pci.c 2005-03-22 15:06:45.945108064 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: avm_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: avm_pci.c,v 1.29 2001/09/24 13:22:55 kai Exp $ + * + * low level stuff for AVM Fritz!PCI and ISA PnP isdn cards + * +@@ -19,11 +19,11 @@ + #include "isac.h" + #include "isdnl1.h" + #include <linux/pci.h> +-#include <linux/isapnp.h> ++#include <linux/isdn_compat.h> + #include <linux/interrupt.h> + + extern const char *CardType[]; +-static const char *avm_pci_rev = "$Revision: 1.1.4.1 $"; ++static const char *avm_pci_rev = "$Revision: 1.29 $"; + + #define AVM_FRITZ_PCI 1 + #define AVM_FRITZ_PNP 2 +@@ -291,8 +291,7 @@ + debugl1(cs, "hdlc_empty_fifo: incoming packet too large"); + return; + } +- p = bcs->hw.hdlc.rcvbuf + bcs->hw.hdlc.rcvidx; +- ptr = (u_int *)p; ++ ptr = (u_int *) p = bcs->hw.hdlc.rcvbuf + bcs->hw.hdlc.rcvidx; + bcs->hw.hdlc.rcvidx += count; + if (cs->subtyp == AVM_FRITZ_PCI) { + outl(idx, cs->hw.avm.cfg_reg + 4); +@@ -353,8 +352,7 @@ + } + if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) + debugl1(cs, "hdlc_fill_fifo %d/%ld", count, bcs->tx_skb->len); +- p = bcs->tx_skb->data; +- ptr = (u_int *)p; ++ ptr = (u_int *) p = bcs->tx_skb->data; + skb_pull(bcs->tx_skb, count); + bcs->tx_cnt -= count; + bcs->hw.hdlc.count += count; +@@ -766,10 +764,6 @@ + } + + static struct pci_dev *dev_avm __initdata = NULL; +-#ifdef __ISAPNP__ +-static struct pci_bus *bus_avm __initdata = NULL; +-static struct pci_dev *pnp_avm __initdata = NULL; +-#endif + + int __init + setup_avm_pcipnp(struct IsdnCard *card) +@@ -783,47 +777,10 @@ + if (cs->typ != ISDN_CTYPE_FRITZPCI) + return (0); + if (card->para[1]) { +- /* old manual method */ + cs->hw.avm.cfg_reg = card->para[1]; + cs->irq = card->para[0]; + cs->subtyp = AVM_FRITZ_PNP; + } else { +-#ifdef __ISAPNP__ +- if (isapnp_present()) { +- struct pci_bus *ba; +- if ((ba = isapnp_find_card( +- ISAPNP_VENDOR('A', 'V', 'M'), +- ISAPNP_FUNCTION(0x0900), bus_avm))) { +- bus_avm = ba; +- pnp_avm = NULL; +- if ((pnp_avm = isapnp_find_dev(bus_avm, +- ISAPNP_VENDOR('A', 'V', 'M'), +- ISAPNP_FUNCTION(0x0900), pnp_avm))) { +- pnp_avm->prepare(pnp_avm); +- pnp_avm->deactivate(pnp_avm); +- pnp_avm->activate(pnp_avm); +- cs->hw.avm.cfg_reg = +- pnp_avm->resource[0].start; +- cs->irq = +- pnp_avm->irq_resource[0].start; +- if (!cs->irq) { +- printk(KERN_ERR "FritzPnP:No IRQ\n"); +- pnp_avm->deactivate(pnp_avm); +- return(0); +- } +- if (!cs->hw.avm.cfg_reg) { +- printk(KERN_ERR "FritzPnP:No IO address\n"); +- pnp_avm->deactivate(pnp_avm); +- return(0); +- } +- cs->subtyp = AVM_FRITZ_PNP; +- goto ready; +- } +- } +- } else { +- printk(KERN_INFO "FritzPnP: no ISA PnP present\n"); +- } +-#endif + #if CONFIG_PCI + if (!pci_present()) { + printk(KERN_ERR "FritzPCI: no PCI bus present\n"); +@@ -838,7 +795,7 @@ + } + if (pci_enable_device(dev_avm)) + return(0); +- cs->hw.avm.cfg_reg = pci_resource_start(dev_avm, 1); ++ cs->hw.avm.cfg_reg = pci_resource_start_io(dev_avm, 1); + if (!cs->hw.avm.cfg_reg) { + printk(KERN_ERR "FritzPCI: No IO-Adr for PCI card found\n"); + return(0); +@@ -854,7 +811,6 @@ + return (0); + #endif /* CONFIG_PCI */ + } +-ready: + cs->hw.avm.isac = cs->hw.avm.cfg_reg + 0x10; + if (check_region((cs->hw.avm.cfg_reg), 32)) { + printk(KERN_WARNING +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/bkm_a4t.c linux-2.4.29/drivers/isdn/hisax/bkm_a4t.c +--- linux-2.4.29.old/drivers/isdn/hisax/bkm_a4t.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/bkm_a4t.c 2005-03-22 15:06:45.962105480 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: bkm_a4t.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: bkm_a4t.c,v 1.22 2001/09/24 13:22:55 kai Exp $ + * + * low level stuff for T-Berkom A4T + * +@@ -20,11 +20,12 @@ + #include "jade.h" + #include "isdnl1.h" + #include <linux/pci.h> ++#include <linux/isdn_compat.h> + #include "bkm_ax.h" + + extern const char *CardType[]; + +-const char *bkm_a4t_revision = "$Revision: 1.1.4.1 $"; ++const char *bkm_a4t_revision = "$Revision: 1.22 $"; + + + static inline u_char +@@ -293,13 +294,13 @@ + u16 sub_sys; + u16 sub_vendor; + +- sub_vendor = dev_a4t->subsystem_vendor; +- sub_sys = dev_a4t->subsystem_device; ++ pci_get_sub_vendor(dev_a4t,sub_vendor); ++ pci_get_sub_system(dev_a4t,sub_sys); + if ((sub_sys == PCI_DEVICE_ID_BERKOM_A4T) && (sub_vendor == PCI_VENDOR_ID_BERKOM)) { + if (pci_enable_device(dev_a4t)) + return(0); + found = 1; +- pci_memaddr = pci_resource_start(dev_a4t, 0); ++ pci_memaddr = pci_resource_start_mem(dev_a4t, 0); + cs->irq = dev_a4t->irq; + break; + } +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/bkm_a8.c linux-2.4.29/drivers/isdn/hisax/bkm_a8.c +--- linux-2.4.29.old/drivers/isdn/hisax/bkm_a8.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/bkm_a8.c 2005-03-22 15:06:45.982102440 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: bkm_a8.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: bkm_a8.c,v 1.22 2001/09/24 13:22:55 kai Exp $ + * + * low level stuff for Scitel Quadro (4*S0, passive) + * +@@ -20,6 +20,7 @@ + #include "hscx.h" + #include "isdnl1.h" + #include <linux/pci.h> ++#include <linux/isdn_compat.h> + #include "bkm_ax.h" + + #if CONFIG_PCI +@@ -28,7 +29,7 @@ + + extern const char *CardType[]; + +-const char sct_quadro_revision[] = "$Revision: 1.1.4.1 $"; ++const char sct_quadro_revision[] = "$Revision: 1.22 $"; + + static const char *sct_quadro_subtypes[] = + { +@@ -329,13 +330,13 @@ + while ((dev_a8 = pci_find_device(PCI_VENDOR_ID_PLX, + PCI_DEVICE_ID_PLX_9050, dev_a8))) { + +- sub_vendor_id = dev_a8->subsystem_vendor; +- sub_sys_id = dev_a8->subsystem_device; ++ pci_get_sub_vendor(dev_a8,sub_vendor_id); ++ pci_get_sub_system(dev_a8,sub_sys_id); + if ((sub_sys_id == PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO) && + (sub_vendor_id == PCI_VENDOR_ID_BERKOM)) { + if (pci_enable_device(dev_a8)) + return(0); +- pci_ioaddr1 = pci_resource_start(dev_a8, 1); ++ pci_ioaddr1 = pci_resource_start_io(dev_a8, 1); + pci_irq = dev_a8->irq; + pci_bus = dev_a8->bus->number; + pci_device_fn = dev_a8->devfn; +@@ -365,7 +366,7 @@ + pci_ioaddr1 &= PCI_BASE_ADDRESS_IO_MASK; + pcibios_write_config_dword(pci_bus, pci_device_fn, + PCI_BASE_ADDRESS_1, pci_ioaddr1); +- dev_a8->resource[ 1].start = pci_ioaddr1; ++ get_pcibase(dev_a8, 1) = pci_ioaddr1; + } + #endif /* End HACK */ + } +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/bkm_ax.h linux-2.4.29/drivers/isdn/hisax/bkm_ax.h +--- linux-2.4.29.old/drivers/isdn/hisax/bkm_ax.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/bkm_ax.h 2005-03-22 15:06:46.010098184 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: bkm_ax.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id$ + * + * low level decls for T-Berkom cards A4T and Scitel Quadro (4*S0, passive) + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/callc.c linux-2.4.29/drivers/isdn/hisax/callc.c +--- linux-2.4.29.old/drivers/isdn/hisax/callc.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/callc.c 2005-03-22 15:06:46.027095600 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: callc.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: callc.c,v 2.59 2002/02/09 21:19:11 keil Exp $ + * + * Author Karsten Keil + * Copyright by Karsten Keil <keil@isdn4linux.de> +@@ -26,7 +26,7 @@ + #define MOD_USE_COUNT ( GET_USE_COUNT (&__this_module)) + #endif /* MODULE */ + +-const char *lli_revision = "$Revision: 1.1.4.1 $"; ++const char *lli_revision = "$Revision: 2.59 $"; + + extern struct IsdnCard cards[]; + extern int nrcards; +@@ -145,9 +145,11 @@ + EV_PROCEED, /* 20 */ + EV_ALERT, /* 21 */ + EV_REDIR, /* 22 */ ++ EV_ALERTING, /* 23 */ ++ EV_PROCEEDING, /* 24 */ + }; + +-#define EVENT_COUNT (EV_REDIR + 1) ++#define EVENT_COUNT (EV_PROCEEDING + 1) + + static char *strEvent[] = + { +@@ -174,6 +176,8 @@ + "EV_PROCEED", + "EV_ALERT", + "EV_REDIR", ++ "EV_ALERTING", ++ "EV_PROCEEDING", + }; + + +@@ -286,6 +290,22 @@ + } + + static void ++lli_alerting(struct FsmInst *fi, int event, void *arg) ++{ ++ struct Channel *chanp = fi->userdata; ++ ++ HL_LL(chanp, ISDN_STAT_ALERT); ++} ++ ++static void ++lli_proceeding(struct FsmInst *fi, int event, void *arg) ++{ ++ struct Channel *chanp = fi->userdata; ++ ++ HL_LL(chanp, ISDN_STAT_PROCEED); ++} ++ ++static void + lli_resume(struct FsmInst *fi, int event, void *arg) + { + struct Channel *chanp = fi->userdata; +@@ -784,6 +804,8 @@ + {ST_OUT_DIAL, EV_DISCONNECT_IND, lli_release_req}, + {ST_OUT_DIAL, EV_RELEASE, lli_dhup_close}, + {ST_OUT_DIAL, EV_NOSETUP_RSP, lli_no_setup_rsp}, ++ {ST_OUT_DIAL, EV_PROCEEDING, lli_proceeding}, ++ {ST_OUT_DIAL, EV_ALERTING, lli_alerting}, + {ST_OUT_DIAL, EV_SETUP_ERR, lli_error}, + {ST_IN_WAIT_LL, EV_LEASED_REL, lli_failure_l}, + {ST_IN_WAIT_LL, EV_ACCEPTD, lli_setup_rsp}, +@@ -925,7 +947,7 @@ + ic.driver = cs->myid; + ic.command = ISDN_STAT_REDIR; + ic.arg = chan; +- ic.parm.num[0] = result; ++ (ulong)(ic.parm.num[0]) = result; + cs->iif.statcallb(&ic); + } /* stat_redir_result */ + +@@ -997,8 +1019,13 @@ + FsmEvent(&chanp->fi, EV_RELEASE, NULL); + break; + case (CC_PROCEED_SEND | INDICATION): ++ break; + case (CC_PROCEEDING | INDICATION): ++ FsmEvent(&chanp->fi, EV_PROCEEDING, NULL); ++ break; + case (CC_ALERTING | INDICATION): ++ FsmEvent(&chanp->fi, EV_ALERTING, NULL); ++ break; + case (CC_PROGRESS | INDICATION): + case (CC_NOTIFY | INDICATION): + break; +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/cert.c linux-2.4.29/drivers/isdn/hisax/cert.c +--- linux-2.4.29.old/drivers/isdn/hisax/cert.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/cert.c 2005-03-22 15:06:46.042093320 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: cert.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: cert.c,v 2.6 2001/09/24 13:22:56 kai Exp $ + * + * Author Karsten Keil + * Copyright by Karsten Keil <keil@isdn4linux.de> +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/config.c linux-2.4.29/drivers/isdn/hisax/config.c +--- linux-2.4.29.old/drivers/isdn/hisax/config.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/config.c 2005-03-22 15:06:46.077088000 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: config.c,v 1.1.4.5 2001/12/09 19:19:26 kai Exp $ ++/* $Id: config.c,v 2.84 2002/08/13 09:55:29 keil Exp $ + * + * Author Karsten Keil + * Copyright by Karsten Keil <keil@isdn4linux.de> +@@ -24,6 +24,11 @@ + #include <linux/kernel_stat.h> + #include <linux/tqueue.h> + #include <linux/interrupt.h> ++ ++#ifdef CONFIG_HISAX_HFC_USB ++#include "hisax_loadable.h" ++#endif ++ + #define HISAX_STATUS_BUFSIZE 4096 + #define INCLUDE_INLINE_FUNCS + +@@ -75,8 +80,7 @@ + * 37 HFC 2BDS0 S+/SP p0=irq p1=iobase + * 38 Travers Technologies NETspider-U PCI card + * 39 HFC 2BDS0-SP PCMCIA p0=irq p1=iobase +- * 40 hotplug interface +- * 41 Formula-n enter:now ISDN PCI a/b none ++ * 40 HFC-S USB none + * + * protocol can be either ISDN_PTYPE_EURO or ISDN_PTYPE_1TR6 or ISDN_PTYPE_NI1 + * +@@ -95,11 +99,17 @@ + "Siemens I-Surf", "Acer P10", "HST Saphir", "Telekom A4T", + "Scitel Quadro", "Gazel", "HFC 2BDS0 PCI", "Winbond 6692", + "HFC 2BDS0 SX", "NETspider-U", "HFC-2BDS0-SP PCMCIA", +- "Hotplug", "Formula-n enter:now PCI a/b", ++ "HFC-S USB", + }; + + void HiSax_closecard(int cardnr); + ++#ifdef CONFIG_HISAX_HFC_USB ++#define DEFAULT_CARD ISDN_CTYPE_HFC_USB ++#define DEFAULT_CFG {0,0,0,0} ++EXPORT_SYMBOL(hisax_register_hfcusb); ++#endif ++ + #ifdef CONFIG_HISAX_ELSA + #define DEFAULT_CARD ISDN_CTYPE_ELSA + #define DEFAULT_CFG {0,0,0,0} +@@ -339,19 +349,27 @@ + NULL, \ + } + +-struct IsdnCard cards[HISAX_MAX_CARDS] = { ++#define EMPTY_CARD {0, DEFAULT_PROTO, {0, 0, 0, 0}, NULL} ++ ++struct IsdnCard cards[] = { + FIRST_CARD, ++ EMPTY_CARD, ++ EMPTY_CARD, ++ EMPTY_CARD, ++ EMPTY_CARD, ++ EMPTY_CARD, ++ EMPTY_CARD, ++ EMPTY_CARD, + }; + +-#define HISAX_IDSIZE (HISAX_MAX_CARDS*8) +-static char HiSaxID[HISAX_IDSIZE] __devinitdata = { 0, }; ++static char HiSaxID[64] __devinitdata = { 0, }; + + char *HiSax_id __devinitdata = HiSaxID; + #ifdef MODULE + /* Variables for insmod */ +-static int type[HISAX_MAX_CARDS] __devinitdata = { 0, }; +-static int protocol[HISAX_MAX_CARDS] __devinitdata = { 0, }; +-static int io[HISAX_MAX_CARDS] __devinitdata = { 0, }; ++static int type[8] __devinitdata = { 0, }; ++static int protocol[8] __devinitdata = { 0, }; ++static int io[8] __devinitdata = { 0, }; + #undef IO0_IO1 + #ifdef CONFIG_HISAX_16_3 + #define IO0_IO1 +@@ -361,27 +379,23 @@ + #define IO0_IO1 + #endif + #ifdef IO0_IO1 +-static int io0[HISAX_MAX_CARDS] __devinitdata = { 0, }; +-static int io1[HISAX_MAX_CARDS] __devinitdata = { 0, }; ++static int io0[8] __devinitdata = { 0, }; ++static int io1[8] __devinitdata = { 0, }; + #endif +-static int irq[HISAX_MAX_CARDS] __devinitdata = { 0, }; +-static int mem[HISAX_MAX_CARDS] __devinitdata = { 0, }; ++static int irq[8] __devinitdata = { 0, }; ++static int mem[8] __devinitdata = { 0, }; + static char *id __devinitdata = HiSaxID; + +-#define PARM_PARA "1-" __MODULE_STRING(HISAX_MAX_CARDS) "i" +- +-MODULE_DESCRIPTION("ISDN4Linux: Driver for passive ISDN cards"); + MODULE_AUTHOR("Karsten Keil"); +-MODULE_LICENSE("GPL"); +-MODULE_PARM(type, PARM_PARA); +-MODULE_PARM(protocol, PARM_PARA); +-MODULE_PARM(io, PARM_PARA); +-MODULE_PARM(irq, PARM_PARA); +-MODULE_PARM(mem, PARM_PARA); ++MODULE_PARM(type, "1-8i"); ++MODULE_PARM(protocol, "1-8i"); ++MODULE_PARM(io, "1-8i"); ++MODULE_PARM(irq, "1-8i"); ++MODULE_PARM(mem, "1-8i"); + MODULE_PARM(id, "s"); + #ifdef IO0_IO1 +-MODULE_PARM(io0, PARM_PARA); +-MODULE_PARM(io1, PARM_PARA); ++MODULE_PARM(io0, "1-8i"); ++MODULE_PARM(io1, "1-8i"); + #endif + #endif /* MODULE */ + +@@ -432,6 +446,7 @@ + } + + #ifndef MODULE ++#ifdef COMPAT_HAS_NEW_SETUP + #define MAX_ARG (HISAX_MAX_CARDS*5) + static int __init HiSax_setup(char *line) + { +@@ -440,12 +455,16 @@ + char *str; + + str = get_options(line, MAX_ARG, ints); ++#else ++void __init HiSax_setup(char *str, int *ints) ++{ ++ int i, j, argc; ++#endif + argc = ints[0]; + printk(KERN_DEBUG "HiSax_setup: argc(%d) str(%s)\n", argc, str); + i = 0; + j = 1; + while (argc && (i < HISAX_MAX_CARDS)) { +- cards[i].protocol = DEFAULT_PROTO; + if (argc) { + cards[i].typ = ints[j]; + j++; +@@ -473,19 +492,21 @@ + } + i++; + } +- if (str && *str) { +- if (strlen(str) < HISAX_IDSIZE) +- strcpy(HiSaxID, str); +- else +- printk(KERN_WARNING "HiSax: ID too long!"); +- } else ++ if (str && *str) { ++ strcpy(HiSaxID, str); ++ HiSax_id = HiSaxID; ++ } else { + strcpy(HiSaxID, "HiSax"); +- +- HiSax_id = HiSaxID; ++ HiSax_id = HiSaxID; ++ } ++#ifdef COMPAT_HAS_NEW_SETUP + return 1; + } + + __setup("hisax=", HiSax_setup); ++#else ++} ++#endif /* COMPAT_HAS_NEW_SETUP */ + #endif /* MODULES */ + + #if CARD_TELES0 +@@ -560,6 +581,10 @@ + extern int setup_hfcpci(struct IsdnCard *card); + #endif + ++#if CONFIG_HISAX_HFC_USB ++extern int setup_hfc_usb(struct IsdnCard *card); ++#endif ++ + #if CARD_HFC_SX + extern int setup_hfcsx(struct IsdnCard *card); + #endif +@@ -604,10 +629,6 @@ + extern int setup_netjet_u(struct IsdnCard *card); + #endif + +-#if CARD_FN_ENTERNOW_PCI +-extern int setup_enternow_pci(struct IsdnCard *card); +-#endif +- + /* + * Find card with given driverId + */ +@@ -899,7 +920,8 @@ + return 3; + } + +-static int __devinit checkcard(int cardnr, char *id, int *busy_flag) ++static int __devinit checkcard(int cardnr, char *id, int *busy_flag, ++ void *load_drv) + { + long flags; + int ret = 0; +@@ -1093,6 +1115,12 @@ + ret = setup_hfcsx(card); + break; + #endif ++#if CONFIG_HISAX_HFC_USB ++ case ISDN_CTYPE_HFC_USB: ++ cs->hw.hfcusb.drv = load_drv; ++ ret = setup_hfc_usb(card); ++ break; ++#endif + #if CARD_NICCY + case ISDN_CTYPE_NICCY: + ret = setup_niccy(card); +@@ -1143,11 +1171,6 @@ + ret = setup_netjet_u(card); + break; + #endif +-#if CARD_FN_ENTERNOW_PCI +- case ISDN_CTYPE_ENTERNOW: +- ret = setup_enternow_pci(card); +- break; +-#endif + case ISDN_CTYPE_DYNAMIC: + ret = 2; + break; +@@ -1186,6 +1209,9 @@ + case ISDN_CTYPE_DYNAMIC: + ret = 0; + break; ++ case ISDN_CTYPE_HFC_USB: ++ ret = cs->cardmsg(cs, CARD_INIT, NULL); ++ break; + default: + ret = init_card(cs); + break; +@@ -1257,16 +1283,13 @@ + else + sprintf(ids, "%s%d", id, i); + } +- if (checkcard(i, ids, busy_flag)) { ++ if (checkcard(i, ids, busy_flag, NULL)) { + foundcards++; + i++; + } else { +- /* make sure we don't oops the module */ +- if (cards[i].typ > 0 && cards[i].typ <= ISDN_CTYPE_COUNT) { +- printk(KERN_WARNING +- "HiSax: Card %s not installed !\n", +- CardType[cards[i].typ]); +- } ++ printk(KERN_WARNING ++ "HiSax: Card %s not installed !\n", ++ CardType[cards[i].typ]); + HiSax_shiftcards(i); + nrcards--; + } +@@ -1342,6 +1365,49 @@ + #endif + } + ++#ifdef CONFIG_HISAX_HFC_USB ++int ++hisax_register_hfcusb(struct hisax_drvreg *l1drv) ++{ ++ int i; ++ char ids[30]; ++ ++ if (l1drv->version != HISAX_LOAD_VERSION) ++ return 1; ++ ++ switch (l1drv->cmd) { ++ case HISAX_LOAD_CHKVER: ++ break; /* success */ ++ ++ case HISAX_LOAD_REGISTER: ++ for (i = 0; i < HISAX_MAX_CARDS; i++) { ++ if (!cards[i].typ) ++ break; ++ } ++ if (i >= HISAX_MAX_CARDS) ++ return 1; /* no space */ ++ cards[i].typ = ISDN_CTYPE_HFC_USB; /* setup type */ ++ cards[i].protocol = DEFAULT_PROTO; ++ sprintf(ids, "%s%d", l1drv->drvname, i); ++ if (checkcard(i, ids, NULL, (void *) l1drv)) { ++ nrcards++; ++ return 0; ++ } ++ if (cards[i].cs) ++ kfree((void *) cards[i].cs); ++ cards[i].cs = NULL; ++ cards[i].typ = 0; /* no card present */ ++ return 1; ++ break; ++ ++ default: ++ return 1; /* unknown command */ ++ } ++ ++ return 0; ++} /* hisax_register_hfcusb */ ++#endif ++ + static int __init HiSax_init(void) + { + int i, retval; +@@ -1408,8 +1474,6 @@ + if (protocol[i]) { + cards[j].protocol = protocol[i]; + nzproto++; +- } else { +- cards[j].protocol = DEFAULT_PROTO; + } + switch (type[i]) { + case ISDN_CTYPE_16_0: +@@ -1487,22 +1551,15 @@ + } else { + /* QUADRO is a 4 BRI card */ + cards[j++].para[0] = 1; +- /* we need to check if further cards can be added */ +- if (j < HISAX_MAX_CARDS) { +- cards[j].typ = ISDN_CTYPE_SCT_QUADRO; +- cards[j].protocol = protocol[i]; +- cards[j++].para[0] = 2; +- } +- if (j < HISAX_MAX_CARDS) { +- cards[j].typ = ISDN_CTYPE_SCT_QUADRO; +- cards[j].protocol = protocol[i]; +- cards[j++].para[0] = 3; +- } +- if (j < HISAX_MAX_CARDS) { +- cards[j].typ = ISDN_CTYPE_SCT_QUADRO; +- cards[j].protocol = protocol[i]; +- cards[j].para[0] = 4; +- } ++ cards[j].typ = ISDN_CTYPE_SCT_QUADRO; ++ cards[j].protocol = protocol[i]; ++ cards[j++].para[0] = 2; ++ cards[j].typ = ISDN_CTYPE_SCT_QUADRO; ++ cards[j].protocol = protocol[i]; ++ cards[j++].para[0] = 3; ++ cards[j].typ = ISDN_CTYPE_SCT_QUADRO; ++ cards[j].protocol = protocol[i]; ++ cards[j].para[0] = 4; + } + break; + } +@@ -1526,10 +1583,15 @@ + nrcards, (nrcards > 1) ? "s" : ""); + + /* Install only, if at least one card found */ +- if (!HiSax_inithardware(NULL)) +- return -ENODEV; ++ if (!HiSax_inithardware(NULL)) { ++ retval = -EIO; ++ goto out_isdnl1; ++ } ++ + return 0; + ++ out_isdnl1: ++ Isdnl1Free(); + out_tei: + TeiFree(); + out_isdnl2: +@@ -1576,8 +1638,6 @@ + cards[i].typ = type[i]; + if (protocol[i]) { + cards[i].protocol = protocol[i]; +- } else { +- cards[i].protocol = DEFAULT_PROTO; + } + } + cards[0].para[0] = pcm_irq; +@@ -1595,8 +1655,7 @@ + printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", + nrcards, (nrcards > 1) ? "s" : ""); + +- if (!HiSax_inithardware(busy_flag)) +- return -ENODEV; ++ HiSax_inithardware(busy_flag); + printk(KERN_NOTICE "HiSax: module installed\n"); + #endif + return 0; +@@ -1619,8 +1678,6 @@ + cards[i].typ = type[i]; + if (protocol[i]) { + cards[i].protocol = protocol[i]; +- } else { +- cards[i].protocol = DEFAULT_PROTO; + } + } + cards[0].para[0] = pcm_irq; +@@ -1638,8 +1695,7 @@ + printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", + nrcards, (nrcards > 1) ? "s" : ""); + +- if (!HiSax_inithardware(busy_flag)) +- return -ENODEV; ++ HiSax_inithardware(busy_flag); + printk(KERN_NOTICE "HiSax: module installed\n"); + #endif + return 0; +@@ -1662,8 +1718,6 @@ + cards[i].typ = type[i]; + if (protocol[i]) { + cards[i].protocol = protocol[i]; +- } else { +- cards[i].protocol = DEFAULT_PROTO; + } + } + cards[0].para[0] = pcm_irq; +@@ -1681,8 +1735,7 @@ + printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", + nrcards, (nrcards > 1) ? "s" : ""); + +- if (!HiSax_inithardware(busy_flag)) +- return -ENODEV; ++ HiSax_inithardware(busy_flag); + printk(KERN_NOTICE "HiSax: module installed\n"); + #endif + return 0; +@@ -1705,8 +1758,6 @@ + cards[i].typ = type[i]; + if (protocol[i]) { + cards[i].protocol = protocol[i]; +- } else { +- cards[i].protocol = DEFAULT_PROTO; + } + } + cards[0].para[0] = pcm_irq; +@@ -1724,8 +1775,7 @@ + printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", + nrcards, (nrcards > 1) ? "s" : ""); + +- if (!HiSax_inithardware(busy_flag)) +- return -ENODEV; ++ HiSax_inithardware(busy_flag); + printk(KERN_NOTICE "HiSax: module installed\n"); + #endif + return 0; +@@ -1743,7 +1793,7 @@ + sprintf(ids, "HiSax%d", nrcards); + else + sprintf(ids, "HiSax"); +- if (!checkcard(nrcards, ids, busy_flag)) { ++ if (!checkcard(nrcards, ids, busy_flag, NULL)) { + return -1; + } + ret = nrcards; +@@ -1785,7 +1835,7 @@ + cards[i].protocol = protocol; + sprintf(id, "%s%d", name, i); + nrcards++; +- retval = checkcard(i, id, 0); ++ retval = checkcard(i, id, 0, NULL); + if (retval == 0) { // yuck + cards[i].typ = 0; + nrcards--; +@@ -2117,9 +2167,6 @@ + {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20, PCI_ANY_ID, PCI_ANY_ID}, + {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U, PCI_ANY_ID, PCI_ANY_ID}, + {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201, PCI_ANY_ID, PCI_ANY_ID}, +-//######################################################################################### +- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA202, PCI_ANY_ID, PCI_ANY_ID}, +-//######################################################################################### + #endif + #ifdef CONFIG_HISAX_ELSA + {PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK, PCI_ANY_ID, PCI_ANY_ID}, +@@ -2178,11 +2225,3 @@ + + module_init(HiSax_init); + module_exit(HiSax_exit); +- +-EXPORT_SYMBOL(FsmNew); +-EXPORT_SYMBOL(FsmFree); +-EXPORT_SYMBOL(FsmEvent); +-EXPORT_SYMBOL(FsmChangeState); +-EXPORT_SYMBOL(FsmInitTimer); +-EXPORT_SYMBOL(FsmDelTimer); +-EXPORT_SYMBOL(FsmRestartTimer); +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/diva.c linux-2.4.29/drivers/isdn/hisax/diva.c +--- linux-2.4.29.old/drivers/isdn/hisax/diva.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/diva.c 2005-03-22 15:06:46.106083592 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: diva.c,v 1.1.4.2 2002/08/30 11:21:00 keil Exp $ ++/* $Id: diva.c,v 1.33 2001/09/24 13:22:56 kai Exp $ + * + * low level stuff for Eicon.Diehl Diva Family ISDN cards + * +@@ -22,14 +22,13 @@ + #include "isac.h" + #include "hscx.h" + #include "ipac.h" +-#include "ipacx.h" + #include "isdnl1.h" + #include <linux/pci.h> +-#include <linux/isapnp.h> ++#include <linux/isdn_compat.h> + + extern const char *CardType[]; + +-const char *Diva_revision = "$Revision: 1.1.4.2 $"; ++const char *Diva_revision = "$Revision: 1.33 $"; + + #define byteout(addr,val) outb(val,addr) + #define bytein(addr) inb(addr) +@@ -51,7 +50,6 @@ + #define DIVA_PCI 2 + #define DIVA_IPAC_ISA 3 + #define DIVA_IPAC_PCI 4 +-#define DIVA_IPACX_PCI 5 + + /* CTRL (Read) */ + #define DIVA_IRQ_STAT 0x01 +@@ -71,12 +69,10 @@ + #define PITA_MISC_REG 0x1c + #ifdef __BIG_ENDIAN + #define PITA_PARA_SOFTRESET 0x00000001 +-#define PITA_SER_SOFTRESET 0x00000002 + #define PITA_PARA_MPX_MODE 0x00000004 + #define PITA_INT0_ENABLE 0x00000200 + #else + #define PITA_PARA_SOFTRESET 0x01000000 +-#define PITA_SER_SOFTRESET 0x02000000 + #define PITA_PARA_MPX_MODE 0x04000000 + #define PITA_INT0_ENABLE 0x00020000 + #endif +@@ -244,47 +240,6 @@ + memwritereg(cs->hw.diva.cfg_reg, offset + (hscx ? 0x40 : 0), value); + } + +-/* IO-Functions for IPACX type cards */ +-static u_char +-MemReadISAC_IPACX(struct IsdnCardState *cs, u_char offset) +-{ +- return (memreadreg(cs->hw.diva.cfg_reg, offset)); +-} +- +-static void +-MemWriteISAC_IPACX(struct IsdnCardState *cs, u_char offset, u_char value) +-{ +- memwritereg(cs->hw.diva.cfg_reg, offset, value); +-} +- +-static void +-MemReadISACfifo_IPACX(struct IsdnCardState *cs, u_char * data, int size) +-{ +- while(size--) +- *data++ = memreadreg(cs->hw.diva.cfg_reg, 0); +-} +- +-static void +-MemWriteISACfifo_IPACX(struct IsdnCardState *cs, u_char * data, int size) +-{ +- while(size--) +- memwritereg(cs->hw.diva.cfg_reg, 0, *data++); +-} +- +-static u_char +-MemReadHSCX_IPACX(struct IsdnCardState *cs, int hscx, u_char offset) +-{ +- return(memreadreg(cs->hw.diva.cfg_reg, offset + +- (hscx ? IPACX_OFF_B2 : IPACX_OFF_B1))); +-} +- +-static void +-MemWriteHSCX_IPACX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) +-{ +- memwritereg(cs->hw.diva.cfg_reg, offset + +- (hscx ? IPACX_OFF_B2 : IPACX_OFF_B1), value); +-} +- + /* + * fast interrupt HSCX stuff goes here + */ +@@ -595,7 +550,7 @@ + u_char exval; + struct BCState *bcs; + +- if (val & 0x01) { // EXB ++ if (val & 0x01) { + bcs = cs->bcs + 1; + exval = MemReadHSCX(cs, 1, HSCX_EXIR); + if (exval & 0x40) { +@@ -622,7 +577,7 @@ + debugl1(cs, "HSCX B interrupt %x", val); + Memhscx_interrupt(cs, val, 1); + } +- if (val & 0x02) { // EXA ++ if (val & 0x02) { + bcs = cs->bcs; + exval = MemReadHSCX(cs, 0, HSCX_EXIR); + if (exval & 0x40) { +@@ -644,7 +599,7 @@ + } else if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX A EXIR %x", exval); + } +- if (val & 0x04) { // ICA ++ if (val & 0x04) { + exval = MemReadHSCX(cs, 0, HSCX_ISTA); + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "HSCX A interrupt %x", exval); +@@ -705,31 +660,12 @@ + memwritereg(cs->hw.diva.cfg_reg, IPAC_MASK, 0xC0); + } + +-static void +-diva_irq_ipacx_pci(int intno, void *dev_id, struct pt_regs *regs) +-{ +- struct IsdnCardState *cs = dev_id; +- u_char val; +- u_char *cfg; +- +- if (!cs) { +- printk(KERN_WARNING "Diva: Spurious interrupt!\n"); +- return; +- } +- cfg = (u_char *) cs->hw.diva.pci_cfg; +- val = *cfg; +- if (!(val &PITA_INT0_STATUS)) return; // other shared IRQ +- interrupt_ipacx(cs); // handler for chip +- *cfg = PITA_INT0_STATUS; // Reset PLX interrupt +-} +- + void + release_io_diva(struct IsdnCardState *cs) + { + int bytecnt; + +- if ((cs->subtyp == DIVA_IPAC_PCI) || +- (cs->subtyp == DIVA_IPACX_PCI) ) { ++ if (cs->subtyp == DIVA_IPAC_PCI) { + u_int *cfg = (unsigned int *)cs->hw.diva.pci_cfg; + + *cfg = 0; /* disable INT0/1 */ +@@ -776,16 +712,6 @@ + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout((10*HZ)/1000); + memwritereg(cs->hw.diva.cfg_reg, IPAC_MASK, 0xc0); +- } else if (cs->subtyp == DIVA_IPACX_PCI) { +- unsigned int *ireg = (unsigned int *)(cs->hw.diva.pci_cfg + +- PITA_MISC_REG); +- *ireg = PITA_PARA_SOFTRESET | PITA_PARA_MPX_MODE; +- set_current_state(TASK_UNINTERRUPTIBLE); +- schedule_timeout((10*HZ)/1000); +- *ireg = PITA_PARA_MPX_MODE | PITA_SER_SOFTRESET; +- set_current_state(TASK_UNINTERRUPTIBLE); +- schedule_timeout((10*HZ)/1000); +- MemWriteISAC_IPACX(cs, IPACX_MASK, 0xff); // Interrupts off + } else { /* DIVA 2.0 */ + cs->hw.diva.ctrl_reg = 0; /* Reset On */ + byteout(cs->hw.diva.ctrl, cs->hw.diva.ctrl_reg); +@@ -814,9 +740,7 @@ + { + int blink = 0; + +- if ((cs->subtyp == DIVA_IPAC_ISA) || +- (cs->subtyp == DIVA_IPAC_PCI) || +- (cs->subtyp == DIVA_IPACX_PCI) ) ++ if ((cs->subtyp == DIVA_IPAC_ISA) || (cs->subtyp == DIVA_IPAC_PCI)) + return; + del_timer(&cs->hw.diva.tl); + if (cs->hw.diva.status & DIVA_ASSIGN) +@@ -859,12 +783,6 @@ + release_io_diva(cs); + return(0); + case CARD_INIT: +- if (cs->subtyp == DIVA_IPACX_PCI) { +- ireg = (unsigned int *)cs->hw.diva.pci_cfg; +- *ireg = PITA_INT0_ENABLE; +- init_ipacx(cs, 3); // init chip and enable interrupts +- return (0); +- } + if (cs->subtyp == DIVA_IPAC_PCI) { + ireg = (unsigned int *)cs->hw.diva.pci_cfg; + *ireg = PITA_INT0_ENABLE; +@@ -901,9 +819,7 @@ + } + break; + } +- if ((cs->subtyp != DIVA_IPAC_ISA) && +- (cs->subtyp != DIVA_IPAC_PCI) && +- (cs->subtyp != DIVA_IPACX_PCI) ) ++ if ((cs->subtyp != DIVA_IPAC_ISA) && (cs->subtyp != DIVA_IPAC_PCI)) + diva_led_handler(cs); + return(0); + } +@@ -911,40 +827,11 @@ + static struct pci_dev *dev_diva __initdata = NULL; + static struct pci_dev *dev_diva_u __initdata = NULL; + static struct pci_dev *dev_diva201 __initdata = NULL; +-static struct pci_dev *dev_diva202 __initdata = NULL; +- +-#ifdef __ISAPNP__ +-static struct isapnp_device_id diva_ids[] __initdata = { +- { ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51), +- ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51), +- (unsigned long) "Diva picola" }, +- { ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x51), +- ISAPNP_VENDOR('E', 'I', 'C'), ISAPNP_FUNCTION(0x51), +- (unsigned long) "Diva picola" }, +- { ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x71), +- ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x71), +- (unsigned long) "Diva 2.0" }, +- { ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0x71), +- ISAPNP_VENDOR('E', 'I', 'C'), ISAPNP_FUNCTION(0x71), +- (unsigned long) "Diva 2.0" }, +- { ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0xA1), +- ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0xA1), +- (unsigned long) "Diva 2.01" }, +- { ISAPNP_VENDOR('G', 'D', 'I'), ISAPNP_FUNCTION(0xA1), +- ISAPNP_VENDOR('E', 'I', 'C'), ISAPNP_FUNCTION(0xA1), +- (unsigned long) "Diva 2.01" }, +- { 0, } +-}; +- +-static struct isapnp_device_id *pdev = &diva_ids[0]; +-static struct pci_bus *pnp_c __devinitdata = NULL; +-#endif +- + + int __init + setup_diva(struct IsdnCard *card) + { +- int bytecnt = 8; ++ int bytecnt; + u_char val; + struct IsdnCardState *cs = card->cs; + char tmp[64]; +@@ -977,75 +864,8 @@ + cs->hw.diva.hscx_adr = card->para[1] + DIVA_HSCX_ADR; + } + cs->irq = card->para[0]; ++ bytecnt = 8; + } else { +-#ifdef __ISAPNP__ +- if (isapnp_present()) { +- struct pci_bus *pb; +- struct pci_dev *pd; +- +- while(pdev->card_vendor) { +- if ((pb = isapnp_find_card(pdev->card_vendor, +- pdev->card_device, pnp_c))) { +- pnp_c = pb; +- pd = NULL; +- if ((pd = isapnp_find_dev(pnp_c, +- pdev->vendor, pdev->function, pd))) { +- printk(KERN_INFO "HiSax: %s detected\n", +- (char *)pdev->driver_data); +- pd->prepare(pd); +- pd->deactivate(pd); +- pd->activate(pd); +- card->para[1] = +- pd->resource[0].start; +- card->para[0] = +- pd->irq_resource[0].start; +- if (!card->para[0] || !card->para[1]) { +- printk(KERN_ERR "Diva PnP:some resources are missing %ld/%lx\n", +- card->para[0], card->para[1]); +- pd->deactivate(pd); +- return(0); +- } +- cs->hw.diva.cfg_reg = card->para[1]; +- cs->irq = card->para[0]; +- if (pdev->function == ISAPNP_FUNCTION(0xA1)) { +- cs->subtyp = DIVA_IPAC_ISA; +- cs->hw.diva.ctrl = 0; +- cs->hw.diva.isac = +- card->para[1] + DIVA_IPAC_DATA; +- cs->hw.diva.hscx = +- card->para[1] + DIVA_IPAC_DATA; +- cs->hw.diva.isac_adr = +- card->para[1] + DIVA_IPAC_ADR; +- cs->hw.diva.hscx_adr = +- card->para[1] + DIVA_IPAC_ADR; +- test_and_set_bit(HW_IPAC, &cs->HW_Flags); +- } else { +- cs->subtyp = DIVA_ISA; +- cs->hw.diva.ctrl = +- card->para[1] + DIVA_ISA_CTRL; +- cs->hw.diva.isac = +- card->para[1] + DIVA_ISA_ISAC_DATA; +- cs->hw.diva.hscx = +- card->para[1] + DIVA_HSCX_DATA; +- cs->hw.diva.isac_adr = +- card->para[1] + DIVA_ISA_ISAC_ADR; +- cs->hw.diva.hscx_adr = +- card->para[1] + DIVA_HSCX_ADR; +- } +- goto ready; +- } else { +- printk(KERN_ERR "Diva PnP: PnP error card found, no device\n"); +- return(0); +- } +- } +- pdev++; +- pnp_c=NULL; +- } +- if (!pdev->card_vendor) { +- printk(KERN_INFO "Diva PnP: no ISAPnP card found\n"); +- } +- } +-#endif + #if CONFIG_PCI + if (!pci_present()) { + printk(KERN_ERR "Diva: no PCI bus present\n"); +@@ -1059,14 +879,14 @@ + return(0); + cs->subtyp = DIVA_PCI; + cs->irq = dev_diva->irq; +- cs->hw.diva.cfg_reg = pci_resource_start(dev_diva, 2); ++ cs->hw.diva.cfg_reg = pci_resource_start_io(dev_diva, 2); + } else if ((dev_diva_u = pci_find_device(PCI_VENDOR_ID_EICON, + PCI_DEVICE_ID_EICON_DIVA20_U, dev_diva_u))) { + if (pci_enable_device(dev_diva_u)) + return(0); + cs->subtyp = DIVA_PCI; + cs->irq = dev_diva_u->irq; +- cs->hw.diva.cfg_reg = pci_resource_start(dev_diva_u, 2); ++ cs->hw.diva.cfg_reg = pci_resource_start_io(dev_diva_u, 2); + } else if ((dev_diva201 = pci_find_device(PCI_VENDOR_ID_EICON, + PCI_DEVICE_ID_EICON_DIVA201, dev_diva201))) { + if (pci_enable_device(dev_diva201)) +@@ -1074,19 +894,9 @@ + cs->subtyp = DIVA_IPAC_PCI; + cs->irq = dev_diva201->irq; + cs->hw.diva.pci_cfg = +- (ulong) ioremap(pci_resource_start(dev_diva201, 0), 4096); ++ (ulong) ioremap(pci_resource_start_mem(dev_diva201, 0), 4096); + cs->hw.diva.cfg_reg = +- (ulong) ioremap(pci_resource_start(dev_diva201, 1), 4096); +- } else if ((dev_diva202 = pci_find_device(PCI_VENDOR_ID_EICON, +- PCI_DEVICE_ID_EICON_DIVA202, dev_diva202))) { +- if (pci_enable_device(dev_diva202)) +- return(0); +- cs->subtyp = DIVA_IPACX_PCI; +- cs->irq = dev_diva202->irq; +- cs->hw.diva.pci_cfg = +- (ulong) ioremap(pci_resource_start(dev_diva202, 0), 4096); +- cs->hw.diva.cfg_reg = +- (ulong) ioremap(pci_resource_start(dev_diva202, 1), 4096); ++ (ulong) ioremap(pci_resource_start_mem(dev_diva201, 1), 4096); + } else { + printk(KERN_WARNING "Diva: No PCI card found\n"); + return(0); +@@ -1107,8 +917,7 @@ + printk(KERN_WARNING "Diva: unable to config DIVA PCI\n"); + return (0); + #endif /* CONFIG_PCI */ +- if ((cs->subtyp == DIVA_IPAC_PCI) || +- (cs->subtyp == DIVA_IPACX_PCI) ) { ++ if (cs->subtyp == DIVA_IPAC_PCI) { + cs->hw.diva.ctrl = 0; + cs->hw.diva.isac = 0; + cs->hw.diva.hscx = 0; +@@ -1125,23 +934,18 @@ + bytecnt = 32; + } + } +-ready: ++ + printk(KERN_INFO + "Diva: %s card configured at %#lx IRQ %d\n", + (cs->subtyp == DIVA_PCI) ? "PCI" : + (cs->subtyp == DIVA_ISA) ? "ISA" : +- (cs->subtyp == DIVA_IPAC_ISA) ? "IPAC ISA" : +- (cs->subtyp == DIVA_IPAC_PCI) ? "IPAC PCI" : "IPACX PCI", ++ (cs->subtyp == DIVA_IPAC_ISA) ? "IPAC ISA" : "IPAC PCI", + cs->hw.diva.cfg_reg, cs->irq); +- if ((cs->subtyp == DIVA_IPAC_PCI) || +- (cs->subtyp == DIVA_IPACX_PCI) || +- (cs->subtyp == DIVA_PCI) ) +- printk(KERN_INFO "Diva: %s space at %#lx\n", +- (cs->subtyp == DIVA_PCI) ? "PCI" : +- (cs->subtyp == DIVA_IPAC_PCI) ? "IPAC PCI" : "IPACX PCI", ++ if ((cs->subtyp == DIVA_IPAC_PCI) || (cs->subtyp == DIVA_PCI)) ++ printk(KERN_INFO "Diva: %s PCI space at %#lx\n", ++ (cs->subtyp == DIVA_PCI) ? "PCI" : "IPAC PCI", + cs->hw.diva.pci_cfg); +- if ((cs->subtyp != DIVA_IPAC_PCI) && +- (cs->subtyp != DIVA_IPACX_PCI) ) { ++ if (cs->subtyp != DIVA_IPAC_PCI) { + if (check_region(cs->hw.diva.cfg_reg, bytecnt)) { + printk(KERN_WARNING + "HiSax: %s config port %lx-%lx already in use\n", +@@ -1177,17 +981,6 @@ + cs->irq_func = &diva_irq_ipac_pci; + val = memreadreg(cs->hw.diva.cfg_reg, IPAC_ID); + printk(KERN_INFO "Diva: IPAC version %x\n", val); +- } else if (cs->subtyp == DIVA_IPACX_PCI) { +- cs->readisac = &MemReadISAC_IPACX; +- cs->writeisac = &MemWriteISAC_IPACX; +- cs->readisacfifo = &MemReadISACfifo_IPACX; +- cs->writeisacfifo = &MemWriteISACfifo_IPACX; +- cs->BC_Read_Reg = &MemReadHSCX_IPACX; +- cs->BC_Write_Reg = &MemWriteHSCX_IPACX; +- cs->BC_Send_Data = 0; // function located in ipacx module +- cs->irq_func = &diva_irq_ipacx_pci; +- printk(KERN_INFO "Diva: IPACX Design Id: %x\n", +- MemReadISAC_IPACX(cs, IPACX_ID) &0x3F); + } else { /* DIVA 2.0 */ + cs->hw.diva.tl.function = (void *) diva_led_handler; + cs->hw.diva.tl.data = (long) cs; +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/elsa.c linux-2.4.29/drivers/isdn/hisax/elsa.c +--- linux-2.4.29.old/drivers/isdn/hisax/elsa.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/elsa.c 2005-03-22 15:06:46.123081008 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: elsa.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: elsa.c,v 2.32 2001/09/24 13:22:56 kai Exp $ + * + * low level stuff for Elsa isdn cards + * +@@ -28,13 +28,13 @@ + #include "hscx.h" + #include "isdnl1.h" + #include <linux/pci.h> +-#include <linux/isapnp.h> ++#include <linux/isdn_compat.h> + #include <linux/serial.h> + #include <linux/serial_reg.h> + + extern const char *CardType[]; + +-const char *Elsa_revision = "$Revision: 1.1.4.1 $"; ++const char *Elsa_revision = "$Revision: 2.32 $"; + const char *Elsa_Types[] = + {"None", "PC", "PCC-8", "PCC-16", "PCF", "PCF-Pro", + "PCMCIA", "QS 1000", "QS 3000", "Microlink PCI", "QS 3000 PCI", +@@ -864,21 +864,6 @@ + static struct pci_dev *dev_qs1000 __devinitdata = NULL; + static struct pci_dev *dev_qs3000 __devinitdata = NULL; + +-#ifdef __ISAPNP__ +-static struct isapnp_device_id elsa_ids[] __initdata = { +- { ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0133), +- ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0133), +- (unsigned long) "Elsa QS1000" }, +- { ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0134), +- ISAPNP_VENDOR('E', 'L', 'S'), ISAPNP_FUNCTION(0x0134), +- (unsigned long) "Elsa QS3000" }, +- { 0, } +-}; +- +-static struct isapnp_device_id *pdev = &elsa_ids[0]; +-static struct pci_bus *pnp_c __devinitdata = NULL; +-#endif +- + int __devinit + setup_elsa(struct IsdnCard *card) + { +@@ -893,7 +878,6 @@ + cs->hw.elsa.ctrl_reg = 0; + cs->hw.elsa.status = 0; + cs->hw.elsa.MFlag = 0; +- cs->subtyp = 0; + if (cs->typ == ISDN_CTYPE_ELSA) { + cs->hw.elsa.base = card->para[0]; + printk(KERN_INFO "Elsa: Microlink IO probing\n"); +@@ -955,60 +939,9 @@ + return (0); + } + } else if (cs->typ == ISDN_CTYPE_ELSA_PNP) { +-#ifdef __ISAPNP__ +- if (!card->para[1] && isapnp_present()) { +- struct pci_bus *pb; +- struct pci_dev *pd; +- +- while(pdev->card_vendor) { +- if ((pb = isapnp_find_card(pdev->card_vendor, +- pdev->card_device, pnp_c))) { +- pnp_c = pb; +- pd = NULL; +- if ((pd = isapnp_find_dev(pnp_c, +- pdev->vendor, pdev->function, pd))) { +- printk(KERN_INFO "HiSax: %s detected\n", +- (char *)pdev->driver_data); +- pd->prepare(pd); +- pd->deactivate(pd); +- pd->activate(pd); +- card->para[1] = +- pd->resource[0].start; +- card->para[0] = +- pd->irq_resource[0].start; +- if (!card->para[0] || !card->para[1]) { +- printk(KERN_ERR "Elsa PnP:some resources are missing %ld/%lx\n", +- card->para[0], card->para[1]); +- pd->deactivate(pd); +- return(0); +- } +- if (pdev->function == ISAPNP_FUNCTION(0x133)) +- cs->subtyp = ELSA_QS1000; +- else +- cs->subtyp = ELSA_QS3000; +- break; +- } else { +- printk(KERN_ERR "Elsa PnP: PnP error card found, no device\n"); +- return(0); +- } +- } +- pdev++; +- pnp_c=NULL; +- } +- if (!pdev->card_vendor) { +- printk(KERN_INFO "Elsa PnP: no ISAPnP card found\n"); +- return(0); +- } +- } +-#endif +- if (card->para[1] && card->para[0]) { +- cs->hw.elsa.base = card->para[1]; +- cs->irq = card->para[0]; +- if (!cs->subtyp) +- cs->subtyp = ELSA_QS1000; +- } else { +- printk(KERN_ERR "Elsa PnP: no parameter\n"); +- } ++ cs->hw.elsa.base = card->para[1]; ++ cs->irq = card->para[0]; ++ cs->subtyp = ELSA_QS1000; + cs->hw.elsa.cfg = cs->hw.elsa.base + ELSA_CONFIG; + cs->hw.elsa.ale = cs->hw.elsa.base + ELSA_ALE; + cs->hw.elsa.isac = cs->hw.elsa.base + ELSA_ISAC; +@@ -1058,16 +991,16 @@ + return(0); + cs->subtyp = ELSA_QS1000PCI; + cs->irq = dev_qs1000->irq; +- cs->hw.elsa.cfg = pci_resource_start(dev_qs1000, 1); +- cs->hw.elsa.base = pci_resource_start(dev_qs1000, 3); ++ cs->hw.elsa.cfg = pci_resource_start_io(dev_qs1000, 1); ++ cs->hw.elsa.base = pci_resource_start_io(dev_qs1000, 3); + } else if ((dev_qs3000 = pci_find_device(PCI_VENDOR_ID_ELSA, + PCI_DEVICE_ID_ELSA_QS3000, dev_qs3000))) { + if (pci_enable_device(dev_qs3000)) + return(0); + cs->subtyp = ELSA_QS3000PCI; + cs->irq = dev_qs3000->irq; +- cs->hw.elsa.cfg = pci_resource_start(dev_qs3000, 1); +- cs->hw.elsa.base = pci_resource_start(dev_qs3000, 3); ++ cs->hw.elsa.cfg = pci_resource_start_io(dev_qs3000, 1); ++ cs->hw.elsa.base = pci_resource_start_io(dev_qs3000, 3); + } else { + printk(KERN_WARNING "Elsa: No PCI card found\n"); + return(0); +@@ -1123,7 +1056,6 @@ + break; + case ELSA_PCFPRO: + case ELSA_PCF: +- case ELSA_QS3000: + case ELSA_QS3000PCI: + bytecnt = 16; + break; +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/elsa_cs.c linux-2.4.29/drivers/isdn/hisax/elsa_cs.c +--- linux-2.4.29.old/drivers/isdn/hisax/elsa_cs.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/elsa_cs.c 2005-03-22 15:06:46.138078728 +0100 +@@ -72,7 +72,7 @@ + MODULE_PARM(pc_debug, "i"); + #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); + static char *version = +-"elsa_cs.c $Revision: 1.1.4.1 $ $Date: 2001/11/20 14:19:35 $ (K.Lichtenwalder)"; ++"elsa_cs.c $Revision: 1.2 $ $Date: 2001/09/24 13:22:56 $ (K.Lichtenwalder)"; + #else + #define DEBUG(n, args...) + #endif +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/elsa_ser.c linux-2.4.29/drivers/isdn/hisax/elsa_ser.c +--- linux-2.4.29.old/drivers/isdn/hisax/elsa_ser.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/elsa_ser.c 2005-03-22 15:06:46.158075688 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: elsa_ser.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: elsa_ser.c,v 2.14 2001/09/24 13:22:56 kai Exp $ + * + * stuff for the serial modem on ELSA cards + * +@@ -396,6 +396,74 @@ + } + } + ++#if 0 ++static inline void check_modem_status(struct IsdnCardState *cs) ++{ ++ int status; ++ struct async_struct *info = cs->hw.elsa.info; ++ struct async_icount *icount; ++ ++ status = serial_inp(info, UART_MSR); ++ ++ if (status & UART_MSR_ANY_DELTA) { ++ icount = &info->state->icount; ++ /* update input line counters */ ++ if (status & UART_MSR_TERI) ++ icount->rng++; ++ if (status & UART_MSR_DDSR) ++ icount->dsr++; ++ if (status & UART_MSR_DDCD) { ++ icount->dcd++; ++ } ++ if (status & UART_MSR_DCTS) ++ icount->cts++; ++// wake_up(&info->delta_msr_wait); ++ } ++ ++ if ((info->flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) { ++#if (defined(SERIAL_DEBUG_OPEN) || defined(SERIAL_DEBUG_INTR)) ++ printk("ttys%d CD now %s...", info->line, ++ (status & UART_MSR_DCD) ? "on" : "off"); ++#endif ++ if (status & UART_MSR_DCD) ++// wake_up(&info->open_wait); ++; ++ else if (!((info->flags & ASYNC_CALLOUT_ACTIVE) && ++ (info->flags & ASYNC_CALLOUT_NOHUP))) { ++#ifdef SERIAL_DEBUG_OPEN ++ printk("doing serial hangup..."); ++#endif ++ if (info->tty) ++ tty_hangup(info->tty); ++ } ++ } ++#if 0 ++ if (info->flags & ASYNC_CTS_FLOW) { ++ if (info->tty->hw_stopped) { ++ if (status & UART_MSR_CTS) { ++#if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW)) ++ printk("CTS tx start..."); ++#endif ++ info->tty->hw_stopped = 0; ++ info->IER |= UART_IER_THRI; ++ serial_outp(info, UART_IER, info->IER); ++// rs_sched_event(info, RS_EVENT_WRITE_WAKEUP); ++ return; ++ } ++ } else { ++ if (!(status & UART_MSR_CTS)) { ++#if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW)) ++ printk("CTS tx stop..."); ++#endif ++ info->tty->hw_stopped = 1; ++ info->IER &= ~UART_IER_THRI; ++ serial_outp(info, UART_IER, info->IER); ++ } ++ } ++ } ++#endif 0 ++} ++#endif + + static void rs_interrupt_elsa(int irq, struct IsdnCardState *cs) + { +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/fsm.c linux-2.4.29/drivers/isdn/hisax/fsm.c +--- linux-2.4.29.old/drivers/isdn/hisax/fsm.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/fsm.c 2005-03-22 15:06:46.174073256 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: fsm.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id$ + * + * Finite state machine + * +@@ -21,6 +21,14 @@ + + #define FSM_TIMER_DEBUG 0 + ++EXPORT_SYMBOL(FsmNew); ++EXPORT_SYMBOL(FsmFree); ++EXPORT_SYMBOL(FsmEvent); ++EXPORT_SYMBOL(FsmChangeState); ++EXPORT_SYMBOL(FsmInitTimer); ++EXPORT_SYMBOL(FsmDelTimer); ++EXPORT_SYMBOL(FsmRestartTimer); ++ + int __init + FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount) + { +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/fsm.h linux-2.4.29/drivers/isdn/hisax/fsm.h +--- linux-2.4.29.old/drivers/isdn/hisax/fsm.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/fsm.h 2005-03-22 15:06:46.189070976 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: fsm.h,v 1.1.2.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id$ + * + * Finite state machine + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/gazel.c linux-2.4.29/drivers/isdn/hisax/gazel.c +--- linux-2.4.29.old/drivers/isdn/hisax/gazel.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/gazel.c 2005-03-22 15:06:46.205068544 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: gazel.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: gazel.c,v 2.19 2001/09/24 13:22:56 kai Exp $ + * + * low level stuff for Gazel isdn cards + * +@@ -20,9 +20,10 @@ + #include "isdnl1.h" + #include "ipac.h" + #include <linux/pci.h> ++#include <linux/isdn_compat.h> + + extern const char *CardType[]; +-const char *gazel_revision = "$Revision: 1.1.4.1 $"; ++const char *gazel_revision = "$Revision: 2.19 $"; + + #define R647 1 + #define R685 2 +@@ -563,8 +564,8 @@ + if (pci_enable_device(dev_tel)) + return 1; + pci_irq = dev_tel->irq; +- pci_ioaddr0 = pci_resource_start(dev_tel, 1); +- pci_ioaddr1 = pci_resource_start(dev_tel, 2); ++ pci_ioaddr0 = pci_resource_start_io(dev_tel, 1); ++ pci_ioaddr1 = pci_resource_start_io(dev_tel, 2); + found = 1; + } + if (found) +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_2bds0.c linux-2.4.29/drivers/isdn/hisax/hfc_2bds0.c +--- linux-2.4.29.old/drivers/isdn/hisax/hfc_2bds0.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfc_2bds0.c 2005-03-22 15:06:46.221066112 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hfc_2bds0.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: hfc_2bds0.c,v 1.18 2001/09/24 13:22:56 kai Exp $ + * + * specific routines for CCD's HFC 2BDS0 + * +@@ -616,6 +616,17 @@ + */ + if (!cs) + return; ++#if 0 ++ if (test_and_clear_bit(D_CLEARBUSY, &cs->event)) { ++ if (cs->debug) ++ debugl1(cs, "D-Channel Busy cleared"); ++ stptr = cs->stlist; ++ while (stptr != NULL) { ++ stptr->l1.l1l2(stptr, PH_PAUSE | CONFIRM, NULL); ++ stptr = stptr->next; ++ } ++ } ++#endif + if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) { + switch (cs->dc.hfcd.ph_state) { + case (0): +@@ -1090,6 +1101,32 @@ + cs->hw.hfcD.mst_m |= HFCD_MASTER; + cs->writeisac(cs, HFCD_MST_MODE, cs->hw.hfcD.mst_m); + break; ++#if 0 ++ case (HW_TESTLOOP | REQUEST): ++ u_char val = 0; ++ if (1 & (int) arg) ++ val |= 0x0c; ++ if (2 & (int) arg) ++ val |= 0x3; ++ if (test_bit(HW_IOM1, &cs->HW_Flags)) { ++ /* IOM 1 Mode */ ++ if (!val) { ++ cs->writeisac(cs, ISAC_SPCR, 0xa); ++ cs->writeisac(cs, ISAC_ADF1, 0x2); ++ } else { ++ cs->writeisac(cs, ISAC_SPCR, val); ++ cs->writeisac(cs, ISAC_ADF1, 0xa); ++ } ++ } else { ++ /* IOM 2 Mode */ ++ cs->writeisac(cs, ISAC_SPCR, val); ++ if (val) ++ cs->writeisac(cs, ISAC_ADF1, 0x8); ++ else ++ cs->writeisac(cs, ISAC_ADF1, 0x0); ++ } ++ break; ++#endif + default: + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "hfcd_l1hw unknown pr %4x", pr); +@@ -1106,6 +1143,20 @@ + static void + hfc_dbusy_timer(struct IsdnCardState *cs) + { ++#if 0 ++ struct PStack *stptr; ++ if (test_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { ++ if (cs->debug) ++ debugl1(cs, "D-Channel Busy"); ++ test_and_set_bit(FLG_L1_DBUSY, &cs->HW_Flags); ++ stptr = cs->stlist; ++ ++ while (stptr != NULL) { ++ stptr->l1.l1l2(stptr, PH_PAUSE | INDICATION, NULL); ++ stptr = stptr->next; ++ } ++ } ++#endif + } + + unsigned int __init +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_2bds0.h linux-2.4.29/drivers/isdn/hisax/hfc_2bds0.h +--- linux-2.4.29.old/drivers/isdn/hisax/hfc_2bds0.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfc_2bds0.h 2005-03-22 15:06:46.236063832 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hfc_2bds0.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: hfc_2bds0.h,v 1.6 2001/09/24 13:22:56 kai Exp $ + * + * specific defines for CCD's HFC 2BDS0 + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_2bs0.c linux-2.4.29/drivers/isdn/hisax/hfc_2bs0.c +--- linux-2.4.29.old/drivers/isdn/hisax/hfc_2bs0.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfc_2bs0.c 2005-03-22 15:06:46.272058360 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hfc_2bs0.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: hfc_2bs0.c,v 1.20 2001/09/24 13:22:56 kai Exp $ + * + * specific routines for CCD's HFC 2BS0 + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_2bs0.h linux-2.4.29/drivers/isdn/hisax/hfc_2bs0.h +--- linux-2.4.29.old/drivers/isdn/hisax/hfc_2bs0.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfc_2bs0.h 2005-03-22 15:06:46.288055928 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hfc_2bs0.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: hfc_2bs0.h,v 1.5 2001/09/24 13:22:56 kai Exp $ + * + * specific defines for CCD's HFC 2BS0 + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_pci.c linux-2.4.29/drivers/isdn/hisax/hfc_pci.c +--- linux-2.4.29.old/drivers/isdn/hisax/hfc_pci.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfc_pci.c 2005-03-22 15:06:46.305053344 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hfc_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: hfc_pci.c,v 1.48 2001/09/24 13:22:56 kai Exp $ + * + * low level driver for CCD´s hfc-pci based cards + * +@@ -22,11 +22,12 @@ + #include "hfc_pci.h" + #include "isdnl1.h" + #include <linux/pci.h> ++#include <linux/isdn_compat.h> + #include <linux/interrupt.h> + + extern const char *CardType[]; + +-static const char *hfcpci_revision = "$Revision: 1.1.4.1 $"; ++static const char *hfcpci_revision = "$Revision: 1.48 $"; + + /* table entry in the PCI devices list */ + typedef struct { +@@ -76,8 +77,6 @@ + { + unsigned long flags; + +- printk(KERN_INFO "HiSax: release hfcpci at %p\n", +- cs->hw.hfcpci.pci_io); + save_flags(flags); + cli(); + cs->hw.hfcpci.int_m2 = 0; /* interrupt output off ! */ +@@ -88,11 +87,13 @@ + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout((30 * HZ) / 1000); /* Timeout 30ms */ + Write_hfc(cs, HFCPCI_CIRM, 0); /* Reset Off */ ++#if CONFIG_PCI + pcibios_write_config_word(cs->hw.hfcpci.pci_bus, cs->hw.hfcpci.pci_device_fn, PCI_COMMAND, 0); /* disable memory mapped ports + busmaster */ ++#endif /* CONFIG_PCI */ + del_timer(&cs->hw.hfcpci.timer); + kfree(cs->hw.hfcpci.share_start); + cs->hw.hfcpci.share_start = NULL; +- iounmap((void *)cs->hw.hfcpci.pci_io); ++ vfree(cs->hw.hfcpci.pci_io); + } + + /********************************************************************************/ +@@ -687,10 +688,6 @@ + debugl1(cs, "hfcpci_fill_fifo_trans %d frame length %d discarded", + bcs->channel, bcs->tx_skb->len); + +- if (bcs->st->lli.l1writewakeup && +- (PACKET_NOACK != bcs->tx_skb->pkt_type)) +- bcs->st->lli.l1writewakeup(bcs->st, bcs->tx_skb->len); +- + dev_kfree_skb_any(bcs->tx_skb); + cli(); + bcs->tx_skb = skb_dequeue(&bcs->squeue); /* fetch next data */ +@@ -1146,6 +1143,20 @@ + static void + hfcpci_dbusy_timer(struct IsdnCardState *cs) + { ++#if 0 ++ struct PStack *stptr; ++ if (test_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { ++ if (cs->debug) ++ debugl1(cs, "D-Channel Busy"); ++ test_and_set_bit(FLG_L1_DBUSY, &cs->HW_Flags); ++ stptr = cs->stlist; ++ ++ while (stptr != NULL) { ++ stptr->l1.l1l2(stptr, PH_PAUSE | INDICATION, NULL); ++ stptr = stptr->next; ++ } ++ } ++#endif + } + + /*************************************/ +@@ -1550,6 +1561,17 @@ + */ + if (!cs) + return; ++#if 0 ++ if (test_and_clear_bit(D_CLEARBUSY, &cs->event)) { ++ if (cs->debug) ++ debugl1(cs, "D-Channel Busy cleared"); ++ stptr = cs->stlist; ++ while (stptr != NULL) { ++ stptr->l1.l1l2(stptr, PH_PAUSE | CONFIRM, NULL); ++ stptr = stptr->next; ++ } ++ } ++#endif + if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) { + if (!cs->hw.hfcpci.nt_mode) + switch (cs->dc.hfcpci.ph_state) { +@@ -1712,7 +1734,7 @@ + if (pci_enable_device(tmp_hfcpci)) + continue; + pci_set_master(tmp_hfcpci); +- if ((card->para[0]) && (card->para[0] != (tmp_hfcpci->resource[ 0].start & PCI_BASE_ADDRESS_IO_MASK))) ++ if ((card->para[0]) && (card->para[0] != (get_pcibase(tmp_hfcpci, 0) & PCI_BASE_ADDRESS_IO_MASK))) + continue; + else + break; +@@ -1729,7 +1751,7 @@ + printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n"); + return (0); + } +- cs->hw.hfcpci.pci_io = (char *) dev_hfcpci->resource[ 1].start; ++ cs->hw.hfcpci.pci_io = (char *) get_pcibase(dev_hfcpci, 1); + printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", id_list[i].vendor_name, id_list[i].card_name); + } else { + printk(KERN_WARNING "HFC-PCI: No PCI card found\n"); +@@ -1746,7 +1768,7 @@ + printk(KERN_WARNING "HFC-PCI: Error allocating memory for FIFO!\n"); + return 0; + } +- cs->hw.hfcpci.fifos = (void *) ++ (ulong) cs->hw.hfcpci.fifos = + (((ulong) cs->hw.hfcpci.share_start) & ~0x7FFF) + 0x8000; + pcibios_write_config_dword(cs->hw.hfcpci.pci_bus, + cs->hw.hfcpci.pci_device_fn, 0x80, +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_pci.h linux-2.4.29/drivers/isdn/hisax/hfc_pci.h +--- linux-2.4.29.old/drivers/isdn/hisax/hfc_pci.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfc_pci.h 2005-03-22 15:06:46.320051064 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hfc_pci.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: hfc_pci.h,v 1.10 2001/09/24 13:22:56 kai Exp $ + * + * specific defines for CCD's HFC 2BDS0 PCI chips + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_sx.c linux-2.4.29/drivers/isdn/hisax/hfc_sx.c +--- linux-2.4.29.old/drivers/isdn/hisax/hfc_sx.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfc_sx.c 2005-03-22 15:06:46.350046504 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hfc_sx.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: hfc_sx.c,v 1.12 2001/09/24 13:22:56 kai Exp $ + * + * level driver for CCD´s hfc-s+/sp based cards + * +@@ -17,11 +17,10 @@ + #include "hfc_sx.h" + #include "isdnl1.h" + #include <linux/interrupt.h> +-#include <linux/isapnp.h> + + extern const char *CardType[]; + +-static const char *hfcsx_revision = "$Revision: 1.1.4.1 $"; ++static const char *hfcsx_revision = "$Revision: 1.12 $"; + + /***************************************/ + /* IRQ-table for CCDs demo board */ +@@ -940,6 +939,20 @@ + static void + hfcsx_dbusy_timer(struct IsdnCardState *cs) + { ++#if 0 ++ struct PStack *stptr; ++ if (test_bit(FLG_DBUSY_TIMER, &cs->HW_Flags)) { ++ if (cs->debug) ++ debugl1(cs, "D-Channel Busy"); ++ test_and_set_bit(FLG_L1_DBUSY, &cs->HW_Flags); ++ stptr = cs->stlist; ++ ++ while (stptr != NULL) { ++ stptr->l1.l1l2(stptr, PH_PAUSE | INDICATION, NULL); ++ stptr = stptr->next; ++ } ++ } ++#endif + } + + /*************************************/ +@@ -1333,6 +1346,17 @@ + */ + if (!cs) + return; ++#if 0 ++ if (test_and_clear_bit(D_CLEARBUSY, &cs->event)) { ++ if (cs->debug) ++ debugl1(cs, "D-Channel Busy cleared"); ++ stptr = cs->stlist; ++ while (stptr != NULL) { ++ stptr->l1.l1l2(stptr, PH_PAUSE | CONFIRM, NULL); ++ stptr = stptr->next; ++ } ++ } ++#endif + if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) { + if (!cs->hw.hfcsx.nt_mode) + switch (cs->dc.hfcsx.ph_state) { +@@ -1461,17 +1485,7 @@ + return (0); + } + +-#ifdef __ISAPNP__ +-static struct isapnp_device_id hfc_ids[] __initdata = { +- { ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2620), +- ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2620), +- (unsigned long) "Teles 16.3c2" }, +- { 0, } +-}; + +-static struct isapnp_device_id *hdev = &hfc_ids[0]; +-static struct pci_bus *pnp_c __devinitdata = NULL; +-#endif + + int __devinit + setup_hfcsx(struct IsdnCard *card) +@@ -1482,45 +1496,6 @@ + + strcpy(tmp, hfcsx_revision); + printk(KERN_INFO "HiSax: HFC-SX driver Rev. %s\n", HiSax_getrev(tmp)); +-#ifdef __ISAPNP__ +- if (!card->para[1] && isapnp_present()) { +- struct pci_bus *pb; +- struct pci_dev *pd; +- +- while(hdev->card_vendor) { +- if ((pb = isapnp_find_card(hdev->card_vendor, +- hdev->card_device, pnp_c))) { +- pnp_c = pb; +- pd = NULL; +- if ((pd = isapnp_find_dev(pnp_c, +- hdev->vendor, hdev->function, pd))) { +- printk(KERN_INFO "HiSax: %s detected\n", +- (char *)hdev->driver_data); +- pd->prepare(pd); +- pd->deactivate(pd); +- pd->activate(pd); +- card->para[1] = pd->resource[0].start; +- card->para[0] = pd->irq_resource[0].start; +- if (!card->para[0] || !card->para[1]) { +- printk(KERN_ERR "HFC PnP:some resources are missing %ld/%lx\n", +- card->para[0], card->para[1]); +- pd->deactivate(pd); +- return(0); +- } +- break; +- } else { +- printk(KERN_ERR "HFC PnP: PnP error card found, no device\n"); +- } +- } +- hdev++; +- pnp_c=NULL; +- } +- if (!hdev->card_vendor) { +- printk(KERN_INFO "HFC PnP: no ISAPnP card found\n"); +- return(0); +- } +- } +-#endif + cs->hw.hfcsx.base = card->para[1] & 0xfffe; + cs->irq = card->para[0]; + cs->hw.hfcsx.int_s1 = 0; +@@ -1603,3 +1578,7 @@ + cs->auxcmd = &hfcsx_auxcmd; + return (1); + } ++ ++ ++ ++ +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_sx.h linux-2.4.29/drivers/isdn/hisax/hfc_sx.h +--- linux-2.4.29.old/drivers/isdn/hisax/hfc_sx.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfc_sx.h 2005-03-22 15:06:46.365044224 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hfc_sx.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id$ + * + * specific defines for CCD's HFC 2BDS0 S+,SP chips + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_usb.c linux-2.4.29/drivers/isdn/hisax/hfc_usb.c +--- linux-2.4.29.old/drivers/isdn/hisax/hfc_usb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfc_usb.c 2005-03-22 15:06:46.381041792 +0100 +@@ -0,0 +1,1189 @@ ++/* $Id: hfc_usb.c,v 2.3 2001/07/06 21:30:11 werner Exp $ ++ * ++ * ++ * ++ * Author (C) 2001 Werner Cornelius (werner@isdn-development.de) ++ * modular driver for Colognechip HFC-USB chip ++ * as plugin for HiSax isdn driver ++ * type approval valid for HFC-S USB based TAs ++ * ++ * Copyright 2001 by Werner Cornelius (werner@isdn-development.de) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#include <linux/types.h> ++#include <linux/stddef.h> ++#include <linux/timer.h> ++#include <linux/config.h> ++#include <linux/isdn_compat.h> ++#include <linux/init.h> ++#include "hisax.h" ++#include <linux/module.h> ++#include <linux/kernel_stat.h> ++#include <linux/tqueue.h> ++#include <linux/usb.h> ++#include <linux/kernel.h> ++#include <linux/smp_lock.h> ++#include <linux/sched.h> ++#include "hisax_loadable.h" ++ ++#define INCLUDE_INLINE_FUNCS ++ ++/***********/ ++/* defines */ ++/***********/ ++#define HFC_CTRL_TIMEOUT 5 /* 5ms timeout writing/reading regs */ ++#define HFC_TIMER_T3 7000 /* timeout for l1 activation timer */ ++ ++#define HFCUSB_L1_STATECHANGE 0 /* L1 state changed */ ++#define HFCUSB_L1_DRX 1 /* D-frame received */ ++#define HFCUSB_L1_ERX 2 /* E-frame received */ ++#define HFCUSB_L1_DTX 4 /* D-frames completed */ ++ ++#define MAX_BCH_SIZE 2048 /* allowed B-channel packet size */ ++ ++#define HFCUSB_RX_THRESHOLD 64 /* threshold for fifo report bit rx */ ++#define HFCUSB_TX_THRESHOLD 64 /* threshold for fifo report bit tx */ ++ ++#define HFCUSB_CHIP_ID 0x16 /* Chip ID register index */ ++#define HFCUSB_CIRM 0x00 /* cirm register index */ ++#define HFCUSB_USB_SIZE 0x07 /* int length register */ ++#define HFCUSB_USB_SIZE_I 0x06 /* iso length register */ ++#define HFCUSB_F_CROSS 0x0b /* bit order register */ ++#define HFCUSB_CLKDEL 0x37 /* bit delay register */ ++#define HFCUSB_CON_HDLC 0xfa /* channel connect register */ ++#define HFCUSB_HDLC_PAR 0xfb ++#define HFCUSB_SCTRL 0x31 /* S-bus control register (tx) */ ++#define HFCUSB_SCTRL_E 0x32 /* same for E and special funcs */ ++#define HFCUSB_SCTRL_R 0x33 /* S-bus control register (rx) */ ++#define HFCUSB_F_THRES 0x0c /* threshold register */ ++#define HFCUSB_FIFO 0x0f /* fifo select register */ ++#define HFCUSB_F_USAGE 0x1a /* fifo usage register */ ++#define HFCUSB_MST_MODE0 0x14 ++#define HFCUSB_MST_MODE1 0x15 ++#define HFCUSB_P_DATA 0x1f ++#define HFCUSB_INC_RES_F 0x0e ++#define HFCUSB_STATES 0x30 ++ ++#define HFCUSB_CHIPID 0x40 /* ID value of HFC-USB */ ++ ++/******************/ ++/* fifo registers */ ++/******************/ ++#define HFCUSB_NUM_FIFOS 8 /* maximum number of fifos */ ++#define HFCUSB_B1_TX 0 /* index for B1 transmit bulk/int */ ++#define HFCUSB_B1_RX 1 /* index for B1 receive bulk/int */ ++#define HFCUSB_B2_TX 2 ++#define HFCUSB_B2_RX 3 ++#define HFCUSB_D_TX 4 ++#define HFCUSB_D_RX 5 ++#define HFCUSB_PCM_TX 6 ++#define HFCUSB_PCM_RX 7 ++ ++/************/ ++/* LED mask */ ++/************/ ++#define LED_DRIVER 0x1 ++#define LED_L1 0x2 ++#define LED_BCH 0x4 ++ ++/**********/ ++/* macros */ ++/**********/ ++#define Write_hfc(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_out_pipe,0,0x40,(c),(b),0,0,HFC_CTRL_TIMEOUT) ++#define Read_hfc(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_in_pipe,1,0xC0,0,(b),(c),1,HFC_CTRL_TIMEOUT) ++ ++#ifdef COMPAT_HAS_USB_IDTAB ++/****************************************/ ++/* data defining the devices to be used */ ++/****************************************/ ++static __devinitdata const struct usb_device_id hfc_usb_idtab[3] = { ++ {USB_DEVICE(0x959, 0x2bd0)}, /* Colognechip ROM */ ++ {USB_DEVICE(0x7b0, 0x0006)}, /* USB TA 128 */ ++ {} /* end with an all-zeroes entry */ ++}; ++#endif ++ ++/*************************************************/ ++/* entry and size of output/input control buffer */ ++/*************************************************/ ++#define HFC_CTRL_BUFSIZE 32 ++typedef struct { ++ __u8 hfc_reg; /* register number */ ++ __u8 reg_val; /* value to be written (or read) */ ++} ctrl_buft; ++ ++/***************************************************************/ ++/* structure defining input+output fifos (interrupt/bulk mode) */ ++/***************************************************************/ ++struct hfcusb_data; /* forward definition */ ++typedef struct { ++ int fifonum; /* fifo index attached to this structure */ ++ __u8 fifo_mask; /* mask for this fifo */ ++ int active; /* fifo is currently active */ ++ struct hfcusb_data *hfc; /* pointer to main structure */ ++ int pipe; /* address of endpoint */ ++ __u8 usb_maxlen; /* maximum length for usb transfer */ ++ int max_size; /* maximum size of receive/send packet */ ++ int transmode; /* transparent mode selected */ ++ int framenum; /* number of frame when last tx completed */ ++ int rx_offset; /* offset inside rx buffer */ ++ int next_complete; /* complete marker */ ++ __u8 *act_ptr; /* pointer to next data */ ++ __u8 intervall; /* interrupt interval */ ++ struct sk_buff *buff; /* actual used buffer */ ++ urb_t urb; /* transfer structure for usb routines */ ++ __u8 buffer[128]; /* buffer incoming/outgoing data */ ++} usb_fifo; ++ ++/*********************************************/ ++/* structure holding all data for one device */ ++/*********************************************/ ++typedef struct hfcusb_data { ++ struct hisax_drvreg regd; /* register data and callbacks */ ++ struct usb_device *dev; /* our device */ ++ int if_used; /* used interface number */ ++ int alt_used; /* used alternate config */ ++ int ctrl_paksize; /* control pipe packet size */ ++ int ctrl_in_pipe, ctrl_out_pipe; /* handles for control pipe */ ++ ++ /* control pipe background handling */ ++ ctrl_buft ctrl_buff[HFC_CTRL_BUFSIZE]; /* buffer holding queued data */ ++ volatile int ctrl_in_idx, ctrl_out_idx, ctrl_cnt; /* input/output pointer + count */ ++ urb_t ctrl_urb; /* transfer structure for control channel */ ++ devrequest ctrl_write; /* buffer for control write request */ ++ devrequest ctrl_read; /* same for read request */ ++ ++ volatile __u8 dfifo_fill; /* value read from tx d-fifo */ ++ volatile __u8 active_fifos; /* fifos currently active as bit mask */ ++ volatile __u8 threshold_mask; /* threshold actually reported */ ++ volatile __u8 service_request; /* fifo needs service from task */ ++ volatile __u8 ctrl_fifo; /* last selected fifo */ ++ volatile __u8 bch_enables; /* or mask for sctrl_r and sctrl register values */ ++ volatile __u8 led_req; /* request status of adapters leds */ ++ volatile __u8 led_act; /* active status of adapters leds */ ++ usb_fifo fifos[HFCUSB_NUM_FIFOS]; /* structure holding all fifo data */ ++ ++ /* layer 1 activation/deactivation handling */ ++ volatile __u8 l1_state; /* actual l1 state */ ++ volatile ulong l1_event; /* event mask */ ++ struct tq_struct l1_tq; /* l1 bh structure */ ++ struct timer_list t3_timer; /* timer for activation/deactivation */ ++ struct timer_list t4_timer; /* timer for activation/deactivation */ ++} hfcusb_data; ++ ++#if 0 ++static void ++usb_dump_urb(purb_t purb) ++{ ++ printk("urb :%p\n", purb); ++ printk("next :%p\n", purb->next); ++ printk("dev :%p\n", purb->dev); ++ printk("pipe :%08X\n", purb->pipe); ++ printk("status :%d\n", purb->status); ++ printk("transfer_flags :%08X\n", purb->transfer_flags); ++ printk("transfer_buffer :%p\n", purb->transfer_buffer); ++ printk("transfer_buffer_length:%d\n", ++ purb->transfer_buffer_length); ++ printk("actual_length :%d\n", purb->actual_length); ++ printk("setup_packet :%p\n", purb->setup_packet); ++ printk("start_frame :%d\n", purb->start_frame); ++ printk("number_of_packets :%d\n", purb->number_of_packets); ++ printk("interval :%d\n", purb->interval); ++ printk("error_count :%d\n", purb->error_count); ++ printk("context :%p\n", purb->context); ++ printk("complete :%p\n", purb->complete); ++} ++#endif ++ ++/*************************************************************************/ ++/* bottom half handler for L1 activation/deactiavtaion + D-chan + E-chan */ ++/*************************************************************************/ ++static void ++usb_l1d_bh(hfcusb_data * hfc) ++{ ++ ++ while (hfc->l1_event) { ++ if (test_and_clear_bit ++ (HFCUSB_L1_STATECHANGE, &hfc->l1_event)) { ++ if (hfc->l1_state == 7) ++ hfc->led_req |= LED_L1; ++ else ++ hfc->led_req &= ~LED_L1; ++ if ((hfc->l1_state == 7) || ++ (hfc->l1_state == 3)) ++ hfc->regd.dch_l1l2(hfc->regd.arg_hisax, ++ (hfc->l1_state == ++ 7) ? (PH_ACTIVATE | ++ INDICATION) ++ : (PH_DEACTIVATE | INDICATION), ++ NULL); ++ } ++ if (test_and_clear_bit(HFCUSB_L1_DRX, &hfc->l1_event)) { ++ hfc->regd.dch_l1l2(hfc->regd.arg_hisax, ++ PH_DATA | INDICATION, ++ (void *) 0); ++ } ++ if (test_and_clear_bit(HFCUSB_L1_ERX, &hfc->l1_event)) { ++ hfc->regd.dch_l1l2(hfc->regd.arg_hisax, ++ PH_DATA | INDICATION, ++ (void *) 1); ++ } ++ if (test_and_clear_bit(HFCUSB_L1_DTX, &hfc->l1_event)) { ++ hfc->regd.dch_l1l2(hfc->regd.arg_hisax, ++ PH_DATA | CONFIRM, NULL); ++ } ++ } /* while */ ++} /* usb_l1d_bh */ ++ ++/******************************************************/ ++/* start next background transfer for control channel */ ++/******************************************************/ ++static void ++ctrl_start_transfer(hfcusb_data * hfc) ++{ ++ ++ if (hfc->ctrl_cnt) { ++ switch (hfc->ctrl_buff[hfc->ctrl_out_idx].hfc_reg) { ++ case HFCUSB_F_USAGE: ++ hfc->ctrl_urb.pipe = hfc->ctrl_in_pipe; ++ hfc->ctrl_urb.setup_packet = ++ (u_char *) & hfc->ctrl_read; ++ hfc->ctrl_urb.transfer_buffer_length = 1; ++ hfc->ctrl_read.index = ++ hfc->ctrl_buff[hfc->ctrl_out_idx]. ++ hfc_reg; ++ hfc->ctrl_urb.transfer_buffer = ++ (char *) &hfc->dfifo_fill; ++ break; ++ ++ default: /* write register */ ++ hfc->ctrl_urb.pipe = hfc->ctrl_out_pipe; ++ hfc->ctrl_urb.setup_packet = ++ (u_char *) & hfc->ctrl_write; ++ hfc->ctrl_urb.transfer_buffer = NULL; ++ hfc->ctrl_urb.transfer_buffer_length = 0; ++ hfc->ctrl_write.index = ++ hfc->ctrl_buff[hfc->ctrl_out_idx]. ++ hfc_reg; ++ hfc->ctrl_write.value = ++ hfc->ctrl_buff[hfc->ctrl_out_idx]. ++ reg_val; ++ break; ++ } ++ usb_submit_urb(&hfc->ctrl_urb); /* start transfer */ ++ } ++} /* ctrl_start_transfer */ ++ ++/************************************/ ++/* queue a control transfer request */ ++/* return 0 on success. */ ++/************************************/ ++static int ++queue_control_request(hfcusb_data * hfc, __u8 reg, __u8 val) ++{ ++ ctrl_buft *buf; ++ ++ if (hfc->ctrl_cnt >= HFC_CTRL_BUFSIZE) ++ return (1); /* no space left */ ++ buf = hfc->ctrl_buff + hfc->ctrl_in_idx; /* pointer to new index */ ++ buf->hfc_reg = reg; ++ buf->reg_val = val; ++ if (++hfc->ctrl_in_idx >= HFC_CTRL_BUFSIZE) ++ hfc->ctrl_in_idx = 0; /* pointer wrap */ ++ if (++hfc->ctrl_cnt == 1) ++ ctrl_start_transfer(hfc); ++ return (0); ++} /* queue_control_request */ ++ ++/**************************************/ ++/* called when timer t3 or t4 expires */ ++/**************************************/ ++static void ++l1_timer_expire(hfcusb_data * hfc) ++{ ++ if (timer_pending(&hfc->t4_timer)) ++ del_timer(&hfc->t4_timer); ++ queue_control_request(hfc, HFCUSB_STATES, 0x40); ++ test_and_set_bit(HFCUSB_L1_STATECHANGE, ++ &hfc->l1_event); ++ queue_task(&hfc->l1_tq, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++} /* l1_timer_expire */ ++ ++/**************************************************/ ++/* (re)fills a tx-fifo urb. Queuing is done later */ ++/**************************************************/ ++static void ++fill_tx_urb(usb_fifo * fifo) ++{ ++ struct sk_buff *skb; ++ long flags; ++ int i, ii = 0; ++ ++ fifo->urb.dev = fifo->hfc->dev; ++ if ((fifo->buff) ++ && (fifo->urb.transfer_buffer_length < fifo->usb_maxlen)) { ++ switch (fifo->fifonum) { ++ case HFCUSB_B1_TX: ++ case HFCUSB_B2_TX: ++ skb = fifo->buff; ++ fifo->buff = NULL; ++ fifo->hfc->regd.bch_l1l2(fifo->hfc->regd. ++ arg_hisax, ++ (fifo->fifonum == ++ HFCUSB_B1_TX) ? 0 ++ : 1, ++ (PH_DATA | ++ CONFIRM), ++ (void *) skb); ++ fifo->hfc->service_request |= ++ fifo->fifo_mask; ++ return; ++ case HFCUSB_D_TX: ++ dev_kfree_skb_any(fifo->buff); ++ fifo->buff = NULL; ++ save_flags(flags); ++ cli(); ++ fifo->hfc->dfifo_fill = 0xff; /* currently invalid data */ ++ queue_control_request(fifo->hfc, ++ HFCUSB_FIFO, ++ HFCUSB_D_TX); ++ queue_control_request(fifo->hfc, ++ HFCUSB_F_USAGE, 0); ++ restore_flags(flags); ++ return; ++ default: ++ return; /* error, invalid fifo */ ++ } ++ } ++ ++ /* check if new buffer needed */ ++ if (!fifo->buff) { ++ switch (fifo->fifonum) { ++ case HFCUSB_B1_TX: ++ if (fifo->hfc->regd.bsk[0]) ++ fifo->buff = *fifo->hfc->regd.bsk[0]; /* B1-channel tx buffer */ ++ break; ++ case HFCUSB_B2_TX: ++ if (fifo->hfc->regd.bsk[1]) ++ fifo->buff = *fifo->hfc->regd.bsk[1]; /* B2-channel tx buffer */ ++ break; ++ case HFCUSB_D_TX: ++ if (fifo->hfc->regd.dsq) ++ fifo->buff = skb_dequeue(fifo->hfc->regd.dsq); /* D-channel tx queue */ ++ break; ++ default: ++ return; /* error, invalid fifo */ ++ } ++ if (!fifo->buff) { ++ fifo->active = 0; /* we are inactive now */ ++ fifo->hfc->active_fifos &= ~fifo->fifo_mask; ++ if (fifo->fifonum == HFCUSB_D_TX) { ++ test_and_set_bit(HFCUSB_L1_DTX, ++ &fifo->hfc->l1_event); ++ queue_task(&fifo->hfc->l1_tq, ++ &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++ } ++ return; ++ } ++ fifo->act_ptr = fifo->buff->data; /* start of data */ ++ fifo->active = 1; ++ ii = 1; ++ fifo->hfc->active_fifos |= fifo->fifo_mask; ++ fifo->hfc->service_request &= ~fifo->fifo_mask; ++ } ++ /* fillup the send buffer */ ++ i = fifo->buff->len - (fifo->act_ptr - fifo->buff->data); /* remaining length */ ++ fifo->buffer[0] = !fifo->transmode; /* not eof */ ++ if (i > (fifo->usb_maxlen - ii)) { ++ i = fifo->usb_maxlen - ii; ++ } ++ if (i) ++ memcpy(fifo->buffer + ii, fifo->act_ptr, i); ++ fifo->urb.transfer_buffer_length = i + ii; ++ fifo->rx_offset = ii; ++} /* fill_tx_urb */ ++ ++/************************************************/ ++/* transmit completion routine for all tx fifos */ ++/************************************************/ ++static void ++tx_complete(purb_t urb) ++{ ++ usb_fifo *fifo = (usb_fifo *) urb->context; /* pointer to our fifo */ ++ ++ fifo->hfc->service_request &= ~fifo->fifo_mask; /* no further handling */ ++ fifo->framenum = usb_get_current_frame_number(fifo->hfc->dev); ++ ++ /* check for deactivation or error */ ++ if ((!fifo->active) || (urb->status)) { ++ fifo->hfc->active_fifos &= ~fifo->fifo_mask; /* we are inactive */ ++ fifo->active = 0; ++ if ((fifo->buff) && (fifo->fifonum == HFCUSB_D_TX)) { ++ dev_kfree_skb_any(fifo->buff); ++ } ++ fifo->buff = NULL; ++ return; ++ } ++ fifo->act_ptr += (urb->transfer_buffer_length - fifo->rx_offset); /* adjust pointer */ ++ fill_tx_urb(fifo); /* refill the urb */ ++ fifo->hfc->threshold_mask |= fifo->fifo_mask; /* assume threshold reached */ ++ if (fifo->buff) ++ fifo->hfc->service_request |= fifo->fifo_mask; /* need to restart */ ++} /* tx_complete */ ++ ++/***********************************************/ ++/* receive completion routine for all rx fifos */ ++/***********************************************/ ++static void ++rx_complete(purb_t urb) ++{ ++ usb_fifo *fifo = (usb_fifo *) urb->context; /* pointer to our fifo */ ++ hfcusb_data *hfc = fifo->hfc; ++ usb_fifo *txfifo; ++ __u8 last_state; ++ int i, ii, currcnt, hdlci; ++ struct sk_buff *skb; ++ ++ urb->dev = hfc->dev; /* security init */ ++ if ((!fifo->active) || (urb->status)) { ++ hfc->service_request &= ~fifo->fifo_mask; /* no further handling */ ++ hfc->active_fifos &= ~fifo->fifo_mask; /* we are inactive */ ++ fifo->urb.interval = 0; /* cancel automatic rescheduling */ ++ if (fifo->buff) { ++ dev_kfree_skb_any(fifo->buff); ++ fifo->buff = NULL; ++ } ++ return; ++ } ++ ++ /* first check for any status changes */ ++ if ((urb->actual_length < fifo->rx_offset) ++ || (urb->actual_length > fifo->usb_maxlen)) ++ return; /* error condition */ ++ ++ if (fifo->rx_offset) { ++ hfc->threshold_mask = fifo->buffer[1]; /* update threshold status */ ++ fifo->next_complete = fifo->buffer[0] & 1; ++ if ((fifo->fifonum == HFCUSB_D_RX) && ++ (hfc->led_req != hfc->led_act)) ++ queue_control_request(hfc, HFCUSB_P_DATA, hfc->led_req); ++ ++ /* check if rescheduling needed */ ++ if ((i = ++ hfc->service_request & hfc->active_fifos & ~hfc-> ++ threshold_mask)) { ++ currcnt = ++ usb_get_current_frame_number(hfc->dev); ++ txfifo = hfc->fifos + HFCUSB_B1_TX; ++ ii = 3; ++ while (ii--) { ++ if ((i & txfifo->fifo_mask) ++ && (currcnt != txfifo->framenum)) { ++ hfc->service_request &= ++ ~txfifo->fifo_mask; ++ if (!txfifo->buff) ++ fill_tx_urb(txfifo); ++ if (txfifo->buff) ++ usb_submit_urb(&txfifo-> ++ urb); ++ } ++ txfifo += 2; ++ } ++ } ++ ++ /* handle l1 events */ ++ if ((fifo->buffer[0] >> 4) != hfc->l1_state) { ++ last_state = hfc->l1_state; ++ hfc->l1_state = fifo->buffer[0] >> 4; /* update status */ ++ if (timer_pending(&hfc->t4_timer)) ++ del_timer(&hfc->t4_timer); ++ if (((hfc->l1_state == 3) && ++ ((last_state == 7) || ++ (last_state == 8))) || ++ ((timer_pending(&hfc->t3_timer) && ++ (hfc->l1_state == 8)))) { ++ hfc->t4_timer.expires = jiffies + 2; ++ add_timer(&hfc->t4_timer); ++ } else { ++ if (timer_pending(&hfc->t3_timer) ++ && (hfc->l1_state == 7)) ++ del_timer(&hfc->t3_timer); /* no longer needed */ ++ test_and_set_bit(HFCUSB_L1_STATECHANGE, ++ &hfc->l1_event); ++ queue_task(&hfc->l1_tq, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++ } ++ } ++ } ++ ++ /* check the length for data and move if present */ ++ if (fifo->next_complete || (urb->actual_length > fifo->rx_offset)) { ++ i = fifo->buff->len + urb->actual_length - fifo->rx_offset; /* new total length */ ++ hdlci = (fifo->transmode) ? 0 : 3; ++ if (i <= (fifo->max_size + hdlci)) { ++ memcpy(fifo->act_ptr, ++ fifo->buffer + fifo->rx_offset, ++ urb->actual_length - fifo->rx_offset); ++ fifo->act_ptr += ++ (urb->actual_length - fifo->rx_offset); ++ fifo->buff->len += ++ (urb->actual_length - fifo->rx_offset); ++ } else ++ fifo->buff->len = fifo->max_size + 4; /* mark frame as to long */ ++ if (fifo->next_complete && (urb->actual_length < fifo->usb_maxlen)) { ++ /* the frame is complete */ ++ fifo->next_complete = 0; ++ if (((!*(fifo->act_ptr - 1)) || fifo->transmode) && ++ (fifo->buff->len >= (hdlci + 1)) ++ && (fifo->buff->len <= ++ (fifo->max_size + hdlci)) && ++ ((skb = dev_alloc_skb(fifo->max_size + hdlci)) != NULL)) { ++ fifo->buff->len -= hdlci; /* adjust size */ ++ switch (fifo->fifonum) { ++ case HFCUSB_D_RX: ++ skb_queue_tail(hfc->regd. ++ drq, ++ fifo->buff); ++ test_and_set_bit ++ (HFCUSB_L1_DRX, ++ &hfc->l1_event); ++ queue_task(&hfc->l1_tq, ++ &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++ break; ++ ++ case HFCUSB_B1_RX: ++ if (hfc->regd.brq[0]) { ++ skb_queue_tail ++ (hfc->regd. ++ brq[0], ++ fifo->buff); ++ hfc->regd. ++ bch_l1l2(hfc-> ++ regd. ++ arg_hisax, ++ 0, ++ PH_DATA ++ | ++ INDICATION, ++ (void *) ++ fifo-> ++ buff); ++ } else ++ dev_kfree_skb_any ++ (fifo->buff); ++ break; ++ ++ case HFCUSB_B2_RX: ++ if (hfc->regd.brq[1]) { ++ skb_queue_tail ++ (hfc->regd. ++ brq[1], ++ fifo->buff); ++ hfc->regd. ++ bch_l1l2(hfc-> ++ regd. ++ arg_hisax, ++ 1, ++ PH_DATA ++ | ++ INDICATION, ++ (void ++ *) ++ fifo-> ++ buff); ++ } else ++ dev_kfree_skb_any ++ (fifo->buff); ++ break; ++ ++ case HFCUSB_PCM_RX: ++ skb_queue_tail(&hfc->regd. ++ erq, ++ fifo->buff); ++ test_and_set_bit ++ (HFCUSB_L1_ERX, ++ &hfc->l1_event); ++ queue_task(&hfc->l1_tq, ++ &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++ break; ++ ++ default: ++ dev_kfree_skb_any(fifo-> ++ buff); ++ break; ++ } ++ fifo->buff = skb; ++ } ++ fifo->buff->len = 0; /* reset counter */ ++ fifo->act_ptr = fifo->buff->data; /* and pointer */ ++ } ++ } ++ fifo->rx_offset = (urb->actual_length < fifo->usb_maxlen) ? 2 : 0; ++} /* rx_complete */ ++ ++/***************************************************/ ++/* start the interrupt transfer for the given fifo */ ++/***************************************************/ ++static void ++start_rx_fifo(usb_fifo * fifo) ++{ ++ if (fifo->buff) ++ return; /* still active */ ++ if (! ++ (fifo->buff = ++ dev_alloc_skb(fifo->max_size + (fifo->transmode ? 0 : 3)))) ++ return; ++ fifo->act_ptr = fifo->buff->data; ++ FILL_INT_URB(&fifo->urb, fifo->hfc->dev, fifo->pipe, fifo->buffer, ++ fifo->usb_maxlen, rx_complete, fifo, fifo->intervall); ++ fifo->next_complete = 0; ++ fifo->rx_offset = 2; ++ fifo->active = 1; /* must be marked active */ ++ fifo->hfc->active_fifos |= fifo->fifo_mask; ++ if (usb_submit_urb(&fifo->urb)) { ++ fifo->active = 0; ++ fifo->hfc->active_fifos &= ~fifo->fifo_mask; ++ dev_kfree_skb_any(fifo->buff); ++ fifo->buff = NULL; ++ } ++} /* start_rx_fifo */ ++ ++/***************************************************************/ ++/* control completion routine handling background control cmds */ ++/***************************************************************/ ++static void ++ctrl_complete(purb_t urb) ++{ ++ hfcusb_data *hfc = (hfcusb_data *) urb->context; ++ ++ urb->dev = hfc->dev; ++ if (hfc->ctrl_cnt) { ++ switch (hfc->ctrl_buff[hfc->ctrl_out_idx].hfc_reg) { ++ case HFCUSB_FIFO: ++ hfc->ctrl_fifo = ++ hfc->ctrl_buff[hfc->ctrl_out_idx]. ++ reg_val; ++ break; ++ case HFCUSB_F_USAGE: ++ if (!hfc->dfifo_fill) { ++ fill_tx_urb(hfc->fifos + ++ HFCUSB_D_TX); ++ if (hfc->fifos[HFCUSB_D_TX].buff) ++ usb_submit_urb(&hfc-> ++ fifos ++ [HFCUSB_D_TX]. ++ urb); ++ } else { ++ queue_control_request(hfc, ++ HFCUSB_FIFO, ++ HFCUSB_D_TX); ++ queue_control_request(hfc, ++ HFCUSB_F_USAGE, ++ 0); ++ } ++ break; ++ case HFCUSB_SCTRL_R: ++ switch (hfc->ctrl_fifo) { ++ case HFCUSB_B1_RX: ++ if (hfc->bch_enables & 1) ++ start_rx_fifo(hfc-> ++ fifos ++ + ++ HFCUSB_B1_RX); ++ break; ++ case HFCUSB_B2_RX: ++ if (hfc->bch_enables & 2) ++ start_rx_fifo(hfc-> ++ fifos ++ + ++ HFCUSB_B2_RX); ++ break; ++ } ++ if (hfc->bch_enables & 3) ++ hfc->led_req |= LED_BCH; ++ else ++ hfc->led_req &= ~LED_BCH; ++ break; ++ case HFCUSB_P_DATA: ++ hfc->led_act = ++ hfc->ctrl_buff[hfc->ctrl_out_idx]. ++ reg_val; ++ break; ++ } ++ hfc->ctrl_cnt--; /* decrement actual count */ ++ if (++hfc->ctrl_out_idx >= HFC_CTRL_BUFSIZE) ++ hfc->ctrl_out_idx = 0; /* pointer wrap */ ++ ctrl_start_transfer(hfc); /* start next transfer */ ++ } ++} /* ctrl_complete */ ++ ++/*****************************************/ ++/* Layer 1 + D channel access from HiSax */ ++/*****************************************/ ++static void ++hfcusb_l1_access(void *drvarg, int pr, void *arg) ++{ ++ hfcusb_data *hfc = (hfcusb_data *) drvarg; ++ ++ switch (pr) { ++ case (PH_DATA | REQUEST): ++ case (PH_PULL | INDICATION): ++ skb_queue_tail(hfc->regd.dsq, ++ (struct sk_buff *) arg); ++ if (!hfc->fifos[HFCUSB_D_TX].active ++ && !hfc->dfifo_fill) { ++ fill_tx_urb(hfc->fifos + HFCUSB_D_TX); ++ hfc->active_fifos |= ++ hfc->fifos[HFCUSB_D_TX].fifo_mask; ++ usb_submit_urb(&hfc->fifos[HFCUSB_D_TX]. ++ urb); ++ } ++ break; ++ case (PH_ACTIVATE | REQUEST): ++ switch (hfc->l1_state) { ++ case 6: ++ case 8: ++ hfc->regd.dch_l1l2(hfc->regd.arg_hisax, ++ (PH_DEACTIVATE | ++ INDICATION), NULL); ++ ++ break; ++ case 7: ++ hfc->regd.dch_l1l2(hfc->regd.arg_hisax, ++ (PH_ACTIVATE | ++ INDICATION), NULL); ++ ++ break; ++ default: ++ queue_control_request(hfc, HFCUSB_STATES, 0x60); /* start activation */ ++ hfc->t3_timer.expires = ++ jiffies + (HFC_TIMER_T3 * HZ) / 1000; ++ if (!timer_pending(&hfc->t3_timer)) ++ add_timer(&hfc->t3_timer); ++ break; ++ } ++ break; ++ ++ case (PH_DEACTIVATE | REQUEST): ++ queue_control_request(hfc, HFCUSB_STATES, 0x40); /* start deactivation */ ++ break; ++ default: ++ printk(KERN_INFO "unknown hfcusb l1_access 0x%x\n", ++ pr); ++ break; ++ } ++} /* hfcusb_l1_access */ ++ ++/*******************************/ ++/* B channel access from HiSax */ ++/*******************************/ ++static void ++hfcusb_bch_access(void *drvarg, int chan, int pr, void *arg) ++{ ++ hfcusb_data *hfc = (hfcusb_data *) drvarg; ++ usb_fifo *fifo = hfc->fifos + (chan ? HFCUSB_B2_TX : HFCUSB_B1_TX); ++ long flags; ++ ++ switch (pr) { ++ case (PH_DATA | REQUEST): ++ case (PH_PULL | INDICATION): ++ save_flags(flags); ++ cli(); ++ if (!fifo->active) { ++ fill_tx_urb(fifo); ++ hfc->active_fifos |= fifo->fifo_mask; ++ usb_submit_urb(&fifo->urb); ++ } ++ restore_flags(flags); ++ break; ++ case (PH_ACTIVATE | REQUEST): ++ if (!((int) arg)) { ++ hfc->bch_enables &= ~(1 << chan); ++ if (fifo->active) { ++ fifo->active = 0; ++ usb_unlink_urb(&fifo->urb); ++ } ++ save_flags(flags); ++ cli(); ++ queue_control_request(hfc, HFCUSB_FIFO, ++ fifo->fifonum); ++ queue_control_request(hfc, ++ HFCUSB_INC_RES_F, 2); ++ queue_control_request(hfc, HFCUSB_CON_HDLC, ++ 9); ++ queue_control_request(hfc, HFCUSB_SCTRL, ++ 0x40 + ++ hfc->bch_enables); ++ queue_control_request(hfc, HFCUSB_SCTRL_R, ++ hfc->bch_enables); ++ restore_flags(flags); ++ fifo++; ++ if (fifo->active) { ++ fifo->active = 0; ++ usb_unlink_urb(&fifo->urb); ++ } ++ return; /* fifo deactivated */ ++ } ++ fifo->transmode = ((int) arg == L1_MODE_TRANS); ++ fifo->max_size = ++ ((fifo->transmode) ? fifo-> ++ usb_maxlen : MAX_BCH_SIZE); ++ (fifo + 1)->transmode = fifo->transmode; ++ (fifo + 1)->max_size = fifo->max_size; ++ hfc->bch_enables |= (1 << chan); ++ save_flags(flags); ++ cli(); ++ queue_control_request(hfc, HFCUSB_FIFO, ++ fifo->fifonum); ++ queue_control_request(hfc, HFCUSB_CON_HDLC, ++ ((!fifo-> ++ transmode) ? 9 : 11)); ++ queue_control_request(hfc, HFCUSB_INC_RES_F, 2); ++ queue_control_request(hfc, HFCUSB_SCTRL, ++ 0x40 + hfc->bch_enables); ++ if ((int) arg == L1_MODE_HDLC) ++ queue_control_request(hfc, HFCUSB_CON_HDLC, ++ 8); ++ queue_control_request(hfc, HFCUSB_FIFO, ++ fifo->fifonum + 1); ++ queue_control_request(hfc, HFCUSB_CON_HDLC, ++ ((!fifo-> ++ transmode) ? 8 : 10)); ++ queue_control_request(hfc, HFCUSB_INC_RES_F, 2); ++ queue_control_request(hfc, HFCUSB_SCTRL_R, ++ hfc->bch_enables); ++ restore_flags(flags); ++ ++ break; ++ ++ default: ++ printk(KERN_INFO ++ "unknown hfcusb bch_access chan %d 0x%x\n", ++ chan, pr); ++ break; ++ } ++} /* hfcusb_bch_access */ ++ ++/***************************************************************************/ ++/* usb_init is called once when a new matching device is detected to setup */ ++/* main parmeters. It registers the driver at the main hisax module. */ ++/* on success 0 is returned. */ ++/***************************************************************************/ ++static int ++usb_init(hfcusb_data * hfc) ++{ ++ usb_fifo *fifo; ++ int i; ++ u_char b; ++ ++ /* check the chip id */ ++ if ((Read_hfc(hfc, HFCUSB_CHIP_ID, &b) != 1) || ++ (b != HFCUSB_CHIPID)) { ++ printk(KERN_INFO "HFC-USB: Invalid chip id 0x%02x\n", b); ++ return (1); ++ } ++ ++ /* first set the needed config, interface and alternate */ ++ usb_set_configuration(hfc->dev, 1); ++ usb_set_interface(hfc->dev, hfc->if_used, hfc->alt_used); ++ ++ /* init the led state request */ ++ hfc->led_req = LED_DRIVER; ++ ++ /* now we initialise the chip */ ++ Write_hfc(hfc, HFCUSB_CIRM, 0x10); /* aux = output, reset off */ ++ Write_hfc(hfc, HFCUSB_P_DATA, 0); /* leds = off */ ++ Write_hfc(hfc, HFCUSB_USB_SIZE, ++ (hfc->fifos[HFCUSB_B1_TX].usb_maxlen >> 3) | ++ ((hfc->fifos[HFCUSB_B1_RX].usb_maxlen >> 3) << 4)); ++ ++ /* enable PCM/GCI master mode */ ++ Write_hfc(hfc, HFCUSB_MST_MODE1, 0); /* set default values */ ++ Write_hfc(hfc, HFCUSB_MST_MODE0, 1); /* enable master mode */ ++ ++ /* init the fifos */ ++ Write_hfc(hfc, HFCUSB_F_THRES, (HFCUSB_TX_THRESHOLD >> 3) | ++ ((HFCUSB_RX_THRESHOLD >> 3) << 4)); ++ ++ for (i = 0, fifo = hfc->fifos + i; i < HFCUSB_NUM_FIFOS; ++ i++, fifo++) { ++ Write_hfc(hfc, HFCUSB_FIFO, i); /* select the desired fifo */ ++ ++ fifo->transmode = 0; /* hdlc mode selected */ ++ fifo->buff = NULL; /* init buffer pointer */ ++ fifo->max_size = ++ (i <= HFCUSB_B2_RX) ? MAX_BCH_SIZE : MAX_DFRAME_LEN; ++ Write_hfc(hfc, HFCUSB_HDLC_PAR, ((i <= HFCUSB_B2_RX) ? 0 : 2)); /* data length */ ++ Write_hfc(hfc, HFCUSB_CON_HDLC, ((i & 1) ? 0x08 : 0x09)); /* rx hdlc, tx fill 1 */ ++ Write_hfc(hfc, HFCUSB_INC_RES_F, 2); /* reset the fifo */ ++ } ++ ++ Write_hfc(hfc, HFCUSB_CLKDEL, 0x0f); /* clock delay value */ ++ Write_hfc(hfc, HFCUSB_STATES, 3 | 0x10); /* set deactivated mode */ ++ Write_hfc(hfc, HFCUSB_STATES, 3); /* enable state machine */ ++ ++ Write_hfc(hfc, HFCUSB_SCTRL_R, 0); /* disable both B receivers */ ++ Write_hfc(hfc, HFCUSB_SCTRL, 0x40); /* disable B transmitters + cap mode */ ++ ++ /* init the l1 timer */ ++ init_timer(&hfc->t3_timer); ++ hfc->t3_timer.data = (long) hfc; ++ hfc->t3_timer.function = (void *) l1_timer_expire; ++ hfc->t4_timer.data = (long) hfc; ++ hfc->t4_timer.function = (void *) l1_timer_expire; ++ hfc->l1_tq.routine = (void *) (void *) usb_l1d_bh; ++ hfc->l1_tq.sync = 0; ++ hfc->l1_tq.data = hfc; ++ ++ /* init the background control machinery */ ++ hfc->ctrl_read.requesttype = 0xc0; ++ hfc->ctrl_read.request = 1; ++ hfc->ctrl_read.length = 1; ++ hfc->ctrl_write.requesttype = 0x40; ++ hfc->ctrl_write.request = 0; ++ hfc->ctrl_write.length = 0; ++ FILL_CONTROL_URB(&hfc->ctrl_urb, hfc->dev, hfc->ctrl_out_pipe, ++ (u_char *) & hfc->ctrl_write, NULL, 0, ++ ctrl_complete, hfc); ++ ++ /* init the TX-urbs */ ++ fifo = hfc->fifos + HFCUSB_D_TX; ++ FILL_BULK_URB(&fifo->urb, hfc->dev, fifo->pipe, ++ (u_char *) fifo->buffer, 0, tx_complete, fifo); ++ fifo = hfc->fifos + HFCUSB_B1_TX; ++ FILL_BULK_URB(&fifo->urb, hfc->dev, fifo->pipe, ++ (u_char *) fifo->buffer, 0, tx_complete, fifo); ++ fifo = hfc->fifos + HFCUSB_B2_TX; ++ FILL_BULK_URB(&fifo->urb, hfc->dev, fifo->pipe, ++ (u_char *) fifo->buffer, 0, tx_complete, fifo); ++ ++ /* init the E-buffer */ ++ skb_queue_head_init(&hfc->regd.erq); ++ ++ /* now register ourself at hisax */ ++ hfc->regd.version = HISAX_LOAD_VERSION; /* set our version */ ++ hfc->regd.cmd = HISAX_LOAD_REGISTER; /* register command */ ++ hfc->regd.argl1 = (void *) hfc; /* argument for our local routine */ ++ hfc->regd.dch_l2l1 = hfcusb_l1_access; ++ hfc->regd.bch_l2l1 = hfcusb_bch_access; ++ hfc->regd.drvname = "hfc_usb"; ++ if (hisax_register_hfcusb(&hfc->regd)) { ++ printk(KERN_INFO "HFC-USB failed to register at hisax\n"); ++ Write_hfc(hfc, HFCUSB_CIRM, 0x08); /* aux = input, reset on */ ++ return (1); ++ } ++ ++ /* startup the D- and E-channel fifos */ ++ start_rx_fifo(hfc->fifos + HFCUSB_D_RX); /* D-fifo */ ++ if (hfc->fifos[HFCUSB_PCM_RX].pipe) ++ start_rx_fifo(hfc->fifos + HFCUSB_PCM_RX); /* E-fifo */ ++ ++ return (0); ++} /* usb_init */ ++ ++/*************************************************/ ++/* function called to probe a new plugged device */ ++/*************************************************/ ++static void * ++hfc_usb_probe(struct usb_device *dev, unsigned int interface ++#ifdef COMPAT_HAS_USB_IDTAB ++ , const struct usb_device_id *id_table) ++#else ++ ) ++#endif ++{ ++ hfcusb_data *context; ++ struct usb_interface *ifp = dev->actconfig->interface + interface; ++ struct usb_interface_descriptor *ifdp = ++ ifp->altsetting + ifp->act_altsetting; ++ struct usb_endpoint_descriptor *epd; ++ int i, idx, ep_msk; ++ ++#ifdef COMPAT_HAS_USB_IDTAB ++ if (id_table && (dev->descriptor.idVendor == id_table->idVendor) && ++ (dev->descriptor.idProduct == id_table->idProduct) && ++#else ++ if ((((dev->descriptor.idVendor == 0x959) && ++ (dev->descriptor.idProduct == 0x2bd0)) || ++ ((dev->descriptor.idVendor == 0x7b0) && ++ (dev->descriptor.idProduct == 0x0006))) && ++#endif ++ (ifdp->bNumEndpoints >= 6) && (ifdp->bNumEndpoints <= 16)) { ++ if (!(context = kmalloc(sizeof(hfcusb_data), GFP_KERNEL))) { ++ return (NULL); /* got no mem */ ++ }; ++ memset(context, 0, sizeof(hfcusb_data)); /* clear the structure */ ++ i = ifdp->bNumEndpoints; /* get number of endpoints */ ++ ep_msk = 0; /* none found */ ++ epd = ifdp->endpoint; /* first endpoint descriptor */ ++ while (i-- && ((ep_msk & 0xcf) != 0xcf)) { ++ ++ idx = (((epd->bEndpointAddress & 0x7f) - 1) << 1); /* get endpoint base */ ++ if (idx < 7) { ++ switch (epd->bmAttributes) { ++ case USB_ENDPOINT_XFER_INT: ++ if (! ++ (epd-> ++ bEndpointAddress & ++ 0x80)) ++ break; /* only interrupt in allowed */ ++ idx++; /* input index is odd */ ++ context->fifos[idx].pipe = ++ usb_rcvintpipe(dev, ++ epd-> ++ bEndpointAddress); ++ break; ++ ++ case USB_ENDPOINT_XFER_BULK: ++ if (epd-> ++ bEndpointAddress & ++ 0x80) ++ break; /* only bulk out allowed */ ++ context->fifos[idx].pipe = ++ usb_sndbulkpipe(dev, ++ epd-> ++ bEndpointAddress); ++ break; ++ default: ++ context->fifos[idx].pipe = 0; /* reset data */ ++ } /* switch attribute */ ++ ++ if (context->fifos[idx].pipe) { ++ context->fifos[idx].fifonum = idx; ++ context->fifos[idx].fifo_mask = ++ 1 << idx; ++ context->fifos[idx].hfc = context; ++ context->fifos[idx].usb_maxlen = ++ epd->wMaxPacketSize; ++ context->fifos[idx].intervall = ++ epd->bInterval; ++ ep_msk |= (1 << idx); ++ } else ++ ep_msk &= ~(1 << idx); ++ } /* idx < 7 */ ++ epd++; ++ } ++ ++ if ((ep_msk & 0x3f) != 0x3f) { ++ kfree(context); ++ return (NULL); ++ } ++ MOD_INC_USE_COUNT; /* lock our module */ ++ context->dev = dev; /* save device */ ++ context->if_used = interface; /* save used interface */ ++ context->alt_used = ifp->act_altsetting; /* and alternate config */ ++ context->ctrl_paksize = dev->descriptor.bMaxPacketSize0; /* control size */ ++ ++ /* create the control pipes needed for register access */ ++ context->ctrl_in_pipe = usb_rcvctrlpipe(context->dev, 0); ++ context->ctrl_out_pipe = usb_sndctrlpipe(context->dev, 0); ++ ++ /* init the chip and register the driver */ ++ if (usb_init(context)) { ++ kfree(context); ++ MOD_DEC_USE_COUNT; ++ return (NULL); ++ } ++ ++ printk(KERN_INFO ++ "HFC-USB: New device if=%d alt=%d registered\n", ++ context->if_used, context->alt_used); ++ return (context); ++ } ++ ++ return (NULL); /* no matching entry */ ++} /* hfc_usb_probe */ ++ ++/****************************************************/ ++/* function called when an active device is removed */ ++/****************************************************/ ++static void ++hfc_usb_disconnect(struct usb_device *usbdev, void *drv_context) ++{ ++ hfcusb_data *context = drv_context; ++ int i; ++ struct sk_buff *skb; ++ ++ /* tell all fifos to terminate */ ++ for (i = 0; i < HFCUSB_NUM_FIFOS; i++) ++ if (context->fifos[i].active) { ++ context->fifos[i].active = 0; ++ usb_unlink_urb(&context->fifos[i].urb); ++ } ++ while (context->active_fifos) { ++ set_current_state(TASK_INTERRUPTIBLE); ++ /* Timeout 10ms */ ++ schedule_timeout((10 * HZ) / 1000); ++ } ++ if (timer_pending(&context->t3_timer)) ++ del_timer(&context->t3_timer); ++ context->regd.release_driver(context->regd.arg_hisax); ++ while ((skb = skb_dequeue(&context->regd.erq)) != NULL) ++ dev_kfree_skb_any(skb); ++ ++ kfree(context); /* free our structure again */ ++ MOD_DEC_USE_COUNT; /* and decrement the usage counter */ ++} /* hfc_usb_disconnect */ ++ ++/************************************/ ++/* our driver information structure */ ++/************************************/ ++static struct usb_driver hfc_drv = { ++ name:"hfc_usb", ++#ifdef COMPAT_HAS_USB_IDTAB ++ id_table:hfc_usb_idtab, ++#endif ++ probe:hfc_usb_probe, ++ disconnect:hfc_usb_disconnect, ++}; ++ ++static void __exit ++hfc_usb_exit(void) ++{ ++ ++ usb_deregister(&hfc_drv); /* release our driver */ ++ printk(KERN_INFO "HFC-USB module removed\n"); ++} ++ ++static int __init ++hfc_usb_init(void) ++{ ++ struct hisax_drvreg drv; ++ ++ drv.version = HISAX_LOAD_VERSION; /* set our version */ ++ drv.cmd = HISAX_LOAD_CHKVER; /* check command only */ ++ if (hisax_register_hfcusb(&drv)) { ++ printk(KERN_INFO "HFC-USB <-> hisax version conflict\n"); ++ return (-1); /* unable to register */ ++ } ++ if (usb_register(&hfc_drv)) { ++ printk(KERN_INFO ++ "Unable to register HFC-USB module at usb stack\n"); ++ return (-1); /* unable to register */ ++ } ++ ++ printk(KERN_INFO "HFC-USB module loaded\n"); ++ return (0); ++} ++ ++module_init(hfc_usb_init); ++module_exit(hfc_usb_exit); +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_usbr.c linux-2.4.29/drivers/isdn/hisax/hfc_usbr.c +--- linux-2.4.29.old/drivers/isdn/hisax/hfc_usbr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfc_usbr.c 2005-03-22 15:06:46.397039360 +0100 +@@ -0,0 +1,471 @@ ++/* $Id: hfc_usbr.c,v 2.5 2001/07/06 21:30:11 werner Exp $ ++ ++ * hfc_usb.c low level driver for CCD´s hfc-usb single chip controllers ++ * type approval valid for HFC-S USB based TAs ++ * ++ * Author Werner Cornelius (werner@isdn-development.de) ++ * ++ * Copyright 2001 by Werner Cornelius (werner@isdn4linux.de) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#define __NO_VERSION__ ++#include <linux/init.h> ++#include "hisax.h" ++#include "isdnl1.h" ++#include "hisax_loadable.h" ++ ++extern const char *CardType[]; ++ ++static const char *hfcusb_revision = "$Revision: 2.5 $"; ++ ++/*********************************/ ++/* schedule a new b_channel task */ ++/*********************************/ ++static void ++hfcusb_sched_event(struct BCState *bcs, int event) ++{ ++ bcs->event |= 1 << event; ++ queue_task(&bcs->tqueue, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++} ++ ++/************************************************/ ++/* select a b-channel entry matching and active */ ++/************************************************/ ++static ++struct BCState * ++Sel_BCS(struct IsdnCardState *cs, int channel) ++{ ++ if (cs->bcs[0].mode && (cs->bcs[0].channel == channel)) ++ return (&cs->bcs[0]); ++ else if (cs->bcs[1].mode && (cs->bcs[1].channel == channel)) ++ return (&cs->bcs[1]); ++ else ++ return (NULL); ++} ++ ++/**********************************************/ ++/* transfer function (D-channel from l2 to l1 */ ++/**********************************************/ ++static void ++hfcusb_d_l2l1(struct PStack *st, int pr, void *arg) ++{ ++ struct IsdnCardState *cs = st->l1.hardware; ++ struct hisax_drvreg *drv = cs->hw.hfcusb.drv; ++ ++ if (drv) { ++ switch (pr) { ++ case (PH_DATA | REQUEST): ++ case (PH_PULL | INDICATION): ++ cs->hw.hfcusb.dch_tx_busy = 1; ++ break; ++ case (PH_PULL | REQUEST): ++ if (!cs->hw.hfcusb.dch_tx_busy) { ++ test_and_clear_bit(FLG_L1_PULL_REQ, ++ &st->l1.Flags); ++ st->l1.l1l2(st, PH_PULL | CONFIRM, ++ NULL); ++ } else ++ test_and_set_bit(FLG_L1_PULL_REQ, ++ &st->l1.Flags); ++ return; ++ } ++ drv->dch_l2l1(drv, pr, arg); ++ } else ++ debugl1(cs, "hfcusb l2l1 called without existing driver"); ++} /* hfcusb_d_l2l1 */ ++ ++/*****************************/ ++/* E-channel receive routine */ ++/*****************************/ ++static void ++EChannel_proc_rcv(struct IsdnCardState *cs) ++{ ++ u_char *ptr; ++ struct sk_buff *skb; ++ struct hisax_drvreg *usbdrv = ++ (struct hisax_drvreg *) cs->hw.hfcusb.drv; ++ ++ ++ while ((skb = skb_dequeue(&usbdrv->erq)) != NULL) { ++ if (cs->debug & DEB_DLOG_HEX) { ++ ptr = cs->dlog; ++ if ((skb->len) < MAX_DLOG_SPACE / 3 - 10) { ++ *ptr++ = 'E'; ++ *ptr++ = 'C'; ++ *ptr++ = 'H'; ++ *ptr++ = 'O'; ++ *ptr++ = ':'; ++ ptr += QuickHex(ptr, skb->data, skb->len); ++ ptr--; ++ *ptr++ = '\n'; ++ *ptr = 0; ++ HiSax_putstatus(cs, NULL, cs->dlog); ++ } else ++ HiSax_putstatus(cs, "LogEcho: ", ++ "warning Frame too big (%d)", ++ skb->len); ++ } ++ dev_kfree_skb_any(skb); ++ } ++} ++ ++/******************************************/ ++/* transfer function called from L1 to L2 */ ++/******************************************/ ++static void ++hfcusb_d_l1l2(void *cs1, int pr, void *arg) ++{ ++ struct IsdnCardState *cs = (struct IsdnCardState *) cs1; ++ ++ switch (pr) { ++ case (PH_DATA | INDICATION): ++ if (!((int) arg)) ++ DChannel_proc_rcv(cs); ++ else ++ EChannel_proc_rcv(cs); ++ break; ++ ++ case (PH_DATA | CONFIRM): ++ cs->hw.hfcusb.dch_tx_busy = 0; ++ DChannel_proc_xmt(cs); ++ break; ++ ++ case (PH_ACTIVATE | INDICATION): ++ case (PH_ACTIVATE | CONFIRM): ++ cs->stlist->l1.l1l2(cs->stlist, pr, arg); ++ if (cs->debug & L1_DEB_ISAC) ++ debugl1(cs, "layer 1 activated"); ++ break; ++ ++ case (PH_DEACTIVATE | INDICATION): ++ case (PH_DEACTIVATE | CONFIRM): ++ cs->stlist->l1.l1l2(cs->stlist, pr, arg); ++ if (cs->debug & L1_DEB_ISAC) ++ debugl1(cs, "layer 1 deactivated"); ++ break; ++ ++ default: ++ debugl1(cs, "unknown l1 msg 0x%x ", pr); ++ } ++} /* hfcusb_d_l1l2 */ ++ ++ ++/******************************************/ ++/* transfer function called from L1 to L2 */ ++/******************************************/ ++static void ++hfcusb_b_l1l2(void *cs1, int chan, int pr, void *arg) ++{ ++ struct IsdnCardState *cs = (struct IsdnCardState *) cs1; ++ struct BCState *bcs = Sel_BCS(cs, chan); ++ ++ switch (pr) { ++ case (PH_DATA | INDICATION): ++ if (!bcs) ++ return; ++ hfcusb_sched_event(bcs, B_RCVBUFREADY); ++ break; ++ ++ case (PH_DATA | CONFIRM): ++ if (!bcs) ++ return; ++ bcs->tx_cnt -= bcs->tx_skb->len; ++ if (bcs->st->lli.l1writewakeup && ++ (PACKET_NOACK != bcs->tx_skb->pkt_type)) ++ bcs->st->lli.l1writewakeup(bcs->st, ++ bcs->tx_skb-> ++ len); ++ dev_kfree_skb_any(bcs->tx_skb); ++ bcs->tx_skb = skb_dequeue(&bcs->squeue); ++ break; ++ ++ case (PH_ACTIVATE | INDICATION): ++ case (PH_ACTIVATE | CONFIRM): ++ cs->stlist->l1.l1l2(cs->stlist, pr, arg); ++ if (cs->debug & L1_DEB_ISAC) ++ debugl1(cs, "layer 1 activated"); ++ break; ++ ++ case (PH_DEACTIVATE | INDICATION): ++ case (PH_DEACTIVATE | CONFIRM): ++ cs->stlist->l1.l1l2(cs->stlist, pr, arg); ++ if (cs->debug & L1_DEB_ISAC) ++ debugl1(cs, "layer 1 deactivated"); ++ break; ++ ++ default: ++ debugl1(cs, "unknown l1 b msg 0x%x ", pr); ++ } ++} /* hfcusb_b_l1l2 */ ++ ++ ++/***********************************************/ ++/* called during init setting l1 stack pointer */ ++/***********************************************/ ++void ++setstack_hfcusb(struct PStack *st, struct IsdnCardState *cs) ++{ ++ st->l2.l2l1 = hfcusb_d_l2l1; ++} ++ ++/**************************************/ ++/* send B-channel data if not blocked */ ++/**************************************/ ++static void ++hfcusb_send_data(struct BCState *bcs) ++{ ++ struct IsdnCardState *cs = bcs->cs; ++ struct hisax_drvreg *drv = ++ (struct hisax_drvreg *) cs->hw.hfcusb.drv; ++ ++ if (!drv) ++ return; ++ drv->bch_l2l1(drv->argl1, bcs->channel, PH_DATA | REQUEST, ++ bcs->tx_skb); ++} ++ ++/***************************************************************/ ++/* activate/deactivate hardware for selected channels and mode */ ++/***************************************************************/ ++void ++mode_hfcusb(struct BCState *bcs, int mode, int bc) ++{ ++ struct IsdnCardState *cs = bcs->cs; ++ struct hisax_drvreg *drv = cs->hw.hfcusb.drv; ++ ++ if (!drv) ++ return; ++ if (cs->debug & L1_DEB_HSCX) ++ debugl1(cs, "HFCUSB bchannel mode %d bchan %d/%d", ++ mode, bc, bcs->channel); ++ bcs->mode = mode; ++ bcs->channel = bc; ++ if (mode) { ++ drv->bsk[bc] = &bcs->tx_skb; ++ drv->brq[bc] = &bcs->rqueue; ++ } ++ drv->bch_l2l1(drv->argl1, bc, PH_ACTIVATE | REQUEST, ++ (void *) mode); ++ if (!mode) { ++ drv->bsk[bc] = NULL; ++ drv->brq[bc] = NULL; ++ } ++} ++ ++/******************************/ ++/* Layer2 -> Layer 1 Transfer */ ++/******************************/ ++static void ++hfcusb_b_l2l1(struct PStack *st, int pr, void *arg) ++{ ++ struct sk_buff *skb = arg; ++ struct hisax_drvreg *drv = st->l1.bcs->cs->hw.hfcusb.drv; ++ long flags; ++ ++ switch (pr) { ++ case (PH_DATA | REQUEST): ++ save_flags(flags); ++ cli(); ++ if (st->l1.bcs->tx_skb) { ++ skb_queue_tail(&st->l1.bcs->squeue, skb); ++ restore_flags(flags); ++ } else { ++ st->l1.bcs->tx_skb = skb; ++ st->l1.bcs->cs->BC_Send_Data(st->l1.bcs); ++ restore_flags(flags); ++ } ++ break; ++ case (PH_PULL | INDICATION): ++ if (st->l1.bcs->tx_skb) { ++ printk(KERN_WARNING ++ "hfc_l2l1: this shouldn't happen\n"); ++ break; ++ } ++ save_flags(flags); ++ cli(); ++ st->l1.bcs->tx_skb = skb; ++ st->l1.bcs->cs->BC_Send_Data(st->l1.bcs); ++ restore_flags(flags); ++ break; ++ case (PH_PULL | REQUEST): ++ if (!st->l1.bcs->tx_skb) { ++ test_and_clear_bit(FLG_L1_PULL_REQ, ++ &st->l1.Flags); ++ st->l1.l1l2(st, PH_PULL | CONFIRM, NULL); ++ } else ++ test_and_set_bit(FLG_L1_PULL_REQ, ++ &st->l1.Flags); ++ break; ++ case (PH_ACTIVATE | REQUEST): ++ if (drv) { ++ test_and_set_bit(BC_FLG_ACTIV, ++ &st->l1.bcs->Flag); ++ mode_hfcusb(st->l1.bcs, st->l1.mode, ++ st->l1.bc); ++ l1_msg_b(st, pr, arg); ++ } ++ break; ++ case (PH_DEACTIVATE | REQUEST): ++ l1_msg_b(st, pr, arg); ++ break; ++ case (PH_DEACTIVATE | CONFIRM): ++ test_and_clear_bit(BC_FLG_ACTIV, ++ &st->l1.bcs->Flag); ++ test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); ++ mode_hfcusb(st->l1.bcs, 0, st->l1.bc); ++ st->l1.l1l2(st, PH_DEACTIVATE | CONFIRM, NULL); ++ break; ++ } ++} ++ ++/******************************************/ ++/* deactivate B-channel access and queues */ ++/******************************************/ ++static void ++close_hfcusb(struct BCState *bcs) ++{ ++ mode_hfcusb(bcs, 0, bcs->channel); ++ if (test_and_clear_bit(BC_FLG_INIT, &bcs->Flag)) { ++ skb_queue_purge(&bcs->rqueue); ++ skb_queue_purge(&bcs->squeue); ++ if (bcs->tx_skb) { ++ dev_kfree_skb_any(bcs->tx_skb); ++ bcs->tx_skb = NULL; ++ test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); ++ } ++ } ++} ++ ++/*************************************/ ++/* init B-channel queues and control */ ++/*************************************/ ++static int ++open_hfcusbstate(struct IsdnCardState *cs, struct BCState *bcs) ++{ ++ if (!test_and_set_bit(BC_FLG_INIT, &bcs->Flag)) { ++ skb_queue_head_init(&bcs->rqueue); ++ skb_queue_head_init(&bcs->squeue); ++ } ++ bcs->tx_skb = NULL; ++ test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); ++ bcs->event = 0; ++ bcs->tx_cnt = 0; ++ return (0); ++} ++ ++/*********************************/ ++/* inits the stack for B-channel */ ++/*********************************/ ++static int ++setstack_2b(struct PStack *st, struct BCState *bcs) ++{ ++ bcs->channel = st->l1.bc; ++ if (open_hfcusbstate(st->l1.hardware, bcs)) ++ return (-1); ++ st->l1.bcs = bcs; ++ st->l2.l2l1 = hfcusb_b_l2l1; ++ setstack_manager(st); ++ bcs->st = st; ++ setstack_l1_B(st); ++ return (0); ++} ++ ++/********************************/ ++/* called for card init message */ ++/********************************/ ++void __devinit ++inithfcusb(struct IsdnCardState *cs) ++{ ++ cs->setstack_d = setstack_hfcusb; ++ cs->BC_Send_Data = &hfcusb_send_data; ++ cs->bcs[0].BC_SetStack = setstack_2b; ++ cs->bcs[1].BC_SetStack = setstack_2b; ++ cs->bcs[0].BC_Close = close_hfcusb; ++ cs->bcs[1].BC_Close = close_hfcusb; ++ mode_hfcusb(cs->bcs, 0, 0); ++ mode_hfcusb(cs->bcs + 1, 0, 1); ++} ++ ++ ++ ++/*******************************************/ ++/* handle card messages from control layer */ ++/*******************************************/ ++static int ++hfcusb_card_msg(struct IsdnCardState *cs, int mt, void *arg) ++{ ++ if (cs->debug & L1_DEB_ISAC) ++ debugl1(cs, "HFCUSB: card_msg %x", mt); ++ switch (mt) { ++ case CARD_INIT: ++ inithfcusb(cs); ++ return (0); ++ case CARD_RELEASE: ++ case CARD_RESET: ++ case CARD_TEST: ++ return (0); ++ } ++ return (0); ++} ++ ++ ++extern void ++ HiSax_closecard(int cardnr); ++/*****************************/ ++/* release a driver instance */ ++/* called when hardware is */ ++/* no longer present. */ ++/*****************************/ ++static void ++release_hfcdrv(void *arg) ++{ ++ struct IsdnCardState *cs = (struct IsdnCardState *) arg; ++ ++ cs->hw.hfcusb.drv = NULL; /* disable any further use of driver */ ++ HiSax_closecard(cs->cardnr); ++} /* release_hfcdrv */ ++ ++/*********************************************/ ++/* called once when a new device is detected */ ++/* initialises local data */ ++/*********************************************/ ++int ++setup_hfc_usb(struct IsdnCard *card) ++{ ++ struct IsdnCardState *cs = card->cs; ++ char tmp[64]; ++ struct hisax_drvreg *usbdrv = ++ (struct hisax_drvreg *) cs->hw.hfcusb.drv; ++ ++ if (!usbdrv) ++ return (0); /* no driver data present */ ++ ++ strcpy(tmp, hfcusb_revision); ++ printk(KERN_INFO "HiSax: HFC-USB driver Rev. %s\n", ++ HiSax_getrev(tmp)); ++ ++ usbdrv->release_driver = &release_hfcdrv; /* release routine */ ++ usbdrv->arg_hisax = (void *) cs; /* parameter for calling */ ++ usbdrv->dch_l1l2 = &hfcusb_d_l1l2; /* access from L1 to HiSax */ ++ usbdrv->bch_l1l2 = &hfcusb_b_l1l2; ++ usbdrv->drq = &cs->rq; ++ usbdrv->dsq = &cs->sq; ++ cs->cardmsg = &hfcusb_card_msg; ++ return (1); /* success */ ++} +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfcscard.c linux-2.4.29/drivers/isdn/hisax/hfcscard.c +--- linux-2.4.29.old/drivers/isdn/hisax/hfcscard.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfcscard.c 2005-03-22 15:06:46.412037080 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hfcscard.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $ ++/* $Id: hfcscard.c,v 1.10 2001/09/24 13:22:56 kai Exp $ + * + * low level stuff for hfcs based cards (Teles3c, ACER P10) + * +@@ -12,14 +12,13 @@ + + #define __NO_VERSION__ + #include <linux/init.h> +-#include <linux/isapnp.h> + #include "hisax.h" + #include "hfc_2bds0.h" + #include "isdnl1.h" + + extern const char *CardType[]; + +-static const char *hfcs_revision = "$Revision: 1.1.4.1 $"; ++static const char *hfcs_revision = "$Revision: 1.10 $"; + + static void + hfcs_interrupt(int intno, void *dev_id, struct pt_regs *regs) +@@ -140,36 +139,6 @@ + return(0); + } + +-#ifdef __ISAPNP__ +-static struct isapnp_device_id hfc_ids[] __initdata = { +- { ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114), +- ISAPNP_VENDOR('A', 'N', 'X'), ISAPNP_FUNCTION(0x1114), +- (unsigned long) "Acer P10" }, +- { ISAPNP_VENDOR('B', 'I', 'L'), ISAPNP_FUNCTION(0x0002), +- ISAPNP_VENDOR('B', 'I', 'L'), ISAPNP_FUNCTION(0x0002), +- (unsigned long) "Billion 2" }, +- { ISAPNP_VENDOR('B', 'I', 'L'), ISAPNP_FUNCTION(0x0001), +- ISAPNP_VENDOR('B', 'I', 'L'), ISAPNP_FUNCTION(0x0001), +- (unsigned long) "Billion 1" }, +- { ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x7410), +- ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x7410), +- (unsigned long) "IStar PnP" }, +- { ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2610), +- ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2610), +- (unsigned long) "Teles 16.3c" }, +- { ISAPNP_VENDOR('S', 'F', 'M'), ISAPNP_FUNCTION(0x0001), +- ISAPNP_VENDOR('S', 'F', 'M'), ISAPNP_FUNCTION(0x0001), +- (unsigned long) "Tornado Tipa C" }, +- { ISAPNP_VENDOR('K', 'Y', 'E'), ISAPNP_FUNCTION(0x0001), +- ISAPNP_VENDOR('K', 'Y', 'E'), ISAPNP_FUNCTION(0x0001), +- (unsigned long) "Genius Speed Surfer" }, +- { 0, } +-}; +- +-static struct isapnp_device_id *hdev = &hfc_ids[0]; +-static struct pci_bus *pnp_c __devinitdata = NULL; +-#endif +- + int __init + setup_hfcs(struct IsdnCard *card) + { +@@ -178,46 +147,6 @@ + + strcpy(tmp, hfcs_revision); + printk(KERN_INFO "HiSax: HFC-S driver Rev. %s\n", HiSax_getrev(tmp)); +- +-#ifdef __ISAPNP__ +- if (!card->para[1] && isapnp_present()) { +- struct pci_bus *pb; +- struct pci_dev *pd; +- +- while(hdev->card_vendor) { +- if ((pb = isapnp_find_card(hdev->card_vendor, +- hdev->card_device, pnp_c))) { +- pnp_c = pb; +- pd = NULL; +- if ((pd = isapnp_find_dev(pnp_c, +- hdev->vendor, hdev->function, pd))) { +- printk(KERN_INFO "HiSax: %s detected\n", +- (char *)hdev->driver_data); +- pd->prepare(pd); +- pd->deactivate(pd); +- pd->activate(pd); +- card->para[1] = pd->resource[0].start; +- card->para[0] = pd->irq_resource[0].start; +- if (!card->para[0] || !card->para[1]) { +- printk(KERN_ERR "HFC PnP:some resources are missing %ld/%lx\n", +- card->para[0], card->para[1]); +- pd->deactivate(pd); +- return(0); +- } +- break; +- } else { +- printk(KERN_ERR "HFC PnP: PnP error card found, no device\n"); +- } +- } +- hdev++; +- pnp_c=NULL; +- } +- if (!hdev->card_vendor) { +- printk(KERN_INFO "HFC PnP: no ISAPnP card found\n"); +- return(0); +- } +- } +-#endif + cs->hw.hfcD.addr = card->para[1] & 0xfffe; + cs->irq = card->para[0]; + cs->hw.hfcD.cip = 0; +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax.h linux-2.4.29/drivers/isdn/hisax/hisax.h +--- linux-2.4.29.old/drivers/isdn/hisax/hisax.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hisax.h 2005-03-22 15:06:46.431034192 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hisax.h,v 1.1.4.2 2001/12/09 19:15:28 kai Exp $ ++/* $Id: hisax.h,v 2.64 2001/09/24 13:22:56 kai Exp $ + * + * Basic declarations, defines and prototypes + * +@@ -24,7 +24,9 @@ + #include <linux/isdnif.h> + #include <linux/tty.h> + #include <linux/serial_reg.h> ++#ifndef COMPAT_NO_SOFTNET + #include <linux/netdevice.h> ++#endif + + #define ERROR_STATISTIC + +@@ -68,9 +70,6 @@ + #define DL_DATA 0x0220 + #define DL_FLUSH 0x0224 + #define DL_UNIT_DATA 0x0230 +- +-#define MDL_BC_RELEASE 0x0278 // Formula-n enter:now +-#define MDL_BC_ASSIGN 0x027C // Formula-n enter:now + #define MDL_ASSIGN 0x0280 + #define MDL_REMOVE 0x0284 + #define MDL_ERROR 0x0288 +@@ -472,8 +471,6 @@ + #define BC_FLG_FTI_RUN 13 + #define BC_FLG_LL_OK 14 + #define BC_FLG_LL_CONN 15 +-#define BC_FLG_FTI_FTS 16 +-#define BC_FLG_FRH_WAIT 17 + + #define L1_MODE_NULL 0 + #define L1_MODE_TRANS 1 +@@ -695,6 +692,13 @@ + struct timer_list timer; + }; + ++#ifdef CONFIG_HISAX_HFC_USB ++struct hfcUSB_hw { ++ void *drv; /* pointer to driver structure */ ++ int dch_tx_busy; ++}; ++#endif ++ + struct hfcSX_hw { + unsigned long base; + unsigned char cirm; +@@ -838,17 +842,6 @@ + int ph_state; + }; + +-struct amd7930_chip { +- u_char lmr1; +- u_char ph_state; +- u_char old_state; +- u_char flg_t3; +- unsigned int tx_xmtlen; +- struct timer_list timer3; +- void (*ph_command) (struct IsdnCardState *, u_char, char *); +- void (*setIrqMask) (struct IsdnCardState *, u_char); +-}; +- + struct icc_chip { + int ph_state; + u_char *mon_tx; +@@ -902,6 +895,9 @@ + struct njet_hw njet; + struct hfcD_hw hfcD; + struct hfcPCI_hw hfcpci; ++#ifdef CONFIG_HISAX_HFC_USB ++ struct hfcUSB_hw hfcusb; ++#endif + struct hfcSX_hw hfcsx; + struct ix1_hw niccy; + struct isurf_hw isurf; +@@ -945,7 +941,6 @@ + struct hfcpci_chip hfcpci; + struct hfcsx_chip hfcsx; + struct w6692_chip w6692; +- struct amd7930_chip amd7930; + struct icc_chip icc; + } dc; + u_char *rcvbuf; +@@ -967,6 +962,8 @@ + #define MON0_TX 4 + #define MON1_TX 8 + ++#define HISAX_MAX_CARDS 8 ++ + #define ISDN_CTYPE_16_0 1 + #define ISDN_CTYPE_8_0 2 + #define ISDN_CTYPE_16_3 3 +@@ -1006,8 +1003,8 @@ + #define ISDN_CTYPE_HFC_SX 37 + #define ISDN_CTYPE_NETJET_U 38 + #define ISDN_CTYPE_HFC_SP_PCMCIA 39 +-#define ISDN_CTYPE_DYNAMIC 40 +-#define ISDN_CTYPE_ENTERNOW 41 ++#define ISDN_CTYPE_HFC_USB 40 ++#define ISDN_CTYPE_DYNAMIC 41 + #define ISDN_CTYPE_COUNT 41 + + +@@ -1267,10 +1264,6 @@ + #define CARD_NETJET_U 0 + #endif + +-#ifdef CONFIG_HISAX_ENTERNOW_PCI +-#define CARD_FN_ENTERNOW_PCI 1 +-#endif +- + #define TEI_PER_CARD 1 + + /* L1 Debug */ +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_debug.h linux-2.4.29/drivers/isdn/hisax/hisax_debug.h +--- linux-2.4.29.old/drivers/isdn/hisax/hisax_debug.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hisax_debug.h 2005-03-22 15:06:46.452031000 +0100 +@@ -28,7 +28,7 @@ + + #define DBG(level, format, arg...) do { \ + if (level & __debug_variable) \ +-printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \ ++printk(KERN_DEBUG __FUNCTION__ ": " format "\n" , ## arg); \ + } while (0) + + #define DBG_PACKET(level,data,count) \ +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_fcpcipnp.c linux-2.4.29/drivers/isdn/hisax/hisax_fcpcipnp.c +--- linux-2.4.29.old/drivers/isdn/hisax/hisax_fcpcipnp.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hisax_fcpcipnp.c 2005-03-22 15:06:46.468028568 +0100 +@@ -20,22 +20,19 @@ + * + * o POWER PC + * o clean up debugging +- * o tx_skb at PH_DEACTIVATE time + */ + + #include <linux/version.h> + #include <linux/module.h> + #include <linux/init.h> + #include <linux/pci.h> +-#include <linux/isapnp.h> ++#include "hisax_isapnp.h" + #include <linux/kmod.h> + #include <linux/slab.h> + #include <linux/skbuff.h> + #include <linux/netdevice.h> +- +-#include <asm/io.h> +- + #include "hisax_fcpcipnp.h" ++#include "hisax_isac.h" + + // debugging cruft + #define __debug_variable debug +@@ -46,10 +43,14 @@ + MODULE_PARM(debug, "i"); + #endif + +-MODULE_AUTHOR("Kai Germaschewski <kai.germaschewski@gmx.de>/Karsten Keil <kkeil@suse.de>"); ++MODULE_AUTHOR("Kai Germaschewski <kai.germaschewski@gmx.de>"); + MODULE_DESCRIPTION("AVM Fritz!PCI/PnP ISDN driver"); + +-static struct pci_device_id fcpci_ids[] __devinitdata = { ++#ifndef PCI_DEVICE_ID_AVM_A1_V2 ++#define PCI_DEVICE_ID_AVM_A1_V2 0x0e00 ++#endif ++ ++static struct pci_device_id fcpci_ids[] __initdata = { + { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1 , PCI_ANY_ID, PCI_ANY_ID, + 0, 0, (unsigned long) "Fritz!Card PCI" }, + { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1_V2, PCI_ANY_ID, PCI_ANY_ID, +@@ -58,7 +59,7 @@ + }; + MODULE_DEVICE_TABLE(pci, fcpci_ids); + +-static struct isapnp_device_id fcpnp_ids[] __devinitdata = { ++static struct isapnp_device_id fcpnp_ids[] __initdata = { + { ISAPNP_VENDOR('A', 'V', 'M'), ISAPNP_FUNCTION(0x0900), + ISAPNP_VENDOR('A', 'V', 'M'), ISAPNP_FUNCTION(0x0900), + (unsigned long) "Fritz!Card PnP" }, +@@ -68,7 +69,8 @@ + + static int protocol = 2; /* EURO-ISDN Default */ + MODULE_PARM(protocol, "i"); +-MODULE_LICENSE("GPL"); ++ ++static LIST_HEAD(adapter_list); + + // ---------------------------------------------------------------------- + +@@ -147,7 +149,7 @@ + outb(idx, adapter->io + AVM_INDEX); + val = inb(adapter->io + AVM_DATA + (offset & 0xf)); + spin_unlock_irqrestore(&adapter->hw_lock, flags); +- DBG(0x1000, " port %#x, value %#x", ++ DBG(0x1000, __FUNCTION__ " port %#x, value %#x", + offset, val); + return val; + } +@@ -160,7 +162,7 @@ + AVM_IDX_ISAC_REG_HIGH : AVM_IDX_ISAC_REG_LOW; + unsigned long flags; + +- DBG(0x1000, " port %#x, value %#x", ++ DBG(0x1000, __FUNCTION__ " port %#x, value %#x", + offset, value); + spin_lock_irqsave(&adapter->hw_lock, flags); + outb(idx, adapter->io + AVM_INDEX); +@@ -240,7 +242,7 @@ + outl(offset, adapter->io + AVM_ISACSX_INDEX); + val = inl(adapter->io + AVM_ISACSX_DATA); + spin_unlock_irqrestore(&adapter->hw_lock, flags); +- DBG(0x1000, " port %#x, value %#x", ++ DBG(0x1000, __FUNCTION__ " port %#x, value %#x", + offset, val); + + return val; +@@ -252,7 +254,7 @@ + struct fritz_adapter *adapter = isac->priv; + unsigned long flags; + +- DBG(0x1000, " port %#x, value %#x", ++ DBG(0x1000, __FUNCTION__ " port %#x, value %#x", + offset, value); + spin_lock_irqsave(&adapter->hw_lock, flags); + outl(offset, adapter->io + AVM_ISACSX_INDEX); +@@ -375,6 +377,9 @@ + + DBG(0x40, "hdlc_fill_fifo"); + ++ if (!skb) ++ BUG(); ++ + if (skb->len == 0) + BUG(); + +@@ -515,7 +520,6 @@ + } + skb_push(bcs->tx_skb, bcs->tx_cnt); + bcs->tx_cnt = 0; +- hdlc_fill_fifo(bcs); + } + + static inline void hdlc_xpr_irq(struct fritz_bcs *bcs) +@@ -536,7 +540,7 @@ + dev_kfree_skb_irq(skb); + } + +-static void hdlc_irq_one(struct fritz_bcs *bcs, u32 stat) ++static void hdlc_irq(struct fritz_bcs *bcs, u32 stat) + { + DBG(0x10, "ch%d stat %#x", bcs->channel, stat); + if (stat & HDLC_INT_RPR) { +@@ -553,7 +557,7 @@ + } + } + +-static inline void hdlc_irq(struct fritz_adapter *adapter) ++static inline void hdlc_interrupt(struct fritz_adapter *adapter) + { + int nr; + u32 stat; +@@ -562,7 +566,7 @@ + stat = adapter->read_hdlc_status(adapter, nr); + DBG(0x10, "HDLC %c stat %#x", 'A' + nr, stat); + if (stat & HDLC_INT_MASK) +- hdlc_irq_one(&adapter->bcs[nr], stat); ++ hdlc_irq(&adapter->bcs[nr], stat); + } + } + +@@ -584,14 +588,14 @@ + adapter->write_ctrl(bcs, 5); + break; + case L1_MODE_TRANS: ++ bcs->ctrl.sr.mode = HDLC_MODE_TRANS; ++ adapter->write_ctrl(bcs, 5); ++ bcs->ctrl.sr.cmd = HDLC_CMD_XRS; ++ adapter->write_ctrl(bcs, 1); ++ bcs->ctrl.sr.cmd = 0; ++ break; + case L1_MODE_HDLC: +- bcs->rcvidx = 0; +- bcs->tx_cnt = 0; +- bcs->tx_skb = NULL; +- if (mode == L1_MODE_TRANS) +- bcs->ctrl.sr.mode = HDLC_MODE_TRANS; +- else +- bcs->ctrl.sr.mode = HDLC_MODE_ITF_FLG; ++ bcs->ctrl.sr.mode = HDLC_MODE_ITF_FLG; + adapter->write_ctrl(bcs, 5); + bcs->ctrl.sr.cmd = HDLC_CMD_XRS; + adapter->write_ctrl(bcs, 1); +@@ -645,10 +649,10 @@ + return; + DBG(2, "STATUS0 %#x", val); + if (val & AVM_STATUS0_IRQ_ISAC) +- isacsx_irq(&adapter->isac); ++ isacsx_interrupt(&adapter->isac); + + if (val & AVM_STATUS0_IRQ_HDLC) +- hdlc_irq(adapter); ++ hdlc_interrupt(adapter); + } + + static void fcpci_irq(int intno, void *dev, struct pt_regs *regs) +@@ -662,10 +666,10 @@ + return; + DBG(2, "sval %#x", sval); + if (!(sval & AVM_STATUS0_IRQ_ISAC)) +- isac_irq(&adapter->isac); ++ isac_interrupt(&adapter->isac); + + if (!(sval & AVM_STATUS0_IRQ_HDLC)) +- hdlc_irq(adapter); ++ hdlc_interrupt(adapter); + } + + // ---------------------------------------------------------------------- +@@ -681,11 +685,6 @@ + { + outb(AVM_STATUS0_DIS_TIMER | AVM_STATUS0_RES_TIMER | + AVM_STATUS0_ENA_IRQ, adapter->io + AVM_STATUS0); +- +- outb(AVM_STATUS1_ENA_IOM | adapter->irq, +- adapter->io + AVM_STATUS1); +- set_current_state(TASK_UNINTERRUPTIBLE); +- schedule_timeout(50*HZ / 1000); /* Timeout 50ms */ + } + + // ---------------------------------------------------------------------- +@@ -693,6 +692,7 @@ + static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter) + { + u32 val = 0; ++ struct pci_dev *pdev = adapter->pci_dev; + int retval; + + DBG(1,""); +@@ -700,21 +700,21 @@ + isac_init(&adapter->isac); // FIXME is this okay now + + retval = -EBUSY; +- if (!request_region(adapter->io, 32, "fcpcipnp")) ++ if (!request_region(adapter->io, 32, "hisax_fcpcipnp")) + goto err; + + switch (adapter->type) { + case AVM_FRITZ_PCIV2: +- retval = request_irq(adapter->irq, fcpci2_irq, SA_SHIRQ, +- "fcpcipnp", adapter); ++ retval = request_irq(pdev->irq, fcpci2_irq, SA_SHIRQ, ++ "hisax_fcpcipnp", adapter); + break; + case AVM_FRITZ_PCI: +- retval = request_irq(adapter->irq, fcpci_irq, SA_SHIRQ, +- "fcpcipnp", adapter); ++ retval = request_irq(pdev->irq, fcpci_irq, SA_SHIRQ, ++ "hisax_fcpcipnp", adapter); + break; + case AVM_FRITZ_PNP: +- retval = request_irq(adapter->irq, fcpci_irq, 0, +- "fcpcipnp", adapter); ++ retval = request_irq(pdev->irq, fcpci_irq, 0, ++ "hisax_fcpcipnp", adapter); + break; + } + if (retval) +@@ -808,11 +808,23 @@ + + static void __devexit fcpcipnp_release(struct fritz_adapter *adapter) + { ++ struct pci_dev *pdev = adapter->pci_dev; ++ + DBG(1,""); + + outb(0, adapter->io + AVM_STATUS0); +- free_irq(adapter->irq, adapter); ++ free_irq(pdev->irq, adapter); + release_region(adapter->io, 32); ++ ++ switch (adapter->type) { ++ case AVM_FRITZ_PCI: ++ case AVM_FRITZ_PCIV2: ++ pci_disable_device(pdev); ++ break; ++ case AVM_FRITZ_PNP: ++ pdev->deactivate(pdev); ++ break; ++ } + } + + // ---------------------------------------------------------------------- +@@ -830,6 +842,8 @@ + + memset(adapter, 0, sizeof(struct fritz_adapter)); + ++ adapter->pci_dev = pdev; ++ + SET_MODULE_OWNER(&adapter->isac.hisax_d_if); + adapter->isac.hisax_d_if.ifc.priv = &adapter->isac; + adapter->isac.hisax_d_if.ifc.l2l1 = isac_d_l2l1; +@@ -840,6 +854,7 @@ + adapter->bcs[i].b_if.ifc.priv = &adapter->bcs[i]; + adapter->bcs[i].b_if.ifc.l2l1 = fritz_b_l2l1; + } ++ list_add(&adapter->list, &adapter_list); + + pci_set_drvdata(pdev, adapter); + +@@ -854,6 +869,7 @@ + static void delete_adapter(struct fritz_adapter *adapter) + { + hisax_unregister(&adapter->isac.hisax_d_if); ++ list_del(&adapter->list); + kfree(adapter); + } + +@@ -863,12 +879,15 @@ + struct fritz_adapter *adapter; + int retval; + ++ printk(KERN_INFO "hisax_fcpcipnp: found adapter %s at %s\n", ++ (char *) ent->driver_data, pdev->slot_name); ++ + retval = -ENOMEM; + adapter = new_adapter(pdev); + if (!adapter) + goto err; + +- if (pdev->device == PCI_DEVICE_ID_AVM_A1_V2) ++ if (pdev->device == 0x0e00) + adapter->type = AVM_FRITZ_PCIV2; + else + adapter->type = AVM_FRITZ_PCI; +@@ -876,12 +895,7 @@ + retval = pci_enable_device(pdev); + if (retval) + goto err_free; +- + adapter->io = pci_resource_start(pdev, 1); +- adapter->irq = pdev->irq; +- +- printk(KERN_INFO "hisax_fcpcipnp: found adapter %s at %s\n", +- (char *) ent->driver_data, pdev->slot_name); + + retval = fcpcipnp_setup(adapter); + if (retval) +@@ -901,6 +915,9 @@ + struct fritz_adapter *adapter; + int retval; + ++ printk(KERN_INFO "hisax_fcpcipnp: found adapter %s\n", ++ (char *) ent->driver_data); ++ + retval = -ENOMEM; + adapter = new_adapter(pdev); + if (!adapter) +@@ -912,11 +929,8 @@ + pdev->deactivate(pdev); // why? + pdev->activate(pdev); + adapter->io = pdev->resource[0].start; +- adapter->irq = pdev->irq_resource[0].start; +- +- printk(KERN_INFO "hisax_fcpcipnp: found adapter %s at IO %#x irq %d\n", +- (char *) ent->driver_data, adapter->io, adapter->irq); +- ++ pdev->irq = pdev->irq_resource[0].start; ++ + retval = fcpcipnp_setup(adapter); + if (retval) + goto err_free; +@@ -929,43 +943,35 @@ + return retval; + } + +-static void __devexit fcpci_remove(struct pci_dev *pdev) +-{ +- struct fritz_adapter *adapter = pci_get_drvdata(pdev); +- +- fcpcipnp_release(adapter); +- pci_disable_device(pdev); +- delete_adapter(adapter); +-} +- +-static void __devexit fcpnp_remove(struct pci_dev *pdev) ++static void __devexit fcpcipnp_remove(struct pci_dev *pdev) + { + struct fritz_adapter *adapter = pci_get_drvdata(pdev); + + fcpcipnp_release(adapter); +- pdev->deactivate(pdev); + delete_adapter(adapter); + } + + static struct pci_driver fcpci_driver = { +- name: "fcpci", +- probe: fcpci_probe, +- remove: __devexit_p(fcpci_remove), ++ name: "fcpci", ++ probe: fcpci_probe, ++ remove: fcpcipnp_remove, + id_table: fcpci_ids, + }; + + static struct isapnp_driver fcpnp_driver = { +- name: "fcpnp", +- probe: fcpnp_probe, +- remove: __devexit_p(fcpnp_remove), ++ name: "fcpnp", ++ probe: fcpnp_probe, ++ remove: fcpcipnp_remove, + id_table: fcpnp_ids, + }; + +-static int __init hisax_fcpcipnp_init(void) ++static LIST_HEAD(isapnp_drivers); ++ ++static int __init hisax_fcpci_init(void) + { + int retval, pci_nr_found; + +- printk(KERN_INFO "hisax_fcpcipnp: Fritz!Card PCI/PCIv2/PnP ISDN driver v0.0.1\n"); ++ printk(KERN_INFO "hisax_fcpcipnp: Fritz!PCI/PnP ISDN driver v0.0.1\n"); + + retval = pci_register_driver(&fcpci_driver); + if (retval < 0) +@@ -976,15 +982,14 @@ + if (retval < 0) + goto out_unregister_pci; + +-#if !defined(CONFIG_HOTPLUG) || defined(MODULE) ++#if !defined(CONFIG_HOTPLUG) && defined(MODULE) + if (pci_nr_found + retval == 0) { + retval = -ENODEV; + goto out_unregister_isapnp; +- } + #endif + return 0; + +-#if !defined(CONFIG_HOTPLUG) || defined(MODULE) ++#if !defined(CONFIG_HOTPLUG) && defined(MODULE) + out_unregister_isapnp: + isapnp_unregister_driver(&fcpnp_driver); + #endif +@@ -994,11 +999,15 @@ + return retval; + } + +-static void __exit hisax_fcpcipnp_exit(void) ++static void __exit hisax_fcpci_exit(void) + { + isapnp_unregister_driver(&fcpnp_driver); + pci_unregister_driver(&fcpci_driver); + } + +-module_init(hisax_fcpcipnp_init); +-module_exit(hisax_fcpcipnp_exit); ++module_init(hisax_fcpci_init); ++module_exit(hisax_fcpci_exit); ++ ++#ifdef __ISAPNP__ ++#include "hisax_isapnp.c" ++#endif +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_fcpcipnp.h linux-2.4.29/drivers/isdn/hisax/hisax_fcpcipnp.h +--- linux-2.4.29.old/drivers/isdn/hisax/hisax_fcpcipnp.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hisax_fcpcipnp.h 2005-03-22 15:06:46.484026136 +0100 +@@ -43,10 +43,12 @@ + }; + + struct fritz_adapter { ++ struct list_head list; ++ struct pci_dev *pci_dev; ++ + int type; + spinlock_t hw_lock; + unsigned int io; +- unsigned int irq; + struct isac isac; + + struct fritz_bcs bcs[2]; +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isac.c linux-2.4.29/drivers/isdn/hisax/hisax_isac.c +--- linux-2.4.29.old/drivers/isdn/hisax/hisax_isac.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hisax_isac.c 2005-03-22 15:06:46.543017168 +0100 +@@ -34,7 +34,7 @@ + static int debug = 1; + MODULE_PARM(debug, "i"); + +-static char *ISACVer[] = { ++static char *ISACVer[] __devinitdata = { + "2086/2186 V1.1", + "2085 B1", + "2085 B2", +@@ -42,10 +42,6 @@ + }; + #endif + +-MODULE_AUTHOR("Kai Germaschewski <kai.germaschewski@gmx.de>/Karsten Keil <kkeil@suse.de>"); +-MODULE_DESCRIPTION("ISAC/ISAC-SX driver"); +-MODULE_LICENSE("GPL"); +- + #define DBG_WARN 0x0001 + #define DBG_IRQ 0x0002 + #define DBG_L1M 0x0004 +@@ -438,7 +434,7 @@ + va_end(args); + } + +-static void isac_version(struct isac *cs) ++static void __devinit isac_version(struct isac *cs) + { + int val; + +@@ -602,7 +598,7 @@ + } + } + +-void isac_irq(struct isac *isac) ++void isac_interrupt(struct isac *isac) + { + unsigned char val; + +@@ -635,8 +631,6 @@ + if (val & ISAC_ISTA_SIN) { + DBG(DBG_WARN, "SIN"); + } +- isac->write_isac(isac, ISAC_MASK, 0xff); +- isac->write_isac(isac, ISAC_MASK, 0x00); + } + + // ====================================================================== +@@ -742,7 +736,7 @@ + } + } + +-void isacsx_irq(struct isac *isac) ++void isacsx_interrupt(struct isac *isac) + { + unsigned char val; + +@@ -755,7 +749,7 @@ + isacsx_cic_interrupt(isac); + } + +-void isac_init(struct isac *isac) ++void __devinit isac_init(struct isac *isac) + { + isac->tx_skb = NULL; + isac->l1m.fsm = &l1fsm; +@@ -770,7 +764,7 @@ + FsmInitTimer(&isac->l1m, &isac->timer); + } + +-void isac_setup(struct isac *isac) ++void __devinit isac_setup(struct isac *isac) + { + int val, eval; + +@@ -781,7 +775,7 @@ + + isac->write_isac(isac, ISAC_MASK, 0xff); + isac->mocr = 0xaa; +- if (test_bit(ISAC_IOM1, &isac->flags)) { ++ if (test_bit(HW_IOM1, &isac->flags)) { + /* IOM 1 Mode */ + isac->write_isac(isac, ISAC_ADF2, 0x0); + isac->write_isac(isac, ISAC_SPCR, 0xa); +@@ -817,7 +811,7 @@ + FsmEvent(&isac->l1m, (val >> 2) & 0xf, NULL); + + isac->write_isac(isac, ISAC_MASK, 0x0); +- // RESET Receiver and Transmitter ++ /* RESET Receiver and Transmitter */ + isac->write_isac(isac, ISAC_CMDR, ISAC_CMDR_XRES | ISAC_CMDR_RRES); + } + +@@ -888,10 +882,10 @@ + EXPORT_SYMBOL(isac_d_l2l1); + + EXPORT_SYMBOL(isacsx_setup); +-EXPORT_SYMBOL(isacsx_irq); ++EXPORT_SYMBOL(isacsx_interrupt); + + EXPORT_SYMBOL(isac_setup); +-EXPORT_SYMBOL(isac_irq); ++EXPORT_SYMBOL(isac_interrupt); + + module_init(hisax_isac_init); + module_exit(hisax_isac_exit); +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isac.h linux-2.4.29/drivers/isdn/hisax/hisax_isac.h +--- linux-2.4.29.old/drivers/isdn/hisax/hisax_isac.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hisax_isac.h 2005-03-22 15:06:46.559014736 +0100 +@@ -8,7 +8,7 @@ + #define TIMER3_VALUE 7000 + #define MAX_DFRAME_LEN_L1 300 + +-#define ISAC_IOM1 0 ++#define HW_IOM1 0 + + struct isac { + void *priv; +@@ -37,9 +37,9 @@ + void isac_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg); + + void isac_setup(struct isac *isac); +-void isac_irq(struct isac *isac); ++void isac_interrupt(struct isac *isac); + + void isacsx_setup(struct isac *isac); +-void isacsx_irq(struct isac *isac); ++void isacsx_interrupt(struct isac *isac); + + #endif +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isapnp.c linux-2.4.29/drivers/isdn/hisax/hisax_isapnp.c +--- linux-2.4.29.old/drivers/isdn/hisax/hisax_isapnp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hisax_isapnp.c 2005-03-22 15:06:46.576012152 +0100 +@@ -0,0 +1,105 @@ ++// FIXME copied ++static const struct isapnp_device_id * ++isapnp_match_device(const struct isapnp_device_id *ids, struct pci_dev *dev) ++{ ++ DBG(1,""); ++ ++ while (ids->card_vendor || ids->card_device) { ++ if ((ids->card_vendor == ISAPNP_ANY_ID || ids->card_vendor == dev->bus->vendor) && ++ (ids->card_device == ISAPNP_ANY_ID || ids->card_device == dev->bus->device) && ++ (ids->vendor == ISAPNP_ANY_ID || ids->vendor == dev->vendor) && ++ (ids->function == ISAPNP_ANY_ID || ids->function == dev->device)) ++ return ids; ++ ids++; ++ } ++ return NULL; ++} ++ ++/** ++ * pci_dev_driver - get the pci_driver of a device ++ * @dev: the device to query ++ * ++ * Returns the appropriate pci_driver structure or %NULL if there is no ++ * registered driver for the device. ++ */ ++struct pci_driver *isapnp_dev_driver(const struct pci_dev *dev) ++{ ++ return dev->driver; ++} ++ ++static int isapnp_announce_device(struct isapnp_driver *drv, struct pci_dev *dev) ++{ ++ const struct isapnp_device_id *id; ++ int ret = 0; ++ ++ DBG(1,""); ++ ++ if (drv->id_table) { ++ id = isapnp_match_device(drv->id_table, dev); ++ if (!id) { ++ ret = 0; ++ goto out; ++ } ++ } else ++ id = NULL; ++ ++// dev_probe_lock(); ++ if (drv->probe(dev, id) >= 0) { ++ dev->driver = (struct pci_driver *) drv; ++ ret = 1; ++ } ++// dev_probe_unlock(); ++out: ++ return ret; ++} ++ ++/** ++ * FIXME pci_register_driver - register a new pci driver ++ * @drv: the driver structure to register ++ * ++ * Adds the driver structure to the list of registered drivers ++ * Returns the number of pci devices which were claimed by the driver ++ * during registration. The driver remains registered even if the ++ * return value is zero. ++ */ ++int isapnp_register_driver(struct isapnp_driver *drv) ++{ ++ struct pci_dev *dev; ++ int count = 0; ++ ++ DBG(1,""); ++ ++ list_add_tail(&drv->node, &isapnp_drivers); ++ isapnp_for_each_dev(dev) { ++ if (!isapnp_dev_driver(dev)) ++ count += isapnp_announce_device(drv, dev); ++ } ++ return count; ++} ++ ++/** ++ * pci_unregister_driver - unregister a pci driver ++ * @drv: the driver structure to unregister ++ * ++ * Deletes the driver structure from the list of registered PCI drivers, ++ * gives it a chance to clean up by calling its remove() function for ++ * each device it was responsible for, and marks those devices as ++ * driverless. ++ */ ++ ++void isapnp_unregister_driver(struct isapnp_driver *drv) ++{ ++ struct pci_dev *dev; ++ ++ DBG(1,""); ++ ++ list_del(&drv->node); ++ isapnp_for_each_dev(dev) { ++ if (dev->driver == (struct pci_driver *) drv) { ++ if (drv->remove) ++ drv->remove(dev); ++ dev->driver = NULL; ++ } ++ } ++} ++ +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_isapnp.h linux-2.4.29/drivers/isdn/hisax/hisax_isapnp.h +--- linux-2.4.29.old/drivers/isdn/hisax/hisax_isapnp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hisax_isapnp.h 2005-03-22 15:06:46.590010024 +0100 +@@ -0,0 +1,33 @@ ++#ifndef __HISAX_ISAPNP_H__ ++#define __HISAX_ISAPNP_H__ ++ ++#include <linux/isapnp.h> ++ ++#ifdef COMPAT_NEED_ISAPNP_DRIVER ++struct isapnp_driver { ++ struct list_head node; ++ char *name; ++ const struct isapnp_device_id *id_table; /* NULL if wants all devices */ ++ int (*probe) (struct pci_dev *dev, const struct isapnp_device_id *id); /* New device inserted */ ++ void (*remove) (struct pci_dev *dev); /* Device removed (NULL if not a hot-plug capable driver) */ ++}; ++#endif ++#ifdef __ISAPNP__ ++ ++int isapnp_register_driver(struct isapnp_driver *drv); ++void isapnp_unregister_driver(struct isapnp_driver *drv); ++ ++#else ++ ++static inline int isapnp_register_driver(struct isapnp_driver *drv) ++{ ++ return 0; ++} ++ ++static inline void isapnp_unregister_driver(struct isapnp_driver *drv) ++{ ++} ++ ++#endif ++ ++#endif +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hisax_loadable.h linux-2.4.29/drivers/isdn/hisax/hisax_loadable.h +--- linux-2.4.29.old/drivers/isdn/hisax/hisax_loadable.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hisax_loadable.h 2005-03-22 15:06:46.606007592 +0100 +@@ -0,0 +1,74 @@ ++/* $Id: hisax_loadable.h,v 2.1 2001/06/08 22:19:16 werner Exp $ ++ * ++ * ++ * Author (C) 2001 Werner Cornelius (werner@isdn-development.de) ++ * modular driver for Colognechip HFC-USB chip ++ * as plugin for HiSax isdn driver ++ * ++ * Copyright 2001 by Werner Cornelius (werner@isdn4linux.de) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ ++ ++#include <linux/types.h> ++#include <linux/skbuff.h> ++ ++/***************************************/ ++/* additional defines for l1 constants */ ++/***************************************/ ++#define B1_DATA 0x1f0 ++#define B1_SETMODE 0x1f4 ++#define B2_DATA 0x1f8 ++#define B2_SETMODE 0x1fc ++ ++ ++/********************************************************/ ++/* structure used for register and release of L1 driver */ ++/********************************************************/ ++struct hisax_drvreg { ++ int version; /* actual version for check */ ++ int cmd; /* command code */ ++ ++ /* function pointers set by hisax during register call */ ++ void (*release_driver) (void *arg_hisax); /* set by hisax, release function for driver */ ++ void (*dch_l1l2) (void *arg_hisax, int pr, void *arg); /* set by hisax, notify dch+l1 events */ ++ void (*bch_l1l2) (void *arg_hisax, int chan, int pr, void *arg); /* set by hisax, notify bch events */ ++ void *arg_hisax; /* argument when calling hisax main */ ++ struct sk_buff_head *drq; /* pointer to D-receive queue */ ++ struct sk_buff_head *dsq; /* pointer to D-send queue */ ++ struct sk_buff_head erq; /* E-receive queue */ ++ struct sk_buff_head *brq[2]; /* pointer to B-receive queues */ ++ struct sk_buff **bsk[2]; /* pointer to B-transmit buffer */ ++ ++ /* function pointers set by l1 driver before calling the register function */ ++ void (*dch_l2l1) (void *argl1, int pr, void *arg); /* function dch+l1 from hisax -> l1 */ ++ void (*bch_l2l1) (void *argl1, int chan, int pr, void *arg); /* function bch from hisax -> l1 */ ++ void *argl1; /* pointer to l1 data structure when calling l1 */ ++ ++ char *drvname; /* driver name for hisax usage */ ++}; ++ ++/**************************/ ++/* constants and commands */ ++/**************************/ ++#define HISAX_LOAD_VERSION 4 /* change when interface changes */ ++#define HISAX_LOAD_CHKVER 0 /* check version command (returns 0 on success) */ ++#define HISAX_LOAD_REGISTER 1 /* register the L1 driver and return 0 on success */ ++ ++/***************************************/ ++/* definition of the register function */ ++/***************************************/ ++extern int hisax_register_hfcusb(struct hisax_drvreg *l1drv); +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hscx.c linux-2.4.29/drivers/isdn/hisax/hscx.c +--- linux-2.4.29.old/drivers/isdn/hisax/hscx.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hscx.c 2005-03-22 15:06:46.621005312 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hscx.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: hscx.c,v 1.24 2001/09/24 13:22:56 kai Exp $ + * + * HSCX specific routines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hscx.h linux-2.4.29/drivers/isdn/hisax/hscx.h +--- linux-2.4.29.old/drivers/isdn/hisax/hscx.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hscx.h 2005-03-22 15:06:46.640002424 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hscx.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: hscx.h,v 1.8 2001/09/24 13:22:56 kai Exp $ + * + * HSCX specific defines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hscx_irq.c linux-2.4.29/drivers/isdn/hisax/hscx_irq.c +--- linux-2.4.29.old/drivers/isdn/hisax/hscx_irq.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hscx_irq.c 2005-03-22 15:06:46.655999992 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hscx_irq.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: hscx_irq.c,v 1.18 2001/09/24 13:22:56 kai Exp $ + * + * low level b-channel stuff for Siemens HSCX + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/icc.c linux-2.4.29/drivers/isdn/hisax/icc.c +--- linux-2.4.29.old/drivers/isdn/hisax/icc.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/icc.c 2005-03-22 15:06:46.672997408 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: icc.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: icc.c,v 1.8 2001/09/24 13:22:56 kai Exp $ + * + * ICC specific routines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/icc.h linux-2.4.29/drivers/isdn/hisax/icc.h +--- linux-2.4.29.old/drivers/isdn/hisax/icc.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/icc.h 2005-03-22 15:06:46.687995128 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: icc.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: icc.h,v 1.4 2001/09/24 13:22:56 kai Exp $ + * + * ICC specific routines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/ipac.h linux-2.4.29/drivers/isdn/hisax/ipac.h +--- linux-2.4.29.old/drivers/isdn/hisax/ipac.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/ipac.h 2005-03-22 15:06:46.702992848 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: ipac.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: ipac.h,v 1.7 2001/09/24 13:22:56 kai Exp $ + * + * IPAC specific defines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isac.c linux-2.4.29/drivers/isdn/hisax/isac.c +--- linux-2.4.29.old/drivers/isdn/hisax/isac.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/isac.c 2005-03-22 15:06:46.844971264 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isac.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: isac.c,v 1.31 2001/09/24 13:22:56 kai Exp $ + * + * ISAC specific routines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isac.h linux-2.4.29/drivers/isdn/hisax/isac.h +--- linux-2.4.29.old/drivers/isdn/hisax/isac.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/isac.h 2005-03-22 15:06:47.111930680 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isac.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: isac.h,v 1.9 2001/09/24 13:22:56 kai Exp $ + * + * ISAC specific defines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isar.c linux-2.4.29/drivers/isdn/hisax/isar.c +--- linux-2.4.29.old/drivers/isdn/hisax/isar.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/isar.c 2005-03-22 15:06:47.302901648 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isar.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: isar.c,v 1.22 2001/09/23 12:00:05 keil Exp $ + * + * isar.c ISAR (Siemens PSB 7110) specific routines + * +@@ -21,12 +21,10 @@ + #define DLE 0x10 + #define ETX 0x03 + +-#define FAXMODCNT 13 +-const u_char faxmodulation[] = {3,24,48,72,73,74,96,97,98,121,122,145,146}; +-static u_int modmask = 0x1fff; +-static int frm_extra_delay = 2; +-static int para_TOA = 6; +-const u_char *FC1_CMD[] = {"FAE", "FTS", "FRS", "FTM", "FRM", "FTH", "FRH", "CTRL" }; ++ ++const u_char faxmodulation_s[] = "3,24,48,72,73,74,96,97,98,121,122,145,146"; ++const u_char faxmodulation[] = {3,24,48,72,73,74,96,97,98,121,122,145,146}; ++#define FAXMODCNT 13 + + void isar_setup(struct IsdnCardState *cs); + static void isar_pump_cmd(struct BCState *bcs, u_char cmd, u_char para); +@@ -127,7 +125,7 @@ + ireg->clsb = cs->BC_Read_Reg(cs, 1, ISAR_CTRL_L); + #if DUMP_MBOXFRAME + if (cs->debug & L1_DEB_HSCX) +- debugl1(cs, "irq_stat(%02x,%02x,%d)", ireg->iis, ireg->cmsb, ++ debugl1(cs, "rcv_mbox(%02x,%02x,%d)", ireg->iis, ireg->cmsb, + ireg->clsb); + #endif + } +@@ -414,7 +412,6 @@ + } + cs->debug = debug; + isar_setup(cs); +- + ret = 0; + reterrflg: + restore_flags(flags); +@@ -428,21 +425,6 @@ + return(ret); + } + +-static inline void +-ll_deliver_faxstat(struct BCState *bcs, u_char status) +-{ +- isdn_ctrl ic; +- struct Channel *chanp = (struct Channel *) bcs->st->lli.userdata; +- +- if (bcs->cs->debug & L1_DEB_HSCX) +- debugl1(bcs->cs, "HL->LL FAXIND %x", status); +- ic.driver = bcs->cs->myid; +- ic.command = ISDN_STAT_FAXIND; +- ic.arg = chanp->chan; +- ic.parm.aux.cmd = status; +- bcs->cs->iif.statcallb(&ic); +-} +- + extern void BChannel_bh(struct BCState *); + #define B_LL_NOCARRIER 8 + #define B_LL_CONNECT 9 +@@ -599,6 +581,7 @@ + if (ireg->cmsb & SART_NMD) { /* ABORT */ + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "isar_rcv_frame: no more data"); ++ cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); + bcs->hw.isar.rcvidx = 0; + send_DLE_ETX(bcs); + sendmsg(cs, SET_DPS(bcs->hw.isar.dpath) | +@@ -609,6 +592,7 @@ + } + } else { + printk(KERN_WARNING "HiSax: skb out of memory\n"); ++ cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); + } + break; + } +@@ -633,9 +617,8 @@ + bcs->hw.isar.rcvidx = 0; + cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); + } else { +- if (ireg->cmsb & HDLC_FSD) { ++ if (ireg->cmsb & HDLC_FSD) + bcs->hw.isar.rcvidx = 0; +- } + ptr = bcs->hw.isar.rcvbuf + bcs->hw.isar.rcvidx; + bcs->hw.isar.rcvidx += ireg->clsb; + rcv_mbox(cs, ireg, ptr); +@@ -646,8 +629,6 @@ + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "isar frame to short %d", + bcs->hw.isar.rcvidx); +- printk(KERN_WARNING "ISAR: frame to short %d\n", +- bcs->hw.isar.rcvidx); + } else if (!(skb = dev_alloc_skb(bcs->hw.isar.rcvidx))) { + printk(KERN_WARNING "ISAR: receive out of memory\n"); + } else { +@@ -658,7 +639,6 @@ + isar_sched_event(bcs, B_RCVBUFREADY); + send_DLE_ETX(bcs); + isar_sched_event(bcs, B_LL_OK); +- test_and_clear_bit(BC_FLG_FRH_WAIT, &bcs->Flag); + } + bcs->hw.isar.rcvidx = 0; + } +@@ -666,14 +646,13 @@ + if (ireg->cmsb & SART_NMD) { /* ABORT */ + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "isar_rcv_frame: no more data"); ++ cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); + bcs->hw.isar.rcvidx = 0; ++ send_DLE_ETX(bcs); + sendmsg(cs, SET_DPS(bcs->hw.isar.dpath) | + ISAR_HIS_PUMPCTRL, PCTRL_CMD_ESC, 0, NULL); + bcs->hw.isar.state = STFAX_ESCAPE; +- if (test_and_clear_bit(BC_FLG_FRH_WAIT, &bcs->Flag)) { +- send_DLE_ETX(bcs); +- isar_sched_event(bcs, B_LL_NOCARRIER); +- } ++ isar_sched_event(bcs, B_LL_NOCARRIER); + } + break; + default: +@@ -977,6 +956,21 @@ + } + } + ++static inline void ++ll_deliver_faxstat(struct BCState *bcs, u_char status) ++{ ++ isdn_ctrl ic; ++ struct Channel *chanp = (struct Channel *) bcs->st->lli.userdata; ++ ++ if (bcs->cs->debug & L1_DEB_HSCX) ++ debugl1(bcs->cs, "HL->LL FAXIND %x", status); ++ ic.driver = bcs->cs->myid; ++ ic.command = ISDN_STAT_FAXIND; ++ ic.arg = chanp->chan; ++ ic.parm.aux.cmd = status; ++ bcs->cs->iif.statcallb(&ic); ++} ++ + static void + isar_pump_statev_fax(struct BCState *bcs, u_char devt) { + struct IsdnCardState *cs = bcs->cs; +@@ -1081,22 +1075,19 @@ + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "pump stev RSP_DISC"); + if (bcs->hw.isar.state == STFAX_ESCAPE) { +- p1 = 5; + switch(bcs->hw.isar.newcmd) { + case 0: + bcs->hw.isar.state = STFAX_READY; + break; +- case PCTRL_CMD_FTM: +- p1 = 2; + case PCTRL_CMD_FTH: ++ case PCTRL_CMD_FTM: ++ p1 = 10; + sendmsg(cs, dps | ISAR_HIS_PUMPCTRL, + PCTRL_CMD_SILON, 1, &p1); + bcs->hw.isar.state = STFAX_SILDET; + break; +- case PCTRL_CMD_FRM: +- if (frm_extra_delay) +- mdelay(frm_extra_delay); + case PCTRL_CMD_FRH: ++ case PCTRL_CMD_FRM: + p1 = bcs->hw.isar.mod = bcs->hw.isar.newmod; + bcs->hw.isar.newmod = 0; + bcs->hw.isar.cmd = bcs->hw.isar.newcmd; +@@ -1215,9 +1206,6 @@ + isar_pump_statev_modem(bcs, ireg->cmsb); + } else if (bcs->mode == L1_MODE_FAX) { + isar_pump_statev_fax(bcs, ireg->cmsb); +- } else if (ireg->cmsb == PSEV_10MS_TIMER) { +- if (cs->debug & L1_DEB_HSCX) +- debugl1(cs, "pump stev TIMER"); + } else { + if (cs->debug & L1_DEB_WARN) + debugl1(cs, "isar IIS_PSTEV pmode %d stat %x", +@@ -1278,9 +1266,6 @@ + if (test_and_clear_bit(BC_FLG_LL_CONN, &bcs->Flag)) { + isar_sched_event(bcs, B_LL_CONNECT); + } +- if (test_and_clear_bit(BC_FLG_FTI_FTS, &bcs->Flag)) { +- isar_sched_event(bcs, B_LL_OK); +- } + } + + static void +@@ -1303,7 +1288,7 @@ + } else { + param[5] = PV32P6_ATN; + } +- param[0] = para_TOA; /* 6 db */ ++ param[0] = 6; /* 6 db */ + param[1] = PV32P2_V23R | PV32P2_V22A | PV32P2_V22B | + PV32P2_V22C | PV32P2_V21 | PV32P2_BEL; + param[2] = PV32P3_AMOD | PV32P3_V32B | PV32P3_V23B; +@@ -1319,7 +1304,7 @@ + } else { + param[1] = PFAXP2_ATN; + } +- param[0] = para_TOA; /* 6 db */ ++ param[0] = 6; /* 6 db */ + sendmsg(cs, dps | ISAR_HIS_PUMPCFG, ctrl, 2, param); + bcs->hw.isar.state = STFAX_NULL; + bcs->hw.isar.newcmd = 0; +@@ -1348,6 +1333,7 @@ + "\0\0"); + break; + case L1_MODE_HDLC: ++ case L1_MODE_FAX: + param[0] = 0; + sendmsg(cs, dps | ISAR_HIS_SARTCFG, SMODE_HDLC, 1, + param); +@@ -1359,9 +1345,6 @@ + sendmsg(cs, dps | ISAR_HIS_SARTCFG, ctrl, 2, + param); + break; +- case L1_MODE_FAX: +- /* SART must not configured with FAX */ +- break; + } + udelay(1000); + sendmsg(cs, dps | ISAR_HIS_BSTREQ, 0, 0, NULL); +@@ -1465,7 +1448,6 @@ + + switch(cmd) { + case ISDN_FAX_CLASS1_FTM: +- test_and_clear_bit(BC_FLG_FRH_WAIT, &bcs->Flag); + if (bcs->hw.isar.state == STFAX_READY) { + p1 = para; + ctrl = PCTRL_CMD_FTM; +@@ -1489,7 +1471,6 @@ + } + break; + case ISDN_FAX_CLASS1_FTH: +- test_and_clear_bit(BC_FLG_FRH_WAIT, &bcs->Flag); + if (bcs->hw.isar.state == STFAX_READY) { + p1 = para; + ctrl = PCTRL_CMD_FTH; +@@ -1513,7 +1494,6 @@ + } + break; + case ISDN_FAX_CLASS1_FRM: +- test_and_clear_bit(BC_FLG_FRH_WAIT, &bcs->Flag); + if (bcs->hw.isar.state == STFAX_READY) { + p1 = para; + ctrl = PCTRL_CMD_FRM; +@@ -1537,7 +1517,6 @@ + } + break; + case ISDN_FAX_CLASS1_FRH: +- test_and_set_bit(BC_FLG_FRH_WAIT, &bcs->Flag); + if (bcs->hw.isar.state == STFAX_READY) { + p1 = para; + ctrl = PCTRL_CMD_FRH; +@@ -1560,11 +1539,6 @@ + bcs->hw.isar.state = STFAX_ESCAPE; + } + break; +- case ISDN_FAXPUMP_HALT: +- bcs->hw.isar.state = STFAX_NULL; +- nom = 0; +- ctrl = PCTRL_CMD_HALT; +- break; + } + if (ctrl) + sendmsg(cs, dps | ISAR_HIS_PUMPCTRL, ctrl, nom, &p1); +@@ -1658,15 +1632,6 @@ + l1_msg_b(st, pr, arg); + break; + case (PH_DEACTIVATE | CONFIRM): +- switch(st->l1.mode) { +- case L1_MODE_TRANS: +- case L1_MODE_HDLC: +- case L1_MODE_V32: +- break; +- case L1_MODE_FAX: +- isar_pump_cmd(st->l1.bcs, ISDN_FAXPUMP_HALT, 0); +- break; +- } + test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); + test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); + if (st->l1.bcs->cs->debug & L1_DEB_HSCX) +@@ -1758,51 +1723,6 @@ + test_and_set_bit(BC_FLG_DLEETX, + &bcs->Flag); + break; +- case ISDN_FAX_CLASS1_FTS: +- if (ic->parm.aux.subcmd == AT_QUERY) { +- ic->command = ISDN_STAT_FAXIND; +- ic->parm.aux.cmd = ISDN_FAX_CLASS1_OK; +- cs->iif.statcallb(ic); +- return(0); +- } else if (ic->parm.aux.subcmd == AT_EQ_QUERY) { +- strcpy(ic->parm.aux.para, "0-255"); +- ic->command = ISDN_STAT_FAXIND; +- ic->parm.aux.cmd = ISDN_FAX_CLASS1_QUERY; +- cs->iif.statcallb(ic); +- return(0); +- } else if (ic->parm.aux.subcmd == AT_EQ_VALUE) { +- if (cs->debug & L1_DEB_HSCX) +- debugl1(cs, "isar_auxcmd %s=%d", +- FC1_CMD[ic->parm.aux.cmd], ic->parm.aux.para[0]); +- if (bcs->hw.isar.state == STFAX_READY) { +- if (! ic->parm.aux.para[0]) { +- ic->command = ISDN_STAT_FAXIND; +- ic->parm.aux.cmd = ISDN_FAX_CLASS1_OK; +- cs->iif.statcallb(ic); +- return(0); +- } +- if (! test_and_set_bit(BC_FLG_FTI_RUN, &bcs->Flag)) { +- /* n*10 ms */ +- bcs->hw.isar.ftimer.expires = +- jiffies + ((ic->parm.aux.para[0] * 10 * HZ)/1000); +- test_and_set_bit(BC_FLG_FTI_FTS, &bcs->Flag); +- add_timer(&bcs->hw.isar.ftimer); +- return(0); +- } else { +- if (cs->debug) +- debugl1(cs, "isar FTS=%d and FTI busy", +- ic->parm.aux.para[0]); +- } +- } else { +- if (cs->debug) +- debugl1(cs, "isar FTS=%d and isar.state not ready(%x)", +- ic->parm.aux.para[0],bcs->hw.isar.state); +- } +- ic->command = ISDN_STAT_FAXIND; +- ic->parm.aux.cmd = ISDN_FAX_CLASS1_ERROR; +- cs->iif.statcallb(ic); +- } +- break; + case ISDN_FAX_CLASS1_FRM: + case ISDN_FAX_CLASS1_FRH: + case ISDN_FAX_CLASS1_FTM: +@@ -1815,24 +1735,16 @@ + cs->iif.statcallb(ic); + return(0); + } else if (ic->parm.aux.subcmd == AT_EQ_QUERY) { +- char *p = ic->parm.aux.para; +- for(i=0;i<FAXMODCNT;i++) +- if ((1<<i) & modmask) +- p += sprintf(p, "%d,", faxmodulation[i]); +- p--; +- *p=0; ++ strcpy(ic->parm.aux.para, faxmodulation_s); + ic->command = ISDN_STAT_FAXIND; + ic->parm.aux.cmd = ISDN_FAX_CLASS1_QUERY; + cs->iif.statcallb(ic); + return(0); + } else if (ic->parm.aux.subcmd == AT_EQ_VALUE) { +- if (cs->debug & L1_DEB_HSCX) +- debugl1(cs, "isar_auxcmd %s=%d", +- FC1_CMD[ic->parm.aux.cmd], ic->parm.aux.para[0]); + for(i=0;i<FAXMODCNT;i++) + if (faxmodulation[i]==ic->parm.aux.para[0]) + break; +- if ((i < FAXMODCNT) && ((1<<i) & modmask) && ++ if ((FAXMODCNT > i) && + test_bit(BC_FLG_INIT, &bcs->Flag)) { + isar_pump_cmd(bcs, + ic->parm.aux.cmd, +@@ -1850,7 +1762,7 @@ + break; + case (ISDN_CMD_IOCTL): + switch (ic->arg) { +- case 9: /* load firmware */ ++ case (9): /* load firmware */ + features = ISDN_FEATURE_L2_MODEM | + ISDN_FEATURE_L2_FAX | + ISDN_FEATURE_L3_FCLASS1; +@@ -1860,26 +1772,6 @@ + else + ll_run(cs, features); + break; +- case 20: +- features = *(unsigned int *) ic->parm.num; +- printk(KERN_DEBUG "HiSax: max modulation old(%04x) new(%04x)\n", +- modmask, features); +- modmask = features; +- break; +- case 21: +- features = *(unsigned int *) ic->parm.num; +- printk(KERN_DEBUG "HiSax: FRM extra delay old(%d) new(%d) ms\n", +- frm_extra_delay, features); +- if (features >= 0) +- frm_extra_delay = features; +- break; +- case 22: +- features = *(unsigned int *) ic->parm.num; +- printk(KERN_DEBUG "HiSax: TOA old(%d) new(%d) db\n", +- para_TOA, features); +- if (features >= 0 && features < 32) +- para_TOA = features; +- break; + default: + printk(KERN_DEBUG "HiSax: invalid ioctl %d\n", + (int) ic->arg); +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isar.h linux-2.4.29/drivers/isdn/hisax/isar.h +--- linux-2.4.29.old/drivers/isdn/hisax/isar.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/isar.h 2005-03-22 15:06:47.457878088 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isar.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: isar.h,v 1.11 2001/09/24 13:22:56 kai Exp $ + * + * ISAR (Siemens PSB 7110) specific defines + * +@@ -28,8 +28,6 @@ + #define ISAR_HIS_FIRM 0x1e + #define ISAR_HIS_STDSP 0x08 + #define ISAR_HIS_DIAG 0x05 +-#define ISAR_HIS_WAITSTATE 0x27 +-#define ISAR_HIS_TIMERIRQ 0x25 + #define ISAR_HIS_P0CFG 0x3c + #define ISAR_HIS_P12CFG 0x24 + #define ISAR_HIS_SARTCFG 0x25 +@@ -45,10 +43,6 @@ + #define ISAR_HIS_DPS2 0x80 + #define SET_DPS(x) ((x<<6) & 0xc0) + +-#define ISAR_CMD_TIMERIRQ_OFF 0x20 +-#define ISAR_CMD_TIMERIRQ_ON 0x21 +- +- + #define ISAR_IIS_MSCMSD 0x3f + #define ISAR_IIS_VNR 0x15 + #define ISAR_IIS_DKEY 0x03 +@@ -213,8 +207,6 @@ + #define STFAX_ESCAPE 5 + #define STFAX_SILDET 6 + +-#define ISDN_FAXPUMP_HALT 100 +- + extern int ISARVersion(struct IsdnCardState *cs, char *s); + extern void isar_int_main(struct IsdnCardState *cs); + extern void initisar(struct IsdnCardState *cs); +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl1.c linux-2.4.29/drivers/isdn/hisax/isdnl1.c +--- linux-2.4.29.old/drivers/isdn/hisax/isdnl1.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/isdnl1.c 2005-03-22 15:06:47.582859088 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdnl1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: isdnl1.c,v 2.46 2001/09/24 13:22:56 kai Exp $ + * + * common low level stuff for Siemens Chipsetbased isdn cards + * +@@ -18,7 +18,7 @@ + * + */ + +-const char *l1_revision = "$Revision: 1.1.4.1 $"; ++const char *l1_revision = "$Revision: 2.46 $"; + + #define __NO_VERSION__ + #include <linux/init.h> +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl1.h linux-2.4.29/drivers/isdn/hisax/isdnl1.h +--- linux-2.4.29.old/drivers/isdn/hisax/isdnl1.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/isdnl1.h 2005-03-22 15:06:47.615854072 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdnl1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: isdnl1.h,v 2.12 2001/09/24 13:22:56 kai Exp $ + * + * Layer 1 defines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl2.c linux-2.4.29/drivers/isdn/hisax/isdnl2.c +--- linux-2.4.29.old/drivers/isdn/hisax/isdnl2.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/isdnl2.c 2005-03-22 15:06:47.631851640 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdnl2.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: isdnl2.c,v 2.30 2001/09/24 13:22:56 kai Exp $ + * + * Author Karsten Keil + * based on the teles driver from Jan den Ouden +@@ -20,7 +20,7 @@ + #include "hisax.h" + #include "isdnl2.h" + +-const char *l2_revision = "$Revision: 1.1.4.1 $"; ++const char *l2_revision = "$Revision: 2.30 $"; + + static void l2m_debug(struct FsmInst *fi, char *fmt, ...); + +@@ -1418,8 +1418,8 @@ + freewin(st); + st->l2.tei = -1; + stop_t200(st, 17); +- st5_dl_release_l2l3(st); + FsmChangeState(fi, ST_L2_1); ++ st5_dl_release_l2l3(st); + } + + static void +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl2.h linux-2.4.29/drivers/isdn/hisax/isdnl2.h +--- linux-2.4.29.old/drivers/isdn/hisax/isdnl2.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/isdnl2.h 2005-03-22 15:06:47.647849208 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdnl2.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id$ + * + * Layer 2 defines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl3.c linux-2.4.29/drivers/isdn/hisax/isdnl3.c +--- linux-2.4.29.old/drivers/isdn/hisax/isdnl3.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/isdnl3.c 2005-03-22 15:06:47.663846776 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdnl3.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: isdnl3.c,v 2.22 2001/09/24 13:22:56 kai Exp $ + * + * Author Karsten Keil + * based on the teles driver from Jan den Ouden +@@ -21,7 +21,7 @@ + #include "isdnl3.h" + #include <linux/config.h> + +-const char *l3_revision = "$Revision: 1.1.4.1 $"; ++const char *l3_revision = "$Revision: 2.22 $"; + + static struct Fsm l3fsm; + +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isdnl3.h linux-2.4.29/drivers/isdn/hisax/isdnl3.h +--- linux-2.4.29.old/drivers/isdn/hisax/isdnl3.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/isdnl3.h 2005-03-22 15:06:47.679844344 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdnl3.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id$ + * + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/isurf.c linux-2.4.29/drivers/isdn/hisax/isurf.c +--- linux-2.4.29.old/drivers/isdn/hisax/isurf.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/isurf.c 2005-03-22 15:06:47.699841304 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isurf.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: isurf.c,v 1.12 2001/09/24 13:22:56 kai Exp $ + * + * low level stuff for Siemens I-Surf/I-Talk cards + * +@@ -16,11 +16,10 @@ + #include "isac.h" + #include "isar.h" + #include "isdnl1.h" +-#include <linux/isapnp.h> + + extern const char *CardType[]; + +-static const char *ISurf_revision = "$Revision: 1.1.4.1 $"; ++static const char *ISurf_revision = "$Revision: 1.12 $"; + + #define byteout(addr,val) outb(val,addr) + #define bytein(addr) inb(addr) +@@ -128,8 +127,10 @@ + release_io_isurf(struct IsdnCardState *cs) + { + release_region(cs->hw.isurf.reset, 1); ++#ifdef COMPAT_HAS_ISA_IOREMAP + iounmap((unsigned char *)cs->hw.isurf.isar); + release_mem_region(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE); ++#endif + } + + static void +@@ -194,10 +195,6 @@ + return(isar_auxcmd(cs, ic)); + } + +-#ifdef __ISAPNP__ +-static struct pci_bus *pnp_surf __devinitdata = NULL; +-#endif +- + int __init + setup_isurf(struct IsdnCard *card) + { +@@ -215,58 +212,9 @@ + cs->hw.isurf.phymem = card->para[2]; + cs->irq = card->para[0]; + } else { +-#ifdef __ISAPNP__ +- struct pci_bus *pb; +- struct pci_dev *pd; +- +- if (isapnp_present()) { +- cs->subtyp = 0; +- if ((pb = isapnp_find_card( +- ISAPNP_VENDOR('S', 'I', 'E'), +- ISAPNP_FUNCTION(0x0010), pnp_surf))) { +- pnp_surf = pb; +- pd = NULL; +- if (!(pd = isapnp_find_dev(pnp_surf, +- ISAPNP_VENDOR('S', 'I', 'E'), +- ISAPNP_FUNCTION(0x0010), pd))) { +- printk(KERN_ERR "ISurfPnP: PnP error card found, no device\n"); +- return (0); +- } +- pd->prepare(pd); +- pd->deactivate(pd); +- pd->activate(pd); +- /* The ISA-PnP logic apparently +- * expects upper limit address to be +- * set. Since the isa-pnp module +- * doesn't do this, so we have to make +- * up for it. +- */ +- isapnp_cfg_begin(pd->bus->number, pd->devfn); +- isapnp_write_word(ISAPNP_CFG_MEM+3, +- pd->resource[8].end >> 8); +- isapnp_cfg_end(); +- cs->hw.isurf.reset = pd->resource[0].start; +- cs->hw.isurf.phymem = pd->resource[8].start; +- cs->irq = pd->irq_resource[0].start; +- if (!cs->irq || !cs->hw.isurf.reset || !cs->hw.isurf.phymem) { +- printk(KERN_ERR "ISurfPnP:some resources are missing %d/%x/%lx\n", +- cs->irq, cs->hw.isurf.reset, cs->hw.isurf.phymem); +- pd->deactivate(pd); +- return(0); +- } +- } else { +- printk(KERN_INFO "ISurfPnP: no ISAPnP card found\n"); +- return(0); +- } +- } else { +- printk(KERN_INFO "ISurfPnP: no ISAPnP bus found\n"); +- return(0); +- } +-#else + printk(KERN_WARNING "HiSax: %s port/mem not set\n", + CardType[card->typ]); + return (0); +-#endif + } + if (check_region(cs->hw.isurf.reset, 1)) { + printk(KERN_WARNING +@@ -277,6 +225,7 @@ + } else { + request_region(cs->hw.isurf.reset, 1, "isurf isdn"); + } ++#ifdef COMPAT_HAS_ISA_IOREMAP + if (check_mem_region(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE)) { + printk(KERN_WARNING + "HiSax: %s memory region %lx-%lx already in use\n", +@@ -292,6 +241,10 @@ + cs->hw.isurf.isar = + (unsigned long) ioremap(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE); + cs->hw.isurf.isac = cs->hw.isurf.isar + ISURF_ISAC_OFFSET; ++#else ++ cs->hw.isurf.isar = cs->hw.isurf.phymem + ISURF_ISAR_OFFSET; ++ cs->hw.isurf.isac = cs->hw.isurf.phymem + ISURF_ISAC_OFFSET; ++#endif + printk(KERN_INFO + "ISurf: defined at 0x%x 0x%lx IRQ %d\n", + cs->hw.isurf.reset, +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/ix1_micro.c linux-2.4.29/drivers/isdn/hisax/ix1_micro.c +--- linux-2.4.29.old/drivers/isdn/hisax/ix1_micro.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/ix1_micro.c 2005-03-22 15:06:47.714839024 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: ix1_micro.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: ix1_micro.c,v 2.12 2001/09/24 13:22:56 kai Exp $ + * + * low level stuff for ITK ix1-micro Rev.2 isdn cards + * derived from the original file teles3.c from Karsten Keil +@@ -19,14 +19,13 @@ + + #define __NO_VERSION__ + #include <linux/init.h> +-#include <linux/isapnp.h> + #include "hisax.h" + #include "isac.h" + #include "hscx.h" + #include "isdnl1.h" + + extern const char *CardType[]; +-const char *ix1_revision = "$Revision: 1.1.4.1 $"; ++const char *ix1_revision = "$Revision: 2.12 $"; + + #define byteout(addr,val) outb(val,addr) + #define bytein(addr) inb(addr) +@@ -219,21 +218,6 @@ + return(0); + } + +-#ifdef __ISAPNP__ +-static struct isapnp_device_id itk_ids[] __initdata = { +- { ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25), +- ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25), +- (unsigned long) "ITK micro 2" }, +- { ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x29), +- ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x29), +- (unsigned long) "ITK micro 2." }, +- { 0, } +-}; +- +-static struct isapnp_device_id *idev = &itk_ids[0]; +-static struct pci_bus *pnp_c __devinitdata = NULL; +-#endif +- + + int __init + setup_ix1micro(struct IsdnCard *card) +@@ -246,45 +230,6 @@ + if (cs->typ != ISDN_CTYPE_IX1MICROR2) + return (0); + +-#ifdef __ISAPNP__ +- if (!card->para[1] && isapnp_present()) { +- struct pci_bus *pb; +- struct pci_dev *pd; +- +- while(idev->card_vendor) { +- if ((pb = isapnp_find_card(idev->card_vendor, +- idev->card_device, pnp_c))) { +- pnp_c = pb; +- pd = NULL; +- if ((pd = isapnp_find_dev(pnp_c, +- idev->vendor, idev->function, pd))) { +- printk(KERN_INFO "HiSax: %s detected\n", +- (char *)idev->driver_data); +- pd->prepare(pd); +- pd->deactivate(pd); +- pd->activate(pd); +- card->para[1] = pd->resource[0].start; +- card->para[0] = pd->irq_resource[0].start; +- if (!card->para[0] || !card->para[1]) { +- printk(KERN_ERR "ITK PnP:some resources are missing %ld/%lx\n", +- card->para[0], card->para[1]); +- pd->deactivate(pd); +- return(0); +- } +- break; +- } else { +- printk(KERN_ERR "ITK PnP: PnP error card found, no device\n"); +- } +- } +- idev++; +- pnp_c=NULL; +- } +- if (!idev->card_vendor) { +- printk(KERN_INFO "ITK PnP: no ISAPnP card found\n"); +- return(0); +- } +- } +-#endif + /* IO-Ports */ + cs->hw.ix1.isac_ale = card->para[1] + ISAC_COMMAND_OFFSET; + cs->hw.ix1.hscx_ale = card->para[1] + HSCX_COMMAND_OFFSET; +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/jade.c linux-2.4.29/drivers/isdn/hisax/jade.c +--- linux-2.4.29.old/drivers/isdn/hisax/jade.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/jade.c 2005-03-22 15:06:47.729836744 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: jade.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: jade.c,v 1.9 2001/09/24 13:22:56 kai Exp $ + * + * JADE stuff (derived from original hscx.c) + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/jade.h linux-2.4.29/drivers/isdn/hisax/jade.h +--- linux-2.4.29.old/drivers/isdn/hisax/jade.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/jade.h 2005-03-22 15:06:47.745834312 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: jade.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: jade.h,v 1.5 2001/09/24 13:22:56 kai Exp $ + * + * JADE specific defines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/jade_irq.c linux-2.4.29/drivers/isdn/hisax/jade_irq.c +--- linux-2.4.29.old/drivers/isdn/hisax/jade_irq.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/jade_irq.c 2005-03-22 15:06:47.760832032 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: jade_irq.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: jade_irq.c,v 1.7 2001/09/24 13:22:56 kai Exp $ + * + * Low level JADE IRQ stuff (derived from original hscx_irq.c) + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3_1tr6.c linux-2.4.29/drivers/isdn/hisax/l3_1tr6.c +--- linux-2.4.29.old/drivers/isdn/hisax/l3_1tr6.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/l3_1tr6.c 2005-03-22 15:06:47.777829448 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: l3_1tr6.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: l3_1tr6.c,v 2.15 2001/09/24 13:22:56 kai Exp $ + * + * German 1TR6 D-channel protocol + * +@@ -20,7 +20,7 @@ + #include <linux/ctype.h> + + extern char *HiSax_getrev(const char *revision); +-const char *l3_1tr6_revision = "$Revision: 1.1.4.1 $"; ++const char *l3_1tr6_revision = "$Revision: 2.15 $"; + + #define MsgHead(ptr, cref, mty, dis) \ + *ptr++ = dis; \ +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3_1tr6.h linux-2.4.29/drivers/isdn/hisax/l3_1tr6.h +--- linux-2.4.29.old/drivers/isdn/hisax/l3_1tr6.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/l3_1tr6.h 2005-03-22 15:06:47.796826560 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: l3_1tr6.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id$ + * + * German 1TR6 D-channel protocol defines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3dss1.c linux-2.4.29/drivers/isdn/hisax/l3dss1.c +--- linux-2.4.29.old/drivers/isdn/hisax/l3dss1.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/l3dss1.c 2005-03-22 15:06:47.822822608 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: l3dss1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: l3dss1.c,v 2.32 2001/09/24 13:22:56 kai Exp $ + * + * EURO/DSS1 D-channel protocol + * +@@ -27,7 +27,7 @@ + #include <linux/config.h> + + extern char *HiSax_getrev(const char *revision); +-const char *dss1_revision = "$Revision: 1.1.4.1 $"; ++const char *dss1_revision = "$Revision: 2.32 $"; + + #define EXT_BEARER_CAPS 1 + +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3dss1.h linux-2.4.29/drivers/isdn/hisax/l3dss1.h +--- linux-2.4.29.old/drivers/isdn/hisax/l3dss1.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/l3dss1.h 2005-03-22 15:06:47.842819568 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: l3dss1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id$ + * + * DSS1 (Euro) D-channel protocol defines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3ni1.c linux-2.4.29/drivers/isdn/hisax/l3ni1.c +--- linux-2.4.29.old/drivers/isdn/hisax/l3ni1.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/l3ni1.c 2005-03-22 15:06:47.859816984 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: l3ni1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: l3ni1.c,v 2.8 2001/09/24 13:22:56 kai Exp $ + * + * NI1 D-channel protocol + * +@@ -25,7 +25,7 @@ + #include <linux/ctype.h> + + extern char *HiSax_getrev(const char *revision); +-const char *ni1_revision = "$Revision: 1.1.4.1 $"; ++const char *ni1_revision = "$Revision: 2.8 $"; + + #define EXT_BEARER_CAPS 1 + +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/l3ni1.h linux-2.4.29/drivers/isdn/hisax/l3ni1.h +--- linux-2.4.29.old/drivers/isdn/hisax/l3ni1.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/l3ni1.h 2005-03-22 15:06:47.877814248 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: l3ni1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id$ + * + * NI1 D-channel protocol + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/lmgr.c linux-2.4.29/drivers/isdn/hisax/lmgr.c +--- linux-2.4.29.old/drivers/isdn/hisax/lmgr.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/lmgr.c 2005-03-22 15:06:47.895811512 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: lmgr.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id$ + * + * Layermanagement module + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/md5sums.asc linux-2.4.29/drivers/isdn/hisax/md5sums.asc +--- linux-2.4.29.old/drivers/isdn/hisax/md5sums.asc 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/md5sums.asc 2005-03-22 15:06:47.910809232 +0100 +@@ -1,33 +1,22 @@ +------BEGIN PGP SIGNED MESSAGE----- +-Hash: SHA1 +- + # This are valid md5sums for certificated HiSax driver. + # The certification is valid only if the md5sums of all files match. + # The certification is valid only for ELSA Microlink PCI, +-# Eicon Technology Diva 2.01 PCI, Sedlbauer SpeedFax+, +-# HFC-S PCI A based cards and HFC-S USB based ISDN +-# terminal adapters in the moment. ++# Eicon Technology Diva 2.01 PCI, Sedlbauer SpeedFax+, ++# HFC-S PCI A based cards and HFC-S USB based isdn tas ++# in the moment. + # Read ../../../Documentation/isdn/HiSax.cert for more informations. + # +-cd4a9917e1147039d5dfc66440d42054 isac.c +-211840e78b56c9d4753be9c85da21a50 isdnl1.c +-5ce9b1fff42a02f9c2eb4fb81c701b1f isdnl2.c +-6948de0c43513dd23c6706feb5fc2209 isdnl3.c +-3730780b69368218d756024165efea79 tei.c +-16e72710eb58da01415b877490f5d2ac callc.c +-6abc55c77e0f3149ae9334f3257a1a1a cert.c +-27bdb2800d4590e00da20eff241edc47 l3dss1.c +-df8bb877b854c4302d396b554e4e84ef l3_1tr6.c +-9d8b4bed15370063d1b16e47080f50e1 elsa.c +-210f4a3f1eebca70229d786b15cf3e90 diva.c +-4ddf21079dd77e892380f789bae250a7 sedlbauer.c +-8200d818771e3cbdef2a3c3e818d25ac hfc_pci.c ++6f9433a8b696076562562d090e3c420f isac.c ++13c3eed869f5139f44c563e3a8fea1f5 isdnl1.c ++addcff863b0ff1e366c0f2ae9fa6e81e isdnl2.c ++7076deb94a363945c21ea27aca4a720a isdnl3.c ++51c603829b6cc4f8421f744ad657ceff tei.c ++669050ab5079f02887ed0239d86e5474 callc.c ++ecacd146b8f8881ef9349935dab3df4a cert.c ++fadeb3b85bb23bc1ac48470c0848d6fa l3dss1.c ++cf7dec9fac6283716904d26b99188476 l3_1tr6.c ++2f75c8765e1be13d114d5f4433cf364b elsa.c ++b4cf8a4dceed9ea6dcba65a85b4eecc7 diva.c ++dee3f8f40c6fe78a4b57729804b7e6cd sedlbauer.c ++0d79fe6dfc5bfaa4826970c41a6d273d hfc_pci.c + # end of md5sums +------BEGIN PGP SIGNATURE----- +-Version: GnuPG v1.0.6 (GNU/Linux) +-Comment: For info see http://www.gnupg.org +- +-iD8DBQE9rE91DiY0VZsg4ukRAkKfAJ4xWUfqjc0hW+V+JPue5yr7mrt+RwCdGdSf +-GIKgAEdRLzERmpt/bCCwAbY= +-=FaHw +------END PGP SIGNATURE----- +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/mic.c linux-2.4.29/drivers/isdn/hisax/mic.c +--- linux-2.4.29.old/drivers/isdn/hisax/mic.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/mic.c 2005-03-22 15:06:47.926806800 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: mic.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: mic.c,v 1.12 2001/09/24 13:22:56 kai Exp $ + * + * low level stuff for mic cards + * +@@ -19,7 +19,7 @@ + + extern const char *CardType[]; + +-const char *mic_revision = "$Revision: 1.1.4.1 $"; ++const char *mic_revision = "$Revision: 1.12 $"; + + #define byteout(addr,val) outb(val,addr) + #define bytein(addr) inb(addr) +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/netjet.c linux-2.4.29/drivers/isdn/hisax/netjet.c +--- linux-2.4.29.old/drivers/isdn/hisax/netjet.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/netjet.c 2005-03-22 15:06:47.941804520 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: netjet.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: netjet.c,v 1.29 2001/09/24 13:22:56 kai Exp $ + * + * low level stuff for Traverse Technologie NETJet ISDN cards + * +@@ -8,9 +8,7 @@ + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. + * +- * Thanks to Traverse Technologies Australia for documents and information +- * +- * 16-Apr-2002 - led code added - Guy Ellis (guy@traverse.com.au) ++ * Thanks to Traverse Technologie Australia for documents and information + * + */ + +@@ -26,7 +24,7 @@ + #include <asm/io.h> + #include "netjet.h" + +-const char *NETjet_revision = "$Revision: 1.1.4.1 $"; ++const char *NETjet_revision = "$Revision: 1.29 $"; + + /* Interface functions */ + +@@ -135,7 +133,6 @@ + mode_tiger(struct BCState *bcs, int mode, int bc) + { + struct IsdnCardState *cs = bcs->cs; +- u_char led; + + if (cs->debug & L1_DEB_HSCX) + debugl1(cs, "Tiger mode %d bchan %d/%d", +@@ -157,15 +154,6 @@ + cs->hw.njet.dmactrl); + byteout(cs->hw.njet.base + NETJET_IRQMASK0, 0); + } +- if (cs->typ == ISDN_CTYPE_NETJET_S) +- { +- // led off +- led = bc & 0x01; +- led = 0x01 << (6 + led); // convert to mask +- led = ~led; +- cs->hw.njet.auxd &= led; +- byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); +- } + break; + case (L1_MODE_TRANS): + break; +@@ -191,14 +179,6 @@ + bcs->hw.tiger.sendp = bcs->hw.tiger.send; + bcs->hw.tiger.free = NETJET_DMA_TXSIZE; + test_and_set_bit(BC_FLG_EMPTY, &bcs->Flag); +- if (cs->typ == ISDN_CTYPE_NETJET_S) +- { +- // led on +- led = bc & 0x01; +- led = 0x01 << (6 + led); // convert to mask +- cs->hw.njet.auxd |= led; +- byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); +- } + break; + } + if (cs->debug & L1_DEB_HSCX) +@@ -874,13 +854,9 @@ + case (PH_ACTIVATE | REQUEST): + test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); + mode_tiger(st->l1.bcs, st->l1.mode, st->l1.bc); +- /* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG */ +- st->l1.bcs->cs->cardmsg(st->l1.bcs->cs, MDL_BC_ASSIGN, (void *)(&st->l1.bc)); + l1_msg_b(st, pr, arg); + break; + case (PH_DEACTIVATE | REQUEST): +- /* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG */ +- st->l1.bcs->cs->cardmsg(st->l1.bcs->cs, MDL_BC_RELEASE, (void *)(&st->l1.bc)); + l1_msg_b(st, pr, arg); + break; + case (PH_DEACTIVATE | CONFIRM): +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/netjet.h linux-2.4.29/drivers/isdn/hisax/netjet.h +--- linux-2.4.29.old/drivers/isdn/hisax/netjet.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/netjet.h 2005-03-22 15:06:47.956802240 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: netjet.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: netjet.h,v 2.8 2001/09/24 13:22:56 kai Exp $ + * + * NETjet common header file + * +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/niccy.c linux-2.4.29/drivers/isdn/hisax/niccy.c +--- linux-2.4.29.old/drivers/isdn/hisax/niccy.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/niccy.c 2005-03-22 15:06:47.977799048 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: niccy.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: niccy.c,v 1.21 2001/10/20 22:05:00 kai Exp $ + * + * low level stuff for Dr. Neuhaus NICCY PnP and NICCY PCI and + * compatible (SAGEM cybermodem) +@@ -22,10 +22,10 @@ + #include "hscx.h" + #include "isdnl1.h" + #include <linux/pci.h> +-#include <linux/isapnp.h> ++#include <linux/isdn_compat.h> + + extern const char *CardType[]; +-const char *niccy_revision = "$Revision: 1.1.4.1 $"; ++const char *niccy_revision = "$Revision: 1.21 $"; + + #define byteout(addr,val) outb(val,addr) + #define bytein(addr) inb(addr) +@@ -239,9 +239,6 @@ + } + + static struct pci_dev *niccy_dev __initdata = NULL; +-#ifdef __ISAPNP__ +-static struct pci_bus *pnp_c __devinitdata = NULL; +-#endif + + int __init + setup_niccy(struct IsdnCard *card) +@@ -253,39 +250,7 @@ + printk(KERN_INFO "HiSax: Niccy driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_NICCY) + return (0); +-#ifdef __ISAPNP__ +- if (!card->para[1] && isapnp_present()) { +- struct pci_bus *pb; +- struct pci_dev *pd; +- +- if ((pb = isapnp_find_card( +- ISAPNP_VENDOR('S', 'D', 'A'), +- ISAPNP_FUNCTION(0x0150), pnp_c))) { +- pnp_c = pb; +- pd = NULL; +- if (!(pd = isapnp_find_dev(pnp_c, +- ISAPNP_VENDOR('S', 'D', 'A'), +- ISAPNP_FUNCTION(0x0150), pd))) { +- printk(KERN_ERR "NiccyPnP: PnP error card found, no device\n"); +- return (0); +- } +- pd->prepare(pd); +- pd->deactivate(pd); +- pd->activate(pd); +- card->para[1] = pd->resource[0].start; +- card->para[2] = pd->resource[1].start; +- card->para[0] = pd->irq_resource[0].start; +- if (!card->para[0] || !card->para[1] || !card->para[2]) { +- printk(KERN_ERR "NiccyPnP:some resources are missing %ld/%lx/%lx\n", +- card->para[0], card->para[1], card->para[2]); +- pd->deactivate(pd); +- return(0); +- } +- } else { +- printk(KERN_INFO "NiccyPnP: no ISAPnP card found\n"); +- } +- } +-#endif ++ + if (card->para[1]) { + cs->hw.niccy.isac = card->para[1] + ISAC_PNP; + cs->hw.niccy.hscx = card->para[1] + HSCX_PNP; +@@ -331,12 +296,12 @@ + return(0); + } + cs->irq = niccy_dev->irq; +- cs->hw.niccy.cfg_reg = pci_resource_start(niccy_dev, 0); ++ cs->hw.niccy.cfg_reg = pci_resource_start_io(niccy_dev, 0); + if (!cs->hw.niccy.cfg_reg) { + printk(KERN_WARNING "Niccy: No IO-Adr for PCI cfg found\n"); + return(0); + } +- pci_ioaddr = pci_resource_start(niccy_dev, 1); ++ pci_ioaddr = pci_resource_start_io(niccy_dev, 1); + if (!pci_ioaddr) { + printk(KERN_WARNING "Niccy: No IO-Adr for PCI card found\n"); + return(0); +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/nj_s.c linux-2.4.29/drivers/isdn/hisax/nj_s.c +--- linux-2.4.29.old/drivers/isdn/hisax/nj_s.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/nj_s.c 2005-03-22 15:06:47.993796616 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: nj_s.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: nj_s.c,v 2.13 2001/09/24 13:22:56 kai Exp $ + * + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. +@@ -12,11 +12,12 @@ + #include "isac.h" + #include "isdnl1.h" + #include <linux/pci.h> ++#include <linux/isdn_compat.h> + #include <linux/interrupt.h> + #include <linux/ppp_defs.h> + #include "netjet.h" + +-const char *NETjet_S_revision = "$Revision: 1.1.4.1 $"; ++const char *NETjet_S_revision = "$Revision: 2.13 $"; + + static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off) + { +@@ -130,7 +131,6 @@ + release_io_netjet(cs); + return(0); + case CARD_INIT: +- reset_netjet_s(cs); + inittiger(cs); + clear_pending_isac_ints(cs); + initisac(cs); +@@ -180,19 +180,11 @@ + printk(KERN_WARNING "NETjet-S: No IRQ for PCI card found\n"); + return(0); + } +- cs->hw.njet.base = pci_resource_start(dev_netjet, 0); ++ cs->hw.njet.base = pci_resource_start_io(dev_netjet, 0); + if (!cs->hw.njet.base) { + printk(KERN_WARNING "NETjet-S: No IO-Adr for PCI card found\n"); + return(0); + } +- /* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG www.formula-n.com */ +- if ((dev_netjet->subsystem_vendor == 0x55) && +- (dev_netjet->subsystem_device == 0x02)) { +- printk(KERN_WARNING "Netjet: You tried to load this driver with an incompatible TigerJet-card\n"); +- printk(KERN_WARNING "Use type=41 for Formula-n enter:now ISDN PCI and compatible\n"); +- return(0); +- } +- /* end new code */ + } else { + printk(KERN_WARNING "NETjet-S: No PCI card found\n"); + return(0); +@@ -263,6 +255,7 @@ + } else { + request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn"); + } ++ reset_netjet_s(cs); + cs->readisac = &NETjet_ReadIC; + cs->writeisac = &NETjet_WriteIC; + cs->readisacfifo = &NETjet_ReadICfifo; +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/nj_u.c linux-2.4.29/drivers/isdn/hisax/nj_u.c +--- linux-2.4.29.old/drivers/isdn/hisax/nj_u.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/nj_u.c 2005-03-22 15:06:48.008794336 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: nj_u.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: nj_u.c,v 2.14 2001/09/24 13:22:56 kai Exp $ + * + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. +@@ -12,11 +12,12 @@ + #include "icc.h" + #include "isdnl1.h" + #include <linux/pci.h> ++#include <linux/isdn_compat.h> + #include <linux/interrupt.h> + #include <linux/ppp_defs.h> + #include "netjet.h" + +-const char *NETjet_U_revision = "$Revision: 1.1.4.1 $"; ++const char *NETjet_U_revision = "$Revision: 2.14 $"; + + static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off) + { +@@ -181,7 +182,7 @@ + printk(KERN_WARNING "NETspider-U: No IRQ for PCI card found\n"); + return(0); + } +- cs->hw.njet.base = pci_resource_start(dev_netjet, 0); ++ cs->hw.njet.base = pci_resource_start_io(dev_netjet, 0); + if (!cs->hw.njet.base) { + printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n"); + return(0); +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/q931.c linux-2.4.29/drivers/isdn/hisax/q931.c +--- linux-2.4.29.old/drivers/isdn/hisax/q931.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/q931.c 2005-03-22 15:06:48.032790688 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: q931.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: q931.c,v 1.12 2001/09/24 13:22:56 kai Exp $ + * + * code to decode ITU Q.931 call control messages + * +@@ -197,6 +197,31 @@ + + #define MT_N1_LEN (sizeof(mt_n1) / sizeof(struct MessageType)) + ++#if 0 ++static struct MessageType fac_1tr6[] = ++{ ++ {FAC_Sperre, "Sperre"}, ++ {FAC_Forward1, "Forward 1"}, ++ {FAC_Forward2, "Forward 2"}, ++ {FAC_Konferenz, "Konferenz"}, ++ {FAC_GrabBchan, "Grab Bchannel"}, ++ {FAC_Reactivate, "Reactivate"}, ++ {FAC_Konferenz3, "Dreier Konferenz"}, ++ {FAC_Dienstwechsel1, "Einseitiger Dienstwechsel"}, ++ {FAC_Dienstwechsel2, "Zweiseitiger Dienstwechsel"}, ++ {FAC_NummernIdent, "Rufnummer-Identifizierung"}, ++ {FAC_GBG, "GBG"}, ++ {FAC_DisplayUebergeben, "Display Uebergeben"}, ++ {FAC_DisplayUmgeleitet, "Display Umgeleitet"}, ++ {FAC_Unterdruecke, "Unterdruecke Rufnummer"}, ++ {FAC_Deactivate, "Deactivate"}, ++ {FAC_Activate, "Activate"}, ++ {FAC_SPV, "SPV"}, ++ {FAC_Rueckwechsel, "Rueckwechsel"}, ++ {FAC_Umleitung, "Umleitung"} ++}; ++#define FAC_1TR6_LEN (sizeof(fac_1tr6) / sizeof(struct MessageType)) ++#endif + + static int + prbits(char *dest, u_char b, int start, int len) +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/rawhdlc.c linux-2.4.29/drivers/isdn/hisax/rawhdlc.c +--- linux-2.4.29.old/drivers/isdn/hisax/rawhdlc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/rawhdlc.c 2005-03-22 15:06:48.047788408 +0100 +@@ -0,0 +1,543 @@ ++/* $Id: rawhdlc.c,v 1.7 2001/09/24 13:22:57 kai Exp $ ++ * ++ * support routines for cards that don't support HDLC ++ * ++ * Author Brent Baccala ++ * Copyright by Karsten Keil <keil@isdn4linux.de> ++ * by Brent Baccala <baccala@FreeSoft.org> ++ * ++ * This software may be used and distributed according to the terms ++ * of the GNU General Public License, incorporated herein by reference. ++ * ++ * ++ * Some passive ISDN cards, such as the Traverse NETJet and the AMD 7930, ++ * don't perform HDLC encapsulation over the B channel. Drivers for ++ * such cards use support routines in this file to perform B channel HDLC. ++ * ++ * Bit-synchronous HDLC encapsulation is a means of encapsulating packets ++ * over a continuously transmitting serial communications link. ++ * It looks like this: ++ * ++ * 11111111101111110...........0111111011111111111 ++ * iiiiiiiiiffffffffdddddddddddffffffffiiiiiiiiiii ++ * ++ * i = idle f = flag d = data ++ * ++ * When idle, the channel sends a continuous string of ones (mark ++ * idle; illustrated), or a continuous string of flag characters (flag ++ * idle). The beginning of a data frame is marked by a flag character ++ * (01111110), then comes the actual data, followed by another flag ++ * character, after which another frame may be sent immediately (a ++ * single flag may serve as both the end of one frame and the start of ++ * the next), or the link may return to idle. Obviously, the flag ++ * character can not appear anywhere in the data (or a false ++ * end-of-frame would occur), so the transmitter performs ++ * "bit-stuffing" - inserting a zero bit after every five one bits, ++ * irregardless of the original bit after the five ones. Byte ++ * ordering is irrelevent at this point - the data is treated as a ++ * string of bits, not bytes. Since no more than 5 ones may now occur ++ * in a row, the flag sequence, with its 6 ones, is unique. ++ * ++ * Upon reception, a zero bit that occur after 5 one bits is simply ++ * discarded. A series of 6 one bits is end-of-frame, and a series of ++ * 7 one bits is an abort. Once bit-stuffing has been corrected for, ++ * an integer number of bytes should now be present. The last two ++ * of these bytes form the Frame Check Sequence, a CRC that is verified ++ * and then discarded. Note that bit-stuffing is performed on the FCS ++ * just as if it were regular data. ++ * ++ * ++ * ++ * int make_raw_hdlc_data(u_char *src, u_int slen, ++ * u_char *dst, u_int dsize) ++ * ++ * Used for transmission. Copies slen bytes from src to dst, performing ++ * HDLC encapsulation (flag bytes, bit-stuffing, CRC) in the process. ++ * dsize is size of destination buffer, and should be at least ++ * ((6*slen)/5)+5 bytes to ensure adequate space will be available. ++ * Function returns length (in bytes) of valid destination buffer, or ++ * 0 upon destination overflow. ++ * ++ * void init_hdlc_state(struct hdlc_state *stateptr, int mode) ++ * ++ * Initializes hdlc_state structure before first call to read_raw_hdlc_data ++ * ++ * mode = 0: Sane mode ++ * mode = 1/2: ++ * Insane mode; NETJet use a shared unsigned int memory block ( ++ * with busmaster DMA), the bit pattern of every word is ++ * <8 B1> <8 B2> <8 Mon> <2 D> <4 C/I> <MX> <MR> ++ * according to Siemens IOM-2 interface, so we have to handle ++ * the src buffer as unsigned int and have to shift/mask the ++ * B-channel bytes. ++ * mode 1 -> B1 mode 2 -> B2 data is used ++ * ++ * int read_raw_hdlc_data(struct hdlc_state *saved_state, ++ * u_char *src, u_int slen, ++ * u_char *dst, u_int dsize) ++ * ++ * Used for reception. Scans source buffer bit-by-bit looking for ++ * valid HDLC frames, which are copied to destination buffer. HDLC ++ * state information is stored in a structure, which allows this ++ * function to process frames spread across several blocks of raw ++ * HDLC data. Part of the state information is bit offsets into ++ * the source and destination buffers. ++ * ++ * A return value >0 indicates the length of a valid frame, now ++ * stored in the destination buffer. In this case, the source ++ * buffer might not be completely processed, so this function should ++ * be called again with the same source buffer, possibly with a ++ * different destination buffer. ++ * ++ * A return value of zero indicates that the source buffer was ++ * completely processed without finding a valid end-of-packet; ++ * however, we might be in the middle of packet reception, so ++ * the function should be called again with the next block of ++ * raw HDLC data and the same destination buffer. It is NOT ++ * permitted to change the destination buffer in this case, ++ * since data may already have begun to be stored there. ++ * ++ * A return value of -1 indicates some kind of error - destination ++ * buffer overflow, CRC check failed, frame not a multiple of 8 ++ * bits. Destination buffer probably contains invalid data, which ++ * should be discarded. Call function again with same source buffer ++ * and a new (or same) destination buffer. ++ * ++ * Suggested calling sequence: ++ * ++ * init_hdlc_state(...); ++ * for (EACH_RAW_DATA_BLOCK) { ++ * while (len = read_raw_hdlc_data(...)) { ++ * if (len == -1) DISCARD_FRAME; ++ * else PROCESS_FRAME; ++ * } ++ * } ++ * ++ * ++ * Test the code in this file as follows: ++ * gcc -DDEBUGME -o rawhdlctest rawhdlc.c ++ * ./rawhdlctest < rawdata ++ * ++ * The file "rawdata" can be easily generated from a HISAX B-channel ++ * hex dump (CF CF CF 02 ...) using the following perl script: ++ * ++ * while(<>) { ++ * @hexlist = split ' '; ++ * while ($hexstr = shift(@hexlist)) { ++ * printf "%c", hex($hexstr); ++ * } ++ * } ++ * ++ */ ++ ++#ifdef DEBUGME ++#include <stdio.h> ++#endif ++ ++#include <linux/types.h> ++#include <linux/ppp_defs.h> ++#include "rawhdlc.h" ++ ++/* There's actually an identical copy of this table in the PPP code ++ * (ppp_crc16_table), but I don't want this code dependent on PPP ++ */ ++ ++// static ++__u16 fcstab[256] = ++{ ++ 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, ++ 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, ++ 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, ++ 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, ++ 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd, ++ 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, ++ 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, ++ 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974, ++ 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, ++ 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, ++ 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a, ++ 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, ++ 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9, ++ 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, ++ 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, ++ 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70, ++ 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, ++ 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff, ++ 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, ++ 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, ++ 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5, ++ 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, ++ 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, ++ 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c, ++ 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, ++ 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb, ++ 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, ++ 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, ++ 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1, ++ 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, ++ 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, ++ 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 ++}; ++ ++#define HDLC_ZERO_SEARCH 0 ++#define HDLC_FLAG_SEARCH 1 ++#define HDLC_FLAG_FOUND 2 ++#define HDLC_FRAME_FOUND 3 ++#define HDLC_NULL 4 ++#define HDLC_PART 5 ++#define HDLC_FULL 6 ++ ++#define HDLC_FLAG_VALUE 0x7e ++ ++ ++#define MAKE_RAW_BYTE for (j=0; j<8; j++) { \ ++ bitcnt++;\ ++ out_val >>= 1;\ ++ if (val & 1) {\ ++ s_one++;\ ++ out_val |= 0x80;\ ++ } else {\ ++ s_one = 0;\ ++ out_val &= 0x7f;\ ++ }\ ++ if (bitcnt==8) {\ ++ if (d_cnt == dsize) return 0;\ ++ dst[d_cnt++] = out_val;\ ++ bitcnt = 0;\ ++ }\ ++ if (s_one == 5) {\ ++ out_val >>= 1;\ ++ out_val &= 0x7f;\ ++ bitcnt++;\ ++ s_one = 0;\ ++ }\ ++ if (bitcnt==8) {\ ++ if (d_cnt == dsize) return 0;\ ++ dst[d_cnt++] = out_val;\ ++ bitcnt = 0;\ ++ }\ ++ val >>= 1;\ ++ } ++ ++/* Optimization suggestion: If needed, this function could be ++ * dramatically sped up using a state machine. Each state would ++ * correspond to having seen N one bits, and being offset M bits into ++ * the current output byte. N ranges from 0 to 4, M from 0 to 7, so ++ * we need 5*8 = 35 states. Each state would have a table with 256 ++ * entries, one for each input character. Each entry would contain ++ * three output characters, an output state, an a byte increment ++ * that's either 1 or 2. All this could fit in four bytes; so we need ++ * 4 bytes * 256 characters = 1 KB for each state (35 KB total). Zero ++ * the output buffer before you start. For each character in your ++ * input, you look it up in the current state's table and get three ++ * bytes to be or'ed into the output at the current byte offset, and ++ * an byte increment to move your pointer forward. A simple Perl ++ * script could generate the tables. Given HDLC semantics, probably ++ * would be better to set output to all 1s, then use ands instead of ors. ++ * A smaller state machine could operate on nibbles instead of bytes. ++ * A state machine for 32-bit architectures could use word offsets ++ * instead of byte offsets, requiring 5*32 = 160 states; probably ++ * best to work on nibbles in such a case. ++ */ ++ ++ ++int make_raw_hdlc_data(u_char *src, u_int slen, u_char *dst, u_int dsize) ++{ ++ register u_int i,d_cnt=0; ++ register u_char j; ++ register u_char val; ++ register u_char s_one = 0; ++ register u_char out_val = 0; ++ register u_char bitcnt = 0; ++ u_int fcs; ++ ++ ++ dst[d_cnt++] = HDLC_FLAG_VALUE; ++ fcs = PPP_INITFCS; ++ for (i=0; i<slen; i++) { ++ val = src[i]; ++ fcs = PPP_FCS (fcs, val); ++ MAKE_RAW_BYTE; ++ } ++ fcs ^= 0xffff; ++ val = fcs & 0xff; ++ MAKE_RAW_BYTE; ++ val = (fcs>>8) & 0xff; ++ MAKE_RAW_BYTE; ++ val = HDLC_FLAG_VALUE; ++ for (j=0; j<8; j++) { ++ bitcnt++; ++ out_val >>= 1; ++ if (val & 1) ++ out_val |= 0x80; ++ else ++ out_val &= 0x7f; ++ if (bitcnt==8) { ++ if (d_cnt == dsize) return 0; ++ dst[d_cnt++] = out_val; ++ bitcnt = 0; ++ } ++ val >>= 1; ++ } ++ if (bitcnt) { ++ while (8>bitcnt++) { ++ out_val >>= 1; ++ out_val |= 0x80; ++ } ++ if (d_cnt == dsize) return 0; ++ dst[d_cnt++] = out_val; ++ } ++ ++ return d_cnt; ++} ++ ++void init_hdlc_state(struct hdlc_state *stateptr, int mode) ++{ ++ stateptr->state = HDLC_ZERO_SEARCH; ++ stateptr->r_one = 0; ++ stateptr->r_val = 0; ++ stateptr->o_bitcnt = 0; ++ stateptr->i_bitcnt = 0; ++ stateptr->insane_mode = mode; ++} ++ ++/* Optimization suggestion: A similar state machine could surely ++ * be developed for this function as well. ++ */ ++ ++int read_raw_hdlc_data(struct hdlc_state *saved_state, ++ u_char *src, u_int slen, u_char *dst, u_int dsize) ++{ ++ int retval=0; ++ register u_char val; ++ register u_char state = saved_state->state; ++ register u_char r_one = saved_state->r_one; ++ register u_char r_val = saved_state->r_val; ++ register u_int o_bitcnt = saved_state->o_bitcnt; ++ register u_int i_bitcnt = saved_state->i_bitcnt; ++ register u_int fcs = saved_state->fcs; ++ register u_int *isrc = (u_int *) src; ++ ++ /* Use i_bitcnt (bit offset into source buffer) to reload "val" ++ * in case we're starting up again partway through a source buffer ++ */ ++ ++ if ((i_bitcnt >> 3) < slen) { ++ if (saved_state->insane_mode==1) { ++ val = isrc[(i_bitcnt >> 3)] & 0xff; ++ } else if (saved_state->insane_mode==2) { ++ val = (isrc[i_bitcnt >> 3] >>8) & 0xff; ++ } else { ++ val = src[i_bitcnt >> 3]; ++ } ++ val >>= i_bitcnt & 7; ++ } ++ ++ /* One bit per loop. Keep going until we've got something to ++ * report (retval != 0), or we exhaust the source buffer ++ */ ++ ++ while ((retval == 0) && ((i_bitcnt >> 3) < slen)) { ++ if ((i_bitcnt & 7) == 0) { ++ if (saved_state->insane_mode==1) { ++ val = isrc[(i_bitcnt >> 3)] & 0xff; ++ } else if (saved_state->insane_mode==2) { ++ val = (isrc[i_bitcnt >> 3] >>8) & 0xff; ++ } else { ++ val = src[i_bitcnt >> 3]; ++ } ++#ifdef DEBUGME ++ printf("Input byte %d: 0x%2x\n", i_bitcnt>>3, val); ++#endif ++ if (val == 0xff) { ++ state = HDLC_ZERO_SEARCH; ++ o_bitcnt = 0; ++ r_one = 0; ++ i_bitcnt += 8; ++ continue; ++ } ++ } ++ ++#ifdef DEBUGME ++ /* printf("Data bit=%d (%d/%d)\n", val&1, i_bitcnt>>3, i_bitcnt&7);*/ ++#endif ++ ++ if (state == HDLC_ZERO_SEARCH) { ++ if (val & 1) { ++ r_one++; ++ } else { ++ r_one=0; ++ state= HDLC_FLAG_SEARCH; ++ } ++ } else if (state == HDLC_FLAG_SEARCH) { ++ if (val & 1) { ++ r_one++; ++ if (r_one>6) { ++ state=HDLC_ZERO_SEARCH; ++ } ++ } else { ++ if (r_one==6) { ++ o_bitcnt=0; ++ r_val=0; ++ state=HDLC_FLAG_FOUND; ++ } ++ r_one=0; ++ } ++ } else if (state == HDLC_FLAG_FOUND) { ++ if (val & 1) { ++ r_one++; ++ if (r_one>6) { ++ state=HDLC_ZERO_SEARCH; ++ } else { ++ r_val >>= 1; ++ r_val |= 0x80; ++ o_bitcnt++; ++ } ++ } else { ++ if (r_one==6) { ++ o_bitcnt=0; ++ r_val=0; ++ r_one=0; ++ i_bitcnt++; ++ val >>= 1; ++ continue; ++ } else if (r_one!=5) { ++ r_val >>= 1; ++ r_val &= 0x7f; ++ o_bitcnt++; ++ } ++ r_one=0; ++ } ++ if ((state != HDLC_ZERO_SEARCH) && ++ !(o_bitcnt & 7)) { ++#ifdef DEBUGME ++ printf("HDLC_FRAME_FOUND at i_bitcnt:%d\n",i_bitcnt); ++#endif ++ state=HDLC_FRAME_FOUND; ++ fcs = PPP_INITFCS; ++ dst[0] = r_val; ++ fcs = PPP_FCS (fcs, r_val); ++ } ++ } else if (state == HDLC_FRAME_FOUND) { ++ if (val & 1) { ++ r_one++; ++ if (r_one>6) { ++ state=HDLC_ZERO_SEARCH; ++ o_bitcnt=0; ++ } else { ++ r_val >>= 1; ++ r_val |= 0x80; ++ o_bitcnt++; ++ } ++ } else { ++ if (r_one==6) { ++ r_val=0; ++ r_one=0; ++ o_bitcnt++; ++ if (o_bitcnt & 7) { ++ /* Alignment error */ ++#ifdef DEBUGME ++ printf("Alignment error\n"); ++#endif ++ state=HDLC_FLAG_SEARCH; ++ retval = -1; ++ } else if (fcs==PPP_GOODFCS) { ++ /* Valid frame */ ++ state=HDLC_FLAG_FOUND; ++ retval = (o_bitcnt>>3)-3; ++ } else { ++ /* CRC error */ ++#ifdef DEBUGME ++ printf("CRC error; fcs was 0x%x, should have been 0x%x\n", fcs, PPP_GOODFCS); ++#endif ++ state=HDLC_FLAG_FOUND; ++ retval = -1; ++ } ++ } else if (r_one==5) { ++ r_one=0; ++ i_bitcnt++; ++ val >>= 1; ++ continue; ++ } else { ++ r_val >>= 1; ++ r_val &= 0x7f; ++ o_bitcnt++; ++ } ++ r_one=0; ++ } ++ if ((state == HDLC_FRAME_FOUND) && ++ !(o_bitcnt & 7)) { ++ if ((o_bitcnt>>3)>=dsize) { ++ /* Buffer overflow error */ ++#ifdef DEBUGME ++ printf("Buffer overflow error\n"); ++#endif ++ r_val=0; ++ state=HDLC_FLAG_SEARCH; ++ retval = -1; ++ } else { ++ dst[(o_bitcnt>>3)-1] = r_val; ++ fcs = PPP_FCS (fcs, r_val); ++#ifdef DEBUGME ++ printf("Output byte %d: 0x%02x; FCS 0x%04x\n", (o_bitcnt>>3)-1, r_val, fcs); ++#endif ++ } ++ } ++ } ++ i_bitcnt ++; ++ val >>= 1; ++ } ++ ++ /* We exhausted the source buffer before anything else happened ++ * (retval==0). Reset i_bitcnt in expectation of a new source ++ * buffer. Other, we either had an error or a valid frame, so ++ * reset o_bitcnt in expectation of a new destination buffer. ++ */ ++ ++ if (retval == 0) { ++ i_bitcnt = 0; ++ } else { ++ o_bitcnt = 0; ++ } ++ ++ saved_state->state = state; ++ saved_state->r_one = r_one; ++ saved_state->r_val = r_val; ++ saved_state->fcs = fcs; ++ saved_state->o_bitcnt = o_bitcnt; ++ saved_state->i_bitcnt = i_bitcnt; ++ ++ return (retval); ++} ++ ++ ++ ++#ifdef DEBUGME ++ ++char buffer[1024]; ++char obuffer[1024]; ++ ++main() ++{ ++ int buflen=0; ++ int len; ++ struct hdlc_state hdlc_state; ++ ++ while((buffer[buflen] = getc(stdin)) != EOF && buflen<1024) buflen++; ++ ++ printf("buflen = %d\n", buflen); ++ ++ init_hdlc_state(&hdlc_state, 0); ++ ++ while (len = read_raw_hdlc_data(&hdlc_state,buffer,buflen,obuffer,1024)) { ++ if (len == -1) printf("Error @ byte %d/bit %d\n", ++ hdlc_state.i_bitcnt>>3, hdlc_state.i_bitcnt & 7); ++ else { ++ printf("Frame received: len %d\n", len); ++ } ++ } ++ ++ printf("Done\n"); ++} ++ ++#endif +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/rawhdlc.h linux-2.4.29/drivers/isdn/hisax/rawhdlc.h +--- linux-2.4.29.old/drivers/isdn/hisax/rawhdlc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/rawhdlc.h 2005-03-22 15:06:48.076784000 +0100 +@@ -0,0 +1,28 @@ ++/* $Id: rawhdlc.h,v 1.5 2001/09/24 13:22:57 kai Exp $ ++ * ++ * Author Brent Baccala ++ * Copyright by Brent Baccala <baccala@FreeSoft.org> ++ * ++ * This software may be used and distributed according to the terms ++ * of the GNU General Public License, incorporated herein by reference. ++ * ++ */ ++ ++#ifndef RAWHDLC_H ++struct hdlc_state { ++ char insane_mode; ++ u_char state; ++ u_char r_one; ++ u_char r_val; ++ u_int o_bitcnt; ++ u_int i_bitcnt; ++ u_int fcs; ++}; ++ ++ ++int make_raw_hdlc_data(u_char *src, u_int slen, u_char *dst, u_int dsize); ++void init_hdlc_state(struct hdlc_state *stateptr, int mode); ++int read_raw_hdlc_data(struct hdlc_state *saved_state, ++ u_char *src, u_int slen, u_char *dst, u_int dsize); ++#define RAWHDLC_H ++#endif +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/s0box.c linux-2.4.29/drivers/isdn/hisax/s0box.c +--- linux-2.4.29.old/drivers/isdn/hisax/s0box.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/s0box.c 2005-03-22 15:06:48.092781568 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: s0box.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: s0box.c,v 2.6 2001/09/24 13:22:57 kai Exp $ + * + * low level stuff for Creatix S0BOX + * +@@ -18,7 +18,7 @@ + #include "isdnl1.h" + + extern const char *CardType[]; +-const char *s0box_revision = "$Revision: 1.1.4.1 $"; ++const char *s0box_revision = "$Revision: 2.6 $"; + + static inline void + writereg(unsigned int padr, signed int addr, u_char off, u_char val) { +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/saphir.c linux-2.4.29/drivers/isdn/hisax/saphir.c +--- linux-2.4.29.old/drivers/isdn/hisax/saphir.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/saphir.c 2005-03-22 15:06:48.107779288 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: saphir.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: saphir.c,v 1.10 2001/09/24 13:22:57 kai Exp $ + * + * low level stuff for HST Saphir 1 + * +@@ -20,7 +20,7 @@ + #include "isdnl1.h" + + extern const char *CardType[]; +-static char *saphir_rev = "$Revision: 1.1.4.1 $"; ++static char *saphir_rev = "$Revision: 1.10 $"; + + #define byteout(addr,val) outb(val,addr) + #define bytein(addr) inb(addr) +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/sedlbauer.c linux-2.4.29/drivers/isdn/hisax/sedlbauer.c +--- linux-2.4.29.old/drivers/isdn/hisax/sedlbauer.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/sedlbauer.c 2005-03-22 15:06:48.123776856 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: sedlbauer.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: sedlbauer.c,v 1.34 2002/02/09 21:00:57 keil Exp $ + * + * low level stuff for Sedlbauer cards + * includes support for the Sedlbauer speed star (speed star II), +@@ -48,18 +48,19 @@ + #include "isar.h" + #include "isdnl1.h" + #include <linux/pci.h> +-#include <linux/isapnp.h> ++#include <linux/isdn_compat.h> + + extern const char *CardType[]; + +-const char *Sedlbauer_revision = "$Revision: 1.1.4.1 $"; ++const char *Sedlbauer_revision = "$Revision: 1.34 $"; + + const char *Sedlbauer_Types[] = + {"None", "speed card/win", "speed star", "speed fax+", + "speed win II / ISDN PC/104", "speed star II", "speed pci", +- "speed fax+ pyramid", "speed fax+ pci"}; ++ "speed fax+ pyramid", "speed fax+ pci", "HST Saphir III"}; + + #define PCI_SUBVENDOR_SPEEDFAX_PYRAMID 0x51 ++#define PCI_SUBVENDOR_HST_SAPHIR3 0x52 + #define PCI_SUBVENDOR_SEDLBAUER_PCI 0x53 + #define PCI_SUBVENDOR_SPEEDFAX_PCI 0x54 + #define PCI_SUB_ID_SEDLBAUER 0x01 +@@ -72,6 +73,7 @@ + #define SEDL_SPEED_PCI 6 + #define SEDL_SPEEDFAX_PYRAMID 7 + #define SEDL_SPEEDFAX_PCI 8 ++#define HST_SAPHIR3 9 + + #define SEDL_CHIP_TEST 0 + #define SEDL_CHIP_ISAC_HSCX 1 +@@ -531,21 +533,6 @@ + + static struct pci_dev *dev_sedl __devinitdata = NULL; + +-#ifdef __ISAPNP__ +-static struct isapnp_device_id sedl_ids[] __initdata = { +- { ISAPNP_VENDOR('S', 'A', 'G'), ISAPNP_FUNCTION(0x01), +- ISAPNP_VENDOR('S', 'A', 'G'), ISAPNP_FUNCTION(0x01), +- (unsigned long) "Speed win" }, +- { ISAPNP_VENDOR('S', 'A', 'G'), ISAPNP_FUNCTION(0x02), +- ISAPNP_VENDOR('S', 'A', 'G'), ISAPNP_FUNCTION(0x02), +- (unsigned long) "Speed Fax+" }, +- { 0, } +-}; +- +-static struct isapnp_device_id *pdev = &sedl_ids[0]; +-static struct pci_bus *pnp_c __devinitdata = NULL; +-#endif +- + int __devinit + setup_sedlbauer(struct IsdnCard *card) + { +@@ -581,57 +568,6 @@ + bytecnt = 16; + } + } else { +-#ifdef __ISAPNP__ +- if (isapnp_present()) { +- struct pci_bus *pb; +- struct pci_dev *pd; +- +- while(pdev->card_vendor) { +- if ((pb = isapnp_find_card(pdev->card_vendor, +- pdev->card_device, pnp_c))) { +- pnp_c = pb; +- pd = NULL; +- if ((pd = isapnp_find_dev(pnp_c, +- pdev->vendor, pdev->function, pd))) { +- printk(KERN_INFO "HiSax: %s detected\n", +- (char *)pdev->driver_data); +- pd->prepare(pd); +- pd->deactivate(pd); +- pd->activate(pd); +- card->para[1] = +- pd->resource[0].start; +- card->para[0] = +- pd->irq_resource[0].start; +- if (!card->para[0] || !card->para[1]) { +- printk(KERN_ERR "Sedlbauer PnP:some resources are missing %ld/%lx\n", +- card->para[0], card->para[1]); +- pd->deactivate(pd); +- return(0); +- } +- cs->hw.sedl.cfg_reg = card->para[1]; +- cs->irq = card->para[0]; +- if (pdev->function == ISAPNP_FUNCTION(0x2)) { +- cs->subtyp = SEDL_SPEED_FAX; +- cs->hw.sedl.chip = SEDL_CHIP_ISAC_ISAR; +- bytecnt = 16; +- } else { +- cs->subtyp = SEDL_SPEED_CARD_WIN; +- cs->hw.sedl.chip = SEDL_CHIP_TEST; +- } +- goto ready; +- } else { +- printk(KERN_ERR "Sedlbauer PnP: PnP error card found, no device\n"); +- return(0); +- } +- } +- pdev++; +- pnp_c=NULL; +- } +- if (!pdev->card_vendor) { +- printk(KERN_INFO "Sedlbauer PnP: no ISAPnP card found\n"); +- } +- } +-#endif + /* Probe for Sedlbauer speed pci */ + #if CONFIG_PCI + if (!pci_present()) { +@@ -647,15 +583,15 @@ + printk(KERN_WARNING "Sedlbauer: No IRQ for PCI card found\n"); + return(0); + } +- cs->hw.sedl.cfg_reg = pci_resource_start(dev_sedl, 0); ++ cs->hw.sedl.cfg_reg = pci_resource_start_io(dev_sedl, 0); + } else { + printk(KERN_WARNING "Sedlbauer: No PCI card found\n"); + return(0); + } + cs->irq_flags |= SA_SHIRQ; + cs->hw.sedl.bus = SEDL_BUS_PCI; +- sub_vendor_id = dev_sedl->subsystem_vendor; +- sub_id = dev_sedl->subsystem_device; ++ pci_get_sub_vendor(dev_sedl,sub_vendor_id); ++ pci_get_sub_system(dev_sedl,sub_id); + printk(KERN_INFO "Sedlbauer: PCI subvendor:%x subid %x\n", + sub_vendor_id, sub_id); + printk(KERN_INFO "Sedlbauer: PCI base adr %#x\n", +@@ -670,6 +606,9 @@ + } else if (sub_vendor_id == PCI_SUBVENDOR_SPEEDFAX_PCI) { + cs->hw.sedl.chip = SEDL_CHIP_ISAC_ISAR; + cs->subtyp = SEDL_SPEEDFAX_PCI; ++ } else if (sub_vendor_id == PCI_SUBVENDOR_HST_SAPHIR3) { ++ cs->hw.sedl.chip = SEDL_CHIP_IPAC; ++ cs->subtyp = HST_SAPHIR3; + } else if (sub_vendor_id == PCI_SUBVENDOR_SEDLBAUER_PCI) { + cs->hw.sedl.chip = SEDL_CHIP_IPAC; + cs->subtyp = SEDL_SPEED_PCI; +@@ -683,8 +622,8 @@ + cs->hw.sedl.reset_off = SEDL_ISAR_PCI_ISAR_RESET_OFF; + byteout(cs->hw.sedl.cfg_reg, 0xff); + byteout(cs->hw.sedl.cfg_reg, 0x00); +- byteout(cs->hw.sedl.cfg_reg+ 2, 0xdd); +- byteout(cs->hw.sedl.cfg_reg+ 5, 0x02); ++ byteout(cs->hw.sedl.cfg_reg +2, 0xdd); ++ byteout(cs->hw.sedl.cfg_reg +5, 0x02); + byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_on); + save_flags(flags); + sti(); +@@ -697,7 +636,7 @@ + return (0); + #endif /* CONFIG_PCI */ + } +-ready: ++ + /* In case of the sedlbauer pcmcia card, this region is in use, + * reserved for us by the card manager. So we do not check it + * here, it would fail. +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/sportster.c linux-2.4.29/drivers/isdn/hisax/sportster.c +--- linux-2.4.29.old/drivers/isdn/hisax/sportster.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/sportster.c 2005-03-22 15:06:48.169769864 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: sportster.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: sportster.c,v 1.16 2001/09/24 13:22:57 kai Exp $ + * + * low level stuff for USR Sportster internal TA + * +@@ -20,7 +20,7 @@ + #include "isdnl1.h" + + extern const char *CardType[]; +-const char *sportster_revision = "$Revision: 1.1.4.1 $"; ++const char *sportster_revision = "$Revision: 1.16 $"; + + #define byteout(addr,val) outb(val,addr) + #define bytein(addr) inb(addr) +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481-debug.h linux-2.4.29/drivers/isdn/hisax/st5481-debug.h +--- linux-2.4.29.old/drivers/isdn/hisax/st5481-debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/st5481-debug.h 2005-03-22 15:06:48.184767584 +0100 +@@ -0,0 +1,103 @@ ++#define ST5481_DEBUG 0x0 ++ ++#if ST5481_DEBUG ++ ++ ++/* ++ DEBUG flags. Set compile option ST5481_DEBUG with the following bits set to trace ++ the given subsections: ++ ++ 0x01: USB ++ 0x02: D ++ 0x04: B ++ 0x08: PH ++ 0x10: PACKET_DUMP D out ++ 0x20: ISO_DUMP D out ++ 0x40: PACKET_DUMP D in ++ 0x80: ISO_DUMP in ++ 0x100: PACKET_DUMP B out ++ 0x200: ISO_DUMP B out ++ 0x400: PACKET_DUMP B in ++*/ ++ ++#define DBG(level, format, arg...) \ ++if (level & ST5481_DEBUG) \ ++printk(KERN_DEBUG __FUNCTION__ ": " format "\n" , ## arg) \ ++ ++static inline void ++dump_packet(const char *name,const u_char *data,int pkt_len) ++{ ++#define DUMP_HDR_SIZE 200 ++#define DUMP_TLR_SIZE 8 ++ if (pkt_len) { ++ int i,len1,len2; ++ ++ printk(KERN_DEBUG "%s: length=%d,data=",name,pkt_len); ++ ++ if (pkt_len > DUMP_HDR_SIZE+ DUMP_TLR_SIZE) { ++ len1 = DUMP_HDR_SIZE; ++ len2 = DUMP_TLR_SIZE; ++ } else { ++ len1 = pkt_len > DUMP_HDR_SIZE ? DUMP_HDR_SIZE : pkt_len; ++ len2 = 0; ++ } ++ for (i = 0; i < len1; ++i) { ++ printk ("%.2x", data[i]); ++ } ++ if (len2) { ++ printk (".."); ++ for (i = pkt_len-DUMP_TLR_SIZE; i < pkt_len; ++i) { ++ printk ("%.2x", data[i]); ++ } ++ } ++ printk ("\n"); ++ } ++#undef DUMP_HDR_SIZE ++#undef DUMP_TLR_SIZE ++} ++ ++static inline void ++dump_iso_packet(const char *name,urb_t *urb) ++{ ++ int i,j; ++ int len,ofs; ++ u_char *data; ++ ++ printk(KERN_DEBUG "%s: packets=%d,errors=%d\n", ++ name,urb->number_of_packets,urb->error_count); ++ for (i = 0; i < urb->number_of_packets; ++i) { ++ if (urb->pipe & USB_DIR_IN) { ++ len = urb->iso_frame_desc[i].actual_length; ++ } else { ++ len = urb->iso_frame_desc[i].length; ++ } ++ ofs = urb->iso_frame_desc[i].offset; ++ printk(KERN_DEBUG "len=%.2d,ofs=%.3d ",len,ofs); ++ if (len) { ++ data = urb->transfer_buffer+ofs; ++ for (j=0; j < len; j++) { ++ printk ("%.2x", data[j]); ++ } ++ } ++ printk("\n"); ++ } ++} ++ ++#define DUMP_PACKET(level,data,count) \ ++ if (level & ST5481_DEBUG) dump_packet(__FUNCTION__,data,count) ++#define DUMP_SKB(level,skb) \ ++ if ((level & ST5481_DEBUG) && skb) dump_packet(__FUNCTION__,skb->data,skb->len) ++#define DUMP_ISO_PACKET(level,urb) \ ++ if (level & ST5481_DEBUG) dump_iso_packet(__FUNCTION__,urb) ++ ++#else ++ ++#define DBG(level,format, arg...) do {} while (0) ++#define DUMP_PACKET(level,data,count) do {} while (0) ++#define DUMP_SKB(level,skb) do {} while (0) ++#define DUMP_ISO_PACKET(level,urb) do {} while (0) ++ ++#endif ++ ++ ++ +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481.h linux-2.4.29/drivers/isdn/hisax/st5481.h +--- linux-2.4.29.old/drivers/isdn/hisax/st5481.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/st5481.h 2005-03-22 15:06:48.201765000 +0100 +@@ -219,15 +219,15 @@ + #define L1_EVENT_COUNT (EV_TIMER3 + 1) + + #define ERR(format, arg...) \ +-printk(KERN_ERR "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) ++printk(KERN_ERR __FILE__ ": " __FUNCTION__ ": " format "\n" , ## arg) + + #define WARN(format, arg...) \ +-printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) ++printk(KERN_WARNING __FILE__ ": " __FUNCTION__ ": " format "\n" , ## arg) + + #define INFO(format, arg...) \ +-printk(KERN_INFO "%s:%s: " format "\n" , __FILE__, __FUNCTION__ , ## arg) ++printk(KERN_INFO __FILE__ ": " __FUNCTION__ ": " format "\n" , ## arg) + +-#include "isdnhdlc.h" ++#include "st5481_hdlc.h" + #include "fsm.h" + #include "hisax_if.h" + #include <linux/skbuff.h> +@@ -236,7 +236,7 @@ + * FIFO handling + */ + +-/* Generic FIFO structure */ ++/* Generic FIFO structure */ + struct fifo { + u_char r,w,count,size; + spinlock_t lock; +@@ -270,7 +270,7 @@ + index = -1; + } else { + // Return index where to get the next data to add to the FIFO +- index = fifo->w++ & (fifo->size-1); ++ index = fifo->w++ & (fifo->size-1); + fifo->count++; + } + spin_unlock_irqrestore(&fifo->lock, flags); +@@ -289,13 +289,13 @@ + return -1; + } + +- spin_lock_irqsave(&fifo->lock, flags); ++ spin_lock_irqsave(&fifo->lock, flags); + if (!fifo->count) { + // FIFO empty + index = -1; + } else { + // Return index where to get the next data from the FIFO +- index = fifo->r++ & (fifo->size-1); ++ index = fifo->r++ & (fifo->size-1); + fifo->count--; + } + spin_unlock_irqrestore(&fifo->lock, flags); +@@ -309,7 +309,7 @@ + typedef void (*ctrl_complete_t)(void *); + + typedef struct ctrl_msg { +- struct usb_ctrlrequest dr; ++ devrequest dr; + ctrl_complete_t complete; + void *context; + } ctrl_msg; +@@ -336,7 +336,7 @@ + }; + + struct st5481_d_out { +- struct isdnhdlc_vars hdlc_state; ++ struct hdlc_vars hdlc_state; + struct urb *urb[2]; /* double buffering */ + unsigned long busy; + struct sk_buff *tx_skb; +@@ -344,7 +344,7 @@ + }; + + struct st5481_b_out { +- struct isdnhdlc_vars hdlc_state; ++ struct hdlc_vars hdlc_state; + struct urb *urb[2]; /* double buffering */ + u_char flow_event; + u_long busy; +@@ -352,7 +352,7 @@ + }; + + struct st5481_in { +- struct isdnhdlc_vars hdlc_state; ++ struct hdlc_vars hdlc_state; + struct urb *urb[2]; /* double buffering */ + int mode; + int bufsize; +@@ -478,7 +478,7 @@ + if (level & __debug_variable) dump_iso_packet(__FUNCTION__,urb) + + static void __attribute__((unused)) +-dump_iso_packet(const char *name,struct urb *urb) ++dump_iso_packet(const char *name,urb_t *urb) + { + int i,j; + int len,ofs; +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_b.c linux-2.4.29/drivers/isdn/hisax/st5481_b.c +--- linux-2.4.29.old/drivers/isdn/hisax/st5481_b.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/st5481_b.c 2005-03-22 15:06:48.216762720 +0100 +@@ -67,28 +67,24 @@ + bytes_sent = buf_size - len; + if (skb->len < bytes_sent) + bytes_sent = skb->len; +- { /* swap tx bytes to get hearable audio data */ +- register unsigned char *src = skb->data; +- register unsigned char *dest = urb->transfer_buffer+len; +- register unsigned int count; +- for (count = 0; count < bytes_sent; count++) +- *dest++ = isdnhdlc_bit_rev_tab[*src++]; +- } ++ ++ memcpy(urb->transfer_buffer+len, skb->data, bytes_sent); ++ + len += bytes_sent; + } else { +- len += isdnhdlc_encode(&b_out->hdlc_state, +- skb->data, skb->len, &bytes_sent, +- urb->transfer_buffer+len, buf_size-len); ++ len += hdlc_encode(&b_out->hdlc_state, ++ skb->data, skb->len, &bytes_sent, ++ urb->transfer_buffer+len, buf_size-len); + } + + skb_pull(skb, bytes_sent); +- ++ + if (!skb->len) { + // Frame sent + b_out->tx_skb = NULL; + B_L1L2(bcs, PH_DATA | CONFIRM, (void *) skb->truesize); + dev_kfree_skb_any(skb); +- ++ + /* if (!(bcs->tx_skb = skb_dequeue(&bcs->sq))) { */ + /* st5481B_sched_event(bcs, B_XMTBUFREADY); */ + /* } */ +@@ -99,9 +95,9 @@ + len = buf_size; + } else { + // Send flags +- len += isdnhdlc_encode(&b_out->hdlc_state, +- NULL, 0, &bytes_sent, +- urb->transfer_buffer+len, buf_size-len); ++ len += hdlc_encode(&b_out->hdlc_state, ++ NULL, 0, &bytes_sent, ++ urb->transfer_buffer+len, buf_size-len); + } + } + } +@@ -213,7 +209,7 @@ + if (bcs->mode != L1_MODE_NULL) { + // Open the B channel + if (bcs->mode != L1_MODE_TRANS) { +- isdnhdlc_out_init(&b_out->hdlc_state, 0, bcs->mode == L1_MODE_HDLC_56K); ++ hdlc_out_init(&b_out->hdlc_state, 0, bcs->mode == L1_MODE_HDLC_56K); + } + st5481_usb_pipe_reset(adapter, (bcs->channel+1)*2, NULL, NULL); + +@@ -279,7 +275,7 @@ + usb_b_out_complete, bcs); + } + +-static void st5481_release_b_out(struct st5481_bcs *bcs) ++static void __devexit st5481_release_b_out(struct st5481_bcs *bcs) + { + struct st5481_b_out *b_out = &bcs->b_out; + +@@ -320,7 +316,7 @@ + /* + * Release buffers and URBs for the B channels + */ +-void st5481_release_b(struct st5481_bcs *bcs) ++void __devexit st5481_release_b(struct st5481_bcs *bcs) + { + DBG(4,""); + +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_d.c linux-2.4.29/drivers/isdn/hisax/st5481_d.c +--- linux-2.4.29.old/drivers/isdn/hisax/st5481_d.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/st5481_d.c 2005-03-22 15:06:48.231760440 +0100 +@@ -162,8 +162,8 @@ + {ST_L1_F8, EV_TIMER3, l1_timer3}, + {ST_L1_F8, EV_IND_DP, l1_go_f3}, + {ST_L1_F8, EV_IND_AP, l1_go_f6}, +- {ST_L1_F8, EV_IND_AI8, l1_go_f7}, +- {ST_L1_F8, EV_IND_AI10, l1_go_f7}, ++ {ST_L1_F8, EV_IND_AI8, l1_go_f8}, ++ {ST_L1_F8, EV_IND_AI10, l1_go_f8}, + {ST_L1_F8, EV_IND_RSY, l1_ignore}, + }; + +@@ -297,7 +297,7 @@ + unsigned int num_packets, packet_offset; + int len, buf_size, bytes_sent; + struct sk_buff *skb; +- struct iso_packet_descriptor *desc; ++ iso_packet_descriptor_t *desc; + + if (d_out->fsm.state != ST_DOUT_NORMAL) + return; +@@ -313,15 +313,15 @@ + buf_size = NUM_ISO_PACKETS_D * SIZE_ISO_PACKETS_D_OUT; + + if (skb) { +- len = isdnhdlc_encode(&d_out->hdlc_state, +- skb->data, skb->len, &bytes_sent, +- urb->transfer_buffer, buf_size); ++ len = hdlc_encode(&d_out->hdlc_state, ++ skb->data, skb->len, &bytes_sent, ++ urb->transfer_buffer, buf_size); + skb_pull(skb,bytes_sent); + } else { + // Send flags or idle +- len = isdnhdlc_encode(&d_out->hdlc_state, +- NULL, 0, &bytes_sent, +- urb->transfer_buffer, buf_size); ++ len = hdlc_encode(&d_out->hdlc_state, ++ NULL, 0, &bytes_sent, ++ urb->transfer_buffer, buf_size); + } + + if (len < buf_size) { +@@ -413,7 +413,7 @@ + + DBG(2,"len=%d",skb->len); + +- isdnhdlc_out_init(&d_out->hdlc_state, 1, 0); ++ hdlc_out_init(&d_out->hdlc_state, 1, 0); + + if (test_and_set_bit(buf_nr, &d_out->busy)) { + WARN("ep %d urb %d busy %#lx", EP_D_OUT, buf_nr, d_out->busy); +@@ -422,9 +422,9 @@ + urb = d_out->urb[buf_nr]; + + DBG_SKB(0x10, skb); +- len = isdnhdlc_encode(&d_out->hdlc_state, +- skb->data, skb->len, &bytes_sent, +- urb->transfer_buffer, 16); ++ len = hdlc_encode(&d_out->hdlc_state, ++ skb->data, skb->len, &bytes_sent, ++ urb->transfer_buffer, 16); + skb_pull(skb, bytes_sent); + + if(len < 16) +@@ -673,7 +673,7 @@ + usb_d_out_complete, adapter); + } + +-static void st5481_release_d_out(struct st5481_adapter *adapter) ++static void __devexit st5481_release_d_out(struct st5481_adapter *adapter) + { + struct st5481_d_out *d_out = &adapter->d_out; + +@@ -723,7 +723,7 @@ + return retval; + } + +-void st5481_release_d(struct st5481_adapter *adapter) ++void __devexit st5481_release_d(struct st5481_adapter *adapter) + { + DBG(2,""); + +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_init.c linux-2.4.29/drivers/isdn/hisax/st5481_init.c +--- linux-2.4.29.old/drivers/isdn/hisax/st5481_init.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/st5481_init.c 2005-03-22 15:06:48.268754816 +0100 +@@ -14,6 +14,7 @@ + * TODO: + * + * b layer1 delay? ++ * hdlc as module + * hotplug / unregister issues + * mod_inc/dec_use_count + * unify parts of d/b channel usb handling +@@ -177,7 +178,7 @@ + static struct usb_driver st5481_usb_driver = { + name: "st5481_usb", + probe: probe_st5481, +- disconnect: __devexit_p(disconnect_st5481), ++ disconnect: disconnect_st5481, + id_table: st5481_ids, + }; + +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/st5481_usb.c linux-2.4.29/drivers/isdn/hisax/st5481_usb.c +--- linux-2.4.29.old/drivers/isdn/hisax/st5481_usb.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/st5481_usb.c 2005-03-22 15:06:48.284752384 +0100 +@@ -41,9 +41,9 @@ + (unsigned char *)&ctrl->msg_fifo.data[r_index]; + + DBG(1,"request=0x%02x,value=0x%04x,index=%x", +- ((struct ctrl_msg *)urb->setup_packet)->dr.bRequest, +- ((struct ctrl_msg *)urb->setup_packet)->dr.wValue, +- ((struct ctrl_msg *)urb->setup_packet)->dr.wIndex); ++ ((struct ctrl_msg *)urb->setup_packet)->dr.request, ++ ((struct ctrl_msg *)urb->setup_packet)->dr.value, ++ ((struct ctrl_msg *)urb->setup_packet)->dr.index); + + // Prepare the URB + urb->dev = adapter->usb_dev; +@@ -69,11 +69,11 @@ + } + ctrl_msg = &ctrl->msg_fifo.data[w_index]; + +- ctrl_msg->dr.bRequestType = requesttype; +- ctrl_msg->dr.bRequest = request; +- ctrl_msg->dr.wValue = cpu_to_le16p(&value); +- ctrl_msg->dr.wIndex = cpu_to_le16p(&index); +- ctrl_msg->dr.wLength = 0; ++ ctrl_msg->dr.requesttype = requesttype; ++ ctrl_msg->dr.request = request; ++ ctrl_msg->dr.value = cpu_to_le16p(&value); ++ ctrl_msg->dr.index = cpu_to_le16p(&index); ++ ctrl_msg->dr.length = 0; + ctrl_msg->complete = complete; + ctrl_msg->context = context; + +@@ -140,17 +140,17 @@ + + ctrl_msg = (struct ctrl_msg *)urb->setup_packet; + +- if (ctrl_msg->dr.bRequest == USB_REQ_CLEAR_FEATURE) { ++ if (ctrl_msg->dr.request == USB_REQ_CLEAR_FEATURE) { + /* Special case handling for pipe reset */ +- le16_to_cpus(&ctrl_msg->dr.wIndex); ++ le16_to_cpus(&ctrl_msg->dr.index); + usb_endpoint_running(adapter->usb_dev, +- ctrl_msg->dr.wIndex & ~USB_DIR_IN, +- (ctrl_msg->dr.wIndex & USB_DIR_IN) == 0); ++ ctrl_msg->dr.index & ~USB_DIR_IN, ++ (ctrl_msg->dr.index & USB_DIR_IN) == 0); + + /* toggle is reset on clear */ + usb_settoggle(adapter->usb_dev, +- ctrl_msg->dr.wIndex & ~USB_DIR_IN, +- (ctrl_msg->dr.wIndex & USB_DIR_IN) == 0, ++ ctrl_msg->dr.index & ~USB_DIR_IN, ++ (ctrl_msg->dr.index & USB_DIR_IN) == 0, + 0); + + +@@ -235,7 +235,7 @@ + struct usb_interface_descriptor *altsetting; + struct usb_endpoint_descriptor *endpoint; + int status; +- struct urb *urb; ++ urb_t *urb; + u_char *buf; + + DBG(1,""); +@@ -307,7 +307,7 @@ + * Release buffers and URBs for the interrupt and control + * endpoint. + */ +-void st5481_release_usb(struct st5481_adapter *adapter) ++void __devexit st5481_release_usb(struct st5481_adapter *adapter) + { + struct st5481_intr *intr = &adapter->intr; + struct st5481_ctrl *ctrl = &adapter->ctrl; +@@ -443,7 +443,7 @@ + return retval; + } + +-void st5481_release_isocpipes(struct urb* urb[2]) ++void __devexit st5481_release_isocpipes(struct urb* urb[2]) + { + int j; + +@@ -484,18 +484,16 @@ + ptr = urb->transfer_buffer; + while (len > 0) { + if (in->mode == L1_MODE_TRANS) { +- /* swap rx bytes to get hearable audio */ +- register unsigned char *dest = in->rcvbuf; ++ memcpy(in->rcvbuf, ptr, len); + status = len; +- for (; len; len--) +- *dest++ = isdnhdlc_bit_rev_tab[*ptr++]; ++ len = 0; + } else { +- status = isdnhdlc_decode(&in->hdlc_state, ptr, len, &count, +- in->rcvbuf, in->bufsize); ++ status = hdlc_decode(&in->hdlc_state, ptr, len, &count, ++ in->rcvbuf, in->bufsize); + ptr += count; + len -= count; + } +- ++ + if (status > 0) { + // Good frame received + DBG(4,"count=%d",status); +@@ -549,7 +547,7 @@ + return retval; + } + +-void st5481_release_in(struct st5481_in *in) ++void __devexit st5481_release_in(struct st5481_in *in) + { + DBG(2,""); + +@@ -562,8 +560,7 @@ + */ + int st5481_isoc_flatten(struct urb *urb) + { +- struct iso_packet_descriptor *pipd; +- struct iso_packet_descriptor *pend; ++ piso_packet_descriptor_t pipd,pend; + unsigned char *src,*dst; + unsigned int len; + +@@ -624,10 +621,15 @@ + + if (in->mode != L1_MODE_NULL) { + if (in->mode != L1_MODE_TRANS) +- isdnhdlc_rcv_init(&in->hdlc_state, +- in->mode == L1_MODE_HDLC_56K); ++ hdlc_rcv_init(&in->hdlc_state, ++ in->mode == L1_MODE_HDLC_56K); + + st5481_usb_pipe_reset(in->adapter, in->ep, NULL, NULL); ++#if 0 ++ st5481_usb_device_ctrl_msg(in->adapter, in->counter, ++ in->packet_size, ++ st5481_start_rcv, in); ++#endif + st5481_usb_device_ctrl_msg(in->adapter, in->counter, + in->packet_size, + NULL, NULL); +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/tei.c linux-2.4.29/drivers/isdn/hisax/tei.c +--- linux-2.4.29.old/drivers/isdn/hisax/tei.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/tei.c 2005-03-22 15:06:48.316747520 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: tei.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: tei.c,v 2.20 2001/09/24 13:22:57 kai Exp $ + * + * Author Karsten Keil + * based on the teles driver from Jan den Ouden +@@ -21,7 +21,7 @@ + #include <linux/init.h> + #include <linux/random.h> + +-const char *tei_revision = "$Revision: 1.1.4.1 $"; ++const char *tei_revision = "$Revision: 2.20 $"; + + #define ID_REQUEST 1 + #define ID_ASSIGNED 2 +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/teleint.c linux-2.4.29/drivers/isdn/hisax/teleint.c +--- linux-2.4.29.old/drivers/isdn/hisax/teleint.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/teleint.c 2005-03-22 15:06:48.330745392 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: teleint.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: teleint.c,v 1.16 2001/09/24 13:22:57 kai Exp $ + * + * low level stuff for TeleInt isdn cards + * +@@ -19,7 +19,7 @@ + + extern const char *CardType[]; + +-const char *TeleInt_revision = "$Revision: 1.1.4.1 $"; ++const char *TeleInt_revision = "$Revision: 1.16 $"; + + #define byteout(addr,val) outb(val,addr) + #define bytein(addr) inb(addr) +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/teles0.c linux-2.4.29/drivers/isdn/hisax/teles0.c +--- linux-2.4.29.old/drivers/isdn/hisax/teles0.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/teles0.c 2005-03-22 15:06:48.348742656 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: teles0.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: teles0.c,v 2.15 2001/09/24 13:22:57 kai Exp $ + * + * low level stuff for Teles Memory IO isdn cards + * +@@ -24,7 +24,7 @@ + + extern const char *CardType[]; + +-const char *teles0_revision = "$Revision: 1.1.4.1 $"; ++const char *teles0_revision = "$Revision: 2.15 $"; + + #define TELES_IOMEM_SIZE 0x400 + #define byteout(addr,val) outb(val,addr) +@@ -189,8 +189,10 @@ + { + if (cs->hw.teles0.cfg_reg) + release_region(cs->hw.teles0.cfg_reg, 8); ++#ifdef COMPAT_HAS_ISA_IOREMAP + iounmap((unsigned char *)cs->hw.teles0.membase); + release_mem_region(cs->hw.teles0.phymem, TELES_IOMEM_SIZE); ++#endif + } + + static int +@@ -327,6 +329,7 @@ + /* 16.0 and 8.0 designed for IOM1 */ + test_and_set_bit(HW_IOM1, &cs->HW_Flags); + cs->hw.teles0.phymem = card->para[1]; ++#ifdef COMPAT_HAS_ISA_IOREMAP + if (check_mem_region(cs->hw.teles0.phymem, TELES_IOMEM_SIZE)) { + printk(KERN_WARNING + "HiSax: %s memory region %lx-%lx already in use\n", +@@ -342,6 +345,9 @@ + } + cs->hw.teles0.membase = + (unsigned long) ioremap(cs->hw.teles0.phymem, TELES_IOMEM_SIZE); ++#else ++ cs->hw.teles0.membase = cs->hw.teles0.phymem; ++#endif + printk(KERN_INFO + "HiSax: %s config irq:%d mem:0x%lX cfg:0x%X\n", + CardType[cs->typ], cs->irq, +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/teles3.c linux-2.4.29/drivers/isdn/hisax/teles3.c +--- linux-2.4.29.old/drivers/isdn/hisax/teles3.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/teles3.c 2005-03-22 15:06:48.367739768 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: teles3.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: teles3.c,v 2.19 2001/09/24 13:22:57 kai Exp $ + * + * low level stuff for Teles 16.3 & PNP isdn cards + * +@@ -15,14 +15,13 @@ + */ + #define __NO_VERSION__ + #include <linux/init.h> +-#include <linux/isapnp.h> + #include "hisax.h" + #include "isac.h" + #include "hscx.h" + #include "isdnl1.h" + + extern const char *CardType[]; +-const char *teles3_revision = "$Revision: 1.1.4.1 $"; ++const char *teles3_revision = "$Revision: 2.19 $"; + + #define byteout(addr,val) outb(val,addr) + #define bytein(addr) inb(addr) +@@ -255,24 +254,6 @@ + return(0); + } + +-#ifdef __ISAPNP__ +-static struct isapnp_device_id teles_ids[] __initdata = { +- { ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2110), +- ISAPNP_VENDOR('T', 'A', 'G'), ISAPNP_FUNCTION(0x2110), +- (unsigned long) "Teles 16.3 PnP" }, +- { ISAPNP_VENDOR('C', 'T', 'X'), ISAPNP_FUNCTION(0x0), +- ISAPNP_VENDOR('C', 'T', 'X'), ISAPNP_FUNCTION(0x0), +- (unsigned long) "Creatix 16.3 PnP" }, +- { ISAPNP_VENDOR('C', 'P', 'Q'), ISAPNP_FUNCTION(0x1002), +- ISAPNP_VENDOR('C', 'P', 'Q'), ISAPNP_FUNCTION(0x1002), +- (unsigned long) "Compaq ISDN S0" }, +- { 0, } +-}; +- +-static struct isapnp_device_id *tdev = &teles_ids[0]; +-static struct pci_bus *pnp_c __devinitdata = NULL; +-#endif +- + int __devinit + setup_teles3(struct IsdnCard *card) + { +@@ -286,47 +267,6 @@ + && (cs->typ != ISDN_CTYPE_TELESPCMCIA) && (cs->typ != ISDN_CTYPE_COMPAQ_ISA)) + return (0); + +-#ifdef __ISAPNP__ +- if (!card->para[1] && isapnp_present()) { +- struct pci_bus *pb; +- struct pci_dev *pd; +- +- while(tdev->card_vendor) { +- if ((pb = isapnp_find_card(tdev->card_vendor, +- tdev->card_device, pnp_c))) { +- pnp_c = pb; +- pd = NULL; +- if ((pd = isapnp_find_dev(pnp_c, +- tdev->vendor, tdev->function, pd))) { +- printk(KERN_INFO "HiSax: %s detected\n", +- (char *)tdev->driver_data); +- pd->prepare(pd); +- pd->deactivate(pd); +- pd->activate(pd); +- card->para[3] = pd->resource[2].start; +- card->para[2] = pd->resource[1].start; +- card->para[1] = pd->resource[0].start; +- card->para[0] = pd->irq_resource[0].start; +- if (!card->para[0] || !card->para[1] || !card->para[2]) { +- printk(KERN_ERR "Teles PnP:some resources are missing %ld/%lx/%lx\n", +- card->para[0], card->para[1], card->para[2]); +- pd->deactivate(pd); +- return(0); +- } +- break; +- } else { +- printk(KERN_ERR "Teles PnP: PnP error card found, no device\n"); +- } +- } +- tdev++; +- pnp_c=NULL; +- } +- if (!tdev->card_vendor) { +- printk(KERN_INFO "Teles PnP: no ISAPnP card found\n"); +- return(0); +- } +- } +-#endif + if (cs->typ == ISDN_CTYPE_16_3) { + cs->hw.teles3.cfg_reg = card->para[1]; + switch (cs->hw.teles3.cfg_reg) { +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/telespci.c linux-2.4.29/drivers/isdn/hisax/telespci.c +--- linux-2.4.29.old/drivers/isdn/hisax/telespci.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/telespci.c 2005-03-22 15:06:48.382737488 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: telespci.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: telespci.c,v 2.23 2001/09/24 13:22:57 kai Exp $ + * + * low level stuff for Teles PCI isdn cards + * +@@ -20,9 +20,10 @@ + #include "hscx.h" + #include "isdnl1.h" + #include <linux/pci.h> ++#include <linux/isdn_compat.h> + + extern const char *CardType[]; +-const char *telespci_revision = "$Revision: 1.1.4.1 $"; ++const char *telespci_revision = "$Revision: 2.23 $"; + + #define ZORAN_PO_RQ_PEN 0x02000000 + #define ZORAN_PO_WR 0x00800000 +@@ -307,10 +308,10 @@ + printk(KERN_WARNING "Teles: No IRQ for PCI card found\n"); + return(0); + } +- cs->hw.teles0.membase = (u_long) ioremap(pci_resource_start(dev_tel, 0), ++ cs->hw.teles0.membase = (u_long) ioremap(pci_resource_start_mem(dev_tel, 0), + PAGE_SIZE); + printk(KERN_INFO "Found: Zoran, base-address: 0x%lx, irq: 0x%x\n", +- pci_resource_start(dev_tel, 0), dev_tel->irq); ++ pci_resource_start_mem(dev_tel, 0), dev_tel->irq); + } else { + printk(KERN_WARNING "TelesPCI: No PCI card found\n"); + return(0); +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/w6692.c linux-2.4.29/drivers/isdn/hisax/w6692.c +--- linux-2.4.29.old/drivers/isdn/hisax/w6692.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/w6692.c 2005-03-22 15:06:48.398735056 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: w6692.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: w6692.c,v 1.18 2001/09/24 13:22:57 kai Exp $ + * + * Winbond W6692 specific routines + * +@@ -18,6 +18,7 @@ + #include "isdnl1.h" + #include <linux/interrupt.h> + #include <linux/pci.h> ++#include <linux/isdn_compat.h> + + /* table entry in the PCI devices list */ + typedef struct { +@@ -29,20 +30,14 @@ + + static const PCI_ENTRY id_list[] = + { +- {PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692, "Winbond", "W6692"}, + {PCI_VENDOR_ID_DYNALINK, PCI_DEVICE_ID_DYNALINK_IS64PH, "Dynalink/AsusCom", "IS64PH"}, +- {0, 0, "U.S.Robotics", "ISDN PCI Card TA"} ++ {PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692, "Winbond", "W6692"}, ++ {0, 0, NULL, NULL} + }; + +-#define W6692_SV_USR 0x16ec +-#define W6692_SD_USR 0x3409 +-#define W6692_WINBOND 0 +-#define W6692_DYNALINK 1 +-#define W6692_USR 2 +- + extern const char *CardType[]; + +-const char *w6692_revision = "$Revision: 1.1.4.1 $"; ++const char *w6692_revision = "$Revision: 1.18 $"; + + #define DBUSY_TIMER_VALUE 80 + +@@ -675,6 +670,16 @@ + static void + DC_Close_W6692(struct IsdnCardState *cs) + { ++#if 0 ++ if (cs->dc.w6692.mon_rx) { ++ kfree(cs->dc.w6692.mon_rx); ++ cs->dc.w6692.mon_rx = NULL; ++ } ++ if (cs->dc.w6692.mon_tx) { ++ kfree(cs->dc.w6692.mon_tx); ++ cs->dc.w6692.mon_tx = NULL; ++ } ++#endif + } + + static void +@@ -865,38 +870,31 @@ + return (0); + } + +-void resetW6692(struct IsdnCardState *cs) +-{ +- cs->writeW6692(cs, W_D_CTL, W_D_CTL_SRST); +- schedule_timeout((10*HZ)/1000); +- cs->writeW6692(cs, W_D_CTL, 0x00); +- schedule_timeout((10*HZ)/1000); +- cs->writeW6692(cs, W_IMASK, 0xff); +- cs->writeW6692(cs, W_D_SAM, 0xff); +- cs->writeW6692(cs, W_D_TAM, 0xff); +- cs->writeW6692(cs, W_D_EXIM, 0x00); +- cs->writeW6692(cs, W_D_MODE, W_D_MODE_RACT); +- cs->writeW6692(cs, W_IMASK, 0x18); +- if (cs->subtyp == W6692_USR) { +- /* seems that USR implemented some power control features +- * Pin 79 is connected to the oscilator circuit so we +- * have to handle it here +- */ +- cs->writeW6692(cs, W_PCTL, 0x80); +- cs->writeW6692(cs, W_XDATA, 0x00); +- } +-} +- + void __init initW6692(struct IsdnCardState *cs, int part) + { + if (part & 1) { + cs->tqueue.routine = (void *) (void *) W6692_bh; + cs->setstack_d = setstack_W6692; + cs->DC_Close = DC_Close_W6692; ++#if 0 ++ cs->dc.w6692.mon_tx = NULL; ++ cs->dc.w6692.mon_rx = NULL; ++#endif + cs->dbusytimer.function = (void *) dbusy_timer_handler; + cs->dbusytimer.data = (long) cs; + init_timer(&cs->dbusytimer); +- resetW6692(cs); ++ ++ cs->writeW6692(cs, W_D_CTL, W_D_CTL_SRST); ++ cs->writeW6692(cs, W_D_CTL, 0x00); ++ cs->writeW6692(cs, W_IMASK, 0xff); ++#if 0 ++ cs->dc.w6692.mocr = 0xaa; ++#endif ++ cs->writeW6692(cs, W_D_SAM, 0xff); ++ cs->writeW6692(cs, W_D_TAM, 0xff); ++ cs->writeW6692(cs, W_D_EXIM, 0x00); ++ cs->writeW6692(cs, W_D_MODE, W_D_MODE_RACT); ++ cs->writeW6692(cs, W_IMASK, 0x18); + ph_command(cs, W_L1CMD_RST); + cs->dc.w6692.ph_state = W_L1CMD_RST; + W6692_new_ph(cs); +@@ -963,14 +961,9 @@ + { + switch (mt) { + case CARD_RESET: +- resetW6692(cs); + return (0); + case CARD_RELEASE: +- cs->writeW6692(cs, W_IMASK, 0xff); + release_region(cs->hw.w6692.iobase, 256); +- if (cs->subtyp == W6692_USR) { +- cs->writeW6692(cs, W_XDATA, 0x04); +- } + return (0); + case CARD_INIT: + initW6692(cs, 3); +@@ -1013,7 +1006,6 @@ + if (dev_w6692) { + if (pci_enable_device(dev_w6692)) + continue; +- cs->subtyp = id_idx; + break; + } + id_idx++; +@@ -1023,14 +1015,7 @@ + pci_irq = dev_w6692->irq; + /* I think address 0 is allways the configuration area */ + /* and address 1 is the real IO space KKe 03.09.99 */ +- pci_ioaddr = pci_resource_start(dev_w6692, 1); +- /* USR ISDN PCI card TA need some special handling */ +- if (cs->subtyp == W6692_WINBOND) { +- if ((W6692_SV_USR == dev_w6692->subsystem_vendor) && +- (W6692_SD_USR == dev_w6692->subsystem_device)) { +- cs->subtyp = W6692_USR; +- } +- } ++ pci_ioaddr = pci_resource_start_io(dev_w6692, 1); + } + if (!found) { + printk(KERN_WARNING "W6692: No PCI card found\n"); +@@ -1047,18 +1032,18 @@ + } + cs->hw.w6692.iobase = pci_ioaddr; + printk(KERN_INFO "Found: %s %s, I/O base: 0x%x, irq: %d\n", +- id_list[cs->subtyp].vendor_name, id_list[cs->subtyp].card_name, +- pci_ioaddr, pci_irq); ++ id_list[id_idx].vendor_name, id_list[id_idx].card_name, ++ pci_ioaddr, dev_w6692->irq); + if (check_region((cs->hw.w6692.iobase), 256)) { + printk(KERN_WARNING + "HiSax: %s I/O ports %x-%x already in use\n", +- id_list[cs->subtyp].card_name, ++ id_list[id_idx].card_name, + cs->hw.w6692.iobase, + cs->hw.w6692.iobase + 255); + return (0); + } else { + request_region(cs->hw.w6692.iobase, 256, +- id_list[cs->subtyp].card_name); ++ id_list[id_idx].card_name); + } + #else + printk(KERN_WARNING "HiSax: W6692 and NO_PCI_BIOS\n"); +@@ -1068,7 +1053,7 @@ + + printk(KERN_INFO + "HiSax: %s config irq:%d I/O:%x\n", +- id_list[cs->subtyp].card_name, cs->irq, ++ id_list[id_idx].card_name, cs->irq, + cs->hw.w6692.iobase); + + cs->readW6692 = &ReadW6692; +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/w6692.h linux-2.4.29/drivers/isdn/hisax/w6692.h +--- linux-2.4.29.old/drivers/isdn/hisax/w6692.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/w6692.h 2005-03-22 15:06:48.414732624 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: w6692.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $ ++/* $Id: w6692.h,v 1.4 2001/09/24 13:22:57 kai Exp $ + * + * Winbond W6692 specific defines + * +diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/boardergo.c linux-2.4.29/drivers/isdn/hysdn/boardergo.c +--- linux-2.4.29.old/drivers/isdn/hysdn/boardergo.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hysdn/boardergo.c 2005-03-22 15:06:48.468724416 +0100 +@@ -1,27 +1,41 @@ +-/* $Id: boardergo.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ +- * ++/* $Id: boardergo.c,v 1.9 2001/07/19 20:39:51 kai Exp $ ++ + * Linux driver for HYSDN cards, specific routines for ergo type boards. + * +- * Author Werner Cornelius (werner@titro.de) for Hypercope GmbH +- * Copyright 1999 by Werner Cornelius (werner@titro.de) +- * +- * This software may be used and distributed according to the terms +- * of the GNU General Public License, incorporated herein by reference. +- * + * As all Linux supported cards Champ2, Ergo and Metro2/4 use the same + * DPRAM interface and layout with only minor differences all related + * stuff is done here, not in separate modules. + * ++ * written by Werner Cornelius (werner@titro.de) for Hypercope GmbH ++ * ++ * Copyright 1999 by Werner Cornelius (werner@titro.de) ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * + */ + ++#define __NO_VERSION__ + #include <linux/config.h> +-#include <linux/sched.h> ++#include <linux/module.h> ++#include <linux/version.h> ++#include <asm/io.h> + #include <linux/signal.h> + #include <linux/kernel.h> + #include <linux/ioport.h> + #include <linux/interrupt.h> + #include <linux/vmalloc.h> +-#include <asm/io.h> + + #include "hysdn_defs.h" + #include "boardergo.h" +@@ -45,11 +59,10 @@ + if (!card->irq_enabled) + return; /* other device interrupting or irq switched off */ + +- save_flags(flags); +- cli(); /* no further irqs allowed */ ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + + if (!(bytein(card->iobase + PCI9050_INTR_REG) & PCI9050_INTR_REG_STAT1)) { +- restore_flags(flags); /* restore old state */ ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + return; /* no interrupt requested by E1 */ + } + /* clear any pending ints on the board */ +@@ -63,7 +76,7 @@ + queue_task(&card->irq_queue, &tq_immediate); + mark_bh(IMMEDIATE_BH); + } +- restore_flags(flags); ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + } /* ergo_interrupt */ + + /******************************************************************************/ +@@ -83,17 +96,15 @@ + return; /* invalid call */ + + dpr = card->dpram; /* point to DPRAM */ ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + +- save_flags(flags); +- cli(); + if (card->hw_lock) { +- restore_flags(flags); /* hardware currently unavailable */ ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + return; + } + card->hw_lock = 1; /* we now lock the hardware */ + + do { +- sti(); /* reenable other ints */ + again = 0; /* assume loop not to be repeated */ + + if (!dpr->ToHyFlag) { +@@ -113,15 +124,13 @@ + again = 1; /* restart loop */ + } + } /* a message has arrived for us */ +- cli(); /* no further ints */ + if (again) { + dpr->ToHyInt = 1; + dpr->ToPcInt = 1; /* interrupt to E1 for all cards */ + } else + card->hw_lock = 0; /* free hardware again */ + } while (again); /* until nothing more to do */ +- +- restore_flags(flags); ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + } /* ergo_irq_bh */ + + +@@ -138,8 +147,7 @@ + #ifdef CONFIG_HYSDN_CAPI + hycapi_capi_stop(card); + #endif /* CONFIG_HYSDN_CAPI */ +- save_flags(flags); +- cli(); ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + val = bytein(card->iobase + PCI9050_INTR_REG); /* get actual value */ + val &= ~(PCI9050_INTR_REG_ENPCI | PCI9050_INTR_REG_EN1); /* mask irq */ + byteout(card->iobase + PCI9050_INTR_REG, val); +@@ -147,8 +155,7 @@ + byteout(card->iobase + PCI9050_USER_IO, PCI9050_E1_RESET); /* reset E1 processor */ + card->state = CARD_STATE_UNUSED; + card->err_log_state = ERRLOG_STATE_OFF; /* currently no log active */ +- +- restore_flags(flags); ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + } /* ergo_stopcard */ + + /**************************************************************************/ +@@ -163,20 +170,17 @@ + card->err_log_state = ERRLOG_STATE_OFF; /* must be off */ + return; + } +- save_flags(flags); +- cli(); +- ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + if (((card->err_log_state == ERRLOG_STATE_OFF) && !on) || + ((card->err_log_state == ERRLOG_STATE_ON) && on)) { +- restore_flags(flags); ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + return; /* nothing to do */ + } + if (on) + card->err_log_state = ERRLOG_STATE_START; /* request start */ + else + card->err_log_state = ERRLOG_STATE_STOP; /* request stop */ +- +- restore_flags(flags); ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + queue_task(&card->irq_queue, &tq_immediate); + mark_bh(IMMEDIATE_BH); + } /* ergo_set_errlog_state */ +@@ -245,9 +249,6 @@ + while (!dpram->ToHyNoDpramErrLog); /* reread volatile register to flush PCI */ + + byteout(card->iobase + PCI9050_USER_IO, PCI9050_E1_RUN); /* start E1 processor */ +- /* the interrupts are still masked */ +- +- sti(); + set_current_state(TASK_INTERRUPTIBLE); + schedule_timeout((20 * HZ) / 1000); /* Timeout 20ms */ + +@@ -282,7 +283,6 @@ + dst = sp->Data; /* point to data in spool structure */ + buflen = sp->Len; /* maximum len of spooled data */ + wr_mirror = sp->WrPtr; /* only once read */ +- sti(); + + /* try until all bytes written or error */ + i = 0x1000; /* timeout value */ +@@ -358,9 +358,7 @@ + + if (card->debug_flags & LOG_POF_RECORD) + hysdn_addlog(card, "ERGO: pof boot success"); +- save_flags(flags); +- cli(); +- ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + card->state = CARD_STATE_RUN; /* now card is running */ + /* enable the cards interrupt */ + byteout(card->iobase + PCI9050_INTR_REG, +@@ -371,8 +369,7 @@ + dpr->ToPcFlag = 0; /* reset data indicator */ + dpr->ToHyInt = 1; + dpr->ToPcInt = 1; /* interrupt to E1 for all cards */ +- +- restore_flags(flags); ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + if ((hynet_enable & (1 << card->myid)) + && (i = hysdn_net_create(card))) + { +@@ -387,7 +384,6 @@ + #endif /* CONFIG_HYSDN_CAPI */ + return (0); /* success */ + } /* data has arrived */ +- sti(); + set_current_state(TASK_INTERRUPTIBLE); + schedule_timeout((50 * HZ) / 1000); /* Timeout 50ms */ + } /* wait until timeout */ +diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/boardergo.h linux-2.4.29/drivers/isdn/hysdn/boardergo.h +--- linux-2.4.29.old/drivers/isdn/hysdn/boardergo.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hysdn/boardergo.h 2005-03-22 15:06:48.485721832 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: boardergo.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Linux driver for HYSDN cards, definitions for ergo type boards (buffers..). + * +@@ -10,6 +10,7 @@ + * + */ + ++#include <linux/isdn_compat.h> + + /************************************************/ + /* defines for the dual port memory of the card */ +diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hycapi.c linux-2.4.29/drivers/isdn/hysdn/hycapi.c +--- linux-2.4.29.old/drivers/isdn/hysdn/hycapi.c 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hysdn/hycapi.c 2005-03-22 15:06:48.500719552 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hycapi.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Linux driver for HYSDN cards, CAPI2.0-Interface. + * +@@ -29,7 +29,7 @@ + #include "hysdn_defs.h" + #include <linux/kernelcapi.h> + +-static char hycapi_revision[]="$Revision: 1.1.4.1 $"; ++static char hycapi_revision[]="$Revision$"; + + unsigned int hycapi_enable = 0xffffffff; + MODULE_PARM(hycapi_enable, "i"); +diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_boot.c linux-2.4.29/drivers/isdn/hysdn/hysdn_boot.c +--- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_boot.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hysdn/hysdn_boot.c 2005-03-22 15:06:48.516717120 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hysdn_boot.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Linux driver for HYSDN cards + * specific routines for booting and pof handling +@@ -143,7 +143,7 @@ + (boot->pof_recid == TAG_CABSDATA) ? "CABSDATA" : "ABSDATA", + datlen, boot->pof_recoffset); + +- if ((boot->last_error = card->writebootseq(card, boot->buf.BootBuf, datlen)) < 0) ++ if ((boot->last_error = card->writebootseq(card, boot->buf.BootBuf, datlen) < 0)) + return (boot->last_error); /* error writing data */ + + if (boot->pof_recoffset + datlen >= boot->pof_reclen) +diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_defs.h linux-2.4.29/drivers/isdn/hysdn/hysdn_defs.h +--- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_defs.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hysdn/hysdn_defs.h 2005-03-22 15:06:48.533714536 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hysdn_defs.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id: hysdn_defs.h,v 1.10 2001/09/24 13:23:03 kai Exp $ + * + * Linux driver for HYSDN cards + * global definitions and exported vars and functions. +@@ -19,6 +19,11 @@ + #include <linux/interrupt.h> + #include <linux/tqueue.h> + #include <linux/skbuff.h> ++#include <linux/isdn_compat.h> ++#include <linux/spinlock.h> ++ ++#define HYSDN_SPIN_LOCK(a,b) spin_lock(a) ++#define HYSDN_SPIN_UNLOCK(a,b) spin_unlock(a) + + /****************************/ + /* storage type definitions */ +@@ -176,6 +181,7 @@ + struct tq_struct irq_queue; /* interrupt task queue */ + uchar volatile irq_enabled; /* interrupt enabled if != 0 */ + uchar volatile hw_lock; /* hardware is currently locked -> no access */ ++ spinlock_t irq_lock; + + /* boot process */ + void *boot; /* pointer to boot private data */ +diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_init.c linux-2.4.29/drivers/isdn/hysdn/hysdn_init.c +--- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_init.c 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hysdn/hysdn_init.c 2005-03-22 15:06:48.551711800 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hysdn_init.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Linux driver for HYSDN cards, init functions. + * +@@ -21,6 +21,7 @@ + + #include "hysdn_defs.h" + ++#ifndef COMPAT_HAS_2_2_PCI + static struct pci_device_id hysdn_pci_tbl[] __initdata = { + {PCI_VENDOR_ID_HYPERCOPE, PCI_DEVICE_ID_HYPERCOPE_PLX, PCI_ANY_ID, PCI_SUBDEVICE_ID_HYPERCOPE_METRO}, + {PCI_VENDOR_ID_HYPERCOPE, PCI_DEVICE_ID_HYPERCOPE_PLX, PCI_ANY_ID, PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2}, +@@ -29,11 +30,12 @@ + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(pci, hysdn_pci_tbl); ++#endif + MODULE_DESCRIPTION("ISDN4Linux: Driver for HYSDN cards"); + MODULE_AUTHOR("Werner Cornelius"); + MODULE_LICENSE("GPL"); + +-static char *hysdn_init_revision = "$Revision: 1.1.4.1 $"; ++static char *hysdn_init_revision = "$Revision$"; + int cardmax; /* number of found cards */ + hysdn_card *card_root = NULL; /* pointer to first card */ + +@@ -91,11 +93,11 @@ + card->myid = cardmax; /* set own id */ + card->bus = akt_pcidev->bus->number; + card->devfn = akt_pcidev->devfn; /* slot + function */ +- card->subsysid = akt_pcidev->subsystem_device; ++ pci_get_sub_system(akt_pcidev,card->subsysid); + card->irq = akt_pcidev->irq; +- card->iobase = pci_resource_start(akt_pcidev, PCI_REG_PLX_IO_BASE); +- card->plxbase = pci_resource_start(akt_pcidev, PCI_REG_PLX_MEM_BASE); +- card->membase = pci_resource_start(akt_pcidev, PCI_REG_MEMORY_BASE); ++ card->iobase = pci_resource_start_io(akt_pcidev, PCI_REG_PLX_IO_BASE); ++ card->plxbase = pci_resource_start_mem(akt_pcidev, PCI_REG_PLX_MEM_BASE); ++ card->membase = pci_resource_start_mem(akt_pcidev, PCI_REG_MEMORY_BASE); + card->brdtype = BD_NONE; /* unknown */ + card->debug_flags = DEF_DEB_FLAGS; /* set default debug */ + card->faxchans = 0; /* default no fax channels */ +diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_net.c linux-2.4.29/drivers/isdn/hysdn/hysdn_net.c +--- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_net.c 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hysdn/hysdn_net.c 2005-03-22 15:06:48.567709368 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hysdn_net.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Linux driver for HYSDN cards, net (ethernet type) handling routines. + * +@@ -29,7 +29,7 @@ + MODULE_PARM(hynet_enable, "i"); + + /* store the actual version for log reporting */ +-char *hysdn_net_revision = "$Revision: 1.1.4.1 $"; ++char *hysdn_net_revision = "$Revision$"; + + #define MAX_SKB_BUFFERS 20 /* number of buffers for keeping TX-data */ + +@@ -45,6 +45,10 @@ + /* additional vars may be added here */ + char dev_name[9]; /* our own device name */ + ++#ifdef COMPAT_NO_SOFTNET ++ struct sk_buff *tx_skb; /* buffer for tx operation */ ++ ++#else + /* Tx control lock. This protects the transmit buffer ring + * state along with the "tx full" state of the driver. This + * means all netif_queue flow control actions are protected +@@ -56,6 +60,7 @@ + int sk_count; /* number of buffers currently in ring */ + + int is_open; /* flag controlling module locking */ ++#endif + }; /* net_local */ + + +@@ -83,11 +88,19 @@ + hysdn_card *card = dev->priv; + int i; + ++#ifdef COMPAT_NO_SOFTNET ++ dev->tbusy = 0; /* non busy state */ ++ dev->interrupt = 0; ++ if (!dev->start) ++ MOD_INC_USE_COUNT; /* increment only if device is down */ ++ dev->start = 1; /* and started */ ++#else + if (!((struct net_local *) dev)->is_open) + MOD_INC_USE_COUNT; /* increment only if interface is actually down */ + ((struct net_local *) dev)->is_open = 1; /* device actually open */ + + netif_start_queue(dev); /* start tx-queueing */ ++#endif + + /* Fill in the MAC-level header (if not already set) */ + if (!card->mac_addr[0]) { +@@ -104,6 +117,7 @@ + return (0); + } /* net_open */ + ++#ifndef COMPAT_NO_SOFTNET + /*******************************************/ + /* flush the currently occupied tx-buffers */ + /* must only be called when device closed */ +@@ -119,6 +133,7 @@ + nl->sk_count--; + } + } /* flush_tx_buffers */ ++#endif + + + /*********************************************************************/ +@@ -129,6 +144,15 @@ + net_close(struct net_device *dev) + { + ++#ifdef COMPAT_NO_SOFTNET ++ dev->tbusy = 1; /* we are busy */ ++ ++ if (dev->start) ++ MOD_DEC_USE_COUNT; /* dec only if device has been active */ ++ ++ dev->start = 0; /* and not started */ ++ ++#else + netif_stop_queue(dev); /* disable queueing */ + + if (((struct net_local *) dev)->is_open) +@@ -136,9 +160,52 @@ + ((struct net_local *) dev)->is_open = 0; + flush_tx_buffers((struct net_local *) dev); + ++#endif + return (0); /* success */ + } /* net_close */ + ++#ifdef COMPAT_NO_SOFTNET ++/************************************/ ++/* send a packet on this interface. */ ++/* only for kernel versions < 2.3.33 */ ++/************************************/ ++static int ++net_send_packet(struct sk_buff *skb, struct net_device *dev) ++{ ++ struct net_local *lp = (struct net_local *) dev; ++ ++ if (dev->tbusy) { ++ /* ++ * If we get here, some higher level has decided we are broken. ++ * There should really be a "kick me" function call instead. ++ * As ISDN may have higher timeouts than real ethernet 10s timeout ++ */ ++ int tickssofar = jiffies - dev->trans_start; ++ if (tickssofar < (10000 * HZ) / 1000) ++ return 1; ++ printk(KERN_WARNING "%s: transmit timed out. \n", dev->name); ++ dev->tbusy = 0; ++ dev->trans_start = jiffies; ++ } ++ /* ++ * Block a timer-based transmit from overlapping. This could better be ++ * done with atomic_swap(1, dev->tbusy), but set_bit() works as well. ++ */ ++ if (test_and_set_bit(0, (void *) &dev->tbusy) != 0) ++ printk(KERN_WARNING "%s: Transmitter access conflict.\n", dev->name); ++ ++ else { ++ lp->stats.tx_bytes += skb->len; ++ dev->trans_start = jiffies; ++ lp->tx_skb = skb; /* remember skb pointer */ ++ queue_task(&((hysdn_card *) dev->priv)->irq_queue, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); ++ } ++ ++ return (0); /* success */ ++} /* net_send_packet */ ++ ++#else + /************************************/ + /* send a packet on this interface. */ + /* new style for kernel >= 2.3.33 */ +@@ -176,6 +243,7 @@ + return (0); /* success */ + } /* net_send_packet */ + ++#endif + + + /***********************************************************************/ +@@ -190,6 +258,15 @@ + if (!lp) + return; /* non existing device */ + ++#ifdef COMPAT_NO_SOFTNET ++ if (lp->tx_skb) ++ dev_kfree_skb(lp->tx_skb); /* free tx pointer */ ++ lp->tx_skb = NULL; /* reset pointer */ ++ ++ lp->stats.tx_packets++; ++ lp->netdev.tbusy = 0; ++ mark_bh(NET_BH); /* Inform upper layers. */ ++#else + + if (!lp->sk_count) + return; /* error condition */ +@@ -203,6 +280,7 @@ + + if (lp->sk_count-- == MAX_SKB_BUFFERS) /* dec usage count */ + netif_start_queue((struct net_device *) lp); ++#endif + } /* hysdn_tx_netack */ + + /*****************************************************/ +@@ -250,10 +328,15 @@ + if (!lp) + return (NULL); /* non existing device */ + ++#ifdef COMPAT_NO_SOFTNET ++ return (lp->tx_skb); /* return packet pointer */ ++ ++#else + if (!lp->sk_count) + return (NULL); /* nothing available */ + + return (lp->skbs[lp->out_idx]); /* next packet to send */ ++#endif + } /* hysdn_tx_netget */ + + +@@ -296,15 +379,21 @@ + } + memset(dev, 0, sizeof(struct net_local)); /* clean the structure */ + ++#ifndef COMPAT_NO_SOFTNET + spin_lock_init(&((struct net_local *) dev)->lock); ++#endif + + /* initialise necessary or informing fields */ + dev->base_addr = card->iobase; /* IO address */ + dev->irq = card->irq; /* irq */ + dev->init = net_init; /* the init function of the device */ ++#ifdef COMPAT_NO_SOFTNET ++ dev->name = ((struct net_local *) dev)->dev_name; /* device name */ ++#else + if(dev->name) { + strcpy(dev->name, ((struct net_local *) dev)->dev_name); + } ++#endif + if ((i = register_netdev(dev))) { + printk(KERN_WARNING "HYSDN: unable to create network device\n"); + kfree(dev); +@@ -333,7 +422,9 @@ + card->netif = NULL; /* clear out pointer */ + dev->stop(dev); /* close the device */ + ++#ifndef COMPAT_NO_SOFTNET + flush_tx_buffers((struct net_local *) dev); /* empty buffers */ ++#endif + + unregister_netdev(dev); /* release the device */ + kfree(dev); /* release the memory allocated */ +diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_pof.h linux-2.4.29/drivers/isdn/hysdn/hysdn_pof.h +--- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_pof.h 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hysdn/hysdn_pof.h 2005-03-22 15:06:48.583706936 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hysdn_pof.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Linux driver for HYSDN cards, definitions used for handling pof-files. + * +diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_procconf.c linux-2.4.29/drivers/isdn/hysdn/hysdn_procconf.c +--- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_procconf.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hysdn/hysdn_procconf.c 2005-03-22 15:06:48.598704656 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hysdn_procconf.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Linux driver for HYSDN cards, /proc/net filesystem dir and conf functions. + * +@@ -17,11 +17,13 @@ + #include <linux/poll.h> + #include <linux/proc_fs.h> + #include <linux/pci.h> ++#ifndef COMPAT_USE_MODCOUNT_LOCK + #include <linux/smp_lock.h> ++#endif + + #include "hysdn_defs.h" + +-static char *hysdn_procconf_revision = "$Revision: 1.1.4.1 $"; ++static char *hysdn_procconf_revision = "$Revision$"; + + #define INFO_OUT_LEN 80 /* length of info line including lf */ + +@@ -212,32 +214,29 @@ + static ssize_t + hysdn_conf_read(struct file *file, char *buf, size_t count, loff_t * off) + { +- loff_t pos = *off; + char *cp; + int i; + + if (off != &file->f_pos) /* fs error check */ + return -ESPIPE; + +- if (!(file->f_mode & FMODE_READ)) +- return -EPERM; +- +- if (!(cp = file->private_data)) +- return (-EFAULT); /* should never happen */ +- +- i = strlen(cp); /* get total string length */ +- +- if (pos != (unsigned)pos || pos >= i) +- return 0; +- +- /* still bytes to transfer */ +- cp += pos; /* point to desired data offset */ +- i -= pos; /* remaining length */ +- if (i > count) +- i = count; /* limit length to transfer */ +- if (copy_to_user(buf, cp, i)) +- return (-EFAULT); /* copy error */ +- *off = pos + i; /* adjust offset */ ++ if (file->f_mode & FMODE_READ) { ++ if (!(cp = file->private_data)) ++ return (-EFAULT); /* should never happen */ ++ i = strlen(cp); /* get total string length */ ++ if (*off < i) { ++ /* still bytes to transfer */ ++ cp += *off; /* point to desired data offset */ ++ i -= *off; /* remaining length */ ++ if (i > count) ++ i = count; /* limit length to transfer */ ++ if (copy_to_user(buf, cp, i)) ++ return (-EFAULT); /* copy error */ ++ *off += i; /* adjust offset */ ++ } else ++ return (0); ++ } else ++ return (-EPERM); /* no permission to read */ + + return (i); + } /* hysdn_conf_read */ +@@ -254,7 +253,11 @@ + char *cp, *tmp; + + /* now search the addressed card */ ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_INC_USE_COUNT; ++#else + lock_kernel(); ++#endif + card = card_root; + while (card) { + pd = card->procconf; +@@ -263,7 +266,11 @@ + card = card->next; /* search next entry */ + } + if (!card) { ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_DEC_USE_COUNT; ++#else + unlock_kernel(); ++#endif + return (-ENODEV); /* device is unknown/invalid */ + } + if (card->debug_flags & (LOG_PROC_OPEN | LOG_PROC_ALL)) +@@ -274,7 +281,11 @@ + /* write only access -> write boot file or conf line */ + + if (!(cnf = kmalloc(sizeof(struct conf_writedata), GFP_KERNEL))) { ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_DEC_USE_COUNT; ++#else + unlock_kernel(); ++#endif + return (-EFAULT); + } + cnf->card = card; +@@ -286,7 +297,11 @@ + /* read access -> output card info data */ + + if (!(tmp = (char *) kmalloc(INFO_OUT_LEN * 2 + 2, GFP_KERNEL))) { ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_DEC_USE_COUNT; ++#else + unlock_kernel(); ++#endif + return (-EFAULT); /* out of memory */ + } + filep->private_data = tmp; /* start of string */ +@@ -320,10 +335,16 @@ + *cp++ = '\n'; + *cp = 0; /* end of string */ + } else { /* simultaneous read/write access forbidden ! */ ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_DEC_USE_COUNT; ++#else + unlock_kernel(); ++#endif + return (-EPERM); /* no permission this time */ + } ++#ifndef COMPAT_USE_MODCOUNT_LOCK + unlock_kernel(); ++#endif + return (0); + } /* hysdn_conf_open */ + +@@ -338,7 +359,9 @@ + int retval = 0; + struct proc_dir_entry *pd; + ++#ifndef COMPAT_USE_MODCOUNT_LOCK + lock_kernel(); ++#endif + /* search the addressed card */ + card = card_root; + while (card) { +@@ -348,7 +371,9 @@ + card = card->next; /* search next entry */ + } + if (!card) { ++#ifndef COMPAT_USE_MODCOUNT_LOCK + unlock_kernel(); ++#endif + return (-ENODEV); /* device is unknown/invalid */ + } + if (card->debug_flags & (LOG_PROC_OPEN | LOG_PROC_ALL)) +@@ -371,7 +396,11 @@ + if (filep->private_data) + kfree(filep->private_data); /* release memory */ + } ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_DEC_USE_COUNT; ++#else + unlock_kernel(); ++#endif + return (retval); + } /* hysdn_conf_close */ + +@@ -387,6 +416,9 @@ + release: hysdn_conf_close, + }; + ++#ifdef COMPAT_NO_SOFTNET ++static struct inode_operations conf_inode_operations; ++#endif + /*****************************/ + /* hysdn subdir in /proc/net */ + /*****************************/ +@@ -415,8 +447,17 @@ + if ((card->procconf = (void *) create_proc_entry(conf_name, + S_IFREG | S_IRUGO | S_IWUSR, + hysdn_proc_entry)) != NULL) { ++#ifdef COMPAT_NO_SOFTNET ++ memset(&conf_inode_operations, 0, sizeof(struct inode_operations)); ++ conf_inode_operations.default_file_ops = &conf_fops; ++ ++ ((struct proc_dir_entry *) card->procconf)->ops = &conf_inode_operations; ++#else + ((struct proc_dir_entry *) card->procconf)->proc_fops = &conf_fops; ++#ifdef COMPAT_HAS_FILEOP_OWNER + ((struct proc_dir_entry *) card->procconf)->owner = THIS_MODULE; ++#endif ++#endif + hysdn_proclog_init(card); /* init the log file entry */ + } + card = card->next; /* next entry */ +diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_proclog.c linux-2.4.29/drivers/isdn/hysdn/hysdn_proclog.c +--- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_proclog.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hysdn/hysdn_proclog.c 2005-03-22 15:06:48.613702376 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hysdn_proclog.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Linux driver for HYSDN cards, /proc/net filesystem log functions. + * +@@ -16,7 +16,9 @@ + #include <linux/poll.h> + #include <linux/proc_fs.h> + #include <linux/pci.h> ++#ifndef COMPAT_USE_MODCOUNT_LOCK + #include <linux/smp_lock.h> ++#endif + + #include "hysdn_defs.h" + +@@ -115,8 +117,7 @@ + strcpy(ib->log_start, cp); /* set output string */ + ib->next = NULL; + ib->proc_ctrl = pd; /* point to own control structure */ +- save_flags(flags); +- cli(); ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + ib->usage_cnt = pd->if_used; + if (!pd->log_head) + pd->log_head = ib; /* new head */ +@@ -124,7 +125,7 @@ + pd->log_tail->next = ib; /* follows existing messages */ + pd->log_tail = ib; /* new tail */ + i = pd->del_lock++; /* get lock state */ +- restore_flags(flags); ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + + /* delete old entrys */ + if (!i) +@@ -210,7 +211,6 @@ + word ino; + struct procdata *pd = NULL; + hysdn_card *card; +- loff_t pos = *off; + + if (!*((struct log_data **) file->private_data)) { + if (file->f_flags & O_NONBLOCK) +@@ -235,11 +235,11 @@ + return (0); + + inf->usage_cnt--; /* new usage count */ +- file->private_data = &inf->next; /* next structure */ ++ (struct log_data **) file->private_data = &inf->next; /* next structure */ + if ((len = strlen(inf->log_start)) <= count) { + if (copy_to_user(buf, inf->log_start, len)) + return -EFAULT; +- *off = pos + len; ++ file->f_pos += len; + return (len); + } + return (0); +@@ -255,7 +255,11 @@ + struct procdata *pd = NULL; + ulong flags; + ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_INC_USE_COUNT; ++#else + lock_kernel(); ++#endif + card = card_root; + while (card) { + pd = card->proclog; +@@ -264,7 +268,11 @@ + card = card->next; /* search next entry */ + } + if (!card) { ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_DEC_USE_COUNT; ++#else + unlock_kernel(); ++#endif + return (-ENODEV); /* device is unknown/invalid */ + } + filep->private_data = card; /* remember our own card */ +@@ -274,19 +282,24 @@ + } else if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) { + + /* read access -> log/debug read */ +- save_flags(flags); +- cli(); ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + pd->if_used++; + if (pd->log_head) +- filep->private_data = &(pd->log_tail->next); ++ (struct log_data **) filep->private_data = &(pd->log_tail->next); + else +- filep->private_data = &(pd->log_head); +- restore_flags(flags); ++ (struct log_data **) filep->private_data = &(pd->log_head); ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + } else { /* simultaneous read/write access forbidden ! */ ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_DEC_USE_COUNT; ++#else + unlock_kernel(); ++#endif + return (-EPERM); /* no permission this time */ + } ++#ifndef COMPAT_USE_MODCOUNT_LOCK + unlock_kernel(); ++#endif + return (0); + } /* hysdn_log_open */ + +@@ -306,7 +319,9 @@ + int flags, retval = 0; + + ++#ifndef COMPAT_USE_MODCOUNT_LOCK + lock_kernel(); ++#endif + if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_WRITE) { + /* write only access -> write debug level written */ + retval = 0; /* success */ +@@ -314,8 +329,7 @@ + /* read access -> log/debug read, mark one further file as closed */ + + pd = NULL; +- save_flags(flags); +- cli(); ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + inf = *((struct log_data **) filep->private_data); /* get first log entry */ + if (inf) + pd = (struct procdata *) inf->proc_ctrl; /* still entries there */ +@@ -338,7 +352,7 @@ + inf->usage_cnt--; /* decrement usage count for buffers */ + inf = inf->next; + } +- restore_flags(flags); ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + + if (pd) + if (pd->if_used <= 0) /* delete buffers if last file closed */ +@@ -348,7 +362,11 @@ + kfree(inf); + } + } /* read access */ ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_DEC_USE_COUNT; ++#else + unlock_kernel(); ++#endif + + return (retval); + } /* hysdn_log_close */ +@@ -400,6 +418,9 @@ + release: hysdn_log_close, + }; + ++#ifdef COMPAT_NO_SOFTNET ++struct inode_operations log_inode_operations; ++#endif + + /***********************************************************************************/ + /* hysdn_proclog_init is called when the module is loaded after creating the cards */ +@@ -414,10 +435,20 @@ + + if ((pd = (struct procdata *) kmalloc(sizeof(struct procdata), GFP_KERNEL)) != NULL) { + memset(pd, 0, sizeof(struct procdata)); ++#ifdef COMPAT_NO_SOFTNET ++ memset(&log_inode_operations, 0, sizeof(struct inode_operations)); ++ log_inode_operations.default_file_ops = &log_fops; ++#endif + sprintf(pd->log_name, "%s%d", PROC_LOG_BASENAME, card->myid); + if ((pd->log = create_proc_entry(pd->log_name, S_IFREG | S_IRUGO | S_IWUSR, hysdn_proc_entry)) != NULL) { ++#ifdef COMPAT_NO_SOFTNET ++ pd->log->ops = &log_inode_operations; /* set new operations table */ ++#else + pd->log->proc_fops = &log_fops; ++#ifdef COMPAT_HAS_FILEOP_OWNER + pd->log->owner = THIS_MODULE; ++#endif ++#endif + } + + init_waitqueue_head(&(pd->rd_queue)); +diff -rNu linux-2.4.29.old/drivers/isdn/hysdn/hysdn_sched.c linux-2.4.29/drivers/isdn/hysdn/hysdn_sched.c +--- linux-2.4.29.old/drivers/isdn/hysdn/hysdn_sched.c 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/hysdn/hysdn_sched.c 2005-03-22 15:06:48.630699792 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hysdn_sched.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id: hysdn_sched.c,v 1.9 2001/09/24 13:23:03 kai Exp $ + * + * Linux driver for HYSDN cards + * scheduler routines for handling exchange card <-> pc. +@@ -12,11 +12,9 @@ + */ + + #include <linux/config.h> +-#include <linux/sched.h> + #include <linux/signal.h> + #include <linux/kernel.h> + #include <linux/ioport.h> +-#include <linux/interrupt.h> + #include <asm/io.h> + + #include "hysdn_defs.h" +@@ -151,22 +149,19 @@ + + if (card->debug_flags & LOG_SCHED_ASYN) + hysdn_addlog(card, "async tx-cfg chan=%d len=%d", chan, strlen(line) + 1); +- +- save_flags(flags); +- cli(); ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + while (card->async_busy) { +- sti(); +- ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + if (card->debug_flags & LOG_SCHED_ASYN) + hysdn_addlog(card, "async tx-cfg delayed"); + + set_current_state(TASK_INTERRUPTIBLE); + schedule_timeout((20 * HZ) / 1000); /* Timeout 20ms */ + if (!--cnt) { +- restore_flags(flags); ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + return (-ERR_ASYNC_TIME); /* timed out */ + } +- cli(); ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + } /* wait for buffer to become free */ + + strcpy(card->async_data, line); +@@ -177,31 +172,26 @@ + /* now queue the task */ + queue_task(&card->irq_queue, &tq_immediate); + mark_bh(IMMEDIATE_BH); +- sti(); +- ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + if (card->debug_flags & LOG_SCHED_ASYN) + hysdn_addlog(card, "async tx-cfg data queued"); + + cnt++; /* short delay */ +- cli(); +- ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + while (card->async_busy) { +- sti(); +- ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + if (card->debug_flags & LOG_SCHED_ASYN) + hysdn_addlog(card, "async tx-cfg waiting for tx-ready"); + + set_current_state(TASK_INTERRUPTIBLE); + schedule_timeout((20 * HZ) / 1000); /* Timeout 20ms */ + if (!--cnt) { +- restore_flags(flags); ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + return (-ERR_ASYNC_TIME); /* timed out */ + } +- cli(); ++ HYSDN_SPIN_LOCK(&card->irq_lock, flags); + } /* wait for buffer to become free again */ +- +- restore_flags(flags); +- ++ HYSDN_SPIN_UNLOCK(&card->irq_lock, flags); + if (card->debug_flags & LOG_SCHED_ASYN) + hysdn_addlog(card, "async tx-cfg data send"); + +diff -rNu linux-2.4.29.old/drivers/isdn/icn/icn.c linux-2.4.29/drivers/isdn/icn/icn.c +--- linux-2.4.29.old/drivers/isdn/icn/icn.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/icn/icn.c 2005-03-22 15:06:48.722685808 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: icn.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * ISDN low-level module for the ICN active ISDN-Card. + * +@@ -41,7 +41,7 @@ + #undef MAP_DEBUG + + static char +-*revision = "$Revision: 1.1.4.1 $"; ++*revision = "$Revision$"; + + static int icn_addcard(int, char *, char *); + +@@ -1634,6 +1634,7 @@ + } + + #ifndef MODULE ++#ifdef COMPAT_HAS_NEW_SETUP + static int __init + icn_setup(char *line) + { +@@ -1643,6 +1644,14 @@ + static char sid2[20]; + + str = get_options(line, 2, ints); ++#else ++void ++icn_setup(char *str, int *ints) ++{ ++ char *p; ++ static char sid[20]; ++ static char sid2[20]; ++#endif + if (ints[0]) + portbase = ints[1]; + if (ints[0] > 1) +@@ -1656,9 +1665,13 @@ + icn_id2 = sid2; + } + } ++#ifdef COMPAT_HAS_NEW_SETUP + return(1); + } + __setup("icn=", icn_setup); ++#else ++} ++#endif + #endif /* MODULE */ + + static int __init icn_init(void) +diff -rNu linux-2.4.29.old/drivers/isdn/icn/icn.h linux-2.4.29/drivers/isdn/icn/icn.h +--- linux-2.4.29.old/drivers/isdn/icn/icn.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/icn/icn.h 2005-03-22 15:06:48.752681248 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: icn.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * ISDN lowlevel-module for the ICN active ISDN-Card. + * +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_audio.c linux-2.4.29/drivers/isdn/isdn_audio.c +--- linux-2.4.29.old/drivers/isdn/isdn_audio.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_audio.c 2005-03-22 15:06:44.306357192 +0100 +@@ -1,9 +1,9 @@ +-/* $Id: isdn_audio.c,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $ ++/* $Id: isdn_audio.c,v 1.24 2002/08/13 09:57:26 keil Exp $ + * + * Linux ISDN subsystem, audio conversion and compression (linklevel). + * + * Copyright 1994-1999 by Fritz Elfert (fritz@isdn4linux.de) +- * DTMF code (c) 1996 by Christian Mock (cm@kukuruz.ping.at) ++ * DTMF code (c) 1996 by Christian Mock (cm@tahina.priv.at) + * Silence detection (c) 1998 by Armin Schindler (mac@gismo.telekom.de) + * + * This software may be used and distributed according to the terms +@@ -15,7 +15,7 @@ + #include "isdn_audio.h" + #include "isdn_common.h" + +-char *isdn_audio_revision = "$Revision: 1.1.4.1 $"; ++char *isdn_audio_revision = "$Revision: 1.24 $"; + + /* + * Misc. lookup-tables. +@@ -169,19 +169,39 @@ + 0x8a, 0x8a, 0x6a, 0x6a, 0xea, 0xea, 0x2a, 0x2a + }; + +-#define NCOEFF 8 /* number of frequencies to be analyzed */ +-#define DTMF_TRESH 4000 /* above this is dtmf */ ++#define NCOEFF 16 /* number of frequencies to be analyzed */ ++#define DTMF_TRESH 25000 /* above this is dtmf */ + #define SILENCE_TRESH 200 /* below this is silence */ ++#define H2_TRESH 20000 /* 2nd harmonic */ + #define AMP_BITS 9 /* bits per sample, reduced to avoid overflow */ + #define LOGRP 0 + #define HIGRP 1 + ++typedef struct { ++ int grp; /* low/high group */ ++ int k; /* k */ ++ int k2; /* k fuer 2. harmonic */ ++} dtmf_t; ++ + /* For DTMF recognition: + * 2 * cos(2 * PI * k / N) precalculated for all k + */ + static int cos2pik[NCOEFF] = + { +- 55813, 53604, 51193, 48591, 38114, 33057, 25889, 18332 ++ 55812, 29528, 53603, 24032, 51193, 14443, 48590, 6517, ++ 38113, -21204, 33057, -32186, 25889, -45081, 18332, -55279 ++}; ++ ++static dtmf_t dtmf_tones[8] = ++{ ++ {LOGRP, 0, 1}, /* 697 Hz */ ++ {LOGRP, 2, 3}, /* 770 Hz */ ++ {LOGRP, 4, 5}, /* 852 Hz */ ++ {LOGRP, 6, 7}, /* 941 Hz */ ++ {HIGRP, 8, 9}, /* 1209 Hz */ ++ {HIGRP, 10, 11}, /* 1336 Hz */ ++ {HIGRP, 12, 13}, /* 1477 Hz */ ++ {HIGRP, 14, 15} /* 1633 Hz */ + }; + + static char dtmf_matrix[4][4] = +@@ -208,7 +228,7 @@ + : "memory", "ax"); + #else + while (n--) +- *buff = table[*(unsigned char *)buff], buff++; ++ *buff++ = table[*(unsigned char *)buff]; + #endif + } + +@@ -479,18 +499,6 @@ + sk2 = sk1; + sk1 = sk; + } +- /* Avoid overflows */ +- sk >>= 1; +- sk2 >>= 1; +- /* compute |X(k)|**2 */ +- /* report overflows. This should not happen. */ +- /* Comment this out if desired */ +- if (sk < -32768 || sk > 32767) +- printk(KERN_DEBUG +- "isdn_audio: dtmf goertzel overflow, sk=%d\n", sk); +- if (sk2 < -32768 || sk2 > 32767) +- printk(KERN_DEBUG +- "isdn_audio: dtmf goertzel overflow, sk2=%d\n", sk2); + result[k] = + ((sk * sk) >> AMP_BITS) - + ((((cos2pik[k] * sk) >> 15) * sk2) >> AMP_BITS) + +@@ -514,58 +522,28 @@ + int grp[2]; + char what; + char *p; +- int thresh; + + while ((skb = skb_dequeue(&info->dtmf_queue))) { + result = (int *) skb->data; + s = info->dtmf_state; +- grp[LOGRP] = grp[HIGRP] = -1; ++ grp[LOGRP] = grp[HIGRP] = -2; + silence = 0; +- thresh = 0; +- for (i = 0; i < NCOEFF; i++) { +- if (result[i] > DTMF_TRESH) { +- if (result[i] > thresh) +- thresh = result[i]; +- } +- else if (result[i] < SILENCE_TRESH) ++ for (i = 0; i < 8; i++) { ++ if ((result[dtmf_tones[i].k] > DTMF_TRESH) && ++ (result[dtmf_tones[i].k2] < H2_TRESH)) ++ grp[dtmf_tones[i].grp] = (grp[dtmf_tones[i].grp] == -2) ? i : -1; ++ else if ((result[dtmf_tones[i].k] < SILENCE_TRESH) && ++ (result[dtmf_tones[i].k2] < SILENCE_TRESH)) + silence++; + } +- if (silence == NCOEFF) ++ if (silence == 8) + what = ' '; + else { +- if (thresh > 0) { +- thresh = thresh >> 4; /* touchtones must match within 12 dB */ +- for (i = 0; i < NCOEFF; i++) { +- if (result[i] < thresh) +- continue; /* ignore */ +- /* good level found. This is allowed only one time per group */ +- if (i < NCOEFF / 2) { +- /* lowgroup*/ +- if (grp[LOGRP] >= 0) { +- // Bad. Another tone found. */ +- grp[LOGRP] = -1; +- break; +- } +- else +- grp[LOGRP] = i; +- } +- else { /* higroup */ +- if (grp[HIGRP] >= 0) { // Bad. Another tone found. */ +- grp[HIGRP] = -1; +- break; +- } +- else +- grp[HIGRP] = i - NCOEFF/2; +- } +- } +- if ((grp[LOGRP] >= 0) && (grp[HIGRP] >= 0)) { +- what = dtmf_matrix[grp[LOGRP]][grp[HIGRP]]; +- if (s->last != ' ' && s->last != '.') +- s->last = what; /* min. 1 non-DTMF between DTMF */ +- } else +- what = '.'; +- } +- else ++ if ((grp[LOGRP] >= 0) && (grp[HIGRP] >= 0)) { ++ what = dtmf_matrix[grp[LOGRP]][grp[HIGRP] - 4]; ++ if (s->last != ' ' && s->last != '.') ++ s->last = what; /* min. 1 non-DTMF between DTMF */ ++ } else + what = '.'; + } + if ((what != s->last) && (what != ' ') && (what != '.')) { +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_audio.h linux-2.4.29/drivers/isdn/isdn_audio.h +--- linux-2.4.29.old/drivers/isdn/isdn_audio.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_audio.h 2005-03-22 15:06:44.321354912 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_audio.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_audio.h,v 1.10 2001/09/24 13:22:42 kai Exp $ + * + * Linux ISDN subsystem, audio conversion and compression (linklevel). + * +@@ -20,7 +20,6 @@ + + typedef struct dtmf_state { + char last; +- char llast; + int idx; + int buf[DTMF_NPOINTS]; + } dtmf_state; +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_bsdcomp.c linux-2.4.29/drivers/isdn/isdn_bsdcomp.c +--- linux-2.4.29.old/drivers/isdn/isdn_bsdcomp.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_bsdcomp.c 2005-03-22 15:06:44.339352176 +0100 +@@ -105,6 +105,14 @@ + + #define DEBUG 1 + ++#ifdef CONFIG_ISDN_WITH_ABC ++#define BSD_C_MALLOC(x) kmalloc((x),GFP_ATOMIC) ++#define BSD_C_FREE(x) kfree(x) ++#else ++#define BSD_C_MALLOC(x) vmalloc(x) ++#define BSD_C_FREE(x) vfree(x) ++#endif ++ + /* + * A dictionary for doing BSD compress. + */ +@@ -285,7 +293,7 @@ + * Release the dictionary + */ + if (db->dict) { +- vfree (db->dict); ++ BSD_C_FREE (db->dict); + db->dict = NULL; + } + +@@ -293,7 +301,7 @@ + * Release the string buffer + */ + if (db->lens) { +- vfree (db->lens); ++ BSD_C_FREE (db->lens); + db->lens = NULL; + } + +@@ -350,14 +358,19 @@ + * Allocate space for the dictionary. This may be more than one page in + * length. + */ +- db->dict = (struct bsd_dict *) vmalloc (hsize * sizeof (struct bsd_dict)); ++ db->dict = (struct bsd_dict *) BSD_C_MALLOC (hsize * sizeof (struct bsd_dict)); ++ ++ MOD_INC_USE_COUNT; ++ /* ++ ** MOD_INC_USE_COUNT must be before bsd_free ++ ** bsd_free make MOD_DEC_USE_COUNT if db != NULL ++ */ ++ + if (!db->dict) { + bsd_free (db); + return NULL; + } + +- MOD_INC_USE_COUNT; +- + /* + * If this is the compression buffer then there is no length data. + * For decompression, the length information is needed as well. +@@ -365,7 +378,7 @@ + if (!decomp) + db->lens = NULL; + else { +- db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) * ++ db->lens = (unsigned short *) BSD_C_MALLOC ((maxmaxcode + 1) * + sizeof (db->lens[0])); + if (!db->lens) { + bsd_free (db); /* calls MOD_DEC_USE_COUNT; */ +@@ -478,7 +491,11 @@ + int hval,disp,ilen,mxcode; + unsigned char *rptr = skb_in->data; + int isize = skb_in->len; ++#ifdef CONFIG_ISDN_WITH_ABC ++ long secure = 0; ++#endif + ++#ifndef CONFIG_ISDN_WITH_ABC + #define OUTPUT(ent) \ + { \ + bitno -= n_bits; \ +@@ -490,17 +507,45 @@ + bitno += 8; \ + } while (bitno <= 24); \ + } ++#else ++#define OUTPUT(ent) \ ++ { \ ++ secure = 0; \ ++ bitno -= n_bits; \ ++ accm |= ((ent) << bitno); \ ++ do { \ ++ if(skb_out && skb_tailroom(skb_out) > 0) \ ++ *(skb_put(skb_out,1)) = (unsigned char) (accm>>24); \ ++ accm <<= 8; \ ++ bitno += 8; \ ++ } while (bitno <= 24 && ++secure < 10000); \ ++ if(secure >= 10000) { \ ++ printk(KERN_DEBUG "BSD in OUTPUT secure counter reached\n"); \ ++ return 0; \ ++ } \ ++ } ++#endif + + /* + * If the protocol is not in the range we're interested in, + * just return without compressing the packet. If it is, + * the protocol becomes the first byte to compress. + */ ++#ifdef CONFIG_ISDN_WITH_ABC ++ ent = proto; ++ ++ if (proto < 0x21 || proto > 0xf9 || !(proto & 0x1) ) { ++ ++ printk(KERN_DEBUG "bsd_compress called with %x\n",proto); ++ return 0; ++ } ++#else + printk(KERN_DEBUG "bsd_compress called with %x\n",proto); + + ent = proto; + if (proto < 0x21 || proto > 0xf9 || !(proto & 0x1) ) + return 0; ++#endif + + db = (struct bsd_db *) state; + hshift = db->hshift; +@@ -538,6 +583,9 @@ + + /* continue probing until a match or invalid entry */ + disp = (hval == 0) ? 1 : hval; ++#ifdef CONFIG_ISDN_WITH_ABC ++ secure = 0; ++#endif + + do { + hval += disp; +@@ -546,7 +594,15 @@ + dictp = dict_ptr (db, hval); + if (dictp->codem1 >= max_ent) + goto nomatch; ++#ifndef CONFIG_ISDN_WITH_ABC + } while (dictp->fcode != fcode); ++#else ++ } while (dictp->fcode != fcode && ++secure < 100000); ++ if(secure >= 100000) { ++ printk(KERN_DEBUG "BSD: compress while dictp->fcode != fcode secure-counter reached\n"); ++ return 0; ++ } ++#endif + + ent = dictp->codem1 + 1; /* finally found (prefix,suffix) */ + continue; +@@ -669,6 +725,9 @@ + int ilen; + int codelen; + int extra; ++#ifdef CONFIG_ISDN_WITH_ABC ++ unsigned long secure = 0; ++#endif + + db = (struct bsd_db *) state; + max_ent = db->max_ent; +@@ -677,7 +736,9 @@ + n_bits = db->n_bits; + tgtbitno = 32 - n_bits; /* bitno when we have a code */ + ++#ifndef CONFIG_ISDN_WITH_ABC + printk(KERN_DEBUG "bsd_decompress called\n"); ++#endif + + if(!skb_in || !skb_out) { + printk(KERN_ERR "bsd_decompress called with NULL parameter\n"); +@@ -795,7 +856,11 @@ + + p = skb_put(skb_out,codelen); + p += codelen; ++#ifdef CONFIG_ISDN_WITH_ABC ++ for(secure = 0; finchar > LAST && secure < 50000;secure++) { ++#else + while (finchar > LAST) { ++#endif + struct bsd_dict *dictp2 = dict_ptr (db, finchar); + + dictp = dict_ptr (db, dictp2->cptr); +@@ -822,6 +887,12 @@ + } + } + *--p = finchar; ++#ifdef CONFIG_ISDN_WITH_ABC ++ if(secure >= 50000) { ++ printk(KERN_DEBUG "BSD: decompress secure-counter reached\n"); ++ return DECOMP_FATALERROR; ++ } ++#endif + + #ifdef DEBUG + if (--codelen != 0) +@@ -851,12 +922,23 @@ + /* look for a free hash table entry */ + if (dictp->codem1 < max_ent) { + disp = (hval == 0) ? 1 : hval; ++#ifdef CONFIG_ISDN_WITH_ABC ++ secure = 0; ++#endif + do { + hval += disp; + if (hval >= db->hsize) + hval -= db->hsize; + dictp = dict_ptr (db, hval); ++#ifndef CONFIG_ISDN_WITH_ABC + } while (dictp->codem1 < max_ent); ++#else ++ } while (dictp->codem1 < max_ent && ++secure < 50000); ++ if(secure >= 50000) { ++ printk(KERN_DEBUG "BSD: decomp while (dictp->codem1 < max_ent) secure-counter reached\n"); ++ return DECOMP_FATALERROR; ++ } ++#endif + } + + /* +@@ -895,11 +977,21 @@ + db->comp_bytes += skb_in->len - BSD_OVHD; + db->uncomp_bytes += skb_out->len; + ++#ifdef CONFIG_ISDN_WITH_ABC ++ /* ++ ** bsd_check will call bsd_clear ++ ** and so on the internal tables will be cleared. ++ ** ++ ** I think that's not what we will at this point ????? ++ ** For me at works without bsd_check. ++ */ ++#else + if (bsd_check(db)) { + if (db->debug) + printk(KERN_DEBUG "bsd_decomp%d: peer should have cleared dictionary on %d\n", + db->unit, db->seqno - 1); + } ++#endif + return skb_out->len; + } + +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.c linux-2.4.29/drivers/isdn/isdn_common.c +--- linux-2.4.29.old/drivers/isdn/isdn_common.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_common.c 2005-03-22 15:06:44.359349136 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_common.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_common.c,v 1.137 2002/02/09 21:19:11 keil Exp $ + * + * Linux ISDN subsystem, common used functions (linklevel). + * +@@ -19,6 +19,7 @@ + #include <linux/vmalloc.h> + #include <linux/isdn.h> + #include <linux/smp_lock.h> ++#include <linux/list.h> + #include "isdn_common.h" + #include "isdn_tty.h" + #include "isdn_net.h" +@@ -33,7 +34,9 @@ + #include <linux/isdn_divertif.h> + #endif /* CONFIG_ISDN_DIVERSION */ + #include "isdn_v110.h" ++#ifdef HAVE_DEVFS_FS + #include <linux/devfs_fs_kernel.h> ++#endif /* HAVE_DEVFS_FS */ + + /* Debugflags */ + #undef ISDN_DEBUG_STATCALLB +@@ -44,7 +47,7 @@ + + isdn_dev *dev; + +-static char *isdn_revision = "$Revision: 1.1.4.1 $"; ++static char *isdn_revision = "$Revision: 1.137 $"; + + extern char *isdn_net_revision; + extern char *isdn_tty_revision; +@@ -67,19 +70,19 @@ + + static int isdn_writebuf_stub(int, int, const u_char *, int, int); + static void set_global_features(void); ++#ifdef HAVE_DEVFS_FS + static void isdn_register_devfs(int); + static void isdn_unregister_devfs(int); ++#endif /* HAVE_DEVFS_FS */ + static int isdn_wildmat(char *s, char *p); + + void + isdn_lock_drivers(void) + { + int i; +- isdn_ctrl cmd; + +- for (i = 0; i < ISDN_MAX_DRIVERS; i++) { +- if (!dev->drv[i]) +- continue; ++ for (i = 0; i < dev->drivers; i++) { ++ isdn_ctrl cmd; + + cmd.driver = i; + cmd.arg = 0; +@@ -101,10 +104,7 @@ + { + int i; + +- for (i = 0; i < ISDN_MAX_DRIVERS; i++) { +- if (!dev->drv[i]) +- continue; +- ++ for (i = 0; i < dev->drivers; i++) + if (dev->drv[i]->locks > 0) { + isdn_ctrl cmd; + +@@ -114,7 +114,6 @@ + isdn_command(&cmd); + dev->drv[i]->locks--; + } +- } + } + + void +@@ -473,6 +472,7 @@ + dev->drv[di]->flags &= ~DRV_FLAG_RUNNING; + break; + case ISDN_STAT_ICALL: ++ case ISDN_STAT_ICALLW: + if (i < 0) + return -1; + #ifdef ISDN_DEBUG_STATCALLB +@@ -718,7 +718,9 @@ + dev->drvmap[i] = -1; + dev->chanmap[i] = -1; + dev->usage[i] &= ~ISDN_USAGE_DISABLED; ++#ifdef HAVE_DEVFS_FS + isdn_unregister_devfs(i); ++#endif /* HAVE_DEVFS_FS */ + } + dev->drivers--; + dev->channels -= dev->drv[di]->channels; +@@ -755,6 +757,10 @@ + if (divert_if) + return(divert_if->stat_callback(c)); + #endif /* CONFIG_ISDN_DIVERSION */ ++ case ISDN_STAT_ALERT: ++ case ISDN_STAT_PROCEED: ++ isdn_tty_stat_callback(i, c); ++ break; + default: + return -1; + } +@@ -900,72 +906,239 @@ + return (dev->chanmap[minor]); + } + +-static char * +-isdn_statstr(void) ++// ---------------------------------------------------------------------- ++// /dev/isdninfo ++// ++// This device has somewhat insane semantics, but we need to support ++// them for the sake of compatibility. ++// ++// After opening, the first read will succeed and return the current state ++// Then, unless O_NONBLOCK is set, it will block until a state change happens ++// and then return the new state. ++// Also, if the buffer size for the read is too small, we'll just return ++// EOF ++ ++struct isdnstatus_dev { ++ struct list_head list; ++ int update; ++}; ++ ++static DECLARE_WAIT_QUEUE_HEAD(isdnstatus_waitq); ++static LIST_HEAD(isdnstatus_devs); ++static spinlock_t isdnstatus_devs_lock = SPIN_LOCK_UNLOCKED; ++ ++void ++isdn_info_update(void) ++{ ++ struct list_head *p; ++ struct isdnstatus_dev *idev; ++ ++ spin_lock(&isdnstatus_devs_lock); ++ list_for_each(p, &isdnstatus_devs) { ++ idev = list_entry(p, struct isdnstatus_dev, list); ++ idev->update = 1; ++ } ++ spin_unlock(&isdnstatus_devs_lock); ++ wake_up_interruptible(&isdnstatus_waitq); ++} ++ ++static int ++isdnstatus_open(struct inode *ino, struct file *filep) ++{ ++ struct isdnstatus_dev *p; ++ ++ p = kmalloc(sizeof(struct isdnstatus_dev), GFP_USER); ++ if (!p) ++ return -ENOMEM; ++ ++ /* At opening time we allow a single update */ ++ p->update = 1; ++ spin_lock(&isdnstatus_devs_lock); ++ list_add(&p->list, &isdnstatus_devs); ++ spin_unlock(&isdnstatus_devs_lock); ++ filep->private_data = p; ++ ++ return 0; ++} ++ ++static void ++isdnstatus_close(struct inode *ino, struct file *filep) ++{ ++ struct isdnstatus_dev *p = filep->private_data; ++ ++ spin_lock(&isdnstatus_devs_lock); ++ list_del(&p->list); ++ spin_unlock(&isdnstatus_devs_lock); ++ kfree(p); ++} ++ ++// FIXME we don't lock against the state changing whilst being ++// printed ++ ++void ++isdn_statstr(char *buf) + { +- static char istatbuf[2048]; + char *p; + int i; + +- sprintf(istatbuf, "idmap:\t"); +- p = istatbuf + strlen(istatbuf); ++ p = buf; ++ p += sprintf(p, "idmap:\t"); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { +- sprintf(p, "%s ", (dev->drvmap[i] < 0) ? "-" : dev->drvid[dev->drvmap[i]]); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "%s ", (dev->drvmap[i] < 0) ? "-" : dev->drvid[dev->drvmap[i]]); + } +- sprintf(p, "\nchmap:\t"); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "\nchmap:\t"); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { +- sprintf(p, "%d ", dev->chanmap[i]); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "%d ", dev->chanmap[i]); + } +- sprintf(p, "\ndrmap:\t"); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "\ndrmap:\t"); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { +- sprintf(p, "%d ", dev->drvmap[i]); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "%d ", dev->drvmap[i]); + } +- sprintf(p, "\nusage:\t"); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "\nusage:\t"); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { +- sprintf(p, "%d ", dev->usage[i]); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "%d ", dev->usage[i]); + } +- sprintf(p, "\nflags:\t"); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "\nflags:\t"); + for (i = 0; i < ISDN_MAX_DRIVERS; i++) { + if (dev->drv[i]) { +- sprintf(p, "%ld ", dev->drv[i]->online); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "%ld ", dev->drv[i]->online); + } else { +- sprintf(p, "? "); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "? "); + } + } +- sprintf(p, "\nphone:\t"); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "\nphone:\t"); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { +- sprintf(p, "%s ", dev->num[i]); +- p = istatbuf + strlen(istatbuf); ++ p += sprintf(p, "%s ", dev->num[i]); + } +- sprintf(p, "\n"); +- return istatbuf; ++ p += sprintf(p, "\n"); + } + +-/* Module interface-code */ ++static ssize_t ++isdnstatus_read(struct file *file, char *buf, size_t count, loff_t * off) ++{ ++ static DECLARE_MUTEX(istatbuf_mutex); ++ static char istatbuf[2048]; + +-void +-isdn_info_update(void) ++ DECLARE_WAITQUEUE(wait, current); ++ struct isdnstatus_dev *idev; ++ int retval = 0; ++ unsigned int len; ++ ++ idev = file->private_data; ++ ++ if (off != &file->f_pos) ++ return -ESPIPE; ++ ++ add_wait_queue(&isdnstatus_waitq, &wait); ++ for (;;) { ++ set_current_state(TASK_INTERRUPTIBLE); ++ ++ if (idev->update) ++ break; ++ ++ retval = -EAGAIN; ++ if (file->f_flags & O_NONBLOCK) ++ break; ++ ++ retval = -ERESTARTSYS; ++ if (signal_pending(current)) ++ break; ++ ++ schedule(); ++ } ++ __set_current_state(TASK_RUNNING); ++ remove_wait_queue(&isdnstatus_waitq, &wait); ++ ++ if (!idev->update) ++ goto out; ++ ++ idev->update = 0; ++ down(&istatbuf_mutex); ++ isdn_statstr(istatbuf); ++ len = strlen(istatbuf); ++ if (len > count) { ++ retval = 0; ++ goto out_unlock; ++ } ++ if (copy_to_user(buf, istatbuf, len)) { ++ retval = -EFAULT; ++ goto out_unlock; ++ } ++ *off += len; ++ retval = len; ++ ++ out_unlock: ++ up(&istatbuf_mutex); ++ out: ++ return retval; ++} ++ ++static ssize_t ++isdnstatus_write(struct file *file, const char *buf, size_t count, loff_t * off) + { +- infostruct *p = dev->infochain; ++ return -EINVAL; ++} ++ ++static unsigned int ++isdnstatus_poll(struct file *file, poll_table * wait) ++{ ++ struct isdnstatus_dev *idev; ++ unsigned int mask = 0; ++ ++ idev = file->private_data; + +- while (p) { +- *(p->private) = 1; +- p = (infostruct *) p->next; ++ poll_wait(file, &isdnstatus_waitq, wait); ++ if (idev->update) { ++ mask |= POLLIN | POLLRDNORM; + } +- wake_up_interruptible(&(dev->info_waitq)); ++ return mask; + } + ++static int ++isdnstatus_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) ++{ ++ int retval; ++ isdn_net_ioctl_phone phone; ++ ++ switch (cmd) { ++ case IIOCGETDVR: ++ return (TTY_DV + ++ (NET_DV << 8) + ++ (INF_DV << 16)); ++ case IIOCGETCPS: ++ if (arg) { ++ ulong *p = (ulong *) arg; ++ int i; ++ if ((retval = verify_area(VERIFY_WRITE, (void *) arg, ++ sizeof(ulong) * ISDN_MAX_CHANNELS * 2))) ++ return retval; ++ for (i = 0; i < ISDN_MAX_CHANNELS; i++) { ++ put_user(dev->ibytes[i], p++); ++ put_user(dev->obytes[i], p++); ++ } ++ return 0; ++ } else ++ return -EINVAL; ++ break; ++#ifdef CONFIG_NETDEVICES ++ case IIOCNETGPN: ++ /* Get peer phone number of a connected ++ * isdn network interface */ ++ if (arg) { ++ if (copy_from_user((char *) &phone, (char *) arg, sizeof(phone))) ++ return -EFAULT; ++ return isdn_net_getpeer(&phone, (isdn_net_ioctl_phone *) arg); ++ } else ++ return -EINVAL; ++#endif ++ default: ++ return -EINVAL; ++ } ++} ++ ++// ---------------------------------------------------------------------- ++ ++ + static ssize_t + isdn_read(struct file *file, char *buf, size_t count, loff_t * off) + { +@@ -976,37 +1149,16 @@ + int chidx; + int retval; + char *p; +- loff_t pos = *off; + + if (off != &file->f_pos) + return -ESPIPE; + +- if (pos != (unsigned) pos) +- return -EINVAL; +- ++#ifndef COMPAT_HAVE_READ_LOCK_KERNEL + lock_kernel(); +- if (minor == ISDN_MINOR_STATUS) { +- if (!file->private_data) { +- if (file->f_flags & O_NONBLOCK) { +- retval = -EAGAIN; +- goto out; +- } +- interruptible_sleep_on(&(dev->info_waitq)); +- } +- p = isdn_statstr(); +- file->private_data = 0; +- if ((len = strlen(p)) <= count) { +- if (copy_to_user(buf, p, len)) { +- retval = -EFAULT; +- goto out; +- } +- *off = pos + len; +- retval = len; +- goto out; +- } +- retval = 0; +- goto out; +- } ++#endif ++ if (minor == ISDN_MINOR_STATUS) ++ return isdnstatus_read(file, buf, count, off); ++ + if (!dev->drivers) { + retval = -ENODEV; + goto out; +@@ -1031,7 +1183,7 @@ + cli(); + len = isdn_readbchan(drvidx, chidx, p, 0, count, + &dev->drv[drvidx]->rcv_waitq[chidx]); +- *off = pos + len; ++ *off += len; + restore_flags(flags); + if (copy_to_user(buf,p,len)) + len = -EFAULT; +@@ -1052,6 +1204,9 @@ + } + interruptible_sleep_on(&(dev->drv[drvidx]->st_waitq)); + } ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ if(drvidx || (len = isdn_dw_abc_lcr_readstat(buf,count)) < 1) { ++#endif + if (dev->drv[drvidx]->interface->readstat) { + if (count > dev->drv[drvidx]->stavail) + count = dev->drv[drvidx]->stavail; +@@ -1061,6 +1216,9 @@ + } else { + len = 0; + } ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ } ++#endif + save_flags(flags); + cli(); + if (len) +@@ -1068,7 +1226,7 @@ + else + dev->drv[drvidx]->stavail = 0; + restore_flags(flags); +- *off = pos + len; ++ *off += len; + retval = len; + goto out; + } +@@ -1080,7 +1238,9 @@ + #endif + retval = -ENODEV; + out: ++#ifndef COMPAT_HAVE_READ_LOCK_KERNEL + unlock_kernel(); ++#endif + return retval; + } + +@@ -1092,15 +1252,18 @@ + int chidx; + int retval; + ++ if (minor == ISDN_MINOR_STATUS) ++ return isdnstatus_write(file, buf, count, off); ++ + if (off != &file->f_pos) + return -ESPIPE; + +- if (minor == ISDN_MINOR_STATUS) +- return -EPERM; + if (!dev->drivers) + return -ENODEV; + ++#ifndef COMPAT_HAVE_WRITE_LOCK_KERNEL + lock_kernel(); ++#endif + if (minor <= ISDN_MINOR_BMAX) { + printk(KERN_WARNING "isdn_write minor %d obsolete!\n", minor); + drvidx = isdn_minor2drv(minor); +@@ -1145,7 +1308,9 @@ + #endif + retval = -ENODEV; + out: ++#ifndef COMPAT_HAVE_WRITE_LOCK_KERNEL + unlock_kernel(); ++#endif + return retval; + } + +@@ -1156,15 +1321,12 @@ + unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev); + int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL); + ++#ifndef COMPAT_HAVE_POLL_LOCK_KERNEL + lock_kernel(); +- if (minor == ISDN_MINOR_STATUS) { +- poll_wait(file, &(dev->info_waitq), wait); +- /* mask = POLLOUT | POLLWRNORM; */ +- if (file->private_data) { +- mask |= POLLIN | POLLRDNORM; +- } +- goto out; +- } ++#endif ++ if (minor == ISDN_MINOR_STATUS) ++ return isdnstatus_poll(file, wait); ++ + if (minor >= ISDN_MINOR_CTRL && minor <= ISDN_MINOR_CTRLMAX) { + if (drvidx < 0) { + /* driver deregistered while file open */ +@@ -1186,7 +1348,9 @@ + #endif + mask = POLLERR; + out: ++#ifndef COMPAT_HAVE_POLL_LOCK_KERNEL + unlock_kernel(); ++#endif + return mask; + } + +@@ -1216,42 +1380,9 @@ + #define phone iocpar.phone + #define cfg iocpar.cfg + +- if (minor == ISDN_MINOR_STATUS) { +- switch (cmd) { +- case IIOCGETDVR: +- return (TTY_DV + +- (NET_DV << 8) + +- (INF_DV << 16)); +- case IIOCGETCPS: +- if (arg) { +- ulong *p = (ulong *) arg; +- int i; +- if ((ret = verify_area(VERIFY_WRITE, (void *) arg, +- sizeof(ulong) * ISDN_MAX_CHANNELS * 2))) +- return ret; +- for (i = 0; i < ISDN_MAX_CHANNELS; i++) { +- put_user(dev->ibytes[i], p++); +- put_user(dev->obytes[i], p++); +- } +- return 0; +- } else +- return -EINVAL; +- break; +-#ifdef CONFIG_NETDEVICES +- case IIOCNETGPN: +- /* Get peer phone number of a connected +- * isdn network interface */ +- if (arg) { +- if (copy_from_user((char *) &phone, (char *) arg, sizeof(phone))) +- return -EFAULT; +- return isdn_net_getpeer(&phone, (isdn_net_ioctl_phone *) arg); +- } else +- return -EINVAL; +-#endif +- default: +- return -EINVAL; +- } +- } ++ if (minor == ISDN_MINOR_STATUS) ++ return isdnstatus_ioctl(inode, file, cmd, arg); ++ + if (!dev->drivers) + return -ENODEV; + if (minor <= ISDN_MINOR_BMAX) { +@@ -1273,11 +1404,34 @@ + */ + switch (cmd) { + case IIOCNETDWRSET: ++#ifdef CONFIG_ISDN_WITH_ABC ++ if (arg) { ++ ++ if (copy_from_user(name, (char *) arg, sizeof(name))) { ++ ++ return(-EFAULT); ++ ++ } else { ++ ++ isdn_net_dev *p = isdn_net_findif(name); ++ ++ if(p == NULL) ++ return(-EINVAL); ++ ++ return(isdn_dw_abc_reset_interface(p->local,1)); ++ } ++ } ++#else + printk(KERN_INFO "INFO: ISDN_DW_ABC_EXTENSION not enabled\n"); ++#endif + return(-EINVAL); + case IIOCNETLCR: ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ return(isdn_dw_abc_lcr_ioctl(arg)); ++#else + printk(KERN_INFO "INFO: ISDN_ABC_LCR_SUPPORT not enabled\n"); + return -ENODEV; ++#endif + #ifdef CONFIG_NETDEVICES + case IIOCNETAIF: + /* Add a network-interface */ +@@ -1650,22 +1804,12 @@ + int chidx; + int retval = -ENODEV; + ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_INC_USE_COUNT; ++#endif + + if (minor == ISDN_MINOR_STATUS) { +- infostruct *p; +- +- if ((p = kmalloc(sizeof(infostruct), GFP_KERNEL))) { +- p->next = (char *) dev->infochain; +- p->private = (char *) &(filep->private_data); +- dev->infochain = p; +- /* At opening we allow a single update */ +- filep->private_data = (char *) 1; +- retval = 0; +- goto out; +- } else { +- retval = -ENOMEM; +- goto out; +- } ++ return isdnstatus_open(ino, filep); + } + if (!dev->channels) + goto out; +@@ -1688,6 +1832,9 @@ + if (drvidx < 0) + goto out; + isdn_lock_drivers(); ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ if(!drvidx) isdn_dw_abc_lcr_open(); ++#endif + retval = 0; + goto out; + } +@@ -1700,6 +1847,10 @@ + } + #endif + out: ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ if (retval) ++ MOD_DEC_USE_COUNT; ++#endif + return retval; + } + +@@ -1708,25 +1859,11 @@ + { + uint minor = MINOR(ino->i_rdev); + ++#ifndef COMPAT_USE_MODCOUNT_LOCK + lock_kernel(); ++#endif + if (minor == ISDN_MINOR_STATUS) { +- infostruct *p = dev->infochain; +- infostruct *q = NULL; +- +- while (p) { +- if (p->private == (char *) &(filep->private_data)) { +- if (q) +- q->next = p->next; +- else +- dev->infochain = (infostruct *) (p->next); +- kfree(p); +- goto out; +- } +- q = p; +- p = (infostruct *) (p->next); +- } +- printk(KERN_WARNING "isdn: No private data while closing isdnctrl\n"); +- goto out; ++ isdnstatus_close(ino, filep); + } + isdn_unlock_drivers(); + if (minor <= ISDN_MINOR_BMAX) +@@ -1734,6 +1871,12 @@ + if (minor <= ISDN_MINOR_CTRLMAX) { + if (dev->profd == current) + dev->profd = NULL; ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ { ++ int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL); ++ if(!drvidx) isdn_dw_abc_lcr_close(); ++ } ++#endif + goto out; + } + #ifdef CONFIG_ISDN_PPP +@@ -1742,13 +1885,19 @@ + #endif + + out: ++#ifdef COMPAT_USE_MODCOUNT_LOCK ++ MOD_DEC_USE_COUNT; ++#else + unlock_kernel(); ++#endif + return 0; + } + + static struct file_operations isdn_fops = + { ++#ifdef COMPAT_HAS_FILEOP_OWNER + owner: THIS_MODULE, ++#endif + llseek: no_llseek, + read: isdn_read, + write: isdn_write, +@@ -1801,6 +1950,15 @@ + if (USG_NONE(dev->usage[i]) && + (dev->drvmap[i] != -1)) { + int d = dev->drvmap[i]; ++#ifdef CONFIG_ISDN_WITH_ABC_CH_EXTINUSE ++ if(jiffies < dev->dwabc_chan_external_inuse[i]) { ++ ++ if((dev->dwabc_chan_external_inuse[i] - jiffies) > (HZ * 120)) ++ dev->dwabc_chan_external_inuse[i] = 0; ++ else ++ continue; ++ } ++#endif + if ((dev->usage[i] & ISDN_USAGE_EXCLUSIVE) && + ((pre_dev != d) || (pre_chan != dev->chanmap[i]))) + continue; +@@ -1819,7 +1977,11 @@ + restore_flags(flags); + return i; + } else { ++#ifdef CONFIG_ISDN_WITH_ABC ++ if ((pre_dev == d) && ((pre_chan == dev->chanmap[i]) || pre_chan > 1000)) { ++#else + if ((pre_dev == d) && (pre_chan == dev->chanmap[i])) { ++#endif + dev->usage[i] &= ISDN_USAGE_EXCLUSIVE; + dev->usage[i] |= usage; + isdn_info_update(); +@@ -2006,7 +2168,7 @@ + + if ((adding) && (d->rcverr)) + kfree(d->rcverr); +- if (!(d->rcverr = kmalloc(sizeof(int) * m, GFP_KERNEL))) { ++ if (!(d->rcverr = (int *) kmalloc(sizeof(int) * m, GFP_KERNEL))) { + printk(KERN_WARNING "register_isdn: Could not alloc rcverr\n"); + return -1; + } +@@ -2014,7 +2176,7 @@ + + if ((adding) && (d->rcvcount)) + kfree(d->rcvcount); +- if (!(d->rcvcount = kmalloc(sizeof(int) * m, GFP_KERNEL))) { ++ if (!(d->rcvcount = (int *) kmalloc(sizeof(int) * m, GFP_KERNEL))) { + printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n"); + if (!adding) kfree(d->rcverr); + return -1; +@@ -2026,7 +2188,8 @@ + skb_queue_purge(&d->rpqueue[j]); + kfree(d->rpqueue); + } +- if (!(d->rpqueue = kmalloc(sizeof(struct sk_buff_head) * m, GFP_KERNEL))) { ++ if (!(d->rpqueue = ++ (struct sk_buff_head *) kmalloc(sizeof(struct sk_buff_head) * m, GFP_KERNEL))) { + printk(KERN_WARNING "register_isdn: Could not alloc rpqueue\n"); + if (!adding) { + kfree(d->rcvcount); +@@ -2040,7 +2203,8 @@ + + if ((adding) && (d->rcv_waitq)) + kfree(d->rcv_waitq); +- d->rcv_waitq = kmalloc(sizeof(wait_queue_head_t) * 2 * m, GFP_KERNEL); ++ d->rcv_waitq = (wait_queue_head_t *) ++ kmalloc(sizeof(wait_queue_head_t) * 2 * m, GFP_KERNEL); + if (!d->rcv_waitq) { + printk(KERN_WARNING "register_isdn: Could not alloc rcv_waitq\n"); + if (!adding) { +@@ -2064,7 +2228,9 @@ + if (dev->chanmap[k] < 0) { + dev->chanmap[k] = j; + dev->drvmap[k] = drvidx; ++#ifdef HAVE_DEVFS_FS + isdn_register_devfs(k); ++#endif /* HAVE_DEVFS_FS */ + break; + } + restore_flags(flags); +@@ -2128,6 +2294,7 @@ + i_div->ll_cmd = isdn_command; /* set command function */ + i_div->drv_to_name = map_drvname; + i_div->name_to_drv = map_namedrv; ++ i_div->dial_net_name = isdn_net_force_dial; + MOD_INC_USE_COUNT; + divert_if = i_div; /* remember interface */ + return(DIVERT_NO_ERR); +@@ -2165,7 +2332,7 @@ + printk(KERN_WARNING "register_isdn: No write routine given.\n"); + return 0; + } +- if (!(d = kmalloc(sizeof(driver), GFP_KERNEL))) { ++ if (!(d = (driver *) kmalloc(sizeof(driver), GFP_KERNEL))) { + printk(KERN_WARNING "register_isdn: Could not alloc driver-struct\n"); + return 0; + } +@@ -2225,6 +2392,7 @@ + return rev; + } + ++#ifdef HAVE_DEVFS_FS + #ifdef CONFIG_DEVFS_FS + + static devfs_handle_t devfs_handle; +@@ -2314,6 +2482,7 @@ + } + + #endif /* CONFIG_DEVFS_FS */ ++#endif /* HAVE_DEVFS_FS */ + + /* + * Allocate and initialize all data, register modem-devices +@@ -2331,7 +2500,6 @@ + init_timer(&dev->timer); + dev->timer.function = isdn_timer_funct; + init_MUTEX(&dev->sem); +- init_waitqueue_head(&dev->info_waitq); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) { + dev->drvmap[i] = -1; + dev->chanmap[i] = -1; +@@ -2345,7 +2513,9 @@ + vfree(dev); + return -EIO; + } ++#ifdef HAVE_DEVFS_FS + isdn_init_devfs(); ++#endif /* HAVE_DEVFS_FS */ + if ((i = isdn_tty_modem_init()) < 0) { + printk(KERN_WARNING "isdn: Could not register tty devices\n"); + if (i == -3) +@@ -2353,7 +2523,9 @@ + if (i <= -2) + tty_unregister_driver(&dev->mdm.tty_modem); + vfree(dev); ++#ifdef HAVE_DEVFS_FS + isdn_cleanup_devfs(); ++#endif /* HAVE_DEVFS_FS */ + devfs_unregister_chrdev(ISDN_MAJOR, "isdn"); + return -EIO; + } +@@ -2364,7 +2536,9 @@ + tty_unregister_driver(&dev->mdm.cua_modem); + for (i = 0; i < ISDN_MAX_CHANNELS; i++) + kfree(dev->mdm.info[i].xmit_buf - 4); ++#ifdef HAVE_DEVFS_FS + isdn_cleanup_devfs(); ++#endif /* HAVE_DEVFS_FS */ + devfs_unregister_chrdev(ISDN_MAJOR, "isdn"); + vfree(dev); + return -EIO; +@@ -2390,6 +2564,9 @@ + printk("\n"); + #endif + isdn_info_update(); ++#ifdef CONFIG_ISDN_WITH_ABC ++ isdn_dw_abc_init_func(); ++#endif + return 0; + } + +@@ -2398,7 +2575,7 @@ + */ + static void __exit isdn_exit(void) + { +- unsigned long flags; ++ int flags; + int i; + + #ifdef CONFIG_ISDN_PPP +@@ -2432,13 +2609,18 @@ + printk(KERN_WARNING "isdn: controldevice busy, remove cancelled\n"); + restore_flags(flags); + } else { ++#ifdef HAVE_DEVFS_FS + isdn_cleanup_devfs(); ++#endif /* HAVE_DEVFS_FS */ + del_timer(&dev->timer); + restore_flags(flags); + /* call vfree with interrupts enabled, else it will hang */ + vfree(dev); + printk(KERN_NOTICE "ISDN-subsystem unloaded\n"); + } ++#ifdef CONFIG_ISDN_WITH_ABC ++ isdn_dw_abc_release_func(); ++#endif + } + + module_init(isdn_init); +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_common.h linux-2.4.29/drivers/isdn/isdn_common.h +--- linux-2.4.29.old/drivers/isdn/isdn_common.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_common.h 2005-03-22 15:06:44.374346856 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_common.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_common.h,v 1.22 2001/09/24 13:22:42 kai Exp $ + * + * header for Linux ISDN subsystem + * common used functions and debugging-switches (linklevel). +@@ -24,6 +24,9 @@ + #undef ISDN_DEBUG_NET_DIAL + #undef ISDN_DEBUG_NET_ICALL + ++#ifdef CONFIG_ISDN_WITH_ABC ++int isdn_net_force_dial_lp(isdn_net_local *); ++#endif + /* Prototypes */ + extern void isdn_MOD_INC_USE_COUNT(void); + extern void isdn_MOD_DEC_USE_COUNT(void); +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_concap.c linux-2.4.29/drivers/isdn/isdn_concap.c +--- linux-2.4.29.old/drivers/isdn/isdn_concap.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_concap.c 2005-03-22 15:06:44.389344576 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_concap.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_concap.c,v 1.9 2001/09/24 13:22:42 kai Exp $ + * + * Linux ISDN subsystem, protocol encapsulation + * +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_concap.h linux-2.4.29/drivers/isdn/isdn_concap.h +--- linux-2.4.29.old/drivers/isdn/isdn_concap.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_concap.h 2005-03-22 15:06:44.405342144 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_concap.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_concap.h,v 1.4 2001/09/24 13:22:42 kai Exp $ + * + * Linux ISDN subsystem, protocol encapsulation + * +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_dwabc.c linux-2.4.29/drivers/isdn/isdn_dwabc.c +--- linux-2.4.29.old/drivers/isdn/isdn_dwabc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_dwabc.c 2005-03-22 15:06:44.421339712 +0100 +@@ -0,0 +1,1053 @@ ++ ++/* $Id: isdn_dwabc.c,v 1.27 2001/12/01 23:18:21 detabc Exp $ ++ ++ * Linux ISDN subsystem, abc-extension releated funktions. ++ * ++ * Copyright by abc GmbH ++ * written by Detlef Wengorz <detlefw@isdn4linux.de> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2, or (at your option) ++ * any later version. ++ * ++ */ ++ ++#include <linux/config.h> ++#define __NO_VERSION__ ++ ++#ifdef CONFIG_ISDN_WITH_ABC ++ ++static char *dwabcrevison = "$Revision: 1.27 $"; ++ ++#include <asm/semaphore.h> ++#define CONFIG_ISDN_WITH_ABC_NEED_DWSJIFFIES 1 ++#include <linux/list.h> ++#include <linux/isdn.h> ++#include "isdn_common.h" ++#include "isdn_net.h" ++ ++#include <linux/skbuff.h> ++ ++#include <net/udp.h> ++#include <net/checksum.h> ++#include <linux/isdn_dwabc.h> ++ ++ ++#if CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS && CONFIG_ISDN_PPP ++#include <linux/isdn_ppp.h> ++extern struct isdn_ppp_compressor *isdn_ippp_comp_head; ++#define ipc_head isdn_ippp_comp_head ++#ifndef CI_BSD_COMPRESS ++#define CI_BSD_COMPRESS 21 ++#endif ++#endif ++ ++#define NBYTEORDER_30BYTES 0x1e00 ++#define DWABC_TMRES (HZ / 10) ++ ++#define VERBLEVEL (dev->net_verbose > 2) ++ ++static struct timer_list dw_abc_timer; ++ ++ ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++static ISDN_DWSPINLOCK lcr_spin = ISDN_DWSPIN_UNLOCKED; ++#define LCR_LOCK() isdn_dwspin_trylock(&lcr_spin) ++#define LCR_ULOCK() isdn_dwspin_unlock(&lcr_spin) ++ ++typedef struct ISDN_DW_ABC_LCR { ++ ++ struct list_head dll; ++ char lcr_printbuf[64 + ISDN_MSNLEN + ISDN_MSNLEN]; ++ char *lcr_poin; ++ char *lcr_epoin; ++ ++} ISDN_DW_ABC_LCR; ++ ++static LIST_HEAD(lcr_dll); ++static atomic_t lcr_open_count = ATOMIC_INIT(0); ++static volatile ulong lcr_call_counter = 0; ++ ++ ++static int myjiftime(char *p,u_long nj) ++{ ++ sprintf(p,"%02ld:%02ld.%02ld", ++ ((nj / 100) / 60) % 100, (nj / 100) % 60,nj % 100); ++ ++ return(8); ++} ++ ++ ++static void dw_lcr_clear_all(void) ++{ ++ struct list_head *lh; ++ ++ if(!LCR_LOCK()) { ++ ++ while((lh = lcr_dll.next) != &lcr_dll) { ++ ++ ISDN_DW_ABC_LCR *p = list_entry(lh,ISDN_DW_ABC_LCR,dll); ++ list_del(&p->dll); ++ kfree(p); ++ } ++ ++ LCR_ULOCK(); ++ } ++} ++ ++void isdn_dw_abc_lcr_open(void) ++{ atomic_inc(&lcr_open_count); } ++ ++void isdn_dw_abc_lcr_close(void) ++{ ++ if(atomic_dec_and_test(&lcr_open_count)) ++ dw_lcr_clear_all(); ++} ++ ++int isdn_dw_abc_lcr_lock(void) ++{ return(LCR_LOCK()); } ++ ++void isdn_dw_abc_lcr_ulock(void) ++{ LCR_ULOCK(); } ++ ++ ++size_t isdn_dw_abc_lcr_readstat(char *buf,size_t count) ++{ ++ size_t retw = 0; ++ ++ while(buf != NULL && count > 0) { ++ ++ struct list_head *lh = NULL; ++ ISDN_DW_ABC_LCR *p = NULL; ++ char *dp = NULL; ++ size_t n; ++ ++ if((n = LCR_LOCK())) { ++ ++ if(!retw) ++ retw = n; ++ ++ break; ++ } ++ ++ ++ while((lh = lcr_dll.next) != &lcr_dll) { ++ ++ p = list_entry(lh,ISDN_DW_ABC_LCR,dll); ++ ++ if(p->lcr_poin >= p->lcr_epoin) { ++ ++ list_del(&p->dll); ++ kfree(p); ++ p = NULL; ++ ++ } else break; ++ } ++ ++ if(p == NULL) { ++ ++ LCR_ULOCK(); ++ break; ++ } ++ ++ n = p->lcr_epoin - p->lcr_poin; ++ ++ if(n > count) ++ n = count; ++ ++ dp = p->lcr_poin; ++ p->lcr_poin += n; ++ retw += n; ++ LCR_ULOCK(); ++ copy_to_user(buf,dp,n); ++ buf += n; ++ } ++ ++ return(retw); ++} ++ ++ ++static void isdn_dw_abc_lcr_clear_helper(isdn_net_local *lp) ++{ ++ if(lp != NULL) { ++ ++ void *a,*b; ++ ++ a = lp->dw_abc_lcr_cmd; ++ b = lp->dw_abc_lcr_io; ++ lp->dw_abc_lcr_io = NULL; ++ lp->dw_abc_lcr_cmd = NULL; ++ lp->dw_abc_lcr_callid = ++ lp->dw_abc_lcr_start_request = ++ lp->dw_abc_lcr_end_request = 0; ++ ++ if(a) kfree(a); ++ if(b) kfree(b); ++ } ++} ++ ++void isdn_dw_abc_lcr_clear(isdn_net_local *lp) ++{ ++ if(!LCR_LOCK()) { ++ isdn_dw_abc_lcr_clear_helper(lp); ++ LCR_ULOCK(); ++ } ++} ++ ++ ++u_long isdn_dw_abc_lcr_call_number( isdn_net_local *lp,isdn_ctrl *call_cmd) ++{ ++ u_long mid = 0; ++ ++ if(LCR_LOCK()) ++ return(0); ++ ++ isdn_dw_abc_lcr_clear_helper(lp); ++ ++ if( atomic_read(&lcr_open_count) > 0 && ++ lp != NULL && ++ call_cmd != NULL) { ++ ++ ISDN_DW_ABC_LCR *lc = NULL; ++ int ab = 0; ++ ++ if((lp->dw_abc_lcr_cmd = ++ ( isdn_ctrl *)kmalloc(sizeof(isdn_ctrl),GFP_ATOMIC)) == NULL) { ++ ++no_mem_out:; ++ isdn_dw_abc_lcr_clear_helper(lp); ++ LCR_ULOCK(); ++ printk(KERN_DEBUG "%s %d : LCR no memory\n",__FILE__,__LINE__); ++ return(0); ++ } ++ ++ memcpy(lp->dw_abc_lcr_cmd,call_cmd,sizeof(*call_cmd)); ++ while(!(lp->dw_abc_lcr_callid = mid = lcr_call_counter++)); ++ ++ lp->dw_abc_lcr_end_request = lp->dw_abc_lcr_start_request = jiffies; ++ lp->dw_abc_lcr_end_request += HZ * 3; ++ ++ if((lc = (ISDN_DW_ABC_LCR *)kmalloc(sizeof(*lc),GFP_KERNEL)) == NULL) ++ goto no_mem_out; ++ ++ lc->lcr_poin = lc->lcr_epoin = lc->lcr_printbuf; ++ lc->lcr_epoin += myjiftime(lc->lcr_epoin,jiffies); ++ ++ sprintf(lc->lcr_epoin," DW_ABC_LCR\t%lu\t%.*s\t%.*s\n", ++ mid, ++ (int)ISDN_MSNLEN, ++ call_cmd->parm.setup.eazmsn, ++ (int)ISDN_MSNLEN, ++ call_cmd->parm.setup.phone); ++ ++ lc->lcr_epoin += strlen(lc->lcr_epoin); ++ ab = lc->lcr_epoin - lc->lcr_poin; ++ ++ list_add_tail(&lc->dll,&lcr_dll); ++ LCR_ULOCK(); ++ ++ if(ab > 0) { ++ ++ if(dev->drv[0] != NULL ) { ++ ++ dev->drv[0]->stavail += ab; ++ wake_up_interruptible(&dev->drv[0]->st_waitq); ++ } ++ } ++ ++ } else LCR_ULOCK(); ++ ++ return(mid); ++} ++ ++ ++int isdn_dw_abc_lcr_ioctl(u_long arg) ++{ ++ struct ISDN_DWABC_LCR_IOCTL i; ++ int need = sizeof(struct ISDN_DWABC_LCR_IOCTL); ++ isdn_net_dev *p; ++ ++ memset(&i,0,sizeof(struct ISDN_DWABC_LCR_IOCTL)); ++ copy_from_user(&i,(char *)arg,sizeof(int)); ++ ++ if(i.lcr_ioctl_sizeof < need) ++ need = i.lcr_ioctl_sizeof; ++ ++ if(need > 0) ++ copy_from_user(&i,(char *)arg,need); ++ ++ if(LCR_LOCK()) ++ return(-EAGAIN); ++ ++ p = dev->netdev; ++ ++ for(;p ; p = p->next) { ++ ++ isdn_net_local *lp = p->local; ++ ++ if( lp->dw_abc_lcr_callid != i.lcr_ioctl_callid) ++ continue; ++ ++ if(lp->dw_abc_lcr_cmd == NULL) ++ continue; ++ ++ if(lp->dw_abc_lcr_io == NULL) ++ lp->dw_abc_lcr_io = (struct ISDN_DWABC_LCR_IOCTL *) ++ kmalloc(sizeof(struct ISDN_DWABC_LCR_IOCTL),GFP_ATOMIC); ++ ++ if(lp->dw_abc_lcr_io == NULL) { ++ ++ printk(KERN_DEBUG "%s %d : no memory\n",__FILE__,__LINE__); ++ continue; ++ } ++ ++ memcpy(lp->dw_abc_lcr_io,&i,sizeof(struct ISDN_DWABC_LCR_IOCTL)); ++ ++ if(i.lcr_ioctl_flags & DWABC_LCR_FLG_NEWNUMBER) { ++ ++ char *xx = i.lcr_ioctl_nr; ++ char *exx = xx + sizeof(i.lcr_ioctl_nr); ++ char *d = lp->dw_abc_lcr_cmd->parm.setup.phone; ++ char *ed = d + sizeof(lp->dw_abc_lcr_cmd->parm.setup.phone) - 1; ++ ++ while(d < ed && xx < exx && *xx) *(d++) = *(xx++); ++ while(d < ed) *(d++) = 0; ++ *d = 0; ++ } ++ } ++ ++ LCR_ULOCK(); ++ return(0); ++} ++ ++#endif ++ ++ ++#ifdef CONFIG_ISDN_WITH_ABC_UDP_CHECK ++int dw_abc_udp_test(struct sk_buff *skb,struct net_device *ndev) ++{ ++ if(ndev != NULL && skb != NULL && skb->protocol == htons(ETH_P_IP)) { ++ ++ struct iphdr *iph = (struct iphdr *)skb->data; ++ isdn_net_local *lp = (isdn_net_local *) ndev->priv; ++ int rklen = skb->len; ++ ++ if (skb->nh.raw > skb->data && skb->nh.raw < skb->tail) { ++ ++ rklen -= (char *)skb->nh.raw - (char *)skb->data; ++ iph = (struct iphdr *)skb->nh.raw; ++ } ++ ++ if(rklen >= 20 && iph->version == 4 && ++ !(lp->dw_abc_flags & ISDN_DW_ABC_FLAG_NO_UDP_CHECK)) { ++ ++ if( iph->tot_len == NBYTEORDER_30BYTES && ++ iph->protocol == IPPROTO_UDP) { ++ ++ struct udphdr *udp = ++ (struct udphdr *)((char *)iph + (iph->ihl << 2)); ++ ++ ushort usrc = ntohs(udp->source); ++ ++ if( udp->dest == htons(25001) && ++ usrc >= 20000 && usrc < 25000) { ++ ++ char *p = (char *)(udp + 1); ++ ++ if(p[0] == p[1]) { ++ ++ char mc = 0; ++ ++ switch(*p) { ++ case 0x30: ++ ++ mc = *p; ++ ++ if((lp->flags & ISDN_NET_CONNECTED) && (!lp->dialstate)) ++ mc++; ++ ++ break; ++ ++ case 0x32: ++ ++ mc = *p; ++#ifdef CONFIG_ISDN_WITH_ABC_UDP_CHECK_DIAL ++ if((lp->flags & ISDN_NET_CONNECTED) && (!lp->dialstate)) { ++ ++ mc++; ++ break; ++ } ++ ++ if(!isdn_net_force_dial_lp(lp)) mc++; ++#endif ++ break; ++ ++ case 0x11: ++ mc = *p + 1; ++ isdn_dw_abc_reset_interface(lp,1); ++ break; ++ ++ case 0x28: mc = *p + 1; break; ++ case 0x2a: ++ case 0x2c: ++ ++ mc = *p; ++#ifdef CONFIG_ISDN_WITH_ABC_UDP_CHECK_HANGUP ++ if(!(lp->dw_abc_flags & ISDN_DW_ABC_FLAG_NO_UDP_HANGUP)) { ++ ++ if(lp->isdn_device >= 0) { ++ ++ isdn_net_hangup(ndev); ++ mc = *p + 1; ++ } ++ } ++#endif ++ break; ++ } ++ ++ if(mc) { ++ ++ struct sk_buff *nskb; ++ int need = 2+sizeof(struct iphdr)+sizeof(struct udphdr); ++ int hneed = need + ndev->hard_header_len; ++ ++ if((nskb = (struct sk_buff *)dev_alloc_skb(hneed)) != NULL) { ++ ++ ushort n = sizeof(struct udphdr) + 2; ++ struct iphdr *niph; ++ struct udphdr *nup; ++ skb_reserve(nskb,ndev->hard_header_len); ++ ++ if((niph = (struct iphdr *)skb_put(nskb,need))==NULL){ ++ ++ printk(KERN_DEBUG "%s: skb_put failt (%d bytes)\n", lp->name,hneed); ++ dev_kfree_skb(nskb); ++ return(0); ++ } ++ ++ nup = (struct udphdr *)(niph + 1); ++ ((char *)(nup + 1))[0] = mc; ++ ((char *)(nup + 1))[1] = mc; ++ nup->source=udp->dest; ++ nup->dest=udp->source; ++ nup->len=htons(n); ++ nup->check=0; /* dont need checksum */ ++ memset((void *)niph,0,sizeof(*niph)); ++ niph->version=4; ++ niph->ihl=5; ++ niph->tot_len=NBYTEORDER_30BYTES; ++ niph->ttl = 32; ++ niph->protocol = IPPROTO_UDP; ++ niph->saddr=iph->daddr; ++ niph->daddr=iph->saddr; ++ niph->id=iph->id; ++ niph->check=ip_fast_csum((unsigned char *)niph,niph->ihl); ++ nskb->dev = ndev; ++ nskb->pkt_type = PACKET_HOST; ++ nskb->protocol = htons(ETH_P_IP); ++ nskb->mac.raw = nskb->data; ++ netif_rx(nskb); ++ } ++ ++ return(1); ++ } ++ } ++ } ++ } ++ } ++ } ++ ++ return(0); ++} ++#endif ++ ++ ++void isdn_dw_clear_if(ulong pm,isdn_net_local *lp) ++{ ++ if(lp != NULL) { ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ isdn_dw_abc_lcr_clear(lp); ++#endif ++ } ++} ++ ++ ++ ++static void dw_abc_timer_func(u_long dont_need_yet) ++{ ++ register u_long t; ++ ++ if(!((t = ++isdn_dwabc_jiffies.msec_100) & 1)) ++ if(isdn_dwabc_jiffies.msec_200++ & 1) ++ isdn_dwabc_jiffies.msec_400++; ++ ++ if(!(t % 5)) ++ if(isdn_dwabc_jiffies.msec_500++ & 1) ++ isdn_dwabc_jiffies.msec_1000++; ++ ++ dw_abc_timer.expires = jiffies + DWABC_TMRES; ++ add_timer(&dw_abc_timer); ++} ++ ++ ++void isdn_dw_abc_init_func(void) ++{ ++ ++ init_timer(&dw_abc_timer); ++ dw_abc_timer.function = dw_abc_timer_func; ++ ++ ++ printk( KERN_INFO ++ "abc-extension %s Kernel 0x%06X\n" ++ "written by\nDetlef Wengorz <detlefw@isdn4linux.de>\n" ++ "Installed options:\n" ++#ifdef CONFIG_ISDN_WITH_ABC_CALLB ++ "CONFIG_ISDN_WITH_ABC_CALLB\n" ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_UDP_CHECK ++ "CONFIG_ISDN_WITH_ABC_UDP_CHECK\n" ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_UDP_CHECK_HANGUP ++ "CONFIG_ISDN_WITH_ABC_UDP_CHECK_HANGUP\n" ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_UDP_CHECK_DIAL ++ "CONFIG_ISDN_WITH_ABC_UDP_CHECK_DIAL\n" ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ "CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ\n" ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ "CONFIG_ISDN_WITH_ABC_LCR_SUPPORT\n" ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER ++ "CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER\n" ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_CH_EXTINUSE ++ "CONFIG_ISDN_WITH_ABC_CH_EXTINUSE\n" ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ "CONFIG_ISDN_WITH_ABC_CONN_ERROR\n" ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS ++ "CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS\n" ++#endif ++ "loaded\n", ++ dwabcrevison,LINUX_VERSION_CODE); ++ dwsjiffies = 0; ++ dw_abc_timer.expires = jiffies + DWABC_TMRES; ++ add_timer(&dw_abc_timer); ++} ++ ++void isdn_dw_abc_release_func(void) ++{ ++ del_timer(&dw_abc_timer); ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ dw_lcr_clear_all(); ++#endif ++ printk( KERN_INFO ++ "abc-extension %s Kernel 0x%06X\n" ++ "written by\n" ++ "Detlef Wengorz <detlefw@isdn4linux.de>\n" ++ "unloaded\n", ++ dwabcrevison,LINUX_VERSION_CODE); ++} ++ ++ ++void isdn_dwabc_test_phone(isdn_net_local *lp) ++{ ++ if(lp != NULL) { ++ ++ isdn_net_phone *h = lp->phone[0]; ++ ulong oflags = lp->dw_abc_flags; ++ int secure = 0; ++ ++ lp->dw_abc_flags = 0; ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ *lp->dw_out_msn = 0; ++#endif ++ ++ for(;h != NULL && secure < 1000;secure++,h = h->next) { ++ ++ char *p = h->num; ++ char *ep = p + ISDN_MSNLEN; ++ ++ for(;p < ep && *p && (*p <= ' ' || *p == '"' || *p == '\'');p++); ++ ++ if(p >= ep) ++ continue; ++ ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ if(*p == '>') { ++ ++ if(++p < ep && *p != '<' && *p != '>') { ++ ++ char *d = lp->dw_out_msn; ++ ++ for(;*p && (p < ep) && (*p == ' ' || *p == '\t');p++); ++ for(ep--;*p && (p < ep);) *(d++) = *(p++); ++ *d = 0; ++ continue; ++ } ++ } ++#endif ++ ++ if(*p == '~') { ++ ++ /* abc switch's */ ++ ++ for(p++;p < ep && *p;p++) switch(*p) { ++ case 'u': lp->dw_abc_flags |= ISDN_DW_ABC_FLAG_NO_UDP_CHECK; break; ++ case 'h': lp->dw_abc_flags |= ISDN_DW_ABC_FLAG_NO_UDP_HANGUP; break; ++ case 'd': lp->dw_abc_flags |= ISDN_DW_ABC_FLAG_NO_UDP_DIAL; break; ++ case 'c': lp->dw_abc_flags |= ISDN_DW_ABC_FLAG_NO_CH_EXTINUSE; break; ++ case 'e': lp->dw_abc_flags |= ISDN_DW_ABC_FLAG_NO_CONN_ERROR; break; ++ case 'l': lp->dw_abc_flags |= ISDN_DW_ABC_FLAG_NO_LCR; break; ++ ++ case 'x': ++ case 'X': lp->dw_abc_flags |= ISDN_DW_ABC_FLAG_RCV_NO_HUPTIMER; break; ++ ++ case 'B': lp->dw_abc_flags |= ISDN_DW_ABC_FLAG_BSD_COMPRESS; break; ++ case 'L': lp->dw_abc_flags |= ISDN_DW_ABC_FLAG_LEASED_LINE; break; ++ ++ case '"': ++ case ' ': ++ case '\t': ++ case '\'': break; ++ ++ default: ++ printk(KERN_DEBUG"isdn_net: %s abc-switch <~%c> unknown\n",lp->name,*p); ++ break; ++ } ++ } ++ } ++ ++ if(lp->dw_abc_flags & ISDN_DW_ABC_FLAG_LEASED_LINE) { ++ ++ lp->dw_abc_flags |= ++ ISDN_DW_ABC_FLAG_NO_UDP_CHECK | ++ ISDN_DW_ABC_FLAG_NO_UDP_HANGUP | ++ ISDN_DW_ABC_FLAG_NO_UDP_DIAL | ++ ISDN_DW_ABC_FLAG_NO_CH_EXTINUSE | ++ ISDN_DW_ABC_FLAG_NO_CONN_ERROR | ++ ISDN_DW_ABC_FLAG_NO_LCR; ++ } ++ ++ if(dev->net_verbose && (lp->dw_abc_flags != oflags || dev->net_verbose > 4)) ++ printk(KERN_DEBUG "isdn_net %s abc-flags 0x%lx\n",lp->name,lp->dw_abc_flags); ++ ++ } ++} ++ ++ ++int isdn_dw_abc_reset_interface(isdn_net_local *lp,int with_message) ++{ ++ int r = -EINVAL; ++ ++ if(lp != NULL) { ++ ++ r = 0; ++ ++ lp->dw_abc_bchan_last_connect = 0; ++ lp->dw_abc_dialstart = 0; ++ lp->dw_abc_inuse_secure = 0; ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ lp->dw_abc_bchan_errcnt = 0; ++#endif ++ ++ if(with_message && dev->net_verbose > 0) ++ printk(KERN_INFO ++ "%s: NOTE: reset (clear) abc-interface-secure-counter\n", ++ lp->name); ++ } ++ ++ return(r); ++} ++ ++ ++#if CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS && CONFIG_ISDN_PPP ++ ++#define DWBSD_PKT_FIRST_LEN 16 ++#define DWBSD_PKT_SWITCH 165 ++#define DWBSD_PKT_BSD 189 ++ ++#define DWBSD_VERSION 0x2 ++ ++void dwabc_bsd_first_gen(isdn_net_local *lp) ++{ ++ if(lp != NULL && lp->p_encap == ISDN_NET_ENCAP_RAWIP && ++ (lp->dw_abc_flags & ISDN_DW_ABC_FLAG_BSD_COMPRESS)) { ++ ++ struct sk_buff *skb = NULL; ++ char *p = NULL; ++ char *ep = NULL; ++ ++ if((skb =(struct sk_buff *)dev_alloc_skb(128)) == NULL) { ++ ++ printk(KERN_INFO "%s: dwabc: alloc-skb failed for 128 bytes\n",lp->name); ++ return; ++ } ++ ++ skb_reserve(skb,64); ++ p = skb_put(skb,DWBSD_PKT_FIRST_LEN); ++ ep = p + DWBSD_PKT_FIRST_LEN; ++ ++ *(p++) = DWBSD_PKT_SWITCH; ++ *(p++) = DWBSD_VERSION; ++ for(;p < ep;p++) *(p++) = 0; ++ ++ isdn_net_write_super(lp, skb); ++ ++ if(dev->net_verbose > 2) ++ printk(KERN_INFO "%s: dwabc: sending comm-header version 0x%x\n",lp->name,DWBSD_VERSION); ++ } ++} ++ ++ ++void dwabc_bsd_free(isdn_net_local *lp) ++{ ++ if(lp != NULL) { ++ ++ if(lp->dw_abc_bsd_stat_rx || lp->dw_abc_bsd_stat_tx) { ++ ++ struct isdn_ppp_compressor *c = NULL; ++ ++ if(!(c = (struct isdn_ppp_compressor *)lp->dw_abc_bsd_compressor)) { ++ ++ printk(KERN_WARNING ++ "%s: PANIC: freeing bsd compressmemory without compressor\n", ++ lp->name); ++ ++ } else { ++ ++ if(lp->dw_abc_bsd_stat_rx) (*c->free)(lp->dw_abc_bsd_stat_rx); ++ if(lp->dw_abc_bsd_stat_tx) (*c->free)(lp->dw_abc_bsd_stat_tx); ++ ++ if(dev->net_verbose > 2) ++ printk(KERN_INFO ++ "%s: free bsd compress-memory\n", ++ lp->name); ++ } ++ } ++ ++ lp->dw_abc_bsd_compressor = NULL; ++ lp->dw_abc_bsd_stat_rx = NULL; ++ lp->dw_abc_bsd_stat_tx = NULL; ++ lp->dw_abc_if_flags &= ~ISDN_DW_ABC_IFFLAG_BSDAKTIV; ++ ++ if(dev->net_verbose > 0) { ++ ++ if(lp->dw_abc_bsd_rcv != lp->dw_abc_bsd_bsd_rcv) { ++ ++ printk(KERN_INFO "%s: Receive %lu<-%lu kb\n",lp->name, ++ lp->dw_abc_bsd_rcv >> 10 , lp->dw_abc_bsd_bsd_rcv >> 10); ++ } ++ ++ ++ if(lp->dw_abc_bsd_snd != lp->dw_abc_bsd_bsd_snd) { ++ ++ printk(KERN_INFO "%s: Send %lu->%lu kb\n",lp->name, ++ lp->dw_abc_bsd_snd >> 10 , lp->dw_abc_bsd_bsd_snd >> 10); ++ } ++ } ++ ++ lp->dw_abc_bsd_rcv = ++ lp->dw_abc_bsd_bsd_rcv = ++ lp->dw_abc_bsd_snd = ++ lp->dw_abc_bsd_bsd_snd = 0; ++ } ++} ++ ++ ++int dwabc_bsd_init(isdn_net_local *lp) ++{ ++ int r = 1; ++ ++ if(lp != NULL) { ++ ++ dwabc_bsd_free(lp); ++ ++ if(lp->p_encap == ISDN_NET_ENCAP_RAWIP) { ++ ++ void *rx = NULL; ++ void *tx = NULL; ++ struct isdn_ppp_comp_data *cp = NULL; ++ struct isdn_ppp_compressor *c = NULL; ++ ++ if(lp->dw_abc_flags & ISDN_DW_ABC_FLAG_BSD_COMPRESS) do { ++ ++ for(c = ipc_head ; ++ c != NULL && c->num != CI_BSD_COMPRESS; c = c->next); ++ ++ if(c == NULL) { ++ ++ printk(KERN_INFO ++ "%s: Module isdn_bsdcompress not loaded\n", ++ lp->name); ++ ++ break; ++ } ++ ++ cp = (struct isdn_ppp_comp_data *) ++ kmalloc(sizeof(struct isdn_ppp_comp_data),GFP_ATOMIC); ++ ++ if(cp == NULL) { ++ ++ printk(KERN_INFO ++ "%s: allocation of isdn_ppp_comp_data failed\n", ++ lp->name); ++ ++ break; ++ } ++ ++ memset(cp,0,sizeof(*cp)); ++ cp->num = CI_BSD_COMPRESS; ++ cp->optlen = 1; ++ ++ /* ++ ** set BSD_VERSION 1 and 12 bits compressmode ++ */ ++ *cp->options = (1 << 5) | 12; ++ ++ if((rx = (*c->alloc)(cp)) == NULL) { ++ ++ printk(KERN_INFO ++ "%s: allocation of bsd rx-memory failed\n", ++ lp->name); ++ ++ break; ++ } ++ ++ if(!(*c->init)(rx,cp,0,1)) { ++ ++ printk(KERN_INFO ++ "%s: init of bsd rx-stream failed\n",lp->name); ++ ++ break; ++ } ++ ++ cp->flags = IPPP_COMP_FLAG_XMIT; ++ ++ if((tx = (*c->alloc)(cp)) == NULL) { ++ ++ printk(KERN_INFO ++ "%s: allocation of bsd tx-memory failed\n", ++ lp->name); ++ ++ break; ++ } ++ ++ if(!(*c->init)(tx,cp,0,1)) { ++ ++ printk(KERN_INFO ++ "%s: init of bsd tx-stream failed\n", ++ lp->name); ++ ++ break; ++ } ++ ++ lp->dw_abc_bsd_compressor = (void *)c; ++ lp->dw_abc_bsd_stat_rx = rx; ++ lp->dw_abc_bsd_stat_tx = tx; ++ rx = tx = NULL; ++ r = 0; ++ ++ if(dev->net_verbose > 2) ++ printk(KERN_INFO ++ "%s: bsd compress-memory and init ok\n", ++ lp->name); ++ ++ } while(0); ++ ++ if(cp != NULL) ++ kfree(cp); ++ ++ if(c != NULL) { ++ ++ if(tx != NULL) (*c->free)(tx); ++ if(rx != NULL) (*c->free)(rx); ++ } ++ ++ } else if(lp->dw_abc_flags & ISDN_DW_ABC_FLAG_BSD_COMPRESS) { ++ ++ printk(KERN_INFO ++ "%s: bsd-compress only with encapsulation rawip allowed\n", ++ lp->name); ++ } ++ } ++ ++ return(r); ++} ++ ++struct sk_buff *dwabc_bsd_compress( isdn_net_local *lp, ++ struct sk_buff *skb, ++ struct net_device *ndev) ++{ ++ if(lp != NULL && lp->p_encap == ISDN_NET_ENCAP_RAWIP && ++ (lp->dw_abc_flags & ISDN_DW_ABC_FLAG_BSD_COMPRESS) && ++ (lp->dw_abc_if_flags & ISDN_DW_ABC_IFFLAG_BSDAKTIV)) { ++ ++ if(lp->dw_abc_bsd_stat_tx != NULL && lp->dw_abc_bsd_compressor) { ++ ++ struct isdn_ppp_compressor *cp = ++ (struct isdn_ppp_compressor *)lp->dw_abc_bsd_compressor; ++ ++ struct sk_buff *nskb = (struct sk_buff *) ++ dev_alloc_skb(skb->len * 2 + ndev->hard_header_len); ++ ++ int l = 0; ++ ++ if(nskb == NULL) { ++ ++ (void)(*cp->reset)(lp->dw_abc_bsd_stat_tx,0,0,NULL,0,NULL); ++ printk(KERN_INFO "%s: dwabc-compress no memory\n",lp->name); ++ ++ } else { ++ ++ skb_reserve(nskb,ndev->hard_header_len); ++ *(unsigned char *)skb_put(nskb,1) = DWBSD_PKT_BSD; ++ l = (*cp->compress)(lp->dw_abc_bsd_stat_tx,skb,nskb,0x21); ++ ++ if(l < 1 || l > skb->len) { ++ ++ (void)(*cp->reset)(lp->dw_abc_bsd_stat_tx,0,0,NULL,0,NULL); ++ dev_kfree_skb(nskb); ++ ++ } else { ++ ++ u_short sqnr; ++ ++ dev_kfree_skb(skb); ++ skb = nskb; ++ sqnr = ((*(u_char *)skb->data) << 8) + ++ ((u_char)skb->data[1]); ++ ++ if(sqnr > 65500) ++ (void)(*cp->reset) ++ (lp->dw_abc_bsd_stat_tx,0,0,NULL,0,NULL); ++ } ++ } ++ } ++ } ++ ++ return(skb); ++} ++ ++struct sk_buff *dwabc_bsd_rx_pkt( isdn_net_local *lp, ++ struct sk_buff *skb, ++ struct net_device *ndev) ++{ ++ struct sk_buff *r = skb; ++ ++ if(lp != NULL && lp->p_encap == ISDN_NET_ENCAP_RAWIP && ++ (lp->dw_abc_flags & ISDN_DW_ABC_FLAG_BSD_COMPRESS)) { ++ ++ unsigned char *p = (unsigned char *)skb->data; ++ struct isdn_ppp_compressor *cp = ++ (struct isdn_ppp_compressor *)lp->dw_abc_bsd_compressor; ++ ++ if(*p == DWBSD_PKT_SWITCH) { ++ ++ if(skb->len == DWBSD_PKT_FIRST_LEN) { ++ ++ if((lp->dw_abc_remote_version = p[1]) < 0x2) { ++ ++ printk(KERN_INFO ++ "%s: I can't really talk with remote version 0x%x\n" ++ "Please upgrade remote or disable rawip-compression\n", ++ lp->name, ++ p[1]); ++ } ++ ++ lp->dw_abc_if_flags |= ISDN_DW_ABC_IFFLAG_BSDAKTIV; ++ dev_kfree_skb(skb); ++ ++ if(cp && lp->dw_abc_bsd_stat_tx) ++ (void)(*cp->reset)(lp->dw_abc_bsd_stat_tx,0,0,NULL,0,NULL); ++ ++ if(dev->net_verbose > 2) ++ printk(KERN_INFO ++ "%s: receive comm-header rem-version 0x%02x\n", ++ lp->name, ++ lp->dw_abc_remote_version); ++ ++ return(NULL); ++ } ++ ++ } else if(*p == DWBSD_PKT_BSD && lp->dw_abc_bsd_stat_rx != NULL && cp) { ++ ++ struct sk_buff *nskb = NULL; ++ ++ if(test_and_set_bit(ISDN_DW_ABC_BITLOCK_RECEIVE, ++ &lp->dw_abc_bitlocks)) { ++ ++ printk(KERN_INFO "%s: bsd-decomp called recursivly\n",lp->name); ++ dev_kfree_skb(skb); ++ dwabc_bsd_first_gen(lp); ++ return(NULL); ++ } ++ ++ nskb = (struct sk_buff *) ++ dev_alloc_skb(2048 + ndev->hard_header_len); ++ ++ if(nskb != NULL) { ++ ++ int l = 0; ++ u_short sqnr; ++ ++ skb_reserve(nskb,ndev->hard_header_len); ++ skb_pull(skb, 1); ++ sqnr = ((*(u_char *)skb->data) << 8) | ((u_char)skb->data[1]); ++ ++ if(!sqnr && cp && lp->dw_abc_bsd_stat_rx) ++ (void)(*cp->reset)(lp->dw_abc_bsd_stat_rx,0,0,NULL,0,NULL); ++ ++ if((l = (*cp->decompress) ++ (lp->dw_abc_bsd_stat_rx,skb,nskb,NULL)) < 1 || l>8000) { ++ ++ printk(KERN_INFO "%s: abc-decomp failed\n",lp->name); ++ dev_kfree_skb(nskb); ++ dev_kfree_skb(skb); ++ nskb = NULL; ++ dwabc_bsd_first_gen(lp); ++ ++ } else { ++ ++ if (nskb->data[0] & 0x1) ++ skb_pull(nskb, 1); /* protocol ID is only 8 bit */ ++ else ++ skb_pull(nskb, 2); ++ ++ nskb->dev = skb->dev; ++ nskb->pkt_type = skb->pkt_type; ++ nskb->mac.raw = nskb->data; ++ dev_kfree_skb(skb); ++ } ++ ++ } else { ++ ++ printk(KERN_INFO "%s: PANIC abc-decomp no memory\n",lp->name); ++ dev_kfree_skb(skb); ++ dwabc_bsd_first_gen(lp); ++ } ++ ++ clear_bit(ISDN_DW_ABC_BITLOCK_RECEIVE,&lp->dw_abc_bitlocks); ++ r = nskb; ++ } ++ } ++ ++ return(r); ++} ++ ++#else ++int dwabc_bsd_init(isdn_net_local *lp) { return(1); } ++void dwabc_bsd_free(isdn_net_local *lp) { return; } ++void dwabc_bsd_first_gen(isdn_net_local *lp) { return ; } ++ ++struct sk_buff *dwabc_bsd_compress(isdn_net_local *lp,struct sk_buff *skb,struct net_device *ndev) ++{ return(skb); } ++ ++struct sk_buff *dwabc_bsd_rx_pkt(isdn_net_local *lp,struct sk_buff *skb,struct net_device *ndev) ++{ return(skb); } ++#endif ++#endif +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_net.c linux-2.4.29/drivers/isdn/isdn_net.c +--- linux-2.4.29.old/drivers/isdn/isdn_net.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_net.c 2005-03-22 15:06:44.447335760 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_net.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_net.c,v 1.153 2002/08/17 18:35:23 detabc Exp $ + * + * Linux ISDN subsystem, network interfaces and related functions (linklevel). + * +@@ -9,14 +9,6 @@ + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. + * +- * Data Over Voice (DOV) support added - Guy Ellis 23-Mar-02 +- * guy@traverse.com.au +- * Outgoing calls - looks for a 'V' in first char of dialed number +- * Incoming calls - checks first character of eaz as follows: +- * Numeric - accept DATA only - original functionality +- * 'V' - accept VOICE (DOV) only +- * 'B' - accept BOTH DATA and DOV types +- * + * Jan 2001: fix CISCO HDLC Bjoern A. Zeeb <i4l@zabbadoz.net> + * for info on the protocol, see + * http://i4l.zabbadoz.net/i4l/cisco-hdlc.txt +@@ -38,6 +30,10 @@ + #include "isdn_concap.h" + #endif + ++#ifdef CONFIG_ISDN_WITH_ABC ++#include <linux/isdn_dwabc.h> ++#define isdn_net_log_skb(skb,lp) isdn_net_log_skb_dwabc(skb,lp,NULL) ++#endif + + /* + * Outline of new tbusy handling: +@@ -79,7 +75,11 @@ + dev = lp->master; + else + dev = &n->dev; ++#ifdef COMPAT_NO_SOFTNET ++ return dev->start; ++#else + return netif_running(dev); ++#endif + } + + /* +@@ -143,6 +143,10 @@ + atomic_inc(&lp->frame_cnt); + if (isdn_net_device_busy(lp)) + isdn_net_device_stop_queue(lp); ++#if 0 ++ printk(KERN_DEBUG "%s: inc_frame_cnt now %d\n", lp->name, ++ atomic_read(&lp->frame_cnt)); ++#endif + } + + static __inline__ void isdn_net_dec_frame_cnt(isdn_net_local *lp) +@@ -157,11 +161,19 @@ + isdn_net_device_wake_queue(lp); + } + } ++#if 0 ++ printk(KERN_DEBUG "%s: dec_frame_cnt now %d\n", lp->name, ++ atomic_read(&lp->frame_cnt)); ++#endif + } + + static __inline__ void isdn_net_zero_frame_cnt(isdn_net_local *lp) + { + atomic_set(&lp->frame_cnt, 0); ++#if 0 ++ printk(KERN_DEBUG "%s: zero_frame_cnt now %d\n", lp->name, ++ atomic_read(&lp->frame_cnt)); ++#endif + } + + /* For 2.2.x we leave the transmitter busy timeout at 2 secs, just +@@ -173,23 +185,101 @@ + * which might rely on the tx timeout. If so, we'll find out this way... + */ + ++#ifdef COMPAT_NO_SOFTNET ++#define ISDN_NET_TX_TIMEOUT (2*HZ) ++#else + #define ISDN_NET_TX_TIMEOUT (20*HZ) ++#endif + + /* Prototypes */ + ++#ifndef CONFIG_ISDN_WITH_ABC + int isdn_net_force_dial_lp(isdn_net_local *); ++#endif + static int isdn_net_start_xmit(struct sk_buff *, struct net_device *); + + static void isdn_net_ciscohdlck_connected(isdn_net_local *lp); + static void isdn_net_ciscohdlck_disconnected(isdn_net_local *lp); + +-char *isdn_net_revision = "$Revision: 1.1.4.1 $"; ++char *isdn_net_revision = "$Revision: 1.153 $"; + + /* + * Code for raw-networking over ISDN + */ ++#ifdef CONFIG_ISDN_WITH_ABC ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++static int isdn_dwabc_encap_with_conerr(isdn_net_local *lp) ++{ ++ if(lp->dw_abc_flags & ISDN_DW_ABC_FLAG_NO_CONN_ERROR) ++ return(0); ++ ++ return( ++ lp->p_encap == ISDN_NET_ENCAP_SYNCPPP || ++ lp->p_encap == ISDN_NET_ENCAP_RAWIP || ++ lp->p_encap == ISDN_NET_ENCAP_CISCOHDLCK || ++ lp->p_encap == ISDN_NET_ENCAP_UIHDLC ); ++} ++ ++static int isdn_dwabc_conerr_ippktok(struct sk_buff *skb) ++{ ++ struct iphdr *iph = (struct iphdr *)skb->data; ++ return(iph->version == 6 || (skb->len >= 20 && iph->version == 4)); ++} ++ ++#endif ++ ++static int isdn_dwabc_is_interface_disabled(isdn_net_local *lp) ++{ ++ if(lp == NULL) ++ return(0); ++ ++ lp->dw_abc_inuse_secure = 0; ++ lp->dw_abc_dialstart = 0; ++ ++ /* ++ ** check for jiffies overflow ++ */ ++ if(lp->dw_abc_bchan_last_connect > jiffies) { ++ ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ lp->dw_abc_bchan_errcnt = 0; ++#endif ++ lp->dw_abc_bchan_last_connect = 0; ++ } ++ ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ if(!(lp->dw_abc_flags & ISDN_DW_ABC_FLAG_NO_CONN_ERROR) && isdn_dwabc_encap_with_conerr(lp)) { ++ ++ if(lp->dw_abc_bchan_errcnt > 3 && !(lp->dw_abc_bchan_errcnt & 3)) { + ++ ulong nj = jiffies; ++ ulong delay = lp->dw_abc_bchan_errcnt * ++ lp->dw_abc_bchan_errcnt * ++ lp->dw_abc_bchan_errcnt; ++ ++ if(delay > 86400) delay = 86400; ++ delay = (lp->dw_abc_bchan_last_connect + delay * HZ); ++ ++ if(delay > nj) { ++ ++ printk(KERN_INFO ++ "%s: interface auto-disabled (bchannel connect-error %lu seconds left)\n", ++ lp->name,(delay - nj) / HZ); ++ ++ return(1); ++ } ++ } ++ } ++#endif ++ return(0); ++} ++#endif ++ ++#ifdef CONFIG_ISDN_WITH_ABC ++void ++#else + static void ++#endif + isdn_net_unreachable(struct net_device *dev, struct sk_buff *skb, char *reason) + { + if(skb) { +@@ -297,6 +387,12 @@ + + save_flags(flags); + cli(); ++#ifdef CONFIG_ISDN_WITH_ABC ++ isdn_dw_clear_if(0l,lp); ++ lp->dw_abc_if_flags &= ~ISDN_DW_ABC_IFFLAG_NODCHAN; ++ lp->dw_abc_inuse_secure = 0; ++ dwabc_bsd_free(lp); ++#endif + skb_queue_purge(&lp->super_tx_queue); + + if (!lp->master) { /* reset only master device */ +@@ -351,6 +447,26 @@ + if ((l->flags & ISDN_NET_CONNECTED) && (!l->dialstate)) { + anymore = 1; + l->huptimer++; ++#ifdef CONFIG_ISDN_WITH_ABC ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ if( isdn_dwabc_encap_with_conerr(l) && l->dw_abc_bchan_errcnt > 0) { ++ ++ int n = 180; ++ ++ if(l->dw_abc_bchan_errcnt > 3) n = 120; ++ if(l->dw_abc_bchan_errcnt > 6) n = 90; ++ if(l->dw_abc_bchan_errcnt > 9) n = 60; ++ ++ if(l->huptimer > n) { ++ ++ printk(KERN_INFO "%s: bchan conf-error auto-secure-hangup\n",l->name); ++ isdn_net_hangup(&p->dev); ++ p = (isdn_net_dev *) p->next; ++ continue; ++ } ++ } ++#endif ++#endif + /* + * if there is some dialmode where timeout-hangup + * should _not_ be done, check for that here +@@ -465,8 +581,32 @@ + printk(KERN_INFO "%s: Chargesum is %d\n", lp->name, + lp->charge); + isdn_net_unbind_channel(lp); ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ if(lp->dw_abc_bchan_errcnt) { ++ ++ printk(KERN_INFO ++ "%s: Note: bchannel-error-counter is %hd\n", ++ lp->name, ++ lp->dw_abc_bchan_errcnt); ++ } ++#endif + return 1; + } ++#ifdef CONFIG_ISDN_WITH_ABC_CH_EXTINUSE ++ if(!(lp->dw_abc_flags & ISDN_DW_ABC_FLAG_NO_CH_EXTINUSE)) { ++ if((lp->dialstate == 4 || lp->dialstate == 12) && ++ lp->dw_abc_dialstart && (idx < ISDN_MAX_CHANNELS)) { ++ ++ if((jiffies - lp->dw_abc_dialstart) < (HZ >>2)) { ++ ++ lp->dw_abc_if_flags |= ISDN_DW_ABC_IFFLAG_NODCHAN; ++ lp->dialstate = 1; ++ dev->dwabc_chan_external_inuse[idx] = jiffies + HZ * 30; ++ printk(KERN_INFO "%s: Channel %d look like external in use\n",lp->name,idx); ++ } ++ } ++ } ++#endif + break; + #ifdef CONFIG_ISDN_X25 + case ISDN_STAT_BHUP: +@@ -507,6 +647,19 @@ + } + } + printk(KERN_INFO "isdn_net: %s connected\n", lp->name); ++#ifdef CONFIG_ISDN_WITH_ABC ++ if(!dwabc_bsd_init(lp)) dwabc_bsd_first_gen(lp); ++ lp->dw_abc_bchan_last_connect = jiffies; ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ if(!(lp->dw_abc_flags & ISDN_DW_ABC_FLAG_NO_CONN_ERROR)) { ++ ++ lp->dw_abc_bchan_errcnt += isdn_dwabc_encap_with_conerr(lp); ++ ++ if(lp->dw_abc_bchan_errcnt > 32000) ++ lp->dw_abc_bchan_errcnt = 32000; ++ } ++#endif ++#endif + /* If first Chargeinfo comes before B-Channel connect, + * we correct the timestamp here. + */ +@@ -578,7 +731,6 @@ + int i; + unsigned long flags; + isdn_ctrl cmd; +- u_char *phone_number; + + while (p) { + isdn_net_local *lp = p->local; +@@ -597,6 +749,47 @@ + */ + save_flags(flags); + cli(); ++#ifdef CONFIG_ISDN_WITH_ABC_CH_EXTINUSE ++ if(!(lp->dw_abc_flags & ISDN_DW_ABC_FLAG_NO_CH_EXTINUSE) && ++ (lp->dw_abc_if_flags & ISDN_DW_ABC_IFFLAG_NODCHAN)) { ++ ++ int chi = 0; ++ short lsecure = 0; ++ ++ lsecure = lp->dw_abc_inuse_secure; ++ isdn_net_unbind_channel(lp); ++ lp->dw_abc_inuse_secure = lsecure + 1; ++ ++ /* Grab a free ISDN-Channel */ ++ if ((lsecure >= ISDN_MAX_CHANNELS ) || (chi = ++ isdn_get_free_channel( ++ ISDN_USAGE_NET, ++ lp->l2_proto, ++ lp->l3_proto, ++ lp->pre_device, ++ lp->pre_channel, ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ (*lp->dw_out_msn) ? lp->dw_out_msn : lp->msn) ++#else ++ lp->msn) ++#endif ++ ) < 0) { ++ ++ restore_flags(flags); ++ isdn_net_unreachable(&p->dev, NULL, ++ "DWABC: redial-external-inuse NO FREE CHANNEL\n"); ++ isdn_net_hangup(&p->dev); ++ break; ++ } ++ ++ isdn_net_bind_channel(lp, chi); ++ lp->dialstate = 1; ++ lp->dialstarted = 0; ++ lp->dialwait_timer = 0; ++ } ++ ++ lp->dw_abc_if_flags &= ~ISDN_DW_ABC_IFFLAG_NODCHAN; ++#endif + lp->dial = lp->phone[1]; + restore_flags(flags); + if (!lp->dial) { +@@ -621,18 +814,69 @@ + cmd.arg = lp->isdn_channel; + cmd.command = ISDN_CMD_CLREAZ; + isdn_command(&cmd); ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ sprintf(cmd.parm.num, "%s", ++ isdn_map_eaz2msn((*lp->dw_out_msn) ? lp->dw_out_msn : lp->msn, cmd.driver)); ++#else + sprintf(cmd.parm.num, "%s", isdn_map_eaz2msn(lp->msn, cmd.driver)); ++#endif + cmd.command = ISDN_CMD_SETEAZ; + isdn_command(&cmd); + lp->dialretry = 0; + anymore = 1; + lp->dialstate++; ++#ifdef CONFIG_ISDN_WITH_ABC ++ lp->onhtime = lp->dw_abc_old_onhtime; ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ isdn_dw_abc_lcr_clear(lp); ++#endif ++#endif + /* Fall through */ + case 3: + /* Setup interface, dial current phone-number, switch to next number. + * If list of phone-numbers is exhausted, increment + * retry-counter. + */ ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ if(!isdn_dw_abc_lcr_lock()) { ++ ++ if( lp->dw_abc_lcr_cmd != NULL && ++ lp->dw_abc_lcr_start_request != ++ lp->dw_abc_lcr_end_request) { ++ ++ if( lp->dw_abc_lcr_io == NULL && ++ lp->dw_abc_lcr_start_request <= jiffies && ++ lp->dw_abc_lcr_end_request > jiffies) { ++ ++ isdn_dw_abc_lcr_ulock(); ++ anymore = 1; ++ break; ++ } ++ ++ if(lp->dw_abc_lcr_io != NULL) { ++ ++ if(lp->dw_abc_lcr_io->lcr_ioctl_flags & ++ DWABC_LCR_FLG_DISABLE) { ++ ++ isdn_dw_abc_lcr_ulock(); ++ isdn_net_hangup(&p->dev); ++ break; ++ } ++ ++ if(lp->dw_abc_lcr_io->lcr_ioctl_flags & ++ DWABC_LCR_FLG_NEWHUPTIME) { ++ lp->onhtime = lp->dw_abc_lcr_io->lcr_ioctl_onhtime; ++ } ++ } ++ ++ memcpy(&cmd,lp->dw_abc_lcr_cmd,sizeof(cmd)); ++ isdn_dw_abc_lcr_ulock(); ++ goto dw_abc_lcr_next_click; ++ } ++ ++ isdn_dw_abc_lcr_ulock(); ++ } ++#endif + if(dev->global_flags & ISDN_GLOBAL_STOPPED || (ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_OFF)) { + char *s; + if (dev->global_flags & ISDN_GLOBAL_STOPPED) +@@ -677,20 +921,7 @@ + break; + } + +- cmd.driver = lp->isdn_device; +- cmd.command = ISDN_CMD_DIAL; +- cmd.parm.setup.si2 = 0; +- +- /* check for DOV */ +- phone_number = lp->dial->num; +- if ((*phone_number == 'v') || +- (*phone_number == 'V')) { /* DOV call */ +- cmd.parm.setup.si1 = 1; +- } else { /* DATA call */ +- cmd.parm.setup.si1 = 7; +- } +- +- strcpy(cmd.parm.setup.phone, phone_number); ++ sprintf(cmd.parm.setup.phone, "%s", lp->dial->num); + /* + * Switch to next number or back to start if at end of list. + */ +@@ -710,17 +941,70 @@ + } + } + restore_flags(flags); ++ cmd.driver = lp->isdn_device; ++ cmd.command = ISDN_CMD_DIAL; ++ cmd.parm.setup.si1 = 7; ++ cmd.parm.setup.si2 = 0; ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ sprintf(cmd.parm.setup.eazmsn, "%s", ++ isdn_map_eaz2msn((*lp->dw_out_msn) ? lp->dw_out_msn : lp->msn, cmd.driver)); ++#else + sprintf(cmd.parm.setup.eazmsn, "%s", + isdn_map_eaz2msn(lp->msn, cmd.driver)); ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ /* ++ ** if callback-out we dont need ++ ** low-cost-routing LCR ++ */ ++ if(!(lp->flags & ISDN_NET_CBOUT) && ++ !(lp->dw_abc_flags & ISDN_DW_ABC_FLAG_NO_LCR)) { ++ ++ isdn_dw_abc_lcr_call_number(lp,&cmd); ++ ++ if(lp->dw_abc_lcr_start_request != lp->dw_abc_lcr_end_request) { ++ ++ if(dev->net_verbose > 2) { ++ ++ printk(KERN_INFO ++ "%s: Waiting for LCR-response from isdnlog %s -> %s...\n", ++ lp->name, ++ cmd.parm.setup.eazmsn, ++ cmd.parm.setup.phone); ++ } ++ ++ anymore = 1; ++ break; ++ } ++ } ++ ++dw_abc_lcr_next_click:; ++ isdn_dw_abc_lcr_clear(lp); ++#endif + i = isdn_dc2minor(lp->isdn_device, lp->isdn_channel); + if (i >= 0) { + strcpy(dev->num[i], cmd.parm.setup.phone); + dev->usage[i] |= ISDN_USAGE_OUTGOING; + isdn_info_update(); + } +- printk(KERN_INFO "%s: dialing %d %s... %s\n", lp->name, +- lp->dialretry, cmd.parm.setup.phone, +- (cmd.parm.setup.si1 == 1) ? "DOV" : ""); ++#ifdef CONFIG_ISDN_WITH_ABC ++ printk(KERN_INFO "%s: dialing %d %s -> %s...\n", lp->name, ++ lp->dialretry, ++ cmd.parm.setup.eazmsn, ++ cmd.parm.setup.phone); ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ if(lp->dw_abc_bchan_errcnt) { ++ ++ printk(KERN_INFO ++ "%s: Note: bchannel-error-counter is %hd\n", ++ lp->name, ++ lp->dw_abc_bchan_errcnt); ++ } ++#endif ++#else ++ printk(KERN_INFO "%s: dialing %d %s...\n", lp->name, ++ lp->dialretry, cmd.parm.setup.phone); ++#endif + lp->dtimer = 0; + #ifdef ISDN_DEBUG_NET_DIAL + printk(KERN_DEBUG "dial: d=%d c=%d\n", lp->isdn_device, +@@ -741,6 +1025,10 @@ + lp->dialstate = + (lp->cbdelay && + (lp->flags & ISDN_NET_CBOUT)) ? 12 : 4; ++#ifdef CONFIG_ISDN_WITH_ABC ++ lp->dw_abc_if_flags &= ~ISDN_DW_ABC_IFFLAG_NODCHAN; ++ lp->dw_abc_dialstart = jiffies; ++#endif + break; + case 4: + /* Wait for D-Channel-connect. +@@ -890,6 +1178,15 @@ + isdn_command(&cmd); + printk(KERN_INFO "%s: Chargesum is %d\n", lp->name, lp->charge); + isdn_all_eaz(lp->isdn_device, lp->isdn_channel); ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ if(lp->dw_abc_bchan_errcnt) { ++ ++ printk(KERN_INFO ++ "%s: Note: bchannel-error-counter is %hd\n", ++ lp->name, ++ lp->dw_abc_bchan_errcnt); ++ } ++#endif + } + isdn_net_unbind_channel(lp); + } +@@ -899,8 +1196,13 @@ + unsigned short dest; + } ip_ports; + ++#ifdef CONFIG_ISDN_WITH_ABC ++void ++isdn_net_log_skb_dwabc(struct sk_buff * skb, isdn_net_local * lp,char *reason) ++#else + static void + isdn_net_log_skb(struct sk_buff * skb, isdn_net_local * lp) ++#endif + { + u_char *p = skb->nh.raw; /* hopefully, this was set correctly */ + unsigned short proto = ntohs(skb->protocol); +@@ -972,7 +1274,13 @@ + break; + } + printk(KERN_INFO ++#ifdef CONFIG_ISDN_WITH_ABC ++ "%s %s: %d.%d.%d.%d -> %d.%d.%d.%d%s\n", ++ (reason == NULL) ? "OPEN" : reason, ++ (lp != NULL) ? lp->name : "", ++#else + "OPEN: %d.%d.%d.%d -> %d.%d.%d.%d%s\n", ++#endif + + p[12], p[13], p[14], p[15], + p[16], p[17], p[18], p[19], +@@ -980,7 +1288,13 @@ + break; + case ETH_P_ARP: + printk(KERN_INFO ++#ifdef CONFIG_ISDN_WITH_ABC ++ "%s %s: ARP %d.%d.%d.%d -> *.*.*.* ?%d.%d.%d.%d\n", ++ (reason == NULL) ? "OPEN" : reason, ++ (lp != NULL) ? lp->name : "", ++#else + "OPEN: ARP %d.%d.%d.%d -> *.*.*.* ?%d.%d.%d.%d\n", ++#endif + p[14], p[15], p[16], p[17], + p[24], p[25], p[26], p[27]); + break; +@@ -1004,11 +1318,22 @@ + } + + spin_lock_bh(&lp->xmit_lock); ++ + if (!isdn_net_lp_busy(lp)) { ++#ifdef CONFIG_ISDN_WITH_ABC ++ if(!skb_queue_empty(&lp->super_tx_queue)) { ++ /* ++ ** don't reverse the frame flow ++ ** compression need frames in order and maybe other's too ++ */ ++ skb_queue_tail(&lp->super_tx_queue, skb); ++ skb = skb_dequeue(&lp->super_tx_queue); ++ } ++#endif + isdn_net_writebuf_skb(lp, skb); +- } else { +- skb_queue_tail(&lp->super_tx_queue, skb); +- } ++ ++ } else skb_queue_tail(&lp->super_tx_queue, skb); ++ + spin_unlock_bh(&lp->xmit_lock); + } + +@@ -1056,7 +1381,6 @@ + printk(KERN_WARNING "%s: HL driver queue full\n", lp->name); + goto error; + } +- + lp->transcount += len; + isdn_net_inc_frame_cnt(lp); + return; +@@ -1064,9 +1388,19 @@ + error: + dev_kfree_skb(skb); + lp->stats.tx_errors++; +- + } + ++#if 0 ++int isdn_net_send_skb(struct net_device *ndev, isdn_net_local * lp,struct sk_buff *skb) ++{ ++ if (isdn_net_lp_busy(lp)) { ++ printk(KERN_WARNING "isdn_net_send_skb: HL channel busy\n"); ++ return 1; ++ } ++ isdn_net_writebuf_skb(lp, skb); ++ return 0; ++} ++#endif + + /* + * Helper function for isdn_net_start_xmit. +@@ -1109,7 +1443,54 @@ + + /* Reset hangup-timeout */ + lp->huptimer = 0; // FIXME? ++#ifdef CONFIG_ISDN_WITH_ABC ++ ++ if(test_and_set_bit(ISDN_DW_ABC_BITLOCK_SEND,&lp->dw_abc_bitlocks)) { ++ ++ if(dev->net_verbose > 2) ++ printk(KERN_INFO "%s: isdn_net_xmit called recursivly\n",lp->name); ++ ++ spin_unlock_bh(&lp->xmit_lock); ++ return(1); ++ } ++ ++ if(skb != NULL) { ++ ++ int l = skb->len; ++ int nl = l; ++ ++ if( lp->p_encap == ISDN_NET_ENCAP_RAWIP && ++ (lp->dw_abc_if_flags & ISDN_DW_ABC_IFFLAG_BSDAKTIV)) { ++ ++ if((skb = dwabc_bsd_compress(lp,skb,ndev)) != NULL) { ++ ++ int r = 0; ++ nl = skb->len; ++ skb_queue_tail(&lp->super_tx_queue,skb); ++ ++ if(l != nl && (r = isdn_dc2minor(lp->isdn_device,lp->isdn_channel)) >= 0) { ++ ++ dev->obytes[r] += l - nl; ++ lp->stats.tx_bytes += l - nl; ++ } ++ } ++ ++ } else skb_queue_tail(&lp->super_tx_queue,skb); ++ ++ if(lp->p_encap == ISDN_NET_ENCAP_RAWIP) { ++ ++ lp->dw_abc_bsd_snd += l; ++ lp->dw_abc_bsd_bsd_snd += nl; ++ } ++ } ++ clear_bit(ISDN_DW_ABC_BITLOCK_SEND,&lp->dw_abc_bitlocks); ++ ++ while(!isdn_net_lp_busy(lp) && (skb = skb_dequeue(&lp->super_tx_queue))) ++ isdn_net_writebuf_skb(lp, skb); ++ ++#else + isdn_net_writebuf_skb(lp, skb); ++#endif + spin_unlock_bh(&lp->xmit_lock); + + /* the following stuff is here for backwards compatibility. +@@ -1143,6 +1524,69 @@ + + return retv; + ++#if 0 ++ if (lp->cps > lp->triggercps) { ++ /* Device overloaded */ ++ ++ /* ++ * Packet-delivery via round-robin over master ++ * and all connected slaves. ++ */ ++ if (lp->master) { ++ /* Slaves always deliver themselves */ ++ spin_lock_bh(&lp->xmit_lock); ++ if (!isdn_net_lp_busy(lp)) { ++ isdn_net_writebuf_skb(lp, skb); ++ ret = 0; ++ } else { ++ isdn_net_device_stop_queue(lp); ++ ret = 1; ++ } ++ ret = isdn_net_send_skb(ndev, lp, skb); ++ spin_unlock_bh(&lp->xmit_lock); ++ } else { ++ isdn_net_local *slp = (isdn_net_local *) (lp->srobin->priv); ++ /* Master delivers via srobin and maintains srobin */ ++ if (lp->srobin == ndev) { ++ spin_lock_bh(&lp->xmit_lock); ++ ret = isdn_net_send_skb(ndev, lp, skb); ++ spin_unlock_bh(&lp->xmit_lock); ++ } else { ++ ret = isdn_net_start_xmit(skb, lp->srobin); ++ } ++ lp->srobin = (slp->slave) ? slp->slave : ndev; ++ slp = (isdn_net_local *) (lp->srobin->priv); ++ if (!((slp->flags & ISDN_NET_CONNECTED) && (slp->dialstate == 0))) ++ lp->srobin = ndev; ++ } ++ /* Slave-startup using delay-variable */ ++ if (lp->slave) { ++ if (!lp->sqfull) { ++ /* First time overload: set timestamp only */ ++ lp->sqfull = 1; ++ lp->sqfull_stamp = jiffies; ++ } else { ++ /* subsequent overload: if slavedelay exceeded, start dialing */ ++ if ((jiffies - lp->sqfull_stamp) > lp->slavedelay) ++ isdn_net_force_dial_lp((isdn_net_local *) lp->slave->priv); ++ } ++ } ++ } else { ++ /* Not overloaded, deliver locally */ ++ spin_lock_bh(&lp->xmit_lock); ++ if (!isdn_net_lp_busy(lp)) { ++ isdn_net_writebuf_skb(lp, skb); ++ ret = 0; ++ } else { ++ isdn_net_device_stop_queue(lp); ++ ret = 1; ++ } ++ spin_unlock_bh(&lp->xmit_lock); ++ if (lp->sqfull && ((jiffies - lp->sqfull_stamp) > (lp->slavedelay + (10 * HZ)))) ++ lp->sqfull = 0; ++ } ++ return ret; ++#endif + } + + static void +@@ -1161,6 +1605,7 @@ + } + + ++#ifndef COMPAT_NO_SOFTNET + void isdn_net_tx_timeout(struct net_device * ndev) + { + isdn_net_local *lp = (isdn_net_local *) ndev->priv; +@@ -1188,19 +1633,206 @@ + ndev->trans_start = jiffies; + netif_wake_queue(ndev); + } ++#endif + + /* + * Try sending a packet. + * If this interface isn't connected to a ISDN-Channel, find a free channel, + * and start dialing. + */ ++#ifdef CONFIG_ISDN_WITH_ABC ++static int dwabc_isdn_net_start_xmit(struct sk_buff *,struct net_device *); ++ ++static int isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev) ++{ ++ if(skb == NULL || ndev == NULL) ++ return(dwabc_isdn_net_start_xmit(skb,ndev)); ++#ifdef CONFIG_ISDN_WITH_ABC_UDP_CHECK ++ if(!(((isdn_net_local *)ndev->priv)->dw_abc_flags & ++ ISDN_DW_ABC_FLAG_NO_UDP_CHECK)) { ++ ++ if(dw_abc_udp_test(skb,ndev)) { ++ dev_kfree_skb(skb); ++ return(0); ++ } ++ } ++#endif ++ return(dwabc_isdn_net_start_xmit(skb,ndev)); ++} ++ ++ ++#ifdef CONFIG_ISDN_WITH_ABC ++int isdn_auto_dial_helper( isdn_net_local *lp, ++ struct sk_buff *skb, ++ int dm_manual_allowed) ++/********************************************************************** ++ return's: ++ -1 dial not allowed or impossible ++ 0 interface is connected ++ 1 dial is started ++***********************************************************************/ ++{ ++ int retw = -1; ++ int chi; ++ ulong flags; ++ char *errmsg = NULL; ++ ++#ifdef ISDN_DEBUG_NET_DUMP ++ { ++ char *buf = skb->data; ++ isdn_dumppkt("S:", buf, skb->len, 40); ++ } ++#endif ++ if (lp->flags & ISDN_NET_CONNECTED) ++ return(0); ++ ++ save_flags(flags); ++ cli(); ++ ++ do { ++ ++ /* Log packet, which triggered dialing */ ++ if (dev->net_verbose) ++ isdn_net_log_skb(skb, lp); ++ /* only do autodial if allowed by config */ ++ if (!(ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_AUTO)) { ++ errmsg = "dial rejected: interface not in dialmode `auto'"; ++ ++ if(dm_manual_allowed && ++ !(ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_MANUAL)) { ++ ++ errmsg = ++ "dial rejected: interface not in dialmode `auto or manual'"; ++ } ++ break; ++ } ++ ++ if (!lp->phone[1]) { ++ ++ errmsg = "No phone number"; ++ break; ++ } ++ ++ if(lp->dialwait_timer <= 0) { ++ ++ if( lp->dialstarted > 0 && ++ lp->dialtimeout > 0 && ++ jiffies < (lp->dialstarted + lp->dialtimeout + lp->dialwait)) { ++ ++ lp->dialwait_timer = ++ lp->dialstarted + lp->dialtimeout + lp->dialwait; ++ } ++ } ++ ++ if(lp->dialwait_timer > 0) { ++ ++ if(jiffies < lp->dialwait_timer) { ++ ++ errmsg = "dial rejected: retry-time not reached"; ++ break; ++ ++ } else lp->dialwait_timer = 0; ++ } ++#ifdef CONFIG_ISDN_WITH_ABC ++ if(isdn_dwabc_is_interface_disabled(lp)) ++ break; ++#endif ++ /* Grab a free ISDN-Channel */ ++ if (((chi = ++ isdn_get_free_channel( ++ ISDN_USAGE_NET, ++ lp->l2_proto, ++ lp->l3_proto, ++ lp->pre_device, ++ lp->pre_channel, ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ (*lp->dw_out_msn) ? lp->dw_out_msn : ++#endif ++ lp->msn) ++ ) < 0) && ++ ((chi = ++ isdn_get_free_channel( ++ ISDN_USAGE_NET, ++ lp->l2_proto, ++ lp->l3_proto, ++ lp->pre_device, ++ lp->pre_channel^1, ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ (*lp->dw_out_msn) ? lp->dw_out_msn : ++#endif ++ lp->msn) ++ ) < 0)) { ++ ++ errmsg = "No channel"; ++ break; ++ } ++ ++ lp->dialstate = 1; ++ /* Connect interface with channel */ ++ isdn_net_bind_channel(lp, chi); ++#ifdef CONFIG_ISDN_PPP ++ if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) { ++ /* no 'first_skb' handling for syncPPP */ ++ if (isdn_ppp_bind(lp) < 0) { ++ isdn_net_unbind_channel(lp); ++ break; ++ } ++ ++ isdn_net_dial(); /* Initiate dialing */ ++ netif_stop_queue(&lp->netdev->dev); ++ retw = 1; ++ break; ++ /* let upper layer requeue skb packet */ ++ } ++#endif ++ /* Initiate dialing */ ++ isdn_net_dial(); ++ isdn_net_device_stop_queue(lp); ++ retw = 1; ++ ++ } while(0); ++ ++ if(retw < 0 && errmsg != NULL) ++ isdn_net_unreachable(&lp->netdev->dev, skb, errmsg); ++ ++ restore_flags(flags); ++ return(retw); ++} ++#endif ++ ++ ++ ++static int ++dwabc_isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev) ++#else + static int + isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev) ++#endif + { + isdn_net_local *lp = (isdn_net_local *) ndev->priv; + #ifdef CONFIG_ISDN_X25 + struct concap_proto * cprot = lp -> netdev -> cprot; + #endif ++#ifdef COMPAT_NO_SOFTNET ++ /* some comment as with the softnet TX timeout ++ when this happens, it's a bug in the HL card driver ++ and should be fixed there, so we can supposedly get rid of ++ this here at all. ++ I added a debugging message to find out if it ever occurs --KG ++ */ ++ ++ if (ndev->tbusy) { ++ if (jiffies - ndev->trans_start < ISDN_NET_TX_TIMEOUT) ++ return 1; ++ if (!lp->dialstate){ ++ lp->stats.tx_errors++; ++ printk(KERN_WARNING "isdn_tx_timeout dev %s dialstate %d\n", ++ ndev->name, lp->dialstate); ++ } ++ ndev->trans_start = jiffies; ++ netif_wake_queue(ndev); ++ } ++#endif + #ifdef CONFIG_ISDN_X25 + /* At this point hard_start_xmit() passes control to the encapsulation + protocol (if present). +@@ -1220,6 +1852,40 @@ + } else + #endif + /* auto-dialing xmit function */ ++#ifdef CONFIG_ISDN_WITH_ABC ++ { ++ int r; ++ ++ isdn_net_adjust_hdr(skb, ndev); ++ ++ if(!(r = isdn_auto_dial_helper(lp,skb,0))) { ++ ++ /* ++ ** Device is connected to an ISDN channel ++ */ ++ ndev->trans_start = jiffies; ++ ++ if (!lp->dialstate) { ++ ++ /* ++ ** ISDN connection is established, try sending ++ */ ++ r = isdn_net_xmit(ndev, skb); ++ ++ } else r = 1; ++ ++ if(r) ++ netif_stop_queue(ndev); ++ ++ } else if(r < 0) { ++ ++ dev_kfree_skb(skb); ++ r = 0; ++ } ++ ++ return(r); ++ } ++#else + { + #ifdef ISDN_DEBUG_NET_DUMP + u_char *buf; +@@ -1256,6 +1922,14 @@ + } else + lp->dialwait_timer = 0; + } ++#ifdef CONFIG_ISDN_WITH_ABC ++ if(isdn_dwabc_is_interface_disabled(lp)) { ++ ++ dev_kfree_skb(skb); ++ restore_flags(flags); ++ return(0); ++ } ++#endif + /* Grab a free ISDN-Channel */ + if (((chi = + isdn_get_free_channel( +@@ -1264,6 +1938,9 @@ + lp->l3_proto, + lp->pre_device, + lp->pre_channel, ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ (*lp->dw_out_msn) ? lp->dw_out_msn : ++#endif + lp->msn) + ) < 0) && + ((chi = +@@ -1273,6 +1950,9 @@ + lp->l3_proto, + lp->pre_device, + lp->pre_channel^1, ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ (*lp->dw_out_msn) ? lp->dw_out_msn : ++#endif + lp->msn) + ) < 0)) { + restore_flags(flags); +@@ -1296,16 +1976,6 @@ + restore_flags(flags); + return 0; /* STN (skb to nirvana) ;) */ + } +-#ifdef CONFIG_IPPP_FILTER +- if (isdn_ppp_autodial_filter(skb, lp)) { +- isdn_ppp_free(lp); +- isdn_net_unbind_channel(lp); +- restore_flags(flags); +- isdn_net_unreachable(ndev, skb, "dial rejected: packet filtered"); +- dev_kfree_skb(skb); +- return 0; +- } +-#endif + restore_flags(flags); + isdn_net_dial(); /* Initiate dialing */ + netif_stop_queue(ndev); +@@ -1337,6 +2007,7 @@ + } + } + return 1; ++#endif + } + + /* +@@ -1356,6 +2027,9 @@ + if( cprot && cprot -> pops ) cprot -> pops -> close( cprot ); + #endif + netif_stop_queue(dev); ++#ifdef COMPAT_NO_SOFTNET ++ dev->start = 0; ++#endif + if ((p = (((isdn_net_local *) dev->priv)->slave))) { + /* If this interface has slaves, stop them also */ + while (p) { +@@ -1776,6 +2450,10 @@ + } + + switch (type) { ++ case CISCO_TYPE_INET: ++ skb->protocol = htons(ETH_P_IP); ++ netif_rx(skb); ++ break; + case CISCO_TYPE_SLARP: + isdn_net_ciscohdlck_slarp_in(lp, skb); + goto out_free; +@@ -1785,11 +2463,11 @@ + "\"no cdp enable\" on cisco.\n", lp->name); + goto out_free; + default: +- /* no special cisco protocol */ +- skb->protocol = htons(type); +- netif_rx(skb); +- return; ++ printk(KERN_WARNING "%s: Unknown Cisco type 0x%04x\n", ++ lp->name, type); ++ goto out_free; + } ++ return; + + out_free: + kfree_skb(skb); +@@ -1803,9 +2481,19 @@ + { + isdn_net_local *lp = (isdn_net_local *) ndev->priv; + isdn_net_local *olp = lp; /* original 'lp' */ ++#ifdef CONFIG_ISDN_PPP ++ int proto = PPP_PROTOCOL(skb->data); ++#endif + #ifdef CONFIG_ISDN_X25 + struct concap_proto *cprot = lp -> netdev -> cprot; + #endif ++#ifdef CONFIG_ISDN_WITH_ABC ++ struct net_device *ondev = ndev; ++#ifdef CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER ++ ulong lp_huptimer = 0; ++ ulong olp_huptimer = 0; ++#endif ++#endif + lp->transcount += skb->len; + + lp->stats.rx_packets++; +@@ -1819,6 +2507,10 @@ + lp->stats.rx_packets++; + lp->stats.rx_bytes += skb->len; + } ++#ifdef CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER ++ lp_huptimer = lp->huptimer; ++ olp_huptimer = olp->huptimer; ++#endif + skb->dev = ndev; + skb->pkt_type = PACKET_HOST; + skb->mac.raw = skb->data; +@@ -1840,9 +2532,40 @@ + /* Fall through */ + case ISDN_NET_ENCAP_RAWIP: + /* RAW-IP without MAC-Header */ ++#ifdef CONFIG_ISDN_WITH_ABC ++ if(olp->p_encap == ISDN_NET_ENCAP_RAWIP) { ++ ++ ushort l = skb->len; ++ short r = 0; ++ ++ olp->dw_abc_bsd_bsd_rcv += l; ++ ++ if((skb = dwabc_bsd_rx_pkt(olp,skb,ondev)) == NULL) { ++ ++ olp->dw_abc_bsd_rcv += l; ++ return; ++ } ++ ++ olp->dw_abc_bsd_rcv += skb->len; ++ ++ if( l != skb->len && ++ (r=isdn_dc2minor(olp->isdn_device,olp->isdn_channel))>=0) { ++ ++ dev->ibytes[r] += skb->len - l; ++ olp->stats.rx_bytes += skb->len - l; ++ ++ if(olp != lp) ++ lp->stats.rx_bytes += skb->len - l; ++ } ++ } ++#endif + olp->huptimer = 0; + lp->huptimer = 0; + skb->protocol = htons(ETH_P_IP); ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ if(isdn_dwabc_conerr_ippktok(skb)) ++ lp->dw_abc_bchan_errcnt = 0; ++#endif + break; + case ISDN_NET_ENCAP_CISCOHDLCK: + isdn_net_ciscohdlck_receive(lp, skb); +@@ -1862,8 +2585,22 @@ + break; + #ifdef CONFIG_ISDN_PPP + case ISDN_NET_ENCAP_SYNCPPP: +- /* huptimer is done in isdn_ppp_push_higher */ ++ /* ++ * If encapsulation is syncppp, don't reset ++ * huptimer on LCP packets. ++ */ ++ if (proto != PPP_LCP) { ++ olp->huptimer = 0; ++ lp->huptimer = 0; ++ } + isdn_ppp_receive(lp->netdev, olp, skb); ++#ifdef CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER ++ if(olp->dw_abc_flags & ISDN_DW_ABC_FLAG_RCV_NO_HUPTIMER) { ++ ++ lp->huptimer = lp_huptimer + 1; ++ olp->huptimer = olp_huptimer+ 1; ++ } ++#endif + return; + #endif + +@@ -1873,6 +2610,15 @@ + if(cprot) if(cprot -> pops) + if( cprot -> pops -> data_ind){ + cprot -> pops -> data_ind(cprot,skb); ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ lp->dw_abc_bchan_errcnt = 0; ++#ifdef CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER ++ if(olp->dw_abc_flags & ISDN_DW_ABC_FLAG_RCV_NO_HUPTIMER) { ++ lp->huptimer = lp_huptimer; ++ olp->huptimer = olp_huptimer; ++ } ++#endif ++#endif + return; + }; + #endif /* CONFIG_ISDN_X25 */ +@@ -1882,6 +2628,15 @@ + return; + } + ++#ifdef CONFIG_ISDN_WITH_ABC ++#ifdef CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER ++ if(olp->dw_abc_flags & ISDN_DW_ABC_FLAG_RCV_NO_HUPTIMER) { ++ ++ lp->huptimer = lp_huptimer; ++ olp->huptimer = olp_huptimer; ++ } ++#endif ++#endif + netif_rx(skb); + return; + } +@@ -2160,8 +2915,10 @@ + isdn_net_phone *n; + ulong flags; + char nr[32]; +- char *my_eaz; +- ++#ifdef CONFIG_ISDN_WITH_ABC ++ if(dev->net_verbose > 2) ++ printk(KERN_DEBUG "n_fi: di=%d ch=%d idx=%d usg=0x%04X\n", di, ch, idx,dev->usage[idx]); ++#endif + /* Search name in netdev-chain */ + save_flags(flags); + cli(); +@@ -2180,17 +2937,15 @@ + eaz = setup->eazmsn; + if (dev->net_verbose > 1) + printk(KERN_INFO "isdn_net: call from %s,%d,%d -> %s\n", nr, si1, si2, eaz); +- /* Accept DATA and VOICE calls at this stage +- local eaz is checked later for allowed call types */ +- if ((si1 != 7) && (si1 != 1)) { +- restore_flags(flags); +- if (dev->net_verbose > 1) +- printk(KERN_INFO "isdn_net: Service-Indicator not 1 or 7, ignored\n"); +- return 0; +- } +- +-n = (isdn_net_phone *) 0; +-p = dev->netdev; ++ /* Accept only calls with Si1 = 7 (Data-Transmission) */ ++ if (si1 != 7) { ++ restore_flags(flags); ++ if (dev->net_verbose > 1) ++ printk(KERN_INFO "isdn_net: Service-Indicator not 7, ignored\n"); ++ return 0; ++ } ++ n = (isdn_net_phone *) 0; ++ p = dev->netdev; + ematch = wret = swapped = 0; + #ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: di=%d ch=%d idx=%d usg=%d\n", di, ch, idx, +@@ -2210,25 +2965,8 @@ + break; + } + swapped = 0; +- /* check acceptable call types for DOV */ +- my_eaz = isdn_map_eaz2msn(lp->msn, di); +- if (si1 == 1) { /* it's a DOV call, check if we allow it */ +- if (*my_eaz == 'v' || *my_eaz == 'V' || +- *my_eaz == 'b' || *my_eaz == 'B') +- my_eaz++; /* skip to allow a match */ +- else +- my_eaz = 0; /* force non match */ +- } else { /* it's a DATA call, check if we allow it */ +- if (*my_eaz == 'b' || *my_eaz == 'B') +- my_eaz++; /* skip to allow a match */ +- } +- if (my_eaz) +- matchret = isdn_msncmp(eaz, my_eaz); +- else +- matchret = 1; +- if (!matchret) +- ematch = 1; +- ++ if (!(matchret = isdn_msncmp(eaz, isdn_map_eaz2msn(lp->msn, di)))) ++ ematch = 1; + /* Remember if more numbers eventually can match */ + if (matchret > wret) + wret = matchret; +@@ -2236,17 +2974,122 @@ + printk(KERN_DEBUG "n_fi: if='%s', l.msn=%s, l.flags=%d, l.dstate=%d\n", + lp->name, lp->msn, lp->flags, lp->dialstate); + #endif ++#ifdef CONFIG_ISDN_WITH_ABC_CALLB ++ if ((!matchret) && /* EAZ is matching */ ++ (((!(lp->flags & ISDN_NET_CONNECTED)) && /* but not connected */ ++ (USG_NONE(dev->usage[idx]))) || /* and ch. unused or */ ++ (lp->dialstate == 4) || (lp->dialstate == 12) || /* if dialing */ ++ ((lp->flags & ISDN_NET_CBOUT) != 0 && /* init a callback */ ++ lp->outgoing != 0 ))) ++ ++ /* ++ ** we dont stop call's anymore (both sides call's syncron) ++ ** it will be problem in any case. ++ ** both sides will make the same. ++ ** i try later to make a switch (check the phon-numbers) ++ ** to detect with side must be stop the call. ++ */ ++#else + if ((!matchret) && /* EAZ is matching */ + (((!(lp->flags & ISDN_NET_CONNECTED)) && /* but not connected */ + (USG_NONE(dev->usage[idx]))) || /* and ch. unused or */ + ((((lp->dialstate == 4) || (lp->dialstate == 12)) && /* if dialing */ + (!(lp->flags & ISDN_NET_CALLBACK))) /* but no callback */ + ))) ++#endif + { + #ifdef ISDN_DEBUG_NET_ICALL + printk(KERN_DEBUG "n_fi: match1, pdev=%d pch=%d\n", + lp->pre_device, lp->pre_channel); + #endif ++#ifdef CONFIG_ISDN_WITH_ABC ++#ifdef CONFIG_ISDN_WITH_ABC_CALLB ++ { ++ int use_this_call = 0; ++ ++ if(!(lp->flags & ISDN_NET_CBOUT) && ((lp->dialstate == 4) || (lp->dialstate == 12))) { ++ ++ /* ++ ** searching for a diff. in the calling-number and the EAZ ++ ** the remote will make the same ++ */ ++ ++ char *pnr = nr; ++ char *pea = eaz; ++ ++ for(;*pnr;pnr++); ++ for(;*pea;pea++); ++ for(pnr--,pea--;pnr >= nr && pea >= eaz && *pea != *pnr;pnr--,pea--); ++ ++ if(pnr < nr || pea < eaz || *pea > *pnr) { ++ ++ p = (isdn_net_dev *) p->next; ++ continue; ++ } ++ ++ use_this_call = 1; ++ } ++ ++ if( use_this_call || ++ ((lp->flags & ISDN_NET_CBOUT) && (lp->flags & ISDN_NET_CONNECTED))) { ++ ++ /* ++ ** the incoming call was to quick. ++ ** the callback-delay-time ist not reached. ++ ** in that case we can stop the call ++ */ ++ ++ if(lp->isdn_device > -1 && lp->isdn_channel > -1) { ++ ++ int minor = isdn_dc2minor(lp->isdn_device,lp->isdn_channel); ++ ++ if(lp->isdn_device != di || lp->isdn_channel != ch) { ++ ++ isdn_ctrl cmd; ++ ++ memset((void *)&cmd,0,sizeof(cmd)); ++ cmd.driver = lp->isdn_device; ++ cmd.command = ISDN_CMD_HANGUP; ++ cmd.arg = lp->isdn_channel; ++ (void) dev->drv[cmd.driver]->interface->command(&cmd); ++ isdn_all_eaz(lp->isdn_device, lp->isdn_channel); ++ ++ if(dev->net_verbose > 1) { ++ ++ printk(KERN_INFO ++ "%s: found outgoing call hangup old call on di %d ch %d\n", ++ lp->name,lp->isdn_device,lp->isdn_channel); ++ } ++ ++ } else if (dev->net_verbose > 1) { ++ ++ printk(KERN_INFO "%s: found outgoing call on same di %d ch %d\n", ++ lp->name,lp->isdn_device,lp->isdn_channel); ++ } ++ ++ if(minor >= 0) { ++ ++ dev->rx_netdev[minor] = NULL; ++ dev->st_netdev[minor] = NULL; ++ } ++ ++ isdn_free_channel(lp->isdn_device, ++ lp->isdn_channel, ISDN_USAGE_NET); ++ ++ } else if (dev->net_verbose > 1) { ++ ++ printk(KERN_INFO "%s: found outgoing call reset callstate \n",lp->name); ++ } ++ ++ lp->flags &= ~ISDN_NET_CONNECTED; ++ lp->isdn_device = -1; ++ lp->isdn_channel = -1; ++ lp->dtimer = 0; ++ lp->dialstate = 0; ++ } ++ } ++#endif ++#endif + if (dev->usage[idx] & ISDN_USAGE_EXCLUSIVE) { + if ((lp->pre_channel != ch) || + (lp->pre_device != di)) { +@@ -2375,6 +3218,12 @@ + continue; + } + } ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ if(isdn_dwabc_is_interface_disabled(lp)) { ++ restore_flags(flags); ++ return 3; ++ } ++#endif + if (lp->flags & ISDN_NET_CALLBACK) { + int chi; + /* +@@ -2427,6 +3276,47 @@ + restore_flags(flags); + return 0; + } else { ++#ifdef CONFIG_ISDN_WITH_ABC_CALLB ++ { ++ /* ++ ** this is a sanity-check. ++ ** check for double use (device and channel) ++ ** will be very near to a kernel-crash in that case ++ */ ++ isdn_net_dev *sp = dev->netdev; ++ int s_shl; ++ isdn_net_local *ml; ++ ++ for(s_shl=0; s_shl < 2048 && sp != NULL; sp = (isdn_net_dev *)sp->next, s_shl++) { ++ ++ if(sp == p || (ml = sp->local) == NULL) ++ continue; ++ ++ if(ml->isdn_device != di || ml->isdn_channel != ch) ++ continue; ++ ++ if(ml->dialstate != 4 && ml->dialstate != 12) { ++ ++ /* ++ ** wrong situation ++ */ ++ break; ++ } ++ ++ isdn_net_unbind_channel(ml); ++ } ++ ++ if(sp != NULL) { ++ ++ printk(KERN_DEBUG ++"%s: call from %s -> %s (drv %d chan %d duplicated with %s) \n", ++ lp->name, nr, eaz,di,ch, ++ sp->local->name ); ++ ++ restore_flags(flags); ++ return 3; ++ }} ++#endif + printk(KERN_DEBUG "%s: call from %s -> %s accepted\n", lp->name, nr, + eaz); + /* if this interface is dialing, it does it probably on a different +@@ -2516,7 +3406,11 @@ + lp->l3_proto, + lp->pre_device, + lp->pre_channel, ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ (*lp->dw_out_msn) ? lp->dw_out_msn : lp->msn) ++#else + lp->msn) ++#endif + ) < 0) { + printk(KERN_WARNING "isdn_net_force_dial: No channel for %s\n", lp->name); + restore_flags(flags); +@@ -2599,7 +3493,11 @@ + strcpy(netdev->local->name, " "); + else + strcpy(netdev->local->name, name); ++#ifdef COMPAT_NO_SOFTNET ++ netdev->dev.name = netdev->local->name; ++#else + strcpy(netdev->dev.name, netdev->local->name); ++#endif + netdev->dev.priv = netdev->local; + netdev->dev.init = isdn_net_init; + netdev->local->p_encap = ISDN_NET_ENCAP_RAWIP; +@@ -2617,11 +3515,13 @@ + ((isdn_net_local *) q->priv)->slave = &(netdev->dev); + } else { + /* Device shall be a master */ ++#ifndef COMPAT_NO_SOFTNET + /* + * Watchdog timer (currently) for master only. + */ + netdev->dev.tx_timeout = isdn_net_tx_timeout; + netdev->dev.watchdog_timeo = ISDN_NET_TX_TIMEOUT; ++#endif + if (register_netdev(&netdev->dev) != 0) { + printk(KERN_WARNING "isdn_net: Could not register net-device\n"); + kfree(netdev->local); +@@ -2658,6 +3558,9 @@ + netdev->local->hupflags = ISDN_INHUP; /* Do hangup even on incoming calls */ + netdev->local->onhtime = 10; /* Default hangup-time for saving costs + of those who forget configuring this */ ++#ifdef CONFIG_ISDN_WITH_ABC ++ netdev->local->dw_abc_old_onhtime = netdev->local->onhtime; ++#endif + netdev->local->dialmax = 1; + netdev->local->flags = ISDN_NET_CBHUP | ISDN_NET_DM_MANUAL; /* Hangup before Callback, manual dial */ + netdev->local->cbdelay = 25; /* Wait 5 secs before Callback */ +@@ -2831,7 +3734,6 @@ + + /* If binding is exclusive, try to grab the channel */ + save_flags(flags); +- cli(); + if ((i = isdn_get_free_channel(ISDN_USAGE_NET, + lp->l2_proto, lp->l3_proto, drvidx, + chidx, lp->msn)) < 0) { +@@ -2859,6 +3761,9 @@ + lp->pre_device = drvidx; + lp->pre_channel = chidx; + lp->onhtime = cfg->onhtime; ++#ifdef CONFIG_ISDN_WITH_ABC ++ lp->dw_abc_old_onhtime = lp->onhtime; ++#endif + lp->charge = cfg->charge; + lp->l2_proto = cfg->l2_proto; + lp->l3_proto = cfg->l3_proto; +@@ -2932,6 +3837,9 @@ + } + } + lp->p_encap = cfg->p_encap; ++#ifdef CONFIG_ISDN_WITH_ABC ++ isdn_dw_abc_reset_interface(lp,0); ++#endif + return 0; + } + return -ENODEV; +@@ -3007,6 +3915,9 @@ + strcpy(n->num, phone->phone); + n->next = p->local->phone[phone->outgoing & 1]; + p->local->phone[phone->outgoing & 1] = n; ++#ifdef CONFIG_ISDN_WITH_ABC ++ isdn_dwabc_test_phone(p->local); ++#endif + return 0; + } + return -ENODEV; +@@ -3100,6 +4011,9 @@ + else + p->local->phone[inout] = n->next; + kfree(n); ++#ifdef CONFIG_ISDN_WITH_ABC ++ isdn_dwabc_test_phone(p->local); ++#endif + restore_flags(flags); + return 0; + } +@@ -3135,6 +4049,9 @@ + p->local->phone[i] = NULL; + } + p->local->dial = NULL; ++#ifdef CONFIG_ISDN_WITH_ABC ++ isdn_dwabc_test_phone(p->local); ++#endif + restore_flags(flags); + return 0; + } +@@ -3218,6 +4135,10 @@ + /* If no more net-devices remain, disable auto-hangup timer */ + if (dev->netdev == NULL) + isdn_timer_ctrl(ISDN_TIMER_NETHANGUP, 0); ++#ifdef CONFIG_ISDN_WITH_ABC ++ isdn_dw_clear_if(~0l,p->local); ++ dwabc_bsd_free(p->local); ++#endif + restore_flags(flags); + kfree(p->local); + kfree(p); +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_net.h linux-2.4.29/drivers/isdn/isdn_net.h +--- linux-2.4.29.old/drivers/isdn/isdn_net.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_net.h 2005-03-22 15:06:44.463333328 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_net.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_net.h,v 1.23 2001/11/07 22:35:48 kai Exp $ + * + * header for Linux ISDN subsystem, network related functions (linklevel). + * +@@ -26,6 +26,7 @@ + #define CISCO_ADDR_BROADCAST 0x8f + #define CISCO_CTRL 0x00 + #define CISCO_TYPE_CDP 0x2000 ++#define CISCO_TYPE_INET 0x0800 + #define CISCO_TYPE_SLARP 0x8035 + #define CISCO_SLARP_REQUEST 0 + #define CISCO_SLARP_REPLY 1 +@@ -106,8 +107,6 @@ + spin_lock_irqsave(&nd->queue_lock, flags); + + lp = nd->queue; +-// printk(KERN_DEBUG __FUNCTION__": lp:%s(%p) nlp:%s(%p) last(%p)\n", +-// lp->name, lp, nlp->name, nlp, lp->last); + nlp->last = lp->last; + lp->last->next = nlp; + lp->last = nlp; +@@ -127,20 +126,12 @@ + if (lp->master) + master_lp = (isdn_net_local *) lp->master->priv; + +-// printk(KERN_DEBUG __FUNCTION__": lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n", +-// lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue); + spin_lock_irqsave(&master_lp->netdev->queue_lock, flags); + lp->last->next = lp->next; + lp->next->last = lp->last; +- if (master_lp->netdev->queue == lp) { ++ if (master_lp->netdev->queue == lp) + master_lp->netdev->queue = lp->next; +- if (lp->next == lp) { /* last in queue */ +- master_lp->netdev->queue = master_lp->netdev->local; +- } +- } + lp->next = lp->last = lp; /* (re)set own pointers */ +-// printk(KERN_DEBUG __FUNCTION__": mndq(%p)\n", +-// master_lp->netdev->queue); + spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags); + } + +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ppp.c linux-2.4.29/drivers/isdn/isdn_ppp.c +--- linux-2.4.29.old/drivers/isdn/isdn_ppp.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_ppp.c 2005-03-22 15:06:44.481330592 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_ppp.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_ppp.c,v 1.94 2001/11/07 22:35:48 kai Exp $ + * + * Linux ISDN subsystem, functions for synchronous PPP (linklevel). + * +@@ -13,9 +13,6 @@ + #include <linux/isdn.h> + #include <linux/poll.h> + #include <linux/ppp-comp.h> +-#ifdef CONFIG_IPPP_FILTER +-#include <linux/filter.h> +-#endif + + #include "isdn_common.h" + #include "isdn_ppp.h" +@@ -72,11 +69,19 @@ + static int isdn_ppp_bundle(struct ippp_struct *, int unit); + #endif /* CONFIG_ISDN_MPP */ + +-char *isdn_ppp_revision = "$Revision: 1.1.4.1 $"; ++char *isdn_ppp_revision = "$Revision: 1.94 $"; + + static struct ippp_struct *ippp_table[ISDN_MAX_CHANNELS]; + ++#ifndef CONFIG_ISDN_WITH_ABC + static struct isdn_ppp_compressor *ipc_head = NULL; ++#else ++ /* ++ ** make compressor's common usable ++ */ ++struct isdn_ppp_compressor *isdn_ippp_comp_head = NULL; ++#define ipc_head isdn_ippp_comp_head ++#endif + + /* + * frame log (debug) +@@ -110,11 +115,8 @@ + unsigned long flags; + struct ippp_struct *is; + +- if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "%s: ppp_slot(%d) out of range\n", +- __FUNCTION__, lp->ppp_slot); ++ if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) + return 0; +- } + + save_flags(flags); + cli(); +@@ -130,12 +132,7 @@ + lp->netdev->pb->ref_ct--; + spin_unlock(&lp->netdev->pb->lock); + #endif /* CONFIG_ISDN_MPP */ +- if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "%s: ppp_slot(%d) now invalid\n", +- __FUNCTION__, lp->ppp_slot); +- restore_flags(flags); +- return 0; +- } ++ + is = ippp_table[lp->ppp_slot]; + if ((is->state & IPPP_CONNECT)) + isdn_ppp_closewait(lp->ppp_slot); /* force wakeup on ippp device */ +@@ -231,13 +228,12 @@ + void + isdn_ppp_wakeup_daemon(isdn_net_local * lp) + { +- if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "%s: ppp_slot(%d) out of range\n", +- __FUNCTION__, lp->ppp_slot); ++ if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) + return; +- } ++ + ippp_table[lp->ppp_slot]->state = IPPP_OPEN | IPPP_CONNECT | IPPP_NOBLOCK; +- wake_up_interruptible(&ippp_table[lp->ppp_slot]->wq); ++ ++ wake_up_interruptible(&ippp_table[lp->ppp_slot]->wq); + } + + /* +@@ -250,14 +246,13 @@ + { + struct ippp_struct *is; + +- if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "%s: slot(%d) out of range\n", +- __FUNCTION__, slot); ++ if (slot < 0 || slot >= ISDN_MAX_CHANNELS) + return 0; +- } + is = ippp_table[slot]; ++ + if (is->state) + wake_up_interruptible(&is->wq); ++ + is->state = IPPP_CLOSEWAIT; + return 1; + } +@@ -295,9 +290,11 @@ + return -EBUSY; + } + is = file->private_data = ippp_table[slot]; +- +- printk(KERN_DEBUG "ippp, open, slot: %d, minor: %d, state: %04x\n", +- slot, min, is->state); ++ ++#if 0 ++ if (is->debug & 0x1) ++#endif ++ printk(KERN_DEBUG "ippp, open, slot: %d, minor: %d, state: %04x\n", slot, min, is->state); + + /* compression stuff */ + is->link_compressor = is->compressor = NULL; +@@ -327,10 +324,7 @@ + */ + is->slcomp = slhc_init(16, 16); /* not necessary for 2. link in bundle */ + #endif +-#ifdef CONFIG_IPPP_FILTER +- is->pass_filter.filter = NULL; +- is->active_filter.filter = NULL; +-#endif ++ + is->state = IPPP_OPEN; + + return 0; +@@ -349,20 +343,12 @@ + return; + is = file->private_data; + +- if (!is) { +- printk(KERN_ERR "%s: no file->private_data\n", __FUNCTION__); +- return; +- } + if (is->debug & 0x1) + printk(KERN_DEBUG "ippp: release, minor: %d %lx\n", min, (long) is->lp); + + if (is->lp) { /* a lp address says: this link is still up */ + isdn_net_dev *p = is->lp->netdev; + +- if (!p) { +- printk(KERN_ERR "%s: no lp->netdev\n", __FUNCTION__); +- return; +- } + is->state &= ~IPPP_CONNECT; /* -> effect: no call of wakeup */ + /* + * isdn_net_hangup() calls isdn_ppp_free() +@@ -385,18 +371,8 @@ + slhc_free(is->slcomp); + is->slcomp = NULL; + #endif +-#ifdef CONFIG_IPPP_FILTER +- if (is->pass_filter.filter) { +- kfree(is->pass_filter.filter); +- is->pass_filter.filter = NULL; +- } +- if (is->active_filter.filter) { +- kfree(is->active_filter.filter); +- is->active_filter.filter = NULL; +- } +-#endif + +-/* TODO: if this was the previous master: link the stuff to the new master */ ++/* TODO: if this was the previous master: link the the stuff to the new master */ + if(is->comp_stat) + is->compressor->free(is->comp_stat); + if(is->link_comp_stat) +@@ -509,13 +485,15 @@ + if (val & SC_ENABLE_IP && !(is->pppcfg & SC_ENABLE_IP) && (is->state & IPPP_CONNECT)) { + if (lp) { + /* OK .. we are ready to send buffers */ +- is->pppcfg = val; /* isdn_ppp_xmit test for SC_ENABLE_IP !!! */ + netif_wake_queue(&lp->netdev->dev); +- break; + } + } + is->pppcfg = val; + break; ++#if 0 ++ case PPPIOCGSTAT: /* read PPP statistic information */ ++ break; ++#endif + case PPPIOCGIDLE: /* get idle time information */ + if (lp) { + struct ppp_idle pidle; +@@ -604,39 +582,6 @@ + } + return set_arg((void *)arg,&pci,sizeof(struct pppcallinfo)); + } +-#ifdef CONFIG_IPPP_FILTER +- case PPPIOCSPASS: +- case PPPIOCSACTIVE: +- { +- struct sock_fprog uprog, *filtp; +- struct sock_filter *code = NULL; +- int len, err; +- +- if (copy_from_user(&uprog, (void *) arg, sizeof(uprog))) +- return -EFAULT; +- if (uprog.len > 0 && uprog.len < 65536) { +- len = uprog.len * sizeof(struct sock_filter); +- code = kmalloc(len, GFP_KERNEL); +- if (code == NULL) +- return -ENOMEM; +- if (copy_from_user(code, uprog.filter, len)) { +- kfree(code); +- return -EFAULT; +- } +- err = sk_chk_filter(code, uprog.len); +- if (err) { +- kfree(code); +- return err; +- } +- } +- filtp = (cmd == PPPIOCSPASS) ? &is->pass_filter : &is->active_filter; +- if (filtp->filter) +- kfree(filtp->filter); +- filtp->filter = code; +- filtp->len = uprog.len; +- break; +- } +-#endif /* CONFIG_IPPP_FILTER */ + default: + break; + } +@@ -699,7 +644,7 @@ + struct ippp_struct *is; + + if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { +- printk(KERN_WARNING "ippp: illegal slot(%d).\n", slot); ++ printk(KERN_WARNING "ippp: illegal slot.\n"); + return 0; + } + is = ippp_table[slot]; +@@ -976,8 +921,7 @@ + + slot = lp->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "isdn_ppp_receive: lp->ppp_slot(%d)\n", +- lp->ppp_slot); ++ printk(KERN_ERR "isdn_ppp_receive: lp->ppp_slot %d\n", lp->ppp_slot); + kfree_skb(skb); + return; + } +@@ -1026,23 +970,19 @@ + { + struct net_device *dev = &net_dev->dev; + struct ippp_struct *is, *mis; +- isdn_net_local *mlp = NULL; + int slot; + + slot = lp->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "isdn_ppp_push_higher: lp->ppp_slot(%d)\n", +- lp->ppp_slot); ++ printk(KERN_ERR "isdn_ppp_push_higher: lp->ppp_slot %d\n", lp->ppp_slot); + goto drop_packet; + } + is = ippp_table[slot]; + + if (lp->master) { // FIXME? +- mlp = (isdn_net_local *) lp->master->priv; +- slot = mlp->ppp_slot; ++ slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "isdn_ppp_push_higher: master->ppp_slot(%d)\n", +- lp->ppp_slot); ++ printk(KERN_ERR "isdn_ppp_push_higher: master->ppp_slot %d\n", lp->ppp_slot); + goto drop_packet; + } + } +@@ -1076,11 +1016,6 @@ + case PPP_VJC_UNCOMP: + if (is->debug & 0x20) + printk(KERN_DEBUG "isdn_ppp: VJC_UNCOMP\n"); +- if (net_dev->local->ppp_slot < 0) { +- printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n", +- __FUNCTION__, net_dev->local->ppp_slot); +- goto drop_packet; +- } + if (slhc_remember(ippp_table[net_dev->local->ppp_slot]->slcomp, skb->data, skb->len) <= 0) { + printk(KERN_WARNING "isdn_ppp: received illegal VJC_UNCOMP frame!\n"); + goto drop_packet; +@@ -1102,11 +1037,6 @@ + } + skb_put(skb, skb_old->len + 128); + memcpy(skb->data, skb_old->data, skb_old->len); +- if (net_dev->local->ppp_slot < 0) { +- printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n", +- __FUNCTION__, net_dev->local->ppp_slot); +- goto drop_packet; +- } + pkt_len = slhc_uncompress(ippp_table[net_dev->local->ppp_slot]->slcomp, + skb->data, skb_old->len); + kfree_skb(skb_old); +@@ -1133,36 +1063,12 @@ + return; + } + +-#ifdef CONFIG_IPPP_FILTER +- /* check if the packet passes the pass and active filters +- * the filter instructions are constructed assuming +- * a four-byte PPP header on each packet (which is still present) */ +- skb_push(skb, 4); +- skb->data[0] = 0; /* indicate inbound */ +- +- if (is->pass_filter.filter +- && sk_run_filter(skb, is->pass_filter.filter, +- is->pass_filter.len) == 0) { +- if (is->debug & 0x2) +- printk(KERN_DEBUG "IPPP: inbound frame filtered.\n"); +- kfree_skb(skb); +- return; +- } +- if (!(is->active_filter.filter +- && sk_run_filter(skb, is->active_filter.filter, +- is->active_filter.len) == 0)) { +- if (is->debug & 0x2) +- printk(KERN_DEBUG "IPPP: link-active filter: reseting huptimer.\n"); +- lp->huptimer = 0; +- if (mlp) +- mlp->huptimer = 0; +- } +- skb_pull(skb, 4); +-#else /* CONFIG_IPPP_FILTER */ +- lp->huptimer = 0; +- if (mlp) +- mlp->huptimer = 0; +-#endif /* CONFIG_IPPP_FILTER */ ++ /* Reset hangup-timer */ ++ lp->huptimer = 0; ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ lp->dw_abc_bchan_errcnt = 0; ++#endif ++ + skb->dev = dev; + skb->mac.raw = skb->data; + netif_rx(skb); +@@ -1199,6 +1105,7 @@ + return skb_push(skb,len); + } + ++ + /* + * send ppp frame .. we expect a PIDCOMPressable proto -- + * (here: currently always PPP_IP,PPP_VJC_COMP,PPP_VJC_UNCOMP) +@@ -1214,25 +1121,23 @@ + isdn_net_dev *nd; + unsigned int proto = PPP_IP; /* 0x21 */ + struct ippp_struct *ipt,*ipts; +- int slot, retval = 0; ++ int slot; + + mlp = (isdn_net_local *) (netdev->priv); + nd = mlp->netdev; /* get master lp */ + + slot = mlp->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "isdn_ppp_xmit: lp->ppp_slot(%d)\n", +- mlp->ppp_slot); ++ printk(KERN_ERR "isdn_ppp_xmit: lp->ppp_slot %d\n", mlp->ppp_slot); + kfree_skb(skb); +- goto out; ++ return 0; + } + ipts = ippp_table[slot]; + + if (!(ipts->pppcfg & SC_ENABLE_IP)) { /* PPP connected ? */ + if (ipts->debug & 0x1) + printk(KERN_INFO "%s: IP frame delayed.\n", netdev->name); +- retval = 1; +- goto out; ++ return 1; + } + + switch (ntohs(skb->protocol)) { +@@ -1246,25 +1151,24 @@ + printk(KERN_ERR "isdn_ppp: skipped unsupported protocol: %#x.\n", + skb->protocol); + dev_kfree_skb(skb); +- goto out; ++ return 0; + } + + lp = isdn_net_get_locked_lp(nd); + if (!lp) { + printk(KERN_WARNING "%s: all channels busy - requeuing!\n", netdev->name); +- retval = 1; +- goto out; ++ return 1; + } + /* we have our lp locked from now on */ + + slot = lp->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "isdn_ppp_xmit: lp->ppp_slot(%d)\n", +- lp->ppp_slot); ++ printk(KERN_ERR "isdn_ppp_xmit: lp->ppp_slot %d\n", lp->ppp_slot); + kfree_skb(skb); +- goto unlock; ++ return 0; + } + ipt = ippp_table[slot]; ++ lp->huptimer = 0; + + /* + * after this line .. requeueing in the device queue is no longer allowed!!! +@@ -1275,34 +1179,6 @@ + */ + skb_pull(skb,IPPP_MAX_HEADER); + +-#ifdef CONFIG_IPPP_FILTER +- /* check if we should pass this packet +- * the filter instructions are constructed assuming +- * a four-byte PPP header on each packet */ +- skb_push(skb, 4); +- skb->data[0] = 1; /* indicate outbound */ +- *(u_int16_t *)(skb->data + 2) = htons(proto); +- +- if (ipt->pass_filter.filter +- && sk_run_filter(skb, ipt->pass_filter.filter, +- ipt->pass_filter.len) == 0) { +- if (ipt->debug & 0x4) +- printk(KERN_DEBUG "IPPP: outbound frame filtered.\n"); +- kfree_skb(skb); +- goto unlock; +- } +- if (!(ipt->active_filter.filter +- && sk_run_filter(skb, ipt->active_filter.filter, +- ipt->active_filter.len) == 0)) { +- if (ipt->debug & 0x4) +- printk(KERN_DEBUG "IPPP: link-active filter: reseting huptimer.\n"); +- lp->huptimer = 0; +- } +- skb_pull(skb, 4); +-#else /* CONFIG_IPPP_FILTER */ +- lp->huptimer = 0; +-#endif /* CONFIG_IPPP_FILTER */ +- + if (ipt->debug & 0x4) + printk(KERN_DEBUG "xmit skb, len %d\n", (int) skb->len); + if (ipts->debug & 0x40) +@@ -1440,54 +1316,9 @@ + + unlock: + spin_unlock_bh(&lp->xmit_lock); +- out: +- return retval; ++ return 0; + } + +-#ifdef CONFIG_IPPP_FILTER +-/* +- * check if this packet may trigger auto-dial. +- */ +- +-int isdn_ppp_autodial_filter(struct sk_buff *skb, isdn_net_local *lp) +-{ +- struct ippp_struct *is = ippp_table[lp->ppp_slot]; +- u_int16_t proto; +- int drop = 0; +- +- switch (ntohs(skb->protocol)) { +- case ETH_P_IP: +- proto = PPP_IP; +- break; +- case ETH_P_IPX: +- proto = PPP_IPX; +- break; +- default: +- printk(KERN_ERR "isdn_ppp_autodial_filter: unsupported protocol 0x%x.\n", +- skb->protocol); +- return 1; +- } +- +- /* the filter instructions are constructed assuming +- * a four-byte PPP header on each packet. we have to +- * temporarily remove part of the fake header stuck on +- * earlier. +- */ +- skb_pull(skb, IPPP_MAX_HEADER - 4); +- skb->data[0] = 1; /* indicate outbound */ +- *(u_int16_t *)(skb->data + 2) = htons(proto); +- +- drop |= is->pass_filter.filter +- && sk_run_filter(skb, is->pass_filter.filter, +- is->pass_filter.len) == 0; +- drop |= is->active_filter.filter +- && sk_run_filter(skb, is->active_filter.filter, +- is->active_filter.len) == 0; +- +- skb_push(skb, IPPP_MAX_HEADER - 4); +- return drop; +-} +-#endif + #ifdef CONFIG_ISDN_MPP + + /* this is _not_ rfc1990 header, but something we convert both short and long +@@ -1537,15 +1368,8 @@ + + static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to ) + { +- struct ippp_struct * is; +- +- if (lp->ppp_slot < 0) { +- printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", +- __FUNCTION__, lp->ppp_slot); +- return(-EINVAL); +- } +- +- is = ippp_table[lp->ppp_slot]; ++ struct ippp_struct * is = ippp_table[lp->ppp_slot]; ++ + if (add_to) { + if( lp->netdev->pb ) + lp->netdev->pb->ref_ct--; +@@ -1591,8 +1415,7 @@ + stats = &mp->stats; + slot = lp->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "%s: lp->ppp_slot(%d)\n", +- __FUNCTION__, lp->ppp_slot); ++ printk(KERN_ERR "isdn_ppp_mp_receive: lp->ppp_slot %d\n", lp->ppp_slot); + stats->frame_drops++; + dev_kfree_skb(skb); + spin_unlock_irqrestore(&mp->lock, flags); +@@ -1628,8 +1451,7 @@ + for (lpq = net_dev->queue;;) { + slot = lpq->ppp_slot; + if (slot < 0 || slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "%s: lpq->ppp_slot(%d)\n", +- __FUNCTION__, lpq->ppp_slot); ++ printk(KERN_ERR "isdn_ppp_mp_receive: lpq->ppp_slot %d\n", lpq->ppp_slot); + } else { + u32 lls = ippp_table[slot]->last_link_seqno; + if (MP_LT(lls, minseq)) +@@ -1861,14 +1683,9 @@ + struct sk_buff * skb; + unsigned int tot_len; + +- if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", +- __FUNCTION__, lp->ppp_slot); +- return; +- } + if( MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG) ) { + if( ippp_table[lp->ppp_slot]->debug & 0x40 ) +- printk(KERN_DEBUG "isdn_mppp: reassembly: frame %d, " ++ printk(KERN_DEBUG"isdn_mppp: reassembly: frame %d, " + "len %d\n", MP_SEQ(from), from->len ); + skb = from; + skb_pull(skb, MP_HEADER_LEN); +@@ -1987,10 +1804,8 @@ + memset(&t, 0, sizeof(struct ppp_stats)); + if (dev->flags & IFF_UP) { + t.p.ppp_ipackets = lp->stats.rx_packets; +- t.p.ppp_ibytes = lp->stats.rx_bytes; + t.p.ppp_ierrors = lp->stats.rx_errors; + t.p.ppp_opackets = lp->stats.tx_packets; +- t.p.ppp_obytes = lp->stats.tx_bytes; + t.p.ppp_oerrors = lp->stats.tx_errors; + #ifdef CONFIG_ISDN_PPP_VJ + if (slot >= 0 && ippp_table[slot]->slcomp) { +@@ -2018,6 +1833,9 @@ + int len; + isdn_net_local *lp = (isdn_net_local *) dev->priv; + ++#if 0 ++ printk(KERN_DEBUG "ippp, dev_ioctl: cmd %#08x , %d \n", cmd, lp->ppp_slot); ++#endif + + if (lp->p_encap != ISDN_NET_ENCAP_SYNCPPP) + return -EINVAL; +@@ -2431,7 +2249,7 @@ + return; + } + rs->state = CCPResetSentReq; +- /* We always expect an Ack if the decompressor doesn't ++ /* We always expect an Ack if the decompressor doesnt + know better */ + rs->expra = 1; + rs->dlen = 0; +@@ -2582,7 +2400,13 @@ + } + + if(type) { /* type=1 => Link compression */ ++#if 0 ++ compressor = is->link_compressor; ++ stat = is->link_comp_stat; ++ new_proto = PPP_LINK_COMP; ++#else + return skb_in; ++#endif + } + else { + if(!master) { +@@ -2630,31 +2454,18 @@ + static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, + struct sk_buff *skb,int proto) + { +- struct ippp_struct *is; ++ struct ippp_struct *is = ippp_table[lp->ppp_slot]; + struct ippp_struct *mis; + int len; + struct isdn_ppp_resetparams rsparm; + unsigned char rsdata[IPPP_RESET_MAXDATABYTES]; + +- printk(KERN_DEBUG "Received CCP frame from peer slot(%d)\n", +- lp->ppp_slot); +- if (lp->ppp_slot < 0 || lp->ppp_slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", +- __FUNCTION__, lp->ppp_slot); +- return; +- } +- is = ippp_table[lp->ppp_slot]; ++ printk(KERN_DEBUG "Received CCP frame from peer\n"); + isdn_ppp_frame_log("ccp-rcv", skb->data, skb->len, 32, is->unit,lp->ppp_slot); + +- if(lp->master) { +- int slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot; +- if (slot < 0 || slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "%s: slot(%d) out of range\n", +- __FUNCTION__, slot); +- return; +- } +- mis = ippp_table[slot]; +- } else ++ if(lp->master) ++ mis = ippp_table[((isdn_net_local *) (lp->master->priv))->ppp_slot]; ++ else + mis = is; + + switch(skb->data[0]) { +@@ -2806,18 +2617,13 @@ + + static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct sk_buff *skb) + { +- struct ippp_struct *mis,*is; +- int proto, slot = lp->ppp_slot; ++ struct ippp_struct *mis,*is = ippp_table[lp->ppp_slot]; ++ int proto; + unsigned char *data; + + if(!skb || skb->len < 3) + return; +- if (slot < 0 || slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n", +- __FUNCTION__, slot); +- return; +- } +- is = ippp_table[slot]; ++ + /* Daemon may send with or without address and control field comp */ + data = skb->data; + if(!(is->pppcfg & SC_COMP_AC) && data[0] == 0xff && data[1] == 0x03) { +@@ -2833,17 +2639,12 @@ + printk(KERN_DEBUG "Received CCP frame from daemon:\n"); + isdn_ppp_frame_log("ccp-xmit", skb->data, skb->len, 32, is->unit,lp->ppp_slot); + +- if (lp->master) { +- slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot; +- if (slot < 0 || slot > ISDN_MAX_CHANNELS) { +- printk(KERN_ERR "%s: slot(%d) out of range\n", +- __FUNCTION__, slot); +- return; +- } +- mis = ippp_table[slot]; +- } else +- mis = is; +- if (mis != is) ++ if(lp->master) ++ mis = ippp_table[((isdn_net_local *) (lp->master->priv))->ppp_slot]; ++ else ++ mis = is; ++ ++ if(mis != is) + printk(KERN_DEBUG "isdn_ppp: Ouch! Master CCP sends on slave slot!\n"); + + switch(data[2]) { +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ppp.h linux-2.4.29/drivers/isdn/isdn_ppp.h +--- linux-2.4.29.old/drivers/isdn/isdn_ppp.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_ppp.h 2005-03-22 15:06:44.497328160 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_ppp.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_ppp.h,v 1.18 2001/09/24 13:22:42 kai Exp $ + * + * header for Linux ISDN subsystem, functions for synchronous PPP (linklevel). + * +@@ -19,7 +19,6 @@ + extern void isdn_ppp_cleanup(void); + extern int isdn_ppp_free(isdn_net_local *); + extern int isdn_ppp_bind(isdn_net_local *); +-extern int isdn_ppp_autodial_filter(struct sk_buff *, isdn_net_local *); + extern int isdn_ppp_xmit(struct sk_buff *, struct net_device *); + extern void isdn_ppp_receive(isdn_net_dev *, isdn_net_local *, struct sk_buff *); + extern int isdn_ppp_dev_ioctl(struct net_device *, struct ifreq *, int); +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_tty.c linux-2.4.29/drivers/isdn/isdn_tty.c +--- linux-2.4.29.old/drivers/isdn/isdn_tty.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_tty.c 2005-03-22 15:06:44.524324056 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_tty.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_tty.c,v 1.104 2002/02/09 21:19:11 keil Exp $ + * + * Linux ISDN subsystem, tty functions and AT-command emulator (linklevel). + * +@@ -53,7 +53,7 @@ + static int si2bit[8] = + {4, 1, 4, 4, 4, 4, 4, 4}; + +-char *isdn_tty_revision = "$Revision: 1.1.4.1 $"; ++char *isdn_tty_revision = "$Revision: 1.104 $"; + + + /* isdn_tty_try_read() is called from within isdn_tty_rcv_skb() +@@ -321,7 +321,10 @@ + info->send_outstanding++; + info->msr &= ~UART_MSR_CTS; + info->lsr &= ~UART_LSR_TEMT; +- tty_wakeup(tty); ++ if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && ++ tty->ldisc.write_wakeup) ++ (tty->ldisc.write_wakeup) (tty); ++ wake_up_interruptible(&tty->write_wait); + return; + } + if (slen < 0) { +@@ -1211,7 +1214,10 @@ + /* If DLE decoding results in zero-transmit, but + * c originally was non-zero, do a wakeup. + */ +- tty_wakeup(tty); ++ if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && ++ tty->ldisc.write_wakeup) ++ (tty->ldisc.write_wakeup) (tty); ++ wake_up_interruptible(&tty->write_wait); + info->msr |= UART_MSR_CTS; + info->lsr |= UART_LSR_TEMT; + } +@@ -1232,6 +1238,7 @@ + } + } + } else ++#ifdef ISDN_TTY_FCLASS1 + if (TTY_IS_FCLASS1(info)) { + int cc = isdn_tty_handleDLEdown(info, m, c); + +@@ -1252,6 +1259,7 @@ + info->xmit_count += cc; + } else + #endif ++#endif + info->xmit_count += c; + } else { + info->msr |= UART_MSR_CTS; +@@ -1329,7 +1337,10 @@ + isdn_tty_cleanup_xmit(info); + info->xmit_count = 0; + restore_flags(flags); +- tty_wakeup(tty); ++ wake_up_interruptible(&tty->write_wait); ++ if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && ++ tty->ldisc.write_wakeup) ++ (tty->ldisc.write_wakeup) (tty); + } + + static void +@@ -1858,7 +1869,8 @@ + isdn_tty_shutdown(info); + if (tty->driver.flush_buffer) + tty->driver.flush_buffer(tty); +- tty_ldisc_flush(tty); ++ if (tty->ldisc.flush_buffer) ++ tty->ldisc.flush_buffer(tty); + info->tty = 0; + info->ncarrier = 0; + tty->closing = 0; +@@ -2306,6 +2318,22 @@ + isdn_tty_at_cout("\r\n", info); + } + return 1; ++ case ISDN_STAT_ALERT: ++#ifdef ISDN_TTY_STAT_DEBUG ++ printk(KERN_DEBUG "tty_STAT_ALERT ttyI%d\n", info->line); ++#endif ++ /* Signal RINGING to tty-device if requested */ ++ if (info->emu.mdmreg[REG_ALERT] & BIT_ALERT) ++ isdn_tty_modem_result(RESULT_RINGING, info); ++ return 1; ++ case ISDN_STAT_PROCEED: ++#ifdef ISDN_TTY_STAT_DEBUG ++ printk(KERN_DEBUG "tty_STAT_PROCEED ttyI%d\n", info->line); ++#endif ++ /* Signal PROCEEDING to tty-device if requested */ ++ if (info->emu.mdmreg[REG_PROCEED] & BIT_PROCEED) ++ isdn_tty_modem_result(RESULT_PROCEEDING, info); ++ return 1; + case ISDN_STAT_DCONN: + #ifdef ISDN_TTY_STAT_DEBUG + printk(KERN_DEBUG "tty_STAT_DCONN ttyI%d\n", info->line); +@@ -2618,7 +2646,7 @@ + static char *msg[] = + {"OK", "CONNECT", "RING", "NO CARRIER", "ERROR", + "CONNECT 64000", "NO DIALTONE", "BUSY", "NO ANSWER", +- "RINGING", "NO MSN/EAZ", "VCON", "RUNG"}; ++ "RINGING", "NO MSN/EAZ", "VCON", "RUNG", "PROCEEDING"}; + ulong flags; + char s[ISDN_MSNLEN+10]; + +@@ -2781,7 +2809,8 @@ + restore_flags(flags); + return; + } +- tty_ldisc_flush(info->tty); ++ if (info->tty->ldisc.flush_buffer) ++ info->tty->ldisc.flush_buffer(info->tty); + if ((info->flags & ISDN_ASYNC_CHECK_CD) && + (!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) && + (info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) { +@@ -3296,9 +3325,11 @@ + #ifdef CONFIG_ISDN_TTY_FAX + if (TTY_IS_FCLASS2(info)) + sprintf(rs, "\r\n2"); ++#ifdef ISDN_TTY_FCLASS1 + else if (TTY_IS_FCLASS1(info)) + sprintf(rs, "\r\n1"); + #endif ++#endif + isdn_tty_at_cout(rs, info); + break; + case '=': +@@ -3313,6 +3344,7 @@ + m->mdmreg[REG_PSIZE] * 16; + break; + #ifdef CONFIG_ISDN_TTY_FAX ++#ifdef ISDN_TTY_FCLASS1 + case '1': + p[0]++; + if (!(dev->global_features & +@@ -3324,6 +3356,7 @@ + info->xmit_size = + m->mdmreg[REG_PSIZE] * 16; + break; ++#endif + case '2': + p[0]++; + if (!(dev->global_features & +@@ -3348,9 +3381,11 @@ + p[0]++; + strcpy(rs, "\r\n0,"); + #ifdef CONFIG_ISDN_TTY_FAX ++#ifdef ISDN_TTY_FCLASS1 + if (dev->global_features & + ISDN_FEATURE_L3_FCLASS1) + strcat(rs, "1,"); ++#endif + if (dev->global_features & + ISDN_FEATURE_L3_FCLASS2) + strcat(rs, "2,"); +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_tty.h linux-2.4.29/drivers/isdn/isdn_tty.h +--- linux-2.4.29.old/drivers/isdn/isdn_tty.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_tty.h 2005-03-22 15:06:44.545320864 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_tty.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_tty.h,v 1.25 2002/02/09 21:19:11 keil Exp $ + * + * header for Linux ISDN subsystem, tty related functions (linklevel). + * +@@ -78,6 +78,10 @@ + #define BIT_CPNFCON 2 + #define REG_CDN 23 + #define BIT_CDN 4 ++#define REG_ALERT 23 ++#define BIT_ALERT 8 ++#define REG_PROCEED 23 ++#define BIT_PROCEED 16 + + /* defines for result codes */ + #define RESULT_OK 0 +@@ -93,10 +97,13 @@ + #define RESULT_NO_MSN_EAZ 10 + #define RESULT_VCON 11 + #define RESULT_RUNG 12 ++#define RESULT_PROCEEDING 13 + ++#ifdef ISDN_TTY_FCLASS1 + #define TTY_IS_FCLASS1(info) \ + ((info->emu.mdmreg[REG_L2PROT] == ISDN_PROTO_L2_FAX) && \ + (info->emu.mdmreg[REG_L3PROT] == ISDN_PROTO_L3_FCLASS1)) ++#endif + #define TTY_IS_FCLASS2(info) \ + ((info->emu.mdmreg[REG_L2PROT] == ISDN_PROTO_L2_FAX) && \ + (info->emu.mdmreg[REG_L3PROT] == ISDN_PROTO_L3_FCLASS2)) +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ttyfax.c linux-2.4.29/drivers/isdn/isdn_ttyfax.c +--- linux-2.4.29.old/drivers/isdn/isdn_ttyfax.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_ttyfax.c 2005-03-22 15:06:44.561318432 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_ttyfax.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_ttyfax.c,v 1.9 2001/09/24 13:22:43 kai Exp $ + * + * Linux ISDN subsystem, tty_fax AT-command emulator (linklevel). + * +@@ -20,7 +20,7 @@ + #include "isdn_ttyfax.h" + + +-static char *isdn_tty_fax_revision = "$Revision: 1.1.4.1 $"; ++static char *isdn_tty_fax_revision = "$Revision: 1.9 $"; + + #define PARSE_ERROR1 { isdn_tty_fax_modem_result(1, info); return 1; } + +@@ -148,6 +148,7 @@ + } + } + ++#ifdef ISDN_TTY_FCLASS1 + int + isdn_tty_fax_command1(modem_info * info, isdn_ctrl * c) + { +@@ -186,6 +187,7 @@ + } + return (0); + } ++#endif + + int + isdn_tty_fax_command(modem_info * info, isdn_ctrl * c) +@@ -193,8 +195,10 @@ + T30_s *f = info->fax; + char rs[10]; + ++#ifdef ISDN_TTY_FCLASS1 + if (TTY_IS_FCLASS1(info)) + return (isdn_tty_fax_command1(info, c)); ++#endif + + #ifdef ISDN_TTY_FAX_CMD_DEBUG + printk(KERN_DEBUG "isdn_tty: Fax cmd %d on ttyI%d\n", +@@ -312,6 +316,7 @@ + } + } + ++#ifdef ISDN_TTY_FCLASS1 + /* + * Parse AT+F.. FAX class 1 commands + */ +@@ -403,6 +408,7 @@ + } + return 1; + } ++#endif + + /* + * Parse AT+F.. FAX class 2 commands +@@ -970,6 +976,70 @@ + } + return 0; + } ++#if 0 ++ /* LO=n - Flow control opts */ ++ if (!strncmp(p[0], "LO", 2)) { /* TODO */ ++ p[0] += 2; ++ switch (*p[0]) { ++ case '?': ++ p[0]++; ++ sprintf(rs, "\r\n%d", f->lo); ++ isdn_tty_at_cout(rs, info); ++ break; ++ case '=': ++ p[0]++; ++ if (*p[0] == '?') { ++ p[0]++; ++ sprintf(rs, "\r\n0,1,2"); ++ isdn_tty_at_cout(rs, info); ++ } else { ++ par = isdn_getnum(p); ++ if ((par < 0) || (par > 2)) ++ PARSE_ERROR1; ++ f->lo = par; ++#ifdef ISDN_TTY_FAX_STAT_DEBUG ++ printk(KERN_DEBUG "isdn_tty: Fax FLO=%d\n", par); ++#endif ++ } ++ break; ++ default: ++ PARSE_ERROR1; ++ } ++ return 0; ++ } ++#endif ++#if 0 ++ /* LPL=n - Doc for polling cmd */ ++ if (!strncmp(p[0], "LPL", 3)) { /* TODO */ ++ p[0] += 3; ++ switch (*p[0]) { ++ case '?': ++ p[0]++; ++ sprintf(rs, "\r\n%d", f->lpl); ++ isdn_tty_at_cout(rs, info); ++ break; ++ case '=': ++ p[0]++; ++ if (*p[0] == '?') { ++ p[0]++; ++ sprintf(rs, "\r\n0,1"); ++ isdn_tty_at_cout(rs, info); ++ } else { ++ par = isdn_getnum(p); ++ if ((par < 0) || (par > 1)) ++ PARSE_ERROR1; ++ f->lpl = par; ++#ifdef ISDN_TTY_FAX_STAT_DEBUG ++ printk(KERN_DEBUG "isdn_tty: Fax FLPL=%d\n", par); ++#endif ++ } ++ break; ++ default: ++ PARSE_ERROR1; ++ } ++ return 0; ++ } ++#endif + + /* MDL? - DCE Model */ + if (!strncmp(p[0], "MDL?", 4)) { +@@ -1049,6 +1119,38 @@ + } + return 0; + } ++#if 0 ++ /* PTS=n - Page transfer status */ ++ if (!strncmp(p[0], "PTS", 3)) { /* TODO */ ++ p[0] += 3; ++ switch (*p[0]) { ++ case '?': ++ p[0]++; ++ sprintf(rs, "\r\n%d", f->pts); ++ isdn_tty_at_cout(rs, info); ++ break; ++ case '=': ++ p[0]++; ++ if (*p[0] == '?') { ++ p[0]++; ++ sprintf(rs, "\r\n0-5"); ++ isdn_tty_at_cout(rs, info); ++ } else { ++ par = isdn_getnum(p); ++ if ((par < 0) || (par > 5)) ++ PARSE_ERROR1; ++ f->pts = par; ++#ifdef ISDN_TTY_FAX_STAT_DEBUG ++ printk(KERN_DEBUG "isdn_tty: Fax FPTS=%d\n", par); ++#endif ++ } ++ break; ++ default: ++ PARSE_ERROR1; ++ } ++ return 0; ++ } ++#endif + + /* REL=n - Phase C received EOL alignment */ + if (!strncmp(p[0], "REL", 3)) { +@@ -1091,6 +1193,38 @@ + isdn_tty_at_cout(rs, info); + return 0; + } ++#if 0 ++ /* SPL=n - Enable polling */ ++ if (!strncmp(p[0], "SPL", 3)) { /* TODO */ ++ p[0] += 3; ++ switch (*p[0]) { ++ case '?': ++ p[0]++; ++ sprintf(rs, "\r\n%d", f->spl); ++ isdn_tty_at_cout(rs, info); ++ break; ++ case '=': ++ p[0]++; ++ if (*p[0] == '?') { ++ p[0]++; ++ sprintf(rs, "\r\n0,1"); ++ isdn_tty_at_cout(rs, info); ++ } else { ++ par = isdn_getnum(p); ++ if ((par < 0) || (par > 1)) ++ PARSE_ERROR1; ++ f->spl = par; ++#ifdef ISDN_TTY_FAX_STAT_DEBUG ++ printk(KERN_DEBUG "isdn_tty: Fax FSPL=%d\n", par); ++#endif ++ } ++ break; ++ default: ++ PARSE_ERROR1; ++ } ++ return 0; ++ } ++#endif + + /* Phase C Transmit Data Block Size */ + if (!strncmp(p[0], "TBC=", 4)) { /* dummy, not used */ +@@ -1116,7 +1250,9 @@ + { + if (TTY_IS_FCLASS2(info)) + return (isdn_tty_cmd_FCLASS2(p, info)); ++#ifdef ISDN_TTY_FCLASS1 + else if (TTY_IS_FCLASS1(info)) + return (isdn_tty_cmd_FCLASS1(p, info)); ++#endif + PARSE_ERROR1; + } +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_ttyfax.h linux-2.4.29/drivers/isdn/isdn_ttyfax.h +--- linux-2.4.29.old/drivers/isdn/isdn_ttyfax.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_ttyfax.h 2005-03-22 15:06:44.576316152 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_ttyfax.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_ttyfax.h,v 1.3 2001/09/24 13:22:43 kai Exp $ + * + * header for Linux ISDN subsystem, tty_fax related functions (linklevel). + * +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_v110.c linux-2.4.29/drivers/isdn/isdn_v110.c +--- linux-2.4.29.old/drivers/isdn/isdn_v110.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_v110.c 2005-03-22 15:06:44.593313568 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_v110.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_v110.c,v 1.8 2001/09/24 13:22:43 kai Exp $ + * + * Linux ISDN subsystem, V.110 related functions (linklevel). + * +@@ -19,7 +19,7 @@ + + #undef ISDN_V110_DEBUG + +-char *isdn_v110_revision = "$Revision: 1.1.4.1 $"; ++char *isdn_v110_revision = "$Revision: 1.8 $"; + + #define V110_38400 255 + #define V110_19200 15 +@@ -138,6 +138,14 @@ + return; + #ifdef ISDN_V110_DEBUG + printk(KERN_DEBUG "v110 close\n"); ++#if 0 ++ printk(KERN_DEBUG "isdn_v110_close: nbytes=%d\n", v->nbytes); ++ printk(KERN_DEBUG "isdn_v110_close: nbits=%d\n", v->nbits); ++ printk(KERN_DEBUG "isdn_v110_close: key=%d\n", v->key); ++ printk(KERN_DEBUG "isdn_v110_close: SyncInit=%d\n", v->SyncInit); ++ printk(KERN_DEBUG "isdn_v110:close: decodelen=%d\n", v->decodelen); ++ printk(KERN_DEBUG "isdn_v110_close: framelen=%d\n", v->framelen); ++#endif + #endif + kfree(v->encodebuf); + kfree(v); +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_v110.h linux-2.4.29/drivers/isdn/isdn_v110.h +--- linux-2.4.29.old/drivers/isdn/isdn_v110.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_v110.h 2005-03-22 15:06:44.608311288 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_v110.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_v110.h,v 1.5 2001/09/24 13:22:43 kai Exp $ + * + * Linux ISDN subsystem, V.110 related functions (linklevel). + * +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_x25iface.c linux-2.4.29/drivers/isdn/isdn_x25iface.c +--- linux-2.4.29.old/drivers/isdn/isdn_x25iface.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_x25iface.c 2005-03-22 15:06:44.626308552 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_x25iface.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_x25iface.c,v 1.10 2001/09/24 13:22:43 kai Exp $ + * + * Linux ISDN subsystem, X.25 related functions + * +diff -rNu linux-2.4.29.old/drivers/isdn/isdn_x25iface.h linux-2.4.29/drivers/isdn/isdn_x25iface.h +--- linux-2.4.29.old/drivers/isdn/isdn_x25iface.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdn_x25iface.h 2005-03-22 15:06:44.645305664 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_x25iface.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $ ++/* $Id: isdn_x25iface.h,v 1.4 2001/09/24 13:22:43 kai Exp $ + * + * header for Linux ISDN subsystem, x.25 related functions + * +diff -rNu linux-2.4.29.old/drivers/isdn/isdnloop/isdnloop.c linux-2.4.29/drivers/isdn/isdnloop/isdnloop.c +--- linux-2.4.29.old/drivers/isdn/isdnloop/isdnloop.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdnloop/isdnloop.c 2005-03-22 15:06:48.813671976 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdnloop.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id: isdnloop.c,v 1.17 2001/08/30 10:45:42 kai Exp $ + * + * ISDN low-level module implementing a dummy loop driver. + * +@@ -14,7 +14,7 @@ + #include <linux/init.h> + #include "isdnloop.h" + +-static char *revision = "$Revision: 1.1.4.1 $"; ++static char *revision = "$Revision$"; + static char *isdnloop_id; + + MODULE_DESCRIPTION("ISDN4Linux: Pseudo Driver that simulates an ISDN card"); +@@ -22,8 +22,8 @@ + MODULE_LICENSE("GPL"); + MODULE_PARM(isdnloop_id, "s"); + MODULE_PARM_DESC(isdnloop_id, "ID-String of first card"); +- +-static int isdnloop_addcard(char *); ++ ++ static int isdnloop_addcard(char *); + + /* + * Free queue completely. +@@ -1542,11 +1542,7 @@ + } else + strcpy(rev, " ??? "); + printk(KERN_NOTICE "isdnloop-ISDN-driver Rev%s\n", rev); +- +- if (isdnloop_id) +- return (isdnloop_addcard(isdnloop_id)); +- +- return 0; ++ return (isdnloop_addcard(isdnloop_id)); + } + + static void __exit +diff -rNu linux-2.4.29.old/drivers/isdn/isdnloop/isdnloop.h linux-2.4.29/drivers/isdn/isdnloop/isdnloop.h +--- linux-2.4.29.old/drivers/isdn/isdnloop/isdnloop.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/isdnloop/isdnloop.h 2005-03-22 15:06:48.834668784 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdnloop.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Loopback lowlevel module for testing of linklevel. + * +diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/callbacks.c linux-2.4.29/drivers/isdn/pcbit/callbacks.c +--- linux-2.4.29.old/drivers/isdn/pcbit/callbacks.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/pcbit/callbacks.c 2005-03-22 15:06:48.909657384 +0100 +@@ -3,7 +3,7 @@ + * + * Copyright (C) 1996 Universidade de Lisboa + * +- * Written by Pedro Roque Marques (pedro_m@yahoo.com) ++ * Written by Pedro Roque Marques (roque@di.fc.ul.pt) + * + * This software may be used and distributed according to the terms of + * the GNU General Public License, incorporated herein by reference. +diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/callbacks.h linux-2.4.29/drivers/isdn/pcbit/callbacks.h +--- linux-2.4.29.old/drivers/isdn/pcbit/callbacks.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/pcbit/callbacks.h 2005-03-22 15:06:48.953650696 +0100 +@@ -3,7 +3,7 @@ + * + * Copyright (C) 1996 Universidade de Lisboa + * +- * Written by Pedro Roque Marques (pedro_m@yahoo.com) ++ * Written by Pedro Roque Marques (roque@di.fc.ul.pt) + * + * This software may be used and distributed according to the terms of + * the GNU General Public License, incorporated herein by reference. +diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/capi.c linux-2.4.29/drivers/isdn/pcbit/capi.c +--- linux-2.4.29.old/drivers/isdn/pcbit/capi.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/pcbit/capi.c 2005-03-22 15:06:49.042637168 +0100 +@@ -4,7 +4,7 @@ + * + * Copyright (C) 1996 Universidade de Lisboa + * +- * Written by Pedro Roque Marques (pedro_m@yahoo.com) ++ * Written by Pedro Roque Marques (roque@di.fc.ul.pt) + * + * This software may be used and distributed according to the terms of + * the GNU General Public License, incorporated herein by reference. +diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/capi.h linux-2.4.29/drivers/isdn/pcbit/capi.h +--- linux-2.4.29.old/drivers/isdn/pcbit/capi.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/pcbit/capi.h 2005-03-22 15:06:49.071632760 +0100 +@@ -3,7 +3,7 @@ + * + * Copyright (C) 1996 Universidade de Lisboa + * +- * Written by Pedro Roque Marques (pedro_m@yahoo.com) ++ * Written by Pedro Roque Marques (roque@di.fc.ul.pt) + * + * This software may be used and distributed according to the terms of + * the GNU General Public License, incorporated herein by reference. +@@ -63,7 +63,8 @@ + extern int capi_decode_debug_188(u_char *hdr, ushort hdrlen); + #endif + +-static inline struct pcbit_chan * ++extern __inline__ ++struct pcbit_chan * + capi_channel(struct pcbit_dev *dev, struct sk_buff *skb) + { + ushort callref; +diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/drv.c linux-2.4.29/drivers/isdn/pcbit/drv.c +--- linux-2.4.29.old/drivers/isdn/pcbit/drv.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/pcbit/drv.c 2005-03-22 15:06:49.091629720 +0100 +@@ -3,7 +3,7 @@ + * + * Copyright (C) 1996 Universidade de Lisboa + * +- * Written by Pedro Roque Marques (pedro_m@yahoo.com) ++ * Written by Pedro Roque Marques (roque@di.fc.ul.pt) + * + * This software may be used and distributed according to the terms of + * the GNU General Public License, incorporated herein by reference. +@@ -35,7 +35,9 @@ + #include <linux/isdnif.h> + #include <asm/string.h> + #include <asm/io.h> ++#ifdef COMPAT_HAS_ISA_IOREMAP + #include <linux/ioport.h> ++#endif + + #include "pcbit.h" + #include "edss1.h" +@@ -89,6 +91,7 @@ + + if (mem_base >= 0xA0000 && mem_base <= 0xFFFFF ) { + dev->ph_mem = mem_base; ++#ifdef COMPAT_HAS_ISA_IOREMAP + if (check_mem_region(dev->ph_mem, 4096)) { + printk(KERN_WARNING + "PCBIT: memory region %lx-%lx already in use\n", +@@ -100,6 +103,9 @@ + request_mem_region(dev->ph_mem, 4096, "PCBIT mem"); + } + dev->sh_mem = (unsigned char*)ioremap(dev->ph_mem, 4096); ++#else ++ dev->sh_mem = (unsigned char*) mem_base; ++#endif + } + else + { +@@ -112,8 +118,10 @@ + dev->b1 = kmalloc(sizeof(struct pcbit_chan), GFP_KERNEL); + if (!dev->b1) { + printk("pcbit_init: couldn't malloc pcbit_chan struct\n"); ++#ifdef COMPAT_HAS_ISA_IOREMAP + iounmap((unsigned char*)dev->sh_mem); + release_mem_region(dev->ph_mem, 4096); ++#endif + kfree(dev); + return -ENOMEM; + } +@@ -122,8 +130,10 @@ + if (!dev->b2) { + printk("pcbit_init: couldn't malloc pcbit_chan struct\n"); + kfree(dev->b1); ++#ifdef COMPAT_HAS_ISA_IOREMAP + iounmap((unsigned char*)dev->sh_mem); + release_mem_region(dev->ph_mem, 4096); ++#endif + kfree(dev); + return -ENOMEM; + } +@@ -144,8 +154,10 @@ + { + kfree(dev->b1); + kfree(dev->b2); ++#ifdef COMPAT_HAS_ISA_IOREMAP + iounmap((unsigned char*)dev->sh_mem); + release_mem_region(dev->ph_mem, 4096); ++#endif + kfree(dev); + dev_pcbit[board] = NULL; + return -EIO; +@@ -166,8 +178,10 @@ + free_irq(irq, dev); + kfree(dev->b1); + kfree(dev->b2); ++#ifdef COMPAT_HAS_ISA_IOREMAP + iounmap((unsigned char*)dev->sh_mem); + release_mem_region(dev->ph_mem, 4096); ++#endif + kfree(dev); + dev_pcbit[board] = NULL; + return -EIO; +@@ -197,8 +211,10 @@ + free_irq(irq, dev); + kfree(dev->b1); + kfree(dev->b2); ++#ifdef COMPAT_HAS_ISA_IOREMAP + iounmap((unsigned char*)dev->sh_mem); + release_mem_region(dev->ph_mem, 4096); ++#endif + kfree(dev); + dev_pcbit[board] = NULL; + return -EIO; +@@ -235,8 +251,10 @@ + del_timer(&dev->b2->fsm_timer); + kfree(dev->b1); + kfree(dev->b2); ++#ifdef COMPAT_HAS_ISA_IOREMAP + iounmap((unsigned char*)dev->sh_mem); + release_mem_region(dev->ph_mem, 4096); ++#endif + kfree(dev); + } + } +@@ -430,7 +448,7 @@ + switch(dev->l2_state) { + case L2_LWMODE: + /* check (size <= rdp_size); write buf into board */ +- if (len < 0 || len > BANK4 + 1) ++ if (len > BANK4 + 1) + { + printk("pcbit_writecmd: invalid length %d\n", len); + return -EINVAL; +@@ -609,6 +627,20 @@ + dev->b1->s_refnum, + dev->b2->s_refnum); + #endif ++#if 0 ++ if (dev->b1->s_refnum == refnum) ++ chan = dev->b1; ++ else { ++ ++ if (dev->b2->s_refnum == refnum) ++ chan = dev->b2; ++ else { ++ chan = NULL; ++ printk(KERN_WARNING "Connection Confirm - refnum doesn't match chan\n"); ++ break; ++ } ++ } ++#else + /* We just try to find a channel in the right state */ + + if (dev->b1->fsm_state == ST_CALL_INIT) +@@ -622,6 +654,7 @@ + break; + } + } ++#endif + if (capi_decode_conn_conf(chan, skb, &complete)) { + printk(KERN_DEBUG "conn_conf indicates error\n"); + pcbit_fsm_event(dev, chan, EV_ERROR, NULL); +diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/edss1.c linux-2.4.29/drivers/isdn/pcbit/edss1.c +--- linux-2.4.29.old/drivers/isdn/pcbit/edss1.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/pcbit/edss1.c 2005-03-22 15:06:49.119625464 +0100 +@@ -4,7 +4,7 @@ + * + * Copyright (C) 1996 Universidade de Lisboa + * +- * Written by Pedro Roque Marques (pedro_m@yahoo.com) ++ * Written by Pedro Roque Marques (roque@di.fc.ul.pt) + * + * This software may be used and distributed according to the terms of + * the GNU General Public License, incorporated herein by reference. +diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/edss1.h linux-2.4.29/drivers/isdn/pcbit/edss1.h +--- linux-2.4.29.old/drivers/isdn/pcbit/edss1.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/pcbit/edss1.h 2005-03-22 15:06:49.161619080 +0100 +@@ -3,7 +3,7 @@ + * + * Copyright (C) 1996 Universidade de Lisboa + * +- * Written by Pedro Roque Marques (pedro_m@yahoo.com) ++ * Written by Pedro Roque Marques (roque@di.fc.ul.pt) + * + * This software may be used and distributed according to the terms of + * the GNU General Public License, incorporated herein by reference. +diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/layer2.c linux-2.4.29/drivers/isdn/pcbit/layer2.c +--- linux-2.4.29.old/drivers/isdn/pcbit/layer2.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/pcbit/layer2.c 2005-03-22 15:06:49.195613912 +0100 +@@ -3,7 +3,7 @@ + * + * Copyright (C) 1996 Universidade de Lisboa + * +- * Written by Pedro Roque Marques (pedro_m@yahoo.com) ++ * Written by Pedro Roque Marques (roque@di.fc.ul.pt) + * + * This software may be used and distributed according to the terms of + * the GNU General Public License, incorporated herein by reference. +@@ -369,11 +369,16 @@ + + if (dev->read_frame) { + printk(KERN_DEBUG "pcbit_receive: Type 0 frame and read_frame != NULL\n"); ++#if 0 ++ pcbit_l2_error(dev); ++ return; ++#else + /* discard previous queued frame */ + if (dev->read_frame->skb) + kfree_skb(dev->read_frame->skb); + kfree(dev->read_frame); + dev->read_frame = NULL; ++#endif + } + frame = kmalloc(sizeof(struct frame_buf), GFP_ATOMIC); + +@@ -449,10 +454,14 @@ + + if (!(frame = dev->read_frame)) { + printk("Type 1 frame and no frame queued\n"); ++#if 1 + /* usually after an error: toss frame */ + dev->readptr += tt; + if (dev->readptr > dev->sh_mem + BANK2 + BANKLEN) + dev->readptr -= BANKLEN; ++#else ++ pcbit_l2_error(dev); ++#endif + return; + + } +diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/layer2.h linux-2.4.29/drivers/isdn/pcbit/layer2.h +--- linux-2.4.29.old/drivers/isdn/pcbit/layer2.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/pcbit/layer2.h 2005-03-22 15:06:49.228608896 +0100 +@@ -3,7 +3,7 @@ + * + * Copyright (C) 1996 Universidade de Lisboa + * +- * Written by Pedro Roque Marques (pedro_m@yahoo.com) ++ * Written by Pedro Roque Marques (roque@di.fc.ul.pt) + * + * This software may be used and distributed according to the terms of + * the GNU General Public License, incorporated herein by reference. +diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/module.c linux-2.4.29/drivers/isdn/pcbit/module.c +--- linux-2.4.29.old/drivers/isdn/pcbit/module.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/pcbit/module.c 2005-03-22 15:06:49.251605400 +0100 +@@ -3,7 +3,7 @@ + * + * Copyright (C) 1996 Universidade de Lisboa + * +- * Written by Pedro Roque Marques (pedro_m@yahoo.com) ++ * Written by Pedro Roque Marques (roque@di.fc.ul.pt) + * + * This software may be used and distributed according to the terms of + * the GNU General Public License, incorporated herein by reference. +@@ -92,6 +92,7 @@ + } + + #ifndef MODULE ++#ifdef COMPAT_HAS_NEW_SETUP + #define MAX_PARA (MAX_PCBIT_CARDS * 2) + static int __init pcbit_setup(char *line) + { +@@ -100,6 +101,11 @@ + int ints[MAX_PARA+1]; + + str = get_options(line, MAX_PARA, ints); ++#else ++void pcbit_setup(char *str, int *ints) ++{ ++ int i, j, argc; ++#endif + argc = ints[0]; + i = 0; + j = 1; +@@ -118,9 +124,13 @@ + + i++; + } ++#ifdef COMPAT_HAS_NEW_SETUP + return(1); + } + __setup("pcbit=", pcbit_setup); ++#else ++} ++#endif + #endif + + module_init(pcbit_init); +diff -rNu linux-2.4.29.old/drivers/isdn/pcbit/pcbit.h linux-2.4.29/drivers/isdn/pcbit/pcbit.h +--- linux-2.4.29.old/drivers/isdn/pcbit/pcbit.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/pcbit/pcbit.h 2005-03-22 15:06:49.284600384 +0100 +@@ -3,7 +3,7 @@ + * + * Copyright (C) 1996 Universidade de Lisboa + * +- * Written by Pedro Roque Marques (pedro_m@yahoo.com) ++ * Written by Pedro Roque Marques (roque@di.fc.ul.pt) + * + * This software may be used and distributed according to the terms of + * the GNU General Public License, incorporated herein by reference. +diff -rNu linux-2.4.29.old/drivers/isdn/sc/card.h linux-2.4.29/drivers/isdn/sc/card.h +--- linux-2.4.29.old/drivers/isdn/sc/card.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/card.h 2005-03-22 15:06:49.333592936 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: card.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Driver parameters for SpellCaster ISA ISDN adapters + * +diff -rNu linux-2.4.29.old/drivers/isdn/sc/command.c linux-2.4.29/drivers/isdn/sc/command.c +--- linux-2.4.29.old/drivers/isdn/sc/command.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/command.c 2005-03-22 15:06:49.348590656 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: command.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Copyright (C) 1996 SpellCaster Telecommunications Inc. + * +@@ -95,7 +95,7 @@ + if(adapter[i]->driverId == driver) + return i; + } +- return -ENODEV; ++ return -NODEV; + } + + /* +diff -rNu linux-2.4.29.old/drivers/isdn/sc/debug.c linux-2.4.29/drivers/isdn/sc/debug.c +--- linux-2.4.29.old/drivers/isdn/sc/debug.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/debug.c 2005-03-22 15:06:49.363588376 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: debug.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Copyright (C) 1996 SpellCaster Telecommunications Inc. + * +diff -rNu linux-2.4.29.old/drivers/isdn/sc/debug.h linux-2.4.29/drivers/isdn/sc/debug.h +--- linux-2.4.29.old/drivers/isdn/sc/debug.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/debug.h 2005-03-22 15:06:49.378586096 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: debug.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Copyright (C) 1996 SpellCaster Telecommunications Inc. + * +diff -rNu linux-2.4.29.old/drivers/isdn/sc/event.c linux-2.4.29/drivers/isdn/sc/event.c +--- linux-2.4.29.old/drivers/isdn/sc/event.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/event.c 2005-03-22 15:06:49.394583664 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: event.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Copyright (C) 1996 SpellCaster Telecommunications Inc. + * +diff -rNu linux-2.4.29.old/drivers/isdn/sc/init.c linux-2.4.29/drivers/isdn/sc/init.c +--- linux-2.4.29.old/drivers/isdn/sc/init.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/init.c 2005-03-22 15:06:49.432577888 +0100 +@@ -514,6 +514,15 @@ + schedule_timeout(HZ); + sig = readl(rambase + SIG_OFFSET); + pr_debug("Looking for a signature, got 0x%x\n", sig); ++#if 0 ++/* ++ * For Gary: ++ * If it's a timing problem, it should be gone with the above schedule() ++ * Another possible reason may be the missing volatile in the original ++ * code. readl() does this for us. ++ */ ++ printk(""); /* Hack! Doesn't work without this !!!??? */ ++#endif + if(sig == SIGNATURE) + return PRI_BOARD; + +@@ -525,6 +534,9 @@ + schedule_timeout(HZ); + sig = readl(rambase + SIG_OFFSET); + pr_debug("Looking for a signature, got 0x%x\n", sig); ++#if 0 ++ printk(""); /* Hack! Doesn't work without this !!!??? */ ++#endif + if(sig == SIGNATURE) + return BRI_BOARD; + +diff -rNu linux-2.4.29.old/drivers/isdn/sc/interrupt.c linux-2.4.29/drivers/isdn/sc/interrupt.c +--- linux-2.4.29.old/drivers/isdn/sc/interrupt.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/interrupt.c 2005-03-22 15:06:49.447575608 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: interrupt.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Copyright (C) 1996 SpellCaster Telecommunications Inc. + * +diff -rNu linux-2.4.29.old/drivers/isdn/sc/ioctl.c linux-2.4.29/drivers/isdn/sc/ioctl.c +--- linux-2.4.29.old/drivers/isdn/sc/ioctl.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/ioctl.c 2005-03-22 15:06:49.463573176 +0100 +@@ -23,6 +23,9 @@ + + extern board *adapter[]; + ++#if 0 ++static char *ChannelStates[] = { "Idle", "Ready", "Connecting", "Connected", "Disconnecting" }; ++#endif + + int GetStatus(int card, boardInfo *); + +diff -rNu linux-2.4.29.old/drivers/isdn/sc/message.c linux-2.4.29/drivers/isdn/sc/message.c +--- linux-2.4.29.old/drivers/isdn/sc/message.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/message.c 2005-03-22 15:06:49.478570896 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: message.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * functions for sending and receiving control messages + * +diff -rNu linux-2.4.29.old/drivers/isdn/sc/message.h linux-2.4.29/drivers/isdn/sc/message.h +--- linux-2.4.29.old/drivers/isdn/sc/message.h 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/message.h 2005-03-22 15:06:49.495568312 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: message.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Copyright (C) 1996 SpellCaster Telecommunications Inc. + * +diff -rNu linux-2.4.29.old/drivers/isdn/sc/packet.c linux-2.4.29/drivers/isdn/sc/packet.c +--- linux-2.4.29.old/drivers/isdn/sc/packet.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/packet.c 2005-03-22 15:06:49.514565424 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: packet.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Copyright (C) 1996 SpellCaster Telecommunications Inc. + * +diff -rNu linux-2.4.29.old/drivers/isdn/sc/shmem.c linux-2.4.29/drivers/isdn/sc/shmem.c +--- linux-2.4.29.old/drivers/isdn/sc/shmem.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/shmem.c 2005-03-22 15:06:49.560558432 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: shmem.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Copyright (C) 1996 SpellCaster Telecommunications Inc. + * +diff -rNu linux-2.4.29.old/drivers/isdn/sc/timer.c linux-2.4.29/drivers/isdn/sc/timer.c +--- linux-2.4.29.old/drivers/isdn/sc/timer.c 2005-03-22 14:47:56.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/sc/timer.c 2005-03-22 15:06:49.575556152 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: timer.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Copyright (C) 1996 SpellCaster Telecommunications Inc. + * +diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam.h linux-2.4.29/drivers/isdn/tpam/tpam.h +--- linux-2.4.29.old/drivers/isdn/tpam/tpam.h 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/tpam/tpam.h 2005-03-22 15:06:49.648545056 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: tpam.h,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id: tpam.h,v 1.3 2001/09/24 13:23:12 kai Exp $ + * + * Turbo PAM ISDN driver for Linux. (Kernel Driver) + * +diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_commands.c linux-2.4.29/drivers/isdn/tpam/tpam_commands.c +--- linux-2.4.29.old/drivers/isdn/tpam/tpam_commands.c 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/tpam/tpam_commands.c 2005-03-22 15:06:49.664542624 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: tpam_commands.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id: tpam_commands.c,v 1.3 2001/09/24 13:23:12 kai Exp $ + * + * Turbo PAM ISDN driver for Linux. (Kernel Driver - ISDN commands) + * +diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_crcpc.c linux-2.4.29/drivers/isdn/tpam/tpam_crcpc.c +--- linux-2.4.29.old/drivers/isdn/tpam/tpam_crcpc.c 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/tpam/tpam_crcpc.c 2005-03-22 15:06:49.681540040 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: tpam_crcpc.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Turbo PAM ISDN driver for Linux. (Kernel Driver - CRC encoding) + * +diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_hdlc.c linux-2.4.29/drivers/isdn/tpam/tpam_hdlc.c +--- linux-2.4.29.old/drivers/isdn/tpam/tpam_hdlc.c 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/tpam/tpam_hdlc.c 2005-03-22 15:06:49.702536848 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: tpam_hdlc.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id: tpam_hdlc.c,v 1.3 2001/09/24 13:23:12 kai Exp $ + * + * Turbo PAM ISDN driver for Linux. (Kernel Driver - HDLC encoding) + * +diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_main.c linux-2.4.29/drivers/isdn/tpam/tpam_main.c +--- linux-2.4.29.old/drivers/isdn/tpam/tpam_main.c 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/tpam/tpam_main.c 2005-03-22 15:06:49.717534568 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: tpam_main.c,v 1.1.2.2 2001/12/09 18:45:14 kai Exp $ ++/* $Id$ + * + * Turbo PAM ISDN driver for Linux. (Kernel Driver - main routines) + * +@@ -254,7 +254,7 @@ + name: "tpam", + id_table: tpam_pci_tbl, + probe: tpam_probe, +- remove: __devexit_p(tpam_remove), ++ remove: tpam_remove, + }; + + static int __init tpam_init(void) { +diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_memory.c linux-2.4.29/drivers/isdn/tpam/tpam_memory.c +--- linux-2.4.29.old/drivers/isdn/tpam/tpam_memory.c 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/tpam/tpam_memory.c 2005-03-22 15:06:49.734531984 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: tpam_memory.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Turbo PAM ISDN driver for Linux. (Kernel Driver - Board Memory Access) + * +diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_nco.c linux-2.4.29/drivers/isdn/tpam/tpam_nco.c +--- linux-2.4.29.old/drivers/isdn/tpam/tpam_nco.c 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/tpam/tpam_nco.c 2005-03-22 15:06:49.749529704 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: tpam_nco.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Turbo PAM ISDN driver for Linux. + * (Kernel Driver - Low Level NCO Manipulation) +diff -rNu linux-2.4.29.old/drivers/isdn/tpam/tpam_queues.c linux-2.4.29/drivers/isdn/tpam/tpam_queues.c +--- linux-2.4.29.old/drivers/isdn/tpam/tpam_queues.c 2005-03-22 14:47:57.000000000 +0100 ++++ linux-2.4.29/drivers/isdn/tpam/tpam_queues.c 2005-03-22 15:06:49.764527424 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: tpam_queues.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $ ++/* $Id$ + * + * Turbo PAM ISDN driver for Linux. (Kernel Driver) + * +@@ -146,7 +146,6 @@ + do { + hpic = readl(card->bar0 + TPAM_HPIC_REGISTER); + if (waiting_too_long++ > 0xfffffff) { +- kfree_skb(skb); + spin_unlock(&card->lock); + printk(KERN_ERR "TurboPAM(tpam_irq): " + "waiting too long...\n"); +diff -rNu linux-2.4.29.old/include/linux/b1lli.h linux-2.4.29/include/linux/b1lli.h +--- linux-2.4.29.old/include/linux/b1lli.h 2005-03-22 14:47:32.000000000 +0100 ++++ linux-2.4.29/include/linux/b1lli.h 2005-03-22 15:06:49.881509640 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: b1lli.h,v 1.8.8.3 2001/09/23 22:25:05 kai Exp $ ++/* $Id$ + * + * ISDN lowlevel-module for AVM B1-card. + * +diff -rNu linux-2.4.29.old/include/linux/b1pcmcia.h linux-2.4.29/include/linux/b1pcmcia.h +--- linux-2.4.29.old/include/linux/b1pcmcia.h 2005-03-22 14:47:32.000000000 +0100 ++++ linux-2.4.29/include/linux/b1pcmcia.h 2005-03-22 15:06:49.862512528 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: b1pcmcia.h,v 1.1.8.2 2001/09/23 22:25:05 kai Exp $ ++/* $Id$ + * + * Exported functions of module b1pcmcia to be called by + * avm_cs card services module. +diff -rNu linux-2.4.29.old/include/linux/capi.h linux-2.4.29/include/linux/capi.h +--- linux-2.4.29.old/include/linux/capi.h 2005-03-22 14:47:32.000000000 +0100 ++++ linux-2.4.29/include/linux/capi.h 2005-03-22 15:06:49.922503408 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: capi.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $ ++/* $Id$ + * + * CAPI 2.0 Interface for Linux + * +diff -rNu linux-2.4.29.old/include/linux/concap.h linux-2.4.29/include/linux/concap.h +--- linux-2.4.29.old/include/linux/concap.h 2005-03-22 14:47:32.000000000 +0100 ++++ linux-2.4.29/include/linux/concap.h 2005-03-22 15:06:49.906505840 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: concap.h,v 1.2.8.1 2001/09/23 22:25:05 kai Exp $ ++/* $Id: concap.h,v 1.3 2001/09/24 13:23:13 kai Exp $ + * + * Copyright 1997 by Henner Eisen <eis@baty.hanse.de> + * +@@ -11,6 +11,7 @@ + #ifdef __KERNEL__ + #include <linux/skbuff.h> + #include <linux/netdevice.h> ++#include <linux/isdn_compat.h> + + /* Stuff to support encapsulation protocols genericly. The encapsulation + protocol is processed at the uppermost layer of the network interface. +diff -rNu linux-2.4.29.old/include/linux/hysdn_if.h linux-2.4.29/include/linux/hysdn_if.h +--- linux-2.4.29.old/include/linux/hysdn_if.h 2005-03-22 14:47:32.000000000 +0100 ++++ linux-2.4.29/include/linux/hysdn_if.h 2005-03-22 15:06:49.974495504 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: hysdn_if.h,v 1.1.8.3 2001/09/23 22:25:05 kai Exp $ ++/* $Id$ + * + * Linux driver for HYSDN cards + * ioctl definitions shared by hynetmgr and driver. +diff -rNu linux-2.4.29.old/include/linux/isdn/tpam.h linux-2.4.29/include/linux/isdn/tpam.h +--- linux-2.4.29.old/include/linux/isdn/tpam.h 2005-03-22 14:47:32.000000000 +0100 ++++ linux-2.4.29/include/linux/isdn/tpam.h 2005-03-22 15:06:49.947499608 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: tpam.h,v 1.1.2.1 2001/11/20 14:19:38 kai Exp $ ++/* $Id$ + * + * Turbo PAM ISDN driver for Linux. (Kernel Driver) + * +diff -rNu linux-2.4.29.old/include/linux/isdn.h linux-2.4.29/include/linux/isdn.h +--- linux-2.4.29.old/include/linux/isdn.h 2005-03-22 14:47:31.000000000 +0100 ++++ linux-2.4.29/include/linux/isdn.h 2005-03-22 15:06:50.001491400 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $ ++/* $Id: isdn.h,v 1.125 2001/12/01 23:18:21 detabc Exp $ + * + * Main header for the Linux ISDN subsystem (linklevel). + * +@@ -14,6 +14,7 @@ + #ifndef __ISDN_H__ + #define __ISDN_H__ + ++#include <linux/isdn_compat.h> + #include <linux/ioctl.h> + + #ifdef CONFIG_COBALT_MICRO_SERVER +@@ -93,9 +94,15 @@ + #define ISDN_LMSNLEN 255 /* Length of tty's Listen-MSN string */ + #define ISDN_CMSGLEN 50 /* Length of CONNECT-Message to add for Modem */ + ++#ifdef BIG_PHONE_NUMBERS + #define ISDN_MSNLEN 32 + #define NET_DV 0x06 /* Data version for isdn_net_ioctl_cfg */ + #define TTY_DV 0x06 /* Data version for iprofd etc. */ ++#else ++#define ISDN_MSNLEN 20 ++#define NET_DV 0x05 /* Data version for isdn_net_ioctl_cfg */ ++#define TTY_DV 0x05 /* Data version for iprofd etc. */ ++#endif + + #define INF_DV 0x01 /* Data version for /dev/isdninfo */ + +@@ -187,6 +194,61 @@ + #define ISDN_MINOR_PPPMAX (128 + (ISDN_MAX_CHANNELS-1)) + #define ISDN_MINOR_STATUS 255 + ++#ifndef CONFIG_ISDN_WITH_ABC ++#undef CONFIG_ISDN_WITH_ABC_CALLB ++#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK ++#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK_HANGUP ++#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK_DIAL ++#undef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++#undef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++#undef CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER ++#undef CONFIG_ISDN_WITH_ABC_CH_EXTINUSE ++#undef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++#undef CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS ++#else /* CONFIG_ISDN_WITH_ABC */ ++#include <linux/isdn_dwabc.h> ++ ++ ++typedef struct DWABCJIFFIES { ++ ++ u_long msec_1000; ++ u_long msec_500; ++ u_long msec_400; ++ u_long msec_200; ++ u_long msec_100; ++ ++} DWABCJIFFIES; ++ ++ ++#ifdef CONFIG_ISDN_WITH_ABC_NEED_DWSJIFFIES ++DWABCJIFFIES isdn_dwabc_jiffies; ++#else ++extern DWABCJIFFIES isdn_dwabc_jiffies; ++#endif ++#define dwsjiffies (isdn_dwabc_jiffies.msec_1000) ++ ++#define ISDN_DW_ABC_FLAG_UNUSED00001 0x00000001L ++#define ISDN_DW_ABC_FLAG_NO_UDP_CHECK 0x00000002L ++#define ISDN_DW_ABC_FLAG_NO_UDP_HANGUP 0x00000004L ++#define ISDN_DW_ABC_FLAG_NO_UDP_DIAL 0x00000008L ++#define ISDN_DW_ABC_FLAG_UNUSED00010 0x00000010L ++#define ISDN_DW_ABC_FLAG_RCV_NO_HUPTIMER 0x00000020L ++#define ISDN_DW_ABC_FLAG_NO_CH_EXTINUSE 0x00000040L ++#define ISDN_DW_ABC_FLAG_NO_CONN_ERROR 0x00000080L ++#define ISDN_DW_ABC_FLAG_BSD_COMPRESS 0x00000100L ++#define ISDN_DW_ABC_FLAG_NO_LCR 0x00000200L ++#define ISDN_DW_ABC_FLAG_LEASED_LINE 0x00001000L ++ ++#define ISDN_DW_ABC_IFFLAG_NODCHAN 0x00000001L ++#define ISDN_DW_ABC_IFFLAG_BSDAKTIV 0x00000002L ++ ++#define ISDN_DW_ABC_BITLOCK_SEND 0 ++#define ISDN_DW_ABC_BITLOCK_RECEIVE 1 ++ ++#endif /* CONFIG_ISDN_WITH_ABC */ ++ ++ ++ + #ifdef CONFIG_ISDN_PPP + + #ifdef CONFIG_ISDN_PPP_VJ +@@ -204,9 +266,11 @@ + # include <linux/concap.h> + #endif + ++#ifdef HAVE_DEVFS_FS + #ifdef CONFIG_DEVFS_FS + # include <linux/devfs_fs_kernel.h> + #endif ++#endif /* HAVE_DEVFS_FS */ + + #include <linux/isdnif.h> + +@@ -272,6 +336,12 @@ + #define ISDN_NET_CALLBACK 0x04 /* activate callback */ + #define ISDN_NET_CBHUP 0x08 /* hangup before callback */ + #define ISDN_NET_CBOUT 0x10 /* remote machine does callback */ ++#if 0 ++/* Unused??? */ ++#define ISDN_NET_CLONE 0x08 /* clone a tmp interface when called */ ++#define ISDN_NET_TMP 0x10 /* tmp interface until getting an IP */ ++#define ISDN_NET_DYNAMIC 0x20 /* this link is dynamically allocated */ ++#endif + + #define ISDN_NET_MAGIC 0x49344C02 /* for paranoia-checking */ + +@@ -386,6 +456,38 @@ + char cisco_debserint; /* debugging flag of cisco hdlc with slarp */ + struct timer_list cisco_timer; + struct tq_struct tqueue; ++#ifdef CONFIG_ISDN_WITH_ABC ++ ulong dw_abc_flags; ++ ulong dw_abc_if_flags; ++ int dw_abc_inuse_secure; ++ ulong dw_abc_dialstart; ++ int dw_abc_old_onhtime; ++ int dw_abc_remote_version; ++ int dw_abc_bitlocks; ++#ifdef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ ++ char dw_out_msn[ISDN_MSNLEN]; /* eaz for outgoing call if *out_msn != 0 */ ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++ ulong dw_abc_lcr_callid; ++ ulong dw_abc_lcr_start_request; ++ ulong dw_abc_lcr_end_request; ++ isdn_ctrl *dw_abc_lcr_cmd; ++ struct ISDN_DWABC_LCR_IOCTL *dw_abc_lcr_io; ++#endif ++ ulong dw_abc_bchan_last_connect; ++#ifdef CONFIG_ISDN_WITH_ABC_CONN_ERROR ++ short dw_abc_bchan_errcnt; ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS ++ void *dw_abc_bsd_compressor; ++ void *dw_abc_bsd_stat_rx; ++ void *dw_abc_bsd_stat_tx; ++#endif ++ ulong dw_abc_bsd_snd; ++ ulong dw_abc_bsd_bsd_snd; ++ ulong dw_abc_bsd_rcv; ++ ulong dw_abc_bsd_bsd_rcv; ++#endif + } isdn_net_local; + + /* the interface itself */ +@@ -608,12 +710,13 @@ + int tflags; /* Timer-Flags: */ + /* see ISDN_TIMER_..defines */ + int global_flags; +- infostruct *infochain; /* List of open info-devs. */ +- wait_queue_head_t info_waitq; /* Wait-Queue for isdninfo */ + struct timer_list timer; /* Misc.-function Timer */ + int chanmap[ISDN_MAX_CHANNELS];/* Map minor->device-channel */ + int drvmap[ISDN_MAX_CHANNELS]; /* Map minor->driver-index */ + int usage[ISDN_MAX_CHANNELS]; /* Used by tty/ip/voice */ ++#ifdef CONFIG_ISDN_WITH_ABC_CH_EXTINUSE ++ ulong dwabc_chan_external_inuse[ISDN_MAX_CHANNELS]; ++#endif + char num[ISDN_MAX_CHANNELS][ISDN_MSNLEN]; + /* Remote number of active ch.*/ + int m_idx[ISDN_MAX_CHANNELS]; /* Index for mdm.... */ +@@ -631,6 +734,7 @@ + isdn_v110_stream *v110[ISDN_MAX_CHANNELS]; /* V.110 private data */ + struct semaphore sem; /* serialize list access*/ + unsigned long global_features; ++#ifdef HAVE_DEVFS_FS + #ifdef CONFIG_DEVFS_FS + devfs_handle_t devfs_handle_isdninfo; + devfs_handle_t devfs_handle_isdnctrl; +@@ -640,10 +744,41 @@ + devfs_handle_t devfs_handle_ipppX[ISDN_MAX_CHANNELS]; + #endif + #endif /* CONFIG_DEVFS_FS */ ++#endif /* HAVE_DEVFS_FS */ + } isdn_dev; + + extern isdn_dev *dev; + ++#ifdef CONFIG_ISDN_WITH_ABC ++extern int isdn_auto_dial_helper(isdn_net_local *,struct sk_buff *,int); ++extern void dwisdn_nfw_send(isdn_net_local *lp,int drop_only); ++extern void isdn_net_unreachable(struct net_device *,struct sk_buff *,char *); ++extern void isdn_net_log_skb_dwabc(struct sk_buff *,isdn_net_local *,char *); ++extern void isdn_net_hangup(struct net_device *d); ++extern void isdn_dw_clear_if(ulong pm,isdn_net_local *); ++extern void isdn_dwabc_test_phone(isdn_net_local *); ++extern void isdn_dw_abc_init_func(void); ++extern void isdn_dw_abc_release_func(void); ++extern int isdn_dw_abc_reset_interface(isdn_net_local *,int); ++extern int dwabc_bsd_init(isdn_net_local *lp); ++extern void dwabc_bsd_free(isdn_net_local *lp); ++extern struct sk_buff *dwabc_bsd_compress(isdn_net_local *,struct sk_buff *,struct net_device *); ++extern void dwabc_bsd_first_gen(isdn_net_local *); ++extern struct sk_buff *dwabc_bsd_rx_pkt(isdn_net_local *,struct sk_buff *,struct net_device *); ++#ifdef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT ++extern size_t isdn_dw_abc_lcr_readstat(char *,size_t); ++extern ulong isdn_dw_abc_lcr_call_number(isdn_net_local *,isdn_ctrl *); ++extern void isdn_dw_abc_lcr_open(void); ++extern void isdn_dw_abc_lcr_close(void); ++extern int isdn_dw_abc_lcr_ioctl(ulong); ++extern void isdn_dw_abc_lcr_clear(isdn_net_local *); ++extern int isdn_dw_abc_lcr_lock(void); ++extern void isdn_dw_abc_lcr_ulock(void); ++#endif ++#ifdef CONFIG_ISDN_WITH_ABC_UDP_CHECK ++extern int dw_abc_udp_test(struct sk_buff *skb,struct net_device *ndev); ++#endif ++#endif + + #endif /* __KERNEL__ */ + +diff -rNu linux-2.4.29.old/include/linux/isdn_compat.h linux-2.4.29/include/linux/isdn_compat.h +--- linux-2.4.29.old/include/linux/isdn_compat.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/include/linux/isdn_compat.h 2005-03-22 15:06:50.017488968 +0100 +@@ -0,0 +1,261 @@ ++/* $Id: isdn_compat.h,v 1.53 2001/09/24 13:23:13 kai Exp $ ++ * ++ * Linux ISDN subsystem ++ * Compatibility for various Linux kernel versions ++ * ++ * This software may be used and distributed according to the terms ++ * of the GNU General Public License, incorporated herein by reference. ++ * ++ */ ++ ++#ifndef _LINUX_ISDN_COMPAT_H ++#define _LINUX_ISDN_COMPAT_H ++ ++#ifdef __KERNEL__ ++ ++#ifndef ISDN_COMPAT_NOT_GENERIC ++/* when using std2kern -u, this part is left out and instead provided ++ by the .ctrl files */ ++ ++#include <linux/version.h> ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18) ++ ++#define set_current_state(sta) (current->state = sta) ++#define module_init(x) int init_module(void) { return x(); } ++#define module_exit(x) void cleanup_module(void) { x(); } ++#define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); *(int *)0 = 0; } while (0) ++#define init_MUTEX(x) *(x)=MUTEX ++#define init_MUTEX_LOCKED(x) *(x)=MUTEX_LOCKED ++#define __devinit ++#define __devinitdata ++ ++#else /* 2.2.18 and later */ ++ ++#define COMPAT_HAS_NEW_SETUP ++#define COMPAT_HAS_NEW_WAITQ ++ ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) ++ ++#define dev_kfree_skb_irq(a) dev_kfree_skb(a) ++#define dev_kfree_skb_any(a) dev_kfree_skb(a) ++#define COMPAT_HAS_2_2_PCI ++#define get_pcibase(ps, nr) ps->base_address[nr] ++#define pci_resource_start_io(pdev, nr) ((pdev)->base_address[nr] & PCI_BASE_ADDRESS_IO_MASK) ++#define pci_resource_start_mem(pdev, nr) ((pdev)->base_address[nr] & PCI_BASE_ADDRESS_MEM_MASK) ++#define pci_get_sub_vendor(pdev, id) pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &id) ++#define pci_get_sub_system(pdev, id) pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &id) ++ ++#define __exit ++#define __devinit ++#define __devinitdata ++ ++#define net_device device ++#define COMPAT_NO_SOFTNET ++#define netif_running(d) test_bit(LINK_STATE_START, &d->state) ++#define COMPAT_NEED_MPPP_DEFS ++#define spin_lock_bh(lock) ++#define spin_unlock_bh(lock) ++#define COMPAT_NEED_SPIN_LOCK_BH ++#define i_count_read(ic) ic ++#define i_count_inc(ic) ic++ ++#define COMPAT_USE_MODCOUNT_LOCK ++#define devfs_register_chrdev(m,n,f) register_chrdev(m,n,f) ++#define devfs_unregister_chrdev(m,n) unregister_chrdev(m,n) ++#define COMPAT_NEED_PCI_IDS ++#define in_irq() (local_irq_count[smp_processor_id()] != 0) ++ ++#else /* 2.4.0 and later */ ++ ++#define pci_resource_start_io(pdev, nr) pci_resource_start(pdev, nr) ++#define pci_resource_start_mem(pdev, nr) pci_resource_start(pdev, nr) ++#define get_pcibase(ps, nr) ps->resource[nr].start ++#define pci_get_sub_system(pdev, id) id = pdev->subsystem_device ++#define pci_get_sub_vendor(pdev, id) id = pdev->subsystem_vendor ++ ++#define BIG_PHONE_NUMBERS ++#define COMPAT_HAS_ISA_IOREMAP ++#define i_count_read(ic) atomic_read(&ic) ++#define i_count_inc(ic) atomic_inc(&ic) ++#define COMPAT_HAS_FILEOP_OWNER ++#define COMPAT_HAVE_NEW_FILLDIR ++#define COMPAT_has_fileops_in_inode ++#define COMPAT_HAS_init_special_inode ++#define COMPAT_d_alloc_root_one_parameter ++#define HAVE_DEVFS_FS ++#define COMPAT_HAS_SCHEDULE_TASK ++#define COMPAT_HAS_USB_IDTAB ++ ++#endif ++ ++#endif /* ISDN_COMPAT_GENERIC */ ++ ++#ifdef COMPAT_HAS_2_2_PCI ++#include <linux/pci.h> ++#ifdef __powerpc__ ++static inline int pci_enable_device(struct pci_dev *dev) ++{ ++ u16 cmd; ++ pci_read_config_word(dev, PCI_COMMAND, &cmd); ++ cmd |= PCI_COMMAND_MEMORY | PCI_COMMAND_IO | PCI_COMMAND_SERR; ++ cmd &= ~PCI_COMMAND_FAST_BACK; ++ pci_write_config_word(dev, PCI_COMMAND, cmd); ++ return(0); ++} ++#else ++static inline int pci_enable_device(struct pci_dev *dev) ++{ ++ return 0; ++} ++#endif /* __powerpc__ */ ++ ++#define PCI_ANY_ID (~0) ++ ++/* as this is included multiple times, we make it inline */ ++ ++static inline struct pci_dev * pci_find_subsys(unsigned int vendor, unsigned int device, ++ unsigned int ss_vendor, unsigned int ss_device, ++ struct pci_dev *from) ++{ ++ unsigned short subsystem_vendor, subsystem_device; ++ ++ while ((from = pci_find_device(vendor, device, from))) { ++ pci_read_config_word(from, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor); ++ pci_read_config_word(from, PCI_SUBSYSTEM_ID, &subsystem_device); ++ if ((ss_vendor == PCI_ANY_ID || subsystem_vendor == ss_vendor) && ++ (ss_device == PCI_ANY_ID || subsystem_device == ss_device)) ++ return from; ++ } ++ return NULL; ++} ++#endif ++ ++#ifdef COMPAT_NO_SOFTNET ++#include <linux/netdevice.h> ++ ++/* ++ * Tell upper layers that the network device is ready to xmit more frames. ++ */ ++static void __inline__ netif_wake_queue(struct net_device * dev) ++{ ++ dev->tbusy = 0; ++ mark_bh(NET_BH); ++} ++ ++/* ++ * called during net_device open() ++ */ ++static void __inline__ netif_start_queue(struct net_device * dev) ++{ ++ dev->tbusy = 0; ++ /* actually, we never use the interrupt flag at all */ ++ dev->interrupt = 0; ++ dev->start = 1; ++} ++ ++/* ++ * Ask upper layers to temporarily cease passing us more xmit frames. ++ */ ++static void __inline__ netif_stop_queue(struct net_device * dev) ++{ ++ dev->tbusy = 1; ++} ++ ++#endif /* COMPAT_NO_SOFTNET */ ++ ++#ifndef COMPAT_HAS_NEW_WAITQ ++typedef struct wait_queue wait_queue_t; ++typedef struct wait_queue *wait_queue_head_t; ++ ++#define DECLARE_WAITQUEUE(wait, current) struct wait_queue wait = { current, NULL } ++#define DECLARE_WAIT_QUEUE_HEAD(wait) wait_queue_head_t wait ++#define init_waitqueue_head(x) *(x)=NULL ++#define init_waitqueue_entry(q,p) ((q)->task)=(p) ++#endif /* COMPAT_HAS_NEW_WAITQ */ ++ ++#ifdef COMPAT_NEED_PCI_IDS ++ ++#define PCI_ANY_ID (~0) ++ ++#define PCI_VENDOR_ID_DYNALINK 0x0675 ++#define PCI_DEVICE_ID_DYNALINK_IS64PH 0x1702 ++ ++#define PCI_DEVICE_ID_WINBOND2_6692 0x6692 ++ ++#define PCI_DEVICE_ID_PLX_R685 0x1030 ++#define PCI_DEVICE_ID_PLX_DJINN_ITOO 0x1151 ++#define PCI_DEVICE_ID_PLX_R753 0x1152 ++ ++#define PCI_VENDOR_ID_ELSA 0x1048 ++#define PCI_DEVICE_ID_ELSA_MICROLINK 0x1000 ++#define PCI_DEVICE_ID_ELSA_QS3000 0x3000 ++ ++#define PCI_VENDOR_ID_EICON 0x1133 ++#define PCI_DEVICE_ID_EICON_DIVA20PRO 0xe001 ++#define PCI_DEVICE_ID_EICON_DIVA20 0xe002 ++#define PCI_DEVICE_ID_EICON_DIVA20PRO_U 0xe003 ++#define PCI_DEVICE_ID_EICON_DIVA20_U 0xe004 ++#define PCI_DEVICE_ID_EICON_DIVA201 0xe005 ++#define PCI_DEVICE_ID_EICON_MAESTRA 0xe010 ++#define PCI_DEVICE_ID_EICON_MAESTRAQ 0xe012 ++#define PCI_DEVICE_ID_EICON_MAESTRAQ_U 0xe013 ++#define PCI_DEVICE_ID_EICON_MAESTRAP 0xe014 ++ ++#define PCI_VENDOR_ID_CCD 0x1397 ++#define PCI_DEVICE_ID_CCD_2BD0 0x2BD0 ++#define PCI_DEVICE_ID_CCD_B000 0xB000 ++#define PCI_DEVICE_ID_CCD_B006 0xB006 ++#define PCI_DEVICE_ID_CCD_B007 0xB007 ++#define PCI_DEVICE_ID_CCD_B008 0xB008 ++#define PCI_DEVICE_ID_CCD_B009 0xB009 ++#define PCI_DEVICE_ID_CCD_B00A 0xB00A ++#define PCI_DEVICE_ID_CCD_B00B 0xB00B ++#define PCI_DEVICE_ID_CCD_B00C 0xB00C ++#define PCI_DEVICE_ID_CCD_B100 0xB100 ++ ++#define PCI_VENDOR_ID_ASUSTEK 0x1043 ++#define PCI_DEVICE_ID_ASUSTEK_0675 0x0675 ++ ++#define PCI_VENDOR_ID_BERKOM 0x0871 ++#define PCI_DEVICE_ID_BERKOM_A1T 0xFFA1 ++#define PCI_DEVICE_ID_BERKOM_T_CONCEPT 0xFFA2 ++#define PCI_DEVICE_ID_BERKOM_A4T 0xFFA4 ++#define PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO 0xFFA8 ++ ++#define PCI_DEVICE_ID_SATSAGEM_NICCY 0x1016 ++ ++#define PCI_DEVICE_ID_TIGERJET_100 0x0002 ++ ++#define PCI_VENDOR_ID_ANIGMA 0x1051 ++#define PCI_DEVICE_ID_ANIGMA_MC145575 0x0100 ++ ++#define PCI_VENDOR_ID_ZOLTRIX 0x15b0 ++#define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2BD0 ++ ++#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_E 0x0070 ++#define PCI_DEVICE_ID_DIGI_DF_M_E 0x0071 ++#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A 0x0072 ++#define PCI_DEVICE_ID_DIGI_DF_M_A 0x0073 ++ ++#define PCI_DEVICE_ID_AVM_B1 0x0700 ++#define PCI_DEVICE_ID_AVM_C4 0x0800 ++#define PCI_DEVICE_ID_AVM_C2 0x1100 ++#define PCI_DEVICE_ID_AVM_T1 0x1200 ++ ++#define PCI_VENDOR_ID_HYPERCOPE 0x1365 ++#define PCI_DEVICE_ID_HYPERCOPE_PLX 0x9050 ++#define PCI_SUBDEVICE_ID_HYPERCOPE_OLD_ERGO 0x0104 ++#define PCI_SUBDEVICE_ID_HYPERCOPE_ERGO 0x0106 ++#define PCI_SUBDEVICE_ID_HYPERCOPE_METRO 0x0107 ++#define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2 0x0108 ++#define PCI_SUBDEVICE_ID_HYPERCOPE_PLEXUS 0x0109 ++ ++#define PCI_VENDOR_ID_ABOCOM 0x13D1 ++#define PCI_DEVICE_ID_ABOCOM_2BD1 0x2BD1 ++ ++#endif /* COMPAT_NEED_PCI_IDS */ ++ ++#endif /* __KERNEL__ */ ++#endif /* _LINUX_ISDN_COMPAT_H */ +diff -rNu linux-2.4.29.old/include/linux/isdn_divertif.h linux-2.4.29/include/linux/isdn_divertif.h +--- linux-2.4.29.old/include/linux/isdn_divertif.h 2005-03-22 14:47:32.000000000 +0100 ++++ linux-2.4.29/include/linux/isdn_divertif.h 2005-03-22 15:06:50.032486688 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_divertif.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $ ++/* $Id$ + * + * Header for the diversion supplementary interface for i4l. + * +@@ -14,7 +14,7 @@ + /***********************************************************/ + /* magic value is also used to control version information */ + /***********************************************************/ +-#define DIVERT_IF_MAGIC 0x25873401 ++#define DIVERT_IF_MAGIC 0x25873402 + #define DIVERT_CMD_REG 0x00 /* register command */ + #define DIVERT_CMD_REL 0x01 /* release command */ + #define DIVERT_NO_ERR 0x00 /* return value no error */ +@@ -34,6 +34,7 @@ + int (*ll_cmd)(isdn_ctrl *); /* supplied by hl on return */ + char * (*drv_to_name)(int); /* map a driver id to name, supplied by hl */ + int (*name_to_drv)(char *); /* map a driver id to name, supplied by hl */ ++ int (*dial_net_name)(char *); /* force dial of a ll net interface */ + } isdn_divert_if; + + /*********************/ +diff -rNu linux-2.4.29.old/include/linux/isdn_dwabc.h linux-2.4.29/include/linux/isdn_dwabc.h +--- linux-2.4.29.old/include/linux/isdn_dwabc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.29/include/linux/isdn_dwabc.h 2005-03-22 15:06:50.048484256 +0100 +@@ -0,0 +1,84 @@ ++/* $Id: isdn_dwabc.h,v 1.9 2001/09/26 20:32:08 detabc Exp $ ++ * ++ * Header for the Linux ISDN abc-extension. ++ * ++ * Copyright by abc GmbH ++ * written by Detlef Wengorz <detlefw@isdn4linux.de> ++ * ++ * This software may be used and distributed according to the terms ++ * of the GNU General Public License, incorporated herein by reference. ++ * ++ */ ++ ++#ifndef ISDN_DWABC_H ++#define ISDN_DWABC_H ++ ++#ifdef __KERNEL__ ++#include <linux/types.h> ++#include <linux/kernel.h> ++#include <linux/sched.h> ++#include <linux/smp.h> ++#include <linux/spinlock.h> ++#include <linux/errno.h> ++ ++ ++typedef struct ISDN_DWSPINLOCK { ++ ++ spinlock_t spin; ++ short owner; ++ short my_flags; ++ ulong irq_flags; ++ ++} ISDN_DWSPINLOCK; ++ ++#define ISDN_DWSPIN_UNLOCKED \ ++ (ISDN_DWSPINLOCK) { \ ++ spin: SPIN_LOCK_UNLOCKED, \ ++ owner: -1, \ ++ my_flags: 0, \ ++ irq_flags: 0, \ ++ } ++ ++#define ISDN_DWSPIN_INIT(x) \ ++ do { *(x) = ISDN_DWSPIN_UNLOCKED; } while(0); ++ ++static __inline__ int isdn_dwspin_trylock(ISDN_DWSPINLOCK *spin) ++{ ++ if(!spin_trylock(&spin->spin)) { ++ ++ if(spin->owner == smp_processor_id()) ++ return(-EAGAIN); ++ ++ spin_lock(&spin->spin); ++ } ++ ++ spin->owner = smp_processor_id(); ++ return(0); ++} ++ ++static __inline__ void isdn_dwspin_unlock(ISDN_DWSPINLOCK *spin) ++{ ++ spin->owner = -1; ++ spin_unlock(&spin->spin); ++} ++ ++ ++#else ++#include <sys/types.h> ++#endif ++ ++#define DWABC_LCR_FLG_NEWNUMBER 0x00000001L ++#define DWABC_LCR_FLG_DISABLE 0x00000002L ++#define DWABC_LCR_FLG_NEWHUPTIME 0x00000004L ++ ++ ++struct ISDN_DWABC_LCR_IOCTL { ++ ++ int lcr_ioctl_sizeof; /* mustbe sizeof(ISDN_DWABC_LCR_IOCTL) */ ++ u_short lcr_ioctl_onhtime; /* new hanguptime */ ++ u_long lcr_ioctl_callid; /* callid from lcr-subsystem */ ++ u_long lcr_ioctl_flags; /* see above */ ++ char lcr_ioctl_nr[32]; /* new destination phonenumber */ ++}; ++ ++#endif +diff -rNu linux-2.4.29.old/include/linux/isdn_lzscomp.h linux-2.4.29/include/linux/isdn_lzscomp.h +--- linux-2.4.29.old/include/linux/isdn_lzscomp.h 2005-03-22 14:47:32.000000000 +0100 ++++ linux-2.4.29/include/linux/isdn_lzscomp.h 2005-03-22 15:06:50.089478024 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdn_lzscomp.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $ ++/* $Id$ + * + * Header for isdn_lzscomp.c + * Concentrated here to not mess up half a dozen kernel headers with code +diff -rNu linux-2.4.29.old/include/linux/isdn_ppp.h linux-2.4.29/include/linux/isdn_ppp.h +--- linux-2.4.29.old/include/linux/isdn_ppp.h 2005-03-22 14:47:31.000000000 +0100 ++++ linux-2.4.29/include/linux/isdn_ppp.h 2005-03-22 15:06:50.116473920 +0100 +@@ -8,6 +8,7 @@ + #ifndef _LINUX_ISDN_PPP_H + #define _LINUX_ISDN_PPP_H + ++#include <linux/isdn_compat.h> + + #define CALLTYPE_INCOMING 0x1 + #define CALLTYPE_OUTGOING 0x2 +@@ -33,6 +34,11 @@ + #define PPPIOCSCOMPRESSOR _IOW('t',135,int) + #define PPPIOCGIFNAME _IOR('t',136, char [IFNAMSIZ] ) + ++#ifdef COMPAT_NEED_MPPP_DEFS ++#define PPP_MP 0x003d ++#define PPP_COMPFRAG 0x00fb ++#define PPP_CCPFRAG 0x80fb ++#endif + + #define SC_MP_PROT 0x00000200 + #define SC_REJ_MP_PROT 0x00000400 +@@ -65,9 +71,6 @@ + + #include <linux/config.h> + +-#ifdef CONFIG_IPPP_FILTER +-#include <linux/filter.h> +-#endif + + #define DECOMP_ERR_NOMEM (-10) + +@@ -226,10 +229,6 @@ + unsigned char *cbuf; + struct slcompress *slcomp; + #endif +-#ifdef CONFIG_IPPP_FILTER +- struct sock_fprog pass_filter; /* filter for packets to pass */ +- struct sock_fprog active_filter; /* filter for pkts to reset idle */ +-#endif + unsigned long debug; + struct isdn_ppp_compressor *compressor,*decompressor; + struct isdn_ppp_compressor *link_compressor,*link_decompressor; +diff -rNu linux-2.4.29.old/include/linux/isdnif.h linux-2.4.29/include/linux/isdnif.h +--- linux-2.4.29.old/include/linux/isdnif.h 2005-03-22 14:47:31.000000000 +0100 ++++ linux-2.4.29/include/linux/isdnif.h 2005-03-22 15:06:50.132471488 +0100 +@@ -1,4 +1,4 @@ +-/* $Id: isdnif.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $ ++/* $Id: isdnif.h,v 1.43 2002/02/09 21:19:11 keil Exp $ + * + * Linux ISDN subsystem + * Definition of the interface between the subsystem and its low-level drivers. +@@ -14,6 +14,7 @@ + #ifndef __ISDNIF_H__ + #define __ISDNIF_H__ + ++#include <linux/isdn_compat.h> + + /* + * Values for general protocol-selection +@@ -213,6 +214,8 @@ + #define ISDN_STAT_FAXIND 276 /* FAX indications from HL-driver */ + #define ISDN_STAT_AUDIO 277 /* DTMF, DSP indications */ + #define ISDN_STAT_DISCH 278 /* Disable/Enable channel usage */ ++#define ISDN_STAT_ALERT 279 /* Signal alerting */ ++#define ISDN_STAT_PROCEED 280 /* Signal proceeding */ + + /* + * Audio commands +diff -rNu linux-2.4.29.old/include/linux/kernelcapi.h linux-2.4.29/include/linux/kernelcapi.h +--- linux-2.4.29.old/include/linux/kernelcapi.h 2005-03-22 14:47:32.000000000 +0100 ++++ linux-2.4.29/include/linux/kernelcapi.h 2005-03-22 15:06:50.147469208 +0100 +@@ -1,12 +1,10 @@ +-/* $Id: kernelcapi.h,v 1.1.4.2 2002/01/28 18:25:10 kai Exp $ ++/* ++ * $Id: kernelcapi.h,v 1.9 2000/11/28 09:34:02 kai Exp $ + * + * Kernel CAPI 2.0 Interface for Linux + * + * (c) Copyright 1997 by Carsten Paeth (calle@calle.in-berlin.de) + * +- * This software may be used and distributed according to the terms +- * of the GNU General Public License, incorporated herein by reference. +- * + */ + + #ifndef __KERNELCAPI_H__ diff --git a/recipes/linux/linux-wrt-2.4.30/401-hfc-usb-backport-i4l-cvs b/recipes/linux/linux-wrt-2.4.30/401-hfc-usb-backport-i4l-cvs new file mode 100644 index 0000000000..4ef20fa8ba --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/401-hfc-usb-backport-i4l-cvs @@ -0,0 +1,2663 @@ +diff -rNu linux-2.4.29.old/drivers/Makefile linux-2.4.29/drivers/Makefile +--- linux-2.4.29.old/drivers/Makefile 2005-03-22 14:47:41.000000000 +0100 ++++ linux-2.4.29/drivers/Makefile 2005-03-22 15:15:20.012957872 +0100 +@@ -38,7 +38,7 @@ + subdir-$(CONFIG_MD) += md + subdir-$(CONFIG_IEEE1394) += ieee1394 + subdir-$(CONFIG_PNP) += pnp +-subdir-$(CONFIG_ISDN_BOOL) += isdn ++subdir-$(CONFIG_ISDN) += isdn + subdir-$(CONFIG_ATM) += atm + subdir-$(CONFIG_FC4) += fc4 + +diff -rNu linux-2.4.29.old/drivers/isdn/hisax/hfc_usb.c linux-2.4.29/drivers/isdn/hisax/hfc_usb.c +--- linux-2.4.29.old/drivers/isdn/hisax/hfc_usb.c 2005-03-22 15:13:58.233390256 +0100 ++++ linux-2.4.29/drivers/isdn/hisax/hfc_usb.c 2005-03-22 15:14:57.475384104 +0100 +@@ -1,13 +1,11 @@ +-/* $Id: hfc_usb.c,v 2.3 2001/07/06 21:30:11 werner Exp $ ++/* ++ * hfc_usb.c + * ++ * modular HiSax ISDN driver for Colognechip HFC-USB chip + * +- * +- * Author (C) 2001 Werner Cornelius (werner@isdn-development.de) +- * modular driver for Colognechip HFC-USB chip +- * as plugin for HiSax isdn driver +- * type approval valid for HFC-S USB based TAs +- * +- * Copyright 2001 by Werner Cornelius (werner@isdn-development.de) ++ * Authors : Peter Sprenger (sprenger@moving-byters.de) ++ * Martin Bachem (info@colognechip.com) ++ * based on the first hfc_usb driver of Werner Cornelius (werner@isdn-development.de) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -23,70 +21,90 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * +- */ ++ * 2005_Mar_16 grsch ++ * ported 2.6.8 hfc_usb.c to 2.4.20 format ++ * Gregor Schaffrath <gschaff@ran-dom.org> ++*/ ++ + + #include <linux/types.h> + #include <linux/stddef.h> + #include <linux/timer.h> + #include <linux/config.h> +-#include <linux/isdn_compat.h> + #include <linux/init.h> + #include "hisax.h" + #include <linux/module.h> + #include <linux/kernel_stat.h> +-#include <linux/tqueue.h> + #include <linux/usb.h> + #include <linux/kernel.h> + #include <linux/smp_lock.h> + #include <linux/sched.h> ++#include "hisax_if.h" + #include "hisax_loadable.h" + ++static const char *hfcusb_revision = "4.0"; ++ ++/* ++ to enable much mire debug messages in this driver, define ++ VERBOSE_USB_DEBUG and VERBOSE_ISDN_DEBUG ++ below ++*/ ++ ++#define VERBOSE_USB_DEBUG ++#define VERBOSE_ISDN_DEBUG ++ + #define INCLUDE_INLINE_FUNCS + ++#define TRUE 1 ++#define FALSE 0 ++ ++ + /***********/ + /* defines */ + /***********/ +-#define HFC_CTRL_TIMEOUT 5 /* 5ms timeout writing/reading regs */ +-#define HFC_TIMER_T3 7000 /* timeout for l1 activation timer */ +- +-#define HFCUSB_L1_STATECHANGE 0 /* L1 state changed */ +-#define HFCUSB_L1_DRX 1 /* D-frame received */ +-#define HFCUSB_L1_ERX 2 /* E-frame received */ +-#define HFCUSB_L1_DTX 4 /* D-frames completed */ +- +-#define MAX_BCH_SIZE 2048 /* allowed B-channel packet size */ +- +-#define HFCUSB_RX_THRESHOLD 64 /* threshold for fifo report bit rx */ +-#define HFCUSB_TX_THRESHOLD 64 /* threshold for fifo report bit tx */ +- +-#define HFCUSB_CHIP_ID 0x16 /* Chip ID register index */ +-#define HFCUSB_CIRM 0x00 /* cirm register index */ +-#define HFCUSB_USB_SIZE 0x07 /* int length register */ +-#define HFCUSB_USB_SIZE_I 0x06 /* iso length register */ +-#define HFCUSB_F_CROSS 0x0b /* bit order register */ +-#define HFCUSB_CLKDEL 0x37 /* bit delay register */ +-#define HFCUSB_CON_HDLC 0xfa /* channel connect register */ ++#define HFC_CTRL_TIMEOUT 20 //(HZ * USB_CTRL_GET_TIMEOUT) ++/* 5ms timeout writing/reading regs */ ++#define HFC_TIMER_T3 8000 /* timeout for l1 activation timer */ ++#define HFC_TIMER_T4 500 /* time for state change interval */ ++ ++#define HFCUSB_L1_STATECHANGE 0 /* L1 state changed */ ++#define HFCUSB_L1_DRX 1 /* D-frame received */ ++#define HFCUSB_L1_ERX 2 /* E-frame received */ ++#define HFCUSB_L1_DTX 4 /* D-frames completed */ ++ ++#define MAX_BCH_SIZE 2048 /* allowed B-channel packet size */ ++ ++#define HFCUSB_RX_THRESHOLD 64 /* threshold for fifo report bit rx */ ++#define HFCUSB_TX_THRESHOLD 64 /* threshold for fifo report bit tx */ ++ ++#define HFCUSB_CHIP_ID 0x16 /* Chip ID register index */ ++#define HFCUSB_CIRM 0x00 /* cirm register index */ ++#define HFCUSB_USB_SIZE 0x07 /* int length register */ ++#define HFCUSB_USB_SIZE_I 0x06 /* iso length register */ ++#define HFCUSB_F_CROSS 0x0b /* bit order register */ ++#define HFCUSB_CLKDEL 0x37 /* bit delay register */ ++#define HFCUSB_CON_HDLC 0xfa /* channel connect register */ + #define HFCUSB_HDLC_PAR 0xfb +-#define HFCUSB_SCTRL 0x31 /* S-bus control register (tx) */ +-#define HFCUSB_SCTRL_E 0x32 /* same for E and special funcs */ +-#define HFCUSB_SCTRL_R 0x33 /* S-bus control register (rx) */ +-#define HFCUSB_F_THRES 0x0c /* threshold register */ +-#define HFCUSB_FIFO 0x0f /* fifo select register */ +-#define HFCUSB_F_USAGE 0x1a /* fifo usage register */ ++#define HFCUSB_SCTRL 0x31 /* S-bus control register (tx) */ ++#define HFCUSB_SCTRL_E 0x32 /* same for E and special funcs */ ++#define HFCUSB_SCTRL_R 0x33 /* S-bus control register (rx) */ ++#define HFCUSB_F_THRES 0x0c /* threshold register */ ++#define HFCUSB_FIFO 0x0f /* fifo select register */ ++#define HFCUSB_F_USAGE 0x1a /* fifo usage register */ + #define HFCUSB_MST_MODE0 0x14 + #define HFCUSB_MST_MODE1 0x15 + #define HFCUSB_P_DATA 0x1f + #define HFCUSB_INC_RES_F 0x0e + #define HFCUSB_STATES 0x30 + +-#define HFCUSB_CHIPID 0x40 /* ID value of HFC-USB */ ++#define HFCUSB_CHIPID 0x40 /* ID value of HFC-USB */ + + /******************/ + /* fifo registers */ + /******************/ +-#define HFCUSB_NUM_FIFOS 8 /* maximum number of fifos */ +-#define HFCUSB_B1_TX 0 /* index for B1 transmit bulk/int */ +-#define HFCUSB_B1_RX 1 /* index for B1 receive bulk/int */ ++#define HFCUSB_NUM_FIFOS 8 /* maximum number of fifos */ ++#define HFCUSB_B1_TX 0 /* index for B1 transmit bulk/int */ ++#define HFCUSB_B1_RX 1 /* index for B1 receive bulk/int */ + #define HFCUSB_B2_TX 2 + #define HFCUSB_B2_RX 3 + #define HFCUSB_D_TX 4 +@@ -94,198 +112,162 @@ + #define HFCUSB_PCM_TX 6 + #define HFCUSB_PCM_RX 7 + +-/************/ +-/* LED mask */ +-/************/ +-#define LED_DRIVER 0x1 +-#define LED_L1 0x2 +-#define LED_BCH 0x4 ++/* ++* used to switch snd_transfer_mode for different TA modes e.g. the Billion USB TA just ++* supports ISO out, while the Cologne Chip EVAL TA just supports BULK out ++*/ ++#define USB_INT 0 ++#define USB_BULK 1 ++#define USB_ISOC 2 ++ ++#define ISOC_PACKETS_D 8 ++#define ISOC_PACKETS_B 8 ++#define ISO_BUFFER_SIZE 128 ++ ++// ISO send definitions ++#define SINK_MAX 68 ++#define SINK_MIN 48 ++#define SINK_DMIN 12 ++#define SINK_DMAX 18 ++#define BITLINE_INF (-64*8) ++ ++ ++ + + /**********/ + /* macros */ + /**********/ +-#define Write_hfc(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_out_pipe,0,0x40,(c),(b),0,0,HFC_CTRL_TIMEOUT) +-#define Read_hfc(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_in_pipe,1,0xC0,0,(b),(c),1,HFC_CTRL_TIMEOUT) +- +-#ifdef COMPAT_HAS_USB_IDTAB +-/****************************************/ +-/* data defining the devices to be used */ +-/****************************************/ +-static __devinitdata const struct usb_device_id hfc_usb_idtab[3] = { +- {USB_DEVICE(0x959, 0x2bd0)}, /* Colognechip ROM */ +- {USB_DEVICE(0x7b0, 0x0006)}, /* USB TA 128 */ +- {} /* end with an all-zeroes entry */ +-}; +-#endif ++#define write_usb(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_out_pipe,0,0x40,(c),(b),NULL,0,HFC_CTRL_TIMEOUT) ++#define read_usb(a,b,c) usb_control_msg((a)->dev,(a)->ctrl_in_pipe,1,0xC0,0,(b),(c),1,HFC_CTRL_TIMEOUT) + + /*************************************************/ + /* entry and size of output/input control buffer */ + /*************************************************/ + #define HFC_CTRL_BUFSIZE 32 +-typedef struct { ++typedef struct ++{ + __u8 hfc_reg; /* register number */ + __u8 reg_val; /* value to be written (or read) */ ++ int action; /* data for action handler */ ++ + } ctrl_buft; + ++typedef struct ++{ ++ int vendor; // vendor id ++ int prod_id; // product id ++ char *vend_name; // vendor string ++ __u8 led_scheme; // led display scheme ++ __u8 led_invert; // invert led aux port settings ++ __u8 led_bits[8]; // array of 8 possible LED bitmask settings ++ ++} vendor_data; ++ + /***************************************************************/ + /* structure defining input+output fifos (interrupt/bulk mode) */ + /***************************************************************/ +-struct hfcusb_data; /* forward definition */ +-typedef struct { +- int fifonum; /* fifo index attached to this structure */ +- __u8 fifo_mask; /* mask for this fifo */ +- int active; /* fifo is currently active */ ++ ++struct usb_fifo; /* forward definition */ ++typedef struct iso_urb_struct ++{ ++ struct urb *purb; ++ __u8 buffer[ISO_BUFFER_SIZE]; /* buffer incoming/outgoing data */ ++ struct usb_fifo *owner_fifo; // pointer to owner fifo ++} iso_urb_struct; ++ ++ ++struct hfcusb_data; /* forward definition */ ++typedef struct usb_fifo ++{ ++ int fifonum; /* fifo index attached to this structure */ ++ int active; /* fifo is currently active */ + struct hfcusb_data *hfc; /* pointer to main structure */ +- int pipe; /* address of endpoint */ +- __u8 usb_maxlen; /* maximum length for usb transfer */ +- int max_size; /* maximum size of receive/send packet */ +- int transmode; /* transparent mode selected */ +- int framenum; /* number of frame when last tx completed */ +- int rx_offset; /* offset inside rx buffer */ +- int next_complete; /* complete marker */ +- __u8 *act_ptr; /* pointer to next data */ +- __u8 intervall; /* interrupt interval */ +- struct sk_buff *buff; /* actual used buffer */ +- urb_t urb; /* transfer structure for usb routines */ +- __u8 buffer[128]; /* buffer incoming/outgoing data */ ++ int pipe; /* address of endpoint */ ++ __u8 usb_packet_maxlen; /* maximum length for usb transfer */ ++ unsigned int max_size; /* maximum size of receive/send packet */ ++ __u8 intervall; /* interrupt interval */ ++ struct sk_buff *skbuff; /* actual used buffer */ ++ struct urb *urb; /* transfer structure for usb routines */ ++ __u8 buffer[128]; /* buffer incoming/outgoing data */ ++ int bit_line; /* how much bits are in the fifo? */ ++ ++ volatile __u8 usb_transfer_mode;/* switched between ISO and INT */ ++ iso_urb_struct iso[2]; /* need two urbs to have one always for pending */ ++ struct hisax_if *hif; /* hisax interface */ ++ int delete_flg; /* only delete skbuff once */ ++ int last_urblen; /* remember length of last packet */ ++ + } usb_fifo; + ++ + /*********************************************/ + /* structure holding all data for one device */ + /*********************************************/ +-typedef struct hfcusb_data { +- struct hisax_drvreg regd; /* register data and callbacks */ +- struct usb_device *dev; /* our device */ +- int if_used; /* used interface number */ +- int alt_used; /* used alternate config */ +- int ctrl_paksize; /* control pipe packet size */ ++typedef struct hfcusb_data ++{ ++ // HiSax Interface for loadable Layer1 drivers ++ struct hisax_d_if d_if; /* see hisax_if.h */ ++ struct hisax_b_if b_if[2]; /* see hisax_if.h */ ++ int protocol; ++ ++ struct usb_device *dev; /* our device */ ++ int if_used; /* used interface number */ ++ int alt_used; /* used alternate config */ ++ int ctrl_paksize; /* control pipe packet size */ + int ctrl_in_pipe, ctrl_out_pipe; /* handles for control pipe */ ++ int cfg_used; /* configuration index used */ ++ int vend_idx; // vendor found ++ ++ int b_mode[2]; // B-channel mode ++ ++ int l1_activated; // layer 1 activated ++ ++ int packet_size,iso_packet_size; + + /* control pipe background handling */ + ctrl_buft ctrl_buff[HFC_CTRL_BUFSIZE]; /* buffer holding queued data */ +- volatile int ctrl_in_idx, ctrl_out_idx, ctrl_cnt; /* input/output pointer + count */ +- urb_t ctrl_urb; /* transfer structure for control channel */ +- devrequest ctrl_write; /* buffer for control write request */ +- devrequest ctrl_read; /* same for read request */ +- +- volatile __u8 dfifo_fill; /* value read from tx d-fifo */ +- volatile __u8 active_fifos; /* fifos currently active as bit mask */ +- volatile __u8 threshold_mask; /* threshold actually reported */ +- volatile __u8 service_request; /* fifo needs service from task */ +- volatile __u8 ctrl_fifo; /* last selected fifo */ +- volatile __u8 bch_enables; /* or mask for sctrl_r and sctrl register values */ +- volatile __u8 led_req; /* request status of adapters leds */ +- volatile __u8 led_act; /* active status of adapters leds */ ++ volatile int ctrl_in_idx, ctrl_out_idx, ++ ctrl_cnt; /* input/output pointer + count */ ++ struct urb *ctrl_urb; /* transfer structure for control channel */ ++ ++ struct usb_ctrlrequest ctrl_write; /* buffer for control write request */ ++ struct usb_ctrlrequest ctrl_read; /* same for read request */ ++ ++ __u8 led_state,led_new_data,led_b_active; ++ ++ volatile __u8 threshold_mask; /* threshold actually reported */ ++ volatile __u8 bch_enables; /* or mask for sctrl_r and sctrl register values */ ++ + usb_fifo fifos[HFCUSB_NUM_FIFOS]; /* structure holding all fifo data */ + +- /* layer 1 activation/deactivation handling */ +- volatile __u8 l1_state; /* actual l1 state */ +- volatile ulong l1_event; /* event mask */ +- struct tq_struct l1_tq; /* l1 bh structure */ +- struct timer_list t3_timer; /* timer for activation/deactivation */ +- struct timer_list t4_timer; /* timer for activation/deactivation */ ++ volatile __u8 l1_state; /* actual l1 state */ ++ struct timer_list t3_timer; /* timer 3 for activation/deactivation */ ++ struct timer_list t4_timer; /* timer 4 for activation/deactivation */ ++ struct timer_list led_timer; /* timer flashing leds */ ++ + } hfcusb_data; + +-#if 0 +-static void +-usb_dump_urb(purb_t purb) +-{ +- printk("urb :%p\n", purb); +- printk("next :%p\n", purb->next); +- printk("dev :%p\n", purb->dev); +- printk("pipe :%08X\n", purb->pipe); +- printk("status :%d\n", purb->status); +- printk("transfer_flags :%08X\n", purb->transfer_flags); +- printk("transfer_buffer :%p\n", purb->transfer_buffer); +- printk("transfer_buffer_length:%d\n", +- purb->transfer_buffer_length); +- printk("actual_length :%d\n", purb->actual_length); +- printk("setup_packet :%p\n", purb->setup_packet); +- printk("start_frame :%d\n", purb->start_frame); +- printk("number_of_packets :%d\n", purb->number_of_packets); +- printk("interval :%d\n", purb->interval); +- printk("error_count :%d\n", purb->error_count); +- printk("context :%p\n", purb->context); +- printk("complete :%p\n", purb->complete); +-} +-#endif + +-/*************************************************************************/ +-/* bottom half handler for L1 activation/deactiavtaion + D-chan + E-chan */ +-/*************************************************************************/ +-static void +-usb_l1d_bh(hfcusb_data * hfc) +-{ ++static void collect_rx_frame(usb_fifo *fifo,__u8 *data,int len,int finish); ++ + +- while (hfc->l1_event) { +- if (test_and_clear_bit +- (HFCUSB_L1_STATECHANGE, &hfc->l1_event)) { +- if (hfc->l1_state == 7) +- hfc->led_req |= LED_L1; +- else +- hfc->led_req &= ~LED_L1; +- if ((hfc->l1_state == 7) || +- (hfc->l1_state == 3)) +- hfc->regd.dch_l1l2(hfc->regd.arg_hisax, +- (hfc->l1_state == +- 7) ? (PH_ACTIVATE | +- INDICATION) +- : (PH_DEACTIVATE | INDICATION), +- NULL); +- } +- if (test_and_clear_bit(HFCUSB_L1_DRX, &hfc->l1_event)) { +- hfc->regd.dch_l1l2(hfc->regd.arg_hisax, +- PH_DATA | INDICATION, +- (void *) 0); +- } +- if (test_and_clear_bit(HFCUSB_L1_ERX, &hfc->l1_event)) { +- hfc->regd.dch_l1l2(hfc->regd.arg_hisax, +- PH_DATA | INDICATION, +- (void *) 1); +- } +- if (test_and_clear_bit(HFCUSB_L1_DTX, &hfc->l1_event)) { +- hfc->regd.dch_l1l2(hfc->regd.arg_hisax, +- PH_DATA | CONFIRM, NULL); +- } +- } /* while */ +-} /* usb_l1d_bh */ + + /******************************************************/ + /* start next background transfer for control channel */ + /******************************************************/ +-static void +-ctrl_start_transfer(hfcusb_data * hfc) ++static void ctrl_start_transfer(hfcusb_data * hfc) + { +- +- if (hfc->ctrl_cnt) { +- switch (hfc->ctrl_buff[hfc->ctrl_out_idx].hfc_reg) { +- case HFCUSB_F_USAGE: +- hfc->ctrl_urb.pipe = hfc->ctrl_in_pipe; +- hfc->ctrl_urb.setup_packet = +- (u_char *) & hfc->ctrl_read; +- hfc->ctrl_urb.transfer_buffer_length = 1; +- hfc->ctrl_read.index = +- hfc->ctrl_buff[hfc->ctrl_out_idx]. +- hfc_reg; +- hfc->ctrl_urb.transfer_buffer = +- (char *) &hfc->dfifo_fill; +- break; +- +- default: /* write register */ +- hfc->ctrl_urb.pipe = hfc->ctrl_out_pipe; +- hfc->ctrl_urb.setup_packet = +- (u_char *) & hfc->ctrl_write; +- hfc->ctrl_urb.transfer_buffer = NULL; +- hfc->ctrl_urb.transfer_buffer_length = 0; +- hfc->ctrl_write.index = +- hfc->ctrl_buff[hfc->ctrl_out_idx]. +- hfc_reg; +- hfc->ctrl_write.value = +- hfc->ctrl_buff[hfc->ctrl_out_idx]. +- reg_val; +- break; +- } +- usb_submit_urb(&hfc->ctrl_urb); /* start transfer */ ++ int err; ++ if(hfc->ctrl_cnt) ++ { ++ hfc->ctrl_urb->pipe = hfc->ctrl_out_pipe; ++ hfc->ctrl_urb->setup_packet = (u_char *) & hfc->ctrl_write; ++ hfc->ctrl_urb->transfer_buffer = NULL; ++ hfc->ctrl_urb->transfer_buffer_length = 0; ++ hfc->ctrl_write.wIndex = hfc->ctrl_buff[hfc->ctrl_out_idx].hfc_reg; ++ hfc->ctrl_write.wValue = hfc->ctrl_buff[hfc->ctrl_out_idx].reg_val; ++ err = usb_submit_urb(hfc->ctrl_urb); /* start transfer */ ++ printk(KERN_DEBUG "ctrl_start_transfer: submit %d\n", err); + } + } /* ctrl_start_transfer */ + +@@ -293,897 +275,1418 @@ + /* queue a control transfer request */ + /* return 0 on success. */ + /************************************/ +-static int +-queue_control_request(hfcusb_data * hfc, __u8 reg, __u8 val) ++static int queue_control_request(hfcusb_data * hfc, __u8 reg, __u8 val,int action) + { + ctrl_buft *buf; + +- if (hfc->ctrl_cnt >= HFC_CTRL_BUFSIZE) +- return (1); /* no space left */ +- buf = hfc->ctrl_buff + hfc->ctrl_in_idx; /* pointer to new index */ ++#ifdef VERBOSE_USB_DEBUG ++ printk ("HFC_USB: queue_control_request reg: %x, val: %x\n", reg, val); ++#endif ++ ++ if(hfc->ctrl_cnt >= HFC_CTRL_BUFSIZE) return(1); /* no space left */ ++ buf = &hfc->ctrl_buff[hfc->ctrl_in_idx]; /* pointer to new index */ + buf->hfc_reg = reg; + buf->reg_val = val; ++ buf->action=action; + if (++hfc->ctrl_in_idx >= HFC_CTRL_BUFSIZE) + hfc->ctrl_in_idx = 0; /* pointer wrap */ + if (++hfc->ctrl_cnt == 1) + ctrl_start_transfer(hfc); +- return (0); +-} /* queue_control_request */ ++ return(0); ++} /* queue_control_request */ + +-/**************************************/ +-/* called when timer t3 or t4 expires */ +-/**************************************/ +-static void +-l1_timer_expire(hfcusb_data * hfc) +-{ +- if (timer_pending(&hfc->t4_timer)) +- del_timer(&hfc->t4_timer); +- queue_control_request(hfc, HFCUSB_STATES, 0x40); +- test_and_set_bit(HFCUSB_L1_STATECHANGE, +- &hfc->l1_event); +- queue_task(&hfc->l1_tq, &tq_immediate); +- mark_bh(IMMEDIATE_BH); +-} /* l1_timer_expire */ +- +-/**************************************************/ +-/* (re)fills a tx-fifo urb. Queuing is done later */ +-/**************************************************/ +-static void +-fill_tx_urb(usb_fifo * fifo) +-{ +- struct sk_buff *skb; +- long flags; +- int i, ii = 0; +- +- fifo->urb.dev = fifo->hfc->dev; +- if ((fifo->buff) +- && (fifo->urb.transfer_buffer_length < fifo->usb_maxlen)) { +- switch (fifo->fifonum) { +- case HFCUSB_B1_TX: +- case HFCUSB_B2_TX: +- skb = fifo->buff; +- fifo->buff = NULL; +- fifo->hfc->regd.bch_l1l2(fifo->hfc->regd. +- arg_hisax, +- (fifo->fifonum == +- HFCUSB_B1_TX) ? 0 +- : 1, +- (PH_DATA | +- CONFIRM), +- (void *) skb); +- fifo->hfc->service_request |= +- fifo->fifo_mask; +- return; +- case HFCUSB_D_TX: +- dev_kfree_skb_any(fifo->buff); +- fifo->buff = NULL; +- save_flags(flags); +- cli(); +- fifo->hfc->dfifo_fill = 0xff; /* currently invalid data */ +- queue_control_request(fifo->hfc, +- HFCUSB_FIFO, +- HFCUSB_D_TX); +- queue_control_request(fifo->hfc, +- HFCUSB_F_USAGE, 0); +- restore_flags(flags); +- return; +- default: +- return; /* error, invalid fifo */ +- } ++ ++static int control_action_handler(hfcusb_data *hfc,int reg,int val,int action) ++{ ++ if(!action) return(1); // no action defined ++ ++ return(0); ++} ++ ++ ++/***************************************************************/ ++/* control completion routine handling background control cmds */ ++/***************************************************************/ ++static void ctrl_complete(struct urb *urb) ++{ ++ hfcusb_data *hfc = (hfcusb_data *) urb->context; ++ ctrl_buft *buf; ++ ++ printk(KERN_DEBUG "ctrl_complete cnt %d\n", hfc->ctrl_cnt); ++ urb->dev = hfc->dev; ++ if(hfc->ctrl_cnt) ++ { ++ buf=&hfc->ctrl_buff[hfc->ctrl_out_idx]; ++ control_action_handler(hfc,buf->hfc_reg,buf->reg_val,buf->action); ++ ++ hfc->ctrl_cnt--; /* decrement actual count */ ++ if(++hfc->ctrl_out_idx >= HFC_CTRL_BUFSIZE) hfc->ctrl_out_idx = 0; /* pointer wrap */ ++ ++ ctrl_start_transfer(hfc); /* start next transfer */ ++ } ++} /* ctrl_complete */ ++ ++ ++ ++#define LED_OFF 0 // no LED support ++#define LED_SCHEME1 1 // LED standard scheme ++#define LED_SCHEME2 2 // not used yet... ++ ++#define LED_POWER_ON 1 ++#define LED_POWER_OFF 2 ++#define LED_S0_ON 3 ++#define LED_S0_OFF 4 ++#define LED_B1_ON 5 ++#define LED_B1_OFF 6 ++#define LED_B1_DATA 7 ++#define LED_B2_ON 8 ++#define LED_B2_OFF 9 ++#define LED_B2_DATA 10 ++ ++#define LED_NORMAL 0 // LEDs are normal ++#define LED_INVERTED 1 // LEDs are inverted ++ ++// time for LED flashing ++#define LED_TIME 250 ++ ++vendor_data vdata[]= ++{ ++ {0x959, 0x2bd0, "ISDN USB TA (Cologne Chip HFC-S USB based)", LED_OFF,LED_NORMAL,{4,0,2,1}}, /* CologneChip Eval TA */ ++ {0x7b0, 0x0007, "Billion tiny USB ISDN TA 128", LED_SCHEME1, LED_INVERTED, {8,0x40,0x20,0x10}}, /* Billion TA */ ++ {0x742, 0x2008, "Stollmann USB TA", LED_SCHEME1, LED_NORMAL, {4,0,2,1}}, /* Stollmann TA */ ++ {0x8e3, 0x0301, "Olitec USB RNIS", LED_SCHEME1, LED_NORMAL, {2,0,1,4}}, /* Olitec TA */ ++ {0x675, 0x1688, "DrayTec USB ISDN TA", LED_SCHEME1, LED_NORMAL, {4,0,2,1}}, /* Draytec TA */ ++ {0x7fa, 0x0846, "Bewan Modem RNIS USB", LED_SCHEME1, LED_INVERTED, {8,0x40,0x20,0x10}}, /* Bewan TA */ ++ {0} // EOL element ++}; ++ ++/***************************************************/ ++/* write led data to auxport & invert if necessary */ ++/***************************************************/ ++static void write_led(hfcusb_data * hfc,__u8 led_state) ++{ ++ if(led_state!=hfc->led_state) ++ { ++ hfc->led_state=led_state; ++ queue_control_request(hfc, HFCUSB_P_DATA,(vdata[hfc->vend_idx].led_invert) ? ~led_state : led_state,1); ++ } ++} ++ ++/******************************************/ ++/* invert B-channel LEDs if data is sent */ ++/******************************************/ ++static void led_timer(hfcusb_data * hfc) ++{ ++ static int cnt=0; ++ __u8 led_state=hfc->led_state; ++ ++ if(cnt) ++ { ++ if(hfc->led_b_active&1) led_state|=vdata[hfc->vend_idx].led_bits[2]; ++ if(hfc->led_b_active&2) led_state|=vdata[hfc->vend_idx].led_bits[3]; ++ } ++ else ++ { ++ if(!(hfc->led_b_active&1) || hfc->led_new_data&1) led_state&=~vdata[hfc->vend_idx].led_bits[2]; ++ if(!(hfc->led_b_active&2) || hfc->led_new_data&2) led_state&=~vdata[hfc->vend_idx].led_bits[3]; + } + +- /* check if new buffer needed */ +- if (!fifo->buff) { +- switch (fifo->fifonum) { +- case HFCUSB_B1_TX: +- if (fifo->hfc->regd.bsk[0]) +- fifo->buff = *fifo->hfc->regd.bsk[0]; /* B1-channel tx buffer */ ++ write_led(hfc,led_state); ++ hfc->led_new_data=0; ++ ++ cnt=!cnt; ++ // restart 4 hz timer ++ hfc->led_timer.expires = jiffies + (LED_TIME * HZ) / 1000; ++ if(!timer_pending(&hfc->led_timer)) add_timer(&hfc->led_timer); ++} ++ ++/**************************/ ++/* handle LED requests */ ++/**************************/ ++static void handle_led(hfcusb_data * hfc,int event) ++{ ++ __u8 led_state=hfc->led_state; ++ ++ // if no scheme -> no LED action ++ if(vdata[hfc->vend_idx].led_scheme==LED_OFF) return; ++ ++ switch(event) ++ { ++ case LED_POWER_ON: ++ led_state|=vdata[hfc->vend_idx].led_bits[0]; ++ break; ++ case LED_POWER_OFF: // no Power off handling ++ break; ++ case LED_S0_ON: ++ led_state|=vdata[hfc->vend_idx].led_bits[1]; ++ break; ++ case LED_S0_OFF: ++ led_state&=~vdata[hfc->vend_idx].led_bits[1]; + break; +- case HFCUSB_B2_TX: +- if (fifo->hfc->regd.bsk[1]) +- fifo->buff = *fifo->hfc->regd.bsk[1]; /* B2-channel tx buffer */ ++ case LED_B1_ON: ++ hfc->led_b_active|=1; + break; +- case HFCUSB_D_TX: +- if (fifo->hfc->regd.dsq) +- fifo->buff = skb_dequeue(fifo->hfc->regd.dsq); /* D-channel tx queue */ ++ case LED_B1_OFF: ++ hfc->led_b_active&=~1; + break; +- default: +- return; /* error, invalid fifo */ ++ case LED_B1_DATA: ++ hfc->led_new_data|=1; ++ break; ++ case LED_B2_ON: ++ hfc->led_b_active|=2; ++ break; ++ case LED_B2_OFF: ++ hfc->led_b_active&=~2; ++ break; ++ case LED_B2_DATA: ++ hfc->led_new_data|=2; ++ break; ++ } ++ ++ write_led(hfc,led_state); ++} ++ ++/********************************/ ++/* called when timer t3 expires */ ++/********************************/ ++static void l1_timer_expire_t3(hfcusb_data * hfc) ++{ ++ //printk (KERN_INFO "HFC-USB: l1_timer_expire_t3\n"); ++ ++ hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,PH_DEACTIVATE | INDICATION,NULL); ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "PH_DEACTIVATE | INDICATION sent\n"); ++#endif ++ hfc->l1_activated=FALSE; ++ handle_led(hfc,LED_S0_OFF); ++} ++ ++/********************************/ ++/* called when timer t4 expires */ ++/********************************/ ++static void l1_timer_expire_t4(hfcusb_data * hfc) ++{ ++ //printk (KERN_INFO "HFC-USB: l1_timer_expire_t4\n"); ++ ++ hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,PH_DEACTIVATE | INDICATION,NULL); ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "PH_DEACTIVATE | INDICATION sent\n"); ++#endif ++ hfc->l1_activated=FALSE; ++ handle_led(hfc,LED_S0_OFF); ++} ++ ++/*****************************/ ++/* handle S0 state changes */ ++/*****************************/ ++static void state_handler(hfcusb_data * hfc,__u8 state) ++{ ++ __u8 old_state; ++ ++ old_state=hfc->l1_state; ++ ++ // range check ++ if(state==old_state || state<1 || state>8) return; ++ ++#ifdef VERBOSE_ISDN_DEBUG ++ printk(KERN_INFO "HFC-USB: new S0 state:%d old_state:%d\n",state,old_state); ++#endif ++ ++ if(state<4 || state==7 || state==8) ++ { ++ if(timer_pending(&hfc->t3_timer)) del_timer(&hfc->t3_timer); ++ //printk(KERN_INFO "HFC-USB: T3 deactivated\n"); ++ } ++ ++ if(state>=7) ++ { ++ if(timer_pending(&hfc->t4_timer)) del_timer(&hfc->t4_timer); ++ //printk(KERN_INFO "HFC-USB: T4 deactivated\n"); ++ } ++ ++ if(state==7 && !hfc->l1_activated) ++ { ++ hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,PH_ACTIVATE | INDICATION,NULL); ++ //printk(KERN_INFO "HFC-USB: PH_ACTIVATE | INDICATION sent\n"); ++ hfc->l1_activated=TRUE; ++ handle_led(hfc,LED_S0_ON); ++ } ++ else ++ if(state<=3 /* && activated*/) ++ { ++ if(old_state==7 || old_state==8) ++ { ++ //printk(KERN_INFO "HFC-USB: T4 activated\n"); ++ hfc->t4_timer.expires = jiffies + (HFC_TIMER_T4 * HZ) / 1000; ++ if(!timer_pending(&hfc->t4_timer)) add_timer(&hfc->t4_timer); + } +- if (!fifo->buff) { +- fifo->active = 0; /* we are inactive now */ +- fifo->hfc->active_fifos &= ~fifo->fifo_mask; +- if (fifo->fifonum == HFCUSB_D_TX) { +- test_and_set_bit(HFCUSB_L1_DTX, +- &fifo->hfc->l1_event); +- queue_task(&fifo->hfc->l1_tq, +- &tq_immediate); +- mark_bh(IMMEDIATE_BH); +- } +- return; ++ else ++ { ++ hfc->d_if.ifc.l1l2(&hfc->d_if.ifc,PH_DEACTIVATE | INDICATION,NULL); ++ //printk(KERN_INFO "HFC-USB: PH_DEACTIVATE | INDICATION sent\n"); ++ hfc->l1_activated=FALSE; ++ handle_led(hfc,LED_S0_OFF); + } +- fifo->act_ptr = fifo->buff->data; /* start of data */ +- fifo->active = 1; +- ii = 1; +- fifo->hfc->active_fifos |= fifo->fifo_mask; +- fifo->hfc->service_request &= ~fifo->fifo_mask; +- } +- /* fillup the send buffer */ +- i = fifo->buff->len - (fifo->act_ptr - fifo->buff->data); /* remaining length */ +- fifo->buffer[0] = !fifo->transmode; /* not eof */ +- if (i > (fifo->usb_maxlen - ii)) { +- i = fifo->usb_maxlen - ii; +- } +- if (i) +- memcpy(fifo->buffer + ii, fifo->act_ptr, i); +- fifo->urb.transfer_buffer_length = i + ii; +- fifo->rx_offset = ii; +-} /* fill_tx_urb */ +- +-/************************************************/ +-/* transmit completion routine for all tx fifos */ +-/************************************************/ +-static void +-tx_complete(purb_t urb) ++ } ++ ++ hfc->l1_state=state; ++} ++ ++ ++/* prepare iso urb */ ++static void fill_isoc_urb(struct urb *urb, struct usb_device *dev, unsigned int pipe, void *buf, ++ int num_packets, int packet_size, int interval, usb_complete_t complete, void *context) + { +- usb_fifo *fifo = (usb_fifo *) urb->context; /* pointer to our fifo */ ++ int k; + +- fifo->hfc->service_request &= ~fifo->fifo_mask; /* no further handling */ +- fifo->framenum = usb_get_current_frame_number(fifo->hfc->dev); ++ spin_lock_init(&urb->lock); // do we really need spin_lock_init ? ++ urb->dev = dev; ++ urb->pipe = pipe; ++ urb->complete = complete; ++ urb->number_of_packets = num_packets; ++ urb->transfer_buffer_length = packet_size * num_packets; ++ urb->context = context; ++ urb->transfer_buffer = buf; ++ urb->transfer_flags = 0; ++ urb->transfer_flags = USB_ISO_ASAP; ++ urb->actual_length = 0; ++ urb->interval = interval; ++ for (k = 0; k < num_packets; k++) { ++ urb->iso_frame_desc[k].offset = packet_size * k; ++ urb->iso_frame_desc[k].length = packet_size; ++ urb->iso_frame_desc[k].actual_length = 0; ++ } ++} + +- /* check for deactivation or error */ +- if ((!fifo->active) || (urb->status)) { +- fifo->hfc->active_fifos &= ~fifo->fifo_mask; /* we are inactive */ +- fifo->active = 0; +- if ((fifo->buff) && (fifo->fifonum == HFCUSB_D_TX)) { +- dev_kfree_skb_any(fifo->buff); ++/* allocs urbs and start isoc transfer with two pending urbs to avoid gaps in the transfer chain */ ++static int start_isoc_chain(usb_fifo * fifo, int num_packets_per_urb,usb_complete_t complete,int packet_size) ++{ ++ int i, k, errcode; ++ ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: starting ISO-chain for Fifo %i\n", fifo->fifonum); ++#endif ++ ++ ++ // allocate Memory for Iso out Urbs ++ for (i = 0; i < 2; i++) { ++ if (!(fifo->iso[i].purb)) { ++ fifo->iso[i].purb = usb_alloc_urb(num_packets_per_urb); ++ fifo->iso[i].owner_fifo = (struct usb_fifo *) fifo; ++ ++ // Init the first iso ++ if (ISO_BUFFER_SIZE >= (fifo->usb_packet_maxlen * num_packets_per_urb)) ++ { ++ ++ fill_isoc_urb(fifo->iso[i].purb, fifo->hfc->dev, fifo->pipe, fifo->iso[i].buffer, ++ num_packets_per_urb, fifo->usb_packet_maxlen, fifo->intervall, ++ complete, &fifo->iso[i]); ++ ++ memset(fifo->iso[i].buffer, 0, sizeof(fifo->iso[i].buffer)); ++ ++ // defining packet delimeters in fifo->buffer ++ for(k = 0; k < num_packets_per_urb; k++) ++ { ++ fifo->iso[i].purb->iso_frame_desc[k].offset = k*packet_size; ++ fifo->iso[i].purb->iso_frame_desc[k].length = packet_size; ++ } ++ } + } +- fifo->buff = NULL; +- return; ++ ++ fifo->bit_line = BITLINE_INF; ++ ++ errcode = usb_submit_urb(fifo->iso[i].purb); ++ fifo->active = (errcode >= 0) ? 1 : 0; ++ if(errcode < 0) ++ { ++ printk(KERN_INFO "HFC-USB: error submitting ISO URB: %i.%i \n", errcode, i); ++ }; ++ + } +- fifo->act_ptr += (urb->transfer_buffer_length - fifo->rx_offset); /* adjust pointer */ +- fill_tx_urb(fifo); /* refill the urb */ +- fifo->hfc->threshold_mask |= fifo->fifo_mask; /* assume threshold reached */ +- if (fifo->buff) +- fifo->hfc->service_request |= fifo->fifo_mask; /* need to restart */ +-} /* tx_complete */ + +-/***********************************************/ +-/* receive completion routine for all rx fifos */ +-/***********************************************/ +-static void +-rx_complete(purb_t urb) ++ // errcode = (usb_submit_urb(fifo->iso[0].purb, GFP_KERNEL)); ++ return(fifo->active); ++} ++ ++/* stops running iso chain and frees their pending urbs */ ++static void stop_isoc_chain(usb_fifo * fifo) + { +- usb_fifo *fifo = (usb_fifo *) urb->context; /* pointer to our fifo */ +- hfcusb_data *hfc = fifo->hfc; +- usb_fifo *txfifo; +- __u8 last_state; +- int i, ii, currcnt, hdlci; +- struct sk_buff *skb; +- +- urb->dev = hfc->dev; /* security init */ +- if ((!fifo->active) || (urb->status)) { +- hfc->service_request &= ~fifo->fifo_mask; /* no further handling */ +- hfc->active_fifos &= ~fifo->fifo_mask; /* we are inactive */ +- fifo->urb.interval = 0; /* cancel automatic rescheduling */ +- if (fifo->buff) { +- dev_kfree_skb_any(fifo->buff); +- fifo->buff = NULL; ++ int i; ++ ++ for(i = 0; i < 2; i++) ++ { ++ if(fifo->iso[i].purb) ++ { ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: Stopping iso chain for fifo %i.%i\n", fifo->fifonum, i); ++#endif ++ usb_unlink_urb(fifo->iso[i].purb); ++ usb_free_urb(fifo->iso[i].purb); ++ fifo->iso[i].purb = NULL; + } +- return; + } ++ if (fifo->urb) { ++ usb_unlink_urb(fifo->urb); ++ usb_free_urb(fifo->urb); ++ fifo->urb = NULL; ++ } ++ fifo->active = 0; ++} + +- /* first check for any status changes */ +- if ((urb->actual_length < fifo->rx_offset) +- || (urb->actual_length > fifo->usb_maxlen)) +- return; /* error condition */ +- +- if (fifo->rx_offset) { +- hfc->threshold_mask = fifo->buffer[1]; /* update threshold status */ +- fifo->next_complete = fifo->buffer[0] & 1; +- if ((fifo->fifonum == HFCUSB_D_RX) && +- (hfc->led_req != hfc->led_act)) +- queue_control_request(hfc, HFCUSB_P_DATA, hfc->led_req); +- +- /* check if rescheduling needed */ +- if ((i = +- hfc->service_request & hfc->active_fifos & ~hfc-> +- threshold_mask)) { +- currcnt = +- usb_get_current_frame_number(hfc->dev); +- txfifo = hfc->fifos + HFCUSB_B1_TX; +- ii = 3; +- while (ii--) { +- if ((i & txfifo->fifo_mask) +- && (currcnt != txfifo->framenum)) { +- hfc->service_request &= +- ~txfifo->fifo_mask; +- if (!txfifo->buff) +- fill_tx_urb(txfifo); +- if (txfifo->buff) +- usb_submit_urb(&txfifo-> +- urb); ++// defines how much ISO packets are handled in one URB ++static int iso_packets[8]={ISOC_PACKETS_B,ISOC_PACKETS_B,ISOC_PACKETS_B,ISOC_PACKETS_B, ++ ISOC_PACKETS_D,ISOC_PACKETS_D,ISOC_PACKETS_D,ISOC_PACKETS_D}; ++ ++/*****************************************************/ ++/* transmit completion routine for all ISO tx fifos */ ++/*****************************************************/ ++static void tx_iso_complete(struct urb *urb) ++{ ++ iso_urb_struct *context_iso_urb = (iso_urb_struct *) urb->context; ++ usb_fifo *fifo = context_iso_urb->owner_fifo; ++ hfcusb_data *hfc = fifo->hfc; ++ int k, tx_offset, num_isoc_packets, sink, len, current_len,errcode,frame_complete,transp_mode,fifon; ++ __u8 threshbit; ++ __u8 threshtable[8] = { 1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; ++ ++ fifon=fifo->fifonum; ++ tx_offset=0; ++ // very weird error code when using ohci drivers, for now : ignore this error ... (MB) ++ if(urb->status == -EOVERFLOW) ++ { ++ urb->status = 0; ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: ignoring USB DATAOVERRUN for fifo %i \n",fifon); ++#endif ++ } ++ ++ if(fifo->active && !urb->status) ++ { ++ transp_mode=0; ++ if(fifon<4 && hfc->b_mode[fifon/2]==L1_MODE_TRANS) transp_mode=TRUE; ++ ++ threshbit = threshtable[fifon] & hfc->threshold_mask; // is threshold set for our channel? ++ num_isoc_packets=iso_packets[fifon]; ++ ++ if(fifon >= HFCUSB_D_TX) ++ { ++ sink = (threshbit) ? SINK_DMIN : SINK_DMAX; // how much bit go to the sink for D-channel? ++ } ++ else ++ { ++ sink = (threshbit) ? SINK_MIN : SINK_MAX; // how much bit go to the sink for B-channel? ++ } ++ ++ // prepare ISO Urb ++ fill_isoc_urb(urb, fifo->hfc->dev, fifo->pipe,context_iso_urb->buffer, num_isoc_packets, ++ fifo->usb_packet_maxlen, fifo->intervall, tx_iso_complete, urb->context); ++ memset(context_iso_urb->buffer, 0, sizeof(context_iso_urb->buffer)); ++ ++ frame_complete=FALSE; ++ ++ // Generate Iso Packets ++ for(k = 0; k < num_isoc_packets; ++k) ++ { ++ if(fifo->skbuff) ++ { ++ len = fifo->skbuff->len; // remaining length ++ ++ fifo->bit_line -= sink; // we lower data margin every msec ++ current_len = (0 - fifo->bit_line) / 8; ++ if(current_len > 14) current_len = 14; // maximum 15 byte for every ISO packet makes our life easier ++ current_len = (len <= current_len) ? len : current_len; ++ fifo->bit_line += current_len * 8; // how much bit do we put on the line? ++ ++ context_iso_urb->buffer[tx_offset] = 0; ++ if(current_len == len) ++ { ++ if(!transp_mode) ++ { ++ context_iso_urb->buffer[tx_offset] = 1; // here frame completion ++ fifo->bit_line += 32; // add 2 byte flags and 16bit CRC at end of ISDN frame ++ } ++ frame_complete = TRUE; ++ } ++ ++ // copy bytes from buffer into ISO_URB ++ memcpy(context_iso_urb->buffer+tx_offset+1,fifo->skbuff->data,current_len); ++ skb_pull(fifo->skbuff,current_len); ++ ++ // define packet delimeters within the URB buffer ++ urb->iso_frame_desc[k].offset = tx_offset; ++ urb->iso_frame_desc[k].length = current_len + 1; ++ ++ tx_offset += (current_len + 1); ++ // printk(KERN_INFO "HFC-USB: fifonum:%d,%d bytes to send, %d bytes ISO packet,bitline:%d,sink:%d,threshbit:%d,threshmask:%x\n",fifon,len,current_len,fifo->bit_line,sink,threshbit,hfc->threshold_mask); ++ if(!transp_mode) ++ { ++ if(fifon==HFCUSB_B1_TX) handle_led(hfc,LED_B1_DATA); ++ if(fifon==HFCUSB_B2_TX) handle_led(hfc,LED_B2_DATA); ++ } ++ } ++ else ++ { ++ // we have no more data - generate 1 byte ISO packets ++ urb->iso_frame_desc[k].offset = tx_offset++; ++ ++ urb->iso_frame_desc[k].length = 1; ++ fifo->bit_line -= sink; // we lower data margin every msec ++ ++ if(fifo->bit_line < BITLINE_INF) ++ { ++ fifo->bit_line = BITLINE_INF; ++ //printk (KERN_INFO "HFC-USB: BITLINE_INF underrun\n"); + } +- txfifo += 2; + } +- } + +- /* handle l1 events */ +- if ((fifo->buffer[0] >> 4) != hfc->l1_state) { +- last_state = hfc->l1_state; +- hfc->l1_state = fifo->buffer[0] >> 4; /* update status */ +- if (timer_pending(&hfc->t4_timer)) +- del_timer(&hfc->t4_timer); +- if (((hfc->l1_state == 3) && +- ((last_state == 7) || +- (last_state == 8))) || +- ((timer_pending(&hfc->t3_timer) && +- (hfc->l1_state == 8)))) { +- hfc->t4_timer.expires = jiffies + 2; +- add_timer(&hfc->t4_timer); +- } else { +- if (timer_pending(&hfc->t3_timer) +- && (hfc->l1_state == 7)) +- del_timer(&hfc->t3_timer); /* no longer needed */ +- test_and_set_bit(HFCUSB_L1_STATECHANGE, +- &hfc->l1_event); +- queue_task(&hfc->l1_tq, &tq_immediate); +- mark_bh(IMMEDIATE_BH); ++ if(frame_complete) ++ { ++ // delete the buffer only once, here or in hfc_usb_l2l1() in a PH_DATA|REQUEST ++ fifo->delete_flg=TRUE; ++ ++ fifo->hif->l1l2(fifo->hif,PH_DATA|CONFIRM,(void*)fifo->skbuff->truesize); ++ ++ if(fifo->skbuff && fifo->delete_flg) ++ { ++ dev_kfree_skb_any(fifo->skbuff); ++ //printk(KERN_INFO "HFC-USB: skbuff=NULL on fifo:%d\n",fifo->fifonum); ++ fifo->skbuff = NULL; ++ fifo->delete_flg=FALSE; ++ } ++ ++ frame_complete=FALSE; + } ++ } ++ ++ errcode = usb_submit_urb(urb); ++ if(errcode < 0) ++ { ++ printk(KERN_INFO "HFC-USB: error submitting ISO URB: %i \n", errcode); ++ } ++ } ++ else ++ { ++ if(urb->status) ++ { ++ printk(KERN_INFO "HFC-USB: tx_iso_complete : urb->status %i, fifonum %i\n", urb->status,fifon); + } + } + +- /* check the length for data and move if present */ +- if (fifo->next_complete || (urb->actual_length > fifo->rx_offset)) { +- i = fifo->buff->len + urb->actual_length - fifo->rx_offset; /* new total length */ +- hdlci = (fifo->transmode) ? 0 : 3; +- if (i <= (fifo->max_size + hdlci)) { +- memcpy(fifo->act_ptr, +- fifo->buffer + fifo->rx_offset, +- urb->actual_length - fifo->rx_offset); +- fifo->act_ptr += +- (urb->actual_length - fifo->rx_offset); +- fifo->buff->len += +- (urb->actual_length - fifo->rx_offset); +- } else +- fifo->buff->len = fifo->max_size + 4; /* mark frame as to long */ +- if (fifo->next_complete && (urb->actual_length < fifo->usb_maxlen)) { +- /* the frame is complete */ +- fifo->next_complete = 0; +- if (((!*(fifo->act_ptr - 1)) || fifo->transmode) && +- (fifo->buff->len >= (hdlci + 1)) +- && (fifo->buff->len <= +- (fifo->max_size + hdlci)) && +- ((skb = dev_alloc_skb(fifo->max_size + hdlci)) != NULL)) { +- fifo->buff->len -= hdlci; /* adjust size */ +- switch (fifo->fifonum) { +- case HFCUSB_D_RX: +- skb_queue_tail(hfc->regd. +- drq, +- fifo->buff); +- test_and_set_bit +- (HFCUSB_L1_DRX, +- &hfc->l1_event); +- queue_task(&hfc->l1_tq, +- &tq_immediate); +- mark_bh(IMMEDIATE_BH); +- break; ++} /* tx_iso_complete */ + +- case HFCUSB_B1_RX: +- if (hfc->regd.brq[0]) { +- skb_queue_tail +- (hfc->regd. +- brq[0], +- fifo->buff); +- hfc->regd. +- bch_l1l2(hfc-> +- regd. +- arg_hisax, +- 0, +- PH_DATA +- | +- INDICATION, +- (void *) +- fifo-> +- buff); +- } else +- dev_kfree_skb_any +- (fifo->buff); +- break; +- +- case HFCUSB_B2_RX: +- if (hfc->regd.brq[1]) { +- skb_queue_tail +- (hfc->regd. +- brq[1], +- fifo->buff); +- hfc->regd. +- bch_l1l2(hfc-> +- regd. +- arg_hisax, +- 1, +- PH_DATA +- | +- INDICATION, +- (void +- *) +- fifo-> +- buff); +- } else +- dev_kfree_skb_any +- (fifo->buff); +- break; ++/*****************************************************/ ++/* receive completion routine for all ISO tx fifos */ ++/*****************************************************/ ++static void rx_iso_complete(struct urb *urb) ++{ ++ iso_urb_struct *context_iso_urb = (iso_urb_struct *) urb->context; ++ usb_fifo *fifo = context_iso_urb->owner_fifo; ++ hfcusb_data *hfc = fifo->hfc; ++ int k, len, errcode, offset, num_isoc_packets,fifon; ++ __u8 *buf; + +- case HFCUSB_PCM_RX: +- skb_queue_tail(&hfc->regd. +- erq, +- fifo->buff); +- test_and_set_bit +- (HFCUSB_L1_ERX, +- &hfc->l1_event); +- queue_task(&hfc->l1_tq, +- &tq_immediate); +- mark_bh(IMMEDIATE_BH); +- break; ++ fifon=fifo->fifonum; ++ // very weird error code when using ohci drivers, for now : ignore this error ... (MB) ++ if(urb->status == -EOVERFLOW) ++ { ++ urb->status = 0; ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: ignoring USB DATAOVERRUN for fifo %i \n",fifon); ++#endif ++ } + +- default: +- dev_kfree_skb_any(fifo-> +- buff); +- break; ++ if(fifo->active && !urb->status) ++ { ++ num_isoc_packets=iso_packets[fifon]; ++ ++ // Generate D-Channel Iso Packets ++ for(k = 0; k < num_isoc_packets; ++k) ++ { ++ len=urb->iso_frame_desc[k].actual_length; ++ offset=urb->iso_frame_desc[k].offset; ++ buf=context_iso_urb->buffer+offset; ++ ++ if(fifo->last_urblen!=fifo->usb_packet_maxlen) ++ { ++ // the threshold mask is in the 2nd status byte ++ hfc->threshold_mask=buf[1]; ++ // the S0 state is in the upper half of the 1st status byte ++ state_handler(hfc,buf[0] >> 4); ++ // if we have more than the 2 status bytes -> collect data ++ if(len>2) collect_rx_frame(fifo,buf+2,len-2,buf[0]&1); + } +- fifo->buff = skb; +- } +- fifo->buff->len = 0; /* reset counter */ +- fifo->act_ptr = fifo->buff->data; /* and pointer */ ++ else collect_rx_frame(fifo,buf,len,0); ++ ++ fifo->last_urblen=len; ++ ++ } ++ ++ // prepare ISO Urb ++ fill_isoc_urb(urb, fifo->hfc->dev, fifo->pipe,context_iso_urb->buffer, num_isoc_packets, ++ fifo->usb_packet_maxlen, fifo->intervall, rx_iso_complete, urb->context); ++ ++ errcode = usb_submit_urb(urb); ++ if(errcode < 0) ++ { ++ printk(KERN_INFO "HFC-USB: error submitting ISO URB: %i \n", errcode); ++ } ++ } ++ else ++ { ++ if(urb->status) ++ { ++ printk(KERN_INFO "HFC-USB: rx_iso_complete : urb->status %i, fifonum %i\n", urb->status,fifon); ++ } ++ } ++} /* rx_iso_complete */ ++ ++ ++/*****************************************************/ ++/* collect data from interrupt or isochron in */ ++/*****************************************************/ ++static void collect_rx_frame(usb_fifo *fifo,__u8 *data,int len,int finish) ++{ ++ hfcusb_data *hfc = fifo->hfc; ++ int transp_mode,fifon; ++ ++ fifon=fifo->fifonum; ++ transp_mode=0; ++ if(fifon<4 && hfc->b_mode[fifon/2]==L1_MODE_TRANS) transp_mode=TRUE; ++ ++ //printk(KERN_INFO "HFC-USB: got %d bytes finish:%d max_size:%d fifo:%d\n",len,finish,fifo->max_size,fifon); ++ if(!fifo->skbuff) ++ { ++ // allocate sk buffer ++ fifo->skbuff=dev_alloc_skb(fifo->max_size + 3); ++ if(!fifo->skbuff) ++ { ++ printk(KERN_INFO "HFC-USB: cannot allocate buffer (dev_alloc_skb) fifo:%d\n",fifon); ++ return; ++ } ++ ++ } ++ ++ if(len && fifo->skbuff->len+len<fifo->max_size) ++ { ++ memcpy(skb_put(fifo->skbuff,len),data,len); ++ } ++ else printk(KERN_INFO "HCF-USB: got frame exceeded fifo->max_size:%d\n",fifo->max_size); ++ ++ // give transparent data up, when 128 byte are available ++ if(transp_mode && fifo->skbuff->len>=128) ++ { ++ fifo->hif->l1l2(fifo->hif,PH_DATA | INDICATION,fifo->skbuff); ++ fifo->skbuff = NULL; // buffer was freed from upper layer ++ return; ++ } ++ ++ // we have a complete hdlc packet ++ if(finish) ++ { ++ if(!fifo->skbuff->data[fifo->skbuff->len-1]) ++ { ++ skb_trim(fifo->skbuff,fifo->skbuff->len-3); // remove CRC & status ++ ++ //printk(KERN_INFO "HFC-USB: got frame %d bytes on fifo:%d\n",fifo->skbuff->len,fifon); ++ ++ if(fifon==HFCUSB_PCM_RX) fifo->hif->l1l2(fifo->hif,PH_DATA_E | INDICATION,fifo->skbuff); ++ else fifo->hif->l1l2(fifo->hif,PH_DATA | INDICATION,fifo->skbuff); ++ ++ fifo->skbuff = NULL; // buffer was freed from upper layer ++ } ++ else ++ { ++ printk(KERN_INFO "HFC-USB: got frame %d bytes but CRC ERROR!!!\n",fifo->skbuff->len); ++ ++ skb_trim(fifo->skbuff,0); // clear whole buffer ++ } ++ } ++ ++ // LED flashing only in HDLC mode ++ if(!transp_mode) ++ { ++ if(fifon==HFCUSB_B1_RX) handle_led(hfc,LED_B1_DATA); ++ if(fifon==HFCUSB_B2_RX) handle_led(hfc,LED_B2_DATA); ++ } ++} ++ ++/***********************************************/ ++/* receive completion routine for all rx fifos */ ++/***********************************************/ ++static void rx_complete(struct urb *urb) ++{ ++ int len; ++ __u8 *buf; ++ usb_fifo *fifo = (usb_fifo *) urb->context; /* pointer to our fifo */ ++ hfcusb_data *hfc = fifo->hfc; ++ ++ urb->dev = hfc->dev; /* security init */ ++ ++ if((!fifo->active) || (urb->status)) { ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: RX-Fifo %i is going down (%i)\n", fifo->fifonum, urb->status); ++#endif ++ fifo->urb->interval = 0; /* cancel automatic rescheduling */ ++ if(fifo->skbuff) { ++ dev_kfree_skb_any(fifo->skbuff); ++ fifo->skbuff = NULL; + } ++ return; + } +- fifo->rx_offset = (urb->actual_length < fifo->usb_maxlen) ? 2 : 0; +-} /* rx_complete */ ++ ++ len=urb->actual_length; ++ buf=fifo->buffer; ++ ++ if(fifo->last_urblen!=fifo->usb_packet_maxlen) { ++ // the threshold mask is in the 2nd status byte ++ hfc->threshold_mask=buf[1]; ++ // the S0 state is in the upper half of the 1st status byte ++ state_handler(hfc,buf[0] >> 4); ++ // if we have more than the 2 status bytes -> collect data ++ if(len>2) collect_rx_frame(fifo,buf+2,urb->actual_length-2,buf[0]&1); ++ } else ++ collect_rx_frame(fifo,buf,urb->actual_length,0); ++ ++ fifo->last_urblen=urb->actual_length; ++ ++ ++} /* rx_complete */ ++ ++ + + /***************************************************/ + /* start the interrupt transfer for the given fifo */ + /***************************************************/ +-static void +-start_rx_fifo(usb_fifo * fifo) ++static void start_int_fifo(usb_fifo * fifo) + { +- if (fifo->buff) +- return; /* still active */ +- if (! +- (fifo->buff = +- dev_alloc_skb(fifo->max_size + (fifo->transmode ? 0 : 3)))) +- return; +- fifo->act_ptr = fifo->buff->data; +- FILL_INT_URB(&fifo->urb, fifo->hfc->dev, fifo->pipe, fifo->buffer, +- fifo->usb_maxlen, rx_complete, fifo, fifo->intervall); +- fifo->next_complete = 0; +- fifo->rx_offset = 2; +- fifo->active = 1; /* must be marked active */ +- fifo->hfc->active_fifos |= fifo->fifo_mask; +- if (usb_submit_urb(&fifo->urb)) { ++ int errcode; ++ ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: starting intr IN fifo:%d\n", fifo->fifonum); ++#endif ++ if (!fifo->urb) { ++ fifo->urb = usb_alloc_urb(0); ++ if (!fifo->urb) ++ return; ++ } ++ usb_fill_int_urb(fifo->urb, fifo->hfc->dev, fifo->pipe, fifo->buffer, ++ fifo->usb_packet_maxlen, rx_complete, fifo, fifo->intervall); ++ fifo->active = 1; /* must be marked active */ ++ errcode = usb_submit_urb(fifo->urb); ++ ++ if(errcode) ++ { ++ printk(KERN_INFO "HFC-USB: submit URB error(start_int_info): status:%i\n", errcode); + fifo->active = 0; +- fifo->hfc->active_fifos &= ~fifo->fifo_mask; +- dev_kfree_skb_any(fifo->buff); +- fifo->buff = NULL; ++ fifo->skbuff = NULL; + } +-} /* start_rx_fifo */ ++} /* start_int_fifo */ + +-/***************************************************************/ +-/* control completion routine handling background control cmds */ +-/***************************************************************/ +-static void +-ctrl_complete(purb_t urb) ++/*****************************/ ++/* set the B-channel mode */ ++/*****************************/ ++static void set_hfcmode(hfcusb_data *hfc,int channel,int mode) + { +- hfcusb_data *hfc = (hfcusb_data *) urb->context; ++ __u8 val,idx_table[2]={0,2}; + +- urb->dev = hfc->dev; +- if (hfc->ctrl_cnt) { +- switch (hfc->ctrl_buff[hfc->ctrl_out_idx].hfc_reg) { +- case HFCUSB_FIFO: +- hfc->ctrl_fifo = +- hfc->ctrl_buff[hfc->ctrl_out_idx]. +- reg_val; +- break; +- case HFCUSB_F_USAGE: +- if (!hfc->dfifo_fill) { +- fill_tx_urb(hfc->fifos + +- HFCUSB_D_TX); +- if (hfc->fifos[HFCUSB_D_TX].buff) +- usb_submit_urb(&hfc-> +- fifos +- [HFCUSB_D_TX]. +- urb); +- } else { +- queue_control_request(hfc, +- HFCUSB_FIFO, +- HFCUSB_D_TX); +- queue_control_request(hfc, +- HFCUSB_F_USAGE, +- 0); +- } +- break; +- case HFCUSB_SCTRL_R: +- switch (hfc->ctrl_fifo) { +- case HFCUSB_B1_RX: +- if (hfc->bch_enables & 1) +- start_rx_fifo(hfc-> +- fifos +- + +- HFCUSB_B1_RX); +- break; +- case HFCUSB_B2_RX: +- if (hfc->bch_enables & 2) +- start_rx_fifo(hfc-> +- fifos +- + +- HFCUSB_B2_RX); +- break; +- } +- if (hfc->bch_enables & 3) +- hfc->led_req |= LED_BCH; +- else +- hfc->led_req &= ~LED_BCH; +- break; +- case HFCUSB_P_DATA: +- hfc->led_act = +- hfc->ctrl_buff[hfc->ctrl_out_idx]. +- reg_val; +- break; +- } +- hfc->ctrl_cnt--; /* decrement actual count */ +- if (++hfc->ctrl_out_idx >= HFC_CTRL_BUFSIZE) +- hfc->ctrl_out_idx = 0; /* pointer wrap */ +- ctrl_start_transfer(hfc); /* start next transfer */ ++#ifdef VERBOSE_ISDN_DEBUG ++ printk (KERN_INFO "HFC-USB: setting channel %d to mode %d\n",channel,mode); ++#endif ++ ++ hfc->b_mode[channel]=mode; ++ ++ // setup CON_HDLC ++ val=0; ++ if(mode!=L1_MODE_NULL) val=8; // enable fifo? ++ if(mode==L1_MODE_TRANS) val|=2; // set transparent bit ++ ++ queue_control_request(hfc,HFCUSB_FIFO,idx_table[channel],1); // set FIFO to transmit register ++ queue_control_request(hfc,HFCUSB_CON_HDLC,val,1); ++ queue_control_request(hfc,HFCUSB_INC_RES_F,2,1); // reset fifo ++ ++ queue_control_request(hfc,HFCUSB_FIFO,idx_table[channel]+1,1); // set FIFO to receive register ++ queue_control_request(hfc,HFCUSB_CON_HDLC,val,1); ++ queue_control_request(hfc,HFCUSB_INC_RES_F,2,1); // reset fifo ++ ++ val=0x40; ++ if(hfc->b_mode[0]) val|=1; ++ if(hfc->b_mode[1]) val|=2; ++ queue_control_request(hfc,HFCUSB_SCTRL,val,1); ++ ++ val=0; ++ if(hfc->b_mode[0]) val|=1; ++ if(hfc->b_mode[1]) val|=2; ++ queue_control_request(hfc,HFCUSB_SCTRL_R,val,1); ++ ++ if(mode==L1_MODE_NULL) ++ { ++ if(channel) handle_led(hfc,LED_B2_OFF); ++ else handle_led(hfc,LED_B1_OFF); + } +-} /* ctrl_complete */ ++ else ++ { ++ if(channel) handle_led(hfc,LED_B2_ON); ++ else handle_led(hfc,LED_B1_ON); ++ } ++} + +-/*****************************************/ +-/* Layer 1 + D channel access from HiSax */ +-/*****************************************/ +-static void +-hfcusb_l1_access(void *drvarg, int pr, void *arg) +-{ +- hfcusb_data *hfc = (hfcusb_data *) drvarg; +- +- switch (pr) { +- case (PH_DATA | REQUEST): +- case (PH_PULL | INDICATION): +- skb_queue_tail(hfc->regd.dsq, +- (struct sk_buff *) arg); +- if (!hfc->fifos[HFCUSB_D_TX].active +- && !hfc->dfifo_fill) { +- fill_tx_urb(hfc->fifos + HFCUSB_D_TX); +- hfc->active_fifos |= +- hfc->fifos[HFCUSB_D_TX].fifo_mask; +- usb_submit_urb(&hfc->fifos[HFCUSB_D_TX]. +- urb); +- } +- break; +- case (PH_ACTIVATE | REQUEST): +- switch (hfc->l1_state) { +- case 6: +- case 8: +- hfc->regd.dch_l1l2(hfc->regd.arg_hisax, +- (PH_DEACTIVATE | +- INDICATION), NULL); ++/* ++ -------------------------------------------------------------------------------------- ++ from here : hisax_if callback routines : ++ - void hfc_usb_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg) { + +- break; +- case 7: +- hfc->regd.dch_l1l2(hfc->regd.arg_hisax, +- (PH_ACTIVATE | +- INDICATION), NULL); ++ l1 to l2 routines : ++ - static void hfc_usb_l1l2(hfcusb_data * hfc) + +- break; +- default: +- queue_control_request(hfc, HFCUSB_STATES, 0x60); /* start activation */ +- hfc->t3_timer.expires = +- jiffies + (HFC_TIMER_T3 * HZ) / 1000; +- if (!timer_pending(&hfc->t3_timer)) +- add_timer(&hfc->t3_timer); +- break; +- } +- break; ++*/ + +- case (PH_DEACTIVATE | REQUEST): +- queue_control_request(hfc, HFCUSB_STATES, 0x40); /* start deactivation */ +- break; +- default: +- printk(KERN_INFO "unknown hfcusb l1_access 0x%x\n", +- pr); +- break; +- } +-} /* hfcusb_l1_access */ +- +-/*******************************/ +-/* B channel access from HiSax */ +-/*******************************/ +-static void +-hfcusb_bch_access(void *drvarg, int chan, int pr, void *arg) +-{ +- hfcusb_data *hfc = (hfcusb_data *) drvarg; +- usb_fifo *fifo = hfc->fifos + (chan ? HFCUSB_B2_TX : HFCUSB_B1_TX); +- long flags; +- +- switch (pr) { +- case (PH_DATA | REQUEST): +- case (PH_PULL | INDICATION): +- save_flags(flags); +- cli(); +- if (!fifo->active) { +- fill_tx_urb(fifo); +- hfc->active_fifos |= fifo->fifo_mask; +- usb_submit_urb(&fifo->urb); +- } +- restore_flags(flags); +- break; +- case (PH_ACTIVATE | REQUEST): +- if (!((int) arg)) { +- hfc->bch_enables &= ~(1 << chan); +- if (fifo->active) { +- fifo->active = 0; +- usb_unlink_urb(&fifo->urb); ++void hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg) ++{ ++ usb_fifo *fifo = my_hisax_if->priv; ++ hfcusb_data *hfc = fifo->hfc; ++ ++ switch (pr) { ++ case PH_ACTIVATE | REQUEST: ++ if(fifo->fifonum==HFCUSB_D_TX) ++ { ++#ifdef VERBOSE_ISDN_DEBUG ++ printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_ACTIVATE | REQUEST\n"); ++#endif ++ queue_control_request(hfc, HFCUSB_STATES,0x60,1); /* make activation */ ++ hfc->t3_timer.expires = jiffies + (HFC_TIMER_T3 * HZ) / 1000; ++ if(!timer_pending(&hfc->t3_timer)) add_timer(&hfc->t3_timer); + } +- save_flags(flags); +- cli(); +- queue_control_request(hfc, HFCUSB_FIFO, +- fifo->fifonum); +- queue_control_request(hfc, +- HFCUSB_INC_RES_F, 2); +- queue_control_request(hfc, HFCUSB_CON_HDLC, +- 9); +- queue_control_request(hfc, HFCUSB_SCTRL, +- 0x40 + +- hfc->bch_enables); +- queue_control_request(hfc, HFCUSB_SCTRL_R, +- hfc->bch_enables); +- restore_flags(flags); +- fifo++; +- if (fifo->active) { +- fifo->active = 0; +- usb_unlink_urb(&fifo->urb); ++ else ++ { ++#ifdef VERBOSE_ISDN_DEBUG ++ printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 Bx-chan: PH_ACTIVATE | REQUEST\n"); ++#endif ++ set_hfcmode(hfc,(fifo->fifonum==HFCUSB_B1_TX) ? 0 : 1 ,(int)arg); ++ fifo->hif->l1l2(fifo->hif,PH_ACTIVATE | INDICATION, NULL); + } +- return; /* fifo deactivated */ +- } +- fifo->transmode = ((int) arg == L1_MODE_TRANS); +- fifo->max_size = +- ((fifo->transmode) ? fifo-> +- usb_maxlen : MAX_BCH_SIZE); +- (fifo + 1)->transmode = fifo->transmode; +- (fifo + 1)->max_size = fifo->max_size; +- hfc->bch_enables |= (1 << chan); +- save_flags(flags); +- cli(); +- queue_control_request(hfc, HFCUSB_FIFO, +- fifo->fifonum); +- queue_control_request(hfc, HFCUSB_CON_HDLC, +- ((!fifo-> +- transmode) ? 9 : 11)); +- queue_control_request(hfc, HFCUSB_INC_RES_F, 2); +- queue_control_request(hfc, HFCUSB_SCTRL, +- 0x40 + hfc->bch_enables); +- if ((int) arg == L1_MODE_HDLC) +- queue_control_request(hfc, HFCUSB_CON_HDLC, +- 8); +- queue_control_request(hfc, HFCUSB_FIFO, +- fifo->fifonum + 1); +- queue_control_request(hfc, HFCUSB_CON_HDLC, +- ((!fifo-> +- transmode) ? 8 : 10)); +- queue_control_request(hfc, HFCUSB_INC_RES_F, 2); +- queue_control_request(hfc, HFCUSB_SCTRL_R, +- hfc->bch_enables); +- restore_flags(flags); +- +- break; +- +- default: +- printk(KERN_INFO +- "unknown hfcusb bch_access chan %d 0x%x\n", +- chan, pr); +- break; +- } +-} /* hfcusb_bch_access */ ++ break; ++ case PH_DEACTIVATE | REQUEST: ++ if(fifo->fifonum==HFCUSB_D_TX) ++ { ++#ifdef VERBOSE_ISDN_DEBUG ++ printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_DEACTIVATE | REQUEST\n"); ++#endif ++ printk (KERN_INFO "HFC-USB: ISDN TE device should not deativate...\n"); ++ } ++ else ++ { ++#ifdef VERBOSE_ISDN_DEBUG ++ printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 Bx-chan: PH_DEACTIVATE | REQUEST\n"); ++#endif ++ set_hfcmode(hfc,(fifo->fifonum==HFCUSB_B1_TX) ? 0 : 1 ,(int)L1_MODE_NULL); ++ fifo->hif->l1l2(fifo->hif,PH_DEACTIVATE | INDICATION, NULL); ++ } ++ break; ++ case PH_DATA | REQUEST: ++ if(fifo->skbuff && fifo->delete_flg) ++ { ++ dev_kfree_skb_any(fifo->skbuff); ++ //printk(KERN_INFO "skbuff=NULL on fifo:%d\n",fifo->fifonum); ++ fifo->skbuff = NULL; ++ fifo->delete_flg=FALSE; ++ } ++ ++ fifo->skbuff=arg; // we have a new buffer ++ ++ //if(fifo->fifonum==HFCUSB_D_TX) printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 D-chan: PH_DATA | REQUEST\n"); ++ //else printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1 Bx-chan: PH_DATA | REQUEST\n"); ++ break; ++ default: ++ printk (KERN_INFO "HFC_USB: hfc_usb_d_l2l1: unkown state : %#x\n", pr); ++ break; ++ } ++} ++ ++// valid configurations ++#define CNF_4INT3ISO 1 // 4 INT IN, 3 ISO OUT ++#define CNF_3INT3ISO 2 // 3 INT IN, 3 ISO OUT ++#define CNF_4ISO3ISO 3 // 4 ISO IN, 3 ISO OUT ++#define CNF_3ISO3ISO 4 // 3 ISO IN, 3 ISO OUT ++ ++ ++/* ++ -------------------------------------------------------------------------------------- ++ From here on USB initialization and deactivation related routines are implemented : ++ ++ - hfc_usb_init : ++ is the main Entry Point for the USB Subsystem when the device get plugged ++ in. This function calls usb_register with usb_driver as parameter. ++ Here, further entry points for probing (hfc_usb_probe) and disconnecting ++ the device (hfc_usb_disconnect) are published, as the id_table ++ ++ - hfc_usb_probe ++ this function is called by the usb subsystem, and steps through the alternate ++ settings of the currently plugged in device to detect all Endpoints needed to ++ run an ISDN TA. ++ Needed EndPoints are ++ 3 (+1) IntIn EndPoints (D-in, E-in, B1-in, B2-in, (E-in)) or ++ 3 (+1) Isochron In Endpoints (D-out, B1-out, B2-out) and 3 IsoOut Endpoints ++ The currently used transfer mode of on the Out-Endpoints will be stored in ++ hfc->usb_transfer_mode and is either USB_INT or USB_ISO ++ When a valid alternate setting could be found, the usb_init (see blow) ++ function is called ++ ++ - usb_init ++ Here, the HFC_USB Chip itself gets initialized and the USB framework to send/receive ++ Data to/from the several EndPoints are initialized: ++ The E- and D-Channel Int-In chain gets started ++ The IsoChain for the Iso-Out traffic get started ++ ++ - hfc_usb_disconnect ++ this function is called by the usb subsystem and has to free all resources ++ and stop all usb traffic to allow a proper hotplugging disconnect. ++ ++*/ + + /***************************************************************************/ + /* usb_init is called once when a new matching device is detected to setup */ +-/* main parmeters. It registers the driver at the main hisax module. */ ++/* main parameters. It registers the driver at the main hisax module. */ + /* on success 0 is returned. */ + /***************************************************************************/ +-static int +-usb_init(hfcusb_data * hfc) ++static int usb_init(hfcusb_data * hfc) + { + usb_fifo *fifo; +- int i; ++ int i, err; + u_char b; +- ++ struct hisax_b_if *p_b_if[2]; ++ + /* check the chip id */ +- if ((Read_hfc(hfc, HFCUSB_CHIP_ID, &b) != 1) || +- (b != HFCUSB_CHIPID)) { ++ printk(KERN_INFO "HFCUSB_CHIP_ID begin\n"); ++ if (read_usb(hfc, HFCUSB_CHIP_ID, &b) != 1) { ++ printk(KERN_INFO "HFC-USB: cannot read chip id\n"); ++ return(1); ++ } ++ printk(KERN_INFO "HFCUSB_CHIP_ID %x\n", b); ++ if (b != HFCUSB_CHIPID) { + printk(KERN_INFO "HFC-USB: Invalid chip id 0x%02x\n", b); +- return (1); ++ return(1); + } + + /* first set the needed config, interface and alternate */ +- usb_set_configuration(hfc->dev, 1); +- usb_set_interface(hfc->dev, hfc->if_used, hfc->alt_used); ++ printk(KERN_INFO "usb_init 1\n"); ++// usb_set_configuration(hfc->dev, 1); ++ printk(KERN_INFO "usb_init 2\n"); ++ err = usb_set_interface(hfc->dev, hfc->if_used, hfc->alt_used); ++ printk(KERN_INFO "usb_init usb_set_interface return %d\n", err); ++ /* now we initialize the chip */ ++ write_usb(hfc, HFCUSB_CIRM, 8); // do reset ++ write_usb(hfc, HFCUSB_CIRM, 0x10); // aux = output, reset off + +- /* init the led state request */ +- hfc->led_req = LED_DRIVER; ++ // set USB_SIZE to match the the wMaxPacketSize for INT or BULK transfers ++ write_usb(hfc, HFCUSB_USB_SIZE,(hfc->packet_size/8) | ((hfc->packet_size/8) << 4)); + +- /* now we initialise the chip */ +- Write_hfc(hfc, HFCUSB_CIRM, 0x10); /* aux = output, reset off */ +- Write_hfc(hfc, HFCUSB_P_DATA, 0); /* leds = off */ +- Write_hfc(hfc, HFCUSB_USB_SIZE, +- (hfc->fifos[HFCUSB_B1_TX].usb_maxlen >> 3) | +- ((hfc->fifos[HFCUSB_B1_RX].usb_maxlen >> 3) << 4)); ++ // set USB_SIZE_I to match the the wMaxPacketSize for ISO transfers ++ write_usb(hfc, HFCUSB_USB_SIZE_I, hfc->iso_packet_size); + + /* enable PCM/GCI master mode */ +- Write_hfc(hfc, HFCUSB_MST_MODE1, 0); /* set default values */ +- Write_hfc(hfc, HFCUSB_MST_MODE0, 1); /* enable master mode */ ++ write_usb(hfc, HFCUSB_MST_MODE1, 0); /* set default values */ ++ write_usb(hfc, HFCUSB_MST_MODE0, 1); /* enable master mode */ + + /* init the fifos */ +- Write_hfc(hfc, HFCUSB_F_THRES, (HFCUSB_TX_THRESHOLD >> 3) | +- ((HFCUSB_RX_THRESHOLD >> 3) << 4)); ++ write_usb(hfc, HFCUSB_F_THRES, (HFCUSB_TX_THRESHOLD/8) |((HFCUSB_RX_THRESHOLD/8) << 4)); + +- for (i = 0, fifo = hfc->fifos + i; i < HFCUSB_NUM_FIFOS; +- i++, fifo++) { +- Write_hfc(hfc, HFCUSB_FIFO, i); /* select the desired fifo */ +- +- fifo->transmode = 0; /* hdlc mode selected */ +- fifo->buff = NULL; /* init buffer pointer */ +- fifo->max_size = +- (i <= HFCUSB_B2_RX) ? MAX_BCH_SIZE : MAX_DFRAME_LEN; +- Write_hfc(hfc, HFCUSB_HDLC_PAR, ((i <= HFCUSB_B2_RX) ? 0 : 2)); /* data length */ +- Write_hfc(hfc, HFCUSB_CON_HDLC, ((i & 1) ? 0x08 : 0x09)); /* rx hdlc, tx fill 1 */ +- Write_hfc(hfc, HFCUSB_INC_RES_F, 2); /* reset the fifo */ +- } +- +- Write_hfc(hfc, HFCUSB_CLKDEL, 0x0f); /* clock delay value */ +- Write_hfc(hfc, HFCUSB_STATES, 3 | 0x10); /* set deactivated mode */ +- Write_hfc(hfc, HFCUSB_STATES, 3); /* enable state machine */ ++ fifo = hfc->fifos; ++ for(i = 0; i < HFCUSB_NUM_FIFOS; i++) ++ { ++ write_usb(hfc, HFCUSB_FIFO, i); /* select the desired fifo */ ++ fifo[i].skbuff = NULL; /* init buffer pointer */ ++ fifo[i].max_size = (i <= HFCUSB_B2_RX) ? MAX_BCH_SIZE : MAX_DFRAME_LEN; ++ fifo[i].last_urblen=0; ++ write_usb(hfc, HFCUSB_HDLC_PAR, ((i <= HFCUSB_B2_RX) ? 0 : 2)); // set 2 bit for D- & E-channel ++ write_usb(hfc, HFCUSB_CON_HDLC, ((i==HFCUSB_D_TX) ? 0x09 : 0x08)); // rx hdlc, enable IFF for D-channel ++ write_usb(hfc, HFCUSB_INC_RES_F, 2); /* reset the fifo */ ++ } + +- Write_hfc(hfc, HFCUSB_SCTRL_R, 0); /* disable both B receivers */ +- Write_hfc(hfc, HFCUSB_SCTRL, 0x40); /* disable B transmitters + cap mode */ ++ write_usb(hfc, HFCUSB_CLKDEL, 0x0f); /* clock delay value */ ++ write_usb(hfc, HFCUSB_STATES, 3 | 0x10); /* set deactivated mode */ ++ write_usb(hfc, HFCUSB_STATES, 3); /* enable state machine */ ++ ++ write_usb(hfc, HFCUSB_SCTRL_R, 0); /* disable both B receivers */ ++ write_usb(hfc, HFCUSB_SCTRL, 0x40); /* disable B transmitters + capacitive mode */ ++ ++ // set both B-channel to not connected ++ hfc->b_mode[0]=L1_MODE_NULL; ++ hfc->b_mode[1]=L1_MODE_NULL; ++ ++ hfc->l1_activated=FALSE; ++ hfc->led_state=0; ++ hfc->led_new_data=0; + +- /* init the l1 timer */ ++ /* init the t3 timer */ + init_timer(&hfc->t3_timer); + hfc->t3_timer.data = (long) hfc; +- hfc->t3_timer.function = (void *) l1_timer_expire; ++ hfc->t3_timer.function = (void *) l1_timer_expire_t3; ++ /* init the t4 timer */ ++ init_timer(&hfc->t4_timer); + hfc->t4_timer.data = (long) hfc; +- hfc->t4_timer.function = (void *) l1_timer_expire; +- hfc->l1_tq.routine = (void *) (void *) usb_l1d_bh; +- hfc->l1_tq.sync = 0; +- hfc->l1_tq.data = hfc; +- +- /* init the background control machinery */ +- hfc->ctrl_read.requesttype = 0xc0; +- hfc->ctrl_read.request = 1; +- hfc->ctrl_read.length = 1; +- hfc->ctrl_write.requesttype = 0x40; +- hfc->ctrl_write.request = 0; +- hfc->ctrl_write.length = 0; +- FILL_CONTROL_URB(&hfc->ctrl_urb, hfc->dev, hfc->ctrl_out_pipe, +- (u_char *) & hfc->ctrl_write, NULL, 0, +- ctrl_complete, hfc); +- +- /* init the TX-urbs */ +- fifo = hfc->fifos + HFCUSB_D_TX; +- FILL_BULK_URB(&fifo->urb, hfc->dev, fifo->pipe, +- (u_char *) fifo->buffer, 0, tx_complete, fifo); +- fifo = hfc->fifos + HFCUSB_B1_TX; +- FILL_BULK_URB(&fifo->urb, hfc->dev, fifo->pipe, +- (u_char *) fifo->buffer, 0, tx_complete, fifo); +- fifo = hfc->fifos + HFCUSB_B2_TX; +- FILL_BULK_URB(&fifo->urb, hfc->dev, fifo->pipe, +- (u_char *) fifo->buffer, 0, tx_complete, fifo); +- +- /* init the E-buffer */ +- skb_queue_head_init(&hfc->regd.erq); +- +- /* now register ourself at hisax */ +- hfc->regd.version = HISAX_LOAD_VERSION; /* set our version */ +- hfc->regd.cmd = HISAX_LOAD_REGISTER; /* register command */ +- hfc->regd.argl1 = (void *) hfc; /* argument for our local routine */ +- hfc->regd.dch_l2l1 = hfcusb_l1_access; +- hfc->regd.bch_l2l1 = hfcusb_bch_access; +- hfc->regd.drvname = "hfc_usb"; +- if (hisax_register_hfcusb(&hfc->regd)) { +- printk(KERN_INFO "HFC-USB failed to register at hisax\n"); +- Write_hfc(hfc, HFCUSB_CIRM, 0x08); /* aux = input, reset on */ +- return (1); +- } +- +- /* startup the D- and E-channel fifos */ +- start_rx_fifo(hfc->fifos + HFCUSB_D_RX); /* D-fifo */ +- if (hfc->fifos[HFCUSB_PCM_RX].pipe) +- start_rx_fifo(hfc->fifos + HFCUSB_PCM_RX); /* E-fifo */ ++ hfc->t4_timer.function = (void *) l1_timer_expire_t4; ++ /* init the led timer */ ++ init_timer(&hfc->led_timer); ++ hfc->led_timer.data = (long) hfc; ++ hfc->led_timer.function = (void *) led_timer; ++ // trigger 4 hz led timer ++ hfc->led_timer.expires = jiffies + (LED_TIME * HZ) / 1000; ++ if(!timer_pending(&hfc->led_timer)) add_timer(&hfc->led_timer); ++ ++ // init the background machinery for control requests ++ hfc->ctrl_read.bRequestType = 0xc0; ++ hfc->ctrl_read.bRequest = 1; ++ hfc->ctrl_read.wLength = 1; ++ hfc->ctrl_write.bRequestType = 0x40; ++ hfc->ctrl_write.bRequest = 0; ++ hfc->ctrl_write.wLength = 0; ++ usb_fill_control_urb(hfc->ctrl_urb, hfc->dev, hfc->ctrl_out_pipe,(u_char *) & hfc->ctrl_write, NULL, 0, ctrl_complete, hfc); ++ ++ /* Init All Fifos */ ++ for(i = 0; i < HFCUSB_NUM_FIFOS; i++) ++ { ++ hfc->fifos[i].iso[0].purb = NULL; ++ hfc->fifos[i].iso[1].purb = NULL; ++ hfc->fifos[i].active = 0; ++ } ++ ++ // register like Germaschewski : ++ hfc->d_if.owner = THIS_MODULE; ++ hfc->d_if.ifc.priv = &hfc->fifos[HFCUSB_D_TX]; ++ hfc->d_if.ifc.l2l1 = hfc_usb_l2l1; ++ ++ for (i=0; i<2; i++) ++ { ++ hfc->b_if[i].ifc.priv = &hfc->fifos[HFCUSB_B1_TX+i*2]; ++ hfc->b_if[i].ifc.l2l1 = hfc_usb_l2l1; ++ p_b_if[i] = &hfc->b_if[i]; ++ } ++ ++ hfc->protocol = 2; /* default EURO ISDN, should be a module_param */ ++ hisax_register(&hfc->d_if, p_b_if, "hfc_usb", hfc->protocol); ++ ++ for (i=0; i<4; i++) ++ hfc->fifos[i].hif=&p_b_if[i/2]->ifc; ++ for (i=4; i<8; i++) ++ hfc->fifos[i].hif=&hfc->d_if.ifc; ++ ++ // 3 (+1) INT IN + 3 ISO OUT ++ if(hfc->cfg_used == CNF_3INT3ISO || hfc->cfg_used == CNF_4INT3ISO) ++ { ++ start_int_fifo(hfc->fifos + HFCUSB_D_RX); // Int IN D-fifo ++ if(hfc->fifos[HFCUSB_PCM_RX].pipe) start_int_fifo(hfc->fifos + HFCUSB_PCM_RX); // E-fifo ++ start_int_fifo(hfc->fifos + HFCUSB_B1_RX); // Int IN B1-fifo ++ start_int_fifo(hfc->fifos + HFCUSB_B2_RX); // Int IN B2-fifo ++ } ++ ++ // 3 (+1) ISO IN + 3 ISO OUT ++ if(hfc->cfg_used==CNF_3ISO3ISO || hfc->cfg_used==CNF_4ISO3ISO) ++ { ++ start_isoc_chain(hfc->fifos + HFCUSB_D_RX, ISOC_PACKETS_D, rx_iso_complete,16); ++ if(hfc->fifos[HFCUSB_PCM_RX].pipe) start_isoc_chain(hfc->fifos + HFCUSB_PCM_RX, ISOC_PACKETS_D, rx_iso_complete,16); ++ start_isoc_chain(hfc->fifos + HFCUSB_B1_RX, ISOC_PACKETS_B, rx_iso_complete,16); ++ start_isoc_chain(hfc->fifos + HFCUSB_B2_RX, ISOC_PACKETS_B, rx_iso_complete,16); ++ } ++ ++ start_isoc_chain(hfc->fifos + HFCUSB_D_TX, ISOC_PACKETS_D, tx_iso_complete,1); ++ start_isoc_chain(hfc->fifos + HFCUSB_B1_TX, ISOC_PACKETS_B, tx_iso_complete,1); ++ start_isoc_chain(hfc->fifos + HFCUSB_B2_TX, ISOC_PACKETS_B, tx_iso_complete,1); ++ ++ handle_led(hfc,LED_POWER_ON); ++ ++ return(0); ++} /* usb_init */ ++ ++ ++/****************************************/ ++/* data defining the devices to be used */ ++/****************************************/ ++// static __devinitdata const struct usb_device_id hfc_usb_idtab[3] = { ++static struct usb_device_id hfc_usb_idtab[] = { ++ {USB_DEVICE(0x7b0, 0x0007)}, /* Billion USB TA 2 */ ++ {USB_DEVICE(0x742, 0x2008)}, /* Stollmann USB TA */ ++ {USB_DEVICE(0x959, 0x2bd0)}, /* Colognechip USB eval TA */ ++ {USB_DEVICE(0x8e3, 0x0301)}, /* OliTec ISDN USB */ ++ {USB_DEVICE(0x675, 0x1688)}, /* DrayTec ISDN USB */ ++ {USB_DEVICE(0x7fa, 0x0846)}, /* Bewan ISDN USB TA */ ++ {} /* end with an all-zeroes entry */ ++}; ++ ++MODULE_AUTHOR("Peter Sprenger (sprenger@moving-byters.de)/Martin Bachem (info@colognechip.com)"); ++MODULE_DESCRIPTION("HFC I4L USB driver"); ++MODULE_DEVICE_TABLE(usb, hfc_usb_idtab); ++MODULE_LICENSE("GPL"); ++ ++#define EP_NUL 1 // Endpoint at this position not allowed ++#define EP_NOP 2 // all type of endpoints allowed at this position ++#define EP_ISO 3 // Isochron endpoint mandatory at this position ++#define EP_BLK 4 // Bulk endpoint mandatory at this position ++#define EP_INT 5 // Interrupt endpoint mandatory at this position ++ ++// this array represents all endpoints possible in the HCF-USB ++// the last 2 entries are the configuration number and the minimum interval for Interrupt endpoints ++int validconf[][18]= ++{ ++ // INT in, ISO out config ++ {EP_NUL,EP_INT,EP_NUL,EP_INT,EP_NUL,EP_INT,EP_NOP,EP_INT,EP_ISO,EP_NUL,EP_ISO,EP_NUL,EP_ISO,EP_NUL,EP_NUL,EP_NUL,CNF_4INT3ISO,2}, ++ {EP_NUL,EP_INT,EP_NUL,EP_INT,EP_NUL,EP_INT,EP_NUL,EP_NUL,EP_ISO,EP_NUL,EP_ISO,EP_NUL,EP_ISO,EP_NUL,EP_NUL,EP_NUL,CNF_3INT3ISO,2}, ++ // ISO in, ISO out config ++ {EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_NOP,EP_ISO,CNF_4ISO3ISO,2}, ++ {EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_NUL,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_ISO,EP_NUL,EP_NUL,CNF_3ISO3ISO,2}, ++ {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} // EOL element ++}; ++ ++// string description of chosen config ++char *conf_str[]= ++{ ++ "4 Interrupt IN + 3 Isochron OUT", ++ "3 Interrupt IN + 3 Isochron OUT", ++ "4 Isochron IN + 3 Isochron OUT", ++ "3 Isochron IN + 3 Isochron OUT" ++}; + +- return (0); +-} /* usb_init */ + + /*************************************************/ + /* function called to probe a new plugged device */ + /*************************************************/ +-static void * +-hfc_usb_probe(struct usb_device *dev, unsigned int interface +-#ifdef COMPAT_HAS_USB_IDTAB +- , const struct usb_device_id *id_table) +-#else +- ) +-#endif ++//static int hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) ++static void* hfc_usb_probe(struct usb_device *dev, unsigned int ifnum, const struct usb_device_id *id) + { ++ //struct usb_device *dev= interface_to_usbdev(intf); ++ struct usb_interface* intf = dev->actconfig->interface + ifnum; + hfcusb_data *context; +- struct usb_interface *ifp = dev->actconfig->interface + interface; +- struct usb_interface_descriptor *ifdp = +- ifp->altsetting + ifp->act_altsetting; +- struct usb_endpoint_descriptor *epd; +- int i, idx, ep_msk; +- +-#ifdef COMPAT_HAS_USB_IDTAB +- if (id_table && (dev->descriptor.idVendor == id_table->idVendor) && +- (dev->descriptor.idProduct == id_table->idProduct) && +-#else +- if ((((dev->descriptor.idVendor == 0x959) && +- (dev->descriptor.idProduct == 0x2bd0)) || +- ((dev->descriptor.idVendor == 0x7b0) && +- (dev->descriptor.idProduct == 0x0006))) && +-#endif +- (ifdp->bNumEndpoints >= 6) && (ifdp->bNumEndpoints <= 16)) { +- if (!(context = kmalloc(sizeof(hfcusb_data), GFP_KERNEL))) { +- return (NULL); /* got no mem */ +- }; +- memset(context, 0, sizeof(hfcusb_data)); /* clear the structure */ +- i = ifdp->bNumEndpoints; /* get number of endpoints */ +- ep_msk = 0; /* none found */ +- epd = ifdp->endpoint; /* first endpoint descriptor */ +- while (i-- && ((ep_msk & 0xcf) != 0xcf)) { +- +- idx = (((epd->bEndpointAddress & 0x7f) - 1) << 1); /* get endpoint base */ +- if (idx < 7) { +- switch (epd->bmAttributes) { +- case USB_ENDPOINT_XFER_INT: +- if (! +- (epd-> +- bEndpointAddress & +- 0x80)) +- break; /* only interrupt in allowed */ +- idx++; /* input index is odd */ +- context->fifos[idx].pipe = +- usb_rcvintpipe(dev, +- epd-> +- bEndpointAddress); +- break; +- +- case USB_ENDPOINT_XFER_BULK: +- if (epd-> +- bEndpointAddress & +- 0x80) +- break; /* only bulk out allowed */ +- context->fifos[idx].pipe = +- usb_sndbulkpipe(dev, +- epd-> +- bEndpointAddress); +- break; +- default: +- context->fifos[idx].pipe = 0; /* reset data */ +- } /* switch attribute */ +- +- if (context->fifos[idx].pipe) { +- context->fifos[idx].fifonum = idx; +- context->fifos[idx].fifo_mask = +- 1 << idx; +- context->fifos[idx].hfc = context; +- context->fifos[idx].usb_maxlen = +- epd->wMaxPacketSize; +- context->fifos[idx].intervall = +- epd->bInterval; +- ep_msk |= (1 << idx); +- } else +- ep_msk &= ~(1 << idx); +- } /* idx < 7 */ +- epd++; +- } ++ //struct usb_host_interface *iface = intf->cur_altsetting; ++ //struct usb_host_interface *iface_used = NULL; ++ //struct usb_host_endpoint *ep; ++ struct usb_endpoint_descriptor* ep; ++ //int ifnum = iface->desc.bInterfaceNumber; ++ struct usb_interface_descriptor* intfdesc = intf->altsetting + intf->act_altsetting; ++ struct usb_interface_descriptor* intfdesc_used = NULL; ++ int i, idx, alt_idx, probe_alt_setting, vend_idx, cfg_used, *vcf, attr, cfg_found, cidx, ep_addr; ++ int cmptbl[16],small_match,iso_packet_size,packet_size,alt_used=0; ++ ++// usb_show_device(dev); ++// usb_show_device_descriptor(&dev->descriptor); ++// usb_show_interface_descriptor(&iface->desc); ++ vend_idx=0xffff; ++ for(i=0;vdata[i].vendor;i++) ++ { ++ if(dev->descriptor.idVendor==vdata[i].vendor && dev->descriptor.idProduct==vdata[i].prod_id) vend_idx=i; ++ } ++ + +- if ((ep_msk & 0x3f) != 0x3f) { +- kfree(context); +- return (NULL); +- } +- MOD_INC_USE_COUNT; /* lock our module */ +- context->dev = dev; /* save device */ +- context->if_used = interface; /* save used interface */ +- context->alt_used = ifp->act_altsetting; /* and alternate config */ +- context->ctrl_paksize = dev->descriptor.bMaxPacketSize0; /* control size */ +- +- /* create the control pipes needed for register access */ +- context->ctrl_in_pipe = usb_rcvctrlpipe(context->dev, 0); +- context->ctrl_out_pipe = usb_sndctrlpipe(context->dev, 0); +- +- /* init the chip and register the driver */ +- if (usb_init(context)) { +- kfree(context); +- MOD_DEC_USE_COUNT; +- return (NULL); +- } ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: probing interface(%d) actalt(%d)\n", ++ ifnum, intfdesc->bAlternateSetting); ++ /* printk(KERN_INFO "HFC-USB: probing interface(%d) actalt(%d) minor(%d)\n", ++ ifnum, intfdesc->bAlternateSetting, intf->driver->minor); */ ++#endif + +- printk(KERN_INFO +- "HFC-USB: New device if=%d alt=%d registered\n", +- context->if_used, context->alt_used); +- return (context); +- } ++ if (vend_idx != 0xffff) { ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: found vendor idx:%d name:%s\n",vend_idx,vdata[vend_idx].vend_name); ++#endif ++ /* if vendor and product ID is OK, start probing a matching alternate setting ... */ ++ alt_idx = 0; ++ small_match=0xffff; ++ // default settings ++ iso_packet_size=16; ++ packet_size=64; ++ ++ while (alt_idx < intf->num_altsetting) { ++ //iface = intf->altsetting + alt_idx; ++ intfdesc = intf->altsetting + alt_idx; ++ probe_alt_setting = intfdesc->bAlternateSetting; ++ cfg_used=0; + +- return (NULL); /* no matching entry */ +-} /* hfc_usb_probe */ ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: test alt_setting %d\n", probe_alt_setting); ++#endif ++ // check for config EOL element ++ while (validconf[cfg_used][0]) { ++ cfg_found=TRUE; ++ vcf=validconf[cfg_used]; ++ ep = intfdesc->endpoint; /* first endpoint descriptor */ ++ ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: (if=%d alt=%d cfg_used=%d)\n", ++ ifnum, probe_alt_setting, cfg_used); ++#endif ++ // copy table ++ memcpy(cmptbl,vcf,16*sizeof(int)); ++ ++ // check for all endpoints in this alternate setting ++ for (i=0; i < intfdesc->bNumEndpoints; i++) { ++ ep_addr = ep->bEndpointAddress; ++ idx = ((ep_addr & 0x7f)-1)*2; /* get endpoint base */ ++ if (ep_addr & 0x80) ++ idx++; ++ attr = ep->bmAttributes; ++ ++ if (cmptbl[idx] == EP_NUL) { ++ printk(KERN_INFO "HFC-USB: cfg_found=FALSE in idx:%d attr:%d cmptbl[%d]:%d\n", ++ idx, attr, idx, cmptbl[idx]); ++ cfg_found = FALSE; ++ } ++ ++ if (attr == USB_ENDPOINT_XFER_INT && cmptbl[idx] == EP_INT) ++ cmptbl[idx] = EP_NUL; ++ if (attr == USB_ENDPOINT_XFER_BULK && cmptbl[idx] == EP_BLK) ++ cmptbl[idx] = EP_NUL; ++ if (attr == USB_ENDPOINT_XFER_ISOC && cmptbl[idx] == EP_ISO) ++ cmptbl[idx] = EP_NUL; ++ ++ // check if all INT endpoints match minimum interval ++ if (attr == USB_ENDPOINT_XFER_INT && ep->bInterval < vcf[17]) { ++#ifdef VERBOSE_USB_DEBUG ++ if (cfg_found) ++ printk(KERN_INFO "HFC-USB: Interrupt Endpoint interval < %d found - skipping config\n", ++ vcf[17]); ++#endif ++ cfg_found = FALSE; ++ } ++ ++ ep++; ++ } ++ ++ for (i = 0; i < 16; i++) { ++ // printk(KERN_INFO "HFC-USB: cmptbl[%d]:%d\n", i, cmptbl[i]); ++ ++ // all entries must be EP_NOP or EP_NUL for a valid config ++ if (cmptbl[i] != EP_NOP && cmptbl[i] != EP_NUL) ++ cfg_found = FALSE; ++ } ++ ++ // we check for smallest match, to provide configuration priority ++ // configurations with smaller index have higher priority ++ if (cfg_found) { ++ if (cfg_used < small_match) { ++ small_match = cfg_used; ++ alt_used = probe_alt_setting; ++ //iface_used = iface; ++ intfdesc_used = intfdesc; ++ } ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: small_match=%x %x\n", small_match, alt_used); ++#endif ++ } ++ ++ cfg_used++; ++ } ++ ++ alt_idx++; ++ } /* (alt_idx < intf->num_altsetting) */ ++#ifdef VERBOSE_USB_DEBUG ++ printk(KERN_INFO "HFC-USB: final small_match=%x alt_used=%x\n",small_match, alt_used); ++#endif ++ // yiipiee, we found a valid config ++ if (small_match != 0xffff) { ++ //iface = iface_used; ++ intfdesc = intfdesc_used; ++ ++ if (!(context = kmalloc(sizeof(hfcusb_data), GFP_KERNEL))) ++ return(NULL); /* got no mem */ ++ memset(context, 0, sizeof(hfcusb_data)); /* clear the structure */ ++ ++ ep = intfdesc->endpoint; /* first endpoint descriptor */ ++ vcf = validconf[small_match]; ++ ++ for (i = 0; i < intfdesc->bNumEndpoints; i++) { ++ ep_addr = ep->bEndpointAddress; ++ idx = ((ep_addr & 0x7f)-1)*2; /* get endpoint base */ ++ if (ep_addr & 0x80) ++ idx++; ++ cidx = idx & 7; ++ attr = ep->bmAttributes; ++ ++ // only initialize used endpoints ++ if (vcf[idx] != EP_NOP && vcf[idx] != EP_NUL) { ++ switch (attr) { ++ case USB_ENDPOINT_XFER_INT: ++ context->fifos[cidx].pipe = usb_rcvintpipe(dev, ep->bEndpointAddress); ++ context->fifos[cidx].usb_transfer_mode = USB_INT; ++ packet_size = ep->wMaxPacketSize; // remember max packet size ++#ifdef VERBOSE_USB_DEBUG ++ printk (KERN_INFO "HFC-USB: Interrupt-In Endpoint found %d ms(idx:%d cidx:%d)!\n", ++ ep->bInterval, idx, cidx); ++#endif ++ break; ++ case USB_ENDPOINT_XFER_BULK: ++ if (ep_addr & 0x80) ++ context->fifos[cidx].pipe = usb_rcvbulkpipe(dev, ep->bEndpointAddress); ++ else ++ context->fifos[cidx].pipe = usb_sndbulkpipe(dev, ep->bEndpointAddress); ++ context->fifos[cidx].usb_transfer_mode = USB_BULK; ++ packet_size = ep->wMaxPacketSize; // remember max packet size ++#ifdef VERBOSE_USB_DEBUG ++ printk (KERN_INFO "HFC-USB: Bulk Endpoint found (idx:%d cidx:%d)!\n", ++ idx, cidx); ++#endif ++ break; ++ case USB_ENDPOINT_XFER_ISOC: ++ if (ep_addr & 0x80) ++ context->fifos[cidx].pipe = usb_rcvisocpipe(dev, ep->bEndpointAddress); ++ else ++ context->fifos[cidx].pipe = usb_sndisocpipe(dev, ep->bEndpointAddress); ++ context->fifos[cidx].usb_transfer_mode = USB_ISOC; ++ iso_packet_size = ep->wMaxPacketSize; // remember max packet size ++#ifdef VERBOSE_USB_DEBUG ++ printk (KERN_INFO "HFC-USB: ISO Endpoint found (idx:%d cidx:%d)!\n", ++ idx, cidx); ++#endif ++ break; ++ default: ++ context->fifos[cidx].pipe = 0; /* reset data */ ++ } /* switch attribute */ ++ ++ if (context->fifos[cidx].pipe) { ++ context->fifos[cidx].fifonum = cidx; ++ context->fifos[cidx].hfc = context; ++ context->fifos[cidx].usb_packet_maxlen = ep->wMaxPacketSize; ++ context->fifos[cidx].intervall = ep->bInterval; ++ context->fifos[cidx].skbuff = NULL; ++#ifdef VERBOSE_USB_DEBUG ++ printk (KERN_INFO "HFC-USB: fifo%d pktlen %d interval %d\n", ++ context->fifos[cidx].fifonum, ++ context->fifos[cidx].usb_packet_maxlen, ++ context->fifos[cidx].intervall); ++#endif ++ } ++ } ++ ++ ep++; ++ } ++ ++ // now share our luck ++ context->dev = dev; /* save device */ ++ context->if_used = ifnum; /* save used interface */ ++ context->alt_used = alt_used; /* and alternate config */ ++ context->ctrl_paksize = dev->descriptor.bMaxPacketSize0; /* control size */ ++ context->cfg_used=vcf[16]; // store used config ++ context->vend_idx=vend_idx; // store found vendor ++ context->packet_size=packet_size; ++ context->iso_packet_size=iso_packet_size; ++ ++ /* create the control pipes needed for register access */ ++ context->ctrl_in_pipe = usb_rcvctrlpipe(context->dev, 0); ++ context->ctrl_out_pipe = usb_sndctrlpipe(context->dev, 0); ++ context->ctrl_urb = usb_alloc_urb(0); ++ ++ printk(KERN_INFO "HFC-USB: detected \"%s\" configuration: %s (if=%d alt=%d)\n", ++ vdata[vend_idx].vend_name, conf_str[small_match], context->if_used, context->alt_used); ++ ++ /* init the chip and register the driver */ ++ if (usb_init(context)) ++ { ++ if (context->ctrl_urb) { ++ usb_unlink_urb(context->ctrl_urb); ++ usb_free_urb(context->ctrl_urb); ++ context->ctrl_urb = NULL; ++ } ++ kfree(context); ++ return(NULL); ++ } ++ //usb_set_intfdata(intf, context); ++ //intf->private_data = context; ++ return(context); ++ } ++ } ++ return(NULL); ++} + + /****************************************************/ + /* function called when an active device is removed */ + /****************************************************/ +-static void +-hfc_usb_disconnect(struct usb_device *usbdev, void *drv_context) ++//static void hfc_usb_disconnect(struct usb_interface *intf) ++static void hfc_usb_disconnect(struct usb_device *usbdev, void* drv_context) + { +- hfcusb_data *context = drv_context; ++ //hfcusb_data *context = intf->private_data; ++ hfcusb_data* context = drv_context; + int i; +- struct sk_buff *skb; + +- /* tell all fifos to terminate */ +- for (i = 0; i < HFCUSB_NUM_FIFOS; i++) +- if (context->fifos[i].active) { +- context->fifos[i].active = 0; +- usb_unlink_urb(&context->fifos[i].urb); +- } +- while (context->active_fifos) { +- set_current_state(TASK_INTERRUPTIBLE); +- /* Timeout 10ms */ +- schedule_timeout((10 * HZ) / 1000); +- } ++ printk(KERN_INFO "HFC-USB: device disconnect\n"); ++ ++ //intf->private_data = NULL; ++ if (!context) ++ return; + if (timer_pending(&context->t3_timer)) + del_timer(&context->t3_timer); +- context->regd.release_driver(context->regd.arg_hisax); +- while ((skb = skb_dequeue(&context->regd.erq)) != NULL) +- dev_kfree_skb_any(skb); ++ if (timer_pending(&context->t4_timer)) ++ del_timer(&context->t4_timer); ++ if (timer_pending(&context->led_timer)) ++ del_timer(&context->led_timer); ++ ++ hisax_unregister(&context->d_if); + ++ /* tell all fifos to terminate */ ++ for(i = 0; i < HFCUSB_NUM_FIFOS; i++) { ++ if(context->fifos[i].usb_transfer_mode == USB_ISOC) { ++ if(context->fifos[i].active > 0) { ++ stop_isoc_chain(&context->fifos[i]); ++#ifdef VERBOSE_USB_DEBUG ++ printk (KERN_INFO "HFC-USB: hfc_usb_disconnect: stopping ISOC chain Fifo no %i\n", i); ++#endif ++ } ++ } else { ++ if(context->fifos[i].active > 0) { ++ context->fifos[i].active = 0; ++#ifdef VERBOSE_USB_DEBUG ++ printk (KERN_INFO "HFC-USB: hfc_usb_disconnect: unlinking URB for Fifo no %i\n", i); ++#endif ++ } ++ if (context->fifos[i].urb) { ++ usb_unlink_urb(context->fifos[i].urb); ++ usb_free_urb(context->fifos[i].urb); ++ context->fifos[i].urb = NULL; ++ } ++ } ++ context->fifos[i].active = 0; ++ } ++ if (context->ctrl_urb) { ++ usb_unlink_urb(context->ctrl_urb); ++ usb_free_urb(context->ctrl_urb); ++ context->ctrl_urb = NULL; ++ } + kfree(context); /* free our structure again */ +- MOD_DEC_USE_COUNT; /* and decrement the usage counter */ + } /* hfc_usb_disconnect */ + ++ + /************************************/ + /* our driver information structure */ + /************************************/ + static struct usb_driver hfc_drv = { + name:"hfc_usb", +-#ifdef COMPAT_HAS_USB_IDTAB + id_table:hfc_usb_idtab, +-#endif + probe:hfc_usb_probe, + disconnect:hfc_usb_disconnect, + }; + +-static void __exit +-hfc_usb_exit(void) +-{ + ++static void __exit hfc_usb_exit(void) ++{ ++#ifdef VERBOSE_USB_DEBUG ++ printk ("HFC-USB: calling \"hfc_usb_exit\" ...\n"); ++#endif + usb_deregister(&hfc_drv); /* release our driver */ + printk(KERN_INFO "HFC-USB module removed\n"); + } + +-static int __init +-hfc_usb_init(void) ++static int __init hfc_usb_init(void) + { +- struct hisax_drvreg drv; ++ printk ("HFC-USB: driver module revision %s loaded\n", hfcusb_revision); + +- drv.version = HISAX_LOAD_VERSION; /* set our version */ +- drv.cmd = HISAX_LOAD_CHKVER; /* check command only */ +- if (hisax_register_hfcusb(&drv)) { +- printk(KERN_INFO "HFC-USB <-> hisax version conflict\n"); +- return (-1); /* unable to register */ +- } +- if (usb_register(&hfc_drv)) { +- printk(KERN_INFO +- "Unable to register HFC-USB module at usb stack\n"); +- return (-1); /* unable to register */ ++ if(usb_register(&hfc_drv)) ++ { ++ printk(KERN_INFO "HFC-USB: Unable to register HFC-USB module at usb stack\n"); ++ return(-1); /* unable to register */ + } +- +- printk(KERN_INFO "HFC-USB module loaded\n"); +- return (0); ++ return(0); + } + ++ ++ ++ ++ + module_init(hfc_usb_init); + module_exit(hfc_usb_exit); ++ diff --git a/recipes/linux/linux-wrt-2.4.30/402-pl2303-backport-2-4-29 b/recipes/linux/linux-wrt-2.4.30/402-pl2303-backport-2-4-29 new file mode 100644 index 0000000000..8577499b0d --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/402-pl2303-backport-2-4-29 @@ -0,0 +1,738 @@ +diff -rNu linux-2.4.29.old/drivers/usb/serial/pl2303.c linux-2.4.29/drivers/usb/serial/pl2303.c +--- linux-2.4.29.old/drivers/usb/serial/pl2303.c 2005-03-22 14:48:04.000000000 +0100 ++++ linux-2.4.29/drivers/usb/serial/pl2303.c 2005-03-22 15:33:05.735943352 +0100 +@@ -1,7 +1,7 @@ + /* + * Prolific PL2303 USB to serial adaptor driver + * +- * Copyright (C) 2001-2003 Greg Kroah-Hartman (greg@kroah.com) ++ * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com) + * Copyright (C) 2003 IBM Corp. + * + * Original driver for 2.2.x by anonymous +@@ -12,8 +12,16 @@ + * (at your option) any later version. + * + * See Documentation/usb/usb-serial.txt for more information on using this driver +- * 2003_Apr_24 gkh +- * Added line error reporting support. Hopefully it is correct... ++ * ++ * ++ * 2005_Mar_05 grsch ++ * ported 2.6.8 pl2303.c to 2.4.20 format ++ * (HX model works fine now, ID table should be brought up to date) ++ * Gregor Schaffrath <gschaff@ran-dom.org> ++ * ++ * 2002_Mar_26 gkh ++ * allowed driver to work properly if there is no tty assigned to a port ++ * (this happens for serial console devices.) + * + * 2001_Oct_06 gkh + * Added RTS and DTR line control. Thanks to joe@bndlg.de for parts of it. +@@ -33,6 +41,9 @@ + * + */ + ++static int debug; ++ ++ + #include <linux/config.h> + #include <linux/kernel.h> + #include <linux/errno.h> +@@ -46,43 +57,44 @@ + #include <linux/spinlock.h> + #include <asm/uaccess.h> + #include <linux/usb.h> +- +-#ifdef CONFIG_USB_SERIAL_DEBUG +- static int debug = 1; +-#else +- static int debug; +-#endif +- + #include "usb-serial.h" + #include "pl2303.h" + + /* + * Version Information + */ +-#define DRIVER_VERSION "v0.10" ++#define DRIVER_VERSION "v0.11" + #define DRIVER_DESC "Prolific PL2303 USB to serial adaptor driver" + +- +- + static struct usb_device_id id_table [] = { + { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID) }, + { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) }, + { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) }, + { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) }, +- { USB_DEVICE(ATEN_VENDOR_ID2, ATEN_PRODUCT_ID) }, + { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) }, + { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID) }, + { USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) }, +- { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) }, +- { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) }, +- { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) }, +- { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, +- { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) }, ++ { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) }, ++ { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) }, ++ { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) }, ++ { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) }, ++ { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) }, ++ { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_ID) }, ++ { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_ID) }, + { } /* Terminating entry */ + }; + + MODULE_DEVICE_TABLE (usb, id_table); + ++/* ++static struct usb_driver pl2303_driver = { ++ .owner = THIS_MODULE, ++ .name = "pl2303", ++ .probe = usb_serial_probe, ++ .disconnect = usb_serial_disconnect, ++ .id_table = id_table, ++}; ++*/ + + #define SET_LINE_REQUEST_TYPE 0x21 + #define SET_LINE_REQUEST 0x20 +@@ -130,6 +142,9 @@ + static int pl2303_write (struct usb_serial_port *port, int from_user, + const unsigned char *buf, int count); + static void pl2303_break_ctl(struct usb_serial_port *port,int break_state); ++static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file); ++static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file, ++ unsigned int set, unsigned int clear); + static int pl2303_startup (struct usb_serial *serial); + static void pl2303_shutdown (struct usb_serial *serial); + +@@ -149,27 +164,48 @@ + .ioctl = pl2303_ioctl, + .break_ctl = pl2303_break_ctl, + .set_termios = pl2303_set_termios, ++ //.tiocmget = pl2303_tiocmget, ++ //.tiocmset = pl2303_tiocmset, + .read_bulk_callback = pl2303_read_bulk_callback, + .read_int_callback = pl2303_read_int_callback, + .write_bulk_callback = pl2303_write_bulk_callback, ++ //.attach = pl2303_startup, + .startup = pl2303_startup, + .shutdown = pl2303_shutdown, + }; + ++enum pl2303_type { ++ type_0, /* don't know the difference between type 0 and */ ++ type_1, /* type 1, until someone from prolific tells us... */ ++ HX, /* HX version of the pl2303 chip */ ++}; ++ + struct pl2303_private { + spinlock_t lock; + wait_queue_head_t delta_msr_wait; + u8 line_control; + u8 line_status; + u8 termios_initialized; ++ enum pl2303_type type; + }; + + + static int pl2303_startup (struct usb_serial *serial) + { + struct pl2303_private *priv; ++ enum pl2303_type type = type_0; + int i; + ++ if (serial->dev->descriptor.bDeviceClass == 0x02) ++ type = type_0; ++ else if (serial->dev->descriptor.bMaxPacketSize0 == 0x40) ++ type = HX; ++ else if (serial->dev->descriptor.bDeviceClass == 0x00) ++ type = type_1; ++ else if (serial->dev->descriptor.bDeviceClass == 0xFF) ++ type = type_1; ++ dbg("device type: %d", type); ++ + for (i = 0; i < serial->num_ports; ++i) { + priv = kmalloc (sizeof (struct pl2303_private), GFP_KERNEL); + if (!priv) +@@ -177,7 +213,8 @@ + memset (priv, 0x00, sizeof (struct pl2303_private)); + spin_lock_init(&priv->lock); + init_waitqueue_head(&priv->delta_msr_wait); +- usb_set_serial_port_data(&serial->port[i], priv); ++ priv->type = type; ++ serial->port[i].private = priv; + } + return 0; + } +@@ -215,13 +252,13 @@ + memcpy (port->write_urb->transfer_buffer, buf, count); + } + +- usb_serial_debug_data (__FILE__, __FUNCTION__, count, port->write_urb->transfer_buffer); ++ usb_serial_debug_data(__FILE__, __FUNCTION__, count, port->write_urb->transfer_buffer); + + port->write_urb->transfer_buffer_length = count; + port->write_urb->dev = port->serial->dev; + result = usb_submit_urb (port->write_urb); + if (result) +- err("%s - failed submitting write urb, error %d", __FUNCTION__, result); ++ err("%s - failed submitting write urb, error %d\n", __FUNCTION__, result); + else + result = count; + +@@ -233,7 +270,7 @@ + static void pl2303_set_termios (struct usb_serial_port *port, struct termios *old_termios) + { + struct usb_serial *serial = port->serial; +- struct pl2303_private *priv = usb_get_serial_port_data(port); ++ struct pl2303_private *priv = port->private; + unsigned long flags; + unsigned int cflag; + unsigned char *buf; +@@ -241,8 +278,7 @@ + int i; + u8 control; + +- dbg("%s - port %d, initialized = %d", __FUNCTION__, port->number, +- priv->termios_initialized); ++ dbg("%s - port %d", __FUNCTION__, port->number); + + if ((!port->tty) || (!port->tty->termios)) { + dbg("%s - no tty structures", __FUNCTION__); +@@ -269,7 +305,7 @@ + + buf = kmalloc (7, GFP_KERNEL); + if (!buf) { +- err("%s - out of memory.", __FUNCTION__); ++ err("%s - out of memory.\n", __FUNCTION__); + return; + } + memset (buf, 0x00, 0x07); +@@ -311,7 +347,7 @@ + case B230400: baud = 230400; break; + case B460800: baud = 460800; break; + default: +- err ("pl2303 driver does not support the baudrate requested (fix it)"); ++ err("pl2303 driver does not support the baudrate requested (fix it)\n"); + break; + } + dbg("%s - baud = %d", __FUNCTION__, baud); +@@ -380,26 +416,30 @@ + buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]); + + if (cflag & CRTSCTS) { +- i = usb_control_msg (serial->dev, usb_sndctrlpipe (serial->dev, 0), +- VENDOR_WRITE_REQUEST, VENDOR_WRITE_REQUEST_TYPE, +- 0x0, 0x41, NULL, 0, 100); +- dbg ("0x40:0x1:0x0:0x41 %d", i); ++ __u16 index; ++ if (priv->type == HX) ++ index = 0x61; ++ else ++ index = 0x41; ++ i = usb_control_msg(serial->dev, ++ usb_sndctrlpipe(serial->dev, 0), ++ VENDOR_WRITE_REQUEST, ++ VENDOR_WRITE_REQUEST_TYPE, ++ 0x0, index, NULL, 0, 100); ++ dbg ("0x40:0x1:0x0:0x%x %d", index, i); + } + + kfree (buf); +-} +- ++} + + static int pl2303_open (struct usb_serial_port *port, struct file *filp) + { + struct termios tmp_termios; + struct usb_serial *serial = port->serial; ++ struct pl2303_private *priv = port->private; + unsigned char *buf; + int result; + +- if (port_paranoia_check (port, __FUNCTION__)) +- return -ENODEV; +- + dbg("%s - port %d", __FUNCTION__, port->number); + + usb_clear_halt(serial->dev, port->write_urb->pipe); +@@ -427,6 +467,18 @@ + SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 0x0404, 1); + FISH (VENDOR_READ_REQUEST_TYPE, VENDOR_READ_REQUEST, 0x8484, 0); + FISH (VENDOR_READ_REQUEST_TYPE, VENDOR_READ_REQUEST, 0x8383, 0); ++ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 0, 1); ++ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 1, 0); ++ ++ if (priv->type == HX) { ++ /* HX chip */ ++ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 2, 0x44); ++ /* reset upstream data pipes */ ++ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 8, 0); ++ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 9, 0); ++ } else { ++ SOUP (VENDOR_WRITE_REQUEST_TYPE, VENDOR_WRITE_REQUEST, 2, 0x24); ++ } + + kfree(buf); + +@@ -441,7 +493,7 @@ + port->read_urb->dev = serial->dev; + result = usb_submit_urb (port->read_urb); + if (result) { +- err("%s - failed submitting read urb, error %d", __FUNCTION__, result); ++ err("%s - failed submitting read urb, error %d\n", __FUNCTION__, result); + pl2303_close (port, NULL); + return -EPROTO; + } +@@ -450,7 +502,7 @@ + port->interrupt_in_urb->dev = serial->dev; + result = usb_submit_urb (port->interrupt_in_urb); + if (result) { +- err("%s - failed submitting interrupt urb, error %d", __FUNCTION__, result); ++ err("%s - failed submitting interrupt urb, error %d\n", __FUNCTION__, result); + pl2303_close (port, NULL); + return -EPROTO; + } +@@ -460,125 +512,103 @@ + + static void pl2303_close (struct usb_serial_port *port, struct file *filp) + { +- struct usb_serial *serial; + struct pl2303_private *priv; + unsigned long flags; + unsigned int c_cflag; + int result; + +- if (port_paranoia_check (port, __FUNCTION__)) +- return; +- serial = get_usb_serial (port, __FUNCTION__); +- if (!serial) +- return; +- + dbg("%s - port %d", __FUNCTION__, port->number); + +- if (serial->dev) { +- if (port->tty) { +- c_cflag = port->tty->termios->c_cflag; +- if (c_cflag & HUPCL) { +- /* drop DTR and RTS */ +- priv = usb_get_serial_port_data(port); +- spin_lock_irqsave(&priv->lock, flags); +- priv->line_control = 0; +- spin_unlock_irqrestore (&priv->lock, flags); +- set_control_lines (port->serial->dev, 0); +- } +- } ++ /* shutdown our urbs */ ++ dbg("%s - shutting down urbs", __FUNCTION__); ++ result = usb_unlink_urb (port->write_urb); ++ if (result) ++ dbg("%s - usb_unlink_urb (write_urb)" ++ " failed with reason: %d", __FUNCTION__, ++ result); + +- /* shutdown our urbs */ +- dbg("%s - shutting down urbs", __FUNCTION__); +- result = usb_unlink_urb (port->write_urb); +- if (result) +- dbg("%s - usb_unlink_urb (write_urb)" +- " failed with reason: %d", __FUNCTION__, +- result); ++ result = usb_unlink_urb (port->read_urb); ++ if (result) ++ dbg("%s - usb_unlink_urb (read_urb) " ++ "failed with reason: %d", __FUNCTION__, ++ result); + +- result = usb_unlink_urb (port->read_urb); +- if (result) +- dbg("%s - usb_unlink_urb (read_urb) " +- "failed with reason: %d", __FUNCTION__, +- result); ++ result = usb_unlink_urb (port->interrupt_in_urb); ++ if (result) ++ dbg("%s - usb_unlink_urb (interrupt_in_urb)" ++ " failed with reason: %d", __FUNCTION__, ++ result); + +- result = usb_unlink_urb (port->interrupt_in_urb); +- if (result) +- dbg("%s - usb_unlink_urb (interrupt_in_urb)" +- " failed with reason: %d", __FUNCTION__, +- result); ++ if (port->tty) { ++ c_cflag = port->tty->termios->c_cflag; ++ if (c_cflag & HUPCL) { ++ /* drop DTR and RTS */ ++ priv = port->private; ++ spin_lock_irqsave(&priv->lock, flags); ++ priv->line_control = 0; ++ spin_unlock_irqrestore (&priv->lock, flags); ++ set_control_lines (port->serial->dev, 0); ++ } + } ++ + } + ++/* taken from 2.4.20 driver */ + static int set_modem_info (struct usb_serial_port *port, unsigned int cmd, unsigned int *value) + { +- struct pl2303_private *priv = usb_get_serial_port_data(port); +- unsigned long flags; +- unsigned int arg; +- u8 control; +- +- if (copy_from_user(&arg, value, sizeof(int))) +- return -EFAULT; +- +- spin_lock_irqsave (&priv->lock, flags); +- switch (cmd) { +- case TIOCMBIS: +- if (arg & TIOCM_RTS) +- priv->line_control |= CONTROL_RTS; +- if (arg & TIOCM_DTR) +- priv->line_control |= CONTROL_DTR; +- break; +- +- case TIOCMBIC: +- if (arg & TIOCM_RTS) +- priv->line_control &= ~CONTROL_RTS; +- if (arg & TIOCM_DTR) +- priv->line_control &= ~CONTROL_DTR; +- break; ++ struct pl2303_private *priv = port->private; ++ unsigned int arg; + +- case TIOCMSET: +- /* turn off RTS and DTR and then only turn +- on what was asked to */ +- priv->line_control &= ~(CONTROL_RTS | CONTROL_DTR); +- priv->line_control |= ((arg & TIOCM_RTS) ? CONTROL_RTS : 0); +- priv->line_control |= ((arg & TIOCM_DTR) ? CONTROL_DTR : 0); +- break; +- } +- control = priv->line_control; +- spin_unlock_irqrestore (&priv->lock, flags); +- +- return set_control_lines (port->serial->dev, control); ++ if (copy_from_user(&arg, value, sizeof(int))) ++ return -EFAULT; ++ ++ switch (cmd) { ++ case TIOCMBIS: ++ if (arg & TIOCM_RTS) ++ priv->line_control |= CONTROL_RTS; ++ if (arg & TIOCM_DTR) ++ priv->line_control |= CONTROL_DTR; ++ break; ++ ++ case TIOCMBIC: ++ if (arg & TIOCM_RTS) ++ priv->line_control &= ~CONTROL_RTS; ++ if (arg & TIOCM_DTR) ++ priv->line_control &= ~CONTROL_DTR; ++ break; ++ ++ case TIOCMSET: ++ /* turn off RTS and DTR and then only turn ++ on what was asked to */ ++ priv->line_control &= ~(CONTROL_RTS | CONTROL_DTR); ++ priv->line_control |= ((arg & TIOCM_RTS) ? CONTROL_RTS : 0); ++ priv->line_control |= ((arg & TIOCM_DTR) ? CONTROL_DTR : 0); ++ break; ++ } ++ ++ return set_control_lines (port->serial->dev, priv->line_control); + } + + static int get_modem_info (struct usb_serial_port *port, unsigned int *value) + { +- struct pl2303_private *priv = usb_get_serial_port_data(port); +- unsigned long flags; +- unsigned int mcr; +- unsigned int status; +- unsigned int result; +- +- spin_lock_irqsave (&priv->lock, flags); +- mcr = priv->line_control; +- status = priv->line_status; +- spin_unlock_irqrestore (&priv->lock, flags); +- +- result = ((mcr & CONTROL_DTR) ? TIOCM_DTR : 0) +- | ((mcr & CONTROL_RTS) ? TIOCM_RTS : 0) +- | ((status & UART_CTS) ? TIOCM_CTS : 0) +- | ((status & UART_DSR) ? TIOCM_DSR : 0) +- | ((status & UART_RING) ? TIOCM_RI : 0) +- | ((status & UART_DCD) ? TIOCM_CD : 0); +- +- dbg("%s - result = %x", __FUNCTION__, result); +- +- if (copy_to_user(value, &result, sizeof(int))) +- return -EFAULT; +- return 0; ++ struct pl2303_private *priv = port->private; ++ unsigned int mcr = priv->line_control; ++ unsigned int result; ++ ++ result = ((mcr & CONTROL_DTR) ? TIOCM_DTR : 0) ++ | ((mcr & CONTROL_RTS) ? TIOCM_RTS : 0); ++ ++ dbg("%s - result = %x", __FUNCTION__, result); ++ ++ if (copy_to_user(value, &result, sizeof(int))) ++ return -EFAULT; ++ return 0; + } ++/* end of 2.4.20 kernel part - grsch */ + + static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) + { +- struct pl2303_private *priv = usb_get_serial_port_data(port); ++ struct pl2303_private *priv = port->private; + unsigned long flags; + unsigned int prevstatus; + unsigned int status; +@@ -617,21 +647,10 @@ + dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd); + + switch (cmd) { +- +- case TIOCMGET: +- dbg("%s (%d) TIOCMGET", __FUNCTION__, port->number); +- return get_modem_info (port, (unsigned int *)arg); +- +- case TIOCMBIS: +- case TIOCMBIC: +- case TIOCMSET: +- dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET", __FUNCTION__, port->number); +- return set_modem_info(port, cmd, (unsigned int *) arg); +- + case TIOCMIWAIT: + dbg("%s (%d) TIOCMIWAIT", __FUNCTION__, port->number); + return wait_modem_info(port, arg); +- ++ + default: + dbg("%s not supported = 0x%04x", __FUNCTION__, cmd); + break; +@@ -652,7 +671,7 @@ + state = BREAK_OFF; + else + state = BREAK_ON; +- dbg("%s - turning break %s", __FUNCTION__, state==BREAK_OFF ? "off" : "on"); ++ dbg("%s - turning break %s", state==BREAK_OFF ? "off" : "on", __FUNCTION__); + + result = usb_control_msg (serial->dev, usb_sndctrlpipe (serial->dev, 0), + BREAK_REQUEST, BREAK_REQUEST_TYPE, state, +@@ -669,8 +688,8 @@ + dbg("%s", __FUNCTION__); + + for (i = 0; i < serial->num_ports; ++i) { +- kfree (usb_get_serial_port_data(&serial->port[i])); +- usb_set_serial_port_data(&serial->port[i], NULL); ++ kfree (serial->port[i].private); ++ serial->port[i].private = NULL; + } + } + +@@ -678,16 +697,14 @@ + static void pl2303_read_int_callback (struct urb *urb) + { + struct usb_serial_port *port = (struct usb_serial_port *) urb->context; +- struct usb_serial *serial = get_usb_serial (port, __FUNCTION__); +- struct pl2303_private *priv = usb_get_serial_port_data(port); ++ struct pl2303_private *priv = port->private; + unsigned char *data = urb->transfer_buffer; + unsigned long flags; ++ int status; + u8 uart_state; + + dbg("%s (%d)", __FUNCTION__, port->number); + +- /* ints auto restart... */ +- + switch (urb->status) { + case 0: + /* success */ +@@ -700,17 +717,14 @@ + return; + default: + dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); +- return; ++ goto exit; + } + +- if (!serial) { +- return; +- } + +- usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, urb->transfer_buffer); ++ usb_serial_debug_data(__FILE__, __FUNCTION__, urb->actual_length, urb->transfer_buffer); + + if (urb->actual_length < UART_STATE) +- return; ++ goto exit; + + /* Save off the uart status for others to look at */ + uart_state = data[UART_STATE]; +@@ -718,17 +732,19 @@ + uart_state |= (priv->line_status & UART_STATE_TRANSIENT_MASK); + priv->line_status = uart_state; + spin_unlock_irqrestore(&priv->lock, flags); +- wake_up_interruptible (&priv->delta_msr_wait); +- +- return; ++ ++exit: ++ status = usb_submit_urb (urb); ++ if (status) ++ err("%s - usb_submit_urb failed with result %d\n", ++ __FUNCTION__, status); + } + + + static void pl2303_read_bulk_callback (struct urb *urb) + { + struct usb_serial_port *port = (struct usb_serial_port *) urb->context; +- struct usb_serial *serial = get_usb_serial (port, __FUNCTION__); +- struct pl2303_private *priv = usb_get_serial_port_data(port); ++ struct pl2303_private *priv = port->private; + struct tty_struct *tty; + unsigned char *data = urb->transfer_buffer; + unsigned long flags; +@@ -737,16 +753,8 @@ + u8 status; + char tty_flag; + +- if (port_paranoia_check (port, __FUNCTION__)) +- return; +- + dbg("%s - port %d", __FUNCTION__, port->number); + +- if (!serial) { +- dbg("%s - bad serial pointer, exiting", __FUNCTION__); +- return; +- } +- + if (urb->status) { + dbg("%s - urb->status = %d", __FUNCTION__, urb->status); + if (!port->open_count) { +@@ -757,17 +765,17 @@ + /* PL2303 mysteriously fails with -EPROTO reschedule the read */ + dbg("%s - caught -EPROTO, resubmitting the urb", __FUNCTION__); + urb->status = 0; +- urb->dev = serial->dev; ++ urb->dev = port->serial->dev; + result = usb_submit_urb(urb); + if (result) +- err("%s - failed resubmitting read urb, error %d", __FUNCTION__, result); ++ err("%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result); + return; + } + dbg("%s - unable to handle the error, exiting.", __FUNCTION__); + return; + } + +- usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, data); ++ usb_serial_debug_data(__FILE__, __FUNCTION__, urb->actual_length, data); + + /* get tty_flag from status */ + tty_flag = TTY_NORMAL; +@@ -776,7 +784,7 @@ + status = priv->line_status; + priv->line_status &= ~UART_STATE_TRANSIENT_MASK; + spin_unlock_irqrestore(&priv->lock, flags); +- wake_up_interruptible (&priv->delta_msr_wait); //AF from 2.6 ++ wake_up_interruptible (&priv->delta_msr_wait); + + /* break takes precedence over parity, */ + /* which takes precedence over framing errors */ +@@ -805,10 +813,10 @@ + + /* Schedule the next read _if_ we are still open */ + if (port->open_count) { +- urb->dev = serial->dev; ++ urb->dev = port->serial->dev; + result = usb_submit_urb(urb); + if (result) +- err("%s - failed resubmitting read urb, error %d", __FUNCTION__, result); ++ err("%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result); + } + + return; +@@ -821,44 +829,32 @@ + struct usb_serial_port *port = (struct usb_serial_port *) urb->context; + int result; + +- if (port_paranoia_check (port, __FUNCTION__)) +- return; +- + dbg("%s - port %d", __FUNCTION__, port->number); + + if (urb->status) { + /* error in the urb, so we have to resubmit it */ +- if (serial_paranoia_check (port->serial, __FUNCTION__)) { +- return; +- } + dbg("%s - Overflow in write", __FUNCTION__); + dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); + port->write_urb->transfer_buffer_length = 1; + port->write_urb->dev = port->serial->dev; + result = usb_submit_urb (port->write_urb); + if (result) +- err("%s - failed resubmitting write urb, error %d", __FUNCTION__, result); ++ err("%s - failed resubmitting write urb, error %d\n", __FUNCTION__, result); + + return; + } + +- queue_task(&port->tqueue, &tq_immediate); +- mark_bh(IMMEDIATE_BH); + +- return; ++ queue_task(&port->tqueue, &tq_immediate); ++ mark_bh(IMMEDIATE_BH); + } + + + static int __init pl2303_init (void) + { +- int retval; +- retval = usb_serial_register(&pl2303_device); +- if (retval) +- goto failed_usb_serial_register; ++ usb_serial_register(&pl2303_device); + info(DRIVER_DESC " " DRIVER_VERSION); + return 0; +-failed_usb_serial_register: +- return retval; + } + + +@@ -877,3 +873,4 @@ + MODULE_PARM(debug, "i"); + MODULE_PARM_DESC(debug, "Debug enabled or not"); + ++//this is an error +diff -rNu linux-2.4.29.old/drivers/usb/serial/pl2303.h linux-2.4.29/drivers/usb/serial/pl2303.h +--- linux-2.4.29.old/drivers/usb/serial/pl2303.h 2005-03-22 14:48:04.000000000 +0100 ++++ linux-2.4.29/drivers/usb/serial/pl2303.h 2005-03-22 15:33:05.758939856 +0100 +@@ -41,3 +41,12 @@ + + #define SITECOM_VENDOR_ID 0x6189 + #define SITECOM_PRODUCT_ID 0x2068 ++ ++/* Alcatel OT535/735 USB cable */ ++#define ALCATEL_VENDOR_ID 0x11f7 ++#define ALCATEL_PRODUCT_ID 0x02df ++ ++/* Samsung I330 phone cradle */ ++#define SAMSUNG_VENDOR_ID 0x04e8 ++#define SAMSUNG_PRODUCT_ID 0x8001 ++ diff --git a/recipes/linux/linux-wrt-2.4.30/403-netdev_random_core.patch b/recipes/linux/linux-wrt-2.4.30/403-netdev_random_core.patch new file mode 100644 index 0000000000..784b65e41c --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/403-netdev_random_core.patch @@ -0,0 +1,296 @@ +diff -urN linux-2.4.26-pre5/Documentation/Configure.help linux-2.4.26-pre5-netdev-core/Documentation/Configure.help +--- linux-2.4.26-pre5/Documentation/Configure.help Sat Mar 20 10:08:18 2004 ++++ linux-2.4.26-pre5-netdev-core/Documentation/Configure.help Sun Mar 21 10:16:14 2004 +@@ -10419,6 +10419,20 @@ + + If you don't know what to use this for, you don't need it. + ++Allow Net Devices to contribute to /dev/random ++CONFIG_NET_RANDOM ++ If you say Y here, network device interrupts will contribute to the ++ kernel entropy pool. Normally, block devices and some other devices ++ feed the pool. Some systems, such as those that are headless or diskless, ++ need additional entropy sources. Some people, however, feel that network ++ devices should not contribute to /dev/random because an external attacker ++ could observe incoming packets in an attempt to learn the entropy pool's ++ state. If you say N, no network device will contribute entropy. ++ ++ If you believe there is a chance of your network packets being observed ++ and you doubt the security of the entropy pool's one-way hash, do not ++ enable this. If unsure, say N. ++ + Ethertap network tap (OBSOLETE) + CONFIG_ETHERTAP + If you say Y here (and have said Y to "Kernel/User network link +diff -urN linux-2.4.26-pre5/drivers/net/Config.in linux-2.4.26-pre5-netdev-core/drivers/net/Config.in +--- linux-2.4.26-pre5/drivers/net/Config.in Sat Mar 20 10:08:18 2004 ++++ linux-2.4.26-pre5-netdev-core/drivers/net/Config.in Sun Mar 21 10:16:14 2004 +@@ -8,6 +8,7 @@ + tristate 'Bonding driver support' CONFIG_BONDING + tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER + tristate 'Universal TUN/TAP device driver support' CONFIG_TUN ++bool 'Allow Net Devices to contribute to /dev/random' CONFIG_NET_RANDOM + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP + fi +diff -urN linux-2.4.26-pre5/include/asm-alpha/signal.h linux-2.4.26-pre5-netdev-core/include/asm-alpha/signal.h +--- linux-2.4.26-pre5/include/asm-alpha/signal.h Sat Dec 1 18:27:14 2001 ++++ linux-2.4.26-pre5-netdev-core/include/asm-alpha/signal.h Sun Mar 21 10:16:14 2004 +@@ -121,7 +121,14 @@ + #define SA_PROBE SA_ONESHOT + #define SA_SAMPLE_RANDOM SA_RESTART + #define SA_SHIRQ 0x40000000 ++ ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 + #endif ++ ++#endif /* __KERNEL__ */ + + #define SIG_BLOCK 1 /* for blocking signals */ + #define SIG_UNBLOCK 2 /* for unblocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-arm/signal.h linux-2.4.26-pre5-netdev-core/include/asm-arm/signal.h +--- linux-2.4.26-pre5/include/asm-arm/signal.h Sat Sep 13 07:57:29 2003 ++++ linux-2.4.26-pre5-netdev-core/include/asm-arm/signal.h Sun Mar 21 10:16:14 2004 +@@ -125,7 +125,14 @@ + #define SA_PROBE 0x80000000 + #define SA_SAMPLE_RANDOM 0x10000000 + #define SA_SHIRQ 0x04000000 ++ ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 + #endif ++ ++#endif /* __KERNEL__ */ + + #define SIG_BLOCK 0 /* for blocking signals */ + #define SIG_UNBLOCK 1 /* for unblocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-cris/signal.h linux-2.4.26-pre5-netdev-core/include/asm-cris/signal.h +--- linux-2.4.26-pre5/include/asm-cris/signal.h Sat Dec 1 18:27:14 2001 ++++ linux-2.4.26-pre5-netdev-core/include/asm-cris/signal.h Sun Mar 21 10:16:14 2004 +@@ -120,7 +120,14 @@ + #define SA_PROBE SA_ONESHOT + #define SA_SAMPLE_RANDOM SA_RESTART + #define SA_SHIRQ 0x04000000 ++ ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 + #endif ++ ++#endif /* __KERNEL__ */ + + #define SIG_BLOCK 0 /* for blocking signals */ + #define SIG_UNBLOCK 1 /* for unblocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-i386/signal.h linux-2.4.26-pre5-netdev-core/include/asm-i386/signal.h +--- linux-2.4.26-pre5/include/asm-i386/signal.h Sun Mar 21 00:00:43 2004 ++++ linux-2.4.26-pre5-netdev-core/include/asm-i386/signal.h Sun Mar 21 10:16:14 2004 +@@ -119,7 +119,14 @@ + #define SA_PROBE SA_ONESHOT + #define SA_SAMPLE_RANDOM SA_RESTART + #define SA_SHIRQ 0x04000000 ++ ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 + #endif ++ ++#endif /* __KERNEL__ */ + + #define SIG_BLOCK 0 /* for blocking signals */ + #define SIG_UNBLOCK 1 /* for unblocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-ia64/signal.h linux-2.4.26-pre5-netdev-core/include/asm-ia64/signal.h +--- linux-2.4.26-pre5/include/asm-ia64/signal.h Sat Mar 20 10:08:20 2004 ++++ linux-2.4.26-pre5-netdev-core/include/asm-ia64/signal.h Sun Mar 21 10:16:14 2004 +@@ -117,6 +117,12 @@ + #define SA_SHIRQ 0x04000000 + #define SA_PERCPU_IRQ 0x02000000 + ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 ++#endif ++ + #endif /* __KERNEL__ */ + + #define SIG_BLOCK 0 /* for blocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-m68k/signal.h linux-2.4.26-pre5-netdev-core/include/asm-m68k/signal.h +--- linux-2.4.26-pre5/include/asm-m68k/signal.h Fri Feb 20 07:38:33 2004 ++++ linux-2.4.26-pre5-netdev-core/include/asm-m68k/signal.h Sun Mar 21 10:16:14 2004 +@@ -116,7 +116,14 @@ + #define SA_PROBE SA_ONESHOT + #define SA_SAMPLE_RANDOM SA_RESTART + #define SA_SHIRQ 0x04000000 ++ ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 + #endif ++ ++#endif /* __KERNEL__ */ + + #define SIG_BLOCK 0 /* for blocking signals */ + #define SIG_UNBLOCK 1 /* for unblocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-mips/signal.h linux-2.4.26-pre5-netdev-core/include/asm-mips/signal.h +--- linux-2.4.26-pre5/include/asm-mips/signal.h Sat Sep 13 07:57:31 2003 ++++ linux-2.4.26-pre5-netdev-core/include/asm-mips/signal.h Sun Mar 21 10:16:14 2004 +@@ -111,6 +111,12 @@ + #define SA_SAMPLE_RANDOM SA_RESTART + #define SA_SHIRQ 0x02000000 + ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 ++#endif ++ + #endif /* __KERNEL__ */ + + #define SIG_BLOCK 1 /* for blocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-mips64/signal.h linux-2.4.26-pre5-netdev-core/include/asm-mips64/signal.h +--- linux-2.4.26-pre5/include/asm-mips64/signal.h Sat Sep 13 07:57:32 2003 ++++ linux-2.4.26-pre5-netdev-core/include/asm-mips64/signal.h Sun Mar 21 10:16:14 2004 +@@ -119,6 +119,12 @@ + #define SA_SAMPLE_RANDOM SA_RESTART + #define SA_SHIRQ 0x02000000 + ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 ++#endif ++ + #endif /* __KERNEL__ */ + + #define SIG_BLOCK 1 /* for blocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-parisc/signal.h linux-2.4.26-pre5-netdev-core/include/asm-parisc/signal.h +--- linux-2.4.26-pre5/include/asm-parisc/signal.h Sun Jan 11 18:48:21 2004 ++++ linux-2.4.26-pre5-netdev-core/include/asm-parisc/signal.h Sun Mar 21 10:16:14 2004 +@@ -100,6 +100,12 @@ + #define SA_SAMPLE_RANDOM SA_RESTART + #define SA_SHIRQ 0x04000000 + ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 ++#endif ++ + #endif /* __KERNEL__ */ + + #define SIG_BLOCK 0 /* for blocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-ppc/signal.h linux-2.4.26-pre5-netdev-core/include/asm-ppc/signal.h +--- linux-2.4.26-pre5/include/asm-ppc/signal.h Sat Sep 13 07:57:32 2003 ++++ linux-2.4.26-pre5-netdev-core/include/asm-ppc/signal.h Sun Mar 21 10:16:14 2004 +@@ -111,6 +111,13 @@ + #define SA_PROBE SA_ONESHOT + #define SA_SAMPLE_RANDOM SA_RESTART + #define SA_SHIRQ 0x04000000 ++ ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 ++#endif ++ + #endif /* __KERNEL__ */ + + #define SIG_BLOCK 0 /* for blocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-s390/signal.h linux-2.4.26-pre5-netdev-core/include/asm-s390/signal.h +--- linux-2.4.26-pre5/include/asm-s390/signal.h Fri Feb 20 07:38:34 2004 ++++ linux-2.4.26-pre5-netdev-core/include/asm-s390/signal.h Sun Mar 21 10:16:14 2004 +@@ -129,7 +129,14 @@ + #define SA_SHIRQ 0x04000000 + #define SA_DOPATHGROUP 0x00100000 + #define SA_FORCE 0x00200000 ++ ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 + #endif ++ ++#endif /* __KERNEL__ */ + + #define SIG_BLOCK 0 /* for blocking signals */ + #define SIG_UNBLOCK 1 /* for unblocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-s390x/signal.h linux-2.4.26-pre5-netdev-core/include/asm-s390x/signal.h +--- linux-2.4.26-pre5/include/asm-s390x/signal.h Fri Feb 20 07:38:34 2004 ++++ linux-2.4.26-pre5-netdev-core/include/asm-s390x/signal.h Sun Mar 21 10:16:14 2004 +@@ -129,7 +129,14 @@ + #define SA_SHIRQ 0x04000000 + #define SA_DOPATHGROUP 0x00100000 + #define SA_FORCE 0x00200000 ++ ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 + #endif ++ ++#endif /* __KERNEL__ */ + + #define SIG_BLOCK 0 /* for blocking signals */ + #define SIG_UNBLOCK 1 /* for unblocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-sh/signal.h linux-2.4.26-pre5-netdev-core/include/asm-sh/signal.h +--- linux-2.4.26-pre5/include/asm-sh/signal.h Sat Dec 1 18:27:13 2001 ++++ linux-2.4.26-pre5-netdev-core/include/asm-sh/signal.h Sun Mar 21 10:16:14 2004 +@@ -107,7 +107,14 @@ + #define SA_PROBE SA_ONESHOT + #define SA_SAMPLE_RANDOM SA_RESTART + #define SA_SHIRQ 0x04000000 ++ ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 + #endif ++ ++#endif /* __KERNEL__ */ + + #define SIG_BLOCK 0 /* for blocking signals */ + #define SIG_UNBLOCK 1 /* for unblocking signals */ +diff -urN linux-2.4.26-pre5/include/asm-sparc/signal.h linux-2.4.26-pre5-netdev-core/include/asm-sparc/signal.h +--- linux-2.4.26-pre5/include/asm-sparc/signal.h Sat Dec 1 18:27:14 2001 ++++ linux-2.4.26-pre5-netdev-core/include/asm-sparc/signal.h Sun Mar 21 10:16:14 2004 +@@ -176,7 +176,14 @@ + #define SA_PROBE SA_ONESHOT + #define SA_SAMPLE_RANDOM SA_RESTART + #define SA_STATIC_ALLOC 0x80 ++ ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 + #endif ++ ++#endif /* __KERNEL__ */ + + /* Type of a signal handler. */ + #ifdef __KERNEL__ +diff -urN linux-2.4.26-pre5/include/asm-sparc64/signal.h linux-2.4.26-pre5-netdev-core/include/asm-sparc64/signal.h +--- linux-2.4.26-pre5/include/asm-sparc64/signal.h Sat Dec 1 18:27:14 2001 ++++ linux-2.4.26-pre5-netdev-core/include/asm-sparc64/signal.h Sun Mar 21 10:16:14 2004 +@@ -192,7 +192,14 @@ + #define SA_PROBE SA_ONESHOT + #define SA_SAMPLE_RANDOM SA_RESTART + #define SA_STATIC_ALLOC 0x80 ++ ++#ifdef CONFIG_NET_RANDOM ++#define SA_NET_RANDOM SA_SAMPLE_RANDOM ++#else ++#define SA_NET_RANDOM 0 + #endif ++ ++#endif /* __KERNEL__ */ + + /* Type of a signal handler. */ + #ifdef __KERNEL__ diff --git a/recipes/linux/linux-wrt-2.4.30/404-netdev_random_et.patch b/recipes/linux/linux-wrt-2.4.30/404-netdev_random_et.patch new file mode 100644 index 0000000000..e14a43c354 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/404-netdev_random_et.patch @@ -0,0 +1,11 @@ +--- linux-2.4.30.old/drivers/net/et/et_linux.c 2005-05-05 02:53:35.000000000 +0200 ++++ linux-2.4.30/drivers/net/et/et_linux.c 2005-05-05 02:54:01.000000000 +0200 +@@ -192,7 +192,7 @@ + #endif + + /* register our interrupt handler */ +- if (request_irq(pdev->irq, et_isr, SA_SHIRQ, dev->name, et)) { ++ if (request_irq(pdev->irq, et_isr, SA_SHIRQ | SA_NET_RANDOM, dev->name, et)) { + ET_ERROR(("et%d: request_irq() failed\n", unit)); + goto fail; + } diff --git a/recipes/linux/linux-wrt-2.4.30/600-linux-squashfs-lzma b/recipes/linux/linux-wrt-2.4.30/600-linux-squashfs-lzma new file mode 100644 index 0000000000..570dce99b7 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/600-linux-squashfs-lzma @@ -0,0 +1,887 @@ +This patch adds LZMA support to the squashfs code, you should also +change mksquashfs appropriately. + +Oleg I. Vdovikin <oleg@cs.msu.su> + +--- linuz/fs/squashfs/inode.c 2004-12-15 22:56:47.000000000 +0300 ++++ linux/fs/squashfs/inode.c 2005-01-20 20:27:27.490010968 +0300 +@@ -3,6 +3,9 @@ + * + * Copyright (c) 2002, 2003, 2004 Phillip Lougher <plougher@users.sourceforge.net> + * ++ * LZMA decompressor support added by Oleg I. Vdovikin ++ * Copyright (c) 2005 Oleg I.Vdovikin <oleg@cs.msu.su> ++ * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2, +@@ -21,7 +24,11 @@ + * inode.c + */ + ++#define SQUASHFS_LZMA ++ ++#ifndef SQUASHFS_LZMA + #define SQUASHFS_1_0_COMPATIBILITY ++#endif + + #include <linux/types.h> + #include <linux/squashfs_fs.h> +@@ -39,6 +46,19 @@ + #include <linux/blkdev.h> + #include <linux/vmalloc.h> + ++#ifdef SQUASHFS_LZMA ++#include "LzmaDecode.h" ++ ++/* default LZMA settings, should be in sync with mksquashfs */ ++#define LZMA_LC 3 ++#define LZMA_LP 0 ++#define LZMA_PB 2 ++ ++#define LZMA_WORKSPACE_SIZE ((LZMA_BASE_SIZE + \ ++ (LZMA_LIT_SIZE << (LZMA_LC + LZMA_LP))) * sizeof(CProb)) ++ ++#endif ++ + #ifdef SQUASHFS_TRACE + #define TRACE(s, args...) printk(KERN_NOTICE "SQUASHFS: "s, ## args) + #else +@@ -77,7 +97,11 @@ + + DECLARE_MUTEX(read_data_mutex); + ++#ifdef SQUASHFS_LZMA ++static unsigned char lzma_workspace[LZMA_WORKSPACE_SIZE]; ++#else + static z_stream stream; ++#endif + + static DECLARE_FSTYPE_DEV(squashfs_fs_type, "squashfs", squashfs_read_super); + +@@ -232,6 +256,15 @@ + if(compressed) { + int zlib_err; + ++#ifdef SQUASHFS_LZMA ++ if ((zlib_err = LzmaDecode(lzma_workspace, ++ LZMA_WORKSPACE_SIZE, LZMA_LC, LZMA_LP, LZMA_PB, ++ c_buffer, c_byte, buffer, msBlk->read_size, &bytes)) != LZMA_RESULT_OK) ++ { ++ ERROR("lzma returned unexpected result 0x%x\n", zlib_err); ++ bytes = 0; ++ } ++#else + stream.next_in = c_buffer; + stream.avail_in = c_byte; + stream.next_out = buffer; +@@ -243,6 +276,7 @@ + bytes = 0; + } else + bytes = stream.total_out; ++#endif + up(&read_data_mutex); + } + +@@ -1491,17 +1525,21 @@ + static int __init init_squashfs_fs(void) + { + ++#ifndef SQUASHFS_LZMA + if(!(stream.workspace = (char *) vmalloc(zlib_inflate_workspacesize()))) { + ERROR("Failed to allocate zlib workspace\n"); + return -ENOMEM; + } ++#endif + return register_filesystem(&squashfs_fs_type); + } + + + static void __exit exit_squashfs_fs(void) + { ++#ifndef SQUASHFS_LZMA + vfree(stream.workspace); ++#endif + unregister_filesystem(&squashfs_fs_type); + } + +--- linuz/fs/squashfs/LzmaDecode.c 1970-01-01 03:00:00.000000000 +0300 ++++ linux/fs/squashfs/LzmaDecode.c 2005-01-20 19:40:35.400513552 +0300 +@@ -0,0 +1,663 @@ ++/* ++ LzmaDecode.c ++ LZMA Decoder ++ ++ LZMA SDK 4.05 Copyright (c) 1999-2004 Igor Pavlov (2004-08-25) ++ http://www.7-zip.org/ ++ ++ LZMA SDK is licensed under two licenses: ++ 1) GNU Lesser General Public License (GNU LGPL) ++ 2) Common Public License (CPL) ++ It means that you can select one of these two licenses and ++ follow rules of that license. ++ ++ SPECIAL EXCEPTION: ++ Igor Pavlov, as the author of this code, expressly permits you to ++ statically or dynamically link your code (or bind by name) to the ++ interfaces of this file without subjecting your linked code to the ++ terms of the CPL or GNU LGPL. Any modifications or additions ++ to this file, however, are subject to the LGPL or CPL terms. ++*/ ++ ++#include "LzmaDecode.h" ++ ++#ifndef Byte ++#define Byte unsigned char ++#endif ++ ++#define kNumTopBits 24 ++#define kTopValue ((UInt32)1 << kNumTopBits) ++ ++#define kNumBitModelTotalBits 11 ++#define kBitModelTotal (1 << kNumBitModelTotalBits) ++#define kNumMoveBits 5 ++ ++typedef struct _CRangeDecoder ++{ ++ Byte *Buffer; ++ Byte *BufferLim; ++ UInt32 Range; ++ UInt32 Code; ++ #ifdef _LZMA_IN_CB ++ ILzmaInCallback *InCallback; ++ int Result; ++ #endif ++ int ExtraBytes; ++} CRangeDecoder; ++ ++Byte RangeDecoderReadByte(CRangeDecoder *rd) ++{ ++ if (rd->Buffer == rd->BufferLim) ++ { ++ #ifdef _LZMA_IN_CB ++ UInt32 size; ++ rd->Result = rd->InCallback->Read(rd->InCallback, &rd->Buffer, &size); ++ rd->BufferLim = rd->Buffer + size; ++ if (size == 0) ++ #endif ++ { ++ rd->ExtraBytes = 1; ++ return 0xFF; ++ } ++ } ++ return (*rd->Buffer++); ++} ++ ++/* #define ReadByte (*rd->Buffer++) */ ++#define ReadByte (RangeDecoderReadByte(rd)) ++ ++void RangeDecoderInit(CRangeDecoder *rd, ++ #ifdef _LZMA_IN_CB ++ ILzmaInCallback *inCallback ++ #else ++ Byte *stream, UInt32 bufferSize ++ #endif ++ ) ++{ ++ int i; ++ #ifdef _LZMA_IN_CB ++ rd->InCallback = inCallback; ++ rd->Buffer = rd->BufferLim = 0; ++ #else ++ rd->Buffer = stream; ++ rd->BufferLim = stream + bufferSize; ++ #endif ++ rd->ExtraBytes = 0; ++ rd->Code = 0; ++ rd->Range = (0xFFFFFFFF); ++ for(i = 0; i < 5; i++) ++ rd->Code = (rd->Code << 8) | ReadByte; ++} ++ ++#define RC_INIT_VAR UInt32 range = rd->Range; UInt32 code = rd->Code; ++#define RC_FLUSH_VAR rd->Range = range; rd->Code = code; ++#define RC_NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | ReadByte; } ++ ++UInt32 RangeDecoderDecodeDirectBits(CRangeDecoder *rd, int numTotalBits) ++{ ++ RC_INIT_VAR ++ UInt32 result = 0; ++ int i; ++ for (i = numTotalBits; i > 0; i--) ++ { ++ /* UInt32 t; */ ++ range >>= 1; ++ ++ result <<= 1; ++ if (code >= range) ++ { ++ code -= range; ++ result |= 1; ++ } ++ /* ++ t = (code - range) >> 31; ++ t &= 1; ++ code -= range & (t - 1); ++ result = (result + result) | (1 - t); ++ */ ++ RC_NORMALIZE ++ } ++ RC_FLUSH_VAR ++ return result; ++} ++ ++int RangeDecoderBitDecode(CProb *prob, CRangeDecoder *rd) ++{ ++ UInt32 bound = (rd->Range >> kNumBitModelTotalBits) * *prob; ++ if (rd->Code < bound) ++ { ++ rd->Range = bound; ++ *prob += (kBitModelTotal - *prob) >> kNumMoveBits; ++ if (rd->Range < kTopValue) ++ { ++ rd->Code = (rd->Code << 8) | ReadByte; ++ rd->Range <<= 8; ++ } ++ return 0; ++ } ++ else ++ { ++ rd->Range -= bound; ++ rd->Code -= bound; ++ *prob -= (*prob) >> kNumMoveBits; ++ if (rd->Range < kTopValue) ++ { ++ rd->Code = (rd->Code << 8) | ReadByte; ++ rd->Range <<= 8; ++ } ++ return 1; ++ } ++} ++ ++#define RC_GET_BIT2(prob, mi, A0, A1) \ ++ UInt32 bound = (range >> kNumBitModelTotalBits) * *prob; \ ++ if (code < bound) \ ++ { A0; range = bound; *prob += (kBitModelTotal - *prob) >> kNumMoveBits; mi <<= 1; } \ ++ else \ ++ { A1; range -= bound; code -= bound; *prob -= (*prob) >> kNumMoveBits; mi = (mi + mi) + 1; } \ ++ RC_NORMALIZE ++ ++#define RC_GET_BIT(prob, mi) RC_GET_BIT2(prob, mi, ; , ;) ++ ++int RangeDecoderBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd) ++{ ++ int mi = 1; ++ int i; ++ #ifdef _LZMA_LOC_OPT ++ RC_INIT_VAR ++ #endif ++ for(i = numLevels; i > 0; i--) ++ { ++ #ifdef _LZMA_LOC_OPT ++ CProb *prob = probs + mi; ++ RC_GET_BIT(prob, mi) ++ #else ++ mi = (mi + mi) + RangeDecoderBitDecode(probs + mi, rd); ++ #endif ++ } ++ #ifdef _LZMA_LOC_OPT ++ RC_FLUSH_VAR ++ #endif ++ return mi - (1 << numLevels); ++} ++ ++int RangeDecoderReverseBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd) ++{ ++ int mi = 1; ++ int i; ++ int symbol = 0; ++ #ifdef _LZMA_LOC_OPT ++ RC_INIT_VAR ++ #endif ++ for(i = 0; i < numLevels; i++) ++ { ++ #ifdef _LZMA_LOC_OPT ++ CProb *prob = probs + mi; ++ RC_GET_BIT2(prob, mi, ; , symbol |= (1 << i)) ++ #else ++ int bit = RangeDecoderBitDecode(probs + mi, rd); ++ mi = mi + mi + bit; ++ symbol |= (bit << i); ++ #endif ++ } ++ #ifdef _LZMA_LOC_OPT ++ RC_FLUSH_VAR ++ #endif ++ return symbol; ++} ++ ++Byte LzmaLiteralDecode(CProb *probs, CRangeDecoder *rd) ++{ ++ int symbol = 1; ++ #ifdef _LZMA_LOC_OPT ++ RC_INIT_VAR ++ #endif ++ do ++ { ++ #ifdef _LZMA_LOC_OPT ++ CProb *prob = probs + symbol; ++ RC_GET_BIT(prob, symbol) ++ #else ++ symbol = (symbol + symbol) | RangeDecoderBitDecode(probs + symbol, rd); ++ #endif ++ } ++ while (symbol < 0x100); ++ #ifdef _LZMA_LOC_OPT ++ RC_FLUSH_VAR ++ #endif ++ return symbol; ++} ++ ++Byte LzmaLiteralDecodeMatch(CProb *probs, CRangeDecoder *rd, Byte matchByte) ++{ ++ int symbol = 1; ++ #ifdef _LZMA_LOC_OPT ++ RC_INIT_VAR ++ #endif ++ do ++ { ++ int bit; ++ int matchBit = (matchByte >> 7) & 1; ++ matchByte <<= 1; ++ #ifdef _LZMA_LOC_OPT ++ { ++ CProb *prob = probs + ((1 + matchBit) << 8) + symbol; ++ RC_GET_BIT2(prob, symbol, bit = 0, bit = 1) ++ } ++ #else ++ bit = RangeDecoderBitDecode(probs + ((1 + matchBit) << 8) + symbol, rd); ++ symbol = (symbol << 1) | bit; ++ #endif ++ if (matchBit != bit) ++ { ++ while (symbol < 0x100) ++ { ++ #ifdef _LZMA_LOC_OPT ++ CProb *prob = probs + symbol; ++ RC_GET_BIT(prob, symbol) ++ #else ++ symbol = (symbol + symbol) | RangeDecoderBitDecode(probs + symbol, rd); ++ #endif ++ } ++ break; ++ } ++ } ++ while (symbol < 0x100); ++ #ifdef _LZMA_LOC_OPT ++ RC_FLUSH_VAR ++ #endif ++ return symbol; ++} ++ ++#define kNumPosBitsMax 4 ++#define kNumPosStatesMax (1 << kNumPosBitsMax) ++ ++#define kLenNumLowBits 3 ++#define kLenNumLowSymbols (1 << kLenNumLowBits) ++#define kLenNumMidBits 3 ++#define kLenNumMidSymbols (1 << kLenNumMidBits) ++#define kLenNumHighBits 8 ++#define kLenNumHighSymbols (1 << kLenNumHighBits) ++ ++#define LenChoice 0 ++#define LenChoice2 (LenChoice + 1) ++#define LenLow (LenChoice2 + 1) ++#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits)) ++#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits)) ++#define kNumLenProbs (LenHigh + kLenNumHighSymbols) ++ ++int LzmaLenDecode(CProb *p, CRangeDecoder *rd, int posState) ++{ ++ if(RangeDecoderBitDecode(p + LenChoice, rd) == 0) ++ return RangeDecoderBitTreeDecode(p + LenLow + ++ (posState << kLenNumLowBits), kLenNumLowBits, rd); ++ if(RangeDecoderBitDecode(p + LenChoice2, rd) == 0) ++ return kLenNumLowSymbols + RangeDecoderBitTreeDecode(p + LenMid + ++ (posState << kLenNumMidBits), kLenNumMidBits, rd); ++ return kLenNumLowSymbols + kLenNumMidSymbols + ++ RangeDecoderBitTreeDecode(p + LenHigh, kLenNumHighBits, rd); ++} ++ ++#define kNumStates 12 ++ ++#define kStartPosModelIndex 4 ++#define kEndPosModelIndex 14 ++#define kNumFullDistances (1 << (kEndPosModelIndex >> 1)) ++ ++#define kNumPosSlotBits 6 ++#define kNumLenToPosStates 4 ++ ++#define kNumAlignBits 4 ++#define kAlignTableSize (1 << kNumAlignBits) ++ ++#define kMatchMinLen 2 ++ ++#define IsMatch 0 ++#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax)) ++#define IsRepG0 (IsRep + kNumStates) ++#define IsRepG1 (IsRepG0 + kNumStates) ++#define IsRepG2 (IsRepG1 + kNumStates) ++#define IsRep0Long (IsRepG2 + kNumStates) ++#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax)) ++#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits)) ++#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex) ++#define LenCoder (Align + kAlignTableSize) ++#define RepLenCoder (LenCoder + kNumLenProbs) ++#define Literal (RepLenCoder + kNumLenProbs) ++ ++#if Literal != LZMA_BASE_SIZE ++StopCompilingDueBUG ++#endif ++ ++#ifdef _LZMA_OUT_READ ++ ++typedef struct _LzmaVarState ++{ ++ CRangeDecoder RangeDecoder; ++ Byte *Dictionary; ++ UInt32 DictionarySize; ++ UInt32 DictionaryPos; ++ UInt32 GlobalPos; ++ UInt32 Reps[4]; ++ int lc; ++ int lp; ++ int pb; ++ int State; ++ int PreviousIsMatch; ++ int RemainLen; ++} LzmaVarState; ++ ++int LzmaDecoderInit( ++ unsigned char *buffer, UInt32 bufferSize, ++ int lc, int lp, int pb, ++ unsigned char *dictionary, UInt32 dictionarySize, ++ #ifdef _LZMA_IN_CB ++ ILzmaInCallback *inCallback ++ #else ++ unsigned char *inStream, UInt32 inSize ++ #endif ++ ) ++{ ++ LzmaVarState *vs = (LzmaVarState *)buffer; ++ CProb *p = (CProb *)(buffer + sizeof(LzmaVarState)); ++ UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + lp)); ++ UInt32 i; ++ if (bufferSize < numProbs * sizeof(CProb) + sizeof(LzmaVarState)) ++ return LZMA_RESULT_NOT_ENOUGH_MEM; ++ vs->Dictionary = dictionary; ++ vs->DictionarySize = dictionarySize; ++ vs->DictionaryPos = 0; ++ vs->GlobalPos = 0; ++ vs->Reps[0] = vs->Reps[1] = vs->Reps[2] = vs->Reps[3] = 1; ++ vs->lc = lc; ++ vs->lp = lp; ++ vs->pb = pb; ++ vs->State = 0; ++ vs->PreviousIsMatch = 0; ++ vs->RemainLen = 0; ++ dictionary[dictionarySize - 1] = 0; ++ for (i = 0; i < numProbs; i++) ++ p[i] = kBitModelTotal >> 1; ++ RangeDecoderInit(&vs->RangeDecoder, ++ #ifdef _LZMA_IN_CB ++ inCallback ++ #else ++ inStream, inSize ++ #endif ++ ); ++ return LZMA_RESULT_OK; ++} ++ ++int LzmaDecode(unsigned char *buffer, ++ unsigned char *outStream, UInt32 outSize, ++ UInt32 *outSizeProcessed) ++{ ++ LzmaVarState *vs = (LzmaVarState *)buffer; ++ CProb *p = (CProb *)(buffer + sizeof(LzmaVarState)); ++ CRangeDecoder rd = vs->RangeDecoder; ++ int state = vs->State; ++ int previousIsMatch = vs->PreviousIsMatch; ++ Byte previousByte; ++ UInt32 rep0 = vs->Reps[0], rep1 = vs->Reps[1], rep2 = vs->Reps[2], rep3 = vs->Reps[3]; ++ UInt32 nowPos = 0; ++ UInt32 posStateMask = (1 << (vs->pb)) - 1; ++ UInt32 literalPosMask = (1 << (vs->lp)) - 1; ++ int lc = vs->lc; ++ int len = vs->RemainLen; ++ UInt32 globalPos = vs->GlobalPos; ++ ++ Byte *dictionary = vs->Dictionary; ++ UInt32 dictionarySize = vs->DictionarySize; ++ UInt32 dictionaryPos = vs->DictionaryPos; ++ ++ if (len == -1) ++ { ++ *outSizeProcessed = 0; ++ return LZMA_RESULT_OK; ++ } ++ ++ while(len > 0 && nowPos < outSize) ++ { ++ UInt32 pos = dictionaryPos - rep0; ++ if (pos >= dictionarySize) ++ pos += dictionarySize; ++ outStream[nowPos++] = dictionary[dictionaryPos] = dictionary[pos]; ++ if (++dictionaryPos == dictionarySize) ++ dictionaryPos = 0; ++ len--; ++ } ++ if (dictionaryPos == 0) ++ previousByte = dictionary[dictionarySize - 1]; ++ else ++ previousByte = dictionary[dictionaryPos - 1]; ++#else ++ ++int LzmaDecode( ++ Byte *buffer, UInt32 bufferSize, ++ int lc, int lp, int pb, ++ #ifdef _LZMA_IN_CB ++ ILzmaInCallback *inCallback, ++ #else ++ unsigned char *inStream, UInt32 inSize, ++ #endif ++ unsigned char *outStream, UInt32 outSize, ++ UInt32 *outSizeProcessed) ++{ ++ UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + lp)); ++ CProb *p = (CProb *)buffer; ++ CRangeDecoder rd; ++ UInt32 i; ++ int state = 0; ++ int previousIsMatch = 0; ++ Byte previousByte = 0; ++ UInt32 rep0 = 1, rep1 = 1, rep2 = 1, rep3 = 1; ++ UInt32 nowPos = 0; ++ UInt32 posStateMask = (1 << pb) - 1; ++ UInt32 literalPosMask = (1 << lp) - 1; ++ int len = 0; ++ if (bufferSize < numProbs * sizeof(CProb)) ++ return LZMA_RESULT_NOT_ENOUGH_MEM; ++ for (i = 0; i < numProbs; i++) ++ p[i] = kBitModelTotal >> 1; ++ RangeDecoderInit(&rd, ++ #ifdef _LZMA_IN_CB ++ inCallback ++ #else ++ inStream, inSize ++ #endif ++ ); ++#endif ++ ++ *outSizeProcessed = 0; ++ while(nowPos < outSize) ++ { ++ int posState = (int)( ++ (nowPos ++ #ifdef _LZMA_OUT_READ ++ + globalPos ++ #endif ++ ) ++ & posStateMask); ++ #ifdef _LZMA_IN_CB ++ if (rd.Result != LZMA_RESULT_OK) ++ return rd.Result; ++ #endif ++ if (rd.ExtraBytes != 0) ++ return LZMA_RESULT_DATA_ERROR; ++ if (RangeDecoderBitDecode(p + IsMatch + (state << kNumPosBitsMax) + posState, &rd) == 0) ++ { ++ CProb *probs = p + Literal + (LZMA_LIT_SIZE * ++ ((( ++ (nowPos ++ #ifdef _LZMA_OUT_READ ++ + globalPos ++ #endif ++ ) ++ & literalPosMask) << lc) + (previousByte >> (8 - lc)))); ++ ++ if (state < 4) state = 0; ++ else if (state < 10) state -= 3; ++ else state -= 6; ++ if (previousIsMatch) ++ { ++ Byte matchByte; ++ #ifdef _LZMA_OUT_READ ++ UInt32 pos = dictionaryPos - rep0; ++ if (pos >= dictionarySize) ++ pos += dictionarySize; ++ matchByte = dictionary[pos]; ++ #else ++ matchByte = outStream[nowPos - rep0]; ++ #endif ++ previousByte = LzmaLiteralDecodeMatch(probs, &rd, matchByte); ++ previousIsMatch = 0; ++ } ++ else ++ previousByte = LzmaLiteralDecode(probs, &rd); ++ outStream[nowPos++] = previousByte; ++ #ifdef _LZMA_OUT_READ ++ dictionary[dictionaryPos] = previousByte; ++ if (++dictionaryPos == dictionarySize) ++ dictionaryPos = 0; ++ #endif ++ } ++ else ++ { ++ previousIsMatch = 1; ++ if (RangeDecoderBitDecode(p + IsRep + state, &rd) == 1) ++ { ++ if (RangeDecoderBitDecode(p + IsRepG0 + state, &rd) == 0) ++ { ++ if (RangeDecoderBitDecode(p + IsRep0Long + (state << kNumPosBitsMax) + posState, &rd) == 0) ++ { ++ #ifdef _LZMA_OUT_READ ++ UInt32 pos; ++ #endif ++ if ( ++ (nowPos ++ #ifdef _LZMA_OUT_READ ++ + globalPos ++ #endif ++ ) ++ == 0) ++ return LZMA_RESULT_DATA_ERROR; ++ state = state < 7 ? 9 : 11; ++ #ifdef _LZMA_OUT_READ ++ pos = dictionaryPos - rep0; ++ if (pos >= dictionarySize) ++ pos += dictionarySize; ++ previousByte = dictionary[pos]; ++ dictionary[dictionaryPos] = previousByte; ++ if (++dictionaryPos == dictionarySize) ++ dictionaryPos = 0; ++ #else ++ previousByte = outStream[nowPos - rep0]; ++ #endif ++ outStream[nowPos++] = previousByte; ++ continue; ++ } ++ } ++ else ++ { ++ UInt32 distance; ++ if(RangeDecoderBitDecode(p + IsRepG1 + state, &rd) == 0) ++ distance = rep1; ++ else ++ { ++ if(RangeDecoderBitDecode(p + IsRepG2 + state, &rd) == 0) ++ distance = rep2; ++ else ++ { ++ distance = rep3; ++ rep3 = rep2; ++ } ++ rep2 = rep1; ++ } ++ rep1 = rep0; ++ rep0 = distance; ++ } ++ len = LzmaLenDecode(p + RepLenCoder, &rd, posState); ++ state = state < 7 ? 8 : 11; ++ } ++ else ++ { ++ int posSlot; ++ rep3 = rep2; ++ rep2 = rep1; ++ rep1 = rep0; ++ state = state < 7 ? 7 : 10; ++ len = LzmaLenDecode(p + LenCoder, &rd, posState); ++ posSlot = RangeDecoderBitTreeDecode(p + PosSlot + ++ ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << ++ kNumPosSlotBits), kNumPosSlotBits, &rd); ++ if (posSlot >= kStartPosModelIndex) ++ { ++ int numDirectBits = ((posSlot >> 1) - 1); ++ rep0 = ((2 | ((UInt32)posSlot & 1)) << numDirectBits); ++ if (posSlot < kEndPosModelIndex) ++ { ++ rep0 += RangeDecoderReverseBitTreeDecode( ++ p + SpecPos + rep0 - posSlot - 1, numDirectBits, &rd); ++ } ++ else ++ { ++ rep0 += RangeDecoderDecodeDirectBits(&rd, ++ numDirectBits - kNumAlignBits) << kNumAlignBits; ++ rep0 += RangeDecoderReverseBitTreeDecode(p + Align, kNumAlignBits, &rd); ++ } ++ } ++ else ++ rep0 = posSlot; ++ rep0++; ++ } ++ if (rep0 == (UInt32)(0)) ++ { ++ /* it's for stream version */ ++ len = -1; ++ break; ++ } ++ if (rep0 > nowPos ++ #ifdef _LZMA_OUT_READ ++ + globalPos ++ #endif ++ ) ++ { ++ return LZMA_RESULT_DATA_ERROR; ++ } ++ len += kMatchMinLen; ++ do ++ { ++ #ifdef _LZMA_OUT_READ ++ UInt32 pos = dictionaryPos - rep0; ++ if (pos >= dictionarySize) ++ pos += dictionarySize; ++ previousByte = dictionary[pos]; ++ dictionary[dictionaryPos] = previousByte; ++ if (++dictionaryPos == dictionarySize) ++ dictionaryPos = 0; ++ #else ++ previousByte = outStream[nowPos - rep0]; ++ #endif ++ outStream[nowPos++] = previousByte; ++ len--; ++ } ++ while(len > 0 && nowPos < outSize); ++ } ++ } ++ ++ #ifdef _LZMA_OUT_READ ++ vs->RangeDecoder = rd; ++ vs->DictionaryPos = dictionaryPos; ++ vs->GlobalPos = globalPos + nowPos; ++ vs->Reps[0] = rep0; ++ vs->Reps[1] = rep1; ++ vs->Reps[2] = rep2; ++ vs->Reps[3] = rep3; ++ vs->State = state; ++ vs->PreviousIsMatch = previousIsMatch; ++ vs->RemainLen = len; ++ #endif ++ ++ *outSizeProcessed = nowPos; ++ return LZMA_RESULT_OK; ++} +--- linuz/fs/squashfs/LzmaDecode.h 1970-01-01 03:00:00.000000000 +0300 ++++ linux/fs/squashfs/LzmaDecode.h 2005-01-20 19:40:36.794301664 +0300 +@@ -0,0 +1,100 @@ ++/* ++ LzmaDecode.h ++ LZMA Decoder interface ++ ++ LZMA SDK 4.05 Copyright (c) 1999-2004 Igor Pavlov (2004-08-25) ++ http://www.7-zip.org/ ++ ++ LZMA SDK is licensed under two licenses: ++ 1) GNU Lesser General Public License (GNU LGPL) ++ 2) Common Public License (CPL) ++ It means that you can select one of these two licenses and ++ follow rules of that license. ++ ++ SPECIAL EXCEPTION: ++ Igor Pavlov, as the author of this code, expressly permits you to ++ statically or dynamically link your code (or bind by name) to the ++ interfaces of this file without subjecting your linked code to the ++ terms of the CPL or GNU LGPL. Any modifications or additions ++ to this file, however, are subject to the LGPL or CPL terms. ++*/ ++ ++#ifndef __LZMADECODE_H ++#define __LZMADECODE_H ++ ++/* #define _LZMA_IN_CB */ ++/* Use callback for input data */ ++ ++/* #define _LZMA_OUT_READ */ ++/* Use read function for output data */ ++ ++/* #define _LZMA_PROB32 */ ++/* It can increase speed on some 32-bit CPUs, ++ but memory usage will be doubled in that case */ ++ ++/* #define _LZMA_LOC_OPT */ ++/* Enable local speed optimizations inside code */ ++ ++#ifndef UInt32 ++#ifdef _LZMA_UINT32_IS_ULONG ++#define UInt32 unsigned long ++#else ++#define UInt32 unsigned int ++#endif ++#endif ++ ++#ifdef _LZMA_PROB32 ++#define CProb UInt32 ++#else ++#define CProb unsigned short ++#endif ++ ++#define LZMA_RESULT_OK 0 ++#define LZMA_RESULT_DATA_ERROR 1 ++#define LZMA_RESULT_NOT_ENOUGH_MEM 2 ++ ++#ifdef _LZMA_IN_CB ++typedef struct _ILzmaInCallback ++{ ++ int (*Read)(void *object, unsigned char **buffer, UInt32 *bufferSize); ++} ILzmaInCallback; ++#endif ++ ++#define LZMA_BASE_SIZE 1846 ++#define LZMA_LIT_SIZE 768 ++ ++/* ++bufferSize = (LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp)))* sizeof(CProb) ++bufferSize += 100 in case of _LZMA_OUT_READ ++by default CProb is unsigned short, ++but if specify _LZMA_PROB_32, CProb will be UInt32(unsigned int) ++*/ ++ ++#ifdef _LZMA_OUT_READ ++int LzmaDecoderInit( ++ unsigned char *buffer, UInt32 bufferSize, ++ int lc, int lp, int pb, ++ unsigned char *dictionary, UInt32 dictionarySize, ++ #ifdef _LZMA_IN_CB ++ ILzmaInCallback *inCallback ++ #else ++ unsigned char *inStream, UInt32 inSize ++ #endif ++); ++#endif ++ ++int LzmaDecode( ++ unsigned char *buffer, ++ #ifndef _LZMA_OUT_READ ++ UInt32 bufferSize, ++ int lc, int lp, int pb, ++ #ifdef _LZMA_IN_CB ++ ILzmaInCallback *inCallback, ++ #else ++ unsigned char *inStream, UInt32 inSize, ++ #endif ++ #endif ++ unsigned char *outStream, UInt32 outSize, ++ UInt32 *outSizeProcessed); ++ ++#endif +--- linuz/fs/squashfs/Makefile 2004-12-15 22:56:47.000000000 +0300 ++++ linux/fs/squashfs/Makefile 2005-01-19 23:04:25.000000000 +0300 +@@ -4,7 +4,7 @@ + + O_TARGET := squashfs.o + +-obj-y := inode.o ++obj-y := inode.o LzmaDecode.o + + obj-m := $(O_TARGET) + diff --git a/recipes/linux/linux-wrt-2.4.30/600-optional-aout-support b/recipes/linux/linux-wrt-2.4.30/600-optional-aout-support new file mode 100644 index 0000000000..56dc1991cf --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/600-optional-aout-support @@ -0,0 +1,688 @@ +diff -urPX nopatch linux-2.4.26/Documentation/Configure.help linux/Documentation/Configure.help +--- linux-2.4.26/Documentation/Configure.help Sat Apr 17 02:10:25 2004 ++++ linux/Documentation/Configure.help Sat Apr 17 02:13:54 2004 +@@ -4622,6 +4622,12 @@ + will be called binfmt_elf.o. Saying M or N here is dangerous because + some crucial programs on your system might be in ELF format. + ++ELF binaries with a.out format interpreters or a.out libraries ++CONFIG_BINFMT_ELF_AOUT ++ The kernel may support ELF executables which use an a.out format ++ interpreter (dynamic linker) and/or a.out shared libraries, in ++ addition to the usual ELF-ELF setups. You shouldn't need this. ++ + Kernel support for a.out binaries + CONFIG_BINFMT_AOUT + A.out (Assembler.OUTput) is a set of formats for libraries and +@@ -4635,13 +4641,11 @@ + warrant removing support. However its removal is a good idea if you + wish to ensure that absolutely none of your programs will use this + older executable format. If you don't know what to answer at this +- point then answer Y. If someone told you "You need a kernel with ++ point then answer N. If someone told you "You need a kernel with + QMAGIC support" then you'll have to say Y here. You may answer M to + compile a.out support as a module and later load the module when you + want to use a program or library in a.out format. The module will be +- called binfmt_aout.o. Saying M or N here is dangerous though, +- because some crucial programs on your system might still be in A.OUT +- format. ++ called binfmt_aout.o. + + OSF/1 v4 readv/writev compatibility + CONFIG_OSF4_COMPAT +diff -urPX nopatch linux-2.4.26/arch/alpha/config.in linux/arch/alpha/config.in +--- linux-2.4.26/arch/alpha/config.in Fri Feb 20 10:07:20 2004 ++++ linux/arch/alpha/config.in Sat Apr 17 02:13:54 2004 +@@ -315,6 +315,9 @@ + fi + + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + tristate 'Kernel support for Linux/Intel ELF binaries' CONFIG_BINFMT_EM86 + source drivers/parport/Config.in +diff -urPX nopatch linux-2.4.26/arch/alpha/defconfig linux/arch/alpha/defconfig +--- linux-2.4.26/arch/alpha/defconfig Fri Feb 20 10:07:20 2004 ++++ linux/arch/alpha/defconfig Sat Apr 17 02:13:54 2004 +@@ -72,6 +72,7 @@ + # CONFIG_KCORE_AOUT is not set + # CONFIG_BINFMT_AOUT is not set + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + # CONFIG_BINFMT_MISC is not set + # CONFIG_BINFMT_EM86 is not set + +diff -urPX nopatch linux-2.4.26/arch/arm/config.in linux/arch/arm/config.in +--- linux-2.4.26/arch/arm/config.in Fri Feb 20 10:07:20 2004 ++++ linux/arch/arm/config.in Sat Apr 17 02:13:54 2004 +@@ -499,6 +499,9 @@ + A.OUT CONFIG_KCORE_AOUT" ELF + tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + dep_bool 'Power Management support (experimental)' CONFIG_PM $CONFIG_EXPERIMENTAL + dep_tristate 'RISC OS personality' CONFIG_ARTHUR $CONFIG_CPU_32 +diff -urPX nopatch linux-2.4.26/arch/arm/defconfig linux/arch/arm/defconfig +--- linux-2.4.26/arch/arm/defconfig Fri Feb 20 10:07:21 2004 ++++ linux/arch/arm/defconfig Sat Apr 17 02:13:54 2004 +@@ -83,8 +83,9 @@ + CONFIG_NWFPE=y + CONFIG_KCORE_ELF=y + # CONFIG_KCORE_AOUT is not set +-CONFIG_BINFMT_AOUT=y ++# CONFIG_BINFMT_AOUT is not set + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + # CONFIG_BINFMT_MISC is not set + # CONFIG_PM is not set + # CONFIG_ARTHUR is not set +diff -urPX nopatch linux-2.4.26/arch/cris/config.in linux/arch/cris/config.in +--- linux-2.4.26/arch/cris/config.in Fri Feb 20 10:07:21 2004 ++++ linux/arch/cris/config.in Sat Apr 17 02:13:54 2004 +@@ -31,6 +31,9 @@ + bool 'Sysctl support' CONFIG_SYSCTL + + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + + string 'Kernel command line' CONFIG_ETRAX_CMDLINE "root=/dev/mtdblock3" + +diff -urPX nopatch linux-2.4.26/arch/cris/defconfig linux/arch/cris/defconfig +--- linux-2.4.26/arch/cris/defconfig Fri Feb 20 10:07:21 2004 ++++ linux/arch/cris/defconfig Sat Apr 17 02:13:54 2004 +@@ -18,6 +18,7 @@ + # CONFIG_BSD_PROCESS_ACCT is not set + # CONFIG_SYSCTL is not set + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + # CONFIG_ETRAX_KGDB is not set + # CONFIG_ETRAX_WATCHDOG is not set + +diff -urPX nopatch linux-2.4.26/arch/i386/config.in linux/arch/i386/config.in +--- linux-2.4.26/arch/i386/config.in Fri Feb 20 10:07:21 2004 ++++ linux/arch/i386/config.in Sat Apr 17 02:13:54 2004 +@@ -327,6 +327,9 @@ + fi + tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER + +diff -urPX nopatch linux-2.4.26/arch/i386/defconfig linux/arch/i386/defconfig +--- linux-2.4.26/arch/i386/defconfig Sat Apr 17 02:10:25 2004 ++++ linux/arch/i386/defconfig Sat Apr 17 02:23:27 2004 +@@ -110,9 +110,10 @@ + CONFIG_SYSCTL=y + CONFIG_KCORE_ELF=y + # CONFIG_KCORE_AOUT is not set +-CONFIG_BINFMT_AOUT=y ++# CONFIG_BINFMT_AOUT is not set + CONFIG_BINFMT_ELF=y +-CONFIG_BINFMT_MISC=y ++# CONFIG_BINFMT_ELF_AOUT is not set ++# CONFIG_BINFMT_MISC is not set + # CONFIG_OOM_KILLER is not set + CONFIG_PM=y + # CONFIG_APM is not set +diff -urPX nopatch linux-2.4.26/arch/ia64/config.in linux/arch/ia64/config.in +--- linux-2.4.26/arch/ia64/config.in Fri Feb 20 10:07:21 2004 ++++ linux/arch/ia64/config.in Sat Apr 17 02:13:54 2004 +@@ -124,6 +124,9 @@ + bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT + bool 'Sysctl support' CONFIG_SYSCTL + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + + if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then +diff -urPX nopatch linux-2.4.26/arch/ia64/defconfig linux/arch/ia64/defconfig +--- linux-2.4.26/arch/ia64/defconfig Fri Feb 20 10:07:21 2004 ++++ linux/arch/ia64/defconfig Sat Apr 17 02:13:54 2004 +@@ -60,6 +60,7 @@ + # CONFIG_BSD_PROCESS_ACCT is not set + CONFIG_SYSCTL=y + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + # CONFIG_BINFMT_MISC is not set + CONFIG_ACPI=y + CONFIG_ACPI_EFI=y +diff -urPX nopatch linux-2.4.26/arch/m68k/config.in linux/arch/m68k/config.in +--- linux-2.4.26/arch/m68k/config.in Fri Feb 20 10:07:22 2004 ++++ linux/arch/m68k/config.in Sat Apr 17 02:13:55 2004 +@@ -99,6 +99,9 @@ + fi + tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + + if [ "$CONFIG_AMIGA" = "y" ]; then +diff -urPX nopatch linux-2.4.26/arch/m68k/defconfig linux/arch/m68k/defconfig +--- linux-2.4.26/arch/m68k/defconfig Fri Feb 20 10:07:22 2004 ++++ linux/arch/m68k/defconfig Sat Apr 17 02:13:55 2004 +@@ -44,8 +44,9 @@ + CONFIG_SYSCTL=y + CONFIG_KCORE_ELF=y + # CONFIG_KCORE_AOUT is not set +-CONFIG_BINFMT_AOUT=y ++# CONFIG_BINFMT_AOUT is not set + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + # CONFIG_BINFMT_MISC is not set + CONFIG_ZORRO=y + # CONFIG_AMIGA_PCMCIA is not set +diff -urPX nopatch linux-2.4.26/arch/mips/config-shared.in linux/arch/mips/config-shared.in +--- linux-2.4.26/arch/mips/config-shared.in Fri Feb 20 10:07:22 2004 ++++ linux/arch/mips/config-shared.in Sat Apr 17 02:13:55 2004 +@@ -944,6 +944,9 @@ + define_bool CONFIG_KCORE_AOUT n + define_bool CONFIG_BINFMT_AOUT n + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + dep_bool 'Kernel support for Linux/MIPS 32-bit binary compatibility' CONFIG_MIPS32_COMPAT $CONFIG_MIPS64 + dep_bool 'Kernel support for o32 binaries' CONFIG_MIPS32_O32 $CONFIG_MIPS32_COMPAT + dep_bool 'Kernel support for n32 binaries' CONFIG_MIPS32_N32 $CONFIG_MIPS32_COMPAT +diff -urPX nopatch linux-2.4.26/arch/mips/defconfig linux/arch/mips/defconfig +--- linux-2.4.26/arch/mips/defconfig Fri Feb 20 10:07:22 2004 ++++ linux/arch/mips/defconfig Sat Apr 17 02:13:55 2004 +@@ -139,6 +139,7 @@ + # CONFIG_KCORE_AOUT is not set + # CONFIG_BINFMT_AOUT is not set + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + # CONFIG_MIPS32_COMPAT is not set + # CONFIG_MIPS32_O32 is not set + # CONFIG_MIPS32_N32 is not set +diff -urPX nopatch linux-2.4.26/arch/mips/kernel/irixelf.c linux/arch/mips/kernel/irixelf.c +--- linux-2.4.26/arch/mips/kernel/irixelf.c Mon Aug 25 11:44:40 2003 ++++ linux/arch/mips/kernel/irixelf.c Sat Apr 17 02:13:55 2004 +@@ -8,6 +8,7 @@ + * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com). + */ + ++#include <linux/config.h> + #include <linux/module.h> + + #include <linux/fs.h> +@@ -48,7 +49,12 @@ + extern int dump_fpu (elf_fpregset_t *); + + static struct linux_binfmt irix_format = { +- NULL, THIS_MODULE, load_irix_binary, load_irix_library, ++ NULL, THIS_MODULE, load_irix_binary, ++#ifdef CONFIG_BINFMT_ELF_AOUT ++ load_irix_library, ++#else ++ NULL, ++#endif + irix_core_dump, PAGE_SIZE + }; + +@@ -787,6 +793,7 @@ + goto out; + } + ++#ifdef CONFIG_BINFMT_ELF_AOUT + /* This is really simpleminded and specialized - we are loading an + * a.out library that is given an ELF header. + */ +@@ -863,6 +870,7 @@ + kfree(elf_phdata); + return 0; + } ++#endif + + /* Called through irix_syssgi() to map an elf image given an FD, + * a phdr ptr USER_PHDRP in userspace, and a count CNT telling how many +diff -urPX nopatch linux-2.4.26/arch/mips64/defconfig linux/arch/mips64/defconfig +--- linux-2.4.26/arch/mips64/defconfig Fri Feb 20 10:07:24 2004 ++++ linux/arch/mips64/defconfig Sat Apr 17 02:13:55 2004 +@@ -137,6 +137,7 @@ + # CONFIG_KCORE_AOUT is not set + # CONFIG_BINFMT_AOUT is not set + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + CONFIG_MIPS32_COMPAT=y + CONFIG_MIPS32_O32=y + # CONFIG_MIPS32_N32 is not set +diff -urPX nopatch linux-2.4.26/arch/parisc/config.in linux/arch/parisc/config.in +--- linux-2.4.26/arch/parisc/config.in Fri Feb 20 10:07:25 2004 ++++ linux/arch/parisc/config.in Sat Apr 17 02:13:55 2004 +@@ -89,6 +89,9 @@ + bool 'Sysctl support' CONFIG_SYSCTL + define_bool CONFIG_KCORE_ELF y + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for SOM binaries' CONFIG_BINFMT_SOM + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + +diff -urPX nopatch linux-2.4.26/arch/parisc/defconfig linux/arch/parisc/defconfig +--- linux-2.4.26/arch/parisc/defconfig Fri Feb 20 10:07:25 2004 ++++ linux/arch/parisc/defconfig Sat Apr 17 02:13:55 2004 +@@ -56,6 +56,7 @@ + CONFIG_SYSCTL=y + CONFIG_KCORE_ELF=y + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + CONFIG_BINFMT_SOM=y + # CONFIG_BINFMT_MISC is not set + # CONFIG_PM is not set +diff -urPX nopatch linux-2.4.26/arch/ppc/config.in linux/arch/ppc/config.in +--- linux-2.4.26/arch/ppc/config.in Sat Apr 17 02:10:25 2004 ++++ linux/arch/ppc/config.in Sat Apr 17 02:13:55 2004 +@@ -384,6 +384,7 @@ + fi + define_bool CONFIG_BINFMT_ELF y + define_bool CONFIG_KERNEL_ELF y ++bool 'ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER + +diff -urPX nopatch linux-2.4.26/arch/ppc/defconfig linux/arch/ppc/defconfig +--- linux-2.4.26/arch/ppc/defconfig Fri Feb 20 10:07:25 2004 ++++ linux/arch/ppc/defconfig Sat Apr 17 02:13:55 2004 +@@ -59,7 +59,8 @@ + CONFIG_KCORE_ELF=y + CONFIG_BINFMT_ELF=y + CONFIG_KERNEL_ELF=y +-CONFIG_BINFMT_MISC=m ++# CONFIG_BINFMT_ELF_AOUT is not set ++# CONFIG_BINFMT_MISC is not set + # CONFIG_OOM_KILLER is not set + CONFIG_PCI_NAMES=y + CONFIG_HOTPLUG=y +diff -urPX nopatch linux-2.4.26/arch/ppc64/config.in linux/arch/ppc64/config.in +--- linux-2.4.26/arch/ppc64/config.in Fri Feb 20 10:07:25 2004 ++++ linux/arch/ppc64/config.in Sat Apr 17 02:13:55 2004 +@@ -82,6 +82,9 @@ + fi + + bool 'Kernel support for 64 bit ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + + tristate 'Kernel support for 32 bit ELF binaries' CONFIG_BINFMT_ELF32 + +diff -urPX nopatch linux-2.4.26/arch/ppc64/defconfig linux/arch/ppc64/defconfig +--- linux-2.4.26/arch/ppc64/defconfig Fri Feb 20 10:07:25 2004 ++++ linux/arch/ppc64/defconfig Sat Apr 17 02:13:55 2004 +@@ -56,6 +56,7 @@ + # CONFIG_BSD_PROCESS_ACCT is not set + CONFIG_KCORE_ELF=y + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + CONFIG_BINFMT_ELF32=y + # CONFIG_BINFMT_MISC is not set + CONFIG_PCI_NAMES=y +diff -urPX nopatch linux-2.4.26/arch/s390/config.in linux/arch/s390/config.in +--- linux-2.4.26/arch/s390/config.in Fri Nov 28 18:26:19 2003 ++++ linux/arch/s390/config.in Sat Apr 17 02:13:55 2004 +@@ -58,6 +58,9 @@ + bool 'Sysctl support' CONFIG_SYSCTL + define_bool CONFIG_KCORE_ELF y + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG + bool 'Pseudo page fault support' CONFIG_PFAULT +diff -urPX nopatch linux-2.4.26/arch/s390/defconfig linux/arch/s390/defconfig +--- linux-2.4.26/arch/s390/defconfig Fri Feb 20 10:07:26 2004 ++++ linux/arch/s390/defconfig Sat Apr 17 02:13:55 2004 +@@ -46,6 +46,7 @@ + CONFIG_SYSCTL=y + CONFIG_KCORE_ELF=y + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + # CONFIG_BINFMT_MISC is not set + # CONFIG_PROCESS_DEBUG is not set + CONFIG_PFAULT=y +diff -urPX nopatch linux-2.4.26/arch/s390x/config.in linux/arch/s390x/config.in +--- linux-2.4.26/arch/s390x/config.in Fri Nov 28 18:26:19 2003 ++++ linux/arch/s390x/config.in Sat Apr 17 02:13:55 2004 +@@ -61,6 +61,9 @@ + bool 'Sysctl support' CONFIG_SYSCTL + define_bool CONFIG_KCORE_ELF y + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG + bool 'Pseudo page fault support' CONFIG_PFAULT +diff -urPX nopatch linux-2.4.26/arch/s390x/defconfig linux/arch/s390x/defconfig +--- linux-2.4.26/arch/s390x/defconfig Fri Feb 20 10:07:26 2004 ++++ linux/arch/s390x/defconfig Sat Apr 17 02:13:55 2004 +@@ -47,6 +47,7 @@ + CONFIG_SYSCTL=y + CONFIG_KCORE_ELF=y + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + # CONFIG_BINFMT_MISC is not set + # CONFIG_PROCESS_DEBUG is not set + CONFIG_PFAULT=y +diff -urPX nopatch linux-2.4.26/arch/sh/config.in linux/arch/sh/config.in +--- linux-2.4.26/arch/sh/config.in Fri Feb 20 10:07:26 2004 ++++ linux/arch/sh/config.in Sat Apr 17 02:13:55 2004 +@@ -283,6 +283,9 @@ + A.OUT CONFIG_KCORE_AOUT" ELF + fi + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + + bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER +diff -urPX nopatch linux-2.4.26/arch/sh/defconfig linux/arch/sh/defconfig +--- linux-2.4.26/arch/sh/defconfig Fri Feb 20 10:07:26 2004 ++++ linux/arch/sh/defconfig Sat Apr 17 02:13:55 2004 +@@ -48,6 +48,7 @@ + CONFIG_KCORE_ELF=y + # CONFIG_KCORE_AOUT is not set + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + # CONFIG_BINFMT_MISC is not set + + # +diff -urPX nopatch linux-2.4.26/arch/sparc/config.in linux/arch/sparc/config.in +--- linux-2.4.26/arch/sparc/config.in Fri Feb 20 10:07:26 2004 ++++ linux/arch/sparc/config.in Sat Apr 17 02:13:55 2004 +@@ -74,6 +74,9 @@ + fi + tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL + bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER +diff -urPX nopatch linux-2.4.26/arch/sparc/defconfig linux/arch/sparc/defconfig +--- linux-2.4.26/arch/sparc/defconfig Sat Apr 17 02:10:25 2004 ++++ linux/arch/sparc/defconfig Sat Apr 17 02:13:55 2004 +@@ -49,9 +49,10 @@ + # CONFIG_BSD_PROCESS_ACCT is not set + CONFIG_SYSCTL=y + CONFIG_KCORE_ELF=y +-CONFIG_BINFMT_AOUT=y ++# CONFIG_BINFMT_AOUT is not set + CONFIG_BINFMT_ELF=y +-CONFIG_BINFMT_MISC=m ++# CONFIG_BINFMT_ELF_AOUT is not set ++# CONFIG_BINFMT_MISC is not set + CONFIG_SUNOS_EMUL=y + # CONFIG_OOM_KILLER is not set + +diff -urPX nopatch linux-2.4.26/arch/sparc64/config.in linux/arch/sparc64/config.in +--- linux-2.4.26/arch/sparc64/config.in Fri Feb 20 10:07:26 2004 ++++ linux/arch/sparc64/config.in Sat Apr 17 02:13:55 2004 +@@ -77,6 +77,9 @@ + bool ' Kernel support for 32-bit (ie. SunOS) a.out binaries' CONFIG_BINFMT_AOUT32 + fi + bool 'Kernel support for 64-bit ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then +diff -urPX nopatch linux-2.4.26/arch/sparc64/defconfig linux/arch/sparc64/defconfig +--- linux-2.4.26/arch/sparc64/defconfig Sat Apr 17 02:10:26 2004 ++++ linux/arch/sparc64/defconfig Sat Apr 17 02:13:55 2004 +@@ -56,7 +56,8 @@ + CONFIG_BINFMT_ELF32=y + # CONFIG_BINFMT_AOUT32 is not set + CONFIG_BINFMT_ELF=y +-CONFIG_BINFMT_MISC=m ++# CONFIG_BINFMT_ELF_AOUT is not set ++# CONFIG_BINFMT_MISC is not set + # CONFIG_SUNOS_EMUL is not set + CONFIG_SOLARIS_EMUL=m + # CONFIG_OOM_KILLER is not set +diff -urPX nopatch linux-2.4.26/arch/x86_64/config.in linux/arch/x86_64/config.in +--- linux-2.4.26/arch/x86_64/config.in Sat Apr 17 02:10:26 2004 ++++ linux/arch/x86_64/config.in Sat Apr 17 02:13:55 2004 +@@ -118,6 +118,9 @@ + fi + #tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT + bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF ++if [ "$CONFIG_BINFMT_ELF" != "n" ]; then ++ bool ' ELF binaries with a.out format interpreters or a.out libraries' CONFIG_BINFMT_ELF_AOUT ++fi + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC + + bool 'Power Management support' CONFIG_PM +diff -urPX nopatch linux-2.4.26/arch/x86_64/defconfig linux/arch/x86_64/defconfig +--- linux-2.4.26/arch/x86_64/defconfig Sat Apr 17 02:10:26 2004 ++++ linux/arch/x86_64/defconfig Sat Apr 17 02:13:55 2004 +@@ -67,6 +67,7 @@ + CONFIG_SYSCTL=y + CONFIG_KCORE_ELF=y + CONFIG_BINFMT_ELF=y ++# CONFIG_BINFMT_ELF_AOUT is not set + # CONFIG_BINFMT_MISC is not set + CONFIG_PM=y + CONFIG_IA32_EMULATION=y +diff -urPX nopatch linux-2.4.26/fs/binfmt_elf.c linux/fs/binfmt_elf.c +--- linux-2.4.26/fs/binfmt_elf.c Sat Apr 17 02:10:31 2004 ++++ linux/fs/binfmt_elf.c Sat Apr 17 02:13:55 2004 +@@ -9,6 +9,7 @@ + * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com). + */ + ++#include <linux/config.h> + #include <linux/module.h> + + #include <linux/fs.h> +@@ -43,7 +44,9 @@ + #include <linux/elf.h> + + static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs); ++#ifdef CONFIG_BINFMT_ELF_AOUT + static int load_elf_library(struct file*); ++#endif + static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int); + extern int dump_fpu (struct pt_regs *, elf_fpregset_t *); + extern void dump_thread(struct pt_regs *, struct user *); +@@ -73,8 +76,14 @@ + #define ELF_PAGEOFFSET(_v) ((_v) & (ELF_MIN_ALIGN-1)) + #define ELF_PAGEALIGN(_v) (((_v) + ELF_MIN_ALIGN - 1) & ~(ELF_MIN_ALIGN - 1)) + +-static struct linux_binfmt elf_format = { +- NULL, THIS_MODULE, load_elf_binary, load_elf_library, elf_core_dump, ELF_EXEC_PAGESIZE ++static struct linux_binfmt elf_format = { ++ NULL, THIS_MODULE, load_elf_binary, ++#ifdef CONFIG_BINFMT_ELF_AOUT ++ load_elf_library, ++#else ++ NULL, ++#endif ++ elf_core_dump, ELF_EXEC_PAGESIZE + }; + + #define BAD_ADDR(x) ((unsigned long)(x) > TASK_SIZE) +@@ -369,6 +378,7 @@ + return error; + } + ++#ifdef CONFIG_BINFMT_ELF_AOUT + static unsigned long load_aout_interp(struct exec * interp_ex, + struct file * interpreter) + { +@@ -413,6 +423,7 @@ + out: + return elf_entry; + } ++#endif + + /* + * These are the functions used to load ELF style executables and shared +@@ -420,7 +431,9 @@ + */ + + #define INTERPRETER_NONE 0 ++#ifdef CONFIG_BINFMT_ELF_AOUT + #define INTERPRETER_AOUT 1 ++#endif + #define INTERPRETER_ELF 2 + + +@@ -444,7 +457,9 @@ + struct elfhdr elf_ex; + struct elfhdr interp_elf_ex; + struct exec interp_ex; ++#ifdef CONFIG_BINFMT_ELF_AOUT + char passed_fileno[6]; ++#endif + struct files_struct *files; + + /* Get the exec-header */ +@@ -556,6 +571,7 @@ + + /* Some simple consistency checks for the interpreter */ + if (elf_interpreter) { ++#ifdef CONFIG_BINFMT_ELF_AOUT + interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT; + + /* Now figure out which format our binary is */ +@@ -563,6 +579,9 @@ + (N_MAGIC(interp_ex) != ZMAGIC) && + (N_MAGIC(interp_ex) != QMAGIC)) + interpreter_type = INTERPRETER_ELF; ++#else ++ interpreter_type = INTERPRETER_ELF; ++#endif + + if (memcmp(interp_elf_ex.e_ident, ELFMAG, SELFMAG) != 0) + interpreter_type &= ~INTERPRETER_ELF; +@@ -571,6 +590,7 @@ + if (!interpreter_type) + goto out_free_dentry; + ++#ifdef CONFIG_BINFMT_ELF_AOUT + /* Make sure only one type was selected */ + if ((interpreter_type & INTERPRETER_ELF) && + interpreter_type != INTERPRETER_ELF) { +@@ -578,6 +598,7 @@ + // printk(KERN_WARNING "ELF: Ambiguous type, using ELF\n"); + interpreter_type = INTERPRETER_ELF; + } ++#endif + /* Verify the interpreter has a valid arch */ + if ((interpreter_type == INTERPRETER_ELF) && + !elf_check_arch(&interp_elf_ex)) +@@ -590,6 +611,7 @@ + /* OK, we are done with that, now set up the arg stuff, + and then start this sucker up */ + ++#ifdef CONFIG_BINFMT_ELF_AOUT + if (!bprm->sh_bang) { + char * passed_p; + +@@ -605,6 +627,7 @@ + } + } + } ++#endif + + /* Flush all traces of the currently running executable */ + retval = flush_old_exec(bprm); +@@ -721,10 +744,12 @@ + end_data += load_bias; + + if (elf_interpreter) { ++#ifdef CONFIG_BINFMT_ELF_AOUT + if (interpreter_type == INTERPRETER_AOUT) + elf_entry = load_aout_interp(&interp_ex, + interpreter); + else ++#endif + elf_entry = load_elf_interp(&interp_elf_ex, + interpreter, + &interp_load_addr); +@@ -743,7 +768,9 @@ + + kfree(elf_phdata); + ++#ifdef CONFIG_BINFMT_ELF_AOUT + if (interpreter_type != INTERPRETER_AOUT) ++#endif + sys_close(elf_exec_fileno); + + set_binfmt(&elf_format); +@@ -757,10 +784,14 @@ + &elf_ex, + load_addr, load_bias, + interp_load_addr, ++#ifdef CONFIG_BINFMT_ELF_AOUT + (interpreter_type == INTERPRETER_AOUT ? 0 : 1)); + /* N.B. passed_fileno might not be initialized? */ + if (interpreter_type == INTERPRETER_AOUT) + current->mm->arg_start += strlen(passed_fileno) + 1; ++#else ++ 1); ++#endif + current->mm->start_brk = current->mm->brk = elf_brk; + current->mm->end_code = end_code; + current->mm->start_code = start_code; +@@ -838,9 +869,9 @@ + goto out; + } + ++#ifdef CONFIG_BINFMT_ELF_AOUT + /* This is really simpleminded and specialized - we are loading an + a.out library that is given an ELF header. */ +- + static int load_elf_library(struct file *file) + { + struct elf_phdr *elf_phdata; +@@ -911,6 +942,7 @@ + out: + return error; + } ++#endif + + /* + * Note that some platforms still use traditional core dumps and not +diff -urPX nopatch linux-2.4.26/fs/exec.c linux/fs/exec.c +--- linux-2.4.26/fs/exec.c Fri Feb 20 10:07:36 2004 ++++ linux/fs/exec.c Sat Apr 17 02:13:55 2004 +@@ -109,6 +109,7 @@ + */ + asmlinkage long sys_uselib(const char * library) + { ++#if defined(CONFIG_BINFMT_AOUT) || defined(CONFIG_BINFMT_ELF_AOUT) + struct file * file; + struct nameidata nd; + int error; +@@ -155,6 +156,9 @@ + exit: + path_release(&nd); + goto out; ++#else ++ return -ENOSYS; ++#endif + } + + /* diff --git a/recipes/linux/linux-wrt-2.4.30/linux.config b/recipes/linux/linux-wrt-2.4.30/linux.config new file mode 100644 index 0000000000..111dae88b6 --- /dev/null +++ b/recipes/linux/linux-wrt-2.4.30/linux.config @@ -0,0 +1,1226 @@ +# +# Automatically generated by make menuconfig: don't edit +# +CONFIG_MIPS=y +CONFIG_MIPS32=y +# CONFIG_MIPS64 is not set + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y + +# +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +# CONFIG_KMOD is not set + +# +# Machine selection +# +# CONFIG_ACER_PICA_61 is not set +# CONFIG_MIPS_BOSPORUS is not set +# CONFIG_MIPS_FICMMP is not set +# CONFIG_MIPS_MIRAGE is not set +# CONFIG_MIPS_DB1000 is not set +# CONFIG_MIPS_DB1100 is not set +# CONFIG_MIPS_DB1500 is not set +# CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set +# CONFIG_MIPS_PB1000 is not set +# CONFIG_MIPS_PB1100 is not set +# CONFIG_MIPS_PB1500 is not set +# CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set +# CONFIG_MIPS_HYDROGEN3 is not set +# CONFIG_MIPS_XXS1500 is not set +# CONFIG_MIPS_MTX1 is not set +# CONFIG_COGENT_CSB250 is not set +# CONFIG_BAGET_MIPS is not set +# CONFIG_CASIO_E55 is not set +# CONFIG_MIPS_COBALT is not set +# CONFIG_DECSTATION is not set +# CONFIG_MIPS_EV64120 is not set +# CONFIG_MIPS_EV96100 is not set +# CONFIG_MIPS_IVR is not set +# CONFIG_HP_LASERJET is not set +# CONFIG_IBM_WORKPAD is not set +# CONFIG_LASAT is not set +# CONFIG_MIPS_ITE8172 is not set +# CONFIG_MIPS_ATLAS is not set +# CONFIG_MIPS_MAGNUM_4000 is not set +# CONFIG_MIPS_MALTA is not set +# CONFIG_MIPS_SEAD is not set +# CONFIG_MOMENCO_OCELOT is not set +# CONFIG_MOMENCO_OCELOT_G is not set +# CONFIG_MOMENCO_OCELOT_C is not set +# CONFIG_MOMENCO_JAGUAR_ATX is not set +# CONFIG_PMC_BIG_SUR is not set +# CONFIG_PMC_STRETCH is not set +# CONFIG_PMC_YOSEMITE is not set +# CONFIG_DDB5074 is not set +# CONFIG_DDB5476 is not set +# CONFIG_DDB5477 is not set +# CONFIG_NEC_OSPREY is not set +# CONFIG_NEC_EAGLE is not set +# CONFIG_OLIVETTI_M700 is not set +# CONFIG_NINO is not set +# CONFIG_SGI_IP22 is not set +# CONFIG_SGI_IP27 is not set +# CONFIG_SIBYTE_SB1xxx_SOC is not set +CONFIG_MIPS_BRCM=y +CONFIG_BCM947XX=y +CONFIG_BCM4710=y +CONFIG_BCM4310=y +CONFIG_BCM4704=y +# CONFIG_BCM5365 is not set +# CONFIG_SNI_RM200_PCI is not set +# CONFIG_TANBAC_TB0226 is not set +# CONFIG_TANBAC_TB0229 is not set +# CONFIG_TOSHIBA_JMR3927 is not set +# CONFIG_TOSHIBA_RBTX4927 is not set +# CONFIG_VICTOR_MPC30X is not set +# CONFIG_ZAO_CAPCELLA is not set +# CONFIG_HIGHMEM is not set +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +CONFIG_PCI=y +CONFIG_NONCOHERENT_IO=y +CONFIG_NEW_TIME_C=y +CONFIG_NEW_IRQ=y +CONFIG_HND=y +# CONFIG_MIPS_AU1000 is not set + +# +# CPU selection +# +CONFIG_CPU_MIPS32=y +# CONFIG_CPU_MIPS64 is not set +# CONFIG_CPU_R3000 is not set +# CONFIG_CPU_TX39XX is not set +# CONFIG_CPU_VR41XX is not set +# CONFIG_CPU_R4300 is not set +# CONFIG_CPU_R4X00 is not set +# CONFIG_CPU_TX49XX is not set +# CONFIG_CPU_R5000 is not set +# CONFIG_CPU_R5432 is not set +# CONFIG_CPU_R6000 is not set +# CONFIG_CPU_NEVADA is not set +# CONFIG_CPU_R8000 is not set +# CONFIG_CPU_R10000 is not set +# CONFIG_CPU_RM7000 is not set +# CONFIG_CPU_RM9000 is not set +# CONFIG_CPU_SB1 is not set +CONFIG_PAGE_SIZE_4KB=y +# CONFIG_PAGE_SIZE_16KB is not set +# CONFIG_PAGE_SIZE_64KB is not set +CONFIG_CPU_HAS_PREFETCH=y +# CONFIG_VTAG_ICACHE is not set +# CONFIG_64BIT_PHYS_ADDR is not set +# CONFIG_CPU_ADVANCED is not set +CONFIG_CPU_HAS_LLSC=y +# CONFIG_CPU_HAS_LLDSCD is not set +# CONFIG_CPU_HAS_WB is not set +CONFIG_CPU_HAS_SYNC=y + +# +# General setup +# +CONFIG_CPU_LITTLE_ENDIAN=y +# CONFIG_BUILD_ELF64 is not set +CONFIG_NET=y +CONFIG_PCI=y +# CONFIG_PCI_NEW is not set +CONFIG_PCI_AUTO=y +# CONFIG_PCI_NAMES is not set +# CONFIG_ISA is not set +# CONFIG_TC is not set +# CONFIG_MCA is not set +# CONFIG_SBUS is not set +CONFIG_HOTPLUG=y + +# +# PCMCIA/CardBus support +# +# CONFIG_PCMCIA is not set + +# +# PCI Hotplug Support +# +# CONFIG_HOTPLUG_PCI is not set +# CONFIG_HOTPLUG_PCI_COMPAQ is not set +# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set +# CONFIG_HOTPLUG_PCI_SHPC is not set +# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set +# CONFIG_HOTPLUG_PCI_PCIE is not set +# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set +CONFIG_SYSVIPC=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +CONFIG_KCORE_ELF=y +# CONFIG_KCORE_AOUT is not set +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_ELF_AOUT is not set +# CONFIG_MIPS32_COMPAT is not set +# CONFIG_MIPS32_O32 is not set +# CONFIG_MIPS32_N32 is not set +# CONFIG_BINFMT_ELF32 is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_OOM_KILLER is not set +# CONFIG_CMDLINE_BOOL is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +# CONFIG_MTD_CFI_B1 is not set +CONFIG_MTD_CFI_B2=y +# CONFIG_MTD_CFI_B4 is not set +# CONFIG_MTD_CFI_B8 is not set +CONFIG_MTD_CFI_I1=y +# CONFIG_MTD_CFI_I2 is not set +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_SSTSTD=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_AMDSTD is not set +# CONFIG_MTD_SHARP is not set +# CONFIG_MTD_JEDEC is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_BCM947XX=y +# CONFIG_MTD_PB1000 is not set +# CONFIG_MTD_PB1500 is not set +# CONFIG_MTD_PB1100 is not set +# CONFIG_MTD_BOSPORUS is not set +# CONFIG_MTD_XXS1500 is not set +# CONFIG_MTD_MTX1 is not set +# CONFIG_MTD_DB1X00 is not set +# CONFIG_MTD_PB1550 is not set +# CONFIG_MTD_HYDROGEN3 is not set +# CONFIG_MTD_MIRAGE is not set +# CONFIG_MTD_CSTM_MIPS_IXX is not set +# CONFIG_MTD_OCELOT is not set +# CONFIG_MTD_LASAT is not set +# CONFIG_MTD_PCI is not set +# CONFIG_MTD_PCMCIA is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SFLASH is not set +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLKMTD is not set +# CONFIG_MTD_DOC1000 is not set +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOCPROBE is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# Parallel port support +# +CONFIG_PARPORT=m +# CONFIG_PARPORT_PC is not set +CONFIG_PARPORT_SPLINK=m +# CONFIG_PARPORT_AMIGA is not set +# CONFIG_PARPORT_MFC3 is not set +# CONFIG_PARPORT_ATARI is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_SUNBPP is not set +# CONFIG_PARPORT_IP22 is not set +# CONFIG_PARPORT_OTHER is not set +# CONFIG_PARPORT_1284 is not set + +# +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set +# CONFIG_CISS_MONITOR_THREAD is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_SX8 is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_BLK_STATS is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set +# CONFIG_BLK_DEV_MD is not set +# CONFIG_MD_LINEAR is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_MD_RAID1 is not set +# CONFIG_MD_RAID5 is not set +# CONFIG_MD_MULTIPATH is not set +# CONFIG_BLK_DEV_LVM is not set + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_NETLINK_DEV=m +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +# CONFIG_FILTER is not set +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_FWMARK=y +CONFIG_IP_ROUTE_NAT=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_TOS=y +# CONFIG_IP_ROUTE_VERBOSE is not set +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_INET_ECN is not set +# CONFIG_SYN_COOKIES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=y +CONFIG_IP_NF_FTP=y +CONFIG_IP_NF_AMANDA=m +CONFIG_IP_NF_TFTP=y +CONFIG_IP_NF_IRC=y +CONFIG_IP_NF_CT_PROTO_GRE=m +CONFIG_IP_NF_PPTP=m +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_MAC=m +CONFIG_IP_NF_MATCH_PKTTYPE=m +CONFIG_IP_NF_MATCH_MARK=y +CONFIG_IP_NF_MATCH_MULTIPORT=y +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_IPP2P=m +CONFIG_IP_NF_MATCH_DSCP=m +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=y +CONFIG_IP_NF_MATCH_HELPER=m +CONFIG_IP_NF_MATCH_STATE=y +CONFIG_IP_NF_MATCH_CONNTRACK=m +CONFIG_IP_NF_MATCH_UNCLEAN=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_LAYER7=m +# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set +CONFIG_IP_NF_MATCH_LAYER7_MAXDATALEN=2048 +CONFIG_IP_NF_MATCH_PHYSDEV=m +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_MIRROR=m +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_NF_NAT_PPTP=m +CONFIG_IP_NF_NAT_PROTO_GRE=m +CONFIG_IP_NF_NAT_AMANDA=m +CONFIG_IP_NF_NAT_SNMP_BASIC=m +CONFIG_IP_NF_NAT_IRC=y +CONFIG_IP_NF_NAT_FTP=y +CONFIG_IP_NF_NAT_TFTP=y +CONFIG_IP_NF_MANGLE=y +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_DSCP=m +CONFIG_IP_NF_TARGET_MARK=y +CONFIG_IP_NF_TARGET_LOG=y +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=y +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_LIMIT=m +CONFIG_IP6_NF_MATCH_MAC=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_MULTIPORT=m +CONFIG_IP6_NF_MATCH_OWNER=m +CONFIG_IP6_NF_MATCH_MARK=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AHESP=m +CONFIG_IP6_NF_MATCH_LENGTH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_MARK=m +# CONFIG_KHTTPD is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set +# CONFIG_ATM is not set +CONFIG_VLAN_8021Q=y +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_DECNET is not set +CONFIG_BRIDGE=y +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_IPF=m +CONFIG_BRIDGE_EBT_ARPF=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_VLANF=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_MARKF=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_MARK_T=m +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_LLC is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +CONFIG_WAN_ROUTER=m +# CONFIG_NET_FASTROUTE is not set +# CONFIG_NET_HW_FLOWCONTROL is not set + +# +# QoS and/or fair queueing +# +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_CSZ=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +# CONFIG_NET_SCH_NETEM is not set +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_QOS=y +CONFIG_NET_ESTIMATOR=y +CONFIG_NET_CLS=y +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_POLICE=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_IPSEC_NAT_TRAVERSAL=y + +# +# Telephony Support +# +# CONFIG_PHONE is not set +# CONFIG_PHONE_IXJ is not set +# CONFIG_PHONE_IXJ_PCMCIA is not set + +# +# ATA/IDE/MFM/RLL support +# +CONFIG_IDE=m + +# +# IDE, ATA and ATAPI Block devices +# +CONFIG_BLK_DEV_IDE=m +# CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_IDEDISK_STROKE=y +# CONFIG_BLK_DEV_IDECS is not set +# CONFIG_BLK_DEV_DELKIN is not set +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set +# CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set +CONFIG_BLK_DEV_IDEPCI=y +# CONFIG_BLK_DEV_GENERIC is not set +# CONFIG_IDEPCI_SHARE_IRQ is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +CONFIG_BLK_DEV_OFFBOARD=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +CONFIG_IDEDMA_PCI_AUTO=y +# CONFIG_IDEDMA_ONLYDISK is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_PCI_WIP is not set +# CONFIG_BLK_DEV_ADMA100 is not set +# CONFIG_BLK_DEV_AEC62XX is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_WDC_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_AMD74XX_OVERRIDE is not set +# CONFIG_BLK_DEV_ATIIXP is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_BLK_DEV_TRIFLEX is not set +# CONFIG_BLK_DEV_CY82C693 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_HPT34X_AUTODMA is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_PIIX is not set +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_OPTI621 is not set +CONFIG_BLK_DEV_PDC202XX_OLD=m +CONFIG_PDC202XX_BURST=y +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_PDC202XX_FORCE is not set +# CONFIG_BLK_DEV_RZ1000 is not set +# CONFIG_BLK_DEV_SC1200 is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SIS5513 is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_IDE_CHIPSETS is not set +CONFIG_IDEDMA_AUTO=y +CONFIG_IDEDMA_IVB=y +# CONFIG_DMA_NONPCI is not set +CONFIG_BLK_DEV_PDC202XX=y +# CONFIG_BLK_DEV_ATARAID is not set +# CONFIG_BLK_DEV_ATARAID_PDC is not set +# CONFIG_BLK_DEV_ATARAID_HPT is not set +# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set +# CONFIG_BLK_DEV_ATARAID_SII is not set + +# +# SCSI support +# +CONFIG_SCSI=m +CONFIG_BLK_DEV_SD=m +CONFIG_SD_EXTRA_DEVS=5 +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_SCSI_DEBUG_QUEUES is not set +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI low-level drivers +# +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_7000FASST is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AHA1542 is not set +# CONFIG_SCSI_AHA1740 is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_MEGARAID is not set +# CONFIG_SCSI_MEGARAID2 is not set +# CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_SATA_AHCI is not set +# CONFIG_SCSI_SATA_SVW is not set +# CONFIG_SCSI_ATA_PIIX is not set +# CONFIG_SCSI_SATA_NV is not set +# CONFIG_SCSI_SATA_QSTOR is not set +# CONFIG_SCSI_SATA_PROMISE is not set +# CONFIG_SCSI_SATA_SX4 is not set +# CONFIG_SCSI_SATA_SIL is not set +# CONFIG_SCSI_SATA_SIS is not set +# CONFIG_SCSI_SATA_ULI is not set +# CONFIG_SCSI_SATA_VIA is not set +# CONFIG_SCSI_SATA_VITESSE is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_CPQFCTS is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_EATA_DMA is not set +# CONFIG_SCSI_EATA_PIO is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_NCR53C7xx is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_NCR53C8XX is not set +# CONFIG_SCSI_SYM53C8XX is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PCI2000 is not set +# CONFIG_SCSI_PCI2220I is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_QLOGIC_ISP is not set +# CONFIG_SCSI_QLOGIC_FC is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_SIM710 is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set +# CONFIG_FUSION_BOOT is not set +# CONFIG_FUSION_ISENSE is not set +# CONFIG_FUSION_CTL is not set +# CONFIG_FUSION_LAN is not set + +# +# IEEE 1394 (FireWire) support (EXPERIMENTAL) +# +# CONFIG_IEEE1394 is not set + +# +# I2O device support +# +# CONFIG_I2O is not set +# CONFIG_I2O_PCI is not set +# CONFIG_I2O_BLOCK is not set +# CONFIG_I2O_LAN is not set +# CONFIG_I2O_SCSI is not set +# CONFIG_I2O_PROC is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y + +# +# Broadcom HND network devices +# +CONFIG_HND=y +# CONFIG_IL is not set +CONFIG_ET=m +# CONFIG_ET_4413 is not set +CONFIG_ET_47XX=y +CONFIG_WL=m +CONFIG_WL_AP=y +CONFIG_WL_STA=y +# CONFIG_WL_OID is not set + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +CONFIG_NET_RANDOM=y +# CONFIG_ETHERTAP is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +# CONFIG_SUNLANCE is not set +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNBMAC is not set +# CONFIG_SUNQE is not set +# CONFIG_SUNGEM is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_LANCE is not set +# CONFIG_NET_VENDOR_SMC is not set +# CONFIG_NET_VENDOR_RACAL is not set +# CONFIG_HP100 is not set +# CONFIG_NET_ISA is not set +CONFIG_NET_PCI=y +# CONFIG_PCNET32 is not set +# CONFIG_AMD8111_ETH is not set +# CONFIG_ADAPTEC_STARFIRE is not set +# CONFIG_APRICOT is not set +CONFIG_B44=m +# CONFIG_CS89x0 is not set +# CONFIG_TULIP is not set +# CONFIG_DE4X5 is not set +# CONFIG_DGRS is not set +# CONFIG_DM9102 is not set +# CONFIG_EEPRO100 is not set +# CONFIG_EEPRO100_PIO is not set +# CONFIG_E100 is not set +# CONFIG_LNE390 is not set +# CONFIG_FEALNX is not set +# CONFIG_NATSEMI is not set +# CONFIG_NE2K_PCI is not set +# CONFIG_FORCEDETH is not set +# CONFIG_NE3210 is not set +# CONFIG_ES3210 is not set +# CONFIG_8139CP is not set +# CONFIG_8139TOO is not set +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_8139TOO_8129 is not set +# CONFIG_8139_OLD_RX_RESET is not set +# CONFIG_SIS900 is not set +# CONFIG_EPIC100 is not set +# CONFIG_SUNDANCE is not set +# CONFIG_SUNDANCE_MMIO is not set +# CONFIG_TLAN is not set +# CONFIG_VIA_RHINE is not set +# CONFIG_VIA_RHINE_MMIO is not set +# CONFIG_WINBOND_840 is not set +# CONFIG_LAN_SAA9730 is not set +# CONFIG_NET_POCKET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_MYRI_SBUS is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_R8169 is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE_MPPC=m +CONFIG_PPPOE=m +# CONFIG_SLIP is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_STRIP is not set +# CONFIG_WAVELAN is not set +# CONFIG_ARLAN is not set +# CONFIG_AIRONET4500 is not set +# CONFIG_AIRONET4500_NONCS is not set +# CONFIG_AIRONET4500_PROC is not set +# CONFIG_AIRO is not set +# CONFIG_HERMES is not set +# CONFIG_PLX_HERMES is not set +# CONFIG_TMD_HERMES is not set +# CONFIG_PCI_HERMES is not set +# CONFIG_PRISM54 is not set +CONFIG_NET_WIRELESS=y + +# +# Token Ring devices +# +# CONFIG_TR is not set +# CONFIG_NET_FC is not set +# CONFIG_RCPCI is not set +CONFIG_SHAPER=m + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# Amateur Radio support +# +# CONFIG_HAMRADIO is not set + +# +# IrDA (infrared) support +# +# CONFIG_IRDA is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input core support +# +# CONFIG_INPUT is not set +# CONFIG_INPUT_KEYBDEV is not set +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_UINPUT is not set + +# +# Character devices +# +# CONFIG_VT is not set +CONFIG_SERIAL=y +CONFIG_SERIAL_CONSOLE=y +# CONFIG_SERIAL_EXTENDED is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=128 +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +# CONFIG_PPDEV is not set +# CONFIG_TIPAR is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +# CONFIG_MOUSE is not set + +# +# Joysticks +# +# CONFIG_INPUT_GAMEPORT is not set +# CONFIG_QIC02_TAPE is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_IPMI_PANIC_EVENT is not set +# CONFIG_IPMI_DEVICE_INTERFACE is not set +# CONFIG_IPMI_KCS is not set +# CONFIG_IPMI_WATCHDOG is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM1535_WDT is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_SC520_WDT is not set +# CONFIG_PCWATCHDOG is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_IB700_WDT is not set +# CONFIG_WAFER_WDT is not set +# CONFIG_I810_TCO is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_60XX_WDT is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_SCx200_WDT is not set +CONFIG_SOFT_WATCHDOG=y +# CONFIG_W83877F_WDT is not set +# CONFIG_WDT is not set +# CONFIG_WDTPCI is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_SCx200 is not set +# CONFIG_SCx200_GPIO is not set +# CONFIG_AMD_PM768 is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set + +# +# Direct Rendering Manager (XFree86 DRI support) +# +# CONFIG_DRM is not set + +# +# File systems +# +# CONFIG_QUOTA is not set +# CONFIG_QFMT_V2 is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_ADFS_FS is not set +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +CONFIG_HFSPLUS_FS=m +# CONFIG_BEFS_FS is not set +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +CONFIG_EXT3_FS=m +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FAT_FS=m +# CONFIG_MSDOS_FS is not set +# CONFIG_UMSDOS_FS is not set +CONFIG_VFAT_FS=m +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +# CONFIG_JFFS2_BBC_ARMLIB is not set +CONFIG_JFFS2_BBC_LZO=y +CONFIG_JFFS2_BBC_LZARI=y +CONFIG_JFFS2_BBC_LZHD=y +CONFIG_JFFS2_BBC_LZSS=y +# CONFIG_CRAMFS is not set +CONFIG_SQUASHFS=y +CONFIG_TMPFS=y +CONFIG_RAMFS=y +# CONFIG_ISO9660_FS is not set +# CONFIG_JOLIET is not set +# CONFIG_ZISOFS is not set +# CONFIG_JFS_FS is not set +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS_RW is not set +# CONFIG_HPFS_FS is not set +CONFIG_PROC_FS=y +CONFIG_DEVFS_FS=y +CONFIG_DEVFS_MOUNT=y +# CONFIG_DEVFS_DEBUG is not set +CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX4FS_RW is not set +# CONFIG_ROMFS_FS is not set +CONFIG_EXT2_FS=m +# CONFIG_SYSV_FS is not set +# CONFIG_UDF_FS is not set +# CONFIG_UDF_RW is not set +# CONFIG_UFS_FS is not set +# CONFIG_UFS_FS_WRITE is not set +CONFIG_XFS_FS=m +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_TRACE is not set +# CONFIG_XFS_DEBUG is not set + +# +# Network File Systems +# +# CONFIG_CODA_FS is not set +# CONFIG_INTERMEZZO_FS is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_ROOT_NFS is not set +# CONFIG_NFSD is not set +# CONFIG_NFSD_V3 is not set +# CONFIG_NFSD_TCP is not set +CONFIG_SUNRPC=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_POSIX=y +# CONFIG_SMB_FS is not set +# CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +# CONFIG_ZISOFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SMB_NLS is not set +CONFIG_NLS=y + +# +# Native Language Support +# +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +CONFIG_USB_EHCI_HCD=m +# CONFIG_USB_UHCI is not set +CONFIG_USB_UHCI_ALT=m +CONFIG_USB_OHCI=m +# CONFIG_USB_AUDIO is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_BLUETOOTH is not set +# CONFIG_USB_MIDI is not set +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +# CONFIG_USB_STORAGE_ISD200 is not set +CONFIG_USB_STORAGE_DPCM=y +CONFIG_USB_STORAGE_HP8200e=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +# CONFIG_USB_ACM is not set +CONFIG_USB_PRINTER=m +# CONFIG_USB_HID is not set +# CONFIG_USB_HIDINPUT is not set +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_DC2XX is not set +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_SCANNER is not set +# CONFIG_USB_MICROTEK is not set +# CONFIG_USB_HPUSBSCSI is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_CATC is not set +# CONFIG_USB_CDCETHER is not set +# CONFIG_USB_USBNET is not set +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_TIGL is not set +# CONFIG_USB_BRLVGER is not set +# CONFIG_USB_LCD is not set + +# +# Support for USB gadgets +# +# CONFIG_USB_GADGET is not set + +# +# Bluetooth support +# +# CONFIG_BLUEZ is not set + +# +# Kernel hacking +# +CONFIG_CROSSCOMPILE=y +# CONFIG_RUNTIME_DEBUG is not set +# CONFIG_REMOTE_DEBUG is not set +# CONFIG_GDB_CONSOLE is not set +# CONFIG_DEBUG_INFO is not set +CONFIG_MAGIC_SYSRQ=y +# CONFIG_MIPS_UNCACHED is not set +CONFIG_LOG_BUF_SHIFT=0 + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +# CONFIG_CRYPTO_TEST is not set + +# +# Library routines +# +# CONFIG_CRC32 is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +# CONFIG_FW_LOADER is not set |