[arch-commits] Commit in intel-537/trunk (14 files)

Tobias Powalowski tpowa at archlinux.org
Sat Oct 11 14:41:00 EDT 2008


    Date: Saturday, October 11, 2008 @ 14:40:59
  Author: tpowa
Revision: 14949

upgpkg: intel-537 2.60.80.0-58

Added:
  intel-537/trunk/kernel-2.6.27.patch
Modified:
  intel-537/trunk/PKGBUILD
  intel-537/trunk/intel-537.install
  intel-537/trunk/kernel-2.6.26.patch
Deleted:
  intel-537/trunk/asmlinkage.patch
  intel-537/trunk/compile.patch
  intel-537/trunk/coredrv.patch
  intel-537/trunk/flip.patch
  intel-537/trunk/intel-537-tty.patch
  intel-537/trunk/kernel-2.6.19.patch
  intel-537/trunk/kernel-2.6.20.patch
  intel-537/trunk/kernel-2.6.24.patch
  intel-537/trunk/module-parm.patch
  intel-537/trunk/pm_unregister.patch

---------------------+
 PKGBUILD            |   39 +++++++--------------
 asmlinkage.patch    |   86 ----------------------------------------------
 compile.patch       |   19 ----------
 coredrv.patch       |   22 -----------
 flip.patch          |   31 ----------------
 intel-537-tty.patch |   49 --------------------------
 intel-537.install   |    4 +-
 kernel-2.6.19.patch |   10 -----
 kernel-2.6.20.patch |   49 --------------------------
 kernel-2.6.24.patch |   22 -----------
 kernel-2.6.26.patch |   92 +++++++++++++++++++++++++-------------------------
 kernel-2.6.27.patch |   51 +++++++++++++++++++++++++++
 module-parm.patch   |   11 -----
 pm_unregister.patch |   12 ------
 14 files changed, 113 insertions(+), 384 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-11 18:35:24 UTC (rev 14948)
+++ PKGBUILD	2008-10-11 18:40:59 UTC (rev 14949)
@@ -1,46 +1,33 @@
 # $Id$
 # Maintainer : Tobias Powalowski <tpowa at archlinux.org>
 
-_kernver=2.6.26-ARCH;
+_kernver=2.6.27-ARCH;
 
 pkgname=intel-537
 pkgver=2.60.80.0
-pkgrel=57
+pkgrel=58
 pkgdesc="Intel Modem Drivers for 537 chipsets. For stock arch 2.6 kernel"
 arch=(i686 x86_64)
 license=('custom:"INTEL537"')
 url="http://linmodems.technion.ac.il/packages/Intel/"
 depends=('intel-537-utils' 'kernel26>=2.6.26-1' 'kernel26<2.6.27')
-source=(http://downloadmirror.intel.com/9284/eng/Intel-537EP-2.70.95.0-suse9.3.tgz flip.patch compile.patch \
-	module-parm.patch pm_unregister.patch asmlinkage.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.24.patch kernel-2.6.26.patch)
+source=(http://linmodems.technion.ac.il/packages/intel/Philippe.Vouters/intel-537EP_secure-2.60.80.0_2008_03_22.tar.bz2
+	kernel-2.6.26.patch
+	kernel-2.6.27.patch)
 install=intel-537.install
 
 build() {
-  cd $startdir/src/Intel-537
-  patch -Np0 -i ../flip.patch || return 1
-  patch -Np0 -i ../compile.patch || return 1
-  patch -Np1 -i ../module-parm.patch || return 1
-  patch -Np1 -i ../pm_unregister.patch || return 1
-  patch -Np1 -i ../asmlinkage.patch || return 1
-  patch -Np0 -i ../kernel-2.6.19.patch || return 1
-  patch -Np0 -i ../kernel-2.6.20.patch || return 1
-  patch -Np0 -i ../kernel-2.6.24.patch || return 1
-  patch -Np0 -i ../kernel-2.6.26.patch || return 1
+  cd $srcdir/intel-537EP_secure-2.60.80.0
   # fix makefile
   sed -i -e "s/\`uname -r\`/${_kernver}/g" makefile
   sed -i -e "s/\`uname -r\`/${_kernver}/g" config_check
-  make KDIR=/lib/modules/${_kernver}/build KERNEL_SOURCE_PATH=/lib/modules/${_kernver}/build 537 || return 1
+  patch -Np0 -i ../kernel-2.6.26.patch || return 1
+  patch -Np1 -i ../kernel-2.6.27.patch || return 1
+  make KDIR=/lib/modules/${_kernver}/build KERNEL_SOURCE_PATH=/lib/modules/${_kernver}/build MODEM_TYPE=537 537 || return 1
   # Install kernel module
-  install -D -m 644 Intel537.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/intel537.ko || return 1
+  install -D -m 644 Intel537.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/net/intel537.ko || return 1
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/intel-537.install
  }
