Check-in [dd9818dd95]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:dd9818dd951a6297de011c9dbc70973935488f64
Date: 2012-09-18 14:18:54
User: BarryK
Comment:rerwin: fixes for dgcmodem, hsfmodem in separate pets

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/sbin/pupdial_init_hotpluggable

@@ -7,10 +7,11 @@
 #101207 if usb-modeswitch has already set /dev/gsmmodem, use it.
 #101207 modem plugged in at bootup, may not trigger usb-modeswitch, replay uevents.
 #101210, 101211 tweaks.
 #110302 wasn't getting the right uevents for my 3g modem, use 'udevadm trigger'.
 #120202 internationalized.
+#120908 rerwin: Removed Dgcmodem logic, already handled by Cdcacm section; moved Hso section to eliminate need for flag to maintain priority (used in init scripts to override execution sequence by script name).  Code moved, shifted or deleted, but not otherwise changed, except for "probe order" variables.
 
 export TEXTDOMAIN=pupdial_init_hotpluggable
 export OUTPUT_CHARSET=UTF-8
 
 #hso.ko: this site http://www.pharscape.org/hso.html states that the hso driver is in kernel
@@ -91,118 +92,20 @@
 # prevPCIIDS="$PCIIDS"
 #fi
 #echo -n "$PCIIDS" > /var/local/pupdial/pciids
 
 #hso.ko not always present... well check them all...
-USBSERIAL='' ; CDC_ACM='' ; HSO='' ; NOZOMI='' ; DGCUSBDCP='' ; IPWIRELESS=''
+USBSERIAL='' ; CDC_ACM='' ; HSO='' ; NOZOMI='' ; IPWIRELESS='' #120908
 if modinfo usbserial >/dev/null 2>&1 ;then USBSERIAL=usbserial ;fi
 if modinfo cdc_acm >/dev/null 2>&1 ;then CDC_ACM=cdc_cm ;fi
 if modinfo hso >/dev/null 2>&1 ;then HSO=hso ;fi
 if modinfo nozomi >/dev/null 2>&1 ;then NOZOMI=nozomi ;fi
-if modinfo dgcusbdcp >/dev/null 2>&1 ;then DGCUSBDCP=dgcusbdcp ;fi
 if modinfo ipwireless >/dev/null 2>&1 ;then IPWIRELESS=ipwireless ;fi
 
