[arch-commits] Commit in intel-536ep/trunk (9 files)

Jan de Groot jgc at archlinux.org
Tue Aug 5 06:14:24 EDT 2008


    Date: Tuesday, August 5, 2008 @ 06:14:23
  Author: jgc
Revision: 7935

Clean up old patches

Deleted:
  intel-536ep/trunk/asmlinkage.patch
  intel-536ep/trunk/compile.patch
  intel-536ep/trunk/coredrv.patch
  intel-536ep/trunk/flip.patch
  intel-536ep/trunk/intel-536ep-4.69-kernel-2.6.10-tty.patch
  intel-536ep/trunk/kernel-2.6.19.patch
  intel-536ep/trunk/kernel-2.6.20.patch
  intel-536ep/trunk/module-parm.patch
  intel-536ep/trunk/pm_unregister.patch

------------------------------------------+
 asmlinkage.patch                         |   86 -----------------------------
 compile.patch                            |   19 ------
 coredrv.patch                            |   22 -------
 flip.patch                               |   31 ----------
 intel-536ep-4.69-kernel-2.6.10-tty.patch |   49 ----------------
 kernel-2.6.19.patch                      |   10 ---
 kernel-2.6.20.patch                      |   36 ------------
 module-parm.patch                        |   11 ---
 pm_unregister.patch                      |   12 ----
 9 files changed, 276 deletions(-)

Deleted: asmlinkage.patch
===================================================================
--- asmlinkage.patch	2008-08-05 10:08:45 UTC (rev 7934)
+++ asmlinkage.patch	2008-08-05 10:14:23 UTC (rev 7935)
@@ -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-08-05 10:08:45 UTC (rev 7934)
+++ compile.patch	2008-08-05 10:14:23 UTC (rev 7935)
@@ -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-08-05 10:08:45 UTC (rev 7934)
+++ coredrv.patch	2008-08-05 10:14:23 UTC (rev 7935)
@@ -1,22 +0,0 @@
---- coredrv/coredrv.c~	2004-07-09 16:34:29.000000000 +0200
-+++ coredrv/coredrv.c	2005-03-29 12:36:24.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");
-     }
-@@ -859,9 +856,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-08-05 10:08:45 UTC (rev 7934)
+++ flip.patch	2008-08-05 10:14:23 UTC (rev 7935)
@@ -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-536ep-4.69-kernel-2.6.10-tty.patch
===================================================================
--- intel-536ep-4.69-kernel-2.6.10-tty.patch	2008-08-05 10:08:45 UTC (rev 7934)
+++ intel-536ep-4.69-kernel-2.6.10-tty.patch	2008-08-05 10:14:23 UTC (rev 7935)
@@ -1,49 +0,0 @@
---- coredrv/softserial.h.orig	2005-03-23 01:55:22.000000000 +0100
-+++ coredrv/softserial.h	2005-03-23 01:55:49.000000000 +0100
-@@ -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);
- 
- 
---- coredrv/softserial_io.c.orig	2005-03-23 01:56:46.000000000 +0100
-+++ coredrv/softserial_io.c	2005-03-23 01:58:59.000000000 +0100
-@@ -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);
- }

Deleted: kernel-2.6.19.patch
===================================================================
--- kernel-2.6.19.patch	2008-08-05 10:08:45 UTC (rev 7934)
+++ kernel-2.6.19.patch	2008-08-05 10:14:23 UTC (rev 7935)
@@ -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-08-05 10:08:45 UTC (rev 7934)
+++ kernel-2.6.20.patch	2008-08-05 10:14:23 UTC (rev 7935)
@@ -1,36 +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)

Deleted: module-parm.patch
===================================================================
--- module-parm.patch	2008-08-05 10:08:45 UTC (rev 7934)
+++ module-parm.patch	2008-08-05 10:14:23 UTC (rev 7935)
@@ -1,11 +0,0 @@
---- Intel-536/coredrv/coredrv.c~	2006-04-09 15:20:25.000000000 +0200
-+++ Intel-536/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-08-05 10:08:45 UTC (rev 7934)
+++ pm_unregister.patch	2008-08-05 10:14:23 UTC (rev 7935)
@@ -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