This commit is contained in:
gferg 2002-07-22 15:39:21 +00:00
parent 9a5932bc1e
commit 8a62ec0b74
9 changed files with 916 additions and 903 deletions

View File

@ -17,12 +17,18 @@
</affiliation>
</author>
<abstract>
<para>This document describes how to build, setup, and use the ACP (Mwave)
Modem feature of the IBM Thinkpad&trade; 600, 600E, and 770x. The latest version of
<para>This document describes how to build, setup, and use the driver and user space application necessary for using the ACP (Mwave)
Modem in the IBM Thinkpad&trade; 600, 600E, and 770 models
which include the on board ACP modem hardware. The latest version of
this document can always be found at <ulink URL="http://www.ibm.com/linux/ltc/"> http://www.ibm.com/linux/ltc/</ulink></para>
</abstract>
<pubdate>2001-01-12</pubdate>
<revhistory>
<revision>
<revnumber>.11</revnumber>
<date>2002-07-18</date>
<authorinitials>PBS</authorinitials>
</revision>
<revision>
<revnumber>.10</revnumber>
<date>2001-07-18</date>
@ -54,7 +60,8 @@
<title>General Information and Hardware Requirements</title>
<sect2 ID="Introduction">
<title>Introduction</title>
<para>The ACP Modem for Linux is a WinModem. It is composed of a
<para>The ACP Modem for Linux is a software based modem.
Support software for the ACP modem is composed of a
loadable kernel module and a user level application. Together
these components support direct connection to public
switched telephone networks (PSTNs) and support selected
@ -69,7 +76,7 @@
</sect2>
<sect2 ID="Credits">
<title>Credits</title>
<para>This Linux ACP Modem driver was ported from the Windows NT&trade
<para>This Linux ACP Modem driver was ported from the Windows NT&trade;
version of the driver available from IBM. Many thanks to
Keith Frechette, Charles Ball, and Frank Novak for their
technical and support efforts in making this project
@ -79,9 +86,14 @@
<title>Where Can I Get the Latest Version of this Driver?</title>
<para>The latest version of this driver is available from <ulink URL="http://www.ibm.com/linux/ltc/">http://www.ibm.com/linux/ltc/</ulink></para>
</sect2>
<sect2 ID="OtherResources">
<title>Are There Any Other Resources?</title>
<para>Thomas Hood's <ulink url="http://panopticon.csustan.edu/thood/tp600lnx.htm">Debian GNU/Linux on IBM ThinkPad 600 and 600x</ulink>
page contains lots of useful information.</para>
</sect2>
<sect2 ID="copyright">
<title>Copyright Notice and Disclaimer</title>
<para>Copyright (c) 2000 IBM Corporation</para>
<para>Copyright (c) 2002 IBM Corporation</para>
<para>This document may be reproduced or distributed in any form
without prior permission. Modified versions of this document
may be freely distributed, provided that they are clearly
@ -165,7 +177,7 @@
<para>gcc version 2.7.x or later</para>
</listitem>
</itemizedlist>
<para>If you are building the ACP Modem driver and application,
<para>If you are building the ACP Modem driver along with the user space application,
you need to have a complete Linux source tree for your
kernel, not just an up-to-date kernel image.</para>
</sect2>
@ -174,14 +186,15 @@
<orderedlist>
<listitem><para>Use <command>tar xzvf</command> <filename>mwavem-yyyymmdd.tar.gz</filename> to unpack the distribution.</para></listitem>
<listitem><para>Change directories with <command>cd <filename>mwavem-yyyymmdd</filename></command></para></listitem>
<listitem><para>Use the <command>./configure</command> command to configure the build options. Issue <command>./configure --help</command> to view all of the options. The defaults are probably okay though.</para></listitem>
<listitem><para>Use the <command>./configure</command> command to configure the build options. Issue <command>./configure --help</command> to view all of the options. The defaults are probably okay though.</para>
<note><title>NOTE</title> <para>As of mwavem-1.0.3 you must give ./configure the --enable-mwavedd argument in order to build the driver with the user space application.</para></note></listitem>
<listitem><para>Use the <command>make</command> command to build all of the ACP Modem binaries.</para>
<note><title>NOTE</title> <para>Your gcc package should be at least at the 2.7.x level.
Check your <filename>/usr/src/linux/Documentation/Changes</filename> file for
the minimum version information.</para>
</note></listitem>
<listitem><para>Use <command>make install</command> to install the <filename>mwavem</filename> binary, <filename>mwavem.conf</filename> configuration, DSPs, and module device driver
files and to create the <filename>/dev/modems/mwave</filename> device node. </para></listitem>
<listitem><para>Use <command>make install</command> to install the <filename>mwavem</filename> binary, <filename>mwavem.conf</filename> configuration, the extra binary (mostly .dsp) files, and module device driver
(if you specified that it must be built) and to create the <filename>/dev/modems/mwave</filename> device node. </para></listitem>
</orderedlist>
</sect2>
<sect2 ID="Setup">
@ -224,28 +237,28 @@ InternationsalRule=00EFG</programlisting>
<note><title>NOTE</title><para> The following arguments are not persistent from boot to boot
(i.e. We are not saving them in the BIOS).</para></note>
<itemizedlist>
<listitem><para>tp3780i_dsp_irq=5/7/10/11/15</para>
<listitem><para>mwave_3780i_irq=5/7/10/11/15</para>
<para>This parameter allows you to configure the IRQ used by the DSP if the DSP IRQ was not set
and stored in BIOS by the Thinkpad&trade; configuration utility.</para></listitem>
<listitem><para>tp3780i_dsp_io=0x130/0x350/0x0070/0xDB0</para>
<listitem><para>mwave_3780i_io=0x130/0x350/0x0070/0xDB0</para>
<para>This parameter allows you to configure the I/O range used by the DSP if the DSP I/O range was not set
and stored in the BIOS by the Thinkpad&trade; configuration utility. </para></listitem>
<listitem><para>tp3780i_uart_irq=3/4</para>
<listitem><para>mwave_uart_irq=3/4</para>
<para>This parameter allows you to configure the IRQ used by the ACP UART if the Mwave's UART
IRQ was not set and stored in BIOS by the Thinkpad&trade; configuration utility.</para></listitem>
<listitem><para>tp3780i_uart_io=0x3f8/0x2f8/0x3E8/0x2E8</para>
<listitem><para>mwave_uart_io=0x3f8/0x2f8/0x3E8/0x2E8</para>
<para>This parameter allows you to configure the I/O range used by the ACP UART if the UART I/O
range was not set and stored in BIOS by the Thinkpad&trade; configuration utility.</para></listitem>
</itemizedlist>
<para>The following code is an example of how to run DSP using ttyS1 resources:</para>
<screen>insmod mwave tp3780i_dsp_irq=10 tp3780i_dsp_io=0x0130 tp3780i_uart_irq=3 tp3780i_uart_io=0x2f8</screen>
<screen>insmod mwave mwave_3780i_irq=10 mwave_3780i_io=0x0130 mwave_uart_irq=3 mwave_uart_io=0x2f8</screen>
<note><title>NOTE</title><para>The <command>mwave</command> is unable to check for resource conflicts. It is the
your responsibility to ensure that none of the resources specified conflict with other devices.</para></note>
<note><title>NOTE</title><para>The <command>mwave</command> is unable to check for resource conflicts. It is
your responsibility to ensure that none of the resources specified conflict with other (commonly PCMCIA) devices.</para></note>
<para>You can use the tpctl package on Linux or the Thinkpad&trade; configuration utility on Windows NT or DOS
to manage the configuration of Thinkpad&trade; related resources.</para>
@ -308,8 +321,8 @@ Mwave Modem, ERROR cannot perform Mwave Initialization retval fffffffb</programl
<para>Typically the configured resources are:</para>
<programlisting>For the DSP: IRQ 10, I/O address 0x130-0x13f
For the UART: IRQ 2, I/O address 0x2f8 (if using ttyS1)
IRQ 3, I/O address 0x3f8 (if using ttyS0)</programlisting>
For the UART: IRQ 3, I/O address 0x2f8 (if using ttyS1)
IRQ 4, I/O address 0x3f8 (if using ttyS0)</programlisting>
<para>For dual boot systems we recommeded that you use the Thinkpad&trade; Configuration Utility
on Windows NT or DOS to configure these system resources. </para>
@ -318,7 +331,7 @@ For the UART: IRQ 2, I/O address 0x2f8 (if using ttyS1)
<orderedlist><listitem><para> Set IRQ sharing to disabled</para></listitem>
<listitem><para>Set 1st IRQ to your DSP IRQ (10 is recommened)</para></listitem>
<listitem><para>Set 2nd IRQ to your UART IRQ (i.e. ttyS1 is equivalent to COM2)</para></listitem>
<listitem><para>Set the DSP I/O address (130 is recommended)</para></listitem>
<listitem><para>Set the DSP I/O address (0x130 is recommended)</para></listitem>
<listitem><para>Set the internal modem I/O address to the UART I/O address
(i.e. 0x2f8 for COM2)</para></listitem>
<listitem><para>The DMA address is unused and can be set to anything.</para></listitem>