-USBMODEMS="$USBSERIAL $CDC_ACM $DGCUSBDCP"
-PCMCIAMODEMS="$HSO $IPWIRELESS $NOZOMI"
-#listed in order that we should probe... $USBSERIAL $CDC_ACM $DGCUSBDCP $HSO $IPWIRELESS $NOZOMI
-
-#Let high-speed modems to be detected by hso init script...
-FLAGHSO=''
-[ "$HSO" != "" ] && [ "`grep -l -s 'Modem' /sys/class/tty/ttyHS?*/hsotype`" != "" ] && FLAGHSO='yes'
-
-#####Allusbserial#####
-if [ "$USBSERIAL" ];then
- if [ ! -h /dev/modem ];then #If a different modem selected, quit.
-  if lsmod | grep '^usbserial ' >/dev/null ;then
-   if [ "$FLAGHSO" = "" ];then
-    #Select interrupt-type device - first one or one identified in log as modem.
-    INTERRUPTLIST="`grep -H -s 'Interrupt' /sys/bus/usb/devices/*-*:*.*/ep_??/type | cut -f 1-6 -d /`"
-    DEVLISTUSB="`ls -1 -d /sys/bus/usb/devices/*-*:*.*/tty????* 2>/dev/null | sed 's/ /\n/g' | grep -F "$INTERRUPTLIST" | cut -f 7 -d / | sed 's/\(tty...\)\([0-9]$\)/\10\2/' | sort | sed 's/\(tty...\)\(0\)/\1/'`"
-    DEVMLIST="`grep -s 'converter now attached' /var/log/messages | grep ' modem ' | grep -o 'ttyUSB[0-9][0-9]*' | sort -u`"
-    if [ "$DEVLISTUSB" != "" ] && [ "$DEVMLIST" != "" ];then
-     MODEMS="`echo "$DEVLISTUSB" | grep -F "$DEVMLIST"`"
-    else
-     MODEMS="$DEVMLIST"
-    fi
-    if [ "$MODEMS" != "" ];then #101205
-     #101206 avoid unecessary modem probing...
-     prevUSBMODEM=''
-     [ -f /var/local/pupdial/usb_modem_port ] && prevUSBMODEM="`cat /var/local/pupdial/usb_modem_port`"
-     [ "$USBIDS" = "$prevUSBIDS" ] && [ "$prevUSBMODEM" ] && [ "`echo "$MODEMS" | grep "$prevUSBMODEM"`" != "" ] && ln -snf $prevUSBMODEM /dev/modem
-     if [ ! -h /dev/modem ];then
-      for MODEM in $MODEMS
-      do
-       chat_with_func /dev/${MODEM}
-       [ $? -eq 0 ] && break
-       MODEM=''
-      done
-      if [ "$MODEM" != "" ];then
-       ln -snf $MODEM /dev/modem
-       echo -n "$MODEM" > /var/local/pupdial/usb_modem_port
-      fi
-     fi
-    fi
-   fi
-  fi
- fi
-fi
-
-#####Cdcacm#####
-if [ "$CDC_ACM" ];then
- if [ ! -h /dev/modem ];then #If a different modem selected, quit.
-  if lsmod | grep '^cdc_acm ' >/dev/null ;then
-   if [ "$FLAGHSO" = "" ];then
-    #Select interrupt-type device - first one or one identified in log as modem.
-    INTERRUPTLIST="`grep -H -s 'Interrupt' /sys/bus/usb/devices/*-*:*.*/ep_??/type | cut -f 1-6 -d /`"
-    DEVLISTACM="`ls -1 -d /sys/bus/usb/devices/*-*:*.*/tty/tty????* 2>/dev/null | sed 's/ /\n/g' | grep -F "$INTERRUPTLIST" | cut -f 8 -d / | sed 's/\(tty...\)\([0-9]$\)/\10\2/' | sort | sed 's/\(tty...\)\(0\)/\1/'`"
-    DEVMLIST="`grep -s ': USB ACM device$' /var/log/messages | grep -o 'ttyACM[0-9][0-9]*' | sort -u`"
-    if [ "$DEVLISTACM" != "" ] && [ "$DEVMLIST" != "" ];then
-     MODEM="`echo "$DEVLISTACM" | grep -F "$DEVMLIST" | head -n 1`"
-    else
-     MODEM="`echo "$DEVMLIST" | head -n 1`"
-    fi
-    if [ "$MODEM" != "" ];then
-     [ ! -e /dev/$MODEM ] && [ -e /dev/input/$MODEM ] && ln -snf input/$MODEM /dev/$MODEM  #device name for pupdial
-     ln -snf $MODEM /dev/modem
-    fi
-   fi
-  fi
- fi
-fi
-
-#####Dgcmodem#####
-if [ "$DGCUSBDCP" ];then
- if [ ! -h /dev/modem ];then #If a different modem selected, quit.
-  if lsmod | grep '^dgcusbdcp ' >/dev/null ;then
-   WAITMAX=20 ; WAITCNT=0
-   until [ "`lsmod | grep '^cdc_acm '`" != "" ];do
-    [ $WAITCNT -gt $WAITMAX ] && break
-    WAITCNT=`expr $WAITCNT + 1`
-    sleep 1
-   done
-   if [ $WAITCNT -le $WAITMAX ];then
-    if [ "$FLAGHSO" = "" ];then
-     if [ "`grep 'adding union descriptor for cdc_acm' /var/log/messages | grep 'dgcusbdcp'`" != "" ];then
-      #Select interrupt-type device - first one or one identified in log as probably a DGC modem.
-      INTERRUPTLIST="`grep -H -s 'Interrupt' /sys/bus/usb/devices/*-*:*.*/ep_??/type | cut -f 1-6 -d /`"
-      DEVLISTACM="`ls -1 -d /sys/bus/usb/devices/*-*:*.*/tty/tty????* 2>/dev/null | sed 's/ /\n/g' | grep -F "$INTERRUPTLIST" | cut -f 8 -d / | sed 's/\(tty...\)\([0-9]$\)/\10\2/' | sort | sed 's/\(tty...\)\(0\)/\1/'`"
-      grep -q 'd[gc][cg]usbdcp' /var/log/messages && DEVMLIST="`grep -o -E -s 'd[gc][cg]usbdcp|ttyACM[0-9][0-9]*' /var/log/messages | sed -e '1,/d[gc][cg]usbdcp/d' -e '/d[gc][cg]usbdcp/Q'`" || DEVMLIST=""
-      if [ "$DEVLISTACM" != "" ] && [ "$DEVMLIST" != "" ];then
-       MODEM="`echo "$DEVLISTACM" | grep -F "$DEVMLIST" | head -n 1`"
-      else
-       MODEM="`echo "$DEVMLIST" | head -n 1`"
-      fi
-      if [ "$MODEM" != "" ];then
-       [ ! -e /dev/$MODEM ] && [ -e /dev/input/$MODEM ] && ln -snf input/$MODEM /dev/$MODEM  #device name for pupdial
-       ln -snf $MODEM /dev/modem #v433 end
-      fi
-     fi
-    fi
-   fi
-  fi
- fi
-fi
+USBMODEMS="$HSO $USBSERIAL $CDC_ACM" #120908...
+PCMCIAMODEMS="$IPWIRELESS $NOZOMI"
+#listed in order that we should probe... $HSO $USBSERIAL $CDC_ACM $IPWIRELESS $NOZOMI
 
 #####Hso#####
 if [ "$HSO" ];then
  MODEM=''
  [ -h /dev/modem ] && MODEM="`readlink /dev/modem | grep -v '^ttyHS[0-9]$'`"