-md5sums=('1740a05c0ce039633f2dd65b055604b0'
-         'c459529b418a72d810f1c17b74ad24ac'
-         '2cea9fefc9844518f40a55f0c26a4714'
-         '24cdd2988a87075a4cb3a5de0ea118d5'
-         '4925209a57fcf7994d4436629f50a4da'
-         '288aa5d8fb6817c5de2119c6c8d3f27a'
-         '63bc7e293d012e5c6f6110c992da14a2'
-         'dfa22d3419daf52bd85c258702bcee3d'
-         '62ac61024d0df2ed99ae3e2c212420be'
-         '3b7439390784516c707712c07e15774b')
+md5sums=('f7f51cef6eac2b2b5e260c1747e025c6'
+         '8c8d0e85490194595cc4d80bc3da969c'
+         '787967a6bc3b371744f4262af32b2bed')

Deleted: asmlinkage.patch
===================================================================
--- asmlinkage.patch	2008-10-11 18:35:24 UTC (rev 14948)
+++ asmlinkage.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -1,86 +0,0 @@
-diff -ur Intel-536.orig/coredrv/lock_lin.h Intel-536/coredrv/lock_lin.h
---- Intel-536.orig/coredrv/lock_lin.h	2005-07-26 17:59:33.000000000 +0200
-+++ Intel-536/coredrv/lock_lin.h	2006-07-31 18:23:28.000000000 +0200
-@@ -89,44 +89,44 @@
- 
- 
- 
--extern void linux_MT_AcquireLock_LAPMrx_que(void);
--extern void linux_MT_ReleaseLock_LAPMrx_que(void);
--extern void linux_MT_AcquireLock_LAPMtx_que(void);
--extern void linux_MT_ReleaseLock_LAPMtx_que(void);
--extern void linux_MT_AcquireLock_LAPMemptied_que(void);
--extern void linux_MT_ReleaseLock_LAPMemptied_que(void);
--extern void linux_MT_AcquireLock_PortQIn(void);
--extern void linux_MT_ReleaseLock_PortQIn(void);
--extern void linux_MT_AcquireLock_PortQOut(void);
--extern void linux_MT_ReleaseLock_PortQOut(void);
--extern void linux_MT_AcquireLock_dte_rx_buffer(void);
--extern void linux_MT_ReleaseLock_dte_rx_buffer(void);
--extern void linux_MT_AcquireLock_dte_tx_buffer(void);
--extern void linux_MT_ReleaseLock_dte_tx_buffer(void);
--extern void linux_MT_AcquireLock_acu_rx_buffer(void);
--extern void linux_MT_ReleaseLock_acu_rx_buffer(void);
--extern void linux_MT_AcquireLock_acu_tx_buffer(void);
--extern void linux_MT_ReleaseLock_acu_tx_buffer(void);
--extern void linux_MT_AcquireLock_dce_rx_buffer(void);
--extern void linux_MT_ReleaseLock_dce_rx_buffer(void);
--extern void linux_MT_AcquireLock_dce_tx_buffer(void);
--extern void linux_MT_ReleaseLock_dce_tx_buffer(void);
--extern void linux_MT_AcquireLock_received_que(void);
--extern void linux_MT_ReleaseLock_received_que(void);
--extern void linux_MT_AcquireLock_emptied_que(void);
--extern void linux_MT_ReleaseLock_emptied_que(void);
--extern void linux_MT_AcquireLock_transmit_que(void);
--extern void linux_MT_ReleaseLock_transmit_que(void);
--extern void linux_MT_AcquireLock_clm_bg(void);
--extern void linux_MT_ReleaseLock_clm_bg(void);
--extern void linux_MT_AcquireLock_timer_task(void);
--extern void linux_MT_ReleaseLock_timer_task(void);
--extern void linux_MT_AcquireLock_mt_dsp(void);
--extern void linux_MT_ReleaseLock_mt_dsp(void);
--extern void linux_AcquireLock_data_to_user(void);
--extern void linux_ReleaseLock_data_to_user(void);
--extern void linux_AcquireLock_rts1(void);
--extern void linux_ReleaseLock_rts1(void);
-+extern asmlinkage void linux_MT_AcquireLock_LAPMrx_que(void);
-+extern asmlinkage void linux_MT_ReleaseLock_LAPMrx_que(void);
-+extern asmlinkage void linux_MT_AcquireLock_LAPMtx_que(void);
-+extern asmlinkage void linux_MT_ReleaseLock_LAPMtx_que(void);
-+extern asmlinkage void linux_MT_AcquireLock_LAPMemptied_que(void);
-+extern asmlinkage void linux_MT_ReleaseLock_LAPMemptied_que(void);
-+extern asmlinkage void linux_MT_AcquireLock_PortQIn(void);
-+extern asmlinkage void linux_MT_ReleaseLock_PortQIn(void);
-+extern asmlinkage void linux_MT_AcquireLock_PortQOut(void);
-+extern asmlinkage void linux_MT_ReleaseLock_PortQOut(void);
-+extern asmlinkage void linux_MT_AcquireLock_dte_rx_buffer(void);
-+extern asmlinkage void linux_MT_ReleaseLock_dte_rx_buffer(void);
-+extern asmlinkage void linux_MT_AcquireLock_dte_tx_buffer(void);
-+extern asmlinkage void linux_MT_ReleaseLock_dte_tx_buffer(void);
-+extern asmlinkage void linux_MT_AcquireLock_acu_rx_buffer(void);
-+extern asmlinkage void linux_MT_ReleaseLock_acu_rx_buffer(void);
-+extern asmlinkage void linux_MT_AcquireLock_acu_tx_buffer(void);
-+extern asmlinkage void linux_MT_ReleaseLock_acu_tx_buffer(void);
-+extern asmlinkage void linux_MT_AcquireLock_dce_rx_buffer(void);
-+extern asmlinkage void linux_MT_ReleaseLock_dce_rx_buffer(void);
-+extern asmlinkage void linux_MT_AcquireLock_dce_tx_buffer(void);
-+extern asmlinkage void linux_MT_ReleaseLock_dce_tx_buffer(void);
-+extern asmlinkage void linux_MT_AcquireLock_received_que(void);
-+extern asmlinkage void linux_MT_ReleaseLock_received_que(void);
-+extern asmlinkage void linux_MT_AcquireLock_emptied_que(void);
-+extern asmlinkage void linux_MT_ReleaseLock_emptied_que(void);
-+extern asmlinkage void linux_MT_AcquireLock_transmit_que(void);
-+extern asmlinkage void linux_MT_ReleaseLock_transmit_que(void);
-+extern asmlinkage void linux_MT_AcquireLock_clm_bg(void);
-+extern asmlinkage void linux_MT_ReleaseLock_clm_bg(void);
-+extern asmlinkage void linux_MT_AcquireLock_timer_task(void);
-+extern asmlinkage void linux_MT_ReleaseLock_timer_task(void);
-+extern asmlinkage void linux_MT_AcquireLock_mt_dsp(void);
-+extern asmlinkage void linux_MT_ReleaseLock_mt_dsp(void);
-+extern asmlinkage void linux_AcquireLock_data_to_user(void);
-+extern asmlinkage void linux_ReleaseLock_data_to_user(void);
-+extern asmlinkage void linux_AcquireLock_rts1(void);
-+extern asmlinkage void linux_ReleaseLock_rts1(void);
- 
- #if(1)
- #define  MT_AcquireLock_mt_dsp()          linux_MT_AcquireLock_mt_dsp();

