[arch-commits] CVS update of extra/network/intel-537-ck (9 files)
Tom Killian
tom at archlinux.org
Sat Oct 13 21:36:20 UTC 2007
Date: Saturday, October 13, 2007 @ 17:36:20
Author: tom
Path: /home/cvs-extra/extra/network/intel-537-ck
Removed: PKGBUILD (1.6) asmlinkage.patch (1.1) compile.patch (1.1)
flip.patch (1.1) intel-537.install (1.4) kernel-2.6.19.patch (1.1)
kernel-2.6.20.patch (1.1) module-parm.patch (1.1)
pm_unregister.patch (1.1)
kernel26ck removed
---------------------+
PKGBUILD | 38 ----------------------
asmlinkage.patch | 86 --------------------------------------------------
compile.patch | 19 -----------
flip.patch | 31 ------------------
intel-537.install | 50 -----------------------------
kernel-2.6.19.patch | 10 -----
kernel-2.6.20.patch | 49 ----------------------------
module-parm.patch | 11 ------
pm_unregister.patch | 12 ------
9 files changed, 306 deletions(-)
Index: extra/network/intel-537-ck/PKGBUILD
diff -u extra/network/intel-537-ck/PKGBUILD:1.6 extra/network/intel-537-ck/PKGBUILD:removed
--- extra/network/intel-537-ck/PKGBUILD:1.6 Mon Aug 20 06:08:54 2007
+++ extra/network/intel-537-ck/PKGBUILD Sat Oct 13 17:36:20 2007
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD,v 1.6 2007/08/20 10:08:54 tom Exp $
-# Maintainer : Tobias Powalowski <tpowa at archlinux.org>
-
-_kernver=2.6.22-ck
-
-pkgname=intel-537-ck
-pkgver=2.60.80.0
-pkgrel=5
-pkgdesc="Intel Modem Drivers for 537 chipsets. For kernel26ck"
-arch=(i686 x86_64)
-license=('custom:"INTEL537"')
-url="http://linmodems.technion.ac.il/packages/Intel/"
-depends=('intel-537-utils' 'kernel26ck')
-source=(ftp://aiedownload.intel.com/df-support/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)
-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
- # 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
- # Install kernel module
- install -D -m 644 Intel537.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/intel537.ko
- sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/intel-537.install
- }
-md5sums=('1740a05c0ce039633f2dd65b055604b0' 'c459529b418a72d810f1c17b74ad24ac'\
- '2cea9fefc9844518f40a55f0c26a4714' '24cdd2988a87075a4cb3a5de0ea118d5'\
- '4925209a57fcf7994d4436629f50a4da' '288aa5d8fb6817c5de2119c6c8d3f27a'\
- '63bc7e293d012e5c6f6110c992da14a2' 'dfa22d3419daf52bd85c258702bcee3d')
Index: extra/network/intel-537-ck/asmlinkage.patch
diff -u extra/network/intel-537-ck/asmlinkage.patch:1.1 extra/network/intel-537-ck/asmlinkage.patch:removed
--- extra/network/intel-537-ck/asmlinkage.patch:1.1 Mon Oct 9 04:44:54 2006
+++ extra/network/intel-537-ck/asmlinkage.patch Sat Oct 13 17:36:20 2007
@@ -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();
Index: extra/network/intel-537-ck/compile.patch
diff -u extra/network/intel-537-ck/compile.patch:1.1 extra/network/intel-537-ck/compile.patch:removed
--- extra/network/intel-537-ck/compile.patch:1.1 Mon Oct 9 04:44:54 2006
+++ extra/network/intel-537-ck/compile.patch Sat Oct 13 17:36:20 2007
@@ -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);
Index: extra/network/intel-537-ck/flip.patch
diff -u extra/network/intel-537-ck/flip.patch:1.1 extra/network/intel-537-ck/flip.patch:removed
--- extra/network/intel-537-ck/flip.patch:1.1 Mon Oct 9 04:44:54 2006
+++ extra/network/intel-537-ck/flip.patch Sat Oct 13 17:36:20 2007
@@ -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);
Index: extra/network/intel-537-ck/intel-537.install
diff -u extra/network/intel-537-ck/intel-537.install:1.4 extra/network/intel-537-ck/intel-537.install:removed
--- extra/network/intel-537-ck/intel-537.install:1.4 Tue Jul 24 05:24:52 2007
+++ extra/network/intel-537-ck/intel-537.install Sat Oct 13 17:36:20 2007
@@ -1,50 +0,0 @@
- # arg 1: the new package version
-post_install() {
-cat << EOF
-INTEL SOFTWARE LICENSE AGREEMENT
-
-IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING.
-Do not use or load this software and any associated materials (collectively, the Software) until you have carefully read the following terms and conditions. By loading or using the Software, you agree to the terms of this Agreement. If you do not wish to so agree, do not install or use the Software.
-
-Copyright (c) 1999-2004, Intel Corporation All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-3. Neither the name of Intel Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-EOF
-
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.22-ck
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
-echo
-echo
-echo "==> NOTICE:"
-echo "==> For more information about the use and config of the drivers,"
-echo "==> have a look at http://wiki.archlinux.org/index.php/Intel_53x_Modem_Driver"
-
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- rm /etc/hamregistry.bin
- post_install $1
-}
-
-# arg 1: the old package version
-post_remove() {
- rm /etc/hamregistry.bin
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.22-ck
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-op=$1
-shift
-$op $*
\ No newline at end of file
Index: extra/network/intel-537-ck/kernel-2.6.19.patch
diff -u extra/network/intel-537-ck/kernel-2.6.19.patch:1.1 extra/network/intel-537-ck/kernel-2.6.19.patch:removed
--- extra/network/intel-537-ck/kernel-2.6.19.patch:1.1 Sat Dec 9 16:41:33 2006
+++ extra/network/intel-537-ck/kernel-2.6.19.patch Sat Oct 13 17:36:20 2007
@@ -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>
Index: extra/network/intel-537-ck/kernel-2.6.20.patch
diff -u extra/network/intel-537-ck/kernel-2.6.20.patch:1.1 extra/network/intel-537-ck/kernel-2.6.20.patch:removed
--- extra/network/intel-537-ck/kernel-2.6.20.patch:1.1 Sat Feb 17 08:54:37 2007
+++ extra/network/intel-537-ck/kernel-2.6.20.patch Sat Oct 13 17:36:20 2007
@@ -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()
Index: extra/network/intel-537-ck/module-parm.patch
diff -u extra/network/intel-537-ck/module-parm.patch:1.1 extra/network/intel-537-ck/module-parm.patch:removed
--- extra/network/intel-537-ck/module-parm.patch:1.1 Mon Oct 9 04:44:54 2006
+++ extra/network/intel-537-ck/module-parm.patch Sat Oct 13 17:36:20 2007
@@ -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);
-
Index: extra/network/intel-537-ck/pm_unregister.patch
diff -u extra/network/intel-537-ck/pm_unregister.patch:1.1 extra/network/intel-537-ck/pm_unregister.patch:removed
--- extra/network/intel-537-ck/pm_unregister.patch:1.1 Mon Oct 9 04:44:54 2006
+++ extra/network/intel-537-ck/pm_unregister.patch Sat Oct 13 17:36:20 2007
@@ -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