root/trunk/gspi-9.70.3_to_zipit2-1.0.patch

Revision 2, 18.0 kB (checked in by drmikecrowe, 1 year ago)

Updated patch to match community request.
Fixed blob patch.

Engineering notes:

I’ve updated the GPL patch files, and they appear clean now. The
problems with them turned out to be CVS updating the RCS keywords that
showed up in some projects as well as the patch files themselves.

I’ve also fixed the make_patches.sh script in the CVS zipit2/build_tree
repository so that it generates correct patch files. The correct patch
files are also attached to this email.

These patches can be applied from the root directory of each project by
patch –p2 < “project patch file” (i.e. these patches have a
build_tree/”module” path prefix).

  • build_tree/wirelessDriver/src_gspi8686/Makefile

    old new  
    3737CFLAGS += -I$(PWD)/os/linux 
    3838CFLAGS += -I$(PWD)/wlan 
    3939 
    40 TOOLPATH_BULVERDE=      /usr/local/arm/3.3.2/bin 
    41 BULVERDE_DIR=           /tftpboot/bulverde/root 
     40TOOLPATH_BULVERDE=      /opt/timesys/toolchains/armv5l-linux/bin 
     41BULVERDE_DIR=           ../bin_gspi8686 
    4242 
    4343        INSTALLDIR=$(BULVERDE_DIR) 
    4444        PLATFORM=pxa270 
    4545        TOOLPATH=$(TOOLPATH_BULVERDE) 
    46         CROSS=$(TOOLPATH)/arm-linux- 
     46        CROSS=$(TOOLPATH)/armv5l-linux- 
    4747        KERNEL_WE=16 
    4848        # Intel Bulverde Mainstone Platform 
    4949        CONFIG_MAINSTONE=y 
     
    5555                # Default MVL kernel has WE14 
    5656                #KERNEL_WE=14 
    5757        endif 
    58         KERNELDIR=/usr/src/arm/linux-2.6.9 
     58        KERNELDIR=../../linux 
    5959 
    6060        PLATFORM = pxa270 
    6161        CFLAGS += -I$(PWD)/if/if_gspi 
     
    173173install: default 
    174174 
    175175        cp -f gspi.$(MODEXT) $(INSTALLDIR) 
     176        $(CROSS)strip --strip-unneeded $(INSTALLDIR)/gspi.$(MODEXT) 
    176177        $(MAKE) -C app/wlanconfig $@ INSTALLDIR=$(INSTALLDIR) 
    177178        cp -f gspi8xxx.$(MODEXT) $(INSTALLDIR)/gspi8686$(DBG).$(MODEXT) 
     179        $(CROSS)strip --strip-unneeded $(INSTALLDIR)/gspi8686$(DGB).$(MODEXT) 
    178180        echo "gspi8686 Driver Installed" 
    179181 
    180182distclean: 
  • build_tree/wirelessDriver/src_gspi8686/app/wlanconfig/Makefile

    old new  
    1313INSTALLPATH := $(PATH_TO_TOP)/$(RELPATH) 
    1414endif 
    1515 
     16CC=$(CROSS_COMPILE)gcc 
     17 
    1618# Override CFLAGS for application sources, remove __ kernel namespace defines 
    1719CFLAGS := $(filter-out -D__%, $(CFLAGS)) 
    1820 
    1921 
    2022# Add the wlan driver directory to the preprocessor include path 
    21 CFLAGS +=  -I$(PATH_TO_TOP)/wlan 
    22  
     23CFLAGS +=  -I$(PATH_TO_TOP)/wlan -I$(PATH_TO_TOP)/os/linux 
     24CFLAGS += -static 
    2325 
    2426# 
    2527# List of application executables to create 
     
    4244 
    4345distclean: clean 
    4446        @rm -f *~ core 
     47 
  • build_tree/wirelessDriver/src_gspi8686/io/gspi/pxa270/.gspi_io.o.d

    old new  
    1 gspi_io.o:  \ 
    2  /home/jkaisner/Zipit2/wireless/GSPI-8686-LINUX26-BULVERDE-9.70.3.p10-26409.P24.org/src_gspi8686/io/gspi/pxa270/gspi_io.c \ 
    3   ./include/linux/autoconf.h \ 
    4   /home/jkaisner/Zipit2/wireless/GSPI-8686-LINUX26-BULVERDE-9.70.3.p10-26409.P24.org/src_gspi8686/io/gspi/pxa270/gspi_io.h \ 
    5   include/linux/kernel.h \ 
    6   /opt/timesys/toolchains/armv5l-linux/lib/gcc/armv5l-linux/3.4.1/include/stdarg.h \ 
    7   include/linux/linkage.h include/asm/linkage.h include/linux/stddef.h \ 
    8   include/linux/compiler.h include/linux/compiler-gcc3.h \ 
    9   include/linux/compiler-gcc.h include/linux/types.h \ 
    10   include/linux/posix_types.h include/asm/posix_types.h \ 
    11   include/asm/types.h include/linux/bitops.h include/asm/bitops.h \ 
    12   include/asm/system.h include/asm/memory.h include/asm/arch/memory.h \ 
    13   include/asm/sizes.h include/asm-generic/memory_model.h \ 
    14   include/linux/irqflags.h include/asm/irqflags.h include/asm/ptrace.h \ 
    15   include/asm-generic/bitops/non-atomic.h \ 
    16   include/asm-generic/bitops/fls64.h include/asm-generic/bitops/sched.h \ 
    17   include/asm-generic/bitops/hweight.h include/linux/log2.h \ 
    18   include/asm/byteorder.h include/linux/byteorder/little_endian.h \ 
    19   include/linux/byteorder/swab.h include/linux/byteorder/generic.h \ 
    20   include/asm/bug.h include/asm-generic/bug.h include/linux/module.h \ 
    21   include/linux/spinlock.h include/linux/preempt.h \ 
    22   include/linux/thread_info.h include/asm/thread_info.h \ 
    23   include/asm/fpstate.h include/asm/domain.h include/linux/stringify.h \ 
    24   include/linux/bottom_half.h include/linux/spinlock_types.h \ 
    25   include/linux/lockdep.h include/linux/spinlock_types_up.h \ 
    26   include/linux/spinlock_up.h include/linux/spinlock_api_up.h \ 
    27   include/asm/atomic.h include/asm-generic/atomic.h include/linux/list.h \ 
    28   include/linux/poison.h include/linux/prefetch.h include/asm/processor.h \ 
    29   include/asm/cache.h include/linux/stat.h include/asm/stat.h \ 
    30   include/linux/time.h include/linux/seqlock.h include/linux/cache.h \ 
    31   include/linux/kmod.h include/linux/errno.h include/asm/errno.h \ 
    32   include/asm-generic/errno.h include/asm-generic/errno-base.h \ 
    33   include/linux/elf.h include/linux/auxvec.h include/asm/auxvec.h \ 
    34   include/linux/elf-em.h include/asm/elf.h include/asm/user.h \ 
    35   include/asm/page.h include/asm/glue.h include/asm-generic/page.h \ 
    36   include/linux/kobject.h include/linux/sysfs.h include/linux/rwsem.h \ 
    37   include/linux/rwsem-spinlock.h include/linux/kref.h \ 
    38   include/linux/wait.h include/asm/current.h include/linux/moduleparam.h \ 
    39   include/linux/init.h include/asm/local.h include/asm-generic/local.h \ 
    40   include/linux/percpu.h include/linux/slab.h include/linux/gfp.h \ 
    41   include/linux/mmzone.h include/linux/threads.h include/linux/numa.h \ 
    42   include/linux/nodemask.h include/linux/bitmap.h include/linux/string.h \ 
    43   include/asm/string.h include/linux/memory_hotplug.h \ 
    44   include/linux/notifier.h include/linux/mutex.h include/linux/srcu.h \ 
    45   include/linux/topology.h include/linux/cpumask.h include/linux/smp.h \ 
    46   include/asm/topology.h include/asm-generic/topology.h \ 
    47   include/linux/slab_def.h include/linux/kmalloc_sizes.h \ 
    48   include/asm/percpu.h include/asm-generic/percpu.h \ 
    49   include/linux/hardirq.h include/linux/smp_lock.h include/linux/sched.h \ 
    50   include/asm/param.h include/linux/capability.h include/linux/timex.h \ 
    51   include/asm/timex.h include/asm/arch/timex.h include/linux/jiffies.h \ 
    52   include/linux/calc64.h include/asm/div64.h include/linux/rbtree.h \ 
    53   include/asm/semaphore.h include/asm/locks.h include/asm/mmu.h \ 
    54   include/asm/cputime.h include/asm-generic/cputime.h include/linux/sem.h \ 
    55   include/linux/ipc.h include/asm/ipcbuf.h include/asm/sembuf.h \ 
    56   include/linux/signal.h include/asm/signal.h \ 
    57   include/asm-generic/signal.h include/asm/sigcontext.h \ 
    58   include/asm/siginfo.h include/asm-generic/siginfo.h \ 
    59   include/linux/securebits.h include/linux/fs_struct.h \ 
    60   include/linux/completion.h include/linux/pid.h include/linux/rcupdate.h \ 
    61   include/linux/seccomp.h include/linux/futex.h include/linux/rtmutex.h \ 
    62   include/linux/plist.h include/linux/param.h include/linux/resource.h \ 
    63   include/asm/resource.h include/asm-generic/resource.h \ 
    64   include/linux/timer.h include/linux/ktime.h include/linux/hrtimer.h \ 
    65   include/linux/task_io_accounting.h include/linux/aio.h \ 
    66   include/linux/workqueue.h include/linux/aio_abi.h include/linux/uio.h \ 
    67   include/linux/sysdev.h include/linux/pm.h include/asm/hardirq.h \ 
    68   include/asm/irq.h include/asm/arch/irqs.h include/linux/irq_cpustat.h \ 
    69   include/asm/module.h include/linux/version.h include/linux/delay.h \ 
    70   include/asm/delay.h include/linux/device.h include/linux/ioport.h \ 
    71   include/linux/klist.h include/asm/device.h include/linux/fs.h \ 
    72   include/linux/limits.h include/linux/ioctl.h include/asm/ioctl.h \ 
    73   include/asm-generic/ioctl.h include/linux/kdev_t.h \ 
    74   include/linux/dcache.h include/linux/namei.h include/linux/radix-tree.h \ 
    75   include/linux/prio_tree.h include/linux/quota.h \ 
    76   include/linux/dqblk_xfs.h include/linux/dqblk_v1.h \ 
    77   include/linux/dqblk_v2.h include/linux/nfs_fs_i.h include/linux/nfs.h \ 
    78   include/linux/sunrpc/msg_prot.h include/linux/fcntl.h \ 
    79   include/asm/fcntl.h include/asm-generic/fcntl.h include/linux/err.h \ 
    80   include/asm/dma.h include/asm/scatterlist.h include/asm/arch/dma.h \ 
    81   include/asm/hardware.h include/asm/arch/hardware.h include/asm/io.h \ 
    82   include/asm/arch/io.h include/asm/arch/pxa-regs.h \ 
    83   include/linux/interrupt.h include/linux/irqreturn.h \ 
    84   include/linux/dma-mapping.h include/asm/dma-mapping.h \ 
    85   include/linux/mm.h include/linux/debug_locks.h \ 
    86   include/linux/backing-dev.h include/linux/mm_types.h \ 
    87   include/asm/pgtable.h include/asm-generic/4level-fixup.h \ 
    88   include/asm/proc-fns.h include/asm/cpu-single.h \ 
    89   include/asm/arch/vmalloc.h include/asm/pgtable-hwdef.h \ 
    90   include/asm-generic/pgtable.h include/linux/page-flags.h \ 
    91   include/linux/vmstat.h \ 
    92   /home/jkaisner/Zipit2/wireless/GSPI-8686-LINUX26-BULVERDE-9.70.3.p10-26409.P24.org/src_gspi8686/os/linux/os_defs.h \ 
    93   /home/jkaisner/Zipit2/wireless/GSPI-8686-LINUX26-BULVERDE-9.70.3.p10-26409.P24.org/src_gspi8686/io/gspi/pxa270/gspi_debug.h 
  • build_tree/wirelessDriver/src_gspi8686/io/gspi/pxa270/gspi_io.c

    old new  
    1212#include        "gspi_io.h" 
    1313#include        "gspi_debug.h" 
    1414 
     15#ifndef OLD_LINUX 
     16EXPORT_SYMBOL(register_user); 
     17EXPORT_SYMBOL(unregister_user); 
     18EXPORT_SYMBOL(gspi_read_reg); 
     19EXPORT_SYMBOL(gspi_write_reg); 
     20EXPORT_SYMBOL(gspi_read_data_direct); 
     21EXPORT_SYMBOL(gspi_write_data_direct); 
     22EXPORT_SYMBOL(gspi_register_irq); 
     23EXPORT_SYMBOL(gspi_unregister_irq); 
     24EXPORT_SYMBOL(gspi_reset); 
     25#endif 
     26 
    1527#define USE_DMA                         1 
    1628#define SSP_SFRM                        24 
    17 #define SSP_IRQ                         22 
     29#define SSP_IRQ                         36 
    1830#define GSPI_DIRECT_MAJOR               240 
    1931#define SFRM_DOWN                       0 
    2032#define SFRM_UP                         1 
     
    2840static int clkdiv = 0; 
    2941volatile int dma_transfer = 0; 
    3042 
     43module_param(clkdiv, int, 0); 
     44 
    3145int g_dummy_clk_reg = 0; 
    3246int g_dummy_clk_ioport = 0; 
    3347int g_bus_mode_reg = 0x02; 
     
    632646{ 
    633647    _ENTER(); 
    634648 
    635     SET_PXA_GPIO_MODE(GPIO23_SCLK_md);  //SCLK 
     649    SET_PXA_GPIO_MODE(GPIO23_SCLK_MD);  //SCLK 
    636650    SET_PXA_GPIO_MODE(GPIO24_SFRM | GPIO_OUT);  //SFRM 
    637651    SET_PXA_GPIO_MODE(GPIO25_STXD_MD);  //TX 
    638652    SET_PXA_GPIO_MODE(GPIO26_SRXD_MD);  //RX 
     
    785799 
    786800module_init(gspihost_module_init); 
    787801module_exit(gspihost_module_exit); 
    788 MODULE_LICENSE("Proprietary"); 
    789  
    790 MODULE_PARM(clkdiv, "i"); 
     802//MODULE_LICENSE("Proprietary"); 
     803MODULE_LICENSE("GPL"); 
     804MODULE_PARM_DESC(clkdiv, "Clock Divisor"); 
  • build_tree/wirelessDriver/src_gspi8686/io/gspi/pxa270/gspi_io.h

    old new  
    1919#include        <linux/fs.h> 
    2020#endif 
    2121 
     22#include        <linux/irq.h> 
     23 
    2224#include        <asm/dma.h> 
    2325#include        <asm/hardware.h> 
    2426#include        <asm/irq.h> 
     
    4244#define EXTERN extern 
    4345 
    4446/* Bit definitions for SSP Control register 0 */ 
     47#ifdef OLD_LINUX 
    4548#define SSCR0_SSE       (1 << 7) 
    4649#define SSCR0_DSS(x)    (x) 
    4750#define SSCR0_FRF(x)    (x << 4) 
     
    8083#define SSPSP_DMYSTOP(x)        (x << 23) 
    8184#define SSPSP_FRST              (1 << 25) 
    8285 
     86#else //OLD_LINUX 
     87 
     88#define SSCR0_DSS(x)    (x) 
     89#define SSCR0_FRF(x)    (x << 4) 
     90#define SSCR0_SCR(x)    ((x) << 8) 
     91#define SSCR1_RFT(x)    (x << 10) 
     92#define SSCR1_TFT(x)    (x << 6) 
     93 
     94#endif //OLD_LINUX 
    8395/* 
    8496 *      SSP Serial Port Registers 
    8597 **/ 
     
    266278EXTERN gspi_notifier_rec_p register_user(gspi_notifier_rec_p notifierp); 
    267279EXTERN void unregister_user(gspi_notifier_rec_p notifierp); 
    268280 
     281#ifdef OLD_LINUX 
    269282EXPORT_SYMBOL(register_user); 
    270283EXPORT_SYMBOL(unregister_user); 
    271284EXPORT_SYMBOL(gspi_read_reg); 
     
    275288EXPORT_SYMBOL(gspi_register_irq); 
    276289EXPORT_SYMBOL(gspi_unregister_irq); 
    277290EXPORT_SYMBOL(gspi_reset); 
     291#endif 
    278292 
    279293#endif /* _GSPI_IO_H */ 
  • build_tree/wirelessDriver/src_gspi8686/os/linux/wlan_thread.h

    old new  
    3636static inline void 
    3737wlan_create_thread(int (*wlanfunc) (void *), wlan_thread * thr, char *name) 
    3838{ 
     39        struct sched_param param = { .sched_priority = 80 }; 
    3940    thr->task = kthread_run(wlanfunc, thr, "%s", name); 
     41        sched_setscheduler(thr->task,SCHED_RR,&param); 
     42        printk(KERN_NOTICE"%s priority = %d:%d:%d:%d\n",name,thr->task->prio,thr->task->static_prio,thr->task->normal_prio,thr->task->policy); 
    4043} 
    4144 
    4245static inline int 
  • build_tree/wirelessDriver/src_gspi8686/wlan/wlan_join.c

    old new  
    306306        } 
    307307    } else { 
    308308        /* Set the SSID */ 
    309         reqSSID.SsidLength = dwrq->length - 1; 
     309// JWK  - no longer need this        reqSSID.SsidLength = dwrq->length - 1; 
     310                reqSSID.SsidLength = dwrq->length; 
    310311        memcpy(reqSSID.Ssid, extra, reqSSID.SsidLength); 
    311  
    312312    } 
    313313 
    314314    PRINTM(INFO, "Requested new SSID = %s\n", 
  • build_tree/wirelessDriver/src_gspi8686/wlan/wlan_main.c

    old new  
    2929********************************************************/ 
    3030 
    3131#include    "include.h" 
     32#include <linux/syscalls.h> 
     33 
     34#ifdef _MAINSTONE 
     35#include <asm/arch/mainstone.h> 
     36#endif 
    3237 
    3338/******************************************************** 
    3439        Local Variables 
     
    751756            TX_RESTORE; 
    752757            schedule(); 
    753758            PRINTM(INFO, "main-thread waking up: IntCnt=%d " 
    754                    "CurCmd=%s CmdPending=%s\n" 
    755                    "                       Connect=%s " 
    756                    "CurTxSkb=%s dnld_sent=%d\n", 
     759                   "CurCmd=%s CmdPending=%s\n", 
    757760                   Adapter->IntCounter, 
    758761                   (Adapter->CurCmd) ? "Y" : "N", 
    759                    list_empty(&Adapter->CmdPendingQ) ? "N" : "Y", 
     762                   list_empty(&Adapter->CmdPendingQ) ? "N" : "Y"); 
     763            PRINTM(INFO,"                       Connect=%s " 
     764                   "CurTxSkb=%s dnld_sent=%d\n", 
    760765                   (Adapter->MediaConnectStatus) ? "Y" : "N", 
    761766                   (Adapter->CurrentTxSkb) ? "Y" : "N", 
    762767                   priv->wlan_dev.dnld_sent); 
     
    938943    dev->watchdog_timeo = MRVDRV_DEFAULT_WATCHDOG_TIMEOUT; 
    939944 
    940945#ifdef  WIRELESS_EXT 
    941     dev->get_wireless_stats = wlan_get_wireless_stats; 
     946//    dev->get_wireless_stats = wlan_get_wireless_stats; 
    942947    dev->wireless_handlers = (struct iw_handler_def *) &wlan_handler_def; 
    943948#endif 
    944949#define NETIF_F_DYNALLOC 16 
     
    13341339 
    13351340MODULE_DESCRIPTION("M-WLAN Driver"); 
    13361341MODULE_AUTHOR("Marvell International Ltd."); 
     1342 
     1343MODULE_LICENSE("GPL"); 
  • build_tree/wirelessDriver/src_gspi8686/wlan/wlan_scan.c

    old new  
    1414    01/11/06: Initial revision. New scan code, relocate related functions 
    1515    01/19/06: Update specific scan routines to discard old results for adhoc 
    1616    01/31/06: Add support for selectively enabling the FW Scan channel filter 
     17    10/24/07: Modify invalid SSID detection so that all APs are reported 
    1718 
    1819************************************************************/ 
    1920 
     
    251252    int ssidIdx; 
    252253 
    253254    for (ssidIdx = 0; ssidIdx < pSsid->SsidLength; ssidIdx++) { 
    254         if (!isprint(pSsid->Ssid[ssidIdx])) { 
    255             return FALSE; 
     255      if (!isprint(pSsid->Ssid[ssidIdx]))  
     256        { 
     257          /* Force SSID length to zero if SSID contains invalid characters... */ 
     258          pSsid->SsidLength = 0; 
    256259        } 
    257260    } 
    258  
     261    /* Always return TRUE so that all APs are reported... */ 
    259262    return TRUE; 
    260263} 
    261264 
     
    28622865     *    driver scan table either as an update to an existing entry 
    28632866     *    or as an addition at the end of the table 
    28642867     */ 
    2865     for (idx = 0; idx < pScan->NumberOfSets && bytesLeft; idx++) { 
     2868    for (idx = 0; idx < pScan->NumberOfSets && bytesLeft; idx++)  
     2869      { 
    28662870        /* Zero out the newBssEntry we are about to store info in */ 
    28672871        memset(&newBssEntry, 0x00, sizeof(newBssEntry)); 
    28682872 
  • build_tree/wirelessDriver/src_gspi8686/wlan/wlan_wext.c

    old new  
    7575#else 
    7676#define DEFAULT_DEBUG_MASK      (DBG_MSG | DBG_FATAL) 
    7777#endif 
     78#else 
     79#define DEFAULT_DEBUG_MASK 0     
     80#endif 
     81 
    7882u32 drvdbg = DEFAULT_DEBUG_MASK; 
    7983u32 ifdbg = 0; 
    80 #endif 
     84module_param(drvdbg, int, 0); 
     85module_param(ifdbg, int, 0); 
    8186 
    8287/******************************************************** 
    8388                Local Functions 
     
    38353840  standard:(iw_handler *) wlan_handler, 
    38363841  private:(iw_handler *) wlan_private_handler, 
    38373842  private_args:(struct iw_priv_args *) wlan_private_args, 
     3843 
     3844        get_wireless_stats: wlan_get_wireless_stats 
    38383845}; 
    38393846 
    38403847/**  
Note: See TracBrowser for help on using the browser.