Deleted: compile.patch
===================================================================
--- compile.patch	2008-10-11 18:35:24 UTC (rev 14948)
+++ compile.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -1,19 +0,0 @@
---- coredrv/coredrv.c~	2006-03-29 11:45:23.000000000 +0200
-+++ coredrv/coredrv.c	2006-03-29 12:03:20.000000000 +0200
-@@ -48,6 +48,7 @@
- 
- #ifdef CONFIG_PM
- #include <linux/pm.h>
-+#include <linux/pm_legacy.h>
- #endif
- 
- #include "uart.h"
-@@ -71,7 +72,7 @@
- 
- #include"softcore.h"
- int softcore_init_struct(struct softcore_struct*);
--EXPORT_SYMBOL_NOVERS(softcore_init_struct);
-+EXPORT_SYMBOL(softcore_init_struct);
- int open(void);
- void close(void);
- void stop(void);

Deleted: coredrv.patch
===================================================================
--- coredrv.patch	2008-10-11 18:35:24 UTC (rev 14948)
+++ coredrv.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -1,22 +0,0 @@
---- coredrv/coredrv.c~	2004-07-31 15:03:43.000000000 +0200
-+++ coredrv/coredrv.c	2005-03-30 09:47:25.000000000 +0200
-@@ -292,9 +292,6 @@
-         case PM_RESUME:
- 			open();
-             break;
--        case PM_SAVE_STATE:
--            printk(KERN_WARNING"Saving power state is not implemented\n");
--            break;
-         default:
-             printk(KERN_WARNING"Unknown power mode request to 537 modem driver\n");
-     }
-@@ -857,9 +854,6 @@
- 
- asmlinkage void kScheduleDPC(void)
- {
--#ifdef CONFIG_PM
--    pm_access(power_dev);
--#endif
-    #if defined(TARGET_CATAWBA)
-       dpc_function( 0 );
-    #else

Deleted: flip.patch
===================================================================
--- flip.patch	2008-10-11 18:35:24 UTC (rev 14948)
+++ flip.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -1,31 +0,0 @@
---- coredrv/coredrv.c~	2006-03-12 17:19:41.000000000 +0100
-+++ coredrv/coredrv.c	2006-03-12 17:29:07.000000000 +0100
-@@ -38,6 +38,7 @@
- #include <linux/sched.h>
- #include <linux/pci.h>
- #include <linux/tty.h>
-+#include <linux/tty_flip.h>
- #include <linux/serial.h>
- #include <linux/serialP.h>
- #include <linux/interrupt.h>
-@@ -583,18 +584,11 @@
-    unsigned char ch;
-    unsigned long flags;
- 
--   while ((UART_dte_to_num() > 0) && 
--          (G.softcore->ptty->flip.count < TTY_FLIPBUF_SIZE))
-+   while (UART_dte_to_num() > 0)
-    {
-       ch = UART_dte_from_char();
-       spin_lock_irqsave(&(G.softcore->ptty->read_lock), flags);
--
--      *(G.softcore->ptty->flip.char_buf_ptr) = ch;
--      *(G.softcore->ptty->flip.flag_buf_ptr) = 0;
--
--      G.softcore->ptty->flip.flag_buf_ptr++;
--      G.softcore->ptty->flip.char_buf_ptr++;
--      G.softcore->ptty->flip.count++;
-+      tty_insert_flip_char(G.softcore->ptty,ch,TTY_NORMAL);
-       tty_flip_buffer_push(G.softcore->ptty);
- 
-       spin_unlock_irqrestore(&(G.softcore->ptty->read_lock), flags);

Deleted: intel-537-tty.patch
===================================================================
--- intel-537-tty.patch	2008-10-11 18:35:24 UTC (rev 14948)
+++ intel-537-tty.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -1,49 +0,0 @@
---- coredrv/softserial_io.c~	2005-03-30 10:01:49.000000000 +0200
-+++ coredrv/softserial_io.c	2005-03-30 10:05:51.000000000 +0200
-@@ -55,7 +55,7 @@
- //=============================================================================
- static DECLARE_MUTEX(softserial_write_sem);
- int softserial_write(struct tty_struct* ptty,
--                      int from_user_space,
-+                      //int from_user_space,
-                       const unsigned char* input_buffer,
-                       int write_count_asked)  //why is it a signed int?
- {
-@@ -73,7 +73,7 @@
-    //printk("softserial:softserial_write()\n");
-    //printk("write: fus%d, count%d\n",from_user_space, write_count_asked);
-    
--   if(from_user_space)
-+   /*if(from_user_space)
-    {
-       down(&softserial_write_sem); //this may not be enough
-       while(write_count_asked - written_count > 0)
-@@ -107,7 +107,7 @@
-       up(&softserial_write_sem);
-    }
-    else           //data is from kernel space
--   {
-+   {*/
-       while(write_count_asked - written_count > 0)
-       {
-          softcore_space = G.softcore.write_free();
-@@ -127,7 +127,7 @@
-          input_buffer_ptr += copy_size;
-          written_count += copy_size;
-       }
--   }
-+   /*}*/
- 
-    return(written_count);
- }
---- coredrv/softserial.h~	2005-03-30 10:01:49.000000000 +0200
-+++ coredrv/softserial.h	2005-03-30 10:09:45.000000000 +0200
-@@ -86,7 +86,7 @@
- int  softserial_open           (struct tty_struct*, struct file*);
- void softserial_put_char       (struct tty_struct*, unsigned char);
- void softserial_set_termios    (struct tty_struct*, struct termios*);
--int  softserial_write          (struct tty_struct*, int, const unsigned char*, int);
-+int  softserial_write          (struct tty_struct*, const unsigned char*, int);
- int  softserial_ioctl          (struct tty_struct*, struct file*, unsigned int, unsigned long);
- 
- 

Modified: intel-537.install
===================================================================
--- intel-537.install	2008-10-11 18:35:24 UTC (rev 14948)
+++ intel-537.install	2008-10-11 18:40:59 UTC (rev 14949)
@@ -8,7 +8,7 @@
 
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.26-ARCH
+  KERNEL_VERSION=2.6.27-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 echo
 echo
@@ -30,7 +30,7 @@
   rm /etc/hamregistry.bin
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.26-ARCH
+  KERNEL_VERSION=2.6.27-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 

Deleted: kernel-2.6.19.patch
===================================================================
--- kernel-2.6.19.patch	2008-10-11 18:35:24 UTC (rev 14948)
+++ kernel-2.6.19.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -1,10 +0,0 @@
---- coredrv/hamdefs.h~	2005-07-26 17:59:33.000000000 +0200
-+++ coredrv/hamdefs.h	2006-10-17 16:07:32.000000000 +0200
-@@ -46,7 +46,6 @@
- #if defined(DRIVERCODE)
-    #define EXPORT_SYMTAB
-    #include<linux/version.h>
--   #include<linux/config.h>
-    #include<linux/kernel.h>
-    #define _LOOSE_KERNEL_NAMES
-    #include<linux/types.h>

Deleted: kernel-2.6.20.patch
===================================================================
--- kernel-2.6.20.patch	2008-10-11 18:35:24 UTC (rev 14948)
+++ kernel-2.6.20.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -1,49 +0,0 @@
---- coredrv/coredrv.c~	2007-01-08 22:46:01.000000000 +0100
-+++ coredrv/coredrv.c	2007-01-08 22:49:52.000000000 +0100
-@@ -767,8 +767,8 @@
-       timeout1 = wait_event_interruptible_timeout(persistReadQ, 0, timeout1);
-    }
- }
--DECLARE_WORK(wait_wq2, WakeTask2, NULL);
--DECLARE_WORK(wait_wq, WakeTask, NULL);
-+DECLARE_WORK(wait_wq2, WakeTask2);
-+DECLARE_WORK(wait_wq, WakeTask);
- #endif
- 
- asmlinkage void wake_up_interruptible_persistWriteQ(void)
---- coredrv/rts.c~	2005-07-26 17:59:33.000000000 +0200
-+++ coredrv/rts.c	2007-01-08 22:53:13.000000000 +0100
-@@ -77,7 +77,7 @@
- };
- #else
- //DECLARE_TASKLET(rs_tasklet, RTS_Task, 0);
--static DECLARE_WORK(rs_wq, RTS_Task, 0);
-+static DECLARE_WORK(rs_wq, RTS_Task);
- 
- #endif
- 
---- coredrv/softserial.c~	2005-07-26 17:59:33.000000000 +0200
-+++ coredrv/softserial.c	2007-01-08 22:55:30.000000000 +0100
-@@ -188,8 +188,7 @@
- static struct async_struct softserial_async;
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
- DECLARE_WORK(softserial_bg_event_work,
--             softserial_background_event_handler,
--             &softserial_async);
-+             softserial_background_event_handler);
- #endif
- static struct serial_state state = {0,BASE_BAUD,-1,0,ASYNC_SPD_VHI | ASYNC_SKIP_TEST};
- int softserial_open(struct tty_struct* ptty, struct file* pfile)
---- coredrv/afedsp_int.c~	2005-07-26 19:59:56.000000000 +0200
-+++ coredrv/afedsp_int.c	2007-01-08 23:03:19.000000000 +0100
-@@ -57,8 +57,8 @@
- };
- DECLARE_TASKLET(sound_tasklet, sound_function, NULL);
- #else
--DECLARE_WORK(prec_wq, Precdialer_Task, 0);
--DECLARE_WORK(sound_wq, sound_function, 0);
-+DECLARE_WORK(prec_wq, Precdialer_Task);
-+DECLARE_WORK(sound_wq, sound_function);
- #endif
- 
- asmlinkage void schedule_precdialer()

