Joshua,
Thanks. Now kmalloc and/or kfree were changed in 2.6.34 kernel so a
conditional is needed there too! :)
Adding this part
#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34) )'
#include <linux/slab.h>'
#endif'
to linmodem-2.6.c fixes the kmalloc and kfree error messages.
The modem responds and works, but connection speed is slow :( compared
to before.
[ 5115.158017] linmodem(1282): linmodem v0.1 loaded
[ 5115.176152] pctel_hw(155): PCTel hardware driver version
0.9.7-9-rht-9 for PCT789
[ 5115.176154]
[ 5115.179592] pctel(481): pctel v0.1 loaded
[ 5115.179653] pctel_hw 0000:01:07.0: PCI INT A -> Link[APC2] -> GSI
17 (level, low) -> IRQ 17
[ 5115.179660] pctel_pci(233): PCTel device[0000:01:07.0](0x38) found
134d:7897 (rev 02), iobase=0xb000, irq=17.
[ 5115.179663] pctel_pci(609): Setup PCI port: port 0xb000, irq 17,
type 0, membase (null), ops (null)
[ 5115.179669] ttyS_PCTEL0 at I/O 0xb000 (irq = 17) is a PCTel
#!/bin/bash
#
# latest fix for 2.6.34 kernels
#
sed -i '423 a if [ ${sub} -lt 30 ]' configure
sed -i '424 a then' configure
sed -i '442 a fi' configure
sed -i '41a /* Add conditional slab.h in 2.6.34 - 06/07/2010 */' linmodem-2.6.c
sed -i '42a #if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34) )'
linmodem-2.6.c
sed -i '43a #include <linux/slab.h>' linmodem-2.6.c
sed -i '44a #endif' linmodem-2.6.c
sed -i 's/port.info/port.state/g' linmodem-2.6.c
sed -i 's/delta_msr_wait/port.delta_msr_wait/g' linmodem-2.6.c
sed -i '1230 s|p|\/\/p|g' linmodem-2.6.c
Regards,
Antonio
BTW
have not tested agrsm-20100106 against 2.6.34 kernel yet :)
also martian-full-20100123 code along with slmodem-2.9.11-20100222 code.
Those are next I guess when someone reports problems?
On 6/7/10, Joshua Gordon Crawford <jgcrawford@xxxxxxxxx> wrote:
> On 7 June 2010 19:07, Robert Thornburrow
> <robert.thornburrow@xxxxxxxxxxxxxxxx> wrote:
>> Hi Antonio,
>>
>> I already have a patch for the compiler version mismatch. It now does
>> an extra check if the exact versions are not the same - it now checks the
>> just the major.minor version numbers and only bails out if these don't
>> match. Users will still see a warning if this happens. You can safely
>> comment out the version check in the script to test the compile.
>>
>> For the other broken bits of configure, the script now checks for some
>> bits in "generated" rather than "linux" as I think we still need the
>> safety check to ensure that everything is there that is needed.
>>
>> I will see if I can find what has happened to the pointer that gets
>> NULLed at the end of linmodem-2.6.c - I don't like the idea of just
>> commenting it out, even if it appears to work.
>>
>> Your patch script will be a handy resource to point people to until I
>> can make a new release, so thank you very much for taking the time to
>> write this.
>>
>> Do we know what kernel version some of the changes came in at? I will
>> have a go at building against a few more versions as part of my
>> regression testing, but if we know when for example port.info became
>> port.state, then I can put proper conditions in the code.
>
> port.info/port.state and delta_msr_wait/port.delta_msr_wait were
> changed for the 2.6.32 kernel.
>
>> Best regards,
>>
>> Robert
>>
>> On 07/06/2010 04:44, Antonio Olivares wrote:
>>>
>>> Robert,
>>>
>>> I wrote a little script with sed that makes the code compile and work.
>>> Just untar the archive and cd to src/ directory and run
>>>
>>> #!/bin/bash
>>> #
>>> # fix for compilation errors pctel modem
>>> #
>>> sed -i '423 a if [ ${sub} -lt 30 ]' configure
>>> sed -i '424 a then' configure
>>> sed -i '442 a fi' configure
>>> sed -i 's/port.info/port.state/g' linmodem-2.6.c
>>> sed -i 's/delta_msr_wait/port.delta_msr_wait/g' linmodem-2.6.c
>>> sed -i '1226 s|p|\/\/p|g' linmodem-2.6.c
>>>
>>>
>>> then you may run
>>>
>>> ./configure -auto # otherwise change this to your modem type :)
>>>
>>> The first part of the script does what asm-changes Marv wrote, put I
>>> had a hard time scripting the patch -p1 asm-default < configure part.
>>> I then played around and got the same errors Carlos was getting. I
>>> then saw that the line 1226 in linmodem-2.6.c was bombing out, I
>>> commented it out and things worked? I know it is a temporary fix, but
>>> it works for the moment.
>>>
>>> Hope this helps. I tried it with 2.6.34 kernel, but failed because of
>>> compiler and kernel mismatch. kernel was compiled with gcc 4.4.3 and
>>> gcc was 4.4.4 so the make failed. Will check that out later.
>>>
>>> Regards,
>>>
>>> Antonio
>>>
>>> On 6/7/10, Robert Thornburrow <robert.thornburrow@xxxxxxxxxxxxxxxx>
>>> wrote:
>>>> Thank you Antonio, Marv and Jeff, for all your help.
>>>>
>>>> I am currently in the process of producing a fixed version of the driver
>>>> with all the necessary changes to support up to kernel 2.6.34.
>>>>
>>>> On my setup I had problems with autoconfig.h, mach-default, info/state,
>>>> delta_msr_wait and kmalloc/kfree. Those kernel mites have been busy!
>>>>
>>>> I've had a manic week and this week looks like it is going to be
>>>> similar,
>>>> but I will endeavour to get a new version out as soon as possible. I
>>>> have
>>>> sporadic email access, so forgive me if I keep going quiet - I am still
>>>> here!
>>>>
>>>> Best regards,
>>>>
>>>> Robert
>>>>
>>>>
>>>> On 06/06/2010 02:50, Antonio Olivares wrote:
>>>>>
>>>>> Carlos,
>>>>>
>>>>> The modem does connect. I can report now successfully. kernel
>>>>> 2.6.33.2, will try with 2.6.34 later maybe couple of days?
>>>>>
>>>>> The modem did not work previously because it was not seated correctly.
>>>>> I positioned it correclty and now it works :) I swapped a smartlink
>>>>> modem to test this one out. Here's ModemData.txt for completeness:
>>>>>
>>>>> root@slax:~# gunzip scanModem.gz
>>>>> root@slax:~# chmod +x scanModem
>>>>> root@slax:~# ./scanModem
>>>>> UPDATE=2010_05_29
>>>>> Continuing as this update is only 1 weeks old,
>>>>> but the current Update is always at: http://linmodems.technion.ac.il
>>>>>
>>>>>
>>>>> Identifying PCI bus slots with candidate modems.
>>>>> Running PCIbus cases
>>>>> Analysing card in PCI bus 01:07.0, writing to scanout.01:07.0
>>>>> Analysing card in PCI bus 00:05.0, writing to scanout.00:05.0
>>>>> Using scanout.00:05.0 data, and writing guidance to ModemData.txt
>>>>> Writing DOCs/Pctel.txt
>>>>> Using scanout.01:07.0 data, and writing guidance to ModemData.txt
>>>>> Writing DOCs/Pctel.txt
>>>>>
>>>>> Writing residual guidance customized to your System.
>>>>> A subfolder Modem/ has been written, containing these files with
>>>>> more detailed Information:
>>>>>
>>>>> ------------------------------------------------------------------------------------------
>>>>> 1stRead.txt Bootup.txt DOCs ModemData.txt dmesg.txt
>>>>> scanout.00:05.0
>>>>> scanout.01:07.0 tmp
>>>>> and in the DOCs subfolder:
>>>>> DriverCompiling.txt InfoGeneral.txt Pctel.txt Rational.txt
>>>>> SoftModem.txt Testing.txt UNSUBSCRIBE.txt YourSystem.txt
>>>>> wvdial.txt
>>>>> -------------------------------------------------------------------------------------------
>>>>> Please read 1stRead.txt first for Guidance.
>>>>>
>>>>>
>>>>> root@slax:~# cat Modem/ModemData.txt
>>>>> Only plain text email is forwarded by the Discuss@xxxxxxxxxxxxx List
>>>>> Server,
>>>>> as HTML can contain viruses. Use as the email Subject Line:
>>>>> YourName, YourCountry
>>>>> ===============================================================================
>>>>> Welcome to Slax-Remix
>>>>> v06
>>>>> ===============================================================================
>>>>>
>>>>> The system is up and running now.
>>>>>
>>>>> Login as "root" with password "toor", both without quotes, lowercase.
>>>>> If you're new to Slax, visit http://www.slax.org/ for more info.
>>>>>
>>>>> After you login, try the following commands:
>>>>>
>>>>> mc ....... to start Midnight Commander (edit/copy/move/create/delete
>>>>> files)
>>>>> startx ... to run Xwindow system with KDE in VESA mode 1024x768 at
>>>>> 75Hz
>>>>> xconf .... to autoconfigure your graphics card for better performance
>>>>>
>>>>> Other commands you may find useful (for experts only!):
>>>>>
>>>>> activate ..... to insert (install) Slax module into the system on the
>>>>> fly
>>>>> deactivate ... to remove (uninstall) Slax module from the root
>>>>> filesystem
>>>>> mkfileswap ... to create a special file on your harddisk for virtual
>>>>> RAM
>>>>>
>>>>> When finished, use "poweroff" or "reboot" command and wait until it
>>>>> completes
>>>>> ===============================================================================
>>>>> kernel 2.6.33.2
>>>>> With this Subject Line cogent experts will be alerted, and useful
>>>>> case names left in the Archive.
>>>>> YourCountry will enable Country specific guidance. Linux experts in
>>>>> YourCountry
>>>>> can be found through: http://www.linux.org/groups/index.html.
>>>>> They will know your Country's modem code, which may be essential for
>>>>> dialup service.
>>>>> Responses from Discuss@xxxxxxxxxxxxx are sometimes blocked by an
>>>>> Internet Provider mail filters.
>>>>> So in a day, also check the Archived responses at
>>>>> http://www.linmodems.org
>>>>> -------------------------- System information
>>>>> ----------------------------
>>>>> CPU=i686,
>>>>> ===============================================================================
>>>>>
>>>>> ===============================================================================
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> ===============================================================================
>>>>> , ALSA_version=1.0.21
>>>>> Linux version 2.6.33.2 (root@slax) (gcc version 4.4.3 (GCC) ) #3 SMP
>>>>> PREEMPT Sat Apr 24 10:23:14 UTC 2010
>>>>> scanModem update of: 2010_05_29
>>>>> The modem symbolic link is /dev/modem -> ttyS_PCTEL0
>>>>> /etc/lsb-release not found
>>>>>
>>>>>
>>>>> Presently install your Linux Distributions dkms package. It provides
>>>>> for automated driver updates,
>>>>> following upgrade of your kernel. For details see
>>>>> http://linux.dell.com/projects.shtml#dkms
>>>>>
>>>>> Modem drivers blocked from loading during bootup are listed in
>>>>> /etc/modprobe* file lines:
>>>>> /etc/modprobe.d/blacklist.conf:blacklist snd-atiixp-modem
>>>>> /etc/modprobe.d/blacklist.conf:blacklist snd-via82xx-modem
>>>>> /etc/modprobe.d/blacklist.conf:blacklist snd-intel8x0m
>>>>>
>>>>>
>>>>> Potentially useful modem drivers now loaded are:
>>>>> snd_hda_intel
>>>>>
>>>>> Attached USB devices are:
>>>>> ID 1058:0401 Western Digital Technologies, Inc.
>>>>> If a cellphone is not detected, see
>>>>> http://ubuntuforums.org/archive/index.php/t-878554.html
>>>>> A sample report is:
>>>>> http://linmodems.technion.ac.il/bigarch/archive-nineth/msg00578.html
>>>>>
>>>>> If a USB modem or cellphone is attached and was not detected, please
>>>>> provide available information in your request to discuss@xxxxxxxxxxxxx
>>>>>
>>>>> Candidate PCI devices with modem chips are:
>>>>> 01:07.0 Modem: PCTel Inc HSP MicroModem 56 (rev 02)
>>>>> 00:05.0 Audio device: nVidia Corporation MCP61 High Definition Audio
>>>>> (rev
>>>>> a2)
>>>>> High Definition Audio cards can host modem chips.
>>>>>
>>>>> For candidate card in slot 01:07.0, firmware information and bootup
>>>>> diagnostics are:
>>>>> PCI slot PCI ID SubsystemID Name
>>>>> ---------- --------- --------- --------------
>>>>> 01:07.0 134d:7897 134d:0001 Modem: PCTel Inc HSP
>>>>> MicroModem 56
>>>>>
>>>>> Modem interrupt assignment and sharing:
>>>>> 17: 20 37401 IO-APIC-fasteoi serial
>>>>> --- Bootup diagnostics for card in PCI slot 01:07.0 ----
>>>>> pci 0000:01:07.0: reg 10: [io 0xb000-0xb03f]
>>>>> pci 0000:01:07.0: supports D2
>>>>> pci 0000:01:07.0: PME# supported from D0 D2 D3hot D3cold
>>>>> pci 0000:01:07.0: PME# disabled
>>>>> serial 0000:01:07.0: enabling device (0000 -> 0001)
>>>>> serial 0000:01:07.0: PCI INT A -> Link[APC2] -> GSI 17 (level, low) ->
>>>>> IRQ
>>>>> 17
>>>>> serial 0000:01:07.0: PCI INT A disabled
>>>>> pctel_hw 0000:01:07.0: PCI INT A -> Link[APC2] -> GSI 17 (level, low)
>>>>> ->
>>>>> IRQ 17
>>>>> pctel_pci(233): PCTel device[0000:01:07.0](0x38) found 134d:7897 (rev
>>>>> 02), iobase=0xb000, irq=17.
>>>>>
>>>>> The PCI slot 01:07.0 of the modem card may be disabled early in
>>>>> a bootup process, but then enabled later. If modem drivers load
>>>>> but the modem is not responsive, read DOCs/Bootup.txt about possible
>>>>> fixes.
>>>>> Send dmesg.txt along with ModemData.txt to discuss@xxxxxxxxxxxxx
>>>>> if help is needed.
>>>>>
>>>>>
>>>>> For candidate card in slot 00:05.0, firmware information and bootup
>>>>> diagnostics are:
>>>>> PCI slot PCI ID SubsystemID Name
>>>>> ---------- --------- --------- --------------
>>>>> 00:05.0 10de:03f0 1458:a002 Audio device: nVidia
>>>>> Corporation MCP61 High Definition Audio
>>>>>
>>>>> Modem interrupt assignment and sharing:
>>>>> 23: 14 1492 IO-APIC-fasteoi sata_nv, hda_intel
>>>>> --- Bootup diagnostics for card in PCI slot 00:05.0 ----
>>>>> pci 0000:00:05.0: reg 10: [mem 0xfb000000-0xfb003fff]
>>>>> pci 0000:00:05.0: PME# supported from D3hot D3cold
>>>>> pci 0000:00:05.0: PME# disabled
>>>>> HDA Intel 0000:00:05.0: PCI INT B -> Link[AAZA] -> GSI 23 (level, low)
>>>>> ->
>>>>> IRQ 23
>>>>> HDA Intel 0000:00:05.0: setting latency timer to 64
>>>>>
>>>>> The PCI slot 00:05.0 of the modem card may be disabled early in
>>>>> a bootup process, but then enabled later. If modem drivers load
>>>>> but the modem is not responsive, read DOCs/Bootup.txt about possible
>>>>> fixes.
>>>>> Send dmesg.txt along with ModemData.txt to discuss@xxxxxxxxxxxxx
>>>>> if help is needed.
>>>>>
>>>>>
>>>>> === Finished firmware and bootup diagnostics, next deducing cogent
>>>>> software. ===
>>>>>
>>>>> Predictive diagnostics for card in bus 00:05.0:
>>>>> Modem chipset detected on
>>>>> NAME="Audio device: nVidia Corporation MCP61 High Definition Audio "
>>>>> CLASS=0403
>>>>> PCIDEV=10de:03f0
>>>>> SUBSYS=1458:a002
>>>>> IRQ=23
>>>>> IDENT=PCTEL
>>>>>
>>>>> For candidate modem in: 00:05.0
>>>>> 0403 Audio device: nVidia Corporation MCP61 High Definition Audio
>>>>> Primary device ID: 10de:03f0
>>>>> Support type needed or chipset: PCTEL
>>>>>
>>>>>
>>>>> At http://linmodems.technion.ac.il/pctel-linux
>>>>> Get the pctel-0.9.7-9-rht-10.tar.gz
>>>>> Unpack under Linux with:
>>>>> tar zxf pctel*.tar.gz
>>>>> and read instuctions therein.
>>>>> Read DOCs/Pctel.txt and Modem/DOCs/YourSystem.txt for follow through
>>>>> guidance.
>>>>>
>>>>> Writing DOCs/Pctel.txt
>>>>>
>>>>>
>>>>> Predictive diagnostics for card in bus 01:07.0:
>>>>> Modem chipset detected on
>>>>> NAME="Modem: PCTel Inc HSP MicroModem 56 "
>>>>> CLASS=0703
>>>>> PCIDEV=134d:7897
>>>>> SUBSYS=134d:0001
>>>>> IRQ=17
>>>>> HDA2=00:05.0
>>>>> IDENT=PCTEL
>>>>>
>>>>> For candidate modem in: 01:07.0
>>>>> 0703 Modem: PCTel Inc HSP MicroModem 56
>>>>> Primary device ID: 134d:7897
>>>>> Support type needed or chipset: PCTEL
>>>>>
>>>>>
>>>>> At http://linmodems.technion.ac.il/pctel-linux
>>>>> Get the pctel-0.9.7-9-rht-10.tar.gz
>>>>> Unpack under Linux with:
>>>>> tar zxf pctel*.tar.gz
>>>>> and read instuctions therein.
>>>>> Read DOCs/Pctel.txt and Modem/DOCs/YourSystem.txt for follow through
>>>>> guidance.
>>>>>
>>>>> Writing DOCs/Pctel.txt
>>>>>
>>>>> Completed candidate modem analyses.
>>>>>
>>>>> The base of the UDEV device file system is: /dev/.udev
>>>>>
>>>>> Versions adequately match for the compiler installed: 4.4.3
>>>>> and the compiler used in kernel assembly: 4.4.3
>>>>>
>>>>>
>>>>>
>>>>> Minimal compiling resources appear complete:
>>>>> make utility - /usr/bin/make
>>>>> Compiler version 4.4
>>>>> linuc_headers base folder /lib/modules/2.6.33.2/build
>>>>>
>>>>> However some compilations and executable functions may need additional
>>>>> files,
>>>>> in the FileNames.h (so called kernel "h"eaders) collection installed
>>>>> in /usr/include/ .
>>>>> For martian_modem, additional required packages are needed. The also
>>>>> required headers of package libc6 are commonly installed by default.
>>>>> Compiling hsfmodem drivers does require linux-libc-dev and libc6-dev
>>>>> packages, for kernels 2.6.24 and later versions.
>>>>> In not included on your install CD, search for them at
>>>>> http://packages.ubuntu.com
>>>>> or comparable Repository for other Linux distros.
>>>>> When compiling ALSA drivers, the utility "patch" will also be needed.
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> If a driver compilation fails, with message including some lack of
>>>>> some FileName.h (stdio.h for example), then
>>>>> Some additional kernel-header files need installation to /usr/include.
>>>>> The minimal additional packages are libc6-dev
>>>>> and any of its dependents, under Ubuntu linux-libc-dev
>>>>>
>>>>> If an alternate ethernet connection is available,
>>>>> $ apt-get update
>>>>> $ apt-get -s install linux-kernel-devel
>>>>> will install needed packages.
>>>>> For Debian/Ubuntu related distributions, run the following command to
>>>>> display the needed package list:
>>>>>
>>>>> Otherwise packages have to be found through http://packages.ubuntu.com
>>>>> Once downloaded and transferred into a Linux partition,
>>>>> they can be installed alltogether with:
>>>>> $ sudo dpkg -i *.deb
>>>>>
>>>>>
>>>>> Checking pppd properties:
>>>>> -rwxr-xr-x 1 root root 266728 Apr 24 09:49 /usr/sbin/pppd
>>>>>
>>>>> In case of an "error 17" "serial loopback" problem, see:
>>>>>
>>>>> http://linmodems.technion.ac.il/linmodems/archive-sixth/msg02637.html
>>>>>
>>>>> To enable dialout without Root permission do:
>>>>> $ su - root (not for Ubuntu)
>>>>> chmod a+x /usr/sbin/pppd
>>>>> or under Ubuntu related Linuxes
>>>>> chmod a+x /usr/sbin/pppd
>>>>>
>>>>> Checking settings of: /etc/ppp/options
>>>>> asyncmap 0
>>>>> crtscts
>>>>> lock
>>>>> modem
>>>>> proxyarp
>>>>> lcp-echo-interval 30
>>>>> lcp-echo-failure 4
>>>>>
>>>>> In case of a message like:
>>>>> Warning: Could not modify /etc/ppp/pap-secrets: Permission denied
>>>>> see http://linmodems.technion.ac.il/bigarch/archive-sixth/msg04656.html
>>>>>
>>>>> For guidance on FAX usage, get from
>>>>> http://linmodems.technion.ac.il/packages/ get faxing.tar.gz
>>>>> It has samples for a modem using port /dev/ttySL0, which must be
>>>>> changed to match your modem's port.
>>>>>
>>>>> Read Modem/DOCs/YourSystem.txt concerning other COMM channels: eth0
>>>>> ppp0
>>>>> Which can interfere with Browser naviagation.
>>>>>
>>>>> Don't worry about the following, it is for experts should trouble
>>>>> shooting be necessary.
>>>>> ==========================================================
>>>>>
>>>>> Checking for modem support lines:
>>>>> --------------------------------------
>>>>> /device/modem symbolic link: lrwxrwxrwx 1 root root 11 Jun 5
>>>>> 20:33 /dev/modem -> ttyS_PCTEL0
>>>>> slmodemd created symbolic link /dev/ttySL0:
>>>>> Within /etc/udev/ files:
>>>>> /etc/udev/rules.d/70-pctel.rules:KERNEL=="ttyS_PCTEL0", SYMLINK="modem"
>>>>> Within /etc/modprobe.conf files:
>>>>> /etc/modprobe.d/blacklist.conf:# ALSA modules to support sound modems.
>>>>> These should be loaded manually
>>>>> /etc/modprobe.d/blacklist.conf:blacklist snd-atiixp-modem
>>>>> /etc/modprobe.d/blacklist.conf:blacklist snd-via82xx-modem
>>>>> Within any ancient /etc/devfs files:
>>>>>
>>>>> Within ancient kernel 2.4.n /etc/module.conf files:
>>>>>
>>>>> --------- end modem support lines --------
>>>>>
>>>>> root@slax:~#
>>>>>
>>>>> root@slax:~# uname -r
>>>>> 2.6.33.2
>>>>> root@slax:~# wvdial
>>>>> --> WvDial: Internet dialer version 1.60
>>>>> --> Initializing modem.
>>>>> --> Sending: ATZ
>>>>> ATZ
>>>>> OK
>>>>> --> Sending: ATQ0 V1 E1 S0=0 &C1 &D2 +FCLASS=0
>>>>> ATQ0 V1 E1 S0=0 &C1 &D2 +FCLASS=0
>>>>> OK
>>>>> --> Modem initialized.
>>>>> --> Sending: ATDT7072000
>>>>> --> Waiting for carrier.
>>>>> ATDT7072000
>>>>> CONNECT 115200
>>>>> --> Carrier detected. Starting PPP immediately.
>>>>> --> Starting pppd at Sat Jun 5 20:36:14 2010
>>>>> --> Pid of pppd: 12804
>>>>> --> Using interface ppp0
>>>>> --> pppd: pȵ è
>>>>> --> pppd: pȵ è
>>>>> --> pppd: pȵ è
>>>>> --> pppd: pȵ è
>>>>> --> local IP address 66.201.8.131
>>>>> --> pppd: pȵ è
>>>>> --> remote IP address 66.201.8.6
>>>>> --> pppd: pȵ è
>>>>> --> primary DNS address 66.201.0.203
>>>>> --> pppd: pȵ è
>>>>> --> secondary DNS address 66.94.120.9
>>>>> --> pppd: pȵ è
>>>>>
>>>>>
>>>>> The same fixes suggested before made it work. I will summarize them:
>>>>>
>>>>> change port.info to port.state
>>>>> change delta_msr_wait to port.delta_msr_wait
>>>>> comment out the line:1226
>>>>>
>>>>> from
>>>>>
>>>>> p->reg.state->port = NULL;
>>>>>
>>>>> to
>>>>> // p->reg.state->port = NULL;
>>>>>
>>>>>
>>>>> and the modem will respond and connect. Hope this helps :)
>>>>>
>>>>> Regards,
>>>>>
>>>>> Antonio
>>>>>
>>>>> On 6/5/10, Antonio Olivares <olivares14031@xxxxxxxxx> wrote:
>>>>>> Carlos
>>>>>>
>>>>>> I have managed to compile the driver, but the dialers kppp and wvdial
>>>>>> are not dialing :(,
>>>>>>
>>>>>> change
>>>>>> line 420 port.info to port.state
>>>>>> line 513 port.state
>>>>>> line 565 delta_msr_wait to port.delta_msr_wait
>>>>>> line 1226? comment it out where it has NULL
>>>>>>
>>>>>> Here are results:
>>>>>>
>>>>>> diff linmodem-2.6.c
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c
>>>>>> 31d30
>>>>>> <
>>>>>> 418c417
>>>>>> < struct tty_struct *tty = p->port.state->tty;
>>>>>> ---
>>>>>>> struct tty_struct *tty = p->port.info->tty;
>>>>>> 420c419
>>>>>> < struct tty_struct *tty = p->port.state->port.tty;
>>>>>> ---
>>>>>>> struct tty_struct *tty = p->port.info->port.tty;
>>>>>> 513c512
>>>>>> < struct circ_buf *xmit = &p->port.state->xmit;
>>>>>> ---
>>>>>>> struct circ_buf *xmit = &p->port.info->xmit;
>>>>>> 565c564
>>>>>> < wake_up_interruptible(&p->port.state->port.delta_msr_wait);
>>>>>> ---
>>>>>>> wake_up_interruptible(&p->port.info->delta_msr_wait);
>>>>>> < int linmodem_register_port(struct uart_port *port) /* int */
>>>>>> ---
>>>>>>> int linmodem_register_port(struct uart_port *port)
>>>>>> 1227c1226
>>>>>> < // p->reg.state->port = NULL; /* NULL */
>>>>>> ---
>>>>>>> p->reg.state->port = NULL;
>>>>>>
>>>>>> pctel_hw: module license 'GPL linked with proprietary libraries'
>>>>>> taints
>>>>>> kernel.
>>>>>> pctel_hw(155): PCTel hardware driver version 0.9.7-9-rht-9 for PCT789
>>>>>> pctel(481): pctel v0.1 loaded
>>>>>> root@slax:~/Downloads/tmp/pctel-0.9.7-9-rht-10#
>>>>>>
>>>>>>
>>>>>>
>>>>>> root@slax:~/Downloads/pctel-0.9.7-9-rht-10/src# lsmod
>>>>>> Module Size Used by
>>>>>> pctel 6954 0
>>>>>> pctel_hw 1035214 1 pctel
>>>>>> linmodem 10461 1 pctel
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> root@slax:~/Downloads/pctel-0.9.7-9-rht-10/src# make clean
>>>>>> rm -f vuart.o i8xxhal.o binary.a built-in.o
>>>>>> rm -f linmodem-2.6.o ptserial-2.6.o ptserial_hw-2.6.o
>>>>>> ptserial_pci-2.6.o
>>>>>> rm -f linmodem.o pctel.o pctel_hw.o
>>>>>> rm -f linmodem.ko pctel.ko pctel_hw.ko
>>>>>> rm -f linmodem.mod.c pctel.mod.c pctel_hw.mod.c
>>>>>> rm -f linmodem.mod.o pctel.mod.o pctel_hw.mod.o
>>>>>> rm -f .built-in.o.cmd
>>>>>> rm -f .pctel.ko.cmd .pctel.mod.o.cmd .pctel.o.cmd
>>>>>> rm -f .pctel_hw.ko.cmd .pctel_hw.mod.o.cmd .pctel_hw.o.cmd
>>>>>> rm -f .linmodem.ko.cmd .linmodem.mod.o.cmd .linmodem.o.cmd
>>>>>> rm -f .linmodem-2.6.o.cmd .ptserial-2.6.o.cmd .ptserial_hw-2.6.o.cmd
>>>>>> rm -f .ptserial_pci-2.6.o.cmd
>>>>>> rm -rf .tmp_versions
>>>>>> rm -f Module.symvers
>>>>>> root@slax:~/Downloads/pctel-0.9.7-9-rht-10/src# ./configure -auto
>>>>>> checking for running kernel version...perl: warning: Setting locale
>>>>>> failed.
>>>>>> perl: warning: Please check that your locale settings:
>>>>>> LANGUAGE = (unset),
>>>>>> LC_ALL = (unset),
>>>>>> LC_COLLATE = "C",
>>>>>> LANG = "en_US"
>>>>>> are supported and installed on your system.
>>>>>> perl: warning: Falling back to the standard locale ("C").
>>>>>> perl: warning: Setting locale failed.
>>>>>> perl: warning: Please check that your locale settings:
>>>>>> LANGUAGE = (unset),
>>>>>> LC_ALL = (unset),
>>>>>> LC_COLLATE = "C",
>>>>>> LANG = "en_US"
>>>>>> are supported and installed on your system.
>>>>>> perl: warning: Falling back to the standard locale ("C").
>>>>>> perl: warning: Setting locale failed.
>>>>>> perl: warning: Please check that your locale settings:
>>>>>> LANGUAGE = (unset),
>>>>>> LC_ALL = (unset),
>>>>>> LC_COLLATE = "C",
>>>>>> LANG = "en_US"
>>>>>> are supported and installed on your system.
>>>>>> perl: warning: Falling back to the standard locale ("C").
>>>>>> perl: warning: Setting locale failed.
>>>>>> perl: warning: Please check that your locale settings:
>>>>>> LANGUAGE = (unset),
>>>>>> LC_ALL = (unset),
>>>>>> LC_COLLATE = "C",
>>>>>> LANG = "en_US"
>>>>>> are supported and installed on your system.
>>>>>> perl: warning: Falling back to the standard locale ("C").
>>>>>> 2.6.33
>>>>>> checking for ptserial...ptserial-2.6.c
>>>>>> checking for gcc...4.4.3
>>>>>> checking for kernel gcc version...4.4.3
>>>>>> searching for kernel includes...found at
>>>>>> /lib/modules/2.6.33.2/build/include
>>>>>> checking for
>>>>>> autoconf.h.../lib/modules/2.6.33.2/build/include/linux/autoconf.h
>>>>>> yes
>>>>>> checking for kernel version in utsrelease.h...UTS_RELEASE is 2.6.33.2
>>>>>> checking type of tty_struct.count...int
>>>>>> checking for presence of udev...present (kernel version 2.6.13 or
>>>>>> later)
>>>>>> detecting your modem...** error
>>>>>> autodetection failed, your modem is not in the database of
>>>>>> known modems. Try to guess the hal and report success, if
>>>>>> the modem worked. Please read the FAQ about autodetection
>>>>>> failed.
>>>>>>
>>>>>> please enter your hal type
>>>>>> choose one of: pct789, cm8738, i8xx, sis, via686a
>>>>>> hal type: pct789
>>>>>> root@slax:~/Downloads/pctel-0.9.7-9-rht-10/src# make all
>>>>>> CC vuart.o
>>>>>> LD binary.a
>>>>>> make -C /lib/modules/2.6.33.2/build
>>>>>> M=/root/Downloads/pctel-0.9.7-9-rht-10/src
>>>>>> make[1]: Entering directory `/usr/src/linux-2.6.33.2'
>>>>>>
>>>>>> WARNING: Symbol version dump /usr/src/linux-2.6.33.2/Module.symvers
>>>>>> is missing; modules will have no dependencies and
>>>>>> modversions.
>>>>>>
>>>>>> LD /root/Downloads/pctel-0.9.7-9-rht-10/src/built-in.o
>>>>>> CC [M] /root/Downloads/pctel-0.9.7-9-rht-10/src/linmodem-2.6.o
>>>>>> CC [M] /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial-2.6.o
>>>>>> CC [M] /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.o
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c: In
>>>>>> function 'pci_pctel_setup':
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c:231:
>>>>>> warning: format '%x' expects type 'unsigned int', but argument 9 has
>>>>>> type 'long unsigned int'
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c: In
>>>>>> function 'amr_pctel_setup':
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c:291:
>>>>>> warning: format '%04x' expects type 'unsigned int', but argument 7 has
>>>>>> type 'long unsigned int'
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c: In
>>>>>> function 'pciserial_init_one':
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c:606:
>>>>>> warning: format '%x' expects type 'unsigned int', but argument 4 has
>>>>>> type 'long unsigned int'
>>>>>> CC [M] /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_hw-2.6.o
>>>>>> LD [M] /root/Downloads/pctel-0.9.7-9-rht-10/src/linmodem.o
>>>>>> LD [M] /root/Downloads/pctel-0.9.7-9-rht-10/src/pctel.o
>>>>>> LD [M] /root/Downloads/pctel-0.9.7-9-rht-10/src/pctel_hw.o
>>>>>> Building modules, stage 2.
>>>>>> MODPOST 3 modules
>>>>>> CC /root/Downloads/pctel-0.9.7-9-rht-10/src/linmodem.mod.o
>>>>>> LD [M] /root/Downloads/pctel-0.9.7-9-rht-10/src/linmodem.ko
>>>>>> CC /root/Downloads/pctel-0.9.7-9-rht-10/src/pctel.mod.o
>>>>>> LD [M] /root/Downloads/pctel-0.9.7-9-rht-10/src/pctel.ko
>>>>>> CC /root/Downloads/pctel-0.9.7-9-rht-10/src/pctel_hw.mod.o
>>>>>> LD [M] /root/Downloads/pctel-0.9.7-9-rht-10/src/pctel_hw.ko
>>>>>> make[1]: Leaving directory `/usr/src/linux-2.6.33.2'
>>>>>>
>>>>>>
>>>>>> linmodem(1282): linmodem v0.1 loaded
>>>>>> pctel_hw: module license 'GPL linked with proprietary libraries'
>>>>>> taints
>>>>>> kernel.
>>>>>> Disabling lock debugging due to kernel taint
>>>>>> pctel_hw(155): PCTel hardware driver version 0.9.7-9-rht-9 for PCT789
>>>>>>
>>>>>> pctel(481): pctel v0.1 loaded
>>>>>> pctel(490): pctel v0.1 unloaded
>>>>>> pctel_hw(165): Unloading PCTel hardware driver version 0.9.7-9-rht-9
>>>>>>
>>>>>> linmodem(1306): linmodem v0.1 unloaded
>>>>>> linmodem(1282): linmodem v0.1 loaded
>>>>>> pctel_hw(155): PCTel hardware driver version 0.9.7-9-rht-9 for PCT789
>>>>>>
>>>>>> pctel(481): pctel v0.1 loaded
>>>>>> pctel(490): pctel v0.1 unloaded
>>>>>> pctel_hw(165): Unloading PCTel hardware driver version 0.9.7-9-rht-9
>>>>>>
>>>>>> linmodem(1306): linmodem v0.1 unloaded
>>>>>> linmodem(1282): linmodem v0.1 loaded
>>>>>> pctel_hw(155): PCTel hardware driver version 0.9.7-9-rht-9 for PCT789
>>>>>>
>>>>>> pctel(481): pctel v0.1 loaded
>>>>>>
>>>>>> but wvdial :
>>>>>> root@slax:~/Downloads# ls /dev/modem -l
>>>>>> lrwxrwxrwx 1 root root 16 Jun 5 15:50 /dev/modem -> /dev/ttyS_PCTEL0
>>>>>> root@slax:~/Downloads# wvdial
>>>>>> --> WvDial: Internet dialer version 1.60
>>>>>> --> Cannot open /dev/modem: No such file or directory
>>>>>> --> Cannot open /dev/modem: No such file or directory
>>>>>> --> Cannot open /dev/modem: No such file or directory
>>>>>> root@slax:~/Downloads#
>>>>>>
>>>>>> I believe it is now a matter of changing some things like the
>>>>>> suggestions given here:
>>>>>>
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c: In
>>>>>> function 'pci_pctel_setup':
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c:231:
>>>>>> warning: format '%x' expects type 'unsigned int', but argument 9 has
>>>>>> type 'long unsigned int'
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c: In
>>>>>> function 'amr_pctel_setup':
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c:291:
>>>>>> warning: format '%04x' expects type 'unsigned int', but argument 7 has
>>>>>> type 'long unsigned int'
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c: In
>>>>>> function 'pciserial_init_one':
>>>>>> /root/Downloads/pctel-0.9.7-9-rht-10/src/ptserial_pci-2.6.c:606:
>>>>>> warning: format '%x' expects type 'unsigned int', but argument 4 has
>>>>>> type 'long unsigned int'
>>>>>>
>>>>>> and it should have a chance at working?
>>>>>>
>>>>>> Hope this helps,
>>>>>>
>>>>>> Antonio
>>>>>>
>>>>>> On 6/5/10, carlos ramos <caramosc@xxxxxxxxx> wrote:
>>>>>>> Hi guys, well i'm trying my best to understand what you are doing.
>>>>>>> I'm
>>>>>>> going to put what i had done before i asked you guys for help to try
>>>>>>> to solve the problem with what i read googling, i didn't mention it
>>>>>>> at
>>>>>>> first because i thought it would not be important, but i can now see
>>>>>>> that its similar to what i had done gooling.
>>>>>>>
>>>>>>> I read in a forum that for the "asm/match--default" problem to change
>>>>>>> lines 426 and 442 in the ./configure file as follows:
>>>>>>>
>>>>>>> 426--- if [ ! -d ${kernel_inc}/asm/mach-default ]
>>>>>>> 426--- if [ ! -d ${kernel_inc}/asm ] <---new
>>>>>>>
>>>>>>> 442--- extra_includes=-I${kernel_inc2}/asm/mach-default
>>>>>>> 442--- extra_includes=-I${kernel_inc2}/asm <---new
>>>>>>>
>>>>>>>
>>>>>>> then when i do:
>>>>>>>
>>>>>>> carlos@carlos-desktop:~/Desktop/pctel-0.9.7-9-rht-10$ sudo ./setup
>>>>>>> [sudo] password for carlos:
>>>>>>> checking for running kernel version...2.6.32
>>>>>>> checking for ptserial...ptserial-2.6.c
>>>>>>> checking for gcc...4.4.3
>>>>>>> checking for kernel gcc version...4.4.3
>>>>>>> searching for kernel includes...found at
>>>>>>> /lib/modules/2.6.32-21-generic/build/include
>>>>>>> checking for
>>>>>>> autoconf.h.../lib/modules/2.6.32-21-generic/build/include/linux/autoconf.h
>>>>>>> checking for asm/mach-default...yes
>>>>>>> checking for kernel version in utsrelease.h...UTS_RELEASE is
>>>>>>> 2.6.32-21-generic
>>>>>>> checking type of tty_struct.count...int
>>>>>>> checking for presence of udev...present (kernel version 2.6.13 or
>>>>>>> later)
>>>>>>> detecting your modem...found. Your modem is a pct789 type modem.
>>>>>>> ** compilation error
>>>>>>> please read the FAQ about reporting compilation problems
>>>>>>> and report this problem. A transcript of the build process
>>>>>>> has been saved in src/make.log. When reporting problems to
>>>>>>> the development team, please send us this file.
>>>>>>> carlos@carlos-desktop:~/Desktop/pctel-0.9.7-9-rht-10$
>>>>>>>
>>>>>>>
>>>>>>> and this is the make.log file:
>>>>>>>
>>>>>>> CC vuart.o
>>>>>>> LD binary.a
>>>>>>> make -C /lib/modules/2.6.32-21-generic/build
>>>>>>> M=/home/carlos/Desktop/pctel-0.9.7-9-rht-10/src
>>>>>>> make[1]: Entering directory
>>>>>>> `/usr/src/linux-headers-2.6.32-21-generic'
>>>>>>> LD /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/built-in.o
>>>>>>> CC [M]
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.o
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c: In
>>>>>>> function ‘receive_chars’:
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c:419:
>>>>>>> error: ‘struct uart_port’ has no member named ‘info’
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c: In
>>>>>>> function ‘transmit_chars’:
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c:512:
>>>>>>> error: ‘struct uart_port’ has no member named ‘info’
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c: In
>>>>>>> function ‘check_modem_status’:
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c:564:
>>>>>>> error: ‘struct uart_port’ has no member named ‘info’
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c: In
>>>>>>> function ‘linmodem_register_port’:
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c:1226:
>>>>>>> error: incompatible types when assigning to type ‘struct tty_port’
>>>>>>> from type ‘void *’
>>>>>>> make[2]: ***
>>>>>>> [/home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.o]
>>>>>>> Error 1
>>>>>>> make[1]: *** [_module_/home/carlos/Desktop/pctel-0.9.7-9-rht-10/src]
>>>>>>> Error
>>>>>>> 2
>>>>>>> make[1]: Leaving directory `/usr/src/linux-headers-2.6.32-21-generic'
>>>>>>> make: *** [all] Error 2
>>>>>>>
>>>>>>>
>>>>>>> then for this error i read to change from "info" to "state" in the
>>>>>>> indicated lines in the linmodem-2.6.c file, then when i do:
>>>>>>>
>>>>>>> carlos@carlos-desktop:~/Desktop/pctel-0.9.7-9-rht-10$ sudo ./setup
>>>>>>> [sudo] password for carlos:
>>>>>>> checking for running kernel version...2.6.32
>>>>>>> checking for ptserial...ptserial-2.6.c
>>>>>>> checking for gcc...4.4.3
>>>>>>> checking for kernel gcc version...4.4.3
>>>>>>> searching for kernel includes...found at
>>>>>>> /lib/modules/2.6.32-21-generic/build/include
>>>>>>> checking for
>>>>>>> autoconf.h.../lib/modules/2.6.32-21-generic/build/include/linux/autoconf.h
>>>>>>> checking for asm/mach-default...yes
>>>>>>> checking for kernel version in utsrelease.h...UTS_RELEASE is
>>>>>>> 2.6.32-21-generic
>>>>>>> checking type of tty_struct.count...int
>>>>>>> checking for presence of udev...present (kernel version 2.6.13 or
>>>>>>> later)
>>>>>>> detecting your modem...found. Your modem is a pct789 type modem.
>>>>>>> ** compilation error
>>>>>>> please read the FAQ about reporting compilation problems
>>>>>>> and report this problem. A transcript of the build process
>>>>>>> has been saved in src/make.log. When reporting problems to
>>>>>>> the development team, please send us this file.
>>>>>>> carlos@carlos-desktop:~/Desktop/pctel-0.9.7-9-rht-10$
>>>>>>>
>>>>>>>
>>>>>>> and this is the make.log file:
>>>>>>>
>>>>>>> CC vuart.o
>>>>>>> LD binary.a
>>>>>>> make -C /lib/modules/2.6.32-21-generic/build
>>>>>>> M=/home/carlos/Desktop/pctel-0.9.7-9-rht-10/src
>>>>>>> make[1]: Entering directory
>>>>>>> `/usr/src/linux-headers-2.6.32-21-generic'
>>>>>>> LD /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/built-in.o
>>>>>>> CC [M]
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.o
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c: In
>>>>>>> function ‘check_modem_status’:
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c:564:
>>>>>>> error: ‘struct uart_state’ has no member named ‘delta_msr_wait’
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c: In
>>>>>>> function ‘linmodem_register_port’:
>>>>>>> /home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.c:1226:
>>>>>>> error: incompatible types when assigning to type ‘struct tty_port’
>>>>>>> from type ‘void *’
>>>>>>> make[2]: ***
>>>>>>> [/home/carlos/Desktop/pctel-0.9.7-9-rht-10/src/linmodem-2.6.o]
>>>>>>> Error 1
>>>>>>> make[1]: *** [_module_/home/carlos/Desktop/pctel-0.9.7-9-rht-10/src]
>>>>>>> Error
>>>>>>> 2
>>>>>>> make[1]: Leaving directory `/usr/src/linux-headers-2.6.32-21-generic'
>>>>>>> make: *** [all] Error 2
>>>>>>>
>>>>>>>
>>>>>>> as I said I really don't know about programing, i just changed the
>>>>>>> lines in the files to see if the driver could install, with what I
>>>>>>> read that could solve the problem. Maybe with output of the make.log
>>>>>>> files can be of some help.
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> On 6/5/10, Marvin Stodolsky <marvin.stodolsky@xxxxxxxxx> wrote:
>>>>>>>> The residual compile problem is at least in part due to
>>>>>>>> port.info becoming obsolete. Below is a fix that was done for the
>>>>>>>> ltmodem code. In the pctel src/linmodems.2.6.c , I tried
>>>>>>>> substitutions of port.state for port.info, but the compile still
>>>>>>>> failed. So something a bit more sophisticated is needed.
>>>>>>>>
>>>>>>>> MarvS
>>>>>>>>
>>>>>>>>
>>>>>>>> ---------- Forwarded message ----------
>>>>>>>> From: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
>>>>>>>> Date: Mon, Jan 4, 2010 at 5:03 PM
>>>>>>>> Subject: [PATCH 8/9] v8250: uart_info is gone
>>>>>>>> To: Discuss@xxxxxxxxxxxxx
>>>>>>>>
>>>>>>>>
>>>>>>>> See upstream kernel.org commit
>>>>>>>> ebd2c8f6d2ec4012c267ecb95e72a57b8355a705
>>>>>>>> where things are relocated into uart_state
>>>>>>>>
>>>>>>>> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
>>>>>>>> ---
>>>>>>>> v8250.c | 8 ++++----
>>>>>>>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>>>>>>>
>>>>>>>> diff --git a/v8250.c b/v8250.c
>>>>>>>> index b422ad1..18849a6 100644
>>>>>>>> --- a/v8250.c
>>>>>>>> +++ b/v8250.c
>>>>>>>> @@ -178,7 +178,7 @@ static void serial8250_enable_ms(struct
>>>>>>>> uart_port
>>>>>>>> *port)
>>>>>>>> static void
>>>>>>>> receive_chars(struct vuart_8250_port *up, unsigned int *status)
>>>>>>>> {
>>>>>>>> - struct tty_struct *tty = up->port.info->port.tty;
>>>>>>>> + struct tty_struct *tty = up->port.state->port.tty;
>>>>>>>> unsigned char ch, lsr = *status;
>>>>>>>> int max_count = 256;
>>>>>>>> char flag;
>>>>>>>> @@ -240,7 +240,7 @@ receive_chars(struct vuart_8250_port *up,
>>>>>>>> unsigned
>>>>>>>> int *status)
>>>>>>>>
>>>>>>>> static void transmit_chars(struct vuart_8250_port *up)
>>>>>>>> {
>>>>>>>> - struct circ_buf *xmit = &up->port.info->xmit;
>>>>>>>> + struct circ_buf *xmit = &up->port.state->xmit;
>>>>>>>> int count;
>>>>>>>>
>>>>>>>> if (up->port.x_char) {
>>>>>>>> @@ -281,7 +281,7 @@ static unsigned int check_modem_status(struct
>>>>>>>> vuart_8250_port *up)
>>>>>>>> unsigned int status = serial_in(up, UART_MSR);
>>>>>>>>
>>>>>>>> if (status & UART_MSR_ANY_DELTA && up->ier & UART_IER_MSI &&
>>>>>>>> - up->port.info != NULL) {
>>>>>>>> + up->port.state != NULL) {
>>>>>>>> if (status & UART_MSR_TERI)
>>>>>>>> up->port.icount.rng++;
>>>>>>>> if (status & UART_MSR_DDSR)
>>>>>>>> @@ -291,7 +291,7 @@ static unsigned int check_modem_status(struct
>>>>>>>> vuart_8250_port *up)
>>>>>>>> if (status & UART_MSR_DCTS)
>>>>>>>> uart_handle_cts_change(&up->port, status &
>>>>>>>> UART_MSR_CTS);
>>>>>>>>
>>>>>>>> -
>>>>>>>> wake_up_interruptible(&up->port.info->delta_msr_wait);
>>>>>>>> +
>>>>>>>> wake_up_interruptible(&up->port.state->delta_msr_wait);
>>>>>>>> }
>>>>>>>>
>>>>>>>> return status;
>>>>>>>> --
>>>>>>>> 1.6.5.2
>>>>>>>>
>>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>>
>>>
>>>
>>
>>
>
>
>
> --
> Joshua Crawford ... http://geocities.com/mortarn
>
> http://www.rewardscentral.com.au/Join/Default.aspx?refer=mortarn
> Be rewarded! Join RewardsCentral today!
>