@@ -225,10 +128,66 @@
     ln -snf $MODEM /dev/ttyS_HS #for pupdial probe
    fi
   fi
  fi
 fi
+
+#####Allusbserial#####
+if [ "$USBSERIAL" ];then
+ if [ ! -h /dev/modem ];then #If a different modem selected, quit.
+  if lsmod | grep '^usbserial ' >/dev/null ;then
+   #Select interrupt-type device - first one or one identified in log as modem.
+   INTERRUPTLIST="`grep -H -s 'Interrupt' /sys/bus/usb/devices/*-*:*.*/ep_??/type | cut -f 1-6 -d /`"
+   DEVLISTUSB="`ls -1 -d /sys/bus/usb/devices/*-*:*.*/tty????* 2>/dev/null | sed 's/ /\n/g' | grep -F "$INTERRUPTLIST" | cut -f 7 -d / | sed 's/\(tty...\)\([0-9]$\)/\10\2/' | sort | sed 's/\(tty...\)\(0\)/\1/'`"
+   DEVMLIST="`grep -s 'converter now attached' /var/log/messages | grep ' modem ' | grep -o 'ttyUSB[0-9][0-9]*' | sort -u`"
+   if [ "$DEVLISTUSB" != "" ] && [ "$DEVMLIST" != "" ];then
+    MODEMS="`echo "$DEVLISTUSB" | grep -F "$DEVMLIST"`"
+   else
+    MODEMS="$DEVMLIST"
+   fi
+   if [ "$MODEMS" != "" ];then #101205
+    #101206 avoid unecessary modem probing...
+    prevUSBMODEM=''
+    [ -f /var/local/pupdial/usb_modem_port ] && prevUSBMODEM="`cat /var/local/pupdial/usb_modem_port`"
+    [ "$USBIDS" = "$prevUSBIDS" ] && [ "$prevUSBMODEM" ] && [ "`echo "$MODEMS" | grep "$prevUSBMODEM"`" != "" ] && ln -snf $prevUSBMODEM /dev/modem
+    if [ ! -h /dev/modem ];then
+     for MODEM in $MODEMS
+     do
+      chat_with_func /dev/${MODEM}
+      [ $? -eq 0 ] && break
+      MODEM=''
+     done
+     if [ "$MODEM" != "" ];then
+      ln -snf $MODEM /dev/modem
+      echo -n "$MODEM" > /var/local/pupdial/usb_modem_port
+     fi
+    fi
+   fi
+  fi
+ fi
+fi
+
+#####Cdcacm/Dgcmodem#####
+if [ "$CDC_ACM" ];then
+ if [ ! -h /dev/modem ];then #If a different modem selected, quit.
+  if lsmod | grep '^cdc_acm ' >/dev/null ;then
+   #Select interrupt-type device - first one or one identified in log as modem.
+   INTERRUPTLIST="`grep -H -s 'Interrupt' /sys/bus/usb/devices/*-*:*.*/ep_??/type | cut -f 1-6 -d /`"
+   DEVLISTACM="`ls -1 -d /sys/bus/usb/devices/*-*:*.*/tty/tty????* 2>/dev/null | sed 's/ /\n/g' | grep -F "$INTERRUPTLIST" | cut -f 8 -d / | sed 's/\(tty...\)\([0-9]$\)/\10\2/' | sort | sed 's/\(tty...\)\(0\)/\1/'`"
+   DEVMLIST="`grep -s ': USB ACM device$' /var/log/messages | grep -o 'ttyACM[0-9][0-9]*' | sort -u`"
+   if [ "$DEVLISTACM" != "" ] && [ "$DEVMLIST" != "" ];then
+    MODEM="`echo "$DEVLISTACM" | grep -F "$DEVMLIST" | head -n 1`"
+   else
+    MODEM="`echo "$DEVMLIST" | head -n 1`"
+   fi
+   if [ "$MODEM" != "" ];then
+    [ ! -e /dev/$MODEM ] && [ -e /dev/input/$MODEM ] && ln -snf input/$MODEM /dev/$MODEM  #device name for pupdial
+    ln -snf $MODEM /dev/modem
+   fi
+  fi
+ fi
+fi #120908 end
 
 #####Ipwireless#####
 if [ "$IPWIRELESS" ];then
  if [ ! -h /dev/modem ];then #If a different modem selected, quit.
   if lsmod | grep '^ipwireless ' >/dev/null ;then

