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

Tobias Powalowski tpowa at archlinux.org
Tue Aug 5 05:49:18 EDT 2008


    Date: Tuesday, August 5, 2008 @ 05:49:17
  Author: tpowa
Revision: 7925

upgpkg: intel-536ep 2.56.76.0-57

Added:
  intel-536ep/trunk/kernel-2.6.26.patch
Modified:
  intel-536ep/trunk/PKGBUILD
  intel-536ep/trunk/intel-536EP.install

---------------------+
 PKGBUILD            |    9 +++--
 intel-536EP.install |    4 +-
 kernel-2.6.26.patch |   80 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-08-05 08:18:21 UTC (rev 7924)
+++ PKGBUILD	2008-08-05 09:49:17 UTC (rev 7925)
@@ -4,19 +4,20 @@
 pkgname=intel-536ep
 name=intel-536EP
 pkgver=2.56.76.0
-pkgrel=56
-_kernver=2.6.25-ARCH
+pkgrel=57
+_kernver=2.6.26-ARCH
 pkgdesc="Intel Modem Drivers for 536EP chipset. For stock arch 2.6 kernel "
 arch=(i686)
 license=('custom:"INTEL536"')
 url="http://linmodems.technion.ac.il/packages/Intel/"
-depends=('intel-536ep-utils' 'kernel26>=2.6.25.3-1' 'kernel26<2.6.26')
-source=(http://linmodems.technion.ac.il/packages/intel/Philippe.Vouters/intel-536EP-2.56.76.0_23_02_2007.tgz kernel-2.6.24.patch)
+depends=('intel-536ep-utils' 'kernel26>=2.6.26-1' 'kernel26<2.6.27')
+source=(http://linmodems.technion.ac.il/packages/intel/Philippe.Vouters/intel-536EP-2.56.76.0_23_02_2007.tgz kernel-2.6.24.patch kernel-2.6.26.patch)
 install=intel-536EP.install
 
 build() {
   cd $startdir/src/intel-536EP-2.56.76.0
   patch -Np0 -i ../kernel-2.6.24.patch || return 1
+  patch -Np1 -i ../kernel-2.6.26.patch || return 1
   # fix makefile
   sed -i -e "s/\`uname -r\`/${_kernver}/g" makefile
   sed -i -e "s/\`uname -r\`/${_kernver}/g" config_check

Modified: intel-536EP.install
===================================================================
--- intel-536EP.install	2008-08-05 08:18:21 UTC (rev 7924)
+++ intel-536EP.install	2008-08-05 09:49:17 UTC (rev 7925)
@@ -8,7 +8,7 @@
 
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.25-ARCH
+  KERNEL_VERSION=2.6.26-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.25-ARCH
+  KERNEL_VERSION=2.6.26-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 

Added: kernel-2.6.26.patch
===================================================================
--- kernel-2.6.26.patch	                        (rev 0)
+++ kernel-2.6.26.patch	2008-08-05 09:49:17 UTC (rev 7925)
@@ -0,0 +1,80 @@
+diff -ruN intel-536EP-2.56.76.0/coredrv/coredrv.c intel-536EP-2.56.76.0.patched/coredrv/coredrv.c
+--- intel-536EP-2.56.76.0/coredrv/coredrv.c	2007-02-23 09:49:06.000000000 +0100
++++ intel-536EP-2.56.76.0.patched/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);
+ }
+ 
+ 
+diff -ruN intel-536EP-2.56.76.0/coredrv/softserial.c intel-536EP-2.56.76.0.patched/coredrv/softserial.c
+--- intel-536EP-2.56.76.0/coredrv/softserial.c	2007-02-23 10:04:22.000000000 +0100
++++ intel-536EP-2.56.76.0.patched/coredrv/softserial.c	2008-08-05 11:37:22.000000000 +0200
+@@ -119,6 +119,7 @@
+    G.softserial_tty_driver.termios         = softserial_termios;
+    G.softserial_tty_driver.termios_locked  = softserial_termios_locked;
+    G.softserial_tty_driver.init_termios    = tty_std_termios;
++
+    //TODO verify unknown flags
+    //all already set except clocal, dont know what clocal stands for
+    G.softserial_tty_driver.init_termios.c_cflag = B115200 |\
+@@ -128,25 +129,28 @@
+                                                   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)
+    {




More information about the arch-commits mailing list