[arch-commits] CVS update of extra/network/intel-537-beyond (10 files)
Travis Willard
travis at archlinux.org
Sun May 20 14:16:05 UTC 2007
Date: Sunday, May 20, 2007 @ 10:16:05
Author: travis
Path: /home/cvs-extra/extra/network/intel-537-beyond
Removed: PKGBUILD (1.5) compile.patch (1.1) coredrv.patch (1.1)
flip.patch (1.1) intel-537-tty.patch (1.1) intel-537.install (1.4)
intel-537.rc.d (1.1) kernel-2.6.19.patch (1.1)
module-parm.patch (1.1) pm_unregister.patch (1.1)
Beyond removed from repos
---------------------+
PKGBUILD | 36 ------------------------------------
compile.patch | 19 -------------------
coredrv.patch | 22 ----------------------
flip.patch | 31 -------------------------------
intel-537-tty.patch | 49 -------------------------------------------------
intel-537.install | 50 --------------------------------------------------
intel-537.rc.d | 35 -----------------------------------
kernel-2.6.19.patch | 10 ----------
module-parm.patch | 11 -----------
pm_unregister.patch | 12 ------------
10 files changed, 275 deletions(-)
Index: extra/network/intel-537-beyond/PKGBUILD
diff -u extra/network/intel-537-beyond/PKGBUILD:1.5 extra/network/intel-537-beyond/PKGBUILD:removed
--- extra/network/intel-537-beyond/PKGBUILD:1.5 Sun Dec 3 02:47:08 2006
+++ extra/network/intel-537-beyond/PKGBUILD Sun May 20 10:16:05 2007
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD,v 1.5 2006/12/03 07:47:08 james Exp $
-# Maintainer : Tobias Powalowski <tpowa at archlinux.org>
-
-_kernver=2.6.19-beyond;
-
-pkgname=intel-537-beyond
-pkgver=2.60.80.0
-pkgrel=36
-pkgdesc="Intel Modem Drivers for 537 chipsets. For beyond kernel"
-arch=(i686 x86_64)
-url="http://linmodems.technion.ac.il/packages/Intel/"
-depends=('intel-537-utils' 'kernel26beyond')
-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)
-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
- # 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')
Index: extra/network/intel-537-beyond/compile.patch
diff -u extra/network/intel-537-beyond/compile.patch:1.1 extra/network/intel-537-beyond/compile.patch:removed
--- extra/network/intel-537-beyond/compile.patch:1.1 Sat May 6 07:39:58 2006
+++ extra/network/intel-537-beyond/compile.patch Sun May 20 10:16:05 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-beyond/coredrv.patch
diff -u extra/network/intel-537-beyond/coredrv.patch:1.1 extra/network/intel-537-beyond/coredrv.patch:removed
--- extra/network/intel-537-beyond/coredrv.patch:1.1 Sat May 6 07:39:58 2006
+++ extra/network/intel-537-beyond/coredrv.patch Sun May 20 10:16:05 2007
@@ -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
Index: extra/network/intel-537-beyond/flip.patch
diff -u extra/network/intel-537-beyond/flip.patch:1.1 extra/network/intel-537-beyond/flip.patch:removed
--- extra/network/intel-537-beyond/flip.patch:1.1 Sat May 6 07:39:58 2006
+++ extra/network/intel-537-beyond/flip.patch Sun May 20 10:16:05 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-beyond/intel-537-tty.patch
diff -u extra/network/intel-537-beyond/intel-537-tty.patch:1.1 extra/network/intel-537-beyond/intel-537-tty.patch:removed
--- extra/network/intel-537-beyond/intel-537-tty.patch:1.1 Sat May 6 07:39:58 2006
+++ extra/network/intel-537-beyond/intel-537-tty.patch Sun May 20 10:16:05 2007
@@ -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);
-
-
Index: extra/network/intel-537-beyond/intel-537.install
diff -u extra/network/intel-537-beyond/intel-537.install:1.4 extra/network/intel-537-beyond/intel-537.install:removed
--- extra/network/intel-537-beyond/intel-537.install:1.4 Sun Dec 3 02:47:08 2006
+++ extra/network/intel-537-beyond/intel-537.install Sun May 20 10:16:05 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.19-beyond
- 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.19-beyond
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-op=$1
-shift
-$op $*
\ No newline at end of file
Index: extra/network/intel-537-beyond/intel-537.rc.d
diff -u extra/network/intel-537-beyond/intel-537.rc.d:1.1 extra/network/intel-537-beyond/intel-537.rc.d:removed
--- extra/network/intel-537-beyond/intel-537.rc.d:1.1 Sat May 6 07:39:59 2006
+++ extra/network/intel-537-beyond/intel-537.rc.d Sun May 20 10:16:05 2007
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Loading Intel Modem Driver"
- hamregistry &
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon intel-537
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Intel Modem Driver"
- killall -9 hamregistry
-if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon intel-537
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "Usage $0 {start|stop|restart}"
- ;;
-esac
\ No newline at end of file
Index: extra/network/intel-537-beyond/kernel-2.6.19.patch
diff -u extra/network/intel-537-beyond/kernel-2.6.19.patch:1.1 extra/network/intel-537-beyond/kernel-2.6.19.patch:removed
--- extra/network/intel-537-beyond/kernel-2.6.19.patch:1.1 Sun Dec 3 02:47:08 2006
+++ extra/network/intel-537-beyond/kernel-2.6.19.patch Sun May 20 10:16:05 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-beyond/module-parm.patch
diff -u extra/network/intel-537-beyond/module-parm.patch:1.1 extra/network/intel-537-beyond/module-parm.patch:removed
--- extra/network/intel-537-beyond/module-parm.patch:1.1 Tue Jun 27 06:29:40 2006
+++ extra/network/intel-537-beyond/module-parm.patch Sun May 20 10:16:05 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-beyond/pm_unregister.patch
diff -u extra/network/intel-537-beyond/pm_unregister.patch:1.1 extra/network/intel-537-beyond/pm_unregister.patch:removed
--- extra/network/intel-537-beyond/pm_unregister.patch:1.1 Tue Jun 27 06:29:40 2006
+++ extra/network/intel-537-beyond/pm_unregister.patch Sun May 20 10:16:05 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