Changes to woof-distro/Packages-puppy-noarch-official

@@ -24,10 +24,11 @@
 desk_icon_theme_stark042-1|desk_icon_theme_stark042|1||Desktop|492K||desk_icon_theme_stark042-1.pet|+gtk+|black-white-orange line-art style icons, based on area042 icons||||
 desk_icon_theme_malays_uniblack-1|desk_icon_theme_malays_uniblack|1||Desktop|264K||desk_icon_theme_malays_uniblack-1.pet||desktop and menu icons, black lines, put together by vicmz||||
 desk_icon_theme_malays_uniblue-1|desk_icon_theme_malays_uniblue|1||Desktop|332K||desk_icon_theme_malays_uniblue-1.pet||desktop and menu icons, pale blue lines, put together by vicmz||||
 desk_icon_theme_neu-1|desk_icon_theme_neu|1||Desktop|172K||desk_icon_theme_neu-1.pet||desktop and menu icons, modern multi-color, put together by jemimah||||
 desk_icon_theme_shining_silver-1|desk_icon_theme_shining_silver|1||Desktop|272K||desk_icon_theme_shining_silver-1.pet||desktop and menu icons, silver-color with blue highlights, put together by vicmz||||
+dgcmodem-1.13-20120910-1|dgcmodem|1.13-20120910-1||BuildingBlock|116K||dgcmodem-1.13-20120910-1.pet||kernel-independent DGC modem driver components, created by rerwin||||
 ffconvert-1.3|ffconvert|1.3||Multimedia|368K||ffconvert-1.3.pet|+ffmpeg|FFConvert multimedia converter||||
 ffconvert_NLS-1.2.1|ffconvert_NLS|1.2.1||Multimedia|304K||ffconvert_NLS-1.2.1.pet|ffconvert|FFConvert multimedia converter||||
 getflash-1.1|getflash|1.1||Internet|56K||getflash-1.1.pet||GetFlash Install Flashplayer||||
 gtk_theme_citrus_cut-1.2|gtk_theme_citrus_cut|1.2||Desktop|172K||gtk_theme_citrus_cut-1.2.pet|+gtk+|gtk2 orangy theme||||
 gtk_theme_delicate_blue-1|gtk_theme_delicate_blue|1||Desktop|48K||gtk_theme_delicate_blue-1.pet|+gtk+|gtk theme, light blue/grey, graduated blue buttons||||
@@ -42,10 +43,11 @@
 gtkthememaker-1.4|gtkthememaker|1.4||Desktop|68K||gtkthememaker-1.4.pet||GTK Theme Maker, design a theme for GTK windows||||
 gtk_theme_phacile_blue-1.3|gtk_theme_phacile_blue|1.3||Desktop|480K||gtk_theme_phacile_blue-1.3.pet|+gtk+|gtk blue-grey theme||||
 gtk_theme_polished_blue-1.2.3|gtk_theme_polished_blue|1.2.3||Desktop|156K||gtk_theme_polished_blue-1.2.3.pet|+gtk+|grey blue 3d gtk theme||||
 gtk_theme_stardust_zigbert-0.5|gtk_theme_stardust_zigbert|0.5||Desktop|45K||gtk_theme_stardust_zigbert-0.5.pet|+gtk+|gtk light blue 3d theme||||
 gtk_theme_stark-1|gtk_theme_stark|1||Desktop|48K||gtk_theme_stark-1.pet|+gtk+|stark black/white theme for gtk, with faint colours and bright orange splashes||||
