Changeset 4275


Ignore:
Timestamp:
2006-07-25T13:29:00+02:00 (12 years ago)
Author:
florian
Message:

Clean up patches : remove warnings, move cli() and save_flags to spinlock mechanisms

Location:
branches/buildroot-ng/openwrt/target/linux/brcm63xx-2.6/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/buildroot-ng/openwrt/target/linux/brcm63xx-2.6/patches/001-brcm_boards.patch

    r4182 r4275  
    13661366diff -urN linux-2.6.17/arch/mips/brcm-boards/bcm963xx/board.c linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/board.c 
    13671367--- linux-2.6.17/arch/mips/brcm-boards/bcm963xx/board.c 1970-01-01 01:00:00.000000000 +0100 
    1368 +++ linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/board.c        2006-07-14 15:39:56.000000000 +0200 
    1369 @@ -0,0 +1,1615 @@ 
     1368+++ linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/board.c        2006-07-25 10:59:34.000000000 +0200 
     1369@@ -0,0 +1,1619 @@ 
    13701370+/* 
    13711371+<:copyright-gpl  
     
    14141414+#include <linux/list.h> 
    14151415+#include <linux/if.h> 
     1416+#include <linux/spinlock.h> 
    14161417+ 
    14171418+#include <bcm_map_part.h> 
     
    14231424+#include "board.h" 
    14241425+#include "bcm_map_part.h" 
     1426+ 
     1427+static DEFINE_SPINLOCK(board_lock); 
    14251428+ 
    14261429+/* Typedefs. */ 
     
    18281831+ 
    18291832+        /* Disable interrupts. */ 
    1830 +        cli(); 
    1831 + 
     1833+        //cli(); 
     1834+       spin_lock_irq(&board_lock); 
     1835+        
    18321836+        /* Reset all blocks. */ 
    18331837+        PERF->BlockSoftReset &= ~BSR_ALL_BLOCKS; 
     
    53805384diff -urN linux-2.6.17/arch/mips/brcm-boards/bcm963xx/boardparms.h linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/boardparms.h 
    53815385--- linux-2.6.17/arch/mips/brcm-boards/bcm963xx/boardparms.h    1970-01-01 01:00:00.000000000 +0100 
    5382 +++ linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/boardparms.h   2006-07-13 19:11:33.000000000 +0200 
    5383 @@ -0,0 +1,766 @@ 
     5386+++ linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/boardparms.h   2006-07-25 10:18:49.000000000 +0200 
     5387@@ -0,0 +1,758 @@ 
    53845388+/* 
    53855389+<:copyright-gpl  
     
    54135417+#if !defined(_BOARDPARMS_H) 
    54145418+#define _BOARDPARMS_H 
    5415 + 
    5416 +#if __cplusplus 
    5417 +extern "C" { 
    5418 +#endif 
    54195419+ 
    54205420+/* Return codes. */ 
     
    61426142+#endif /* __ASSEMBLER__ */ 
    61436143+ 
    6144 +#if __cplusplus 
    6145 +} 
    6146 +#endif 
    6147 + 
    61486144+#endif /* _BOARDPARMS_H */ 
    61496145+ 
     
    68466842diff -urN linux-2.6.17/arch/mips/brcm-boards/bcm963xx/cfiflash.h linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/cfiflash.h 
    68476843--- linux-2.6.17/arch/mips/brcm-boards/bcm963xx/cfiflash.h      1970-01-01 01:00:00.000000000 +0100 
    6848 +++ linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/cfiflash.h     2006-07-13 19:11:33.000000000 +0200 
    6849 @@ -0,0 +1,150 @@ 
     6844+++ linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/cfiflash.h     2006-07-25 10:19:20.000000000 +0200 
     6845@@ -0,0 +1,142 @@ 
    68506846+/************************************************************************/ 
    68516847+/*                                                                      */ 
     
    68826878+#define _CFIFLASH_H 
    68836879+ 
    6884 +#if defined __cplusplus 
    6885 +extern "C" { 
    6886 +#endif 
    6887 + 
    68886880+/* include board/CPU specific definitions */ 
    68896881+#include "bcmtypes.h" 
     
    69936985+extern int flash_get_blk(int addr); 
    69946986+ 
    6995 +#if defined __cplusplus 
    6996 +} 
    6997 +#endif 
    6998 + 
    69996987+#endif 
    70006988diff -urN linux-2.6.17/arch/mips/brcm-boards/bcm963xx/irq.c linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/irq.c 
    70016989--- linux-2.6.17/arch/mips/brcm-boards/bcm963xx/irq.c   1970-01-01 01:00:00.000000000 +0100 
    7002 +++ linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/irq.c  2006-07-14 15:31:35.000000000 +0200 
    7003 @@ -0,0 +1,294 @@ 
     6990+++ linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/irq.c  2006-07-25 10:58:52.000000000 +0200 
     6991@@ -0,0 +1,299 @@ 
    70046992+/* 
    70056993+<:copyright-gpl  
     
    70347022+#include <linux/slab.h> 
    70357023+#include <linux/module.h> 
     7024+#include <linux/spinlock.h> 
    70367025+ 
    70377026+#include <asm/irq.h> 
     
    70417030+#include <bcm_map_part.h> 
    70427031+#include <bcm_intr.h> 
     7032+ 
     7033+static DEFINE_SPINLOCK(irq_lock); 
    70437034+ 
    70447035+static void irq_dispatch_int(struct pt_regs *regs) 
     
    70957086+       else if (cause & CAUSEF_IP6) 
    70967087+               irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_3, regs); 
    7097 +       cli(); 
     7088+       //cli(); 
     7089+       spin_lock_irq(&irq_lock); 
    70987090+    } 
    70997091+} 
     
    71157107+        else if (cause & CAUSEF_IP6) 
    71167108+                irq_dispatch_ext(INTERRUPT_ID_EXTERNAL_3, regs); 
    7117 +        cli(); 
     7109+        //cli(); 
     7110+       spin_lock_irq(&irq_lock); 
    71187111+    } 
    71197112+} 
     
    77417734diff -urN linux-2.6.17/arch/mips/brcm-boards/bcm963xx/ser_init.c linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/ser_init.c 
    77427735--- linux-2.6.17/arch/mips/brcm-boards/bcm963xx/ser_init.c      1970-01-01 01:00:00.000000000 +0100 
    7743 +++ linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/ser_init.c     2006-07-13 19:11:33.000000000 +0200 
     7736+++ linux-2.6.17-brcm63xx/arch/mips/brcm-boards/bcm963xx/ser_init.c     2006-07-25 10:51:12.000000000 +0200 
    77447737@@ -0,0 +1,180 @@ 
    77457738+/* 
     
    79107903+} 
    79117904+ 
    7912 +#if CONFIG_REMOTE_DEBUG 
     7905+#if defined (CONFIG_REMOTE_DEBUG) 
    79137906+/* Prevent other code from writing to the serial port */ 
    79147907+void _putc(char c) { } 
  • branches/buildroot-ng/openwrt/target/linux/brcm63xx-2.6/patches/020-bcmdrivers.patch

    r4117 r4275  
    1 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/Makefile linux-2.6.16.7-patched/bcmdrivers/opensource/Makefile 
    2 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/Makefile       1970-01-01 01:00:00.000000000 +0100 
    3 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/Makefile       2006-07-05 15:21:58.000000000 +0200 
    4 @@ -0,0 +1,20 @@ 
    5 +# File: modules/drivers/Makefile 
    6 +# 
    7 +# Makefile for the GPLed Linux kernel modules. 
    8 +# 
    9 + 
    10 +LN_NAME=bcm9$(BRCM_CHIP) 
    11 +LN_DRIVER_DIRS = 
    12 + 
    13 +-include $(KERNEL_DIR)/.config 
    14 + 
    15 +ifneq ($(CONFIG_BCM_SERIAL),) 
    16 +  LN_DRIVER_DIRS +=ln -sn impl$(CONFIG_BCM_SERIAL_IMPL) char/serial/$(LN_NAME); 
    17 +endif 
    18 + 
    19 +obj-$(CONFIG_BCM_SERIAL) += char/serial/impl$(CONFIG_BCM_SERIAL_IMPL)/ 
    20 + 
    21 + 
    22 +symlinks: 
    23 +       find . -lname "*" -name "$(LN_NAME)" -print -exec rm -f "{}" ";"         
    24 +       $(CONFIG_SHELL) -c "$(LN_DRIVER_DIRS)" 
    25 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/char/serial/impl1/Makefile linux-2.6.16.7-patched/bcmdrivers/opensource/char/serial/impl1/Makefile 
    26 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/char/serial/impl1/Makefile     1970-01-01 01:00:00.000000000 +0100 
    27 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/char/serial/impl1/Makefile     2006-07-05 15:21:58.000000000 +0200 
    28 @@ -0,0 +1,13 @@ 
    29 +# File: bcmdrivers/opensource/char/serial 
    30 +# 
    31 +# Makefile for the BCM63xx serial/console driver 
    32 + 
    33 +obj-$(CONFIG_BCM_SERIAL) += bcm63xx_cons.o 
    34 + 
    35 +EXTRA_CFLAGS += -I$(INC_BRCMDRIVER_PUB_PATH)/$(BRCM_BOARD) 
    36 + 
    37 +-include $(TOPDIR)/Rules.make 
    38 + 
    39 +clean: 
    40 +       rm -f core *.o *.a *.s 
    41 + 
    42 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux-2.6.16.7-patched/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c 
    43 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c       1970-01-01 01:00:00.000000000 +0100 
    44 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c       2006-07-05 15:21:58.000000000 +0200 
    45 @@ -0,0 +1,1038 @@ 
     1diff -urN linux-2.6.17/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c linux-2.6.17-brcm63xx/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c 
     2--- linux-2.6.17/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c 1970-01-01 01:00:00.000000000 +0100 
     3+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/char/serial/impl1/bcm63xx_cons.c        2006-07-25 12:57:09.000000000 +0200 
     4@@ -0,0 +1,1056 @@ 
    465+/* 
    476+<:copyright-gpl  
     
    7635+#include <linux/slab.h> 
    7736+#include <linux/interrupt.h> 
     37+#include <linux/spinlock.h> 
    7838+ 
    7939+/* for definition of struct console */ 
     
    8848+#include <bcm_map_part.h> 
    8949+#include <bcm_intr.h> 
     50+ 
     51+static DEFINE_SPINLOCK(bcm963xx_serial_lock); 
    9052+ 
    9153+extern void _putc(char); 
     
    350312+        return; 
    351313+ 
    352 +    save_flags (flags); 
    353 +    cli (); 
     314+        
     315+    /*save_flags (flags); 
     316+    cli ();*/ 
     317+    spin_lock_irqsave(&bcm963xx_serial_lock, flags); 
    354318+ 
    355319+    info->port->control &= ~(BRGEN|TXEN|RXEN); 
     
    358322+    info->is_initialized = 0; 
    359323+ 
    360 +    restore_flags (flags); 
     324+    //restore_flags (flags); 
     325+    spin_unlock_irqrestore(&bcm963xx_serial_lock, flags); 
    361326+} 
    362327+/*  
     
    370335+{ 
    371336+    unsigned long ulFlags, ulBaud, ulClockFreqHz, ulTmp; 
    372 +    save_flags(ulFlags); 
    373 +    cli(); 
     337+    /*save_flags(ulFlags); 
     338+    cli();*/ 
     339+    spin_lock_irqsave(&bcm963xx_serial_lock, ulFlags); 
     340+ 
    374341+    switch( cFlag & (CBAUD | CBAUDEX) ) 
    375342+    { 
     
    479446+    /* Reset and flush uart */ 
    480447+    pUart->fifoctl = RSTTXFIFOS | RSTRXFIFOS; 
    481 +    restore_flags( ulFlags ); 
     448+    //restore_flags( ulFlags ); 
     449+    spin_unlock_irqrestore(&bcm963xx_serial_lock, ulFlags); 
    482450+} 
    483451+ 
     
    665633+    current->state = TASK_INTERRUPTIBLE; 
    666634+ 
    667 +    save_flags (flags); 
    668 +    cli(); 
     635+    /*save_flags (flags); 
     636+    cli();*/ 
     637+    spin_lock_irqsave(&bcm963xx_serial_lock, flags); 
    669638+ 
    670639+    info->port->control |= XMITBREAK; 
     
    672641+    info->port->control &= ~XMITBREAK; 
    673642+ 
    674 +    restore_flags (flags); 
     643+    spin_unlock_irqrestore(&bcm963xx_serial_lock, flags); 
     644+    //restore_flags (flags); 
    675645+} 
    676646+ 
     
    784754+        return; 
    785755+ 
    786 +    save_flags (flags);  
    787 +    cli(); 
     756+    /*save_flags (flags);  
     757+    cli();*/ 
     758+    spin_lock_irqsave(&bcm963xx_serial_lock, flags); 
    788759+ 
    789760+    if (tty_hung_up_p (filp)) 
    790761+    { 
    791 +        restore_flags (flags); 
     762+        spin_unlock_irqrestore(&bcm963xx_serial_lock, flags); 
     763+        //restore_flags (flags); 
    792764+        return; 
    793765+    } 
     
    816788+    if (info->count) 
    817789+    { 
    818 +        restore_flags (flags); 
     790+        //restore_flags (flags); 
     791+       spin_unlock_irqrestore(&bcm963xx_serial_lock, flags); 
    819792+        return; 
    820793+    } 
     
    862835+    wake_up_interruptible (&info->close_wait); 
    863836+ 
    864 +    restore_flags (flags); 
     837+    //restore_flags (flags); 
     838+    spin_unlock_irqrestore(&bcm963xx_serial_lock, flags); 
    865839+} 
    866840+ 
     
    998972+        panic("Couldn't register serial driver\n"); 
    999973+ 
    1000 +    save_flags(flags); cli(); 
     974+    //save_flags(flags); cli(); 
     975+    spin_lock_irqsave(&bcm963xx_serial_lock, flags); 
     976+     
    1001977+    for (i = 0; i < BCM_NUM_UARTS; i++) 
    1002978+    { 
     
    10291005+     * it is unwise.  
    10301006+     */ 
    1031 +    restore_flags(flags); 
     1007+    //restore_flags(flags); 
     1008+    spin_unlock_irqrestore(&bcm963xx_serial_lock, flags); 
    10321009+    return 0; 
    10331010+} 
     
    10821059+ 
    10831060+console_initcall(bcm63xx_console_init); 
    1084 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6338_intr.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6338_intr.h 
    1085 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6338_intr.h   1970-01-01 01:00:00.000000000 +0100 
    1086 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6338_intr.h   2006-07-05 15:21:58.000000000 +0200 
    1087 @@ -0,0 +1,72 @@ 
     1061diff -urN linux-2.6.17/bcmdrivers/opensource/char/serial/impl1/Makefile linux-2.6.17-brcm63xx/bcmdrivers/opensource/char/serial/impl1/Makefile 
     1062--- linux-2.6.17/bcmdrivers/opensource/char/serial/impl1/Makefile       1970-01-01 01:00:00.000000000 +0100 
     1063+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/char/serial/impl1/Makefile      2006-07-25 10:43:50.000000000 +0200 
     1064@@ -0,0 +1,13 @@ 
     1065+# File: bcmdrivers/opensource/char/serial 
     1066+# 
     1067+# Makefile for the BCM63xx serial/console driver 
     1068+ 
     1069+obj-$(CONFIG_BCM_SERIAL) += bcm63xx_cons.o 
     1070+ 
     1071+EXTRA_CFLAGS += -I$(INC_BRCMDRIVER_PUB_PATH)/$(BRCM_BOARD) 
     1072+ 
     1073+-include $(TOPDIR)/Rules.make 
     1074+ 
     1075+clean: 
     1076+       rm -f core *.o *.a *.s 
     1077+ 
     1078diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6338_intr.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6338_intr.h 
     1079--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6338_intr.h     1970-01-01 01:00:00.000000000 +0100 
     1080+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6338_intr.h    2006-07-25 10:44:46.000000000 +0200 
     1081@@ -0,0 +1,64 @@ 
    10881082+/* 
    10891083+<:copyright-gpl  
     
    11071101+#ifndef __6338_INTR_H 
    11081102+#define __6338_INTR_H 
    1109 + 
    1110 +#ifdef __cplusplus 
    1111 +    extern "C" { 
    1112 +#endif 
    11131103+ 
    11141104+/*=====================================================================*/ 
     
    11521142+#define INTERRUPT_ID_SDIO                (INTERNAL_ISR_TABLE_OFFSET + 17) 
    11531143+ 
    1154 +#ifdef __cplusplus 
    1155 +    } 
    1156 +#endif                     
    1157 + 
    11581144+#endif  /* __BCM6338_H */ 
    11591145+ 
    1160 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6338_map_part.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6338_map_part.h 
    1161 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6338_map_part.h       1970-01-01 01:00:00.000000000 +0100 
    1162 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6338_map_part.h       2006-07-05 15:21:58.000000000 +0200 
    1163 @@ -0,0 +1,341 @@ 
     1146diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6338_map_part.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6338_map_part.h 
     1147--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6338_map_part.h 1970-01-01 01:00:00.000000000 +0100 
     1148+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6338_map_part.h        2006-07-25 10:44:59.000000000 +0200 
     1149@@ -0,0 +1,334 @@ 
    11641150+/* 
    11651151+<:copyright-gpl  
     
    11831169+#ifndef __BCM6338_MAP_H 
    11841170+#define __BCM6338_MAP_H 
    1185 + 
    1186 +#if __cplusplus 
    1187 +extern "C" { 
    1188 +#endif 
    11891171+ 
    11901172+#include "bcmtypes.h" 
     
    14971479+#define MPI ((volatile MpiRegisters * const) MPI_BASE) 
    14981480+ 
    1499 +#if __cplusplus 
    1500 +} 
     1481+ 
    15011482+#endif 
    15021483+ 
    1503 +#endif 
    1504 + 
    1505 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6345_intr.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6345_intr.h 
    1506 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6345_intr.h   1970-01-01 01:00:00.000000000 +0100 
    1507 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6345_intr.h   2006-07-05 15:21:58.000000000 +0200 
    1508 @@ -0,0 +1,78 @@ 
     1484diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6345_intr.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6345_intr.h 
     1485--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6345_intr.h     1970-01-01 01:00:00.000000000 +0100 
     1486+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6345_intr.h    2006-07-25 10:45:09.000000000 +0200 
     1487@@ -0,0 +1,72 @@ 
    15091488+/* 
    15101489+<:copyright-gpl  
     
    15291508+#define __6345_INTR_H 
    15301509+ 
    1531 +#ifdef __cplusplus 
    1532 +    extern "C" { 
    1533 +#endif 
    15341510+ 
    15351511+/*=====================================================================*/ 
     
    15791555+#define INTERRUPT_ID_USB_ISO_TX_CHAN    (DMA_ISR_TABLE_OFFSET + USB_ISO_TX_CHAN) 
    15801556+ 
    1581 +#ifdef __cplusplus 
    1582 +    } 
    1583 +#endif                     
    15841557+ 
    15851558+#endif  /* __BCM6345_H */ 
    15861559+ 
    1587 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6345_map_part.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6345_map_part.h 
    1588 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6345_map_part.h       1970-01-01 01:00:00.000000000 +0100 
    1589 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6345_map_part.h       2006-07-05 15:21:58.000000000 +0200 
    1590 @@ -0,0 +1,169 @@ 
     1560diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6345_map_part.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6345_map_part.h 
     1561--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6345_map_part.h 1970-01-01 01:00:00.000000000 +0100 
     1562+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6345_map_part.h        2006-07-25 10:45:19.000000000 +0200 
     1563@@ -0,0 +1,163 @@ 
    15911564+/* 
    15921565+<:copyright-gpl  
     
    16111584+#define __BCM6345_MAP_H 
    16121585+ 
    1613 +#if __cplusplus 
    1614 +extern "C" { 
    1615 +#endif 
    16161586+ 
    16171587+#include "bcmtypes.h" 
     
    17521722+#define GPIO_NUM_TO_MASK(X)             (1 << ((X) & GPIO_NUM_MAX_BITS_MASK)) 
    17531723+ 
    1754 +#if __cplusplus 
    1755 +} 
     1724+ 
    17561725+#endif 
    17571726+ 
    1758 +#endif 
    1759 + 
    1760 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6348_intr.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6348_intr.h 
    1761 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6348_intr.h   1970-01-01 01:00:00.000000000 +0100 
    1762 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6348_intr.h   2006-07-05 15:21:58.000000000 +0200 
    1763 @@ -0,0 +1,80 @@ 
     1727diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6348_intr.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6348_intr.h 
     1728--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6348_intr.h     1970-01-01 01:00:00.000000000 +0100 
     1729+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6348_intr.h    2006-07-25 10:45:33.000000000 +0200 
     1730@@ -0,0 +1,74 @@ 
    17641731+/* 
    17651732+<:copyright-gpl  
     
    17841751+#define __6348_INTR_H 
    17851752+ 
    1786 +#ifdef __cplusplus 
    1787 +    extern "C" { 
    1788 +#endif 
    17891753+ 
    17901754+/*=====================================================================*/ 
     
    18361800+#define INTERRUPT_ID_DG                  (INTERNAL_ISR_TABLE_OFFSET + 25) 
    18371801+ 
    1838 +#ifdef __cplusplus 
    1839 +    } 
    1840 +#endif                     
    18411802+ 
    18421803+#endif  /* __BCM6348_H */ 
    18431804+ 
    1844 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6348_map_part.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6348_map_part.h 
    1845 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/6348_map_part.h       1970-01-01 01:00:00.000000000 +0100 
    1846 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/6348_map_part.h       2006-07-05 15:21:58.000000000 +0200 
    1847 @@ -0,0 +1,508 @@ 
     1805diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6348_map_part.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6348_map_part.h 
     1806--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/6348_map_part.h 1970-01-01 01:00:00.000000000 +0100 
     1807+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/6348_map_part.h        2006-07-25 10:44:21.000000000 +0200 
     1808@@ -0,0 +1,500 @@ 
    18481809+/* 
    18491810+<:copyright-gpl  
     
    18671828+#ifndef __BCM6348_MAP_H 
    18681829+#define __BCM6348_MAP_H 
    1869 + 
    1870 +#if __cplusplus 
    1871 +extern "C" { 
    1872 +#endif 
    18731830+ 
    18741831+#include "bcmtypes.h" 
     
    23482305+#define USBH_NON_OHCI ((volatile unsigned long * const) USB_HOST_NON_OHCI) 
    23492306+ 
    2350 +#if __cplusplus 
    2351 +} 
    23522307+#endif 
    23532308+ 
     2309diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/bcm_intr.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/bcm_intr.h 
     2310--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/bcm_intr.h      1970-01-01 01:00:00.000000000 +0100 
     2311+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/bcm_intr.h     2006-07-25 10:43:50.000000000 +0200 
     2312@@ -0,0 +1,59 @@ 
     2313+/* 
     2314+<:copyright-gpl  
     2315+ Copyright 2003 Broadcom Corp. All Rights Reserved.  
     2316+  
     2317+ This program is free software; you can distribute it and/or modify it  
     2318+ under the terms of the GNU General Public License (Version 2) as  
     2319+ published by the Free Software Foundation.  
     2320+  
     2321+ This program is distributed in the hope it will be useful, but WITHOUT  
     2322+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or  
     2323+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License  
     2324+ for more details.  
     2325+  
     2326+ You should have received a copy of the GNU General Public License along  
     2327+ with this program; if not, write to the Free Software Foundation, Inc.,  
     2328+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.  
     2329+:> 
     2330+*/ 
     2331+ 
     2332+#ifndef __BCM_INTR_H 
     2333+#define __BCM_INTR_H 
     2334+ 
     2335+#ifdef __cplusplus 
     2336+    extern "C" { 
    23542337+#endif 
    23552338+ 
    2356 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/bcmTag.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/bcmTag.h 
    2357 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/bcmTag.h      1970-01-01 01:00:00.000000000 +0100 
    2358 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/bcmTag.h      2006-07-05 15:21:58.000000000 +0200 
     2339+#if defined(CONFIG_BCM96338) 
     2340+#include <6338_intr.h> 
     2341+#endif 
     2342+#if defined(CONFIG_BCM96345) 
     2343+#include <6345_intr.h> 
     2344+#endif 
     2345+#if defined(CONFIG_BCM96348) 
     2346+#include <6348_intr.h> 
     2347+#endif 
     2348+ 
     2349+/* defines */ 
     2350+struct pt_regs; 
     2351+typedef int (*FN_HANDLER) (int, void *, struct pt_regs *); 
     2352+ 
     2353+/* prototypes */ 
     2354+extern void enable_brcm_irq(unsigned int irq); 
     2355+extern void disable_brcm_irq(unsigned int irq); 
     2356+extern int request_external_irq(unsigned int irq, 
     2357+    FN_HANDLER handler, unsigned long irqflags,  
     2358+    const char * devname, void *dev_id); 
     2359+extern unsigned int BcmHalMapInterrupt(FN_HANDLER isr, unsigned int param, 
     2360+    unsigned int interruptId); 
     2361+extern void dump_intr_regs(void); 
     2362+ 
     2363+/* compatibility definitions */ 
     2364+#define BcmHalInterruptEnable(irq)      enable_brcm_irq( irq ) 
     2365+#define BcmHalInterruptDisable(irq)     disable_brcm_irq( irq ) 
     2366+ 
     2367+#ifdef __cplusplus 
     2368+    } 
     2369+#endif 
     2370+ 
     2371+#endif 
     2372diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/bcm_map_part.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/bcm_map_part.h 
     2373--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/bcm_map_part.h  1970-01-01 01:00:00.000000000 +0100 
     2374+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/bcm_map_part.h 2006-07-25 10:43:50.000000000 +0200 
     2375@@ -0,0 +1,34 @@ 
     2376+/* 
     2377+<:copyright-gpl  
     2378+ Copyright 2004 Broadcom Corp. All Rights Reserved.  
     2379+  
     2380+ This program is free software; you can distribute it and/or modify it  
     2381+ under the terms of the GNU General Public License (Version 2) as  
     2382+ published by the Free Software Foundation.  
     2383+  
     2384+ This program is distributed in the hope it will be useful, but WITHOUT  
     2385+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or  
     2386+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License  
     2387+ for more details.  
     2388+  
     2389+ You should have received a copy of the GNU General Public License along  
     2390+ with this program; if not, write to the Free Software Foundation, Inc.,  
     2391+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.  
     2392+:> 
     2393+*/ 
     2394+ 
     2395+#ifndef __BCM_MAP_PART_H 
     2396+#define __BCM_MAP_PART_H 
     2397+ 
     2398+#if defined(CONFIG_BCM96338) 
     2399+#include <6338_map_part.h> 
     2400+#endif 
     2401+#if defined(CONFIG_BCM96345) 
     2402+#include <6345_map_part.h> 
     2403+#endif 
     2404+#if defined(CONFIG_BCM96348) 
     2405+#include <6348_map_part.h> 
     2406+#endif 
     2407+ 
     2408+#endif 
     2409+ 
     2410diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/bcmpci.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/bcmpci.h 
     2411--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/bcmpci.h        1970-01-01 01:00:00.000000000 +0100 
     2412+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/bcmpci.h       2006-07-25 10:43:50.000000000 +0200 
     2413@@ -0,0 +1,87 @@ 
     2414+/* 
     2415+<:copyright-gpl  
     2416+ Copyright 2004 Broadcom Corp. All Rights Reserved.  
     2417+  
     2418+ This program is free software; you can distribute it and/or modify it  
     2419+ under the terms of the GNU General Public License (Version 2) as  
     2420+ published by the Free Software Foundation.  
     2421+  
     2422+ This program is distributed in the hope it will be useful, but WITHOUT  
     2423+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or  
     2424+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License  
     2425+ for more details.  
     2426+  
     2427+ You should have received a copy of the GNU General Public License along  
     2428+ with this program; if not, write to the Free Software Foundation, Inc.,  
     2429+ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.  
     2430+:> 
     2431+*/ 
     2432+ 
     2433+// 
     2434+// bcmpci.h - bcm96348 PCI, Cardbus, and PCMCIA definition 
     2435+// 
     2436+#ifndef BCMPCI_H 
     2437+#define BCMPCI_H 
     2438+ 
     2439+/* Memory window in internal system bus address space */  
     2440+#define BCM_PCI_MEM_BASE        0x08000000 
     2441+/* IO window in internal system bus address space */  
     2442+#define BCM_PCI_IO_BASE         0x0C000000 
     2443+ 
     2444+#define BCM_PCI_ADDR_MASK       0x1fffffff 
     2445+ 
     2446+/* Memory window size (range) */ 
     2447+#define BCM_PCI_MEM_SIZE_16MB   0x01000000 
     2448+/* IO window size (range) */ 
     2449+#define BCM_PCI_IO_SIZE_64KB    0x00010000 
     2450+ 
     2451+/* PCI Configuration and I/O space acesss */ 
     2452+#define BCM_PCI_CFG(d, f, o)    ( (d << 11) | (f << 8) | (o/4 << 2) ) 
     2453+ 
     2454+/* fake USB PCI slot */ 
     2455+#define USB_HOST_SLOT           9 
     2456+#define USB_BAR0_MEM_SIZE       0x0800 
     2457+ 
     2458+#define BCM_HOST_MEM_SPACE1     0x10000000 
     2459+#define BCM_HOST_MEM_SPACE2     0x00000000 
     2460+ 
     2461+/*  
     2462+ * EBI bus clock is 33MHz and share with PCI bus 
     2463+ * each clock cycle is 30ns. 
     2464+ */ 
     2465+/* attribute memory access wait cnt for 4306 */ 
     2466+#define PCMCIA_ATTR_CE_HOLD     3  // data hold time 70ns 
     2467+#define PCMCIA_ATTR_CE_SETUP    3  // data setup time 50ns 
     2468+#define PCMCIA_ATTR_INACTIVE    6  // time between read/write cycles 180ns. For the total cycle time 600ns (cnt1+cnt2+cnt3+cnt4) 
     2469+#define PCMCIA_ATTR_ACTIVE      10 // OE/WE pulse width 300ns 
     2470+ 
     2471+/* common memory access wait cnt for 4306 */ 
     2472+#define PCMCIA_MEM_CE_HOLD      1  // data hold time 30ns 
     2473+#define PCMCIA_MEM_CE_SETUP     1  // data setup time 30ns 
     2474+#define PCMCIA_MEM_INACTIVE     2  // time between read/write cycles 40ns. For the total cycle time 250ns (cnt1+cnt2+cnt3+cnt4) 
     2475+#define PCMCIA_MEM_ACTIVE       5  // OE/WE pulse width 150ns 
     2476+ 
     2477+#define PCCARD_VCC_MASK     0x00070000  // Mask Reset also 
     2478+#define PCCARD_VCC_33V      0x00010000 
     2479+#define PCCARD_VCC_50V      0x00020000 
     2480+ 
     2481+typedef enum { 
     2482+    MPI_CARDTYPE_NONE,      // No Card in slot 
     2483+    MPI_CARDTYPE_PCMCIA,    // 16-bit PCMCIA card in slot     
     2484+    MPI_CARDTYPE_CARDBUS,   // 32-bit CardBus card in slot 
     2485+}   CardType; 
     2486+ 
     2487+#define CARDBUS_SLOT        0    // Slot 0 is default for CardBus 
     2488+ 
     2489+#define pcmciaAttrOffset    0x00200000 
     2490+#define pcmciaMemOffset     0x00000000 
     2491+// Needs to be right above PCI I/O space. Give 0x8000 (32K) to PCMCIA.  
     2492+#define pcmciaIoOffset      (BCM_PCI_IO_BASE + 0x80000) 
     2493+// Base Address is that mapped into the MPI ChipSelect registers.  
     2494+// UBUS bridge MemoryWindow 0 outputs a 0x00 for the base. 
     2495+#define pcmciaBase          0xbf000000 
     2496+#define pcmciaAttr          (pcmciaAttrOffset | pcmciaBase) 
     2497+#define pcmciaMem           (pcmciaMemOffset  | pcmciaBase) 
     2498+#define pcmciaIo            (pcmciaIoOffset   | pcmciaBase) 
     2499+ 
     2500+#endif 
     2501diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/bcmTag.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/bcmTag.h 
     2502--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/bcmTag.h        1970-01-01 01:00:00.000000000 +0100 
     2503+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/bcmTag.h       2006-07-25 10:43:50.000000000 +0200 
    23592504@@ -0,0 +1,153 @@ 
    23602505+/* 
     
    25112656+#endif // _BCMTAG_H_ 
    25122657+ 
    2513 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/bcm_intr.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/bcm_intr.h 
    2514 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/bcm_intr.h    1970-01-01 01:00:00.000000000 +0100 
    2515 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/bcm_intr.h    2006-07-05 15:21:58.000000000 +0200 
    2516 @@ -0,0 +1,59 @@ 
    2517 +/* 
    2518 +<:copyright-gpl  
    2519 + Copyright 2003 Broadcom Corp. All Rights Reserved.  
    2520 +  
    2521 + This program is free software; you can distribute it and/or modify it  
    2522 + under the terms of the GNU General Public License (Version 2) as  
    2523 + published by the Free Software Foundation.  
    2524 +  
    2525 + This program is distributed in the hope it will be useful, but WITHOUT  
    2526 + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or  
    2527 + FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License  
    2528 + for more details.  
    2529 +  
    2530 + You should have received a copy of the GNU General Public License along  
    2531 + with this program; if not, write to the Free Software Foundation, Inc.,  
    2532 + 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.  
    2533 +:> 
    2534 +*/ 
    2535 + 
    2536 +#ifndef __BCM_INTR_H 
    2537 +#define __BCM_INTR_H 
    2538 + 
    2539 +#ifdef __cplusplus 
    2540 +    extern "C" { 
    2541 +#endif 
    2542 + 
    2543 +#if defined(CONFIG_BCM96338) 
    2544 +#include <6338_intr.h> 
    2545 +#endif 
    2546 +#if defined(CONFIG_BCM96345) 
    2547 +#include <6345_intr.h> 
    2548 +#endif 
    2549 +#if defined(CONFIG_BCM96348) 
    2550 +#include <6348_intr.h> 
    2551 +#endif 
    2552 + 
    2553 +/* defines */ 
    2554 +struct pt_regs; 
    2555 +typedef int (*FN_HANDLER) (int, void *, struct pt_regs *); 
    2556 + 
    2557 +/* prototypes */ 
    2558 +extern void enable_brcm_irq(unsigned int irq); 
    2559 +extern void disable_brcm_irq(unsigned int irq); 
    2560 +extern int request_external_irq(unsigned int irq, 
    2561 +    FN_HANDLER handler, unsigned long irqflags,  
    2562 +    const char * devname, void *dev_id); 
    2563 +extern unsigned int BcmHalMapInterrupt(FN_HANDLER isr, unsigned int param, 
    2564 +    unsigned int interruptId); 
    2565 +extern void dump_intr_regs(void); 
    2566 + 
    2567 +/* compatibility definitions */ 
    2568 +#define BcmHalInterruptEnable(irq)      enable_brcm_irq( irq ) 
    2569 +#define BcmHalInterruptDisable(irq)     disable_brcm_irq( irq ) 
    2570 + 
    2571 +#ifdef __cplusplus 
    2572 +    } 
    2573 +#endif 
    2574 + 
    2575 +#endif 
    2576 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/bcm_map_part.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/bcm_map_part.h 
    2577 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/bcm_map_part.h        1970-01-01 01:00:00.000000000 +0100 
    2578 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/bcm_map_part.h        2006-07-05 15:21:58.000000000 +0200 
    2579 @@ -0,0 +1,34 @@ 
    2580 +/* 
    2581 +<:copyright-gpl  
    2582 + Copyright 2004 Broadcom Corp. All Rights Reserved.  
    2583 +  
    2584 + This program is free software; you can distribute it and/or modify it  
    2585 + under the terms of the GNU General Public License (Version 2) as  
    2586 + published by the Free Software Foundation.  
    2587 +  
    2588 + This program is distributed in the hope it will be useful, but WITHOUT  
    2589 + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or  
    2590 + FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License  
    2591 + for more details.  
    2592 +  
    2593 + You should have received a copy of the GNU General Public License along  
    2594 + with this program; if not, write to the Free Software Foundation, Inc.,  
    2595 + 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.  
    2596 +:> 
    2597 +*/ 
    2598 + 
    2599 +#ifndef __BCM_MAP_PART_H 
    2600 +#define __BCM_MAP_PART_H 
    2601 + 
    2602 +#if defined(CONFIG_BCM96338) 
    2603 +#include <6338_map_part.h> 
    2604 +#endif 
    2605 +#if defined(CONFIG_BCM96345) 
    2606 +#include <6345_map_part.h> 
    2607 +#endif 
    2608 +#if defined(CONFIG_BCM96348) 
    2609 +#include <6348_map_part.h> 
    2610 +#endif 
    2611 + 
    2612 +#endif 
    2613 + 
    2614 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/bcmpci.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/bcmpci.h 
    2615 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/bcmpci.h      1970-01-01 01:00:00.000000000 +0100 
    2616 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/bcmpci.h      2006-07-05 15:21:58.000000000 +0200 
    2617 @@ -0,0 +1,87 @@ 
    2618 +/* 
    2619 +<:copyright-gpl  
    2620 + Copyright 2004 Broadcom Corp. All Rights Reserved.  
    2621 +  
    2622 + This program is free software; you can distribute it and/or modify it  
    2623 + under the terms of the GNU General Public License (Version 2) as  
    2624 + published by the Free Software Foundation.  
    2625 +  
    2626 + This program is distributed in the hope it will be useful, but WITHOUT  
    2627 + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or  
    2628 + FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License  
    2629 + for more details.  
    2630 +  
    2631 + You should have received a copy of the GNU General Public License along  
    2632 + with this program; if not, write to the Free Software Foundation, Inc.,  
    2633 + 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.  
    2634 +:> 
    2635 +*/ 
    2636 + 
    2637 +// 
    2638 +// bcmpci.h - bcm96348 PCI, Cardbus, and PCMCIA definition 
    2639 +// 
    2640 +#ifndef BCMPCI_H 
    2641 +#define BCMPCI_H 
    2642 + 
    2643 +/* Memory window in internal system bus address space */  
    2644 +#define BCM_PCI_MEM_BASE        0x08000000 
    2645 +/* IO window in internal system bus address space */  
    2646 +#define BCM_PCI_IO_BASE         0x0C000000 
    2647 + 
    2648 +#define BCM_PCI_ADDR_MASK       0x1fffffff 
    2649 + 
    2650 +/* Memory window size (range) */ 
    2651 +#define BCM_PCI_MEM_SIZE_16MB   0x01000000 
    2652 +/* IO window size (range) */ 
    2653 +#define BCM_PCI_IO_SIZE_64KB    0x00010000 
    2654 + 
    2655 +/* PCI Configuration and I/O space acesss */ 
    2656 +#define BCM_PCI_CFG(d, f, o)    ( (d << 11) | (f << 8) | (o/4 << 2) ) 
    2657 + 
    2658 +/* fake USB PCI slot */ 
    2659 +#define USB_HOST_SLOT           9 
    2660 +#define USB_BAR0_MEM_SIZE       0x0800 
    2661 + 
    2662 +#define BCM_HOST_MEM_SPACE1     0x10000000 
    2663 +#define BCM_HOST_MEM_SPACE2     0x00000000 
    2664 + 
    2665 +/*  
    2666 + * EBI bus clock is 33MHz and share with PCI bus 
    2667 + * each clock cycle is 30ns. 
    2668 + */ 
    2669 +/* attribute memory access wait cnt for 4306 */ 
    2670 +#define PCMCIA_ATTR_CE_HOLD     3  // data hold time 70ns 
    2671 +#define PCMCIA_ATTR_CE_SETUP    3  // data setup time 50ns 
    2672 +#define PCMCIA_ATTR_INACTIVE    6  // time between read/write cycles 180ns. For the total cycle time 600ns (cnt1+cnt2+cnt3+cnt4) 
    2673 +#define PCMCIA_ATTR_ACTIVE      10 // OE/WE pulse width 300ns 
    2674 + 
    2675 +/* common memory access wait cnt for 4306 */ 
    2676 +#define PCMCIA_MEM_CE_HOLD      1  // data hold time 30ns 
    2677 +#define PCMCIA_MEM_CE_SETUP     1  // data setup time 30ns 
    2678 +#define PCMCIA_MEM_INACTIVE     2  // time between read/write cycles 40ns. For the total cycle time 250ns (cnt1+cnt2+cnt3+cnt4) 
    2679 +#define PCMCIA_MEM_ACTIVE       5  // OE/WE pulse width 150ns 
    2680 + 
    2681 +#define PCCARD_VCC_MASK     0x00070000  // Mask Reset also 
    2682 +#define PCCARD_VCC_33V      0x00010000 
    2683 +#define PCCARD_VCC_50V      0x00020000 
    2684 + 
    2685 +typedef enum { 
    2686 +    MPI_CARDTYPE_NONE,      // No Card in slot 
    2687 +    MPI_CARDTYPE_PCMCIA,    // 16-bit PCMCIA card in slot     
    2688 +    MPI_CARDTYPE_CARDBUS,   // 32-bit CardBus card in slot 
    2689 +}   CardType; 
    2690 + 
    2691 +#define CARDBUS_SLOT        0    // Slot 0 is default for CardBus 
    2692 + 
    2693 +#define pcmciaAttrOffset    0x00200000 
    2694 +#define pcmciaMemOffset     0x00000000 
    2695 +// Needs to be right above PCI I/O space. Give 0x8000 (32K) to PCMCIA.  
    2696 +#define pcmciaIoOffset      (BCM_PCI_IO_BASE + 0x80000) 
    2697 +// Base Address is that mapped into the MPI ChipSelect registers.  
    2698 +// UBUS bridge MemoryWindow 0 outputs a 0x00 for the base. 
    2699 +#define pcmciaBase          0xbf000000 
    2700 +#define pcmciaAttr          (pcmciaAttrOffset | pcmciaBase) 
    2701 +#define pcmciaMem           (pcmciaMemOffset  | pcmciaBase) 
    2702 +#define pcmciaIo            (pcmciaIoOffset   | pcmciaBase) 
    2703 + 
    2704 +#endif 
    2705 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h 
    2706 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h    1970-01-01 01:00:00.000000000 +0100 
    2707 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h    2006-07-05 15:21:58.000000000 +0200 
     2658diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h 
     2659--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h      1970-01-01 01:00:00.000000000 +0100 
     2660+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h     2006-07-25 10:43:50.000000000 +0200 
    27082661@@ -0,0 +1,163 @@ 
    27092662+/* 
     
    28702823+ 
    28712824+#endif 
    2872 diff -Naurp linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/board.h linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/board.h 
    2873 --- linux-2.6.16.7-generic-patched/bcmdrivers/opensource/include/bcm963xx/board.h       1970-01-01 01:00:00.000000000 +0100 
    2874 +++ linux-2.6.16.7-patched/bcmdrivers/opensource/include/bcm963xx/board.h       2006-07-05 15:21:58.000000000 +0200 
    2875 @@ -0,0 +1,374 @@ 
     2825diff -urN linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/board.h linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/board.h 
     2826--- linux-2.6.17/bcmdrivers/opensource/include/bcm963xx/board.h 1970-01-01 01:00:00.000000000 +0100 
     2827+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/include/bcm963xx/board.h        2006-07-25 11:00:10.000000000 +0200 
     2828@@ -0,0 +1,368 @@ 
    28762829+/* 
    28772830+<:copyright-gpl  
     
    29032856+#define _BOARD_H 
    29042857+ 
    2905 +#if __cplusplus 
    2906 +extern "C" { 
    2907 +#endif 
    29082858+/*****************************************************************************/ 
    29092859+/*                    Misc board definitions                                 */ 
     
    32423192+#endif 
    32433193+ 
    3244 +#if __cplusplus 
    3245 +} 
    3246 +#endif 
    32473194+ 
    32483195+#endif /* _BOARD_H */ 
    32493196+ 
     3197diff -urN linux-2.6.17/bcmdrivers/opensource/Makefile linux-2.6.17-brcm63xx/bcmdrivers/opensource/Makefile 
     3198--- linux-2.6.17/bcmdrivers/opensource/Makefile 1970-01-01 01:00:00.000000000 +0100 
     3199+++ linux-2.6.17-brcm63xx/bcmdrivers/opensource/Makefile        2006-07-25 10:43:50.000000000 +0200 
     3200@@ -0,0 +1,20 @@ 
     3201+# File: modules/drivers/Makefile 
     3202+# 
     3203+# Makefile for the GPLed Linux kernel modules. 
     3204+# 
     3205+ 
     3206+LN_NAME=bcm9$(BRCM_CHIP) 
     3207+LN_DRIVER_DIRS = 
     3208+ 
     3209+-include $(KERNEL_DIR)/.config 
     3210+ 
     3211+ifneq ($(CONFIG_BCM_SERIAL),) 
     3212+  LN_DRIVER_DIRS +=ln -sn impl$(CONFIG_BCM_SERIAL_IMPL) char/serial/$(LN_NAME); 
     3213+endif 
     3214+ 
     3215+obj-$(CONFIG_BCM_SERIAL) += char/serial/impl$(CONFIG_BCM_SERIAL_IMPL)/ 
     3216+ 
     3217+ 
     3218+symlinks: 
     3219+       find . -lname "*" -name "$(LN_NAME)" -print -exec rm -f "{}" ";"         
     3220+       $(CONFIG_SHELL) -c "$(LN_DRIVER_DIRS)" 
Note: See TracChangeset for help on using the changeset viewer.