View File

@ -448,7 +448,7 @@ and icon titles of an xterm. </Para>
DB2-HOWTO</ULink>,
<CiteTitle>DB2 Version 7.1 for Linux HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: June 2001</CiteTitle>.
<CiteTitle>Updated: June 2002</CiteTitle>.
Explicit instructions on installing DB2 Universal Database Version 7.1
for Linux on the following Intel x86-based distributions: Caldera
OpenLinux 2.4, Debian, Red Hat Linux 6.2, SuSE Linux 6.2 and 6.3,
@ -1175,7 +1175,7 @@ Xfree86 and KDE. </Para>
KDE-GUI-Login-Configuration-HOWTO</ULink>,
<CiteTitle>KDE GUI Login Configuration HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: June 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
A tutorial on customizing the GUI login screen. </Para>
</ListItem>

View File

@ -86,11 +86,11 @@ Bash-Scripting Guide</ULink>. </Para>
<ListItem>
<Para>
<ULINK URL="../Adv-Routing-HOWTO.html">
<ULINK URL="../Adv-Routing-HOWTO/index.html">
Adv-Routing-HOWTO</ULink>,
<CiteTitle>Linux Advanced Routing &amp; Traffic Control HOWTO</CiteTitle>
</PARA><Para>
<CiteTitle>Updated: December 2001</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
A very hands-on approach to iproute2, traffic shaping and a bit
of netfilter. </Para>
</ListItem>
@ -287,7 +287,7 @@ described are windows-1251, iso-8859-5 and koi8-ru.
Belgian-HOWTO</ULink>,
<CiteTitle>The Belgian HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: June 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
How to tweak Linux for Belgian users; lists Linux user groups,
businesses and other resources in Belgium. </Para>
</ListItem>
@ -503,7 +503,7 @@ potential effects of a security compromise. </Para>
Cluster-HOWTO</ULink>,
<CiteTitle>Linux Cluster HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: April 2002</CiteTitle>.
<CiteTitle>Updated: May 2002</CiteTitle>.
How to set up high-performance Linux computing clusters. </Para>
</ListItem>
@ -625,7 +625,7 @@ locale standards such as keyboard, font, paper-size etc. </Para>
DB2-HOWTO</ULink>,
<CiteTitle>DB2 Version 7.1 for Linux HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: June 2001</CiteTitle>.
<CiteTitle>Updated: June 2002</CiteTitle>.
Explicit instructions on installing DB2 Universal Database Version 7.1
for Linux on the following Intel x86-based distributions: Caldera
OpenLinux 2.4, Debian, Red Hat Linux 6.2, SuSE Linux 6.2 and 6.3,
@ -739,7 +739,7 @@ Linux OS to run many DOS programs. </Para>
DSL-HOWTO</ULink>,
<CiteTitle>DSL HOWTO for Linux</CiteTitle>
</Para><Para>
<CiteTitle>Updated: May 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
Examines the DSL family of high speed Internet services now
being deployed in various
markets worldwide. Information is included on the technology
@ -1274,7 +1274,7 @@ Describes how to use Elite's K7s5a board with Linux. </Para>
KDE-GUI-Login-Configuration-HOWTO</ULink>,
<CiteTitle>KDE GUI Login Configuration HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: June 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
A tutorial on customizing the GUI login screen. </Para>
</ListItem>
@ -1418,7 +1418,7 @@ procedures, tips and techniques to make the process easier. </Para>
Lex-YACC-HOWTO</ULink>,
<CiteTitle>Lex and YACC primer/HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: May 2001</CiteTitle>.
<CiteTitle>Updated: April 2002</CiteTitle>.
Helps you get started using Lex and YACC. </Para>
</ListItem>
@ -1507,7 +1507,7 @@ sequence on IA-32 processors. </Para>
Linux+IPv6-HOWTO</ULink>,
<CiteTitle>Linux IPv6 HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: March 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
The goal of this HOWTO is to answer both basic and
advanced questions about IPv6 on the Linux operating system.
This HOWTO will provide the reader with enough information to
@ -1712,7 +1712,7 @@ quick, secure, and reliable VPN-like tunnels over insecure networks. </Para>
MIPS-HOWTO</ULink>,
<CiteTitle>Linux/MIPS HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: January 2001</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
Describes the MIPS port of the Linux operating system, common problems
and their solutions, availability and more. </Para>
</ListItem>
@ -1913,7 +1913,7 @@ provides pointers for further information and implementation details. </Para>
NFS-HOWTO</ULink>,
<CiteTitle>NFS HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: December 2000</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
How to set up NFS clients and servers. </Para>
</ListItem>
@ -2171,7 +2171,7 @@ How to use the print system under Linux. </Para>
Program-Library-HOWTO</ULink>,
<CiteTitle>Program Library HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: March 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
This HOWTO for programmers discusses how to create and use program
libraries on Linux. This includes static libraries, shared libraries,
and dynamically loaded libraries. </Para>
@ -2251,7 +2251,7 @@ equivalent to the ones commercially available from Red Hat. </Para>
Remote-Serial-Console-HOWTO</ULink>,
<CiteTitle>Remote Serial Console HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: May 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
Covers how to set up your hardware to use a serial console. </Para>
</ListItem>
@ -2369,7 +2369,7 @@ SCSI-Generic-HOWTO</ULink> for more current information.</emphasis> </Para>
Secure-Programs-HOWTO</ULink>,
<CiteTitle>Secure Programming for Linux and Unix HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: March 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
Provides a set of design and implementation guidelines for writing
secure programs for Linux and Unix systems. </Para>
</ListItem>

