[arch-commits] Commit in intel-537/trunk (4 files)
Tobias Powalowski
tpowa at archlinux.org
Sun Mar 1 18:06:42 UTC 2009
Date: Sunday, March 1, 2009 @ 13:06:42
Author: tpowa
Revision: 28598
upgpkg: intel-537 2.60.80.0-60
Modified:
intel-537/trunk/PKGBUILD
Deleted:
intel-537/trunk/intel-537.rc.d
intel-537/trunk/kernel-2.6.26.patch
intel-537/trunk/kernel-2.6.27.patch
---------------------+
PKGBUILD | 14 ++-----
intel-537.rc.d | 35 -------------------
kernel-2.6.26.patch | 92 --------------------------------------------------
kernel-2.6.27.patch | 51 ---------------------------
4 files changed, 4 insertions(+), 188 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-01 17:57:44 UTC (rev 28597)
+++ PKGBUILD 2009-03-01 18:06:42 UTC (rev 28598)
@@ -5,15 +5,13 @@
pkgname=intel-537
pkgver=2.60.80.0
-pkgrel=59
+pkgrel=60
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.28-1' 'kernel26<2.6.29')
-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)
+source=(http://linmodems.technion.ac.il/packages/intel/Philippe.Vouters/intel-5337EP_secure-2.60.80.0_2009_02_08.tar.bz2)
install=intel-537.install
build() {
@@ -21,13 +19,9 @@
# fix makefile
sed -i -e "s/\`uname -r\`/${_kernver}/g" makefile
sed -i -e "s/\`uname -r\`/${_kernver}/g" config_check
- 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 $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=('f7f51cef6eac2b2b5e260c1747e025c6'
- '8c8d0e85490194595cc4d80bc3da969c'
- '787967a6bc3b371744f4262af32b2bed')
+}
+md5sums=('b5d2a258cddd28ede811bfaac41cec9b')
Deleted: intel-537.rc.d
===================================================================
--- intel-537.rc.d 2009-03-01 17:57:44 UTC (rev 28597)
+++ intel-537.rc.d 2009-03-01 18:06:42 UTC (rev 28598)
@@ -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
Deleted: kernel-2.6.26.patch
===================================================================
--- kernel-2.6.26.patch 2009-03-01 17:57:44 UTC (rev 28597)
+++ kernel-2.6.26.patch 2009-03-01 18:06:42 UTC (rev 28598)
@@ -1,92 +0,0 @@
-diff -ruN intel-536EP-2.56.76.0/coredrv/coredrv.c intel-536EP-2.56.76.0.patched/coredrv/coredrv.c
---- coredrv/coredrv.c 2007-02-23 09:49:06.000000000 +0100
-+++ coredrv/coredrv.c 2008-08-05 11:26:09.000000000 +0200
-@@ -740,7 +740,7 @@
-
- int create_hamproc(void)
- {
-- hamproc = create_proc_entry("ham", S_IFREG | S_IRUGO, &proc_root);
-+ hamproc = create_proc_entry("ham", S_IFREG | S_IRUGO, NULL);
- if(hamproc == NULL) return -ENOMEM;
- hamproc->read_proc = hamproc_read;
- hamproc->write_proc = hamproc_write;
-@@ -748,7 +748,7 @@
- }
- void detach_hamproc(void)
- {
-- remove_proc_entry("ham", &proc_root);
-+ remove_proc_entry("ham", NULL);
- }
-
-
---- 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.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,
-+ .write = softserial_write,
-+ .put_char = softserial_put_char,
-+ .flush_chars = softserial_flush_chars,
-+ .write_room = softserial_write_room,
-+ .chars_in_buffer = softserial_chars_in_buffer,
-+ .flush_buffer = softserial_flush_buffer,
-+ .ioctl = softserial_ioctl,
-+ .throttle = softserial_throttle,
-+ .unthrottle = softserial_unthrottle,
-+ .send_xchar = softserial_send_xchar,
-+ .set_termios = softserial_set_termios,
-+ .stop = softserial_stop,
-+ .start = softserial_start,
-+ .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));
- if(rc)
- {
Deleted: kernel-2.6.27.patch
===================================================================
--- kernel-2.6.27.patch 2009-03-01 17:57:44 UTC (rev 28597)
+++ kernel-2.6.27.patch 2009-03-01 18:06:42 UTC (rev 28598)
@@ -1,51 +0,0 @@
---- 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);
- }
-
- //=============================================================================
More information about the arch-commits
mailing list