Deleted: kernel-2.6.24.patch
===================================================================
--- kernel-2.6.24.patch	2008-10-11 18:35:24 UTC (rev 14948)
+++ kernel-2.6.24.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -1,22 +0,0 @@
---- coredrv/coredrv.c~	2007-11-02 08:35:56.000000000 +0000
-+++ coredrv/coredrv.c	2007-11-02 08:36:47.000000000 +0000
-@@ -392,7 +392,7 @@
-    printk(KERN_INFO"open: request_irq CALL\n");
-    retval = request_irq(G.irq,
-                interrupt_handler,
--               SA_SHIRQ,
-+               IRQF_SHARED,
-                MDM_DEVICE_NAME,
-                &(G.irq_share));
-    
---- coredrv/Makefile~	2005-07-26 19:59:56.000000000 +0200
-+++ coredrv/Makefile	2007-11-07 20:33:49.000000000 +0100
-@@ -8,7 +8,7 @@
- ifeq ($(KERNEL_SOURCE_PATH),)
-      INCLUDES = -I /lib/modules/`uname -r`/build/include -I ../inc
- endif
--CFLAGS += $(PSTN_DEF) -Wall -O $(INCLUDES) -fno-common -DTARGET_CATAWBA
-+KBUILD_CFLAGS += $(PSTN_DEF) -Wall -O $(INCLUDES) -fno-common -DTARGET_CATAWBA
- 
- DRIVER_OBJS = coredrv.o clmmain.o rts.o task.o uart.o wwh_dflt.o locks.o \
- 		softserial_io.o softserial_ioctl.o softserial.o