View File

@ -100,7 +100,7 @@ various issues related to this. </Para>
Cluster-HOWTO</ULink>,
<CiteTitle>Linux Cluster HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: April 2002</CiteTitle>.
<CiteTitle>Updated: May 2002</CiteTitle>.
How to set up high-performance Linux computing clusters. </Para>
</ListItem>
@ -462,7 +462,7 @@ Describes how to use Elite's K7s5a board with Linux. </Para>
MIPS-HOWTO</ULink>,
<CiteTitle>Linux/MIPS HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: January 2001</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
Describes the MIPS port of the Linux operating system, common problems
and their solutions, availability and more. </Para>
</ListItem>
@ -601,7 +601,7 @@ Xfree86 and KDE. </Para>
Remote-Serial-Console-HOWTO</ULink>,
<CiteTitle>Remote Serial Console HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: May 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
Covers how to set up your hardware to use a serial console. </Para>
</ListItem>
@ -885,7 +885,7 @@ ACP-Modem</ULink>, <CiteTitle>
Linux ACP Modem (Mwave) mini-HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>
Updated: July 2001</CiteTitle>.
Updated: July 2002</CiteTitle>.
Describes how to build, setup, and use the ACP (Mwave) Modem
feature of the IBM Thinkpad[tm] 600E, 600, and 770x. </Para>
</ListItem>
@ -965,7 +965,7 @@ PCTel-MicroModem-Config</ULink>, <CiteTitle>
PCTel HSP MicroModem Configuration mini-HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>
Updated: June 2002</CiteTitle>.
Updated: July 2002</CiteTitle>.
Make your PCTel HSP MicroModem work in Linux. </Para>
</ListItem>
@ -1096,7 +1096,7 @@ Details how to setup a &ldquo;laplink&rdquo; connection between two computers. <
Remote-Serial-Console-HOWTO</ULink>,
<CiteTitle>Remote Serial Console HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: May 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
Covers how to set up your hardware to use a serial console. </Para>
</ListItem>

