trunk/2.6.14-pre/4900_speakup-20050825.patch

diff -Naurp linux-2.6.13-rc6-git13-gentoo/Documentation/speakup/DefaultKeyAssignments linux-2.6.13-rc6-git13-gentoo-speakup/Documentation/speakup/DefaultKeyAssignments
--- linux-2.6.13-rc6-git13-gentoo/Documentation/speakup/DefaultKeyAssignments   1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/Documentation/speakup/DefaultKeyAssignments   2005-08-25 14:06:54.000000000 -0700
@@ -0,0 +1,46 @@
+This file is intended to give you an overview of the default keys used
+by speakup for it's review functions.  You may change them to be
+anything you want but that will take some familiarity with key
+mapping.
+
+We have remapped the insert or zero key on the keypad to act as a
+shift key.  Well, actually as an altgr key.  So in the following list
+InsKeyPad-period means hold down the insert key like a shift key and
+hit the keypad period.
+
+KeyPad-8               Say current Line
+InsKeyPad-8            say from top of screen to reading cursor.
+KeyPad-7               Say Previous Line (UP one line)
+KeyPad-9               Say Next Line (down one line)
+KeyPad-5               Say Current Word
+InsKeyPad-5            Spell Current Word
+KeyPad-4               Say Previous Word (left one word)
+InsKeyPad-4            say from left edge of line to reading cursor.
+KeyPad-6               Say Next Word (right one word)
+InsKeyPad-6            Say from reading cursor to right edge of line.
+KeyPad-2               Say Current Letter
+InsKeyPad-2            say current letter phonetically
+KeyPad-1               Say Previous Character (left one letter)
+KeyPad-3               Say Next Character (right one letter)
+KeyPad-plus            Say Entire Screen
+InsKeyPad-plus         Say from reading cursor line to bottom of screen.
+KeyPad-Minus           Park reading cursor (toggle)
+InsKeyPad-minus                Say character hex and decimal value.
+KeyPad-period          Say Position (current line, position and console)
+InsKeyPad-period       say colour attributes of current position.
+InsKeyPad-9            Move reading cursor to top of screen (insert pgup)
+InsKeyPad-3            Move reading cursor to bottom of screen (insert pgdn)
+InsKeyPad-7            Move reading cursor to left edge of screen (insert home)
+InsKeyPad-1            Move reading cursor to right edge of screen (insert end)
+ControlKeyPad-1                Move reading cursor to last character on current line.
+KeyPad-Enter           Shut Up (until another key is hit) and sync reading cursor
+InsKeyPad-Enter                Shut Up (until toggled back on).
+InsKeyPad-star n<x|y>  go to line (y) or column (x). Where 'n' is any
+               allowed value for the row or column for your current screen.
+KeyPad-/               Mark and Cut screen region.
+InsKeyPad-/            Paste screen region into any console.
+
+Hitting any key while speakup is outputting speech will quiet the
+synth until it has caught up with what is being printed on the
+console.
+
diff -Naurp linux-2.6.13-rc6-git13-gentoo/Documentation/speakup/INSTALLATION linux-2.6.13-rc6-git13-gentoo-speakup/Documentation/speakup/INSTALLATION
--- linux-2.6.13-rc6-git13-gentoo/Documentation/speakup/INSTALLATION    1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/Documentation/speakup/INSTALLATION    2005-08-25 14:06:54.000000000 -0700
@@ -0,0 +1,108 @@
+This document assumes you have had some experience with kernel
+compilation and installation.  If you have not, I recommend you get
+the kernel source and read the README and various documents in the
+linux/Documentation directory.  In particular the Changes file to make
+sure you have the appropriate utilities needed for installing a 2.2.xx
+or 2.4xx kernel.  It isn't as difficult as you might think.  The
+kernel README is intimidating the first time but once you get the
+steps down, it's really pretty easy.  Getting through the "make
+config" is the tedious bit.
+
+The first thing to do is to place a copy of the tarball in the /usr/src
+directory which is the directory the linux tree is located in as well.
+Next untar speakup by typing:
+
+tar zxf speakup-1.00.tar.gz
+cd speakup-1.00
+./install
+
+Note the dot-slash before the install.  This will copy the speakup
+directory to the kernel tree and apply the various patches and
+components to the appropriate kernel files.  Depending on how
+experienced you are with kernel compiling and hacking will determine
+whether you should bother looking at any failed patches.  If this
+happens, you should probably write to the speakup mailing list for
+help or myself.
+
+If all of the patch hunks apply successfully then just continue with
+the standard steps to compile the kernel with:
+
+make mrproper
+make config
+
+When you get to the section console speech output, answer 'y' to the
+CONFIG_SPEAKUP prompt.  You will be given a submenu with the list of
+synthesizers which are currently supported.  You can include as many
+synths in the kernel as you wish but remember each one takes up kernel
+space.  You can only choose one of the synths as the default or none,
+so just type dtlk or whatever is the correct string for the
+synthesizer you have.  You will also be asked if you wish to build-in
+a speakup key map.  If you do not say 'y' to this option you will need
+to load a speakup map at boot time with whichever mechanism your
+distribution uses for loading key maps.
+
+We have placed the speakup configuration options in make config just
+after the vga console choice.  For the DoubleTalk PC driver included
+by Jim Van Zandt.  I recommend you say no to that option.  I have not
+tried configuring them both in, but I wouldn't be at all surprised if
+it didn't work.
+
+If all goes well up to this point you can continue with the compiling
+process by doing:
+
+make dep >dep.file 2>&1 &
+make bzImage >cc.file 2>&1 &
+make modules >mod.file 2>&1 &
+
+I always redirect output to the files dep.file and cc.file so I can
+look over the compilation record to make sure there are no errors and
+warnings.
+
+Okay, you are ready to install the newly compiled kernel.  Make sure
+you make an linux.old entry in your lilo.conf file so you can recover
+if it blows up.  next as root run "make modules_install" to install
+whatever modules you compiled and move the bzImage from
+/usr/src/linux/arch/i386/boot to wherever your kernel lives.  Also
+move the System.map from /usr/src/linux to where your System.map
+lives.  On our systems we use debian so we create an vmlinuz-speakup
+and System.map-speakup in our /boot directory and set the symbolic
+links vmlinuz and System.map in the root (/) directory to point to the
+images.  Now type lilo to tell lilo to build the new booter file and
+install it.
+
+As of version 0.07, the keymap for speakup is automatically built in
+at compile time.  If you have other keymaps installed at boot time,
+you might want to consider removing them before you reboot the system.
+
+If everything has gone OK up until now, cross your fingers and type:
+
+shutdown -r now
+
+Your system should start talking to you as soon as it starts booting.
+It will talk and talk and ... well, you might want to hit the
+keypad-enter key to tell it to shut up.  You should also read the
+DefaultKeyAssignments file to learn the various review functions
+available.
+
+As of v-0.10 the speakup configuration options are in the
+/proc/speakup subtree.  The individual options should be fairly
+obvious by their names such as rate, volume, punc_level and so forth.
+You can manipulate them by cat'ing or echoing new values to them such
+as:
+
+echo 9 >/proc/speakup/rate
+
+You can see what the current values are by cat'ing those files to the console:
+
+cat /proc/speakup/rate
+
+I have probably managed to overlook a whole whack of things because
+this is the, enter version number here, draft.  Don't worry we'll get
+it right eventually.  If you like the package you really should get on
+the mailing list and start participating in it's development.
+
+  Kirk
+
+email: kirk@braille.uwo.ca
+phone: (519) 679-6845 (home)
+
diff -Naurp linux-2.6.13-rc6-git13-gentoo/Documentation/speakup/README linux-2.6.13-rc6-git13-gentoo-speakup/Documentation/speakup/README
--- linux-2.6.13-rc6-git13-gentoo/Documentation/speakup/README  1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/Documentation/speakup/README  2005-08-25 14:06:54.000000000 -0700
@@ -0,0 +1,98 @@
+Welcome to the speakup project for the Speakup speech package for Linux.
+
+Speakup is written by Kirk Reiser and Andy Berdan.  It is licensed
+under the GPL.  If you don't already know, the GPL stands for the GNU
+General Public License.  Which basically states that this code is free to
+copy, modify and distribute to anyone interested in playing with it.
+The one thing you may not do is turn any part of it into proprietary
+or commercial code without the permission of the author.  That's me.
+
+If you are interested in being involved with the development of speech
+output for Linux you can subscribe to the Speakup mailing list by
+sending a message to speakup-request@braille.uwo.ca with the line: subscribe.  You can also subscribe by going to the speakup web page and following the links at http://www.linux-speakup.org.
+
+We are at a very early stage in the development of this package.
+Hopefully changes will happen often and many.  The current files in
+this directory are:
+
+DefaultKeyAssignments          # speakup's default review keys
+INSTALLATION                   #  for installing speakup from the tar ball.
+README                         # this file
+keymap-tutorial                        # a tutorial on how to layout the keyboard
+
+Read the INSTALLATION file to learn how to apply the patches and the
+default.map for the keyboard.  You should also read the Changes file.
+It really has any new things I've added since last time.
+
+There is no documentation in any of these files to instruct you what
+to do if something goes wrong with the patching or compilation.  If
+you would like that information you will need to subscribe to the
+mailing list and ask for help, or write me kirk@braille.uwo.ca for
+help.  I suggest the mailing list because I will probably tire quickly
+of answering the same questions over and over.  You could always
+decide to dig-in and take on the task, and write documentation to help
+others.
+
+There also is a speakup reflector for the Speak Freely package, which
+many of us hang out on and discuss all sorts of topics from speakup
+problems to ALSA driver installation and just about anything else
+you'd like to talk about.  The reflector is at lwl.braille.uwo.ca:4074
+with it's lwl page at lwl.braille.uwo.ca/speakup.html.  Come and join
+us, it's fun!
+
+Acknowledgements:
+
+I am really very new at kernel hacking and screen review package
+writing, so I have depended heavily on other folks kindness to help me
+a long.  No doubt I will continue to abuse them freely and others
+before this is a really good speech solution for Linux.  (Oh Well!,
+somebody's got to do it.)
+
+Theodore Ts'o.  He gave me a good discussion of unicode and UTF and
+the like.  He doesn't even remember writing me about it.
+
+Alan Cox.  He has answered many questions about scheduling and wait
+queues and timers along with code fragments and so on.  I just wish I
+understood it all totally.  He has also helped immensely in moving
+this package toward inclusion in the standard kernel tree. (Maybe next
+release!)
+
+Martin Mares.  He pointed me in the right direction to figuring out
+the colour attributes and other useful tidbits.
+
+Paul McDermott.  He really is the catalyst for me to actually get
+this all working.  Besides I like seeing him bounce around and get all
+excited every time I have something new working.
+
+John Covici, He was the first person to actually attempt writing
+another synthesizer driver for speakup.  It was the Speakout driver so
+it was also the first serial driver.
+
+Brian Borowski, he was the first person to actually write a speakup
+function other than Andy and I.
+
+Jim Danley, he has more or less become my main man in helping test
+code, add new features, bounce ideas off and generally become a good
+friend.
+
+Matt Campbell, he basically rewrote the drivers to be able to include
+all synths in the kernel at the same time.  The distribution
+maintainers appreciate him a lot as well.
+
+Gene Collins, he was very helpful debugging the current release prior
+to its public showing.  He has also worked hard educating others on
+the list and writing the ALSA mini howto.
+
+I would also like to really thank the folks that handle the
+distribution packages.  I and many other people would not find access
+to speakup nearly so convenient without their efforts.  They include
+Bill Acker, Tom Moore, Matt Campbell, Joe Norton and Joshua Lambert.
+
+There are probably many more I am forgetting right now.  I guess I'll
+just have to add you all later.
+
+
+Happy Hacking!
+
+  Kirk
+
diff -Naurp linux-2.6.13-rc6-git13-gentoo/Documentation/speakup/keymap-tutorial linux-2.6.13-rc6-git13-gentoo-speakup/Documentation/speakup/keymap-tutorial
--- linux-2.6.13-rc6-git13-gentoo/Documentation/speakup/keymap-tutorial 1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/Documentation/speakup/keymap-tutorial 2005-08-25 14:06:54.000000000 -0700
@@ -0,0 +1,140 @@
+                      Speakup Keymap Tutorial
+
+This is meant to be a basic tutorial on how to change the Linux keymap
+file to assign speakup review functions to desired keys.  It is not
+intended to be a replacement for the loadkeys(8) or keymap(5) man
+pages.
+
+The basic lay-out of the keymap file is a series of lines with the
+following fields.  The keyword keycode indicates this is the start of
+a new key assignment.  It is then followed by a number which
+represents the actual key on the keyboard.  That number is followed by
+the equals '=' operator and finally a list of keywords representing
+key names such as keypad5.  Each line can have quite a few key
+functions on it.  They are interpreted by loadkeys in order and
+assigned to key shift states depending on the order they are
+encountered.  So for example, the first value after the equals is the
+keys unshifted state, while the second is the keys shifted state.  If
+you wish to learn the order they are interpreted in read the
+loadkeys(8) and keymap(5) man pages.
+
+You can have subsequent lines which are indented and start with
+another keyword for the various shifted states.  This way you can
+assign some of the states without having to specify them all in order
+up until you get to the one you want to assign.
+
+In speakup, we have assigned the insert key on the number pad to the
+altgr keyword.  This is not required; you could choose any other
+shifted state keyword.  We used altgr because it typically represents
+the right hand alt key.  In Linux each shift key is separate and
+independent, so the left shift and the right shift keys are not
+necessarily the same.  The altgr key is not really used for anything
+important, so we steel it.
+
+Here are the default key assignments for the number eight on the
+keypad:
+
+keycode  72 = KP_8            
+       alt     keycode  72 = Ascii_8         
+
+As you can see, the first line starts with keycode followed by 72
+which is the actual number assigned to the key when the keyboard port
+is read.  The KP_8 after the equal sign, is the symbolic representation
+of the function called when that key is hit.
+
+The second line is the same format except it starts with the keyword
+alt which is indented.  That means that the function at the end of
+that line Ascii_8 is applied to the alt-shifted eight key.
+
+Now here are the speakup assignments for that key:
+
+keycode  72 = 0x0d0a
+       altgr keycode 72 = 0x0d20
+#keycode  72 = KP_8            
+       alt     keycode  72 = Ascii_8         
+
+Notice that the only thing which has changed on the first line is the
+function called when the key is struck.  It is a hexadecimal number
+identifying the function called in a look up table.  It is not a
+symbolic representation yet because that means we need to change the
+loadkeys program to understand our symbolic names.  We will do this in
+the future but for now it is more expedient to just use the table
+indices.  You will find a table at the bottom of this document
+listing the review functions and their corresponding hex lookups.
+
+The 0x0d0a in the first line above is speakup's say line function.
+The second line ends with 0x0d20 which is speakup's read from top of
+screen to reading cursor line.
+
+The third line is the original key assignment commented out with a
+number-sign '#' at the beginning.  I do that so I can easily find the
+keys I want to affect by symbolic name.  Otherwise I would need to
+keep a look up table for all the keycodes.  I recommend you do this as
+well or you'll be very sorry at some point in the future.
+
+The forth line is just the standard key assignment for the left hand
+alt key.
+
+Now let's say we want to design a different keyboard layout.  I'll use
+an example for the JAWS style keypad because I've specifically been
+asked to help with that.  JAWS uses the eight on the keypad to move up
+a line or the speakup function to read previous line.  JAWS also uses
+the keypad_8 key in a shifted mode to read the current line.  I
+apologize if these are not quite right.  It has been a long time since
+I used JAWS.  So we would have the following two lines:
+
+keycode  72 = 0x0d0b
+       altgr keycode 72 = 0x0d0a
+
+The hex value 0x0d0b in the first line is speakup's SAY_PREVIOUS_LINE
+function.  The 0x0d0a in the second line is the same say_line function
+as we had earlier.  So when the number eight is hit on the keypad
+speakup will read the previous line and when the number eight is
+shifted with the insert key on the keypad it will read the current
+line.
+
+As you can tell, it is not really very difficult to reassign the keys
+to different review functions.
+
+Once you have carefully edited the keymap file, called default.map in
+the speakup distribution, you copy it into the /etc/kbd directory.
+Make sure you back up the original default.map from that directory
+first, if there is one.  Then you run loadkeys to load the new map
+into the kernel:
+
+loadkeys /etc/kbd/default.map
+
+If you wish to build your new keyboard lay-out into the kernel, after
+testing it, copy the default.map file into the drivers/char directory,
+with the name defkeymap.map, of your Linux source tree.  Then rm the
+defkeymap.c file and recompile the kernel.  Because there is no
+defkeymap.c `make' will rebuild it on the next compile.
+
+Here is a list of the available speakup review functions at this point
+in time.
+
+SAY_CHAR 0x0d04 /* say this character */
+SAY_PREV_CHAR 0x0d05 /* say character left of this char */
+SAY_NEXT_CHAR 0x0d06 /* say char right of this char */
+SAY_WORD 0x0d07 /* say this word under reading cursor */
+SAY_PREV_WORD 0x0d08
+SAY_NEXT_WORD 0x0d09
+SAY_LINE 0x0d0a /* say this line */
+SAY_PREV_LINE 0x0d0b /* say line above this line */
+SAY_NEXT_LINE 0x0d0c
+TOP_EDGE 0x0d0d /* move to top edge of screen */
+BOTTOM_EDGE 0x0d0e
+LEFT_EDGE 0x0d0f
+RIGHT_EDGE 0x0d10
+SAY_PHONETIC_CHAR 0x0d11 /* say this character phonetically */
+SPELL_WORD 0x0d12 /* spell this word letter by letter */
+SAY_SCREEN 0x0d14
+SAY_POSITION 0x0d1b
+SPEECH_OFF 0x0d1c
+SAY_ATTRIBUTES 0x0d1d
+SPEAKUP_PARKED 0x0d1e
+SAY_FROM_TOP 0x0d20
+SAY_TO_BOTTOM 0x0d21
+SAY_FROM_LEFT 0x0d22
+SAY_TO_RIGHT 0x0d23
+
diff -Naurp linux-2.6.13-rc6-git13-gentoo/Documentation/speakup/spkguide.txt linux-2.6.13-rc6-git13-gentoo-speakup/Documentation/speakup/spkguide.txt
--- linux-2.6.13-rc6-git13-gentoo/Documentation/speakup/spkguide.txt    1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/Documentation/speakup/spkguide.txt    2005-08-25 14:06:54.000000000 -0700
@@ -0,0 +1,1279 @@
+
+The Speakup User's Guide
+For Speakup 2.0 and Later
+By Gene Collins
+Last modified on Tue Mar 29 10:54:19 2005
+Document version 1.0
+
+Copyright (c) 2005  Gene Collins
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A
+copy of the license is included in the section entitled "GNU Free
+Documentation License".
+
+Preface
+
+The purpose of this document is to familiarize users with the user
+interface to Speakup, a Linux Screen Reader.  If you need instructions
+for installing or obtaining Speakup, visit the web site at
+http://linux-speakup.org/.  Speakup is a set of patches to the standard
+Linux kernel source tree.  It can be built as a series of modules, or as
+a part of a monolithic kernel.  These details are beyond the scope of
+this manual, but the user may need to be aware of the module
+capabilities, depending on how your system administrator has installed
+Speakup.  If Speakup is built as a part of a monolithic kernel, and the
+user is using a hardware synthesizer, then Speakup will be able to
+provide speech access from the time the kernel is loaded, until the time
+the system is shutdown.  This means that if you have obtained Linux
+installation media for a distribution which includes Speakup as a part
+of its kernel, you will be able, as a blind person, to install Linux
+with speech access unaided by a sighted person.  Again, these details
+are beyond the scope of this manual, but the user should be aware of
+them.  See the web site mentioned above for further details.
+
+1.  Starting Speakup
+
+If your system administrator has installed Speakup to work with your
+specific synthesizer by default, then all you need to do to use Speakup
+is to boot your system, and Speakup should come up talking.  This
+assumes of course  that your synthesizer is a supported hardware
+synthesizer, and that it is either installed in or connected to your
+system, and is if necessary powered on.
+
+It is possible, however, that Speakup may have been compiled into the
+kernel with no default synthesizer.  It is even possible that your
+kernel has been compiled with support for some of the supported
+synthesizers and not others.  If you find that this is the case, and
+your synthesizer is supported but not available, complain to the person
+who compiled and installed your kernel.  Or better yet, go to the web
+site, and learn how to patch Speakup into your own kernel source, and
+build and install your own kernel.
+
+If your kernel has been compiled with Speakup, and has no default
+synthesizer set, or you would like to use a different synthesizer than
+the default one, then you may issue the following command at the boot
+prompt of your boot loader.
+
+linux speakup_synth=ltlk
+
+This command would tell Speakup to look for and use a LiteTalk or
+DoubleTalk LT at boot up.  You may replace the ltlk synthesizer keyword
+with the keyword for whatever synthesizer you wish to use.  The
+speakup_synth parameter will accept the following keywords, provided
+that support for the related synthesizers has been built into the
+kernel.
+
+acntsa -- Accent SA
+acntpc -- Accent PC
+apolo -- Apolo
+audptr -- Audapter
+bns -- Braille 'n Speak
+dectlk -- DecTalk Express (old and new, db9 serial only)
+decext -- DecTalk (old) External
+dtlk -- DoubleTalk PC
+keypc -- Keynote Gold PC
+ltlk -- DoubleTalk LT, LiteTalk, or external Tripletalk (db9 serial only)
+spkout -- Speak Out
+txprt -- Transport
+
+Note: Speakup does * NOT * support usb connections!  Speakup also does *
+NOT * support the internal Tripletalk!
+
+Speakup does support two other synthesizers, but because they work in
+conjunction with other software, they must be loaded as modules after
+their related software is loaded, and so are not available at boot up. 
+These are as follows:
+
+decpc -- DecTalk PC (not available at boot up)
+sftsyn -- One of several software synthesizers (not available at boot up)
+
+See the sections on loading modules and software synthesizers later in
+this manual for further details.  It should be noted here that the
+speakup_synth boot parameter will have no effect if Speakup has been
+compiled as modules.  In order for Speakup modules to be loaded during
+the boot process, such action must be configured by your system
+administrator.  This will mean that you will hear some, but not all,  of
+the bootup messages.
+
+2.  Basic operation
+
+Once you have booted the system, and if necessary, have supplied the
+proper bootup parameter for your synthesizer, Speakup will begin
+talking as soon as the kernel is loaded.  In fact, it will talk a lot! 
+It will speak all the boot up messages that the kernel prints on the
+screen during the boot process.  This is because Speakup is not a
+separate screen reader, but is actually built into the operating
+system.  Since almost all console applications must print text on the
+screen using the kernel, and must get their keyboard input through the
+kernel, they are automatically handled properly by Speakup.  There are a
+few exceptions, but we'll come to those later.
+
+Note:  In this guide I will refer to the numeric keypad as the keypad. 
+This is done because the speakupmap.map file referred to later in this
+manual uses the term keypad instead of numeric keypad.  Also I'm lazy
+and would rather only type one word.  So keypad it is.  Got it?  Good.
+
+Most of the Speakup review keys are located on the keypad at the far
+right of the keyboard.  The numlock key should be off, in order for these
+to work.  If you toggle the numlock on, the keypad will produce numbers,
+which is exactly what you want for spreadsheets and such.  For the
+purposes of this guide, you should have the numlock turned off, which is
+its default state at bootup.
+
+You probably won't want to listen to all the bootup messages every time
+you start your system, though it's a good idea to listen to them at
+least once, just so you'll know what kind of information is available to
+you during the boot process.  You can always review these messages after
+bootup with the command:
+
+dmesg | more
+
+In order to speed the boot process, and to silence the speaking of the
+bootup messages, just press the keypad enter key.  This key is located
+in the bottom right corner of the keypad.  Speakup will shut up and stay
+that way, until you press another key.
+
+You can check to see if the boot process has completed by pressing the 8
+key on the keypad, which reads the current line.  This also has the
+effect of starting Speakup talking again, so you can press keypad enter
+to silence it again if the boot process has not completed.  
+
+When the boot process is complete, you will arrive at a "login" prompt.
+At this point, you'll need to type in your user id and password, as
+provided by your system administrator.  You will hear Speakup speak the
+letters of your user id as you type it, but not the password.  This is
+because the password is not displayed on the screen for security
+reasons.  This has nothing to do with Speakup, it's a Linux security
+feature.
+
+Once you've logged in, you can run any Linux command or program which is
+allowed by your user id.  Normal users will not be able to run programs
+which require root privileges.
+
+When you are running a program or command, Speakup will automatically
+speak new text as it arrives on the screen.  You can at any time silence
+the speech with keypad enter, or use any of the Speakup review keys. 
+
+Here are some basic Speakup review keys, and a short description of what
+they do.
+
+keypad 1 -- read previous character
+keypad 2 -- read current character (pressing keypad 2 twice rapidly will speak
+       the current character phonetically)
+keypad 3 -- read next character
+keypad 4 -- read previous word
+keypad 5 -- read current word (press twice rapidly to spell the current word)
+keypad 6 -- read next word
+keypad 7 -- read previous line
+keypad 8 -- read current line (press twice rapidly to hear how much the
+       text on the current line is indented)
+keypad 9 -- read next line
+keypad period -- speak current cursor position and announce current
+       virtual console
+
+It's also worth noting that the insert key on the keypad is mapped
+as the speakup key.  Instead of pressing and releasing this key, as you
+do under DOS or Windows, you hold it like a shift key, and press other
+keys in combination with it.  For example, repeatedly holding keypad
+insert, from now on called speakup, and keypad enter will toggle the
+speaking of new text on the screen on and off.  This is not the same as
+just pressing keypad enter by itself, which just silences the speech
+until you hit another key.  When you hit speakup plus keypad enter,
+Speakup will say, "You turned me off.", or "Hey, that's better."  When
+Speakup is turned off, no new text on the screen will be spoken.  You
+can still use the reading controls to review the screen however.
+
+3.  Using the Speakup Help System
+
+Speakup has a help system, which is compiled as a module.  It is loaded
+automatically whenever the Speakup help system is invoked for the first
+time, and remains loaded after that, until speakup is unloaded.  Note
+that if speakup was compiled into a monolithic kernel on your system,
+you will not be able to unload Speakup from your kernel.  If you try to
+use the help system, and find that it is unavailable, then your system
+administrator has not installed the Speakup help module, which is called
+speakup_help.  Complain to your system administrator about this.
+
+In order to enter the Speakup help system, press and hold the speakup
+key (remember that this is the keypad insert key), and press the f1 key.
+You will hear the message:
+
+"Press space to leave help, cursor up or down to scroll, or a letter to
+go to commands in list."
+
+When you press the spacebar to leave the help system, you will hear:
+
+"Leaving help."
+
+While you are in the Speakup help system, you can scroll up or down
+through the list of available commands using the cursor keys.  The list
+of commands is arranged in alphabetical order.  If you wish to jump to
+commands in a specific part of the alphabet, you may press the letter of
+the alphabet you wish to jump to.
+
+You can also just explore by typing keyboard keys.  Pressing keys will
+cause Speakup to speak the command associated with that key.  For
+example, if you press the keypad 8 key, you will hear:
+
+"Keypad 8 is line, say current."
+
+You'll notice that some commands do not have keys assigned to them. 
+This is because they are very infrequently used commands, and are also
+accessible through the proc system.  We'll discuss the proc system later
+in this manual.
+
+You'll also notice that some commands have two keys assigned to them. 
+This is because Speakup has a built in set of alternative key bindings
+for laptop users.  The alternate speakup key is the caps lock key.  You
+can press and hold the caps lock key, while pressing an alternate
+speakup command key to activate the command.  On most laptops, the
+numeric keypad is defined as the keys in the j k l area of the keyboard.
+
+There is usually a function key which turns this keypad function on and
+off, and some other key which controls the numlock state.  Toggling the
+keypad functionality on and off can become a royal pain.  So, Speakup
+gives you a simple way to get at an alternative set of key mappings for
+your laptop.  These are also available by default on desktop systems,
+because Speakup does not know whether it is running on a desktop or
+laptop.  So you may choose which set of Speakup keys to use.  Some
+system administrators may have chosen to compile Speakup for a desktop
+system without this set of alternate key bindings, but these details are
+beyond the scope of this manual.  To use the caps lock for its normal
+purpose, hold the shift key while toggling the caps lock on and off.  We
+should note here, that holding the caps lock key and pressing the z key
+will toggle the alternate j k l keypad on and off.
+
+4.  Keys and Their Assigned Commands
+
+In this section, we'll go through a list of all the speakup keys and
+commands.  You can also get a list of commands and assigned keys from
+the help system.
+
+The following list was taken from the speakupmap.map file.  Key
+assignments are on the left of the equal sign, and the associated
+Speakup commands are on the right.  The designation "spk" means to press
+and hold the speakup key, a.k.a. keypad insert, a.k.a. caps lock, while
+pressing the other specified key.
+
+spk key_f9 = punc_level_dec
+spk key_f10 = punc_level_inc
+spk key_f11 = reading_punc_dec
+spk key_f12 = reading_punc_inc
+spk key_1 = vol_dec
+spk key_2 =  vol_inc
+spk key_3 = pitch_dec
+spk key_4 = pitch_inc
+spk key_5 = rate_dec
+spk key_6 = rate_inc
+key_kpasterisk = toggle_cursoring
+spk key_kpasterisk = speakup_goto
+spk key_f1 = speakup_help
+spk key_f2 = set_win
+spk key_f3 = clear_win
+spk key_f4 = enable_win
+spk key_f5 = edit_some
+spk key_f6 = edit_most
+spk key_f7 = edit_delim
+spk key_f8 = edit_repeat
+shift spk key_f9 = edit_exnum
+ key_kp7 = say_prev_line
+spk key_kp7 = left_edge
+ key_kp8 = say_line
+double  key_kp8 = say_line_indent
+spk key_kp8 = say_from_top
+ key_kp9 = say_next_line
+spk  key_kp9 = top_edge
+ key_kpminus = speakup_parked
+spk key_kpminus = say_char_num
+ key_kp4 = say_prev_word
+spk key_kp4 = say_from_left
+ key_kp5 = say_word
+double key_kp5 = spell_word
+spk key_kp5 = spell_phonetic
+ key_kp6 = say_next_word
+spk key_kp6 = say_to_right
+ key_kpplus = say_screen
+spk key_kpplus = say_win
+ key_kp1 = say_prev_char 
+spk key_kp1 = right_edge
+ key_kp2 = say_char
+spk key_kp2 = say_to_bottom
+double key_kp2 = say_phonetic_char
+ key_kp3 = say_next_char  
+spk  key_kp3 = bottom_edge
+ key_kp0 = spk_key
+ key_kpdot = say_position
+spk key_kpdot = say_attributes
+key_kpenter = speakup_quiet
+spk key_kpenter = speakup_off
+key_sysrq = speech_kill
+ key_kpslash = speakup_cut
+spk key_kpslash = speakup_paste
+spk key_pageup = say_first_char
+spk key_pagedown = say_last_char
+key_capslock = spk_key
+ spk key_z = spk_lock
+key_leftmeta = spk_key
+ctrl spk key_0 = speakup_goto
+spk key_u = say_prev_line
+spk key_i = say_line
+double spk key_i = say_line_indent
+spk key_o = say_next_line
+spk key_minus = speakup_parked
+shift spk key_minus = say_char_num
+spk key_j = say_prev_word
+spk key_k = say_word
+double spk key_k = spell_word
+spk key_l = say_next_word
+spk key_m = say_prev_char
+spk key_comma = say_char
+double spk key_comma = say_phonetic_char
+spk key_dot = say_next_char
+spk key_n = say_position
+ ctrl spk key_m = left_edge
+ ctrl spk key_y = top_edge
+ ctrl spk key_dot = right_edge
+ctrl spk key_p = bottom_edge
+spk key_apostrophe = say_screen
+spk key_h = say_from_left
+spk key_y = say_from_top
+spk key_semicolon = say_to_right
+spk key_p = say_to_bottom
+spk key_slash = say_attributes
+ spk key_enter = speakup_quiet
+ ctrl  spk key_enter = speakup_off
+ spk key_9 = speakup_cut
+spk key_8 = speakup_paste
+shift spk key_m = say_first_char
+ ctrl spk key_semicolon = say_last_char
+
+5.  The Speakup Proc System
+
+The Speakup screen reader also creates a speakup subdirectory as a part
+of the proc system.  You can see these entries by typing the command:
+
+ls -1 /proc/speakup/*
+
+If you issue the above ls command, you will get back something like
+this:
+
+/proc/speakup/attrib_bleep
+/proc/speakup/bell_pos
+/proc/speakup/bleep_time
+/proc/speakup/bleeps
+/proc/speakup/caps_start
+/proc/speakup/caps_stop
+/proc/speakup/characters
+/proc/speakup/cursor_time
+/proc/speakup/delay_time
+/proc/speakup/delimiters
+/proc/speakup/ex_num
+/proc/speakup/freq
+/proc/speakup/full_time
+/proc/speakup/jiffy_delta
+/proc/speakup/key_echo
+/proc/speakup/keymap
+/proc/speakup/no_interrupt
+/proc/speakup/pitch
+/proc/speakup/punc_all
+/proc/speakup/punc_level
+/proc/speakup/punc_most
+/proc/speakup/punc_some
+/proc/speakup/punct
+/proc/speakup/rate
+/proc/speakup/reading_punc
+/proc/speakup/repeats
+/proc/speakup/say_control
+/proc/speakup/say_word_ctl
+/proc/speakup/silent
+/proc/speakup/spell_delay
+/proc/speakup/synth_direct
+/proc/speakup/synth_name
+/proc/speakup/tone
+/proc/speakup/trigger_time
+/proc/speakup/version
+/proc/speakup/voice
+/proc/speakup/vol
+
+In addition to using the Speakup hot keys to change such things as
+volume, pitch, and rate, you can also echo values to the appropriate
+entry in the /proc/speakup directory.  This is very useful, since it
+lets you control Speakup parameters from within a script.  How you
+would write such scripts is somewhat beyond the scope of this manual,
+but I will include a couple of simple examples here to give you a
+general idea of what such scripts can do.
+
+Suppose for example, that you wanted to control both the punctuation
+level and the reading punctuation level at the same time.  For
+simplicity, we'll call them punc0, punc1, punc2, and punc3.  The scripts
+might look something like this:
+
+#!/bin/bash
+# punc0
+# set punc and reading punc levels to 0
+echo 0 >/proc/speakup/punc_level
+echo 0 >/proc/speakup/reading_punc
+echo Punctuation level set to 0.
+
+#!/bin/bash
+# punc1
+# set punc and reading punc levels to 1
+echo 1 >/proc/speakup/punc_level
+echo 1 >/proc/speakup/reading_punc
+echo Punctuation level set to 1.
+
+#!/bin/bash
+# punc2
+# set punc and reading punc levels to 2
+echo 2 >/proc/speakup/punc_level
+echo 2 >/proc/speakup/reading_punc
+echo Punctuation level set to 2.
+
+#!/bin/bash
+# punc3
+# set punc and reading punc levels to 3
+echo 3 >/proc/speakup/punc_level
+echo 3 >/proc/speakup/reading_punc
+echo Punctuation level set to 3.
+
+If you were to store these four small scripts in a directory in your
+path, perhaps /usr/local/bin, and set the permissions to 755 with the
+chmod command, then you could change the default reading punc and
+punctuation levels at the same time by issuing just one command.  For
+example, if you were to execute the punc3 command at your shell prompt,
+then the reading punc and punc level would both get set to 3.
+
+I should note that the above scripts were written to work with bash, but
+regardless of which shell you use, you should be able to do something
+similar.
+
+The Speakup proc system also has another interesting use.  You can echo
+Speakup parameters into the proc system in a script during system
+startup, and speakup will return to your preferred parameters every time
+the system is rebooted.
+
+Most of the Speakup proc parameters can be manipulated by a regular user
+on the system.  However, there are a few parameters that are dangerous
+enough that they should only be manipulated by the root user on your
+system.  There are even some parameters that are read only, and cannot
+be written to at all.  For example, the version entry in the Speakup
+proc system is read only.  This is because there is no reason for a user
+to tamper with the version number which is reported by Speakup.  Doing
+an ls -l on /proc/speakup/version will return this:
+
+-r--r--r--    1 root     root            0 Mar 21 13:46 /proc/speakup/version
+
+As you can see, the version entry in the Speakup proc system is read
+only, is owned by root, and belongs to the root group.  Doing a cat of
+/proc/speakup/version will display the Speakup version number, like
+this:
+
+cat /proc/speakup/version
+Speakup v-2.00 CVS: Thu Oct 21 10:38:21 EDT 2004 
+synth dtlk version 1.1
+
+The display shows the Speakup version number, along with the version
+number of the driver for the current synthesizer.
+
+Looking at entries in the Speakup proc system can be useful in many
+ways.  For example, you might wish to know what level your volume is set
+at.  You could type:
+
+cat /proc/speakup/vol
+5
+
+The number five which comes back is the level at which the synthesizer
+volume is set at.
+
+All the entries in the Speakup proc system are readable, some are
+writable by root only, and some are writable by everyone.  Unless you
+know what you are doing, you should probably leave the ones that are
+writable by root only alone.  Most of the names are self explanatory. 
+Vol for controlling volume, pitch for pitch, rate for controlling speaking
+rate, etc.  If you find one you aren't sure about, you can post a query
+on the Speakup list.
+
+6.  Changing Synthesizers
+
+It is possible to change to a different synthesizer while speakup is
+running.  In other words, it is not necessary to reboot the system
+in order to use a different synthesizer.  You can simply echo the
+synthesizer keyword to the /proc/speakup/synth_name proc entry. 
+Depending on your situation, you may wish to echo none to the synth_name
+proc entry, to disable speech while one synthesizer is disconnected and
+a second one is connected in its place.  Then echo the keyword for the
+new synthesizer into the synth_name proc entry in order to start speech
+with the newly connected synthesizer.  See the list of synthesizer
+keywords in section 1 to find the keyword which matches your synth.
+
+7.  Loading modules
+
+As mentioned earlier, Speakup can either be completely compiled into the
+kernel, with the exception of the help module, or it can be compiled as
+a series of modules.   When compiled as modules, Speakup will only be
+able to speak some of the bootup messages if your system administrator
+has configured the system to load the modules at boo time. The modules
+can  be loaded after the file systems have been checked and mounted, or
+from an initrd.  There is a third possibility.  Speakup can be compiled
+with some components built into the kernel, and others as modules.  As
+we'll see in the next section, this is particularly useful when you are
+working with software synthesizers.
+
+If Speakup is completely compiled as modules, then you must use the
+modprobe command to load Speakup.  You do this by loading the module for
+the synthesizer driver you wish to use.  The driver modules are all
+named speakup_<keyword>, where <keyword> is the keyword for the
+synthesizer you want.  So, in order to load the driver for the DecTalk
+Express, you would type the following command:
+
+modprobe speakup_dectlk
+
+Issuing this command would load the DecTalk Express driver and all other
+related Speakup modules necessary to get Speakup up and running.
+
+To completely unload Speakup, again presuming that it is entirely built
+as modules, you would give the command:
+
+modprobe -r speakup_dectlk
+
+The above command assumes you were running a DecTalk Express.  If you
+were using a different synth, then you would substitute its keyword in
+place of dectlk.
+
+But now, suppose we have a situation where the main Speakup component
+is built into the kernel, and some or all of the drivers are built as
+modules.  Since the main part of Speakup is compiled into the kernel, a
+partial Speakup proc system has been created which we can take advantage
+of by simply echoing the synthesizer keyword into the
+/proc/speakup/synth_name proc entry.  This will cause the kernel to
+automatically load the appropriate driver module, and start Speakup
+talking.  To switch to another synth, just echo a new keyword to the
+synth_name proc entry.  For example, to load the DoubleTalk LT driver,
+you would type:
+
+echo ltlk >/proc/speakup/synth_name
+
+You can use the modprobe -r command to unload driver modules, regardless
+of whether the main part of Speakup has been built into the kernel or
+not.
+
+8.  Using Software Synthesizers
+
+Using a software synthesizer requires that some other software be
+installed and running on your system.  For this reason, software
+synthesizers are not available for use at bootup, or during a system
+installation process.
+
+In order to use a software synthesizer, you must have a package called
+Speech Dispatcher running on your system, and it must be configured to
+work with one of its supported software synthesizers.
+
+Two open source synthesizers you might use are Flite and Festival.  You
+might also choose to purchase the Software DecTalk from Fonix Sales Inc.
+If you run a google search for Fonix, you'll find their web site.
+
+You can obtain a copy of Speech Dispatcher from free(b)soft at
+http://www.freebsoft.org/.  Follow the installation instructions that
+come with Speech Dispatcher in order to install and configure Speech
+Dispatcher.  You can check out the web site for your Linux distribution
+in order to get a copy of either Flite or Festival.  Your Linux
+distribution may also have a precompiled Speech Dispatcher package.
+
+Once you've installed, configured, and tested Speech Dispatcher with your
+chosen software synthesizer, you still need one more piece of software
+in order to make things work.  You need a package called speechd-up. 
+You get it from the free(b)soft web site mentioned above.  After you've
+compiled and installed speechd-up, you are almost ready to begin using
+your software synthesizer.
+
+Before you can use a software synthesizer, you must have created the
+/dev/softsynth device.  If you have not already done so, issue the
+following commands as root:
+
+cd /dev
+mknod softsynth c 10 26
+
+While we are at it, we might just as well create the /dev/synth device,
+which can be used to let user space programs send information to your
+synthesizer.  To create /dev/synth, change to the /dev directory, and
+issue the following command as root:
+
+mknod synth c 10 25
+
+Now you can begin using your software synthesizer.  In order to do so,
+echo the sftsyn keyword to the synth_name proc entry like this:
+
+echo sftsyn >/proc/speakup/synth_name
+
+Next run the speechd_up command like this:
+
+speechd_up &
+
+Your synth should now start talking, and you should be able to adjust
+the pitch, rate, etc.
+
+In this section, we have assumed that your copy of Speakup was compiled
+with the speakup_sftsyn component either built into the kernel, or
+compiled as a module.
+
+9.  Using The DecTalk PC Card
+
+The DecTalk PC card is an ISA card that is inserted into one of the ISA
+slots in your computer.  It requires that the DecTalk PC software be
+installed on your computer, and that the software be loaded onto the
+Dectalk PC card before it can be used.
+
+You can get the dec_pc.tgz file from the linux-speakup.org site.  The
+dec_pc.tgz file is in the ~ftp/pub/linux/speakup directory.
+
+After you have downloaded the dec_pc.tgz file, untar it in your home
+directory, and read the Readme file in the newly created dec_pc
+directory.
+
+The easiest way to get the software working is to copy the entire dec_pc
+directory into /user/local/lib.  To do this, su to root in your home
+directory, and issue the command:
+
+cp dec_pc /usr/local/lib
+
+You will need to copy the dtload command from the dec_pc directory to a
+directory in your path.  Either /usr/bin or /usr/local/bin is a good
+choice.
+
+You can now run the dtload command in order to load the DecTalk PC
+software onto the card.  After you have done this, echo the decpc
+keyword to the synth_name entry in the proc system like this:
+
+echo decpc >/proc/speakup/synth_name
+
+Your DecTalk PC should start talking, and then you can adjust the pitch,
+rate, volume, voice, etc.  The voice entry in the Speakup proc system
+will accept a number from 0 through 7 for the DecTalk PC synthesizer,
+which will give you access to some of the DecTalk voices.
+
+10.  Using Cursor Tracking
+
+In Speakup version 2.0 and later, cursor tracking is turned on by
+default.  This means that when you are using an editor, Speakup will
+automatically speak characters as you move left and right with the
+cursor keys, and lines as you move up and down with the cursor keys.
+
+This is extremely useful, and makes editing files a snap.  But there are
+times when cursor tracking can get in your way.  So Speakup provides a
+toggle to turn cursor tracking on and off.  You do this with the keypad
+asterisk key.  Pressing this key repeatedly will toggle the cursor
+tracking on and off, and you will hear Speakup say, "cursoring off", and
+"cursoring on".
+
+Some folks like to turn cursor tracking off while they are using the
+lynx web browser.  You definitely want to turn cursor tracking off when
+you are using the alsamixer application.  Otherwise, you won't be able
+to hear your mixer settings while you are using the arrow keys.
+
+11.  Cut and Paste
+
+One of Speakup's more useful features is the ability to cut and paste
+text on the screen.  This means that you can capture information from a
+program, and paste that captured text into a different place in the
+program, or into an entirely different program, which may even be
+running on a different console.
+
+For example, in this manual, we have made references to several web
+sites.  It would be nice if you could cut and paste these urls into your
+web browser.  Speakup does this quite nicely.  Suppose you wanted to
+past the following url into your browser:
+
+http://linux-speakup.org/
+
+Use the speakup review keys to position the reading cursor on the first
+character of the above url.  When the reading cursor is in position,
+press the keypad slash key once.  Speakup will say, "mark".  Next,
+position the reading cursor on the rightmost character of the above
+url. Press the keypad slash key once again to actually cut the text
+from the screen.  Speakup will say, "cut".  Although we call this
+cutting, Speakup does not actually delete the cut text from the screen. 
+It makes a copy of the text in a special buffer for later pasting.
+
+Now that you have the url cut from the screen, you can paste it into
+your browser, or even paste the url on a command line as an argument to
+your browser.
+
+Suppose you want to start lynx and go to the Speakup site.
+
+You can switch to a different console with the alt left and right
+arrows, or you can switch to a specific console by typing alt and a
+function key.  These are not Speakup commands, just standard Linux
+console capabilities.
+
+Once you've changed to an appropriate console, and are at a shell prompt,
+type the word lynx, followed by a space.  Now press and hold the speakup
+key, while you type the keypad slash character.  The url will be pasted
+onto the command line, just as though you had typed it in.  Press the
+enter key to execute the command.
+
+The paste buffer will continue to hold the cut information, until a new
+mark and cut operation is carried out.  This means you can paste the cut
+information as many times as you like before doing another cut
+operation.
+
+You are not limited to cutting and pasting only one line on the screen.
+You can also cut and paste rectangular regions of the screen.  Just
+position the reading cursor at the top left corner of the text to be
+cut, mark it with the keypad slash key, then position the reading cursor
+at the bottom right corner of the region to be cut, and cut it with the
+keypad slash key.
+
+12.  Changing the Pronunciation of Characters
+
+Through the /proc/speakup/chars proc entry, Speakup gives you the
+ability to change how Speakup pronounces a given character.  You could,
+for example, change how some punctuation characters are spoken.  You can
+even change how Speakup will pronounce certain letters.
+
+You may, for example, wish to change how Speakup pronounces the z
+character.  The author of Speakup, Kirk Reiser, is Canadian, and thus
+believes that the z should be pronounced zed.  If you are an American,
+you might wish to use the zee pronunciation instead of zed.  You can
+change the pronunciation of both the upper and lower case z with the
+following two commands:
+
+echo 90 zee >/proc/speakup/characters
+echo 122 zee >/proc/speakup/characters
+
+Let's examine the parts of the two previous commands.  They are issued
+at the shell prompt, and could be placed in a startup script.
+
+The word echo tells the shell that you want to have it display the
+string of characters that follow the word echo.  If you were to just
+type:
+
+echo hello.
+
+You would get the word hello printed on your screen as soon as you
+pressed the enter key.  In this case, we are echoing strings that we
+want to be redirected into the proc system.
+
+The numbers 90 and 122 in the above echo commands are the ascii numeric
+values for the upper and lower case z, the characters we wish to change.
+
+The string zee is the pronunciation that we want Speakup to use for the
+upper and lower case z.
+
+The > symbol redirects the output of the echo command to a file, just
+like in DOS, or at the Windows command prompt.
+
+And finally, /proc/speakup/chars is the file entry in the proc system
+where we want the output to be directed.  Speakup looks at the numeric
+value of the character we want to change, and inserts the pronunciation
+string into an internal table.
+
+You can look at the whole table with the following command:
+
+cat /proc/speakup/chars
+
+Speakup will then print out the entire character pronunciation table.  I
+won't display it here, but leave you to look at it at your convenience.
+
+13.  Mapping Keys
+
+Speakup has the capability of allowing you to assign or "map" keys to
+internal Speakup commands.  This section necessarily assumes you have a
+Linux kernel source tree installed, and that it has been patched and
+configured with Speakup.  How you do this is beyond the scope of this
+manual.  For this information, visit the Speakup web site at
+http://linux-speakup.org/.  The reason you'll need the kernel source
+tree patched with Speakup is that the genmap utility you'll need for
+processing keymaps is in the
+/usr/src/linux-<version_number>/drivers/char/speakup directory.  The
+<version_number> in the above directory path is the version number of
+the Linux source tree you are working with.
+
+So ok, you've gone off and gotten your kernel source tree, and patched
+and configured it.  Now you can start manipulating keymaps.
+
+You can either use the
+/usr/src/linux-<version_number>/drivers/char/speakup/speakupmap.map file
+included with the Speakup source, or you can cut and paste the copy in
+section 4 into a separate file.  If you use the one in the Speakup
+source tree, make sure you make a backup of it before you start making
+changes.  You have been warned!
+
+Suppose that you want to swap the key assignments for the Speakup
+say_last_char and the Speakup say_first_char commands.  The
+speakupmap.map lists the key mappings for these two commands as follows:
+
+spk key_pageup = say_first_char
+spk key_pagedown = say_last_char
+
+You can edit your copy of the speakupmap.map file and swap the command
+names on the right side of the = (equals) sign.  You did make a backup,
+right?  The new keymap lines would look like this:
+
+spk key_pageup = say_last_char
+spk key_pagedown = say_first_char
+
+After you edit your copy of the speakupmap.map file, save it under a new
+file name, perhaps newmap.map.  Then exit your editor and return to the
+shell prompt.
+
+You are now ready to load your keymap with your swapped key assignments.
+ Assuming that you saved your new keymap as the file newmap.map, you
+would load your keymap into the proc system like this:
+
+/usr/src/linux-<version_number>/drivers/char/speakup/genmap newmap.map
+>/proc/speakup/keymap
+
+Remember to substitute your kernel version number for the
+<version_number> in the above command.  Also note that although the
+above command wrapped onto two lines in this document, you should type
+it all on one line.
+
+Your say first and say last characters should now be swapped.  Pressing
+speakup pagedown should read you the first non-whitespace character on
+the line your reading cursor is in, and pressing speakup pageup should
+read you the last character on the line your reading cursor is in.
+
+You should note that these new mappings will only stay in effect until
+you reboot, or until you load another keymap.
+
+One final warning.  If you try to load a partial map, you will quickly
+find that all the mappings you didn't include in your file got deleted
+from the working map.  Be extremely careful, and always make a backup! 
+You have been warned!
+
+14.  Using Speakup's Windowing Capability
+
+Speakup has the capability of defining and manipulating windows on the
+screen.  Speakup uses the term "Window", to mean a user defined area of
+the screen.  The key strokes for defining and manipulating Speakup
+windows are as follows:
+
+speakup + f2 -- Set the bounds of the window.
+Speakup + f3 -- clear the current window definition.
+speakup + f4 -- Toggle window silence on and off.
+speakup + keypad plus -- Say the currently defined window.
+
+These capabilities are useful for tracking a certain part of the screen
+without rereading the whole screen, or for silencing a part of the
+screen that is constantly changing, such as a clock or status line.
+
+There is no way to save these window settings, and you can only have one
+window defined for each virtual console.  There is also no way to have
+windows automaticly defined for specific applications.
+
+In order to define a window, use the review keys to move your reading
+cursor to the beginning of the area you want to define.  Then press
+speakup + f2.  Speakup will tell you that the window starts at the
+indicated row and column position.  Then move the reading cursor to the
+end of the area to be defined as a window, and press speakup + f2 again.
+ If there is more than one line in the window, Speakup will tell you
+that the window ends at the indicated row and column position.  If there
+is only one line in the window, then Speakup will tell you that the
+window is the specified line on the screen.  If you are only defining a
+one line window, you can just press speakup + f2 twice after placing the
+reading cursor on the line you want to define as a window.  It is not
+necessary to position the reading cursor at the end of the line in order
+to define the whole line as a window.
+
+                GNU Free Documentation License
+                  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+
+The End.
diff -Naurp linux-2.6.13-rc6-git13-gentoo/MAINTAINERS linux-2.6.13-rc6-git13-gentoo-speakup/MAINTAINERS
--- linux-2.6.13-rc6-git13-gentoo/MAINTAINERS   2005-08-22 14:35:18.000000000 -0700
+++ linux-2.6.13-rc6-git13-gentoo-speakup/MAINTAINERS   2005-08-25 14:06:54.000000000 -0700
@@ -2219,6 +2219,13 @@ M:       wli@holomorphy.com
 L:     sparclinux@vger.kernel.org
 S:     Maintained
 
+SPEAKUP Console speech output
+P: Kirk Reiser
+M: kirk@braille.uwo.ca
+L: speakup@braille.uwo.ca
+W: http://www.linux-speakup.org
+S: Maintained
+
 SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
 P:     Roger Wolff
 M:     R.E.Wolff@BitWizard.nl
diff -Naurp linux-2.6.13-rc6-git13-gentoo/arch/arm/Kconfig linux-2.6.13-rc6-git13-gentoo-speakup/arch/arm/Kconfig
--- linux-2.6.13-rc6-git13-gentoo/arch/arm/Kconfig      2005-08-22 14:35:00.000000000 -0700
+++ linux-2.6.13-rc6-git13-gentoo-speakup/arch/arm/Kconfig      2005-08-25 14:06:54.000000000 -0700
@@ -755,6 +755,7 @@ source "drivers/misc/Kconfig"
 source "drivers/media/Kconfig"
 
 source "drivers/video/Kconfig"
+source "drivers/char/speakup/Kconfig"
 
 source "sound/Kconfig"
 
diff -Naurp linux-2.6.13-rc6-git13-gentoo/arch/mips/Kconfig linux-2.6.13-rc6-git13-gentoo-speakup/arch/mips/Kconfig
--- linux-2.6.13-rc6-git13-gentoo/arch/mips/Kconfig     2005-08-22 14:35:01.000000000 -0700
+++ linux-2.6.13-rc6-git13-gentoo-speakup/arch/mips/Kconfig     2005-08-25 14:06:54.000000000 -0700
@@ -839,6 +839,8 @@ config SIBYTE_STANDALONE
        depends on SIBYTE_SB1xxx_SOC && !SIBYTE_CFE
        default y
 
+source "drivers/char/speakup/Kconfig"
+
 config SIBYTE_STANDALONE_RAM_SIZE
        int "Memory size (in megabytes)"
        depends on SIBYTE_STANDALONE
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/Kconfig linux-2.6.13-rc6-git13-gentoo-speakup/drivers/Kconfig
--- linux-2.6.13-rc6-git13-gentoo/drivers/Kconfig       2005-08-22 14:38:22.000000000 -0700
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/Kconfig       2005-08-25 14:06:54.000000000 -0700
@@ -52,6 +52,8 @@ source "drivers/media/Kconfig"
 
 source "drivers/video/Kconfig"
 
+source "drivers/char/speakup/Kconfig"
+
 source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/Makefile linux-2.6.13-rc6-git13-gentoo-speakup/drivers/Makefile
--- linux-2.6.13-rc6-git13-gentoo/drivers/Makefile      2005-08-22 14:40:26.000000000 -0700
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/Makefile      2005-08-25 14:06:54.000000000 -0700
@@ -1,4 +1,3 @@
-#
 # Makefile for the Linux kernel device drivers.
 #
 # 15 Sep 2000, Christoph Hellwig <hch@infradead.org>
@@ -25,6 +24,8 @@ obj-$(CONFIG_FB_INTEL)          += video
 obj-$(CONFIG_SERIO)            += input/serio/
 obj-y                          += serial/
 obj-$(CONFIG_PARPORT)          += parport/
+# load keyboard early so speakup can be quieted
+obj-$(CONFIG_INPUT)            += input/
 obj-y                          += base/ block/ misc/ net/ media/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-$(CONFIG_ATM)              += atm/
@@ -47,7 +48,6 @@ obj-$(CONFIG_TC)              += tc/
 obj-$(CONFIG_USB)              += usb/
 obj-$(CONFIG_USB_GADGET)       += usb/gadget/
 obj-$(CONFIG_GAMEPORT)         += input/gameport/
-obj-$(CONFIG_INPUT)            += input/
 obj-$(CONFIG_I2O)              += message/
 obj-$(CONFIG_I2C)              += i2c/
 obj-$(CONFIG_W1)               += w1/
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/Makefile linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/Makefile
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/Makefile 2005-08-22 14:35:03.000000000 -0700
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/Makefile 2005-08-25 14:06:54.000000000 -0700
@@ -83,6 +83,7 @@ obj-$(CONFIG_SCx200_GPIO) += scx200_gpio
 obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o
 obj-$(CONFIG_TANBAC_TB0219) += tb0219.o
 
+obj-$(CONFIG_SPEAKUP) += speakup/
 obj-$(CONFIG_WATCHDOG) += watchdog/
 obj-$(CONFIG_MWAVE) += mwave/
 obj-$(CONFIG_AGP) += agp/
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/consolemap.c linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/consolemap.c
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/consolemap.c     2005-06-17 12:48:29.000000000 -0700
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/consolemap.c     2005-08-25 14:06:54.000000000 -0700
@@ -670,3 +670,4 @@ console_map_init(void)
 }
 
 EXPORT_SYMBOL(con_copy_unimap);
+EXPORT_SYMBOL(inverse_translate);
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/keyboard.c linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/keyboard.c
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/keyboard.c       2005-08-22 14:35:03.000000000 -0700
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/keyboard.c       2005-08-25 14:06:54.000000000 -0700
@@ -40,6 +40,13 @@
 #include <linux/sysrq.h>
 #include <linux/input.h>
 
+
+#include <linux/speakup.h>
+        
+#ifdef CONFIG_SPEAKUP_MODULE
+spk_key_func addr_spk_key = NULL;
+#endif
+ 
 static void kbd_disconnect(struct input_handle *handle);
 extern void ctrl_alt_del(void);
 
@@ -64,6 +71,10 @@ extern void ctrl_alt_del(void);
 
 #define KBD_DEFLOCK 0
 
+/* Key types processed even in raw modes */
+
+#define TYPES_ALLOWED_IN_RAW_MODE ((1 << KT_SPEC) | (1 << KT_SHIFT) | (1 << KT_SPKUP))
+
 void compute_shiftstate(void);
 
 /*
@@ -79,7 +90,7 @@ void compute_shiftstate(void);
 typedef void (k_handler_fn)(struct vc_data *vc, unsigned char value, 
                            char up_flag, struct pt_regs *regs);
 static k_handler_fn K_HANDLERS;
-static k_handler_fn *k_handler[16] = { K_HANDLERS };
+k_handler_fn *k_handler[16] = { K_HANDLERS };
 
 #define FN_HANDLERS\
        fn_null,        fn_enter,       fn_show_ptregs, fn_show_mem,\
@@ -100,15 +111,18 @@ static fn_handler_fn *fn_handler[] = { F
 const int max_vals[] = {
        255, ARRAY_SIZE(func_table) - 1, ARRAY_SIZE(fn_handler) - 1, NR_PAD - 1,
        NR_DEAD - 1, 255, 3, NR_SHIFT - 1, 255, NR_ASCII - 1, NR_LOCK - 1,
-       255, NR_LOCK - 1, 255
+       255, NR_LOCK - 1, 255, 255
 };
 
 const int NR_TYPES = ARRAY_SIZE(max_vals);
 
 struct kbd_struct kbd_table[MAX_NR_CONSOLES];
-static struct kbd_struct *kbd = kbd_table;
+struct kbd_struct *kbd = kbd_table;
 static struct kbd_struct kbd0;
 
+EXPORT_SYMBOL(kbd);
+EXPORT_SYMBOL(k_handler);
+
 int spawnpid, spawnsig;
 
 /*
@@ -256,12 +270,14 @@ void kd_mksound(unsigned int hz, unsigne
                                }
                        }
                }
-               if (ticks)
-                       mod_timer(&kd_mksound_timer, jiffies + ticks);
+                if (ticks)
+                        mod_timer(&kd_mksound_timer, jiffies + ticks);
        } else
                kd_nosound(0);
 }
 
+EXPORT_SYMBOL(kd_mksound);
+
 /*
  * Setting the keyboard rate.
  */
@@ -603,6 +619,7 @@ static void k_spec(struct vc_data *vc, u
        if (up_flag)
                return;
        if (value >= ARRAY_SIZE(fn_handler))
+               if (up_flag || (value >= ARRAY_SIZE(fn_handler)))
                return;
        if ((kbd->kbdmode == VC_RAW || 
             kbd->kbdmode == VC_MEDIUMRAW) && 
@@ -1119,6 +1136,13 @@ static void kbd_keycode(unsigned int key
        key_map = key_maps[shift_final];
 
        if (!key_map) {
+#ifdef CONFIG_SPEAKUP
+               if (speakup_key(vc, shift_final, keycode, K(KT_SHIFT,0), !down, regs ))
+                       return;
+#elif defined(CONFIG_SPEAKUP_MODULE)
+               if ( addr_spk_key && (*addr_spk_key)(vc, shift_final,
+                       keycode, K(KT_SHIFT,0), !down, regs) ) return;
+#endif
                compute_shiftstate();
                kbd->slockstate = 0;
                return;
@@ -1136,10 +1160,17 @@ static void kbd_keycode(unsigned int key
        }
 
        type -= 0xf0;
-
-       if (raw_mode && type != KT_SPEC && type != KT_SHIFT)
+#ifdef CONFIG_SPEAKUP
+       if (speakup_key(vc, shift_final, keycode, keysym, !down, regs ))
                return;
+#elif defined(CONFIG_SPEAKUP_MODULE)
+       if ( addr_spk_key && (*addr_spk_key)(vc, shift_final,
+               keycode, keysym, !down, regs) ) return;
+#endif
 
+       if (raw_mode && type != KT_SPEC && type != KT_SHIFT )
+               return;
+ 
        if (type == KT_LETTER) {
                type = KT_LATIN;
                if (vc_kbd_led(kbd, VC_CAPSLOCK)) {
@@ -1148,7 +1179,6 @@ static void kbd_keycode(unsigned int key
                                keysym = key_map[keycode];
                }
        }
-
        (*k_handler[type])(vc, keysym & 0xff, !down, regs);
 
        if (type != KT_SLOCK)
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/BUGS linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/BUGS
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/BUGS     1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/BUGS     2001-10-18 05:53:52.000000000 -0700
@@ -0,0 +1,10 @@
+Well, there are probably just thousands to squash, but these are the
+ones I think of as bugs.
+
+There is a problem with speakup interrogating LiteTalks with rom
+versions of at least 3.22 and earlier. (kirk)
+
+I define bugs as things which aren't working correctly although
+they've been implemented.  NOT features which haven't been added yet.
+
+  Kirk
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/ChangeLog linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/ChangeLog
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/ChangeLog        1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/ChangeLog        2005-08-04 10:40:51.000000000 -0700
@@ -0,0 +1,2649 @@
+2005-08-04 Thursday 12:42  kirk
+
+       Here are the first set of revisions to include screen comparing and
+       attribute or highlight tracking thanks to Mike McDonald of APH.  I am
+       also starting a general clean-up of the code to remove kernel support
+       before 2.6.12.  I will also be starting to modularize all text output
+       by speakup to support other character sets than just ISO-8859-1.
+       (kirk)
+       
+2005-06-27 Monday 10:12  kirk
+
+       Removed the static int errno declaration line 81 in speakup.c which
+       seemed to be causing gcc4 or at least fedora gcc great amounts of
+       angst.  It doesn't seem to bother gcc 3.x so why not.  (kirk)
+       
+2005-06-24 Friday 14:53  kirk
+
+       Okay, some how I checked in the older patches in four places in vt.c.
+       Go figure!  I have just hopefully fixed those so they should actually
+       work.  I'll depend on Gene and Bill to beat on this if possible.  They
+       own the professional hammers. (kirk)
+       
+2005-06-24 Friday 14:32  kirk
+
+       Adding in a couple of small patches to clean up the module handling of
+       speakup.  Once thanks to Daniel Drake for these.  Let's see if I can
+       get this patch to check in properly now. (kirk)
+       
+2005-06-22 Wednesday 16:16  kirk
+
+       Checking in the changes to speakup for 2.6.12.  This will make speakup
+       cvs incompatible with previous versions of the kernel before 2.6.12.
+       Many thanks to Daniel Drake of the gentoo project who managed to send
+       me patches before I had my changes very far underway.  (kirk)
+       
+2005-04-19 Tuesday 14:37  kirk
+
+       This is getting tedious.  The speakup.c does not like being the old
+       version! 'grin' (kirk)
+       
+2005-04-19 Tuesday 12:26  kirk
+
+       Updating Changlog, fixed a missing line in install script to move into
+       the kernel tree root needed for tar ball installation.  Also checked
+       in another copy of the 2.4.27 speakup.c which somehow disappeared
+       after my last checkin.  Let's see if this fixes the 2.4.27 plus cut
+       and paste hang problem. (kirk)
+       
+2005-04-07 Thursday 15:57  gene
+
+       Added Speakup User's Guide to the Speakup tree (Gene)
+       
+2005-03-30 Wednesday 14:02  gene
+
+       Changed max pitch in DecTalk Express driver from 100 to 200 (Gene)
+       
+2005-03-02 Wednesday 20:23  kirk
+
+       I have been also trying to figure out why the cvs mail is not going
+       out recently so this is mostly just a test of that and updating the
+       change log.  (kirk)
+       
+2005-03-02 Wednesday 20:04  kirk
+
+       Well, I broke it good with the last check in and now I'm trying to fix
+       it.  When I took a patch against speakup.c on checkin I forgot it
+       would check in the speakup.c as well so that won't work.  Now I am
+       trying the other approach to copy a speakup.c into place on a 2.4.x
+       checkout.  We'll see if it works. (kirk)
+       
+2005-03-02 Wednesday 17:43  kirk
+
+       Just checking in the new speakup.c.patch diff. (kirk)
+       
+2005-03-02 Wednesday 17:40  kirk
+
+       Making changes to the 2.6.11 branch of speakup.  Had to change four
+       areas of vt.c and we should now have our speakup cursor updating
+       working once again.  Thanks to Daniel Drake of Gentoo for supplying a
+       patch against speakup.c with all the vc_data structure and variable
+       changes.  I am making a v2.6 patch against the 2.4.x speakup.c to
+       hopefully allow us to maintain both trees for a little while longer.
+       (kirk)
+       
+       Also made a minor change to speakup_dectlk.c driver to accommodate
+       female voices thanks to Ken Hitt for that. (kirk)
+       
+2004-12-28 Tuesday 15:11  kirk
+
+       Just checking in the latest ChangeLog. (kirk)
+       
+2004-12-28 Tuesday 14:21  kirk
+
+       [no log message]
+       
+2004-12-28 Tuesday 14:03  kirk
+
+       2.6.10 changed the structure of console_callback() which did away with
+       the curcons variable for the total local context and made it local to
+       a if then clause.  Also moved the function up about 40 lines in the
+       vt.c file which caused the patch to fail on checkout. (kirk)
+       
+2004-10-21 Thursday 10:39  kirk
+
+       I fixed host-progs-y to hostprogs-y which may have been screwing up
+       some people when installing keymaps and the like.  (kirk)
+       
+2004-10-20 Wednesday 14:28  kirk
+
+       Okay, it seems that the atkbd must get registered in the serio modules
+       someplace because moving it below that in the drivers/Makefile allows
+       it to not only compile but actually boot the system as well.  I also
+       fix the integer/pointer warning in line 917 of speakup.c.  Now I just
+       have to get speakup to work once again. (kirk)
+       
+2004-10-20 Wednesday 10:14  kirk
+
+       Checking in the first set of modifications for the 2.6.9 kernel
+       speakup tree.  Modified drivers/Makefile and arch/mips/Kconfig with a
+       successful compile.  I still have to run some tests to check
+       operation. (kirk)
+       
+2004-08-29 Sunday 23:52  kirk
+
+       Minor fix to vt.c under 2.6.8.1 which prevented one hunk of the vt.c
+       patch from being applied.
+       
+       Thanks to Garry Turkington for finding the problem with speakup not
+       compiling under the amd 64 bit processors.  I hope this will take care
+       of all 64 bit architectures.  Garry's solution to the problem follows.
+       (kirk)
+       
+       In speakup.c you include the console_macros.h file from the drivers/char
+       directory.  This is included before linux/modules.h which is fine in and
+       of itself.  But in modules.h there's a
+       definition for :
+               struct attribute attr;
+       
+       This is conditional, within a
+       #ifdef CONFIG_MODULES
+       
+       The problem is that console_macros.h defines a macro called attr.  So if
+       that definition above is hit the macro is included and everything barfs
+       horribly.
+       
+       So the solution is to move the #include "../console_macros.h" in speakup.c
+       from its current position further down - I put it after the
+       #include <linux/consolemap.h> just to be safe.  Everything then compiles
+       fine and from a quick 10 minutes playing around seems to work well on my
+       Athlon64 box.
+       
+       I still don't understand the conditional compilation and why this hits on
+       the x86_64 build I've been using.  Note that the  attr nameclash isn't
+       Speakup specific - any module including that console_macros.h file is at
+       the same risk.  I need to spend a little time understanding what the
+       conditional means and what config options hit it.
+       
+2004-06-07 Monday 10:53  kirk
+
+       Fixed the problem with not being able to switch between synths that
+       are built-in to the kernel.  Changed the softsynth internal synth name
+       to sftsyn and applied Ammer's patch to fix the synth init string for
+       the DECTalk Express.  Thanks Ameer. (kirk)
+       
+2004-05-13 Thursday 16:05  yue
+
+       include #include<linux/module.h> in consolemap.c, make sure EXPORT_SYMBOL
+       is defined in this file
+       
+2004-05-13 Thursday 13:38  kirk
+
+       First of all I believe I have fixed the say screen run together
+       problem but I haven't tested it myself so someone please let me know
+       if I squashed it.  We were properly putting a blank space at the end
+       of the line but weren't incrementing the pointer correctly.
+       
+       Next Steve Holmes submitted a new script version of speakupconf which
+       will now save speakup settings separately for different synths.  Thank
+       you Steve.
+       
+       And last but by no means least Ameer Armaly has submitted two patches
+       for the default speakup key map the first of which he claims makes the
+       qwerty keyboard map act more closely like the key pad keys.  Secondly
+       he made some changes I requested which now place volume and pitch
+       increment and decrement on keyboard 1234 next to the rate decrement
+       and increment.  We have moved the review and reading punctuation keys
+       up to speakup-f9 through speakup-f12 and move edit xnum to
+       speakup-shift-f5.  Thank you very much for these changes Ameer. (kirk)
+       
+2004-05-11 Tuesday 16:34  kirk
+
+       Adding the new consolemap.c patch for 2.4.x. (kirk)
+       
+2004-05-11 Tuesday 16:32  kirk
+
+       Removing the selection.c patch for 2.4.x and taking the initial patch
+       for consolemap.c. (kirk)
+       
+2004-05-11 Tuesday 16:29  kirk
+
+       Initial check in of the 2.4.x modifications for cut and paste.  I
+       believe this is still broken so try it at your own risk.  My machine
+       has major hardware problems which prevent me getting this working
+       correctly just now.  I'll try again from another machine later. (kirk)
+       
+2004-05-11 Tuesday 14:45  kirk
+
+       Adding the new patch file for consolemap.c which just needed to have a
+       function inverse_translate() exported. (kirk)
+       
+2004-05-11 Tuesday 14:44  kirk
+
+       Checking in the first draft of my cut and paste work around for 2.6.xx
+       kernels.  This will temporarily break 2.4.xx kernels until I get the
+       changes there made.  We are moving to our own selection.c routines
+       which are much smaller than the set_selection in selection.c because
+       we only keep the char-by-char mode and throw away the
+       highlighting. (kirk)
+       
+2004-04-14 Wednesday 16:25  kirk
+
+       Reverted the speakup Makefile change to $V that John Mylchreest
+       requested because it broke 2.4.x compiling.  I need to get more
+       clarification on that because it doesn't look like it should have
+       affected his situation in anycase. (kirk)
+       
+2004-04-06 Tuesday 13:26  kirk
+
+       Fixed the problem with say current word when the reading cursor was
+       past the end of characters on the line.  Fixed the say window problem
+       of only reading half of the line when a say window was hit.  Modified
+       the speakup Makefile by request of John Mylchreest to remove the
+       $(topdir) variable being referenced because it seems to play havock
+       with koutput which Gentoo is using to build objects outside of the
+       tree.  (kirk)
+       
+2004-03-11 Thursday 14:35  kirk
+
+       Checking in the new patch which is needed to make the keyboard
+       responce time changes that Gene checked in last week.  I didn't
+       realize it needed a new patch so his change didn't take. (kirk)
+       
+2004-03-11 Thursday 14:31  kirk
+
+       Have removed the Kconfig patches for architectures alpha and m68k in
+       kernel 2.6.4 because they are using the same Kconfig as is i386 and
+       ppc. (kirk)
+       
+2004-03-10 Wednesday 14:56  kirk
+
+       This is just some clean up of the 2.6.3 kernel tree.  Removed the ppc
+       architecture patch because they are now using the standard
+       drivers/Kconfig which is patched for speakup under the i386
+       architecture.  Editted speakup_drvcommon.c and speakup_keypc.c to
+       clean up some warnings during compile time. (kirk)
+       
+2004-03-06 Saturday 10:55  kirk
+
+       Okay a bit of administrative housekeeping and some small but useful
+       tweaks.  First of all much thanks to Ameer Armaly for finding a work
+       around for 2.6.x kernels to restore keyboard responciveness during the
+       boot sequence.  Thank you to a host of folks that have sent me tweaks
+       for the speakup_apolo driver which I have just gotten around to
+       installing.  I cannot remember all of your names but I know Christer
+       Extrum was one contributor please let me know how you all like the new
+       changes.  I have updated the Todo list after a couple of years.  It was
+       surprising to find how many of the items we had actually
+       accomplished. (kirk)
+       
+2004-03-06 Saturday 01:09  kirk
+
+       Okay, I have updated ChangeLog and patched drivers/char/Makefile to
+       work with 2.4.25.  This is mostly a test to see if the cvs mailing
+       list is once again working or not. (kirk)
+       
+2004-03-05 Friday 16:53  gene
+
+       Patched drivers/Makefile to get early keyboard response at boot.  (Gene)
+       
+2003-12-22 Monday 16:22  kirk
+
+       Finally got get_word() working the way I intended it to.  Considerably
+       simpler code.  Made a number of small modifications to various
+       drivers.  We still have the kernel hang problem when trying to remove
+       modules when both speakup and the drivers are modularized.  I'm not
+       sure what the hell is up with that.  Sort of looks like a timing issue
+       but I can't see how or where. (kirk)
+       
+2003-12-10 Wednesday 11:53  kirk
+
+       Checking in the fixes to drivers/char/Makefile for the 2.4.23 kernel.
+       Hopefully this will still allow earlier 2.4.x kernels to still patch.
+       (kirk)
+       
+2003-12-10 Wednesday 10:29  kirk
+
+       Checking in the initial version of speakup_sftsyn.c a simple device
+       for software synthesizers.  It will create a device /dev/softsynth
+       with major number 10 and minor 26 one higher than our /dev/synth.
+       This is a read only device and can be built as either a module or into
+       the kernel. (kirk)
+       
+       Also fixed a few minor other bugs, the double 'n' on the on/off label
+       which I've fixed at least twice before.  Moved the park clear up a few
+       lines in handle_cursor so that bloody reading cursor is released when
+       a cursor key is hit.  Fixed the kernel oops when unloading speakup as
+       a module with modprobe on the console. (kirk)
+       
+2003-11-27 Thursday 08:41  kirk
+
+       Okay, I'm checking in the probable fix for the mysterious 2.6.xx bleep
+       problem thanks to Jamie Teh.  It seems that somehow two lines have
+       been being removed from keyboard.c when checking in some fix well in
+       the past.  The two lines were:
+       
+                       if (ticks)
+                               mod_timer(&kd_mksound_timer, jiffies + ticks);
+       
+       Would someone running 2.6.0-test? please try this and let us know how
+       it works.  (kirk)
+       
+2003-11-20 Thursday 14:35  gene
+
+       Updated the config help formatting in speakup/Kconfig.  (Gene)
+       
+2003-11-15 Saturday 14:13  david
+
+       the synth struct was incorrectly named and it would not link
+       as a built-in
+       
+2003-11-14 Friday 15:03  kirk
+
+       Fixed Config.in to indicate the three to six character string rather
+       than four to six, thanks to Mario Lang for that.  Also fixed a
+       conflict in Kconfig introduced when Gene checked in his new
+       configuration help information for the 2.6.xx kernels. (kirk)
+       
+2003-11-13 Thursday 16:38  gene
+
+       Wrote configuration help In Kconfig file for 2.6.  (Gene)
+       
+2003-11-13 Thursday 10:51  david
+
+       fixed bad timer set code also cursortrack variable for possibly more
+       types of cursoring in the future.
+       
+2003-11-12 Wednesday 15:53  kirk
+
+       Made the modifications for the Apollo synth in the Configure.help for
+       the 2.4.xx kernels. (kirk)
+       
+2003-11-12 Wednesday 15:41  kirk
+
+       Fixed the problem with the Speakout synth not getting detected on load
+       thanks to Steve Holmes.  I over looked fixing Apolo to Apollo in
+       Config.in thanks to Bill Acker for noticing that.  I still have to fix
+       it in Config.help but I'll do that shortly.  Put fuzzy say_word
+       processing back in when say_word_ctl is not set thanks to John Covici
+       for that one.  I also put cursor tracking on/off back in do to a cast
+       of thousands asking for it.  Mostly at the instigation of Gene
+       Collins.  You'll have to check to see if it actually works Gene.
+       (kirk)
+       
+2003-11-11 Tuesday 09:51  david
+
+       the keynote pc driver off the machine which had the working version, oops!
+       
+2003-11-06 Thursday 14:00  kirk
+
+       These are mostly maintenance fixes.  I added the Keynote Gold PC
+       configuration information to Kconfig.  I edited the keynote driver
+       speakup_keypc.c so it actually compiles.  Someone else will have to
+       test this because I don't have a Keynote Gold PC.  I removed the
+       serial_in functions which were not being used from the
+       speakup_acntsa.c and speakup_bns.c drivers.  I actually finally got
+       around to fixing the Apollo driver and related other code to use
+       apollo with two 'l's like it should have been a long time ago. (kirk)
+       
+2003-11-03 Monday 09:31  david
+
+       fixed a multiplier bug in common so it would do negative multipliers.
+       also added prliminary keynote pc driver.
+       
+2003-11-01 Saturday 17:45  kirk
+
+       I moved the synth_alive setting to true up a number of lines.  The
+       synths which depend on that variable were not receiving their
+       initialization strings because it wasn't set quite early enough.  The
+       speakup_write() returns if synth_alive isn't set and so it wasn't
+       sending out the initialization strings. (kirk)
+       
+       I put a ten millisecond delay back in the probing code for the
+       speakout which I removed when updating last time.  It may be the
+       reason the probe is failing on the Speakouts. (kirk)
+       
+2003-10-28 Tuesday 11:15  david
+
+       fixed volume command for j norton
+       
+2003-10-24 Friday 14:20  david
+
+       the EXPORT-OBJ is now fixed
+       
+2003-10-24 Friday 14:00  david
+
+       ok hopefully keyboard.c and char/Makefile will patch correctly
+       
+2003-10-23 Thursday 10:14  david
+
+       added delay for accent-sa.
+       also fixed bug where if word ended in col-80 and next line had word in col-1
+       next-word key would skip first workd on next line.
+       
+2003-10-20 Monday 09:58  kirk
+
+       Changed patch for architecture i386 from arch/i386/Kconfig to
+       drivers/Kconfig for kernels above 2.6.0-test7.  I suspect this may
+       happen to many of the architecture files over time.  Makes sense
+       really. (kirk)
+       
+2003-10-10 Friday 16:08  kirk
+
+       I have fixed the say_next_word bug which when moving to the next line
+       misses the partial word at the beginning of line caused by a wrap
+       around on the screen.  I have also created a new
+       /proc/speakup/say_word_ctl option to allow a user to set whether they
+       have the old say word behavior or returns space if between words.  The
+       default is the old way although not quite because I still have to fix
+       the way it used to check words.  It will eventually have more control
+       options than just 0 return word or 1 return space on space. (kirk)
+       
+2003-10-08 Wednesday 13:29  kirk
+
+       Temporarily removing the MOD_INC_AND_DEC_USE_COUNT variables for now.
+       I am not sure they are particularly useful. (kirk)
+       
+2003-10-08 Wednesday 11:02  kirk
+
+       Made a couple of syntax changes to speakup_key_help and
+       speakup_acntsa.c.  Also modified the Dectalk PC internal
+       driver. (kirk)
+       
+2003-10-07 Tuesday 21:04  kirk
+
+       Okay, I have modified all of the drivers except the Dectalk PC
+       internal.  People are free to try them and let me know how they do or
+       don't work.  (kirk)
+       
+2003-10-07 Tuesday 16:02  kirk
+
+       This is an experimental check in of speakup which has many changes and
+       fixes and most likely broken bits, in it.  It is dangerous to use this
+       currently and unless you have an Apollo, Transport or LiteTalk it just
+       plain won't work.
+       
+       Now what I have done so far.  Modified synth_request_region to steel
+       the tty's away from the operating system if we're being loaded as a
+       module or modules.  Heavily modified the module sections of the code
+       to work properly under 2.6.x and 2.4.2? hopefully.  Modified three
+       drivers so far to not pretend to be ready and available when they are
+       not.  We get away with it under 2.4.x but not under 2.6.x.  I don't
+       remember what else just now but a lot of changes. (kirk)
+       
+       When this is all finished you will be able to load or unload with
+       either modprobe or echo whichever you prefer.  It will hopefully make
+       it easier for loading modules at boot time.  (kirk)
+       
+2003-09-19 Friday 10:03  kirk
+
+       Just updating the ChangeLog before commensing to break things! (kirk)
+       
+2003-09-19 Friday 10:01  kirk
+
+       Updating the 2.6.0 tree based on 2.6.0-test5 which modified once again
+       how the arch Kconfig's are arranged.  Also including the decpc driver
+       and fixing a Kconfig bug for the Audapter under 2.6.x kernels. (kirk)
+       
+2003-08-18 Monday 13:02  gene
+
+       Reverted from Jul 23 to Jul 16 LiteTalk driver because of a bad port test.  (Gene)
+       
+2003-08-08 Friday 14:15  david
+
+       added punc level 4 for reading of extended characters above ascii 127
+       changed the say/spell word functions so that if not on a word say space
+       instead of dragging to the nearest word, prevented me from hearing
+       collumn misallignments.
+       
+2003-08-02 Saturday 20:56  david
+
+       fixed accent driver, forgot to set synth_alive (cuss cuss)
+       So it use to only talk when you pressed kill oops :-)
+       
+2003-08-01 Friday 16:23  david
+
+       fixed flush and some hanging issues.  Also better board detection.
+       
+2003-07-31 Thursday 11:27  david
+
+       the dec_pc beta driver.  You will also need dec_pc.tgz to init the
+       dec_pc board.  The source for dtload is here.
+       the dec_pc.tgz contains dtload, a Readme and the dec_pc software.
+       
+2003-07-30 Wednesday 14:50  david
+
+       hmmm fixed help?  darn thing didn't even compile.  oops!!
+       
+2003-07-30 Wednesday 14:45  david
+
+       fixed help so it doesn't hang.
+       also removed the synthlist for modules.  this means that new synth
+       can be loaded as modules without re-compiling speakup.
+       It now just looks for a module speakup_(name) with a valid check value
+       in the synth header.
+       
+2003-07-28 Monday 18:48  david
+
+       fixed dec to be more responsive after flush.
+       instead of waiting 100ms, wiat for receive ctl-a
+       from express, signals done flush.
+       
+2003-07-23 Wednesday 14:26  david
+
+       fixed bug in ltlk where if no synth kernel hung
+       waiting for input.  Also made sure other
+       synths could not hang on startup.
+       
+2003-07-22 Tuesday 17:17  kirk
+
+       Checking in the 2.6.x changes to Makefile to support Davids new
+       makemapdata.c and makemapdata.h files. (kirk)
+       
+2003-07-22 Tuesday 15:15  kirk
+
+       Okay, I lied earlier as usual.  This fix works and I know it! (kirk)
+       
+2003-07-22 Tuesday 10:51  kirk
+
+       Hopefully fixed once and for all the copy and paste call to
+       set_selection() for 2.4.x and 2.6.x kernels.  Had to revert to using a
+       silly #if (linux_version_code) macro for a function argument which
+       gets bumped in 2.4.x kernels but is used as is in the 2.6.x
+       tree. (kirk)
+       
+2003-07-21 Monday 08:26  david
+
+       fixed keyhelp so speakup key is not announced twice as in
+       keypad 0, speakup keypad 0
+       the speakup mapping is required so speakup key is processed
+       when speakup bit is set.
+       also genmap now detects two functions mapped to same key combination.
+       
+2003-07-18 Friday 10:08  david
+
+       makemapdata.c creates mapdata.h which is used to
+       build genmap
+       
+2003-07-18 Friday 10:07  david
+
+       split genmap into two programs so includes do not
+       have to be available.
+       makemapdata constructs the tables which genmap uses
+       mapdata.h is compiled into genmap so it can be stand-alone
+       
+2003-07-17 Thursday 16:24  david
+
+       enlarged keytable was causing misread of say attributes,
+       also version #if on inc_mod_use_count was wrong
+       
+2003-07-17 Thursday 09:46  david
+
+       a script to load/save speakup configurations. run as speakupconf load/save
+       as root saves in /etc/speakup, as non-root saves in $HOME/.speakup
+       
+2003-07-17 Thursday 08:09  kirk
+
+       Checked in Kconfig-shared.patch which I forgot to check in yesterday.
+       Removed arch/mips/Kconfig which has been replaced with Kconfig-shared.
+       Fixed copy-and-paste which wasn't working in the 2.5.x and 2.6.x
+       kernel branches.  (kirk)
+       
+2003-07-16 Wednesday 20:50  kirk
+
+       Rechecking in the 2.4.21 changes to speakup.  I have also changed the
+       default punctuation delimeters to none and moved reading punc default
+       back to some. (kirk)
+       
+2003-07-16 Wednesday 17:17  david
+
+       long awaited keymap proc entry. use genmap to create the map.
+       as in genmap personal.map >/proc/speakup/keymap
+       or genmap personal.map >key_save
+       then at startup cat key_save >/proc/speakup/keymap
+       
+2003-07-16 Wednesday 13:51  kirk
+
+       Adding in initial support for Linux version 2.6.x. (kirk)
+       
+2003-07-16 Wednesday 09:07  david
+
+       added a check value to synth structure to validate on init.
+       added synth flags for synth speciffic processing.
+       added synth speciffic code for dectalk to insert a space between
+       puncs and alphas to stop dec from spelling urls etc when punc is not
+       spoken.
+       
+2003-07-15 Tuesday 16:29  david
+
+       added extended numeric processing to do $4.00 correctly.
+       no exnum chars are currently on, edit them is bound to speakup f9
+       
+2003-07-11 Friday 08:43  david
+
+       added a type 2 key echo for always speaking key even if system does not
+       echo, useful for validating visa numbers etc. in forms.
+       
+2003-07-08 Tuesday 08:51  david
+
+       fixed keyboard so works in raw mode and also prev hang bug fix from 2.4
+       
+2003-07-08 Tuesday 08:35  david
+
+       fixed keyboard hang, caused by shift_state pointing at null map
+       and I passed KT_SPKUP instead of KT_SHIFT which caused shift_state to not be computed
+       
+2003-06-26 Thursday 14:32  kirk
+
+       Modified Makefile to handle compiling of genmap and the speakupmap.h
+       dependency correctly once again in the 2.4.x tree.  Also updated
+       ChangeLog because it hasn't been done for a while. (kirk)
+       
+2003-06-26 Thursday 13:43  kirk
+
+       These are mostly changes to try to get the modularization working with
+       the 2.5.x kernel tree.  They may have had an unstablizing affect on
+       the 2.4.x tree so beware.
+       
+       Changes include modifying genmap.c to hopefully work in both the 2.4.x
+       and 2.5.x trees.  This has not yet been tested on the 2.4.x tree
+       although it will be soon.  The reason for it's changes are because the
+       2.4.x kernels 'cd' into each directory and then run Makefile.  In the
+       2.5.x kernels all compiling is run from the tree root.
+       
+       Modified Makefile to also use the 2.5.x Makefile changes and reordered
+       the synth lines alphabetically.
+       
+       Modified a couple of drivers and the module include files to
+       incorporate Tom Stivers module licensing strings which will hopefully
+       stop the tainted kernel messages on module loading.
+       
+       Partially incorporated the modularization code into keyboard.c, vt.c
+       and I'm not sure what other patches.  This is not complete.  Speakup
+       works if built-in but I am getting all sorts of kernel oopses when
+       loading modules.  There's something I don't have quite right just
+       yet. (kirk)
+       
+2003-06-19 Thursday 09:41  kirk
+
+       qUpdated files for 2.4.21 which will require using it.  Files changed are arch/mips/config-share.in, drivers/char/Makefile, drivers/char/keyboard.c and removed the miscdevices.h patch which doesn't appear to be necessary any longer. (kirk)
+       
+2003-06-18 Wednesday 16:29  david
+
+       added module include
+       
+2003-06-17 Tuesday 16:37  david
+
+       fixes to makefiles in speakup and char so it actually builds :-)
+       
+2003-06-16 Monday 16:55  david
+
+       added hopefully all the exported symbols for
+       modular speakup
+       
+2003-06-16 Monday 16:40  david
+
+       added the patch for vt.c to export kd_mksound for spk module
+       
+2003-06-16 Monday 16:38  david
+
+       modularized speakup now works on 2.4.
+       loading any synth with modprobe should load spk.o and start talking
+       
+2003-06-13 Friday 12:43  david
+
+       added key exploring to help so they ident when pressed.
+       also took off the unsigned from the int currcons as
+       fg_console is an int so the called funcs ought to take an int
+       
+2003-06-13 Friday 08:39  kirk
+
+       A couple of small fixes I keep making and forgetting to check in.  Fixed
+       CONFIG_SPEAKUP_APOLO in the Kconfig file.  Placed a space after cap in
+       the caps_start string for the apolo.  I can't remember what else
+       off-hand. (kirk)
+       
+2003-06-12 Thursday 15:48  kirk
+
+       A simple typo fix in ld_help although I like having hell in the middle
+       of help.  (kirk)
+       
+2003-06-12 Thursday 14:39  david
+
+       keyinfo.h is #defines and enum formerly in include/linux/speakup.h
+       these are not kernel specific and might as well be here!
+       
+2003-06-12 Thursday 14:37  david
+
+       moved defines to keyinfo.h and 2.5 task scheduling stuff
+       
+2003-06-12 Thursday 14:30  david
+
+       moved defines for keys to keyinfo.h in speakup directory.
+       version 2.5 scheduling also
+       
+2003-06-12 Thursday 12:07  david
+
+       added speakup_keyhelp.c
+       key help module
+       
+2003-06-12 Thursday 12:05  david
+
+       added a rather nifty key help module currently speakup-f1
+       must do make modules and make modules_install to install it.
+       
+2003-05-30 Friday 13:18  david
+
+       changed special handlers to return int so -1 is error, 0 let system
+       do key, 1 we used the key.
+       also changed read_punc default to 3.
+       also goto can end with another goto press or enter,
+       I prefer enter to do the goto.
+       
+2003-05-30 Friday 09:52  david
+
+       moved the re-enable synth to speech_kill as this is the total speech off
+       also fixed a bug where if speakup_off it was reading when cursor keys pressed
+       
+2003-05-27 Tuesday 21:19  david
+
+       forgot to add speech_kill to speakupmap.map
+       
+2003-05-27 Tuesday 11:20  kirk
+
+       I believe I've fixed the 2.5.x speech output going away.  It was
+       is_cursor never getting set back to zero because of an inverted test
+       in cursor_stop_timer().  Took one hell of a lot of work to hunt it
+       down though.  I also fixed another bug which was passing a u_char in a
+       function header when the calling argument was actually an int, talk
+       about interesting results. (kirk)
+       
+2003-05-23 Friday 11:04  david
+
+       fixed a couple of missing parens in speakup.h and took out double setting
+       of $V in Makefile.  It stays set from first test.
+       
+2003-05-22 Thursday 19:35  kirk
+
+       Okay, doesn't it figure that I couldn't get it right the first time
+       anytime.  Moved the #if linux_version_code test block for the
+       #includes down to get around the voodoo compiler errors.  Also had to
+       remove a line I missed having in a version check #ifdef in
+       speakup_drvcommon.c. (kirk)
+       
+2003-05-22 Thursday 17:21  kirk
+
+       This is the first preliminary check in of the new #if revisions for
+       the 2.4.x and 2.5.x kernels.  The files affected are Makefile,
+       speakup.c, speakup_drvcommon.c and spk_priv.h.  I have also removed
+       the speakupmap section of Kconfig and the char/Makefile related to the
+       speakupmap code.  Hopefully this won't break anything but world peace
+       is probably just around the corner as well. (kirk)
+       
+2003-05-21 Wednesday 16:40  david
+
+       fixed keyboard.h and speakup.h for b2.5 kernels
+       
+2003-05-21 Wednesday 16:21  david
+
+       #ifdef versioned Kirk's changed for 2.5
+       added a version of Terry Cudney's keymap so laptop users will be happy
+       allowed multiple defs of the speakup key currently
+       caps_lock, left_meta and numpad_insert
+       
+2003-05-16 Friday 18:20  kirk
+
+       Okay, I've figured out what's wrong now I have to figure out how to
+       fix it.  Here is a temporary fix though I think.  I'm placing the
+       original 2.4.20 spk_priv.h back in place. (kirk)
+       
+2003-05-16 Friday 18:07  kirk
+
+       To weird, this is 2.4.x being fixed yet again. (kirk)
+       
+2003-05-16 Friday 18:04  kirk
+
+       Okay, trying this once again. this is the 2.5.x tree. (kirk)
+       
+2003-05-16 Friday 17:44  kirk
+
+       This is just getting to weird.  This is another check in of Makefile,
+       speakup.c and speakup_drvcommon.c for the 2.4.20 tree.  These seem to
+       keep getting overwritten when I checkin the 2.5.x tree. (kirk)
+       
+2003-05-16 Friday 16:53  kirk
+
+       cvs add'ing the new spk_priv.h file for 2.5.x. (kirk)
+       
+2003-05-16 Friday 16:51  kirk
+
+       Forgot to checkin a slightly modified spk_priv.h earlier.  It seems
+       the timer_list structure has changed somewhat in 2.5.x kernels.  The
+       member structure list has changed names to entry. (kirk)
+       
+2003-05-16 Friday 15:40  kirk
+
+       Okay, checking the proper 2.4.x Makefile, speakup.c and
+       speakup_drvcommon.c files hopefully. (kirk)
+       
+2003-05-16 Friday 14:57  yue
+
+       Still trying to clean up all of my screw-ups from the original checkin
+       of the 2.5.x material. (kirk)
+       
+2003-05-16 Friday 14:04  yue
+
+       Forgot to add the new patch files in diff-v25. Time to take a break I
+       think. (kirk)
+       
+2003-05-16 Friday 13:20  yue
+
+       Just removing the config.help which isn't needed under v2.5.x any
+       longer. (kirk)
+       
+2003-05-16 Friday 12:43  yue
+
+       This is the first checkin of the new 2.5.x speakup code.  We have
+       created patches against the 2.4.x versions of speakup Makefile,
+       speakup.c speakup_drvcommon.c, as well as adding Kconfig which is the
+       new 2.5.x configuration system. (kirk really Yue)
+       
+2003-05-13 Tuesday 13:05  david
+
+       took out the console announce, added stuff for the soon coming help handler
+       add speakup.o to the objects that export symbols in Makefile
+       
+2003-05-13 Tuesday 10:35  david
+
+       moved the shift check in speakup_key so the spk key can be one
+       of the shift/ctrl/alts if someone wants that.
+       added announcement when switching consoles.
+       added flag to stop multiple misc_register from being done,
+       crashed kernel if called more than once.
+       
+2003-05-13 Tuesday 09:51  kirk
+
+       Okay, I fucked things up big time when I cleaned up the Makefile last
+       night.  I kinda cleaned up to much.  I think it's all better
+       now. (kirk)
+       
+2003-05-12 Monday 21:48  kirk
+
+       Fixed a couple of typos in checkout.  BTW, everyone needs a new
+       checkout script. (kirk)
+       
+2003-05-12 Monday 21:35  kirk
+
+       Turning on the --silent flag in patch. (kirk)
+       
+2003-05-12 Monday 21:28  kirk
+
+       Adding in the new patch files in diff-v24. (kirk)
+       
+2003-05-12 Monday 21:05  kirk
+
+       Cleaning up the speakup Makefile and about to destroy checkin and
+       checkout.  Hopefully not for long.  I, if successful, am modifying the
+       files in diff-vxx to be relative to the root dir which is the top
+       directory of the kernel tree.  Checkout will first look for a command
+       line argument pointing to the kernel tree.  If none is given it will
+       check for the existence of a kernel and Documentation directory in the
+       current directory and if found will determine that it is in the root
+       directory and set ROOTDIR accordingly. if not we will fall back to
+       assuming the tree is in /usr/src/linux. (kirk)
+       
+2003-05-12 Monday 19:36  david
+
+       fixed edit punc/delim/repeats to allow shift.
+       Also allow alpha in delim/repeats
+       
+2003-05-12 Monday 17:20  david
+
+       added the shift states to thespeakup internam key_buf
+       required for help, coming soon.
+       also extened key_max to 128 so windows keys could be used.
+       
+2003-05-12 Monday 11:38  david
+
+       added more info to the keymap, also finished spk key now defineable.
+       added it to map as KEY_KP0.  genmap just puts out numbers to speakupmap.h now.
+       working towards /proc/speakup/keymap loading.
+       using genmap to generate the proc stuff as well as the built-in map.
+       added error checking to set_key_info as well as pass in the buffer so we could
+       have console speciffic keymaps if we want too at a later time.
+       
+2003-05-10 Saturday 18:36  david
+
+       in the second call to speakup_key keysym was uninitialized and could have
+       inadvertantly called one of the handlers with bad data.
+       
+2003-05-10 Saturday 14:45  david
+
+       I put the fix in for keyboard.c so if no map speakup_key will
+       still be called.  also the = in genmap.c
+       
+2003-05-10 Saturday 13:33  kirk
+
+       Okay, added an equal sign to the output loop condition in genmap.c
+       which was causing the speakupmap.h to be cut-off one entry to soon.
+       Removed a 'l' from the word coll in say_position() which was causing
+       some synths the Audapter in particular to mispronounce it.  Removed
+       symbols.h because it appears we do not need it any longer.  (kirk)
+       
+2003-05-10 Saturday 00:00  david
+
+       fixed a tolower bug in genmap.c as you can't downshift a quoted string.
+       also some module unloading code in speakup.c to restore the key_handlers.
+       Still more module stuff to be done.
+       
+2003-05-09 Friday 15:17  david
+
+       spk_con_module.h is include by ../console.c when speakup
+       is configured as a module.
+       
+2003-05-09 Friday 15:16  david
+
+       the new mappings generated from speakupmap.map
+       
+2003-05-09 Friday 15:15  david
+
+       now speakupmap.h is included in speakup to provide mappings
+       
+2003-05-09 Friday 15:13  david
+
+       changed genmap and speakupmap.map to be the new style of keymaps
+       key names are now from include/linux/input.h
+       no special default keymap anymore, speakup mappings are done in speakup itself.
+       many changes in speakup.c also for local keymapping and more moving towards being able to be a
+       module.  the speakup key numpad 0 is currently hardcoded but may change soon.
+       the modifiers currently supported are shift, ctrl, alt, altgr, spk and double
+       the double press keys can now be anything which has a single press map.
+       Warning: this is relatively untested code and may not be extremely stable
+       although it has not crashed for me.
+       
+2003-05-07 Wednesday 13:14  david
+
+       more moving to a module version.  fixed init so is module callable by moving
+       the code into speakup_open accept the initial alloc then module can alloc first console
+       and call open.  Also changed KT_SPKUP to 14 so if null synth they will
+       be ignored.
+       
+2003-05-05 Monday 09:56  kirk
+
+       Starting the trashing of 2.2.x kernel support.  We are moving toward
+       2.4.x and 2.5.x. (kirk)
+       
+2003-05-05 Monday 09:46  david
+
+       start of modularizing speakup.
+       also fixed char/Makefile so in no speakup default keymap the kernel still
+       compiles. changed parms to speakup_key for mapping of speakup keys in speakup
+       itself to support 2.5 kernels.
+       
+2003-05-03 Saturday 19:29  kirk
+
+       Fixed bug in say_next_word which caused skipping over the entire next
+       word if you were on the space just before the word. (kirk)
+       
+2003-05-02 Friday 20:10  kirk
+
+       Moved spk_register_dev() into proc_init() and removed the main.c patch
+       to do the registration.  That should fix the devfs hang problem.  Also
+       took the \r out of the synth_interrogate() function in
+       speakup_ltlk.c. (kirk)
+       
+2003-05-02 Friday 18:43  kirk
+
+       Fixed the problem with writing back to a string file in /proc/speakup
+       by surrounding the string in quotes and prepending a \x before
+       unprintable characters.  I think it's a bit of a kludge so if anyone
+       sees a more elligant solution to the problem please invoke
+       same. (kirk)
+       
+2003-05-02 Friday 12:01  kirk
+
+       Now that I've added the ChangeLog, maybe just maybe I should make sure
+       it's up to date. (kirk)
+       
+2003-05-02 Friday 11:56  kirk
+
+       Adding the correct tome offset from Steve Homes for the Speak Out
+       driver.  Also adding the ChangeLog which I thought was already part of
+       it. Go figure. (kirk)
+       
+2003-05-01 Thursday 10:52  david
+
+       fixed a bug in phonetic char and also have it prefix digits with number.
+       
+2003-04-30 Wednesday 22:33  david
+
+       try to get the cvs to eat my tab mod in console.c so tabbed
+       columns read properly
+       
+2003-04-30 Wednesday 22:27  david
+
+       fixed a bug where punctuation allowed to synth when punct is off said
+       nothing but could announce repeats.
+       also suppress multiples so repeats don't give long pauses.
+       added a write of a space in the console for a tab so tabbed columns
+       read properly not run together.
+       
+2003-04-30 Wednesday 19:14  kirk
+
+       I've put a test in synth_interrogate() to break from the rom version
+       loop if i gets larger than 48.  I'm trying to find out what could
+       cause some ltlks to hang the system. (kirk)
+       
+2003-04-30 Wednesday 17:02  kirk
+
+       Just checking in the latest cvs logs.  We have been remiss in keeping
+       on top of it..  (kirk)
+       
+2003-04-30 Wednesday 14:29  david
+
+       forgot to append a space in speak_char, kind of sounds funny!
+       
+2003-04-30 Wednesday 14:21  david
+
+       fixed one line windows, forgot to set bottom.
+       also some optimization in synth_start and spkup_write.
+       took the ex_num handling for now as it was buggy
+       
+2003-04-30 Wednesday 12:35  kirk
+
+       Changed speakup_ltlk.c to support the newer chip set needing a \r the
+       interrogate command.  This now works with the TrippleTalk serial ports
+       on the usb synths as well. (Kirk)
+       
+2003-04-29 Tuesday 08:43  kirk
+
+       Fix synth detection string in speakup_audptr.c from "0x05[q" to
+       "\x05[q". (kirk)
+       
+2003-04-28 Monday 12:24  david
+
+       fixed chars_write_proc a rather silly bug, well two of them,
+       a bad optimization, and cnt was not zero when going back to get_more
+       
+2003-04-25 Friday 15:35  david
+
+       fixed get_word so if on a space before a word, advances one char.
+       Also an odd bug insay_word where multiple words of one char the same would get counted
+       as repeats, append a space to the word to stop this behaviour.
+       
+2003-04-24 Thursday 15:32  david
+
+       speakup.h in include/linux needs updating
+       
+2003-04-24 Thursday 13:40  david
+
+       fixed the rate and voice keys in the map I got caught by cut and paste
+       
+2003-04-24 Thursday 13:28  kirk
+
+       Fixed lock_status[] array to remove the second 'n' in on.  Rewrote the
+       probe routine for the Transport driver to get a more reliable probing
+       on module loads. (kirk)
+       
+2003-04-24 Thursday 12:09  david
+
+       added reading level punctuation on speakup 3-4 top row numbers, moved rate to speakup 5-6
+       and voice change on speakup 7-8 top row numbers
+       also took out the __init declarations on places that may be called
+       more than once such as synth init/probe code
+       
+2003-04-23 Wednesday 21:03  kirk
+
+       A small modification to the top_edge() function to try to correct the
+       move to top of screen problem. (kirk)
+       
+2003-04-23 Wednesday 20:14  david
+
+       fixed a bug where numlock also made cursor keys numeric
+       was passing scancode to speakup_key not the translated keycode.
+       also makes numeric + and / work too!
+       
+2003-04-23 Wednesday 13:53  david
+
+       fix to mod_code that should fix the null pointer problem
+       If a module was installed wile another synth was active the wrong pointer
+       was updated
+       
+2003-04-22 Tuesday 22:13  david
+
+       fixed prev and next word so they stop on lines containing only delimiters
+       hopefully right this time.
+       
+2003-04-22 Tuesday 11:16  david
+
+       turn off temp park on type KT_SPEC keys such as enter, locks etc.
+       
+2003-04-22 Tuesday 11:06  david
+
+       added window which can be set, cleared, silenced or read,
+       currently bound to speakup with f1-f4 respectively
+       added keyboard editing of punc/delimiter/repeat chars.
+       currently mapped as follows:
+       speakup f5, edit some.  speakup f6, edit most.
+       speakup f7, edit delimiters. speakup f8, edit repeats.
+       also touched initial rates in dectlk, decext, dtlk and ltlk synth files.
+       
+2003-04-21 Monday 14:03  kirk
+
+       I've fixed a character misplacement in speakup_decext.c in serprobe().
+       I hope this fixes Genes problem. (kirk)
+       
+2003-04-21 Monday 12:35  kirk
+
+       Just changing grave to accent again in the characters array.  This is
+       really a test to see how cvs logging to a mailing list works. (kirk)
+       
+2003-04-21 Monday 12:28  kirk
+
+       Just changing grave to accent again in the characters array.  This is
+       really a test to see how cvs logging to a mailing list works. (kirk)
+       
+2003-04-18 Friday 15:44  david
+
+       fixed open brace  function begins, added numlock on gives numbers, fixed bugs in next/prev word
+       bleeps for attrib and bleep now do: 0 nothing, 1 beep, 2 announce, 3 both
+       changed speakup_reset to speakup_key, better name.
+       changed temperary park so it goes on only you move the review cursor.
+       i.e. prev/next char, word, line, edges, first/last char.
+       
+2003-04-16 Wednesday 14:04  kirk
+
+       I've changed speakupmap.map keycode 14 back to Delete from Backspace.
+       Thank you David for finding that.  I've also changed the grave accent
+       key back to accent from grave which I'm afraid blends into strings to
+       well. (kirk)
+       
+2003-04-14 Monday 16:32  kirk
+
+       I forgot to #include "cvsversion.h" in the last check in.  This also
+       has David's new speakup_reset() function.  I haven't tested it
+       yet. (kirk)
+       
+2003-04-14 Monday 14:37  kirk
+
+       Okay, this is the first check in of Dave Borowski's major revisions to
+       speakup.  It includes automagic cursor tracking, synth driver
+       modularization a whole bunch of rewritten code and a whack of new bugs
+       as well.  This is very unstable currently, use at your own
+       risk. (kirk)
+       
+2003-03-18 Tuesday 16:11  kirk
+
+       Put a key definition into speakupmap.map for ShiftR keycode 55 which I
+       forgot to include when I was modifying how the map worked.  This
+       restores the speakup go to column and row with the insert cursoring
+       mode. (kirk)
+       
+2002-12-13 Friday 20:15  kirk
+
+       Okay, to fix the problem when there is no speakup map loaded and
+       numlock is turned on, I've renamed all altgr modifiers to Shiftr which
+       is not used.  I also changed the key check in speakup_control to the
+       shiftr code.  As far as I can tell this fixes the problem.  I had to
+       define the keymaps = line to include the 32 weight for the shiftr
+       key. (kirk)
+       
+2002-08-15 Thursday 20:00  gene
+
+       Fix multiple quick_quiet definition for 2.2.x (Gene)
+       
+2002-08-07 Wednesday 14:10  kirk
+
+       Stupid me forgot to remove a plus sign.  Sorry about that folks. (kirk)
+       
+2002-08-07 Wednesday 12:27  kirk
+
+       Just fixing the miscdev.h /dev/synth entry which was rejected because a new line added to the file. (kirk)
+       
+2002-07-05 Friday 21:52  gene
+
+       fixed 2.2.x numlock 0 bug (Gene)
+       
+2002-07-05 Friday 14:01  kirk
+
+       Checking numlock keyboard enter '0' fix for 2.4.18 in keyboard.c
+       (kirk)
+       
+2002-07-05 Friday 13:51  kirk
+
+       Added in David Borowski's patches with takes speakupmap.map with text
+       strings representing the functions and converts them to their hex
+       string values usable by loadkeys.  This patch affects Makefile in
+       speakup, speakupmap.map and a new file genmap.c.  (kirk)
+       
+       Fixed the bug which placed a '0' on the command line when hitting
+       'enter' with numlock mode on.  Speakup_control() was being called from
+       do_spec() with a bad value. (kirk)
+       
+2002-06-14 Friday 15:55  gene
+
+       Edited drivers/char/Makefile to elimate multiple keymap definition problem (Gene)
+       
+2002-06-13 Thursday 17:43  kirk
+
+       Removed the speakup/Makefile patch I added last week because I found a
+       cleaner way to handle the make build variable changes. (kirk)
+       
+2002-06-13 Thursday 10:21  jim
+
+       /usr/src/linux/drivers/char/Makefile:
+           truncated line to read:
+           KEYMAP =
+       (jim)
+       
+2002-06-11 Tuesday 14:24  kirk
+
+       Once again fixing changes to drivers/char/Makefile and speakup/Makefile.  I think this will work better and more cleanly now. (kirk)
+       
+2002-06-10 Monday 13:58  kirk
+
+       Trying to fix speakup/Makefile so it is the original once again. (kirk)
+       
+2002-06-04 Tuesday 15:00  kirk
+
+       Adding the new speakup/Makefile.patch to the cvs repository. (kirk)
+       
+2002-06-04 Tuesday 14:57  kirk
+
+       Modified drivers/charMakefile to fix rejected speakup patch.  I also
+       had to modify speakup/Makefile to use export-objs instead of O_OBJECTS
+       which was causing multiple symbol definitions from
+       speakupmap.o. (kirk)
+       
+2002-04-30 Tuesday 13:25  kirk
+
+       Updating speakup to 2.5.11 and fixing ppc architecture patch.  Also
+       included the move to end of line function from 2.4.x and 2.2.x trees.
+       (kirk)
+       
+2002-04-11 Thursday 09:31  gene
+
+       Checked in nr_speakup changes for 2.2.x to fix load keys problem (Gene)
+       
+2002-04-10 Wednesday 14:30  kirk
+
+       Changed NR_SPKUP to 0x2a in keyboard.h which was causing an unable to
+       bind error when leading speakupmap.map with loadkeys in 2.4.x
+       kernels with the new control-kp1 key. (kirk)
+       ----------------------------------------------------------------------
+       speakupmap.map CVS:
+       diff-v24/^usr^src^linux^Documentation^Configure.help.patch CVS:
+       diff-v24/^usr^src^linux^Documentation^speakup^DefaultKeyAssignments.copy
+       diff-v24/^usr^src^linux^Documentation^speakup^keymap-tutorial.copy
+       diff-v24/^usr^src^linux^arch^alpha^config.in.patch CVS:
+       diff-v24/^usr^src^linux^arch^arm^config.in.patch CVS:
+       diff-v24/^usr^src^linux^arch^i386^config.in.patch CVS:
+       diff-v24/^usr^src^linux^arch^m68k^config.in.patch CVS:
+       diff-v24/^usr^src^linux^arch^mips^config.in.patch CVS:
+       diff-v24/^usr^src^linux^arch^ppc^config.in.patch CVS:
+       diff-v24/^usr^src^linux^arch^sparc64^config.in.patch CVS:
+       diff-v24/^usr^src^linux^arch^sparc^config.in.patch CVS:
+       diff-v24/^usr^src^linux^drivers^char^Makefile.patch CVS:
+       diff-v24/^usr^src^linux^drivers^char^console.c.patch CVS:
+       diff-v24/^usr^src^linux^drivers^char^keyboard.c.patch CVS:
+       diff-v24/^usr^src^linux^drivers^char^selection.c.patch CVS:
+       diff-v24/^usr^src^linux^fs^proc^root.c.patch CVS:
+       diff-v24/^usr^src^linux^include^linux^keyboard.h.patch CVS:
+       diff-v24/^usr^src^linux^include^linux^miscdevice.h.patch CVS:
+       diff-v24/^usr^src^linux^include^linux^proc_fs.h.patch CVS:
+       diff-v24/^usr^src^linux^include^linux^speakup.h.copy CVS:
+       diff-v24/^usr^src^linux^init^main.c.patch CVS:
+       ----------------------------------------------------------------------
+       
+2002-04-04 Thursday 11:33  gene
+
+       Updated DefaultKeyAssignments for 2.2.x kernels - Gene Collins
+       
+2002-04-02 Tuesday 12:27  kirk
+
+       Editted defaultKeyAssignments to reflect the new key combination
+       control keypad 1 for move to last character on line.  (kirk)
+       
+2002-04-02 Tuesday 10:45  kirk
+
+       Added new function end_of_line() to move the reading cursor to the
+       last character on the current line. (kirk)
+       
+2002-03-27 Wednesday 10:44  kirk
+
+       Have modified speakup_shut_off() or whatever it's called to not sync
+       the reading cursor to the actual cursor when temporarily shutting off
+       speakup.  It was a request from Geoff Shang and others. (kirk)
+       
+       I cleaned up the Todo file to remove recent changes in features.
+       (kirk)
+       
+2002-03-03 Sunday 22:32  kirk
+
+       Checking in changes for 2.4.18 which stop the two patch hunks from
+       failing on keyboard.c.  As far as I can tell they are format changes
+       which don't have anything to do with speakup directly. (kirk)
+       
+2002-02-19 Tuesday 11:12  kirk
+
+       Checking in modifications to linux/init/main.c for 2.5.5pre1.  I still
+       need to find a better place for that patch; it is very out of place
+       there now. (kirk)
+       
+2002-02-05 Tuesday 22:31  gene
+
+       
+       Updated 2.2 tree with  the new numlock handling code.  (Gene)
+       
+2002-02-05 Tuesday 20:22  kirk
+
+       Removed some duplicate #include lines in speakup.c (kirk)
+       
+2002-02-05 Tuesday 11:15  kirk
+
+       Made the changes to move numlock checking code out of keyboard.c into
+       speakup_control() in the 2.4.x tree. (kirk)
+       
+2002-02-05 Tuesday 11:01  kirk
+
+       Moved the numlock checking code into speakup_control() where it
+       belongs and out of keyboard.c in the 2.5.x tree. (kirk)
+       
+2002-02-04 Monday 15:18  kirk
+
+       Just adding the new Config.help copy file into cvs. (kirk)
+       
+2002-02-04 Monday 15:16  kirk
+
+       Modified speakup to work with linux 2.5.3 which intailed changing the
+       patch for linux/init/main.c and creating Config.help for the speakup
+       directory instead of the linuxDocumentation/Configure.help.  The help
+       for each subdirectory is now maintained within that directory.
+       
+       Also hand patched keyboard.c to be compatible with the numlock changes
+       to the 2.4.x tree.  Just dropped speakup.h from that distribution in
+       place it hasn't changed much yet. (Kirk)
+       
+2002-01-25 Friday 10:48  gene
+
+       
+       Updated 2.2 tree to work with new keypad numlock layout (Gene)
+       
+2002-01-20 Sunday 17:46  kirk
+
+       I've changed the #define's for TOP_EDGE, LEFT_EDGE and RIGHT_EDGE from
+       0x4[def] which are out of range for nr speakup keys to values in
+       range.  I hope this fixes the problem without breaking something
+       else. (kirk)
+       
+2002-01-20 Sunday 16:13  kirk
+
+       Removed a few double tab chars before altgr keycodes 71 and 73.
+       Hopefully this will correct the key binding problem when loading
+       speakupmap.map with loadkeys. (kirk)
+       
+2002-01-11 Friday 14:43  gene
+
+       
+       Checked in numlock feature for the 2.2 tree.  (Gene)
+       
+2002-01-11 Friday 11:11  kirk
+
+       Modified the Apollo driver to allow chars above 0x80 through as an
+       experiment to see if foreign languages using those upper characters
+       will work correctly. (kirk)
+       
+2002-01-10 Thursday 16:37  kirk
+
+       Woops!  Some how we lost cut and paste in our upgrades to numlock
+       control.  Wouldn't that just make everyone happy! (kirk)
+       
+2002-01-10 Thursday 15:41  kirk
+
+       Checking in speakup.h again for the 2.4.x tree, it didn't take. (Kirk)
+       
+2002-01-09 Wednesday 17:54  kirk
+
+       For some reason speakup.h didn't get updated this morning.  Should be
+       okay now. (kirk)
+       
+2002-01-09 Wednesday 09:58  kirk
+
+       Woops, the correct keyboard.c didn't get checked in. (kirk)
+       
+2002-01-09 Wednesday 08:16  kirk
+
+       Added numlock feature to allow the keypad to act as a normal number
+       pad when the numlock is on. (Yue)
+       
+2001-12-21 Friday 10:49  kirk
+
+       Just checking in for kernel 2.5.1 to stay sync'd with the code. (kirk)
+       
+2001-12-07 Friday 11:55  kirk
+
+       Updating speakup for kernel 2.5.1pre6.  Seems to be something weird
+       going on.  I think I'll have to edit some of the patches by
+       hand. (kirk)
+       
+2001-12-05 Wednesday 14:33  kirk
+
+       Cleaned up speakup.h and speakup.c which were giving warnings during
+       compile and moved stuff around to compile with 2.5.1pre5. (kirk)
+       
+2001-11-23 Friday 14:44  kirk
+
+       Hmmm, something went wrong with the first attempt at adding the
+       diff-v25 directory tree, so we're trying again. (kirk)
+       
+2001-11-23 Friday 09:45  kirk
+
+       Checking in changes to speakup.c to have the system bleep when a shift key is hit while the caps lock is on.  (Yue)
+       
+2001-11-23 Friday 09:41  kirk
+
+       Opening a new branch of speakup for the new version 2.5.0 of
+       linux. (Kirk)
+       
+2001-11-13 Tuesday 13:36  jim
+
+       speakup.c:
+           Fixed the mixed case pitching bug.
+           The speech rates for upper and lower case chars when spelling a word
+           should now be the same.
+       (Jim Danley)
+       
+2001-10-26 Friday 21:38  jim
+
+       Fixed /usr/src/linux/drivers/char/Makefile patch to work with kernels
+       2.4.12 and 2.4.13
+       (Jim)
+       
+2001-10-18 Thursday 08:53  jim
+
+       Removed the cut and paste bug description from the BUGS file.  (Jim)
+       
+2001-10-14 Sunday 15:28  jim
+
+       Part two of the selection.c patch for 2.2.  This process sure was fun!  (Jim)
+       
+2001-10-14 Sunday 15:21  jim
+
+       Just adding the new patch file for selection.c in the diff-v22 patch
+       directory. (Jim)
+       
+2001-10-14 Sunday 14:45  kirk
+
+       Just adding the new patch file for selection.c in the diff-v24 patch
+       directory. (kirk)
+       
+2001-10-14 Sunday 14:42  kirk
+
+       Changed selection.c to test if call is coming from userspace or kernel
+       space and using GFP_ATOMIC if it is being called from kernel-space.
+       This works around kmalloc not returning and hanging the system in
+       set_selection for the block and paste function of speakup. (Jim)
+       
+2001-10-12 Friday 12:10  jim
+
+       speakup.c:
+           Removed statements which were appending 0x00 to buffers to be spoken
+           from functions say_curr_line and say_line_from_to.
+       
+           Inspected and modified all spkup_write() calls to be consistent,
+           that is, end in \n and count is correct.
+       (Jim Danley)
+       
+2001-10-09 Tuesday 08:34  kirk
+
+       Updated the BUGS and Todo list to reflect current speakup
+       states. (kirk)
+       
+2001-10-07 Sunday 21:19  jim
+
+       speakup.c:
+           Moved following variable declarations to top of function speakup_cut().
+               int ret;
+               unsigned char args[6*sizeof(short)];
+               unsigned short *arg;
+               static char *buf = "speakup_cut: set_selection failed: ";
+       (Jim Danley)
+       
+2001-10-07 Sunday 17:11  jim
+
+       Put speakup_dectlk.c back to its original state.  Sorry about that!
+       
+       Also added a clear_selection() call to speakup.c when hitting the "mark"
+           key to remove (if any) hi-lighting of a previous mark/cut from the screen.
+       (Jim Danley)
+       
+2001-10-05 Friday 09:14  kirk
+
+       Checking in a slight change to speakupmap.map to uncomment alt-keypad
+       five to allow ascii five for extended character sets. (kirk)
+       
+2001-10-02 Tuesday 12:34  kirk
+
+       Modified installation and readme files for the version 1.0 release in
+       linux/Documentation/speakup. (kirk)
+       
+2001-10-02 Tuesday 11:00  kirk
+
+       Start of the check-ins for the official speakup v-1.00 release.
+       Modified checkin to change cvsversion format.  Modified install to
+       remove reference to touching speakupmap.map.  Modified speakup.c to
+       reflect version now moved to v-1.00. (kirk)
+       
+2001-10-02 Tuesday 01:18  jim
+
+       Modified the way that cut/paste variables are stored.  No longer in spk_t
+       structure but stand-alone (one per speakup rather than one per console).
+       
+       speakup.c:
+           eliminated unsigned short mode = 0; /* char-by-char selection */
+           by assigning it directly.
+       
+           Added globals
+               char mark_cut_flag;
+               unsigned short mark_x, mark_y;
+       
+       /usr/include/linux/include/linux/speakup.h:
+           removed mark_x and mark_y from the spk_t structure and the associated
+           defines.
+       (Jim Danley)
+       
+2001-09-17 Monday 19:58  jim
+
+       speakup.c:
+           Added:
+               #define Mark_Cut_Bit 0x04
+               #define Mark_Cut_Bit_Mask 0xFB
+       
+           Changed from using bit 2 of spk_shut_up to bit 2 of spk_sound to
+           indicate mark/cut state.
+       
+           Removed statement that was assigning 2 to second byte of first short
+           in args array.
+       (Jim Danley)
+       
+2001-09-14 Friday 15:43  kirk
+
+       Removed the blank line at the bottom of drivers/char/Makefile which I
+       must have dreamed I removed in the last log.  (kirk)
+       
+2001-09-14 Friday 15:28  kirk
+
+       Added a couple of missing key definitions in DefaultKeyAssignments.
+       Removed the blank line at the bottom of drivers/char/Makefile.
+       Rewrote spell_word() to use say_curr_char() and super stream line
+       it. (kirk)
+       
+2001-09-14 Friday 14:11  jim
+
+       speakup_dectlk.c:
+           Changed the valid pitch range from 0-99 to 50-350.
+       (Jim Danley)
+       
+2001-09-14 Friday 01:28  jim
+
+       Made similar changes to add cut and paste feature to 2.2 kernels.  (Jim Danley
+       
+2001-09-13 Thursday 23:13  jim
+
+       diff-v2[24]/^usr^src^linux^Documentation^speakup^DefaultKeyAssignments.copy:
+           Added:
+               KeyPad-/                Mark and Cut screen region.
+               InsKeyPad-/             Paste screen region into any console.
+       (Jim Danley)
+       
+2001-09-13 Thursday 21:41  jim
+
+       Wrote mark/cut/paste feature.
+       
+           Usage:
+               1.  Move reading cursor to one end of the block of text you wish to cut
+               2.  Press the mark/cut key.  You should hear "mark".
+               3.  Move reading cursor to other end of block of text to be cut.
+               4.  Press the mark/cut key.  You should hear "cut".
+               5.  The cut buffer is now saved.
+               6.  Move to a program in any console where you wish to copy the cut buffer.
+               7.  Press the paste key.  You should hear "paste" and text from
+                   the cut buffer will be output just as if you had entered it
+                   at the keyboard.
+       
+           Note:  Trailing whitespace is stripped and newlines added where appropriate.
+       
+       speakup.c:
+           Added two new functions; speakup_cut() and speakup_paste()
+       
+       speakupmap.map:
+           Modified default keymap so that keypad divide toggles mark/cut and
+           insert-keypad divide is paste.
+       
+       /usr/src/linux/include/linux/speakup.h:
+           Added two new variables to the spk_t structure; unsigned long mark_x, mark_y
+               to store the coordinates of the beginning of the mark area to be cut.
+           Added:
+               #define spk_mx speakup_console[currcons]->mark_x
+               #define spk_my speakup_console[currcons]->mark_y
+               #define SPEAKUP_CUT 0x27
+               #define SPEAKUP_PASTE 0x28
+           Added two new prototypes:
+               extern void speakup_cut(unsigned int, struct tty_struct *);
+               extern void speakup_paste(struct tty_struct *);
+       
+       /usr/src/linux/drivers/char/keyboard.c:
+           In function do_spkup():
+               Added case blocks for SPEAKUP_CUT and SPEAKUP_PASTE.
+       
+       /usr/src/linux/include/linux/keyboard.h:
+           Added:
+               #define K_SPEAKUP_CUT K(KT_SPKUP,SPEAKUP_CUT)
+               #define K_SPEAKUP_PASTE K(KT_SPKUP,SPEAKUP_PASTE)
+           and modified: (was 27)
+               #define NR_SPKUP        0x29
+       
+       Also modified patch/copy files below in both diff-v22 and diff-v24 directories.
+       ^usr^src^linux^include^linux^keyboard.h.patch
+       ^usr^src^linux^drivers^char^keyboard.c.patch
+       ^usr^src^linux^include^linux^speakup.h.copy
+       
+2001-09-08 Saturday 22:22  kirk
+
+       Re-implementing the alpha patch for kernels 2.4.x which somehow keeps
+       getting lost.  I also removed the bottom three lines of the checkout
+       script which are not needed anymore because we include a
+       speakupmap.c. (Kirk)
+       
+2001-08-30 Thursday 17:25  kirk
+
+       Modified drivers/char/Makefile to work with the new speakupmap.c
+       changes to 2.4.x.  These changes include a portion of Shane's patch as
+       well as other rewrites by me. (kirk)
+       
+2001-08-30 Thursday 16:17  kirk
+
+       Modified drivers/char/Makefile and speakup/Makefile to accomodate the
+       new 2.4.9ac3 Makefile changes.  This will also include a new
+       speakupmap.c moving towards Shane's Makefile patches for the 2.2.x
+       kernels, not included yet. (kirk)
+       
+2001-08-29 Wednesday 21:26  kirk
+
+       Just adding new patch against linux/init/main.c to cvs. (kirk)
+       
+2001-08-29 Wednesday 21:23  kirk
+
+       Rewrote speakup_init() to call a function speakup_register_devsynth()
+       which gets called from do_basic_setup in init/main.c.  We need to do
+       this so that miscdevice will get called after the mm has been set up.
+       This should allow devfs to work with speakup.  (kirk)
+       
+2001-08-26 Sunday 13:54  kirk
+
+       Removed an old comment line from console.c which prevent clean
+       patching against 2.4.8ac11. (kirk)
+       
+2001-08-25 Saturday 18:46  kirk
+
+       Modified keyboard.c, keyboard.h, speakup.c and speakup.h to conform with the standard kernel source tree under 2.4.x kernels. (Kirk)
+       
+2001-08-25 Saturday 18:30  kirk
+
+       Removing lxdialog patch files and removing their entries from
+       patchlist-22. These are now part of the standard 2.2.19+ kernel
+       tree. (Kirk)
+       ----------------------------------------------------------------------
+       patchlist-v22 speakupmap.map symbols.h CVS:
+       diff-v22/^usr^src^linux^Documentation^speakup^DefaultKeyAssignments.copy
+       diff-v22/^usr^src^linux^Documentation^speakup^keymap-tutorial.copy
+       Removed Files: CVS:
+       diff-v22/^usr^src^linux^scripts^lxdialog^menubox.c.patch CVS:
+       ----------------------------------------------------------------------
+       
+2001-08-25 Saturday 18:15  kirk
+
+       Changed keyboard.c, keyboard.h, speakup.c and speakup.h to conform to
+       the standard linux kernel tree code style for the 2.2.x
+       kernels. (Kirk)
+       
+2001-08-18 Saturday 03:31  jim
+
+       diff-v22/^usr^src^linux^drivers^char^keyboard.c.patch:  Modified patch
+       to allow raw keyboard for version 2.2 kernels.  (Jim Danley)
+       
+2001-08-02 Thursday 13:47  kirk
+
+       Adding \x20 to the flush string for the Audapter synths.  (Kirk)
+       
+2001-07-31 Tuesday 19:07  jim
+
+       speakup_ltlk.c: appended \x20 to flush string of \x18 for litetalk driver.
+       This seems to fix the bug that was causing first chars to be dropped by
+       the double lt and litetalk synths for some users.  (Jim Danley)
+       
+2001-07-26 Thursday 20:12  kirk
+
+       A few small clean ups trying to get 2.4.7 to work. (Kirk)
+       
+2001-07-16 Monday 11:30  kirk
+
+       Added KT_SPKUP to allowed_in_raw_mode macro so speakup's review
+       functions are available in raw mode for v-2.4.x kernels. (Kirk)
+       
+2001-03-17 Saturday 15:40  jim
+
+       speakup.c:
+       Added silent feature.
+       The print screen key kills and revives speakup.  Sending specific values to
+       /proc/speakup/silent now allows the same control without having to press a key.
+       Valid settings are 0 through 3.
+       0 and 2 turn on speakup if not already alive.
+       1 and 3 turn off speakup if not already killed.
+       0 and 1 announce the changes as the print screen key does,
+       2 and 3 act silently.
+       (Jim Danley)
+       
+2001-03-17 Saturday 08:45  jim
+
+       speakup.c and symbols.h:
+       Added bell position feature.
+       When a letter is typed in column bell_pos, console beeps.
+       Valid settings are 0 through video_num_columns.  Zero disables.
+       Get/set via /proc/speakup/bell_pos.
+       (Brian Borowski)
+       
+2001-03-13 Tuesday 14:50  jim
+
+       speakup.c:
+       Added code in say_screen() to insert a space at the end of full lines.
+       (Gene Collins)
+       
+2001-03-13 Tuesday 14:40  jim
+
+       speakup.c:
+       Found and fixed a couple of places where synth_write() was writing len of
+       string plus 1 which caused a NULL to be sent to the synth which causes
+       problems for the Doubletalk LT.
+       
+       speakup.c and keyboard.c for 2.2 and 2.4
+       Corrected the length parameter on several spkup_write() statements which
+       were also sending unnecessary NULLs.
+       
+       Corrected spelling of /proc/speakup/transport directory.  (Jim Danley)
+       
+2001-02-28 Wednesday 10:55  kirk
+
+       Removing the make menuconfig patches for checklist.c and menubox.c
+       because they have been included in linux 2.4.2. (Kirk)
+       
+2001-02-11 Sunday 14:05  kirk
+
+       Checking support for alpha support in 2.4.x kernels. (Kirk)
+       
+2001-01-30 Tuesday 20:55  kirk
+
+       Fixed arch/ppc/config.in to source drivers/char/Config.in which had
+       gotten broken in the post 2.4.0 ac patches. (Kirk)
+       
+2001-01-28 Sunday 23:53  jim
+
+       Reduced duplicate code in proc_speakup_synth_init() by creating two arrays
+       of strings, read_only[] and root_writable[] and using these arrays in
+       for loops.
+       Bumped version numbers on remaining serial synth drivers.  (Jim Danley)
+       
+2001-01-28 Sunday 20:26  kirk
+
+       Made modifications to speakup.h for v2.2 and the remainder of the
+       serial synth drivers to use the initialize_uart() function in
+       speakup_drvcommon.c.  (Kirk)
+       
+2001-01-28 Sunday 19:15  kirk
+
+       Made changes to 2.4.0 to move uart initialization code into
+       speakup_drvcommon.c and modified speakup_dectlk.c to use that
+       change. (Kirk)
+       
+2001-01-28 Sunday 00:26  jim
+
+       Modified the serprobe() function in the Accent SA driver.
+       This should allow the Accent SA to start talking from a cold boot with
+       no help from the lilo serial= or speakup_ser= options.
+       Ran speakup_acntsa.c through Lindent.
+       Bumped speakup_acntsa.c version number.  (Jim Danley)
+       
+2001-01-27 Saturday 23:26  jim
+
+       Modified the serprobe() function in the Dectalk Express driver.
+       My Dectalk Express now starts talking just fine from a cold boot with
+       no help from the lilo serial= or speakup_ser= options.
+       Ran speakup_dectlk.c through Lindent and cleaned up some comments.
+       Bumped Dectalk Express driver version number.  (Jim Danley)
+       
+2001-01-25 Thursday 17:58  jim
+
+       Worked on the write handler for /proc/speakup/synth.
+       It error-checks new_synth_name, prints out msg if synth selected is
+       already in use, looks for new_synth_name in list of synths compiled into
+       kernel, and prepares to switch to new synth.
+       Ran speakup.c through Lindent and cleaned up some comments.  (Jim Danley)
+       
+2001-01-24 Wednesday 22:59  jim
+
+       
+       Modified speakup_drvcommon.c so that those synth-specific /proc file
+       entries which are writable will now accept "" to trigger resetting of
+       the default value.
+       Ran speakup_drvcommon.c through Lindent and cleaned up some comments.
+       (Jim Danley)
+       
+2001-01-24 Wednesday 12:33  kirk
+
+       Made changes for Maintaners to v-24. (Kirk)
+       
+2001-01-24 Wednesday 12:31  kirk
+
+       Another typo fix in Configure.help and an update to the URL in Maintaners. (Kirk)
+       
+2001-01-24 Wednesday 11:57  kirk
+
+       Fixed clarification in Configure.help in v-24. (Kirk)
+       
+2001-01-24 Wednesday 11:56  kirk
+
+       Fixed spelling error in Config.in and modified Configure.help yet again. (Kirk)
+       
+2001-01-24 Wednesday 11:47  kirk
+
+       Fixed formatting in v-24 configure.help. (Kirk)
+       
+2001-01-24 Wednesday 11:46  kirk
+
+       Fixed indentation and spelling errors in configure.help. (Kirk)
+       
+2001-01-24 Wednesday 10:49  kirk
+
+       Fixing the v-2.4 version of the Configure.help file. (Kirk)
+       
+2001-01-24 Wednesday 10:47  kirk
+
+       Updated the Configure.help documentation and re-arranged the speakup
+       Config.in file.  (Kirk)
+       
+2001-01-23 Tuesday 15:45  jim
+
+       
+       Modified speakup.c to handle input in either upper or lower case written
+       to the /proc file entries for those settings that accept a range of
+       values that includes alpha chars.
+       The value is forced to lower case before any comparisons.
+       Modified the synth driver range parameters to accept only lower case as follows:
+       rate in both speakup_acntpc.c and speakup_acntsa.c,
+       pitch and volume in speakup_apolo.c,
+       tone in speakup_txprt.c.
+       Bumped synth driver version numbers.
+       (Jim Danley)
+       
+2001-01-23 Tuesday 11:58  jim
+
+       
+       Fixed typo in speakup_dectlk.c.
+       (Jim Danley)
+       
+2001-01-23 Tuesday 11:39  jim
+
+       
+       Moved full_time into the spk_synth structure for all synths and created
+       /proc/speakup/synth-specific/full_time entry.
+       Modified /usr/include/linux/speakup.h and associated files in diff-v22 and diff-v24.
+       (Jim Danley)
+       
+2001-01-23 Tuesday 01:14  jim
+
+       
+       Added to the TODO list.
+       (Jim Danley)
+       
+2001-01-23 Tuesday 00:42  jim
+
+       
+       Moved delay_time, trigger_time, and jiffy_delta into the spk_synth
+               structure for all synths.
+       Modified /usr/include/linux/speakup.h and associated files in diff-v22 and diff-v24.
+       Assigned following default values for Accent SA and Audapter drivers:
+       delay_time = 400, trigger_time = 5, jiffy_delta = 3.
+       Bumped synth driver version numbers.
+       (Jim Danley)
+       
+2001-01-22 Monday 21:32  jim
+
+       
+       Moved INIT_STRING and REINIT_STRING into the spk_synth structure for all synths.
+       Modified /usr/include/linux/speakup.h and associated files in diff-v22 and diff-v24.
+       Commented out some unused driver code that caused compile warnings.
+       (Jim Danley)
+       
+2001-01-22 Monday 17:44  jim
+
+       
+       Test number 2.
+       (Jim Danley)
+       
+2001-01-22 Monday 16:28  kirk
+
+       
+       Testing my new CVS login.
+       (Jim Danley)
+       
+2001-01-21 Sunday 19:48  kirk
+
+       Wrote char *strlwr(char *) and now use it to be certain that the
+       synth_name (provided by the user in config or at boot time) is forced
+       to lower case.
+       (Jim Danley)
+       
+2001-01-21 Sunday 13:53  kirk
+
+       Added /proc/speakup/synth entry -- read-only so far.
+       Removed old ioctl functions from speakup.c
+       Wrote xlate function to translate escape chars in user provided strings.
+       Added synth_name to "unknown synthesizer" message at boot up.
+       Check for length of synth_name.
+       Made certain that synth_name is NULL terminated.
+       (Jim Danley)
+       
+2001-01-21 Sunday 09:03  kirk
+
+       Changed synth_write("\n", 2);
+       to synth_write("\n", 1);
+       when sending user provided synth settings via /proc to the synth.
+       This *might* fix the problem reported by litetalk users.
+       Cleaned up some comments and indenting.
+       (Jim Danley)
+       
+2001-01-14 Sunday 21:05  matt
+
+       Checking in 2.2.x patches for the last modification. (Matt)
+       
+2001-01-14 Sunday 20:49  kirk
+
+       Checking in Matt Campbells driver rewrite to include all the synths in
+       the kernel at the same time.  (Kirk)
+       
+2001-01-10 Wednesday 12:16  kirk
+
+       Fixed bug when writing to /proc/speakup files caps_start, caps_stop,
+           punc_some, and punc_most.
+       Defined PUNC_CHARS and PUNC_CHARS_SIZE in symbols.h.
+       Added MULTI_CHAR to list of possible spk_variable.flags, necessary to
+           define a list of chars that must belong to another list of chars --
+           used for punc_some and punc_most.
+       Set arbitrary limit of 33 chars on caps_*.
+       Set PUNC_CHARS_SIZE char limit on user supplied value to punc_some and punc_most.
+       Fixed erroneous error strings.
+       #define'd error conditions to make code more clear.
+       Added STRING_TOO_LONG and CHAR_NOT_ONE_OF.
+       Added missing volume setting to DEFAULT_STATIC for Dectalk Express.
+       (Jim Danley)
+       
+2001-01-08 Monday 19:08  kirk
+
+       Made more changes to the cursoring.  I got backspace working in and
+       out of cursoring.  (Kirk)
+       
+2001-01-08 Monday 16:25  kirk
+
+       I have rewritten the cursoring routine speakup_check() to hopefully
+       improve it.  We are not there yet! (Kirk)
+       
+2001-01-07 Sunday 16:05  kirk
+
+       Just fixing some indentation settings. (Kirk)
+       
+2001-01-07 Sunday 13:37  kirk
+
+       added a single line to the top of speakup.c for testing.
+       (Jim Danley)
+       
+2001-01-07 Sunday 12:58  kirk
+
+       Fixed char/Makefile to build depends which it wasn't doing for some
+       reason under 2.2.18. (Kirk)
+       
+2001-01-07 Sunday 12:16  kirk
+
+       Fixed char/Makefile to create the speakup/.depend correctly.  I don't
+       know why it wasn't working before.  Everything else did.  (Kirk)
+       
+2001-01-07 Sunday 12:05  kirk
+
+       modified range checking code in speakup.c to handle negative numbers in
+       user provided parameter to /proc/speakup/* and also in spk_variable.valid.
+       (Jim Danley)
+       
+2001-01-07 Sunday 09:02  kirk
+
+       cleaned up and commented symbols.h.
+       re-wrote some of the range logic in symbols.h and speakup.c.
+       changed char valid[33] to char *valid in spk_variable struct.
+       dropped 0xff as char string terminator for spk_variable.valid member.
+       removed NUMERIC from rate flags for accents.
+       made /proc/speakup/tone read-only for dectalk express.
+       (Jim Danley)
+       
+2001-01-06 Saturday 15:52  kirk
+
+       Reorganized the Todo list and placed bugs in the bugs file. (Kirk)
+       
+2001-01-05 Friday 21:19  kirk
+
+       Made modifications to fix the make menuconfig bug in 2.4.0. (Kirk)
+       
+2001-01-05 Friday 20:42  kirk
+
+       Modified menubox.c in lxdialog to fix bug with initial menus not being
+       shown completely. (Kirk)
+       
+2001-01-05 Friday 15:54  kirk
+
+       merged symbols_*.h into symbols.h and removed symbols_*.h from CVS.
+       cleaned up the format a bit along the way.
+       (Jim Danley)
+       
+2001-01-04 Thursday 18:33  kirk
+
+       Modified the console.c, speakup.h and speakup.c for the 2.4.0 kernels.
+       I have also removed vt.c in preparation for just using the
+       /proc/speakup configuration system. (Kirk)
+       
+2001-01-04 Thursday 12:11  kirk
+
+       Starting major changes for merging into the kernel source tree.  Files
+       updated are console.c speakup.c speakup.h and vt.c.  I have built a
+       new set of functions to interact with the kernel which will be speakup
+       functions if speakup is configured in and null stubs if speakup is not
+       configured in.  So far they include: speakup_allocate(), speakup_bs(),
+       speakup_con_update(), speakup_con_write() and speakup_init().  These
+       changes only affect the 2.2.18 tree currently. (Kirk)
+       
+2001-01-03 Wednesday 10:04  kirk
+
+       Fixed transport driver by giving the uart time to settle before
+       testing for the port. (Kirk)
+       
+2001-01-02 Tuesday 20:18  kirk
+
+       First attempt to change checkout to work with an installed tarball and
+       update it to cvs. (Kirk)
+       
+2001-01-02 Tuesday 14:09  kirk
+
+       Made tchanges to make v24 compatible with 2.4.0-prerelease.  (Kirk)
+       
+2001-01-02 Tuesday 09:50  kirk
+
+       Added code to correctly parse range string for /proc file speech
+           parameters which use a range of chars.
+       Added a priority of KERN_ALERT to printk statements that need to be
+           displayed on user's console regardless.
+       Enhanced warning output if user attempts to assign a value out of range
+           to a /proc variable.
+       (Jim Danley)
+       
+2000-12-31 Sunday 13:20  kirk
+
+       Rewrote checkclean and changed semee to semi in the character
+       array. (Kirk)
+       
+2000-12-31 Sunday 12:12  kirk
+
+       Fixed syntax errors in speakup_txprt.c and modified the install
+       script. (Kirk)
+       
+2000-12-31 Sunday 11:43  kirk
+
+       Fixing typo's in the documentation files. (Kirk)
+       
+2000-12-30 Saturday 23:33  kirk
+
+       Rewrote install and INSTALLATION for a different installing
+       design. (Kirk)
+       
+2000-12-30 Saturday 17:03  kirk
+
+       We are officially version v-0.10. (Kirk)
+       
+2000-12-30 Saturday 16:58  kirk
+
+       Modified the installation file and created an install script. (Kirk)
+       
+2000-12-30 Saturday 15:13  kirk
+
+       Fixed a syntax problem with speakup_audptr.c. (Kirk)
+       
+2000-12-30 Saturday 14:58  kirk
+
+       Placed a length limit on reading of version number in
+       speakup_audptr.c. (Kirk)
+       
+2000-12-30 Saturday 13:12  kirk
+
+       Adding file changes for v22. (Kirk)
+       
+2000-12-30 Saturday 13:10  kirk
+
+       Removing files related to version changes. (Kirk)
+       
+2000-12-30 Saturday 13:00  kirk
+
+       Changed structure of Documentation/speakup and related files to remove
+       references to speakup version for ease in updating documentation.
+       (Kirk)
+       
+2000-12-29 Friday 14:00  kirk
+
+       echo "" > /proc/speakup/characters now resets to defaults for consistency.
+       wrote script to reset all speakup defaults
+       added key_echo toggle to speakup vars controllable by user
+           via /proc/speakup/key_echo
+           key_echo is not 100% -- keypad slash talks even if key_echo == 0
+       (Jim Danley)
+       
+2000-12-24 Sunday 16:46  kirk
+
+       finished ability to write to /proc files, changed some default char descs, added "direct" to /proc
+       
+2000-12-22 Friday 15:04  kirk
+
+       These are the cursoring fixes for the 2.4.0-testxx kernels.  They also
+       include the requested changes I was experimenting with by Alan Cox in
+       preparation for kernel source tree inclusion. (Kirk)
+       
+2000-12-22 Friday 13:54  kirk
+
+       Fixed up some of the cursoring issues and have started making the
+       changes requested by Alan Cox in preparation for kernel source tree
+       inclusion. (Kirk)
+       
+2000-12-21 Thursday 08:56  kirk
+
+       rewrite of speakup_characters_write_proc() to handle fragmented buffers when called by dd, cp, or cat in kernel 2.4 (Jim Danley)
+       
+2000-12-20 Wednesday 12:17  kirk
+
+       Cleaned up some warnings.  (Kirk)
+       
+2000-12-20 Wednesday 11:32  kirk
+
+       Fixed toggle for synth timeout to set it off when waking up the
+       synth. (Kirk)
+       
+2000-12-19 Tuesday 19:31  kirk
+
+       This is atest fix to see if I have helped eliminate the synth bleed
+       through problem with all of the synths. (Kirk)
+       
+2000-12-19 Tuesday 16:29  kirk
+
+       quick change to speakup_audptr.c to fix synth_ver typo for kernel 2.2.18 (Jim Danley)
+       
+2000-12-19 Tuesday 15:35  kirk
+
+       Checking in the 2.2.18 fixes for the synth hanging problems.  (Kirk)
+       
+2000-12-19 Tuesday 15:10  kirk
+
+       Finally fixed the synth hanging problem on synth turn off. (Kirk)
+       
+2000-12-18 Monday 14:44  kirk
+
+       Just updating BUGS to put the backspace problem to bed. (Kirk)
+       
+2000-12-18 Monday 14:40  kirk
+
+       Checking in the backspace fix for 2.4.0-test11. Yeah! Finally
+       fixed. (Kirk)
+       
+2000-12-18 Monday 14:14  kirk
+
+       Fixed the backspace bug at last! In 2.2.18 so far. (Kirk)
+       
+2000-12-18 Monday 10:03  kirk
+
+       Checking in Jim Danleys changes again.  When will I learn to checkout
+       before checking in?? (Kirk)
+       
+2000-12-15 Friday 13:50  kirk
+
+       Checking first draft of menubox.c and checklist.c for
+       v-2.4.0-testxx. (Kirk)
+       
+2000-12-15 Friday 13:48  kirk
+
+       Taking first diff of menubox.c and checklist.c for v2.4.0-test11 for
+       make menuconfig cursoring. (Kirk)
+       
+2000-12-15 Friday 13:17  kirk
+
+       Checking in the new diffs of menubox.c and checklist.c for the first
+       time. (Kirk)
+       
+2000-12-15 Friday 13:14  kirk
+
+       Taking first diff of the make menuconfig patches from checklist.c and
+       menubox.c. (Kirk)
+       
+2000-12-12 Tuesday 18:56  kirk
+
+       Fixed a spelling error added to Todo list and fix speakup.c to not
+       need the is_alive() function. (Kirk)
+       
+2000-12-12 Tuesday 15:21  kirk
+
+       Fixed speakup to patch correctly with 2.2.18.  Unfortunately it won't
+       work with kernels less than 2.2.18 anymore.  It was totally agreed
+       upon by the folks on the reflector.  It's not my fault mom! (Kirk)
+       
+2000-12-12 Tuesday 10:41  kirk
+
+       Fix a problem with a conflict in cvsversion.h. (Kirk)
+       
+2000-12-11 Monday 20:40  kirk
+
+       Attempt to fix the Audapter driver by limiting how long it can stay in
+       kernel space. (Kirk)
+       
+2000-12-11 Monday 17:37  kirk
+
+       Made a slight fix to spk_reset() and moved it's call up a bit in
+       handle_scancodes(); (Kirk)
+       
+2000-12-11 Monday 16:28  kirk
+
+       Just checking in the cvs adds for the new diff-v24 patch files.  (Kirk)
+       
+2000-12-11 Monday 16:25  kirk
+
+       Checking in the 2.4.0 kernel patches for Jim Danley's /proc file
+       system additions. (Kirk)
+       
+2000-12-11 Monday 14:34  kirk
+
+       Checking in added proc files. (Kirk)
+       
+2000-12-11 Monday 14:31  kirk
+
+       Added two new files to v22 kernel for /proc file system,
+       linux/include/linux/proc_fs.h and linux/fs/proc/root.c. (Kirk)
+       
+2000-12-11 Monday 12:59  kirk
+
+       Checking in Jim Danleys /proc file system additions to speakup. (Kirk)
+       
+2000-12-09 Saturday 19:14  kirk
+
+       Changed spk_control to test for zero specifically on say_control. (Kirk)
+       
+2000-12-09 Saturday 18:29  kirk
+
+       Changed spk_control to say capslock scroll_lock and num_lock even when
+       say_control isn't on. (Kirk)
+       
+2000-12-08 Friday 16:21  kirk
+
+       Removing the linux version 2.3.xx stuff again. (Kirk)
+       
+2000-12-08 Friday 15:40  kirk
+
+       patched Configure.help by hand from v2.4 and committing. (Kirk)
+       
+2000-12-08 Friday 14:47  kirk
+
+       Checked in diff-v22/^usr^src^linux^Documentation^Configure.help.patch
+       which seems to have been missed as well as the init/main.c stuff.
+       This is really weird (Kirk)
+       
+2000-12-08 Friday 14:40  kirk
+
+       Added the -d flag to updat in checkout to see if we get cleanup
+       improvement. (Kirk)
+       
+2000-12-08 Friday 13:13  kirk
+
+       Removing patchlist and the linux 2.3.xx support. (Kirk)
+       
+2000-12-08 Friday 13:07  kirk
+
+       Edited check.orig and fix.orig to use the new patchlist filename
+       convention. (Kirk)
+       
+2000-12-07 Thursday 22:17  kirk
+
+       Just checking in the new files, three to be exact. (kirk)
+       
+2000-12-07 Thursday 22:14  kirk
+
+       rewrote checkin, checkout and moved patchlist to patchlist-v22 and
+       patchlist-v24 because we were missing the linux/init/main.c patches
+       and we didn't have a way to handle different files for different
+       versions. (kirk)
+       
+2000-12-06 Wednesday 19:06  kirk
+
+       Added support for the codepage 437 extended character set.  (Jim and Kirk)
+       
+2000-11-29 Wednesday 11:30  kirk
+
+       Fixed the 2.2.xx kernels to have the almost correct backspace code.
+       Also move the new character output in do_con_write() to lf().  I've
+       experimentally put a 'space' in to see if that helps the wrapping
+       during console output. (Kirk)
+       
+2000-11-27 Monday 15:38  kirk
+
+       Fix or partial to the backspace problem at least on 2.4.0-test11.  I
+       probably broke cursoring.
+       
+2000-11-22 Wednesday 20:12  kirk
+
+       Fixed a stupid unused variable by deleting it.
+       Fixed speakup_file_write to send raw user data to the synth.  (Thanx Matt)
+       
+2000-11-21 Tuesday 15:10  kirk
+
+       Adjusted console.c patch for test11 of 2.4.0.
+       
+2000-11-16 Thursday 11:42  kirk
+
+       Modified all drivers to test for no port when clearing the holding
+       register.
+       
+2000-11-16 Thursday 07:56  kirk
+
+       Fixed console.c patch to compensate for the line movement. in Test10.
+       
+2000-10-24 Tuesday 11:10  kirk
+
+       Fix to the LiteTalk driver to get around the hanging when the synth isn't
+       on.
+       
+2000-10-23 Monday 12:15  kirk
+
+       Fixed dtlk driver so non-valid ports are released correctly in
+       dev_probe.  Also added externs for synth_request_region and
+       release. (Kirk)
+       
+2000-08-28 Monday 13:29  kirk
+
+       Fixed Makefile for 2.4.0-test7 in drivers/char.
+       
+2000-08-17 Thursday 16:21  kirk
+
+       Birth of cursoring for version 2.4.xx kernels.
+       
+2000-08-17 Thursday 12:06  kirk
+
+       Okay, I proclaim the birth of cursoring, at least in the 2.2.x kernels.  Next we'll try the 2.3/4.x kernels.
+       
+2000-08-17 Thursday 11:01  kirk
+
+       Fixed CFLAGS to EXTRA_CFLAGS in Makefile to get speakup to compile
+       again.  The break took place between 2.4.0-test4 and test5.
+       
+2000-07-20 Thursday 10:43  kirk
+
+       Changed krealloc to just use kfree instead of kfree_s. Kirk
+       
+2000-07-03 Monday 14:19  kirk
+
+       Fixed one line in keyboard.c and changes to cvs
+       
+2000-06-29 Thursday 16:32  andy
+
+       Fixed checkin / cvsversion.h
+       
+2000-06-29 Thursday 16:26  andy
+
+       v2.2.x keyboard.c + speakup_kill() fix
+       
+2000-06-29 Thursday 16:00  andy
+
+       v2.2 addition of speakup_kill() function (bound to sysreq key)
+       
+2000-06-29 Thursday 15:56  andy
+
+       v2.4 addition of speakup_kill() function (bound to sysrq key)
+       
+2000-06-26 Monday 16:19  andy
+
+       Added (very minimal) read() and ioctl() functions for /dev/synth.
+       
+2000-06-23 Friday 11:16  andy
+
+       Fixed miscdevice.h bad patch
+       
+2000-06-22 Thursday 15:47  andy
+
+       Fixed defkeymap.c not being built properly.
+       
+2000-06-22 Thursday 15:17  andy
+
+       Fixed v2.2.x zero-byte patch bug
+       
+2000-06-22 Thursday 14:48  andy
+
+       Checkout prunes now.
+       
+2000-06-22 Thursday 12:48  andy
+
+       Forgot to kill the old patch files... cleaning up.
+       
+2000-06-22 Thursday 12:45  andy
+
+       Changed checkin/checkout philosophy...
+               v2.2.x, v2.3.x, v2.4.x trees are all in this release
+       
+2000-06-21 Wednesday 16:27  andy
+
+       More checkin/checkout fixes.
+       
+2000-06-21 Wednesday 16:19  andy
+
+       Changed checkin/checkout philosophy, so 0-byte files aren't such a headache
+       
+2000-06-21 Wednesday 14:13  andy
+
+       New checkout script, fixing non-updating of previously patched files.
+       
+2000-06-20 Tuesday 15:14  andy
+
+       /dev/synth (MAJOR 10, MINOR 25) fix for v2.2.x tree
+       
+2000-06-19 Monday 16:02  andy
+
+       checkin script that fixes busted/nonexstant .orig files
+       
+2000-06-19 Monday 13:08  andy
+
+       cvsversion.h fix
+       speakup_decext.c fix for v2.2.x  (no such member 'list' problem)
+       
+2000-06-14 Wednesday 16:00  andy
+
+       TODO update
+       
+2000-06-14 Wednesday 15:25  andy
+
+       Fixed:
+               checkin 'older than' bug
+               disabled <caps|num|scroll>-lock speech when spk_shut_up is set
+       
+2000-06-14 Wednesday 13:15  andy
+
+       Added a cvsversion.h and cvs date tracking into speakup.
+       
+2000-06-14 Wednesday 12:44  andy
+
+       Oops.  Forgot these.
+       
+2000-06-14 Wednesday 08:06  kirk
+
+       Put SYNTH_MINOR #ifdefs in miscdevices.h for v2.2.x kernels.
+       Updated Todo file and temporarily incremented version number of speakup. (Kirk)
+       
+2000-06-13 Tuesday 16:30  andy
+
+       v2.4.x spanky checkin
+       
+2000-06-13 Tuesday 15:36  andy
+
+       v2.4.x checkin for /dev/synth stuff.
+       
+2000-06-13 Tuesday 15:28  andy
+
+       typo fix.
+       
+2000-06-13 Tuesday 15:23  andy
+
+       v2.2.x checkin for the new /dev/synth stuff.
+       
+2000-06-13 Tuesday 15:17  andy
+
+       Added a /dev/synth fops to speakup (MAJOR 10, MINOR 25), so that users can
+       use the synth without speakup (but why?).  :)
+       
+       Also fixed a couple of issues with the check* scripts, and added a -p option
+       to checkin to just create patches.
+       
+2000-06-12 Monday 14:36  andy
+
+       Had a 0-byte defkeymap.c file...
+       
+2000-06-12 Monday 14:26  andy
+
+       Fixed the screwed up v2.2.x patch files, and added a fixorig script which
+               copies .orig files from /usr/src/linux.orig as stated in the
+               patchlist file
+       
+2000-06-09 Friday 16:03  andy
+
+       TODO change
+       
+2000-06-09 Friday 14:21  andy
+
+       added checkclean script
+       
+2000-06-09 Friday 12:46  andy
+
+       updates to the v2.2.x tree.
+       
+2000-06-08 Thursday 14:59  andy
+
+       Fixed v2.2.x diffs, and made a few changes to checkin/checkout/checkorig..
+       
+       Namely,
+               checkin:
+                       fixed bailout on CVSROOT set
+                       diffs only for new or files that have changed since last patch
+                       cvs adds directories properly
+                       checks exit values of cvs commands
+               checkout/checkorig:
+                       zeroes out .orig files that should exist and should be zeroed
+               patchlist:
+                       now specifies patchfiles in the form:
+                       <0|1>,<file>
+                       where the first number is a flag to copy the file to create
+                       a <file>.orig, or create a zero-byte file (0) for <file>.orig
+       
+2000-06-07 Wednesday 15:52  kirk
+
+       [no log message]
+       
+2000-06-07 Wednesday 14:15  andy
+
+       checkin mod
+       
+2000-06-07 Wednesday 14:14  andy
+
+       date test added to ./checkin
+       
+2000-06-07 Wednesday 14:11  andy
+
+       test
+       
+2000-06-07 Wednesday 14:09  andy
+
+       test patch
+       
+2000-06-07 Wednesday 13:02  kirk
+
+       test of checkin on spanky
+       
+2000-06-07 Wednesday 12:32  andy
+
+       more checkin/checkout updates
+       
+2000-06-07 Wednesday 12:19  andy
+
+       quick print fix for checkin script
+       
+2000-06-07 Wednesday 12:17  andy
+
+       Fixed new tree commit/checkout/update bugs with checkin and checkout
+       
+2000-06-07 Wednesday 12:10  kirk
+
+       v24 tree added to cvs
+       
+2000-06-07 Wednesday 11:30  andy
+
+       logic error in ./checkin
+       
+       New diff-vXX directories are added now... just cp -a diff-vYY div-vXX, and
+       kill the CVS/ dir.
+       
+2000-06-05 Monday 15:54  andy
+
+       Fixed ./checkin to 'cvs add' created patch directories.
+       
+2000-06-05 Monday 15:39  andy
+
+       Added synth_release_region, and seperated out a speakup_drvcommon.c file,
+       which contains common driver stuff -- current just synth_release_region(),
+       and synth_request_region().
+       
+2000-06-02 Friday 15:32  andy
+
+       Final test??
+       
+2000-06-02 Friday 14:11  andy
+
+       bleah
+       
+2000-06-02 Friday 13:58  andy
+
+       another test.. *sigh*
+       
+2000-06-02 Friday 13:57  andy
+
+       foo
+       
+2000-06-02 Friday 13:49  andy
+
+       test 342.7
+       
+2000-06-02 Friday 12:56  andy
+
+       wrong checkout script.
+       
+2000-06-02 Friday 12:51  andy
+
+       Yet another test.
+       
+2000-06-01 Thursday 15:45  andy
+
+       test #2
+       
+2000-06-01 Thursday 15:40  andy
+
+       ./checkin script test
+       
+2000-06-01 Thursday 15:38  andy
+
+       Initial version of speakup in CVS.
+       
+2000-06-01 Thursday 15:38  andy
+
+       Initial revision
+       
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/Changes linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/Changes
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/Changes  1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/Changes  2000-06-01 12:38:40.000000000 -0700
@@ -0,0 +1,221 @@
+version 0.09
+
+May.24.2000, fixed piles o' bugs, and patched speakup forward to kernel
+2.3.99-pre8 (at least).  (Andy)
+
+sometime before May 24th, 2000, wrote several new drivers.  (Kirk)
+
+version 0.08
+
+18/11/1999, Finally nailed down and fixed a bug with the serial
+drivers filling their buffer and causing the kernel to hang.  Of
+course, once again I've totally rewritten the serial drivers.  (Kirk)
+
+10/11/1999, Fixed the end of buffer water mark so the kernel wouldn't
+over run the buffer when a process was put to sleep but there was
+already enough chars in the loop to over write end of buffer and trash
+the system.  (Kirk)
+
+29/10/1999, Added code to the drivers to test the kernel version, so
+we could include the proper wait_queue tags for 2.2.x vs 2.3.x. (Kirk)
+
+27/10/1999, fix small bug which made the reading cursor not get stored
+when switching between allocated consoles.  (Kirk)
+
+08/10/1999, Totally rewrote all drivers to follow fixed format.  No
+more will we have drivers which don't look anything like the other
+drivers.  (Kirk)
+
+15/09/1999, Rewrote synth drivers and kernel to support command line
+loading of synth ports at boot time.  (Andy)
+
+14/09/1999, Rewrote portions of the speakup_ltlk.c driver to fix a
+problem with the DoubleTalk LT losing the first character sent to it
+after a null character.  Seems to be a problem only with the LT, not
+being able to deal with characters immediately following NULLs.
+(Kirk)
+
+10/08/1999, Completed writing absolute go to function for speakup
+reading cursor.  (Andy)
+
+04/08/1999, Completed routines for speaking punctuation and
+non-character assigned keys, such as shift/control/alt.  (Andy)
+
+02/08/1999, Added routines to kernel.c and speakup to allow capturing
+of keystrokes when they're hit.  This allows us to speakup characters
+which are typed for cursor control detection and pronouncing chars
+which are not in the allowable punctuation set.  (Andy)
+
+23/07/1999, Added routine speakup_check() to help track cursor
+movement for cursor position pronunciation.  It isn't working yet.
+(Kirk)
+
+16/07/1999, Rewrote serial probe in ltlk driver to deal with autobaud
+versions of the LiteTalk and DoubleTalk LT.  (Andy)
+
+05/07/1999, Fixed a problem with characters like tick and dash which
+don't get passed through to the synth even though they don't get
+spoken.  They are needed to get the synth to handle some words
+correctly.  (Kirk)
+
+25/06/1999, Fixed a bug I missed which caused speakup to not read the
+last character on a line with say_curr_line().  (Kirk)
+
+25/06/1999, Fixed a bug which caused speakup to miss the end of
+wrapped around words to the next line.  (Kirk)
+
+
+version 0.07 
+
+18/06/1999, Rewrote the Speakout driver to make it more inline with
+the current driver design.  This driver hasn't been tested yet.  An
+exercise for John.  (Andy)
+
+17/06/1999, Finished rewriting and testing the new version of load_spk
+utilities to handle multiple synths. This intailed redesigning the
+entire way synth control protocals are stored and passed back and
+forth between configuration files and the ioctl() handler. (Andy)
+
+31/05/1999, Finished writing the driver for the Accent SA and
+Transport external synthesizers.  (Kirk)
+
+20/05/1999, Rewrote portions of the DTLK and LTLK drivers to fix slow
+responce and choppiness of the output with say_curr_line and
+say_screen. (Kirk)
+
+18/05/1999, Finished the make config changes to make it easier to
+include various synths before compiling the kernel.  This included a
+lot of changes to make files and config.in files as well as the
+config.hlp and maintainers documents.  We have moved speakup to its
+own subdirectory under linux/drivers/char and will place all future
+files in there. (Kirk)
+
+17/05/1999, Placed newline characters at the end of all strings in
+speakup.c to facilitate proper output with the Speakout driver. (Kirk)
+
+13/05/1999, Finished writing and testing the ACNTPC driver for the
+Accent PC synthesizer. (Kirk)
+
+11/05/1999, Finished writing and testing the LTLK driver for the
+LightTalk synthesizer. (Andy)
+
+version 0.06
+
+07/04/1999, Hunted down and squashed a bug which caused the system to
+lock up when X11 allocated another console.  Now, you want to talk
+about weird bugs? (Kirk and Andy)
+
+05/04/1999, Fixed a small bug where the reading cursor structure was
+floating when switching from console to console. (Kirk)
+
+05/03/1999, Finally got repeat function to work correctly.  It didn't
+want to give the proper repeat value on say_word and say_line. (Kirk)
+
+4/27/1999, Changed the two shut up functions to sync the reading
+cursor with the console cursor. (Kirk)
+
+4/25/1999, Added a say hex and ASCII value function. (Brian)
+
+4/22/1999, Added our own punctuation handling.  This will give us
+consistancy across various synthesizers.  It also allows us custom
+punctuation sets.  We have four levels currently, NONE, SOME, MOST,
+ALL.  The some and most can be user defined, this will eventually
+become a configuration option with loadspk. (Kirk)
+
+4/19/1999, Added a repeat count function so that speakup doesn't read
+all of a repeating sequence of characters like dashes or equal signs.
+(Kirk)
+
+4/15/1999, Rewrote the synth driver to be smaller and utilize
+buffering all the time.  This entailed a total rewrite of the driver.
+It works much better than the older style driver.  We won't try to be
+compatible with external drivers anymore.  That caused us much grief!
+(Kirk)
+
+Version 0.05
+
+03/01/1999, Modified the kernel code and wrote a number of functions
+for loading and dumping speakups configuration settings.  The two
+client programs are loadspk and dumpspk, see the accompanying README
+and INSTALLATION files for details. (Andy)
+
+Version 0.04
+
+12/23/1998, Added park reading cursor function.  It toggles on and off
+like the speakup off function. (Kirk)
+
+12/10/1998, added code to announce cursor function calls.  This is to
+help me try and figure out how and what to say when.  (Kirk)
+
+12/08/1998, Added a check in say character to beep when the colour
+attribute changes. (Kirk)
+
+12/08/1998, rewrote say previous and next word to wrap around at the
+end of lines and beep when going from line to line.  (Kirk)
+
+12/07/1998, Fixed a little bug which read the bottom half of a
+character which was higher than 0x7f.  It makes make menuconfig work a lot
+nicer. (Kirk)
+
+12/07/1998, Added some new functions to read from reading cursor to
+bottom of screen, read from top of screen, read from left edge of
+screen to reading cursor and read from reading cursor to right edge of
+screen.  These are basically stub functions which call two general
+purpose functions say_screen_from_to() and say_line_from_to().  (Kirk)
+
+version 0.03
+
+11/19/1998, Added say phonetic character function. I have temporarily
+bound it to InsKeyPad-2. (Kirk)
+
+11/19/1998, Added pronunciation of caps, num and scroll lock on and
+off in keyboard.c. (Andy)
+
+11/18/1998, Fixed the bug which made speakup say the entire current
+word even if it wrapped over the end of line.  I also made
+say_curr_word read the word to the right if you have your reading
+cursor on the space just to the left of the word.  Makes it a little
+nicer for reading links in lynx. (Kirk)
+
+version 0.02
+
+11/11/1998, fixed a little problem with the attr byte not being
+correct when speakup_update() was called.  (Kirk)
+
+11/11/1998, fixed consoles which are not the foreground console
+speaking while they're updating their screens.  (Kirk)
+
+11/11/1998, put in the GPL stuff and revised the documentation. (Kirk)
+
+11/10/1998, Rewrote the say_screen function to be super faster than it
+was. (Kirk)
+
+11/10/1998, started to scratch in the soft parked system for reviewing
+around the screen.  This is mostly to prevent the reading cursor from
+moving whenever the screen clock or something gets updated. (Kirk)
+
+11/09/1998, rewrote sections of dtlk.c to do away with writing out
+inside cli()/sti() statements.  Now we time out after 4 usec and
+assume we missed the bit drop on the rdy bit because of an interrupt.
+Seems to work pretty well except the damn thing reads garbage until
+the bogomips line.  Sure is more responsive normally though. (Kirk)
+
+11/05/1998, got the total shut_up routine to work correctly.  In
+vc_allocate() we were allocating a new structure every time it was
+called.  It was supposed to be everytime a new console was
+successfully allocated. (Kirk)
+
+11/04/1998, Wrote colour attribute routine say_attrib().  I have
+temporarily assigned it to the keypad-period. (Kirk)
+
+11/02/1998, vmalloc() didn't work, to early in the boot process.  So
+took our 8192 byte buffer directly by using kmem_start. (Kirk)
+
+10/29/1998, Increased dtlk buffer to 8192 bytes by moving to vmalloc()
+and vfree() instead of get_free_page()/free_page().  We have moved
+from one PAGE_SIZE to two. (kirk)
+
+10/29/1998, changed spk_shut_up to use bit 8 for total shut up instead
+of a seperate variable.  Works independantly for each console
+now. (kirk)
+
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/Config.in linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/Config.in
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/Config.in        1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/Config.in        2003-12-10 07:29:56.000000000 -0800
@@ -0,0 +1,26 @@
+tristate 'Speakup console speech' CONFIG_SPEAKUP
+if [ "$CONFIG_SPEAKUP" != "n" ]; then
+       comment 'Type "y" for each synthesizer you want built into the kernel.'
+       dep_tristate "Accent SA, acntsa" CONFIG_SPEAKUP_ACNTSA $CONFIG_SPEAKUP
+       dep_tristate "Accent PC, acntpc" CONFIG_SPEAKUP_ACNTPC $CONFIG_SPEAKUP
+       dep_tristate "Apollo, apollo" CONFIG_SPEAKUP_APOLLO $CONFIG_SPEAKUP
+       dep_tristate "Audapter, audptr" CONFIG_SPEAKUP_AUDPTR $CONFIG_SPEAKUP
+       dep_tristate "Braille 'n' Speak, bns" CONFIG_SPEAKUP_BNS $CONFIG_SPEAKUP
+       dep_tristate "DECtalk Express, dectlk" CONFIG_SPEAKUP_DECTLK $CONFIG_SPEAKUP
+       dep_tristate "DECtalk External (old), decext" CONFIG_SPEAKUP_DECEXT $CONFIG_SPEAKUP
+       dep_tristate "DECtalk PC (big ISA card), decpc" CONFIG_SPEAKUP_DECPC $CONFIG_SPEAKUP
+       if [ "$CONFIG_SPEAKUP_DECPC" = "y" ] ;then
+         comment 'warning: decpc can only be built as a module'
+       fi
+       comment 'In order to use this you will need'
+       comment 'the dtload program and DECPC software files '
+         comment 'Read the accompanying DECPC documentation for more details'
+       dep_tristate "DoubleTalk PC, dtlk" CONFIG_SPEAKUP_DTLK $CONFIG_SPEAKUP
+       dep_tristate "Keynote Gold PC, keypc" CONFIG_SPEAKUP_KEYPC $CONFIG_SPEAKUP
+       dep_tristate "DoubleTalk LT or LiteTalk, ltlk" CONFIG_SPEAKUP_LTLK $CONFIG_SPEAKUP
+       dep_tristate "Software synthesizers /dev/sftsyn, sftsyn" CONFIG_SPEAKUP_SFTSYN $CONFIG_SPEAKUP
+       dep_tristate "Speak Out, spkout" CONFIG_SPEAKUP_SPKOUT $CONFIG_SPEAKUP
+       dep_tristate "Transport, txprt" CONFIG_SPEAKUP_TXPRT $CONFIG_SPEAKUP
+       comment 'Enter the three to six character synth string from above or none.'
+       string "Default synthesizer for Speakup" CONFIG_SPEAKUP_DEFAULT "none"
+fi
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/Kconfig linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/Kconfig
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/Kconfig  1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/Kconfig  2003-12-10 07:29:56.000000000 -0800
@@ -0,0 +1,210 @@
+menu "Speakup console speech" 
+config SPEAKUP
+       tristate "Build speakup console speech"
+       ---help---
+               
+               This is the Speakup screen reader.  Think of it as a
+               video console for blind people.  If built in to the
+               kernel, it can speak evrything on the text console from
+               boot up to shutdown.  For more information on Speakup,
+               point your browser at http://www.linux-speakup.org/. 
+               There is also a mailing list at the above url that you
+               can subscribe to.
+               
+               Supported synthesizers are accent sa, accent pc, appollo
+               II., Auddapter, Braille 'n Speak, Dectalk external
+               (old), Dectalk PC (full length isa board), Dectalk
+               express, Doubletalk, Doubletalk LT or Litetalk,
+               Keynote
+               Gold internal PC, software synthesizers, Speakout, and transport.
+               
+               Speakup can either be built in or compiled as a module
+               by answering y or m.  If you answer y here, then you
+               must answer either y or m to at least one of the
+               synthesizer drivers below.  If you answer m here, then
+               the synthesizer drivers below can only be built as
+               modules.
+               
+               These drivers are not standalone drivers, but must be
+               used in conjunction with Speakup.  Think of them as
+               video cards for blind people.
+               
+               
+               The Dectalk pc driver can only be built as a module, and
+               requires software to be pre-loaded on to the card before
+               the module can be loaded.  See the decpc choice below
+               for more details.
+               
+               If you are not a blind person, or don't have access to
+               one of the listed synthesizers, you should say n.
+
+config SPEAKUP_ACNTSA
+       depends on SPEAKUP
+       tristate "Accent SA, acntsa"
+       ---help---
+               
+               This is the Speakup driver for the accent sa
+               synthesizer.  You can say y to build it into the kernel,
+               or m to build it as a module.  See the configuration
+               help on the Speakup choice above for more info.
+
+config SPEAKUP_ACNTPC
+       depends on SPEAKUP
+       tristate "Accent PC, acntpc"
+       ---help---
+               
+               This is the Speakup driver for the accent pc
+               synthesizer.  You can say y to build it into the kernel,
+               or m to build it as a module.  See the configuration
+               help on the Speakup choice above for more info.
+
+config SPEAKUP_APOLLO
+       depends on SPEAKUP
+       tristate "Apollo, apollo"
+       ---help---
+               
+               This is the Speakup driver for the Apollo II
+               synthesizer.  You can say y to build it into the kernel,
+               or m to build it as a module.  See the configuration
+               help on the Speakup choice above for more info.
+       
+config SPEAKUP_AUDPTR
+       depends on SPEAKUP
+       tristate "Audapter, audptr"
+       ---help---
+               
+               This is the Speakup driver for the Audapter synthesizer.
+                You can say y to build it into the kernel, or m to
+               build it as a module.  See the configuration help on the
+               Speakup choice above for more info.
+
+config SPEAKUP_BNS
+       depends on SPEAKUP
+       tristate "Braille 'n' Speak, bns"
+       ---help---
+               
+               This is the Speakup driver for the Braille 'n' Speak
+               synthesizer.  You can say y to build it into the kernel,
+               or m to build it as a module.  See the configuration
+               help on the Speakup choice above for more info.
+        
+config SPEAKUP_DECTLK
+       depends on SPEAKUP
+       tristate "DECtalk Express, dectlk"
+       ---help---
+               
+               This is the Speakup driver for the DecTalk Express
+               synthesizer.  You can say y to build it into the kernel,
+               or m to build it as a module.  See the configuration
+               help on the Speakup choice above for more info.
+
+config SPEAKUP_DECEXT
+       depends on SPEAKUP
+       tristate "DECtalk External (old), decext"
+       ---help---
+               
+               This is the Speakup driver for the DecTalk External
+               (old) synthesizer.  You can say y to build it into the
+               kernel, or m to build it as a module.  See the
+               configuration help on the Speakup choice above for more
+               info.
+
+config SPEAKUP_DECPC
+       depends on SPEAKUP
+       tristate "DECtalk PC (big ISA card), decpc"
+       ---help---
+               
+               This is the Speakup driver for the DecTalk PC (full
+               length ISA) synthesizer.  You can say  m to build it as
+               a module.  See the configuration help on the Speakup
+               choice above for more info.
+               
+               In order to use the DecTalk PC driver, you must download
+               the dec_pc.tgz file from linux-speakup.org.  It is in
+               the pub/linux/goodies directory.  The dec_pc.tgz file
+               contains the software which must be pre-loaded on to the
+               DecTalk PC board in order to use it with this driver. 
+               This driver must be built as a module, and can not be
+               loaded until the file system is mounted and the DecTalk
+               PC software has been pre-loaded on to the board.
+               
+               See the README file in the dec_pc.tgz file for more
+               details.
+
+config SPEAKUP_DTLK
+       depends on SPEAKUP
+       tristate "DoubleTalk PC, dtlk"
+       ---help---
+               
+               This is the Speakup driver for the internal DoubleTalk
+               PC synthesizer.  You can say y to build it into the
+               kernel, or m to build it as a module.  See the
+               configuration help on the Speakup choice above for more
+               info.
+
+config SPEAKUP_KEYPC
+       depends on SPEAKUP
+       tristate "Keynote Gold PC, keypc"
+       ---help---
+               
+               This is the Speakup driver for the Keynote Gold
+               PC synthesizer.  You can say y to build it into the
+               kernel, or m to build it as a module.  See the
+               configuration help on the Speakup choice above for more
+               info.
+
+config SPEAKUP_LTLK
+       depends on SPEAKUP
+       tristate "DoubleTalk LT or LiteTalk, ltlk"
+---help---
+
+               This is the Speakup driver for the LiteTalk/DoubleTalk
+               LT synthesizer.  You can say y to build it into the
+               kernel, or m to build it as a module.  See the
+               configuration help on the Speakup choice above for more
+               info.
+
+config SPEAKUP_SFTSYN
+       depends on SPEAKUP
+       tristate "Software synthesizers, sftsyn"
+---help---
+
+               This is the software synthesizer device node.  It will
+               register a device /dev/sftsyn which midware programs
+               and speech
+               daemons may open and read to provide kernel output to
+               software synths
+               such as festival, flite, tuxtalk and so forth.  You
+               can select 'y' or
+               'm' to have it built-in to the kernel or loaded as a module.
+
+config SPEAKUP_SPKOUT
+       depends on SPEAKUP
+       tristate "Speak Out, spkout"
+       ---help---
+               
+               This is the Speakup driver for the Speakout synthesizer.
+                You can say y to build it into the kernel, or m to
+               build it as a module.  See the configuration help on the
+               Speakup choice above for more info.
+
+config SPEAKUP_TXPRT
+       depends on SPEAKUP
+       tristate "Transport, txprt"
+       ---help---
+               
+               This is the Speakup driver for the Transport
+               synthesizer.  You can say y to build it into the kernel,
+               or m to build it as a module.  See the configuration
+               help on the Speakup choice above for more info.
+
+if SPEAKUP != n
+       comment 'Enter the 3 to 6 character keyword from the list above, or none for no default synthesizer on boot up.'
+       depends on SPEAKUP
+endif
+
+config SPEAKUP_DEFAULT
+       string "Choose Default synthesizer for Speakup"
+       default "none"
+
+endmenu
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/Makefile linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/Makefile
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/Makefile 1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/Makefile 2004-10-21 07:39:22.000000000 -0700
@@ -0,0 +1,61 @@
+#
+# Makefile for the speakup speech output system.
+#
+
+V := $(shell awk '/UTS_RELEASE/ {print substr($$3,2,3)}' $(TOPDIR)/include/linux/version.h)
+ifeq ($V,2.4)
+# Note! Dependencies are done automagically by 'make dep', which also
+# removes any old dependencies. DON'T put your own dependencies here
+# unless it's something special (ie not a .c file).
+#
+# Note 2! The CFLAGS definitions are now inherited from the
+# parent makes..
+#
+O_TARGET       := spk.o
+export-objs    := speakup_drvcommon.o speakup.o
+endif
+obj-m = speakup_keyhelp.o
+speakupmain-objs := speakup.o speakup_drvcommon.o
+obj-$(CONFIG_SPEAKUP)  += speakupmain.o
+obj-$(CONFIG_SPEAKUP_ACNTPC)   += speakup_acntpc.o
+obj-$(CONFIG_SPEAKUP_ACNTSA)   += speakup_acntsa.o
+obj-$(CONFIG_SPEAKUP_APOLLO)   += speakup_apollo.o
+obj-$(CONFIG_SPEAKUP_AUDPTR)   += speakup_audptr.o
+obj-$(CONFIG_SPEAKUP_BNS)      += speakup_bns.o
+obj-$(CONFIG_SPEAKUP_DECEXT)   += speakup_decext.o
+obj-$(CONFIG_SPEAKUP_DECPC)    += speakup_decpc.o
+obj-$(CONFIG_SPEAKUP_DECTLK)   += speakup_dectlk.o
+obj-$(CONFIG_SPEAKUP_DTLK)     += speakup_dtlk.o
+obj-$(CONFIG_SPEAKUP_KEYPC)    += speakup_keypc.o
+obj-$(CONFIG_SPEAKUP_LTLK)     += speakup_ltlk.o
+obj-$(CONFIG_SPEAKUP_SFTSYN)   += speakup_sftsyn.o
+obj-$(CONFIG_SPEAKUP_SPKOUT)   += speakup_spkout.o
+obj-$(CONFIG_SPEAKUP_TXPRT)    += speakup_txprt.o
+
+ifeq ($V,2.4)
+       include $(TOPDIR)/Rules.make
+
+speakupmap.h: speakupmap.map genmap
+       ./genmap speakupmap.map >$@
+
+genmap: genmap.c mapdata.h
+       cc -o genmap genmap.c
+
+mapdata.h: makemapdata.c keyinfo.h
+       cc -o makemapdata makemapdata.c
+       ./makemapdata >mapdata.h
+
+endif  
+speakupmain.o:speakup.o speakup_drvcommon.o
+       ld -r -o speakupmain.o speakup.o speakup_drvcommon.o
+
+$(obj)/speakupmap.h: $(src)/speakupmap.map $(src)/genmap
+       $(src)/genmap $(src)/speakupmap.map >$@
+
+$(obj)/mapdata.h: $(src)/keyinfo.h $(src)/makemapdata
+       $(src)/makemapdata >$@
+
+$(obj)/genmap: $(obj)/mapdata.h
+
+HOSTCFLAGS := -Iinclude -I/usr/include
+hostprogs-y := makemapdata genmap
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/TODO linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/TODO
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/TODO     1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/TODO     2004-03-06 07:55:29.000000000 -0800
@@ -0,0 +1,50 @@
+The format of this file is getting organized to help me keep track of
+where we are going.  I am organizing it into three sections.
+Immediate things which need to be done I.E. code re-organization.  New
+features we are currently working on or at least in the near future.
+Long term features which will move to the new features list as the new
+features list empties.
+
+Immediate:
+
+Check and test all linux supported architectures to make sure speakup
+works with them.
+
+New-Features:
+
+A screen memory find function to place the reading cursor.
+
+synth_file fops need to be filled in and expanded such as some type of
+ioctl function and a real synth_file_read() function.
+
+
+Long-Term-Features:
+
+keyboard macros (ala ASAP/qedit)
+
+finding calling process, so per-program configurations can be loaded
+
+Check park status and store it before doing a console switch. (non-trivial)
+
+user defined scroll-back ala shift-pgup.
+
+insert as 'capslock-style'/'next-style' key -- have internalized speakup
+       variable, which tracks state of the insert key; each speakup bare-key
+       function checks the variable, and possibly calls the alternate
+       function and returns
+
+Chuck wants a bleep if the shift key is hit and the capslock is on.
+Here is his suggested test sequence:
+1. check if the caps lock is set; if it is,
+2. check if the char is alphabetic; if it is,
+3. check if the shift key is pressed; if it is,
+4. send a bell char to the console.
+
+Frank would like a fast way to go to the end of the word in addition
+to moving to the beginning.
+
+Gene thinks we should have a /proc function to store and show the rom
+version of any synth currently operating.
+
+The items in each list have no connection with the order of
+implementation.  I just jotted them down as I thought of them.
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/checkclean linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/checkclean
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/checkclean       1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/checkclean       2000-12-31 10:20:36.000000000 -0800
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ "$1" == "" ]; then
+    echo "You forgot to include a path"
+    exit
+fi
+
+cp -R /usr/src/linux/drivers/char/speakup $1/speakup
+cd $1/speakup
+
+rm -rf checkin checkorig checkclean *.o *~ \
+       CVS diff-v22/CVS diff-v24/CVS cvsversion.h
+
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/checkin linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/checkin
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/checkin  1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/checkin  2003-05-12 18:05:31.000000000 -0700
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+cd ../../..
+ROOTDIR=`pwd`
+VERSION=v`head -2 $ROOTDIR/Makefile | \
+       awk '{ printf "%s",$3 }'`
+
+DIR=$ROOTDIR/drivers/char/speakup
+
+echo "Checking in $VERSION"
+
+#  check for CVSROOT stuff
+if [ ! -d ${DIR}/CVS ] && [ "$CVSROOT" == "" ]; then
+       echo 'CVSROOT not set.  Enter it below.'
+       read -p 'CVSROOT> ' CVSROOT
+       [ "$CVSROOT" == "" ] && exit
+       export CVSROOT
+       cvs login || exit
+fi
+
+#  do I have a new version to deal with?
+CVS_ADD=n
+if [ ! -d ${DIR}/diff-${VERSION}/CVS ]; then
+       CVS_ADD=y
+fi
+
+#  make patch files
+echo -n 'Creating CVS files ['
+for i in `cat ${DIR}/patchlist-${VERSION}`; do
+       patch=`echo $i | cut -f 1 -d ,`
+       filebase=`echo $i | cut -f 2 -d ,`
+
+       mkdir -p ${DIR}/diff-${VERSION}
+       fname="${DIR}/diff-${VERSION}/${filebase//\//^}"
+
+       if [ "$patch" == "0" ]; then
+               #  Just copy it
+               if [ $fname.copy -ot $filebase ] || [ ! -e $fname.copy ]; then
+                       echo -n c
+                       cp $ROOTDIR/$filebase $fname.copy
+               else
+                       echo -n .
+               fi
+       else
+               #  Make a patch
+               if [ -e $ROOTDIR/$filebase.orig ]; then
+                   if [ $fname.patch -ot $filebase ] || [ ! -e $fname.patch ] ; then
+                       echo -n p
+                       diff -urN $ROOTDIR/$filebase.orig $filebase > $fname.patch
+                   else
+                       echo -n .
+                   fi
+               else
+                   #  can't patch w/o .orig
+                   echo !
+                   echo Error: $ROOTDIR/$filebase.orig doesn\'t exist!
+                   exit
+               fi
+       fi
+done
+echo '] done.'
+
+[ "$1" == "-p" ] && exit
+
+cd ${DIR}
+
+echo 'Creating cvsversion.h'
+echo '#define CVSVERSION " CVS:' `date` '"' > cvsversion.h
+
+echo 'Sending to CVS...'
+if [ "$CVS_ADD" == "y" ]; then
+       cvs add diff-${VERSION} || exit
+       cvs add diff-${VERSION}/* || exit
+fi
+cvs -Q ci || exit
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/checkout linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/checkout
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/checkout 1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/checkout 2005-08-15 07:47:45.000000000 -0700
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+ROOTDIR=/usr/src/linux
+if [ "$1" != "" ]; then
+       ROOTDIR="$1"
+else
+    if [ -d kernel -a -d Documentation ]; then
+       ROOTDIR=`pwd`
+    fi
+fi
+
+VERSION=v`head -2 $ROOTDIR/Makefile | \
+       awk '{ printf "%s",$3 }'`
+
+DIR=$ROOTDIR/drivers/char/speakup
+
+echo "Patching version $VERSION"
+
+if [ ! -d ${DIR}/CVS ] && [ "$CVSROOT" == "" ]; then
+       echo 'CVSROOT not set.  Enter it below.  Hit enter for anonymous.'
+       read -p 'CVSROOT> ' CVSROOT
+       [ "$CVSROOT" == "" ] &&
+         CVSROOT=':pserver:mike@nondescript.ca:/usr/src/CVS'
+       export CVSROOT
+       cvs login || exit
+fi
+
+if [ "$1" != "-p" ]; then
+       #  get new version
+       mkdir -p ${DIR%/speakup}
+       cd ${DIR%/speakup}
+       if [ -d speakup ] && [ -d ${DIR}/CVS ]; then
+               cd speakup
+               cvs update -d -P || exit
+       else
+       rm -fr ${DIR}
+               cvs co -P speakup || exit
+               cd speakup
+       fi
+fi
+
+#  make .orig files
+echo -n 'Creating .orig files ['
+for i in `cat ${DIR}/patchlist-${VERSION}`; do
+       patch=`echo $i | cut -f 1 -d ,`
+       filebase=`echo $i | cut -f 2 -d ,`
+
+       mkdir -p `dirname $ROOTDIR/$filebase`
+       if [ "$patch" == "1" ]; then
+               if [ ! -e $ROOTDIR/$filebase.orig ]; then
+                       echo -n .
+                       cp $ROOTDIR/$filebase $ROOTDIR/$filebase.orig
+               fi
+       fi
+done
+echo '] done.'
+
+#  apply patches
+echo -n 'Patching files ['
+for i in ${DIR}/diff-${VERSION}/*.patch; do
+       # skip dirs
+       [ -d $i ] && continue
+       echo -n p
+       writeloc=${i##$DIR\/diff-${VERSION}\/}
+       writeloc=${writeloc%.patch}
+       writeloc=${writeloc//^/\/} 
+       patch --silent -f -p0 -o $ROOTDIR/$writeloc $ROOTDIR/$writeloc.orig $i
+done
+echo '] done.'
+
+#  copy files
+echo -n 'Copying files ['
+for i in ${DIR}/diff-${VERSION}/*.copy; do
+       # skip dirs
+       [ -d $i ] && continue
+       echo -n c
+       writeloc=${i##$DIR\/diff-${VERSION}\/}
+       writeloc=${writeloc%.copy}
+       writeloc=${writeloc//^/\/} 
+       cp $i $ROOTDIR/$writeloc
+done
+echo '] done.'
+
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/cvsversion.h linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/cvsversion.h
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/cvsversion.h     1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/cvsversion.h     2005-08-16 12:57:05.000000000 -0700
@@ -0,0 +1 @@
+#define CVSVERSION " CVS: Tue Aug 16 15:56:58 EDT 2005 "
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/dtload.c linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/dtload.c
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/dtload.c 1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/dtload.c 2003-08-08 11:15:12.000000000 -0700
@@ -0,0 +1,554 @@
+/*
+ * This is the DECtalk PC firmware loader for the Linux kernel, version 1.0
+ *
+ * Original 386BSD source:
+ *      Copyright ( c ) 1996 Brian Buhrow <buhrow@lothlorien.nfbcal.org>
+ *
+ * Adapted for Linux:
+ *      Copyright ( c ) 1997 Nicolas Pitre <nico@cam.org>
+ *
+ * Adapted for speakup:
+ *      Copyright ( c ) 2003 David Borowski <david575@golden.net>
+ *
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * ( at your option ) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <malloc.h>
+#include <sys/errno.h>
+#include <asm/io.h>
+#include "dtload.h"
+#include "dtpc_reg.h"
+
+#define dt_delay(x) usleep(x)
+int verbose = 0, intest = 0,infd = -1;
+int image_len, total_paras;
+int dt_stat, dma_state = 0, has_kernel = 0;
+struct dos_reloc fixups[512];
+char *read_buff = NULL;
+struct dos_exe_header header;
+u_short iobase = 0x350;
+
+static inline int dt_getstatus( )
+{
+  dt_stat =  inb_p( iobase )|(inb_p( iobase+1 )<<8);
+  return dt_stat;
+}
+
+static void dt_sendcmd( u_int cmd )
+{
+  outb_p( cmd & 0xFF, iobase );
+  outb_p( (cmd>>8) & 0xFF, iobase+1 );
+}
+
+static int dt_waitbit( int bit )
+{
+  int timeout = 100;
+  while ( --timeout > 0 ) {
+    if( (dt_getstatus( ) & bit ) == bit ) return 1;
+    usleep( 1000 );
+  }
+  return 0;
+}
+
+static int dt_sendcmd_wait( u_int cmd, int bit )
+{
+  int timeout = 1000;
+  outb_p( cmd & 0xFF, iobase );
+  outb_p( (cmd>>8) & 0xFF, iobase+1 );
+  while ( --timeout > 0 ) {
+    if( (dt_getstatus( ) & bit ) == bit ) return 1;
+    usleep( 1000 );
+  }
+  return 0;
+}
+
+static int dt_waitmode( int pattern )
+{
+  int timeout = 1000;
+  while ( --timeout > 0 ) {
+    if( dt_getstatus( ) == pattern ) return 1;
+    usleep( 1000 );
+  }
+  fprintf( stderr, "waitmode p=%x s = %x\n", pattern, dt_stat );
+  return 0;
+}
+
+static int dt_wait_dma( )
+{
+  int timeout = 1000, state = dma_state;
+  if( !has_kernel ){
+    dt_delay( 500 );
+    return( dt_waitbit( STAT_dma_ready ) );
+  }
+  if( ! dt_waitbit( STAT_dma_ready ) ) return 0;
+  while ( --timeout > 0 ) {
+    if( (dt_getstatus()&STAT_dma_state) == state ) return 1;
+    usleep( 1000 );
+  }
+  dma_state = dt_getstatus( ) & STAT_dma_state;
+  return 1;
+}
+
+dt_ctrl( u_int cmd )
+{
+  while ( ! dt_waitbit( STAT_cmd_ready ) ) dt_delay( 100 );
+  outb_p( 0, iobase+2 );
+  outb_p( 0, iobase+3 );
+  dt_getstatus( );
+  dt_sendcmd( CMD_control|cmd );
+  outb_p( 0, iobase+6 );
+  dt_delay( 100 );
+  dt_sendcmd( CMD_null );
+  while ( ! dt_waitbit( STAT_cmd_ready ) ) dt_delay( 100 );
+}
+
+int dt_flush( void )
+{
+  dt_ctrl( CTRL_flush );
+  dt_waitbit( STAT_dma_ready );
+  outb_p( DMA_sync, iobase+4 );
+  outb_p( 0, iobase+4 );
+  dma_state ^= STAT_dma_state;
+  while( dt_getstatus( ) & STAT_flushing ) dt_delay( 100 );
+  return 0;
+}
+
+static int dt_sendbuff( char *src, int len )
+{
+  while( len-- ){
+    if( ! dt_wait_dma( ) ) return -1;
+    if( ! (dt_getstatus( ) & STAT_rr_char) ) break;
+    outb_p( DMA_single_in, iobase+4 );
+    outb_p( *src++, iobase+4 );
+    dma_state ^= STAT_dma_state;
+  }
+  return 0;
+}
+
+unsigned long dt_allocmem( unsigned long paras )
+{
+       unsigned long addr;
+       if( ! dt_wait_dma( ) ) return 0;
+       outb_p( DMA_control, iobase+4 );
+       outb_p( DT_MEM_ALLOC, iobase+4 );
+       dma_state ^= STAT_dma_state;
+       if( ! dt_wait_dma( ) ) return 0;
+       outb_p( paras & 0xFF, iobase+4 );
+       outb_p( (paras>>8) & 0xFF, iobase+4 );
+       dma_state ^= STAT_dma_state;
+       if( ! dt_wait_dma( ) ) return 0;
+       addr = inb_p( iobase+4 );
+       addr |= (inb_p( iobase+4 )<<8);
+       addr += (inb_p( iobase+4 )<<4);
+       addr += (inb_p( iobase+4 )<<12);
+       dma_state ^= STAT_dma_state;
+  return addr;
+}
+
+static int testkernel( void )
+{
+  dt_sendcmd( CMD_sync );
+  if( ! dt_waitbit( STAT_cmd_ready ) ) return -10;
+  has_kernel = ( dt_stat&0x8000 ) ? 1 : 0;
+  if ( verbose ) printf( "testkernel got %x\n", dt_stat );
+  if ( has_kernel ) return 0;
+       dt_delay( 100 );
+  return 1;
+}
+
+static int dt_loadmem( int addr, int len, char *src )
+{
+  char c;
+  int l;
+  if ( verbose ) printf( "dt_loadmem: addr = %08X size = %d\n", addr, len );
+  do {
+    l = len;
+    if ( l >= 0xc000 ) l = 0xc000;
+    len -= l;
+    if( ! dt_wait_dma( ) ) return -1;
+    outb_p( DMA_control, iobase+4 );
+    outb_p( DT_LOAD_MEM, iobase+4 );
+    dma_state ^= STAT_dma_state;
+    if( ! dt_wait_dma( ) ) return -2;
+    outb_p( addr & 0xFF, iobase+4 );
+    outb_p( (addr>>8) & 0xFF, iobase+4 );
+    outb_p( (addr>>16) & 0xFF, iobase+4 );
+    outb_p( (addr>>24) & 0xFF, iobase+4 );
+    outb_p( l & 0xFF, iobase+4 );
+    outb_p( (l>>8) & 0xFF, iobase+4 );
+    dma_state ^= STAT_dma_state;
+    if( ! dt_wait_dma( ) ) return -3;
+    addr += l;
+    while( l-- ){ 
+      c = *src++;
+      outb_p( c, iobase+4 );
+    }
+    dma_state ^= STAT_dma_state;
+  } while ( len > 0 );
+  return 0;
+}
+
+unsigned int loadfile ( char *filename )
+{
+  int i, header_size;
+  unsigned int total_paras;
+  long fix;
+  infd = open ( filename, O_RDONLY );
+  if ( infd == -1 ) {
+      perror ( "Opening file: " );
+      return 0;
+    }
+  read ( infd, &header, sizeof ( struct dos_exe_header ) );
+  if ( header.id != 0x5a4d ) {
+      fprintf ( stderr, "Invalid header file format\n" );
+      fprintf ( stderr, "Want 0x5a4d, got 0x%x\n", header.id );
+      return 0;
+    }
+  if ( header.relen > MAX_FIXUPS ) {
+      fprintf ( stderr, "Too many fixups\n" );
+      return 0;
+    }
+  lseek ( infd, ( long ) header.reloc, SEEK_SET );
+  read ( infd, fixups, sizeof ( struct dos_reloc ) * header.relen );
+  header_size = header.hsize * 16;
+  lseek ( infd, ( long )header_size, SEEK_SET );
+  image_len = ( ( header.pages-1 )*512 ) + ( header.rem- header_size );
+  total_paras =  ( image_len >> 4 ) + header.hmin + 16;
+  read ( infd, read_buff, image_len );
+  close( infd );
+  return total_paras;
+}
+
+static int loadkernel( char *filename )
+{
+  int segfix = 0x40, fix, i;
+  int ipval, csval;
+  if ( has_kernel ) return 0;
+  if ( !loadfile( filename ) ) return -1;
+  header.csval += segfix;
+  header.ssval += segfix;
+  if ( verbose ) {
+      printf ( "Loading kernel of %ld bytes ( %d relocs )\n",
+             image_len, header.relen );
+      printf ( "    cs:ip == %04x:%04x   ss:sp == %04x:%04x\n",
+             header.csval, header.ipval, header.ssval, header.spval );
+    }
+  for ( i = 0; i < header.relen; i++ ) {
+      fix = ( fixups[i].segment << 4 ) + fixups[i].offset;
+      ( *( unsigned int * ) &read_buff[fix] ) += segfix;
+    }
+  csval = header.csval;
+  ipval = header.ipval;
+  dt_sendcmd_wait( MODULE_reset, MODULE_init );
+  dt_sendcmd( CMD_reset );
+  if( dt_getstatus( ) == MODULE_self_test ){
+    if( ! dt_waitmode( MODULE_init ) ) return -1;
+  }
+  if ( !dt_sendcmd_wait( CMD_reset, MODE_status ) ) return -2;
+  if ( !dt_sendcmd_wait( CMD_sync, MODE_error ) ) return -3;
+  if ( !dt_sendcmd_wait( CMD_reset, MODE_status ) ) return -4;
+  if ( verbose ) printf( "card is ready\n" );
+  dt_sendcmd( CMD_dma );
+  if( ! dt_waitbit( STAT_dma_ready ) ) return -5;
+  if( ( i = dt_loadmem( 0x00000400, image_len, read_buff ) ) ) {
+   fprintf( stderr, "kernel load failed, status %d\n", i );
+    return -6;
+  }
+  dt_delay( 100 );
+  /* the kernel is loaded, start it */
+  if ( !dt_sendcmd_wait( CMD_reset, MODE_status ) ) return -7;
+  dt_sendcmd( CMD_dma+1 );   /**xxx**/
+       dt_delay( 100 );
+  if( ! dt_waitbit( STAT_dma_ready ) ) return-8;
+  outb_p( DMA_control, iobase+4 );
+  outb_p( DT_START_TASK, iobase+4 );
+       dt_delay( 100 );
+  outb_p( ipval & 0xFF, iobase+4 );
+  outb_p( (ipval>>8) & 0xFF, iobase+4 );
+  outb_p( csval & 0xFF, iobase+4 );
+  outb_p( (csval>>8) & 0xFF, iobase+4 );
+       if( ! dt_waitmode( 0xc001 ) ) return -9;
+  if ( verbose ) {
+    printf( "done loading kernel\n" );
+  }
+  return testkernel( );
+}
+
+int loaddict ( char *filename, char *name, int type )
+{
+  int i, read_index, read_size, act_size;
+  unsigned short *index_fix, seg_fix;
+  unsigned long entries, index, dic_bytes, dic_addr;
+  unsigned int total_paras;
+  unsigned long param, l;
+  infd = open ( filename, O_RDONLY );
+  if ( infd == -1 ) {
+      perror ( filename );
+      return -1;
+    }
+/* read in the entry count and the actual entry size excluding the
+ * index table ( which is entries * 4 ) ...  */
+  read ( infd, &entries, 4 );
+  read ( infd, &dic_bytes, 4 );
+  if ( verbose )
+    printf ( "Loading %s dictionary of %lu entries, %lu bytes.\n",
+           name, entries, dic_bytes );
+  total_paras = ( ( ( entries * 4 ) + dic_bytes ) >> 4 ) + 2;
+  if ( verbose )
+    printf ( "Allocating %d paragraphs of free ram ...\n", total_paras );
+  l = dt_allocmem( total_paras );
+  if ( l == 0 ) {
+      perror ( "Error requesting memory from speech device" );
+      return -1;
+    }
+  seg_fix = ( l >> 4 ) & 0xffff;
+  dic_addr = l;
+  index = entries;
+  index_fix = ( unsigned short * ) &read_buff[0];
+  if ( verbose )
+    printf ( "Index table starts at %lx\n", l );
+  read_index = index*4;
+  act_size = read ( infd, read_buff, read_index );
+  if ( act_size != read_index ) {
+    fprintf ( stderr, "\nError reading indexes\n" );
+    fprintf ( stderr, "    exp : %d  act : %d\n", read_index * 4, act_size );
+    return -1;
+  }
+  for ( i = 1; i < index * 2; i += 2 )
+    index_fix[i] += seg_fix;
+  if( ( i = dt_loadmem( l, read_index, read_buff ) ) ) {
+    fprintf ( stderr, "\nError loading indexes at 0x%lX: i %d\n",
+      l, i );
+    return -1;
+  }
+  l += read_index;
+/* now, load up the dictionary bytes ...  */
+  if ( verbose )
+    printf ( "Dictionary text starts at %lx\n", l );
+  read_size = dic_bytes;
+  if ( ( act_size = read ( infd, read_buff, read_size ) ) != read_size ) {
+    fprintf ( stderr, "\nError reading dictionary text!\n" );
+    fprintf ( stderr, "asked : %d  actual : %d\n", act_size, read_size );
+    return -1;
+  }
+  if( ( i = dt_loadmem( l, read_size, read_buff ) ) ) {
+    fprintf ( stderr, "\nError loading dictionary at 0x%lX: status %d\n",
+      l, i );
+    return -1;
+  }
+  if( ! dt_wait_dma( ) ) return -1;
+  outb_p( DMA_control, iobase+4 );
+  outb_p( DT_SET_DIC, iobase+4 );
+       dma_state ^= STAT_dma_state;
+  if( ! dt_wait_dma( ) ) return -1;
+  l  = dic_addr;
+       l = ((l << 12) & 0xFFFF0000) + (l & 0x0000000F);
+  outb_p( l & 0xFF, iobase+4 );
+  outb_p( (l>>8) & 0xFF, iobase+4 );
+  outb_p( (l>>16) & 0xFF, iobase+4 );
+  outb_p( (l>>24) & 0xFF, iobase+4 );
+  l = entries;
+  outb_p( l & 0xFF, iobase+4 );
+  outb_p( (l>>8) & 0xFF, iobase+4 );
+  outb_p( (l>>16) & 0xFF, iobase+4 );
+  outb_p( (l>>24) & 0xFF, iobase+4 );
+       l = type;
+  outb_p( l & 0xFF, iobase+4 );
+  outb_p( (l>>8) & 0xFF, iobase+4 );
+       dma_state ^= STAT_dma_state;
+  close ( infd );
+  if ( verbose ) printf( "dictionary load complete\n" );
+  return 0;
+}
+
+int loadexe ( char *filename )
+{
+  unsigned int load_addr = 0, seg_fix;
+  int i, read_size;
+  int ipval, csval;
+  long fix;
+  unsigned long total_paras;
+  total_paras = loadfile ( filename );
+  if ( total_paras == 0 ) return -1;
+  load_addr = dt_allocmem( total_paras );
+  if ( load_addr == 0 ) {
+    fprintf ( stderr, "Error allocating memory on card: " );
+    return -1;
+  }
+  seg_fix = ( load_addr >> 4 ) & 0xffff;
+  if ( verbose ) {
+      printf ( "Loading %s %ld bytes ( %d relocs )\n",
+             filename, image_len, header.relen );
+      printf ( "Allocating %ld bytes of free ram at %05x\n",
+             ( long ) header.hmin * 16, load_addr );
+      printf ( "Total memory taken is %ld bytes\n", ( long ) total_paras * 16 );
+      printf ( "    cs:ip == %04x:%04x   ss:sp == %04x:%04x\n",
+             header.csval + seg_fix, header.ipval, header.ssval + seg_fix, header.spval );
+    }
+    for ( i = 0; i < header.relen; i++ ) {
+       fix = ( ( long ) fixups[i].segment << 4 ) + ( long ) fixups[i].offset;
+       ( *( unsigned int * ) &read_buff[fix] ) += seg_fix;
+        }
+  if( ( i = dt_loadmem( load_addr, image_len, read_buff ) ) ) {
+    fprintf ( stderr, "Error loading speech device at 0x%lX: status %d\n",
+      load_addr, i );
+    return -1;
+  }
+  csval = header.csval + seg_fix;
+  ipval = header.ipval;
+  if( ! dt_wait_dma( ) ) return -1;
+  outb_p( DMA_control, iobase+4 );
+  outb_p( DT_START_TASK, iobase+4 );
+       dma_state ^= STAT_dma_state;
+  if( ! dt_wait_dma( ) ) return -1;
+  outb_p( ipval & 0xFF, iobase+4 );
+  outb_p( (ipval>>8) & 0xFF, iobase+4 );
+  outb_p( csval & 0xFF, iobase+4 );
+  outb_p( (csval>>8) & 0xFF, iobase+4 );
+       dma_state ^= STAT_dma_state;
+  return 0;
+}
+
+void release_io( void )
+{
+  ioperm( (long)iobase, 8, 0 );
+  ioperm( (long)0x0080, 1, 0 );
+  if ( read_buff ) free( read_buff );
+}
+
+parseparm( char *parm, char *value )
+{
+  char *cp = parm+strlen( parm );
+  while ( --cp > parm ) if ( *cp > ' ' ) break;
+  cp[1] = '\0';
+  if ( !strcmp( parm, "io" ) ) {
+    long io = strtol( value, 0, 0 );
+    if ( io >= 0x100 && io <= 0x350 ) {
+      iobase = (u_short)io;
+      return;
+    }
+    fprintf( stderr, "invalid io value %s\n", value );
+    exit( 1 );
+  } else if ( !strcmp( parm,"verbose" ) ) {
+    verbose = atoi( value );
+  }
+}
+
+do_test( void )
+{
+  char buffer[512];
+  int len;
+  dma_state = dt_getstatus( ) & STAT_dma_state;
+  while ( fgets( buffer, 510, stdin ) ) {
+    len = strlen( buffer );
+    if ( len == 1 ) dt_flush( );
+    else {
+      if ( buffer[len-1] == '\n' ) buffer[len-1] = '\013';
+      dt_sendbuff( buffer, len );
+    }
+  }
+  *buffer = '\013';
+  dt_sendbuff( buffer, 1 );
+}
+
+int main ( int argc, char **argv )
+{
+  char name[80], *cp;
+  char *dirname = 0, *confname = "dec_pc.conf";
+  char *init_msg = "[:ra 360] dec pc initialized\011";
+  FILE *confile;
+  struct stat statbuf;
+  int maxsize = 0, status = 0;
+  while ( --argc > 0 ) {
+    argv++;
+    if ( !strcmp( *argv, "-v" ) ) verbose = 1;
+    else if ( !strcmp( *argv, "-t" ) ) intest = 1;
+    else dirname = *argv;
+  }
+  if ( !dirname ) dirname = "/usr/local/lib/dec_pc";
+  if ( chdir( dirname ) != 0 ) {
+    fprintf( stderr, "cannot chdir to %s\n", dirname );
+    exit( 1 );
+  }
+  if ( !( confile = fopen( confname, "r" ) ) ) {
+    fprintf( stderr, "could not open %s", confname );
+    exit( 1 );
+  }
+  while ( fgets( name, 80, confile ) ) {
+    cp = strchr( name, '\n' );
+    if ( cp ) *cp = '\0';
+    if ( ( cp = strchr( name, '=' ) ) ) {
+      *cp++ = '\0';
+      parseparm( name, cp );
+      continue;
+    }
+    if ( stat( name, &statbuf ) != 0 ) {
+      fprintf( stderr, "cannot stat %s\n", name );
+      exit( 1 );
+    }
+    if ( statbuf.st_size > maxsize ) maxsize = statbuf.st_size;
+  }
+  rewind( confile );
+  if ( ioperm( (long)0x0080, 1, 1 ) || ioperm( (long)iobase, 8, 1 ) ) {
+    fprintf( stderr, "could not get ioperm\n" );
+    exit( 1 );
+  }
+  atexit( release_io );
+  if ( testkernel( ) == 0 ) {
+    if ( intest ) do_test( );
+    else fprintf( stderr, "kernel already loaded\n" );
+    exit( 0 );
+  }
+  read_buff = malloc(  maxsize );
+  if ( !read_buff ) {
+    fprintf( stderr, "cannot malloc %d bytes\n", maxsize );
+    exit( 1 );
+  }
+  while ( fgets( name, 80, confile ) && !status ) {
+    cp = strchr( name, '\n' );
+    if ( cp ) *cp = '\0';
+    if ( strchr( name, '=' ) ) continue; /* a parameter */
+    if ( !( cp = strchr( name, '.' ) ) ) continue;
+    cp++;
+    if ( !strcmp ( cp, "dic" ) ) {
+      status = loaddict ( name, "primary", PRIMARY_DIC );
+    } else if ( !strcmp ( cp, "dtu" ) ) {
+      status = loaddict ( name, "user", USER_DIC );
+    } else if ( !strcmp ( cp, "dta" ) ) {
+      status = loaddict ( name, "abbreviation file", ABBREV_DIC );
+    } else if ( !strcmp ( cp, "exe" ) ) {
+      status = loadexe ( name );
+    } else if ( !strcmp ( cp, "sys" ) ) {
+      status = loadkernel ( name );
+    }
+  }
+  if ( status ) fprintf( stderr, "status %d\n", status );
+  fclose( confile );
+  if ( status ) exit( status );
+  dt_sendbuff( init_msg, strlen( init_msg ) );
+  sleep( 1 );
+  if ( intest ) do_test( );
+  exit( 0 );
+}
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/dtload.h linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/dtload.h
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/dtload.h 1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/dtload.h 2003-07-31 08:27:06.000000000 -0700
@@ -0,0 +1,57 @@
+/*
+ * This is the DECtalk PC firmware loader for the Linux kernel, version 1.0
+ *
+ * Original 386BSD source:
+ *      Copyright (c) 1996 Brian Buhrow <buhrow@lothlorien.nfbcal.org>
+ *
+ * Adapted for Linux:
+ *      Copyright (c) 1997 Nicolas Pitre <nico@cam.org>
+ *
+ * Adapted for speakup:
+ *      Copyright (c) 2003 David Borowski <david575@golden.net>
+ *
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#define        MAX_FIXUPS      512             /* maximum fixups per exe */
+/*
+ *  msdos .exe files will look like ...
+ */
+
+struct dos_exe_header {
+       unsigned short id;              /* Linker's signature, must be 0x5a4d */
+       unsigned short rem;             /* length of image mod 512 */
+       unsigned short pages;           /* length of image in pages of 512 bytes */
+       unsigned short relen;           /* number of relocation items */
+       unsigned short hsize;           /* header size in paragraphs of 16 bytes */
+       unsigned short hmin;            /* min # of paragraphs above prog end */
+       unsigned short hmax;
+       unsigned short ssval;
+       unsigned short spval;           /* to be loaded in sp */
+       unsigned short  checksum;
+       unsigned short  ipval;          /* to be loaded in ip */
+       unsigned short  csval;          /* segment offset to code */
+       unsigned short  reloc;          /* location of relocation items */
+       unsigned short  ovrlay;         /* overlay number */
+};
+
+/*  a dos relocation element looks like */
+
+struct dos_reloc {
+       short int offset, segment;
+};
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/dtpc_reg.h linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/dtpc_reg.h
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/dtpc_reg.h       1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/dtpc_reg.h       2003-07-31 08:27:06.000000000 -0700
@@ -0,0 +1,132 @@
+/*
+ * This is the DECtalk PC register constants (from DEC's DOS driver)
+ *
+ * Original code:
+ *      Copyright (c) by Digital Equipment Corp.
+ *
+ * 386BSD DECtalk PC driver:
+ *      Copyright (c) 1996 Brian Buhrow <buhrow@lothlorien.nfbcal.org>
+ *
+ * Linux DECtalk PC driver:
+ *      Copyright (c) 1997 Nicolas Pitre <nico@cam.org>
+ *
+ * speakup DECtalk PC driver:
+ *      Copyright (c) 2003 David Borowski <david575@golden.net>
+ *
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+/*
+ *  port interface defs ... used by dtpc.c
+ */
+
+#define        MODULE_init             0x0dec          /* module in boot code */                       
+#define        MODULE_self_test        0x8800          /* module in self-test */
+#define        MODULE_reset            0xffff          /* reinit the whole module */
+
+#define        MODE_mask               0xf000          /* mode bits in high nibble */
+#define        MODE_null               0x0000
+#define        MODE_test               0x2000          /* in testing mode */
+#define        MODE_status             0x8000
+#define        STAT_int                0x0001          /* running in interrupt mode */
+#define        STAT_tr_char    0x0002          /* character data to transmit */
+#define        STAT_rr_char    0x0004          /* ready to receive char data */
+#define        STAT_cmd_ready  0x0008          /* ready to accept commands */
+#define        STAT_dma_ready  0x0010          /* dma command ready */
+#define        STAT_digitized  0x0020          /* spc in digitized mode */
+#define        STAT_new_index  0x0040          /* new last index ready */
+#define        STAT_new_status 0x0080          /* new status posted */
+#define        STAT_dma_state  0x0100          /* dma state toggle */
+#define        STAT_index_valid        0x0200          /* indexs are valid */
+#define        STAT_flushing   0x0400          /* flush in progress */
+#define        STAT_self_test  0x0800          /* module in self test */
+#define        MODE_ready              0xc000          /* module ready for next phase */
+#define        READY_boot              0x0000                          
+#define        READY_kernel    0x0001          
+#define        MODE_error              0xf000
+
+#define        CMD_mask                        0xf000          /* mask for command nibble */
+#define        CMD_null                        0x0000          /* post status */
+#define        CMD_control             0x1000          /* hard control command */
+#define        CTRL_mask               0x0F00  /*   mask off control nibble */
+#define        CTRL_data               0x00FF  /*   madk to get data byte */
+#define        CTRL_null               0x0000  /*   null control */
+#define        CTRL_vol_up             0x0100  /*   increase volume */
+#define        CTRL_vol_down           0x0200  /*   decrease volume */
+#define        CTRL_vol_set            0x0300  /*   set volume */
+#define        CTRL_pause              0x0400  /*   pause spc */
+#define        CTRL_resume             0x0500  /*   resume spc clock */
+#define        CTRL_resume_spc         0x0001  /*   resume spc soft pause */
+#define        CTRL_flush              0x0600  /*   flush all buffers */
+#define        CTRL_int_enable 0x0700  /*   enable status change ints */
+#define        CTRL_buff_free          0x0800  /*   buffer remain count */
+#define        CTRL_buff_used          0x0900  /*   buffer in use */
+#define        CTRL_speech             0x0a00  /*   immediate speech change */
+#define                CTRL_SP_voice           0x0001  /*      voice change */
+#define                CTRL_SP_rate            0x0002  /*      rate change */
+#define                CTRL_SP_comma           0x0003  /*      comma pause change */
+#define                CTRL_SP_period          0x0004  /*      period pause change */
+#define                CTRL_SP_rate_delta      0x0005  /*        delta rate change */
+#define                CTRL_SP_get_param       0x0006  /*      return the desired parameter */
+#define        CTRL_last_index 0x0b00  /*   get last index spoken */
+#define        CTRL_io_priority        0x0c00  /*   change i/o priority */
+#define        CTRL_free_mem           0x0d00  /*   get free paragraphs on module */
+#define        CTRL_get_lang           0x0e00  /*   return bit mask of loaded languages */
+#define        CMD_test                        0x2000          /* self-test request */
+#define        TEST_mask               0x0F00  /* isolate test field */
+#define        TEST_null               0x0000  /* no test requested */
+#define        TEST_isa_int            0x0100  /* assert isa irq */
+#define        TEST_echo               0x0200  /* make data in == data out */
+#define        TEST_seg                        0x0300  /* set peek/poke segment */
+#define        TEST_off                        0x0400  /* set peek/poke offset */
+#define        TEST_peek               0x0500  /* data out == *peek */
+#define        TEST_poke               0x0600  /* *peek == data in */
+#define        TEST_sub_code           0x00FF  /* user defined test sub codes */
+#define        CMD_id                  0x3000          /* return software id */
+#define        ID_null                 0x0000  /* null id */
+#define        ID_kernel               0x0100  /* kernel code executing */
+#define        ID_boot                 0x0200  /* boot code executing */
+#define        CMD_dma                 0x4000          /* force a dma start */
+#define        CMD_reset               0x5000          /* reset module status */
+#define        CMD_sync                        0x6000          /* kernel sync command */
+#define        CMD_char_in             0x7000          /* single character send */
+#define        CMD_char_out            0x8000          /* single character get */
+#define        CHAR_count_1            0x0100  /*    one char in cmd_low */
+#define        CHAR_count_2            0x0200  /*      the second in data_low */
+#define        CHAR_count_3            0x0300  /*      the third in data_high */
+#define        CMD_spc_mode            0x9000          /* change spc mode */
+#define        CMD_spc_to_text 0x0100  /*   set to text mode */
+#define        CMD_spc_to_digit        0x0200  /*   set to digital mode */
+#define        CMD_spc_rate            0x0400  /*   change spc data rate */
+#define        CMD_error               0xf000          /* severe error */
+
+enum { PRIMARY_DIC     = 0, USER_DIC, COMMAND_DIC, ABBREV_DIC };
+
+#define        DMA_single_in           0x01
+#define        DMA_single_out          0x02
+#define        DMA_buff_in             0x03
+#define        DMA_buff_out            0x04
+#define        DMA_control             0x05
+#define        DT_MEM_ALLOC            0x03
+#define        DT_SET_DIC              0x04
+#define        DT_START_TASK           0x05
+#define        DT_LOAD_MEM             0x06
+#define        DT_READ_MEM             0x07
+#define        DT_DIGITAL_IN           0x08
+#define        DMA_sync                0x06
+#define        DMA_sync_char           0x07
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/genmap.c linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/genmap.c
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/genmap.c 1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/genmap.c 2003-07-21 05:26:38.000000000 -0700
@@ -0,0 +1,204 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <libgen.h>
+#include <string.h>
+#include <linux/version.h>
+#include <ctype.h>
+
+int get_define(void);
+
+#define MAXKEYS 512
+#define MAXKEYVAL 160
+#define HASHSIZE 101
+#define is_shift -3
+#define is_spk -2
+#define is_input -1
+typedef struct st_key_init t_key_init;
+struct st_key_init {
+       char *name;
+       int value, shift;
+};
+typedef struct st_key t_key;
+struct st_key {
+       char *name;
+       t_key *next;
+       int value, shift;
+};
+unsigned char key_data[MAXKEYVAL][16], *kp;
+
+#include "mapdata.h"
+t_key key_table[MAXKEYS];
+t_key *extra_keys = key_table+HASHSIZE;
+char buffer[256], filename[256];
+FILE *infile;
+char delims[] = "\t\n ";
+char *def_name, *def_val, *cp;
+int map_ver = 119; /* an arbitrary number so speakup can check */
+int lc, shift_table[17];
+int max_states = 1, flags = 0;
+/* flags reserved for later, maybe for individual console maps */
+
+void open_input( char *name )
+{
+       strcpy( filename, name );
+       if ( ( infile = fopen( filename, "r" ) ) == 0 ) {
+               fprintf( stderr, "can't open %s, version %d\n", filename, LINUX_VERSION_CODE );
+               exit( 1 );
+       }
+       lc = 0;
+}
+
+int
+oops( char *msg, char *info )
+{
+       if ( info == NULL ) info = " ";
+       fprintf( stderr, "error: file %s line %d\n", filename, lc );
+       fprintf( stderr, "%s %s\n", msg, info );
+       exit( 1 );
+}
+
+t_key *hash_name( char *name )
+{
+       u_char *pn = (u_char *)name;
+       int hash = 0;
+       while ( *pn ) {
+               hash = ( hash * 17 ) & 0xfffffff;
+       if ( isupper( *pn ) ) *pn = tolower( *pn );
+               hash += ( int )*pn;
+               pn++;
+       }
+       hash %= HASHSIZE;
+       return &key_table[hash];
+}
+
+t_key *find_key( char *name )
+{
+       t_key *this = hash_name( name );
+       while ( this ) {
+               if ( !strcmp( name, this->name ) ) return this;
+               this = this->next;
+       }
+       return this;
+}
+
+t_key *add_key( char *name, int value, int shift )
+{
+       t_key *this = hash_name( name );
+       if ( extra_keys-key_table >= MAXKEYS )
+               oops( "out of key table space, enlarge MAXKEYS", NULL );
+       if ( this->name != NULL ) {
+               while ( this->next ) {
+                       if ( !strcmp( name, this->name ) )
+                               oops( "attempt to add duplicate key", name );
+                       this = this->next;
+               }
+               this->next = extra_keys++;
+               this = this->next;
+       }
+       this->name = strdup( name );
+       this->value = value;
+       this->shift = shift;
+       return this;
+}
+
+int get_shift_value( int state )
+{
+       int i;
+       for ( i = 0; shift_table[i] != state; i++ ) {
+               if ( shift_table[i] == -1 ) {
+                       if ( i >= 16 )
+                               oops( "too many shift states", NULL );
+                       shift_table[i] = state;
+                       max_states = i+1;
+               break;
+       }
+       }
+       return i;
+}
+
+int            
+main( int argc, char *argv[] )
+{
+       int value, shift_state, i, spk_val = 0, lock_val = 0;
+       int max_key_used = 0, num_keys_used = 0;
+       t_key *this;
+       t_key_init *p_init;
+char *argpath, *argname, *argcopy;
+
+       bzero( key_table, sizeof( key_table ) );
+       bzero( key_data, sizeof( key_data ) );
+       shift_table[0] = 0;
+       for ( i = 1; i <= 16; i++ ) shift_table[i] = -1;
+       if ( argc < 2 ) {
+               fputs( "usage: genmap filename\n", stderr );
+               exit( 1 );
+       }
+  for ( p_init = init_key_data; p_init->name[0] != '.'; p_init++ )
+               add_key( p_init->name, p_init->value, p_init->shift );
+       open_input( argv[1] );
+       while ( fgets( buffer, 250, infile ) ) {
+               lc++;
+               value = shift_state = 0;
+               cp = strtok( buffer, delims );
+               if ( *cp == '#' ) continue;
+               while ( cp ) {
+                       if ( *cp == '=' ) break;
+                       this = find_key( cp );
+                       if ( this == NULL )
+                               oops( "unknown key/modifier", cp );
+                       if ( this->shift == is_shift ) {
+                               if ( value )
+                                       oops( "modifiers must come first", cp );
+                               shift_state += this->value;
+                       } else if ( this->shift == is_input )
+                               value = this->value;
+                       else oops( "bad modifier or key", cp );
+                       cp = strtok( 0, delims );
+               }
+               if ( !cp ) oops( "no = found", NULL );
+               cp = strtok( 0, delims );
+               if ( !cp ) oops( "no speakup function after =", NULL );
+               this = find_key( cp );
+               if ( this == NULL || this->shift != is_spk )
+                       oops( "invalid speakup function", cp );
+               i = get_shift_value( shift_state );
+               if ( key_data[value][i] ) {
+                       while ( --cp > buffer )
+                               if ( !*cp ) *cp = ' ';
+                       oops( "two functions on same key combination", cp );
+               }
+               key_data[value][i] = (char)this->value;
+               if ( value > max_key_used ) max_key_used = value;
+       }
+       fclose( infile );
+       this = find_key( "spk_key" );
+       if ( this ) spk_val = this->value;
+       this = find_key( "spk_lock" );
+       if ( this ) lock_val = this->value;
+       for ( lc = 1; lc <= max_key_used; lc++ ) {
+               kp = key_data[lc];
+               if ( !memcmp( key_data[0], kp, 16 ) ) continue;
+               num_keys_used++;
+               for ( i = 0; i < max_states; i++ ) {
+                       if ( kp[i] != spk_val&& kp[i] != lock_val ) continue;
+                       shift_state = shift_table[i];
+                       if ( ( shift_state&16 ) ) continue;
+                       shift_state = get_shift_value( shift_state+16 );
+                       kp[shift_state] = kp[i];
+/* fill in so we can process the key up, as spk bit will be set */
+               }
+       }
+       printf( "\t%d, %d, %d,\n\t", map_ver, num_keys_used, max_states );
+       for ( i = 0; i < max_states; i++ )
+               printf( "%d, ", shift_table[i] );
+       printf( "%d,", flags );
+       for ( lc = 1; lc <= max_key_used; lc++ ) {
+               kp = key_data[lc];
+               if ( !memcmp( key_data[0], kp, 16 ) ) continue;
+               printf( "\n\t%d,", lc );
+               for ( i = 0; i < max_states; i++ )
+                       printf( " %d,", (unsigned int)kp[i] );
+       }
+       printf( "\n\t0, %d\n", map_ver );
+       exit( 0 );
+}
diff -Naurp linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/install linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/install
--- linux-2.6.13-rc6-git13-gentoo/drivers/char/speakup/install  1969-12-31 16:00:00.000000000 -0800
+++ linux-2.6.13-rc6-git13-gentoo-speakup/drivers/char/speakup/install  2005-04-19 09:26:21.000000000 -0700
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+VERSION=v`head -2 /usr/src/linux/Makefile | \
+       awk '{ printf "%s",$3 }'`
+
+DIR=/usr/src/linux/drivers/char/speakup
+
+echo "Patching version $VERSION"
+
+if [ "$1" != "--debug" ]; then
+       SILENT=--silent
+fi
+
+cp -R speakup /usr/src/linux/drivers/char/
+cd /usr/src/linux
+
+#  make .orig files
+echo -n 'Creating .orig files ['
+for i in `cat ${DIR}/patchlist-${VERSION}`; do
+       patch=`echo $i | cut -f 1 -d ,`
+       filebase=`echo $i | cut -f 2 -d ,`
+
+       mkdir -p `dirname $filebase`
+       if [ "$patch" == "1" ]; then
+               if [ ! -e $filebase.orig ]; then
+                       echo -n .
+                       cp $filebase $filebase.orig
+               fi
+       fi
+done
+echo '] done.'