Modified: kernel-2.6.26.patch
===================================================================
--- kernel-2.6.26.patch	2008-10-11 18:35:24 UTC (rev 14948)
+++ kernel-2.6.26.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -19,30 +19,51 @@
  }
  
  
---- coredrv/softserial.c~	2008-08-05 09:58:14.000000000 +0000
-+++ coredrv/softserial.c	2008-08-05 09:58:14.000000000 +0000
-@@ -136,24 +136,28 @@
+--- coredrv/afedsp_int.c~	2008-08-05 10:01:45.000000000 +0000
++++ coredrv/afedsp_int.c	2008-08-05 10:01:45.000000000 +0000
+@@ -368,7 +368,7 @@
+ 
+ int create_afeproc(void)
+ {
+-    afeproc = create_proc_entry("afe", S_IFREG|S_IRUGO, &proc_root);
++    afeproc = create_proc_entry("afe", S_IFREG|S_IRUGO, NULL);
+     if(afeproc == NULL)
+         return -ENOMEM;
+     afeproc->proc_fops = &proc_afe_operations;
+@@ -377,7 +377,7 @@
+ 
+ void remove_afeproc(void)
+ {
+-    remove_proc_entry("afe", &proc_root);
++    remove_proc_entry("afe", NULL);
+ }
+ 
+ static int use_count = 0;
+--- coredrv/softserial.c~	2008-10-11 18:37:41.000000000 +0000
++++ coredrv/softserial.c	2008-10-11 18:37:41.000000000 +0000
+@@ -135,25 +135,29 @@
                                                    CLOCAL;
-    G.softserial_tty_driver->magic           = TTY_DRIVER_MAGIC;
+    G.softserial_tty_driver.magic           = TTY_DRIVER_MAGIC;
  
--   G.softserial_tty_driver->open            = softserial_open;
--   G.softserial_tty_driver->close           = softserial_close;
--   G.softserial_tty_driver->write           = softserial_write;
--   G.softserial_tty_driver->put_char        = softserial_put_char;
--   G.softserial_tty_driver->flush_chars     = softserial_flush_chars;
--   G.softserial_tty_driver->write_room      = softserial_write_room;
--   G.softserial_tty_driver->chars_in_buffer = softserial_chars_in_buffer;
--   G.softserial_tty_driver->flush_buffer    = softserial_flush_buffer;
--   G.softserial_tty_driver->ioctl           = softserial_ioctl;
--   G.softserial_tty_driver->throttle        = softserial_throttle;
--   G.softserial_tty_driver->unthrottle      = softserial_unthrottle;
--   G.softserial_tty_driver->send_xchar      = softserial_send_xchar;
--   G.softserial_tty_driver->set_termios     = softserial_set_termios;
--   G.softserial_tty_driver->stop            = softserial_stop;
--   G.softserial_tty_driver->start           = softserial_start;
--   G.softserial_tty_driver->hangup          = softserial_hangup;
--   G.softserial_tty_driver->break_ctl       = softserial_break;
--   G.softserial_tty_driver->wait_until_sent = softserial_wait_until_sent;
+-   G.softserial_tty_driver.open            = softserial_open;
+-   G.softserial_tty_driver.close           = softserial_close;
+-   G.softserial_tty_driver.write           = softserial_write;
+-   G.softserial_tty_driver.put_char        = softserial_put_char;
+-   G.softserial_tty_driver.flush_chars     = softserial_flush_chars;
+-   G.softserial_tty_driver.write_room      = softserial_write_room;
+-   G.softserial_tty_driver.chars_in_buffer = softserial_chars_in_buffer;
+-   G.softserial_tty_driver.flush_buffer    = softserial_flush_buffer;
+-   G.softserial_tty_driver.ioctl           = softserial_ioctl;
+-   G.softserial_tty_driver.throttle        = softserial_throttle;
+-   G.softserial_tty_driver.unthrottle      = softserial_unthrottle;
+-   G.softserial_tty_driver.send_xchar      = softserial_send_xchar;
+-   G.softserial_tty_driver.set_termios     = softserial_set_termios;
+-   G.softserial_tty_driver.stop            = softserial_stop;
+-   G.softserial_tty_driver.start           = softserial_start;
+-   G.softserial_tty_driver.hangup          = softserial_hangup;
+-   G.softserial_tty_driver.break_ctl       = softserial_break;
+-   G.softserial_tty_driver.wait_until_sent = softserial_wait_until_sent;
+-   G.softserial_tty_driver.set_ldisc       = softserial_set_ldisc;
 +   static struct tty_operations ops = {
 +     .open            = softserial_open,
 +     .close           = softserial_close,
@@ -62,29 +83,10 @@
 +     .hangup          = softserial_hangup,
 +     .break_ctl       = softserial_break,
 +     .wait_until_sent = softserial_wait_until_sent,
++     .set_ldisc       = softserial_set_ldisc,
 +   };
 +   tty_set_operations(&(G.softserial_tty_driver), &ops);
-+
- 
-    rc = tty_register_driver(G.softserial_tty_driver);
++ 
+    rc = tty_register_driver(&(G.softserial_tty_driver));
     if(rc)
---- coredrv/afedsp_int.c~	2008-08-05 10:01:45.000000000 +0000
-+++ coredrv/afedsp_int.c	2008-08-05 10:01:45.000000000 +0000
-@@ -368,7 +368,7 @@
- 
- int create_afeproc(void)
- {
--    afeproc = create_proc_entry("afe", S_IFREG|S_IRUGO, &proc_root);
-+    afeproc = create_proc_entry("afe", S_IFREG|S_IRUGO, NULL);
-     if(afeproc == NULL)
-         return -ENOMEM;
-     afeproc->proc_fops = &proc_afe_operations;
-@@ -377,7 +377,7 @@
- 
- void remove_afeproc(void)
- {
--    remove_proc_entry("afe", &proc_root);
-+    remove_proc_entry("afe", NULL);
- }
- 
- static int use_count = 0;
+    {

Added: kernel-2.6.27.patch
===================================================================
--- kernel-2.6.27.patch	                        (rev 0)
+++ kernel-2.6.27.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -0,0 +1,51 @@
+--- intel-537EP_secure-2.60.80.0/coredrv/coredrv.c~	2008-10-11 15:12:11.000000000 +0000
++++ intel-537EP_secure-2.60.80.0/coredrv/coredrv.c	2008-10-11 15:12:11.000000000 +0000
+@@ -52,6 +52,11 @@
+ #include <linux/pm.h>
+ #endif
+ 
++typedef int __bitwise pm_request_t;
++
++#define PM_SUSPEND     ((__force pm_request_t) 1)      /* enter D1-D3 */
++#define PM_RESUME      ((__force pm_request_t) 2)      /* enter D0 */
++
+ #include "uart.h"
+ #include "rts.h"
+ #include "lock_lin.h"
+--- intel-537EP_secure-2.60.80.0/coredrv/locks.c~	2008-10-11 15:23:05.000000000 +0000
++++ intel-537EP_secure-2.60.80.0/coredrv/locks.c	2008-10-11 15:23:05.000000000 +0000
+@@ -39,7 +39,7 @@
+ #include<linux/interrupt.h>
+ #include<linux/irq.h>
+ #include<linux/spinlock.h>
+-#include<asm/semaphore.h>
++#include<linux/semaphore.h>
+ #include"lock_lin.h"
+ 
+ #if !defined(CONFIG_SMP)
+--- intel-537EP_secure-2.60.80.0/coredrv/softserial.c~	2008-10-11 15:25:02.000000000 +0000
++++ intel-537EP_secure-2.60.80.0/coredrv/softserial.c	2008-10-11 15:25:02.000000000 +0000
+@@ -326,22 +326,7 @@
+ #endif
+    struct tty_struct* ptty;
+ 
+-//   printk("softserial:softserial_backgound_event_handler()\n");
+-   if(p_async_struct->tty == NULL) return;
+-
+-   ptty = p_async_struct->tty;
+-
+-   if(test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &p_async_struct->event))
+-   {
+-      if( (ptty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
+-          (ptty->ldisc.write_wakeup != NULL))
+-      {
+-//	 printk("ss_bg_eh:ldisc wakeup\n");
+-         (ptty->ldisc.write_wakeup)(ptty);
+-      }
+-//      printk("ss_bg_eh: wakeup write_wait\n");
+-      wake_up_interruptible(&ptty->write_wait);
+-   }
++   tty_wakeup(ptty);
+ }
+ 
+ //=============================================================================

Deleted: module-parm.patch
===================================================================
--- module-parm.patch	2008-10-11 18:35:24 UTC (rev 14948)
+++ module-parm.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -1,11 +0,0 @@
---- Intel-537/coredrv/coredrv.c~	2006-04-09 15:20:25.000000000 +0200
-+++ Intel-537/coredrv/coredrv.c		2006-04-09 15:22:21.000000000 +0200
-@@ -657,7 +657,7 @@
- #endif
- 
- int sound_enabled = 0;
--MODULE_PARM(sound_enabled, "i");
-+module_param(sound_enabled, int, 0);
- 
- extern asmlinkage void ham_proc_shutdown(void);
- 

Deleted: pm_unregister.patch
===================================================================
--- pm_unregister.patch	2008-10-11 18:35:24 UTC (rev 14948)
+++ pm_unregister.patch	2008-10-11 18:40:59 UTC (rev 14949)
@@ -1,12 +0,0 @@
---- Intel-536/coredrv/coredrv.c~	2006-05-12 09:58:21.000000000 +0200
-+++ Intel-536/coredrv/coredrv.c	2006-05-12 10:01:24.000000000 +0200
-@@ -437,9 +437,6 @@
- #if !defined (TARGET_CATAWBA)
-     vfree(pBaseAddress);
- #endif
--#ifdef CONFIG_PM
--    pm_unregister(power_dev);
--#endif
-    printk(KERN_INFO"*****************close exit ********************\n");
- }
- 




More information about the arch-commits mailing list