View File

@ -36,7 +36,7 @@ ACP-Modem</ULink>, <CiteTitle>
Linux ACP Modem (Mwave) mini-HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>
Updated: July 2001</CiteTitle>.
Updated: July 2002</CiteTitle>.
Describes how to build, setup, and use the ACP (Mwave) Modem
feature of the IBM Thinkpad[tm] 600E, 600, and 770x. </Para>
</ListItem>
@ -1172,7 +1172,7 @@ PCTel-MicroModem-Config</ULink>, <CiteTitle>
PCTel HSP MicroModem Configuration mini-HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>
Updated: June 2002</CiteTitle>.
Updated: July 2002</CiteTitle>.
Make your PCTel HSP MicroModem work in Linux. </Para>
</ListItem>
@ -1254,7 +1254,7 @@ Print2Win</ULink>, <CiteTitle>
The Linux Print2Win mini-HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>
Updated: January 2002</CiteTitle>.
Updated: July 2002</CiteTitle>.
Contains the general configuration to get linux printing
to a Windows print share. </Para>
</ListItem>

View File

@ -157,7 +157,7 @@ set up a network of computers under your own domain. </Para>
DSL-HOWTO</ULink>,
<CiteTitle>DSL HOWTO for Linux</CiteTitle>
</Para><Para>
<CiteTitle>Updated: May 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
Examines the DSL family of high speed Internet services now
being deployed in various
markets worldwide. Information is included on the technology
@ -276,7 +276,7 @@ as a NIS server. </Para>
NFS-HOWTO</ULink>,
<CiteTitle>NFS HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: December 2000</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
How to set up NFS clients and servers. </Para>
</ListItem>
@ -396,7 +396,7 @@ configuration information). </Para>
Linux+IPv6-HOWTO</ULink>,
<CiteTitle>Linux IPv6 HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: March 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
The goal of this HOWTO is to answer both basic and
advanced questions about IPv6 on the Linux operating system.
This HOWTO will provide the reader with enough information to
@ -850,11 +850,11 @@ an IP tunnel between them. </Para>
<ListItem>
<Para>
<ULINK URL="../Adv-Routing-HOWTO.html">
<ULINK URL="../Adv-Routing-HOWTO/index.html">
Adv-Routing-HOWTO</ULink>,
<CiteTitle>Linux Advanced Routing &amp; Traffic Control HOWTO</CiteTitle>
</PARA><Para>
<CiteTitle>Updated: December 2001</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
A very hands-on approach to iproute2, traffic shaping and a bit
of netfilter. </Para>
</ListItem>