+hsfmodem-7.80.02.06-20120911-1|hsfmodem-7.80.02.06|20120911-1||BuildingBlock|830K||hsfmodem-7.80.02.06-20120911-1.pet||HSF modem kernel-independent interfaces & data, pet created by rerwin||||
 hunspell-en-us-2|hunspell-en-us|2||BuildingBlock|732K|pet_packages-quirky|hunspell-en-us-2.pet|+hunspell,+enchant|US English dictionary|||official|
 icons_puppy_app16-20120529|icons_puppy_app16|20120529||Desktop|2288K||icons_puppy_app16-20120529.pet||large collection of 16x16 app icons, can be used by ppm||||
 jwmconfig2-20111110|jwmconfig2|20111110||Desktop|256K||jwmconfig2-20111110.pet|+jwm2,+gtkdialog3|JWM configuration. note, theme font spec different from shinobars pet. note, designed to work with jwm 500+||||
 jwm_theme_bluevariety-1|jwm_theme_bluevariety|1||Desktop|32K||jwm_theme_bluevariety-1.pet|+jwm2|jwm window manager theme, many shades and gradients of blue||||
 jwm_theme_deepbluebold-1-1|jwm_theme_deepbluebold|1-1||Desktop|36K||jwm_theme_deepbluebold-1-1.pet|+jwm2|Theme for JWM window manager, deep blue, white bold text||||

Changes to woof-distro/x86/pet-based/wary/DISTRO_PKGS_SPECS-puppy-wary5

@@ -119,10 +119,11 @@
 no|desk_icon_theme_original||exe
 no|desk_icon_theme_silver_marble||exe
 yes|desk_icon_theme_smooth_color||exe
 no|desk_icon_theme_stardust||exe
 yes|desk_icon_theme_stark042||exe
+yes|dgcmodem||exe| #firmware for dgcmodem analog modem.
 yes|dhcpcd|dhcpcd|exe,dev>null,doc,nls
 no|dhcpcd||exe
 no|dialog|dialog|exe,dev>null,doc,nls| #the T2 dialog is linked against libncurses, my pet libncursesw... no, try later...
 yes|dialog||exe,dev>null,doc,nls
 yes|dictd_client||exe
@@ -284,10 +285,11 @@
 yes|helpsurfer||exe
 yes|hiawatha||exe
 yes|hicolor-icon-theme|hicolor-icon-theme|exe,dev>null,doc,nls
 yes|homebank|homebank|exe,dev>null,doc,nls
 yes|hotplug2stdout||exe
+yes|hsfmodem||exe| #firmware for hsfmodem analog modem.
 yes|hunspell|hunspell|exe,dev,doc,nls
 yes|hunspell-en-us||exe
 no|ibam||exe
 no|icebreaker||exe
 yes|id3lib||exe

Changes to woof-distro/x86/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -119,10 +119,11 @@
 no|desk_icon_theme_jq8flat||exe
 no|desk_icon_theme_original||exe
 yes|desk_icon_theme_smooth_color||exe
 no|desk_icon_theme_stardust||exe
 yes|devmapper|libdevmapper1.02.1,libdevmapper-dev,libdevmapper-event1.02.1|exe,dev,doc,nls
+yes|dgcmodem||exe| #firmware for dgcmodem analog modem.
 no|dhcpcd|dhcpcd|exe,dev>null,doc,nls
 yes|dhcpcd||exe
 yes|dialog|dialog|exe,dev>null,doc,nls
 yes|dictd_client||exe
 yes|didiwiki||exe
@@ -288,10 +289,11 @@
 yes|hiawatha||exe
 yes|hicolor-icon-theme|hicolor-icon-theme|exe,dev>null,doc,nls
 no|homebank|homebank,homebank-data|exe,dev>null,doc,nls
 yes|homebank||exe,dev,doc,nls| #my own pet with less dependencies.
 yes|hotplug2stdout||exe
+yes|hsfmodem||exe| #firmware for hsfmodem analog modem.
 yes|htop||exe
 yes|hunspell|hunspell,libhunspell-1.3-0,libhunspell-dev|exe,dev,doc,nls
 yes|hunspell-en-us|hunspell-en-us|exe,dev,doc,nls
 no|icons_puppy_app16||exe| #large collection of 16x16 app icons.
 yes|id3lib|libid3-3.8.3c2a,libid3-3.8.3-dev|exe,dev,doc,nls