View File

@ -1065,7 +1065,7 @@ Print2Win</ULink>, <CiteTitle>
The Linux Print2Win mini-HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>
Updated: January 2002</CiteTitle>.
Updated: July 2002</CiteTitle>.
Contains the general configuration to get linux printing
to a Windows print share. </Para>
</ListItem>

View File

@ -60,7 +60,7 @@ described are windows-1251, iso-8859-5 and koi8-ru.
Belgian-HOWTO</ULink>,
<CiteTitle>The Belgian HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: June 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
How to tweak Linux for Belgian users; lists Linux user groups,
businesses and other resources in Belgium. </Para>
</ListItem>

View File

@ -182,7 +182,7 @@ Java and how to use Java to write CGI programs. </Para>
Lex-YACC-HOWTO</ULink>,
<CiteTitle>Lex and YACC primer/HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: May 2001</CiteTitle>.
<CiteTitle>Updated: April 2002</CiteTitle>.
Helps you get started using Lex and YACC. </Para>
</ListItem>
@ -226,7 +226,7 @@ Describes the Linux approach to Tcl, a scripting language. </Para>
Program-Library-HOWTO</ULink>,
<CiteTitle>Program Library HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: March 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
This HOWTO for programmers discusses how to create and use program
libraries on Linux. This includes static libraries, shared libraries,
and dynamically loaded libraries. </Para>
@ -484,7 +484,7 @@ operating systems with XML-RPC support. </Para>
Secure-Programs-HOWTO</ULink>,
<CiteTitle>Secure Programming for Linux and Unix HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: March 2002</CiteTitle>.
<CiteTitle>Updated: July 2002</CiteTitle>.
Provides a set of design and implementation guidelines for writing
secure programs for Linux and Unix systems. </Para>
</ListItem>
@ -625,7 +625,7 @@ Control System, under Linux. </Para>
DB2-HOWTO</ULink>,
<CiteTitle>DB2 Version 7.1 for Linux HOWTO</CiteTitle>
</Para><Para>
<CiteTitle>Updated: June 2001</CiteTitle>.
<CiteTitle>Updated: June 2002</CiteTitle>.
Explicit instructions on installing DB2 Universal Database Version 7.1
for Linux on the following Intel x86-based distributions: Caldera
OpenLinux 2.4, Debian, Red Hat Linux 6.2, SuSE Linux 6.2 and 6.3,