diff -urN 2.4.7-rmk3/linux/Documentation/Configure.help linux/Documentation/Configure.help
--- 2.4.7-rmk3/linux/Documentation/Configure.help	Sat Aug 11 15:42:12 2001
+++ linux/Documentation/Configure.help	Sat Aug 11 21:38:39 2001
@@ -11610,6 +11610,23 @@
   The module will be called dabusb.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
+Host-to-Host USB networking
+CONFIG_USB_USBNET
+  This driver supports network links over USB with USB "Network"
+  or "data transfer" cables, often used to network laptops to PCs.
+  Such cables have chips from suppliers such as NetChip and Prolific.
+  Intelligent USB devices could also use this approach to provide
+  Internet access, using standard USB cabling.
+
+  These links will have names like "usb0", "usb1", etc.  They act
+  like two-node Ethernets, so you can use 802.1d Ethernet Bridging
+  (CONFIG_BRIDGE) to simplify your network routing.
+
+  This code is also available as a kernel module (code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called usbnet.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
 PLUSB driver
 CONFIG_USB_PLUSB
   A driver for the Prolific PL-2302 USB-to-USB network device. This
@@ -17914,6 +17955,18 @@
 CONFIG_SERIAL_SA1100_CONSOLE
   If you have enabled the serial port on the SA1100/SA1110 StrongARM
   CPU you can make it the console by answering Y to this option.
+
+Bitsy touchscreent support
+CONFIG_TOUCHSCREEN_BITSY
+  This option enables touchscreen support for Bitsy.  You do not need
+  the SA1100 touchscreen driver for Bitsy.
+  
+Profiling support (only on SA1100 for now)
+CONFIG_PROFILER
+  This option enables an interrupt-driven profiler capable of instrumenting
+  both the kernel and applications.  Although it is generic, it requires a
+  fast timer interface, support for which currently only exists for the
+  SA1100. 
 
 L7200 serial port support
 CONFIG_SERIAL_L7200
diff -urN 2.4.7-rmk3/linux/Documentation/arm/SA1100/ADSBitsy linux/Documentation/arm/SA1100/ADSBitsy
--- 2.4.7-rmk3/linux/Documentation/arm/SA1100/ADSBitsy	Wed Dec 31 19:00:00 1969
+++ linux/Documentation/arm/SA1100/ADSBitsy	Sun Aug 12 16:02:29 2001
@@ -0,0 +1,43 @@
+ADS Bitsy Single Board Computer
+(It is different from Bitsy(iPAQ) of Compaq)
+
+For more details, contact Applied Data Systems or see
+http://www.applieddata.net/products.html
+
+The Linux support for this product has been provided by 
+Woojung Huh <whuh@applieddata.net>
+
+Use 'make adsbitsy_config' before any 'make config'.
+This will set up defaults for ADS Bitsy support.
+
+The kernel zImage is linked to be loaded and executed at 0xc0400000.  
+
+Linux can  be used with the ADS BootLoader that ships with the
+newer rev boards. See their documentation on how to load Linux.
+
+Supported peripherals:
+- SA1100 LCD frame buffer (8/16bpp...sort of)
+- SA1111 USB Master
+- SA1100 serial port
+- pcmcia, compact flash
+- touchscreen(ucb1200)
+- console on LCD screen
+- serial ports (ttyS[0-2])
+  - ttyS0 is default for serial console
+
+To do:
+- everything else!  :-)
+
+Notes:
+
+- The flash on board is divided into 3 partitions.  
+  You should be careful to use flash on board.
+  It's partition is different from GraphicsClient Plus and GraphicsMaster
+
+- 16bpp mode requires a different cable than what ships with the board.
+  Contact ADS or look through the manual to wire your own. Currently,
+  if you compile with 16bit mode support and switch into a lower bpp
+  mode, the timing is off so the image is corrupted.  This will be
+  fixed soon.
+
+Any contribution can be sent to nico@cam.org and will be greatly welcome!
diff -urN 2.4.7-rmk3/linux/Documentation/arm/SA1100/Assabet_Frontlight linux/Documentation/arm/SA1100/Assabet_Frontlight
--- 2.4.7-rmk3/linux/Documentation/arm/SA1100/Assabet_Frontlight	Wed Dec 31 19:00:00 1969
+++ linux/Documentation/arm/SA1100/Assabet_Frontlight	Sat Aug 11 21:38:39 2001
@@ -0,0 +1,115 @@
+Frontlight Driver for The Intel Assabet (SA-1110 evaluation)
+==============================================================
+  Initial version by: Nicholas Mistry (nmistry@lhsl.com)
+
+
+This driver provides basic functionality for the frontlight
+provided with the Assabet board.   It will enable and disable
+the light.  
+
+The module grabs a dynamically assigned Major, so you will have
+to do a mknod before using the device.  I typically use /dev/sa1100-fl
+
+Because the assabet does not come with its own power supply for the
+one can be obtained/made.  Below is a list of the parts i used to 
+enable mine. 
+
+**   The parts/cable described below assume that your assabet 
+**   is using the Sharp LQ039Q2DS54 Screen. 
+
+Parts List:
+------------
+  1 ERG power 8m122375 DC to AC inverter.
+    obtain from: Endicott Research Group Inc. (http://www.ergpower.com)
+
+  Assabet Side Connector:
+    1 Minitek 90312-005 Housing 
+    3 Minitek 77138-101 Pins
+	obtain both from:  FCI Framatome Group (http://www.fciconnect.com)
+	* Samples Available *  
+
+  Inverter Side Connector:
+    1 Standard 0.1" 4 pin Housing
+    3 Standard 0.1" Pins  (crimp is preferred)
+
+  3 pieces of 26 AWG Stranded Wire each aprox 4"-6" long 
+	(3 colors optional: red,black,white)
+
+
+Cable Diagram:
+--------------
+
+Inverter:				Assabet:
+ 
+ _____                                   _______
+      |      ______     /---------------|  |1  [|  (red wire)
+ V+  1|---- |]   1 |---/   /------------|_ |2  [|  (black wire)
+ GND 2|---- |]   2 |------(------\      |_||3  [|
+ CTL 3|---- |]   3 |-----/        \-----|  |4  [|  (white wire)
+ NE  4|---- |]___4_|                    |__|5__[|
+ _____|
+
+
+
+Example Program: 
+----------------
+
+/*  This following example program will blink on and off the  */
+/*  frontlight 5 times w/ an one second delay.  	      */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include <video/sa1100_frontlight.h>
+
+int main(void) {
+
+  int i, fd, retval;
+
+  fd = open ("/dev/sa1100-fl", O_WRONLY);
+
+  if (fd ==  -1) {
+    perror("/dev/sa1100-fl");
+    exit(errno);
+  }
+  
+  printf("\n\t\t\tFrontlight Driver Test Example.\n\n");
+  
+  for (i=0; i<5; i++) {
+    printf("Turning OFF Frontlight...\n");
+    retval = ioctl(fd, _SA1100_FL_OFF, 0);
+    if (retval == -1) {
+      perror("ioctl");
+      exit(errno);
+    }
+    
+    sleep(1);
+    
+    printf("Turning ON Frontlight...\n");
+    retval = ioctl(fd, _SA1100_FL_ON, 0);
+    if (retval == -1) {
+      perror("ioctl");
+      exit(errno);
+    }
+    
+    sleep(1);
+    
+  }
+  
+  printf("Turning OFF Frontlight...\n");
+  retval = ioctl(fd, _SA1100_FL_OFF, 0);
+  if (retval == -1) {
+    perror("ioctl");
+    exit(errno);
+  }
+
+  fprintf(stderr, "Done.\n");
+
+}
+
+
diff -urN 2.4.7-rmk3/linux/Documentation/arm/SA1100/GraphicsMaster linux/Documentation/arm/SA1100/GraphicsMaster
--- 2.4.7-rmk3/linux/Documentation/arm/SA1100/GraphicsMaster	Wed Dec 31 19:00:00 1969
+++ linux/Documentation/arm/SA1100/GraphicsMaster	Sun Aug 12 16:02:29 2001
@@ -0,0 +1,53 @@
+ADS GraphicsMaster Single Board Computer
+
+For more details, contact Applied Data Systems or see
+http://www.applieddata.net/products.html
+
+The original Linux support for this product has been provided by 
+Nicolas Pitre <nico@cam.org>. Continued development work by
+Woojung Huh <whuh@applieddata.net>
+
+Use 'make graphicsmaster_config' before any 'make config'.
+This will set up defaults for GraphicsMaster support.
+
+The kernel zImage is linked to be loaded and executed at 0xc0400000.  
+
+Linux can  be used with the ADS BootLoader that ships with the
+newer rev boards. See their documentation on how to load Linux.
+
+Supported peripherals:
+- SA1100 LCD frame buffer (8/16bpp...sort of)
+- SA1111 USB Master
+- on-board SMC 92C96 ethernet NIC
+- SA1100 serial port
+- flash memory access (MTD/JFFS)
+- pcmcia, compact flash
+- touchscreen(ucb1200)
+- ps/2 keyboard
+- console on LCD screen
+- serial ports (ttyS[0-2])
+  - ttyS0 is default for serial console
+- Smart I/O (ADC, keypad, digital inputs, etc)
+  See http://www.applieddata.com/developers/linux for IOCTL documentation
+  and example user space code. ps/2 keybd is multiplexed through this driver
+
+To do:
+- everything else!  :-)
+
+Notes:
+
+- The flash on board is divided into 3 partitions.  mtd0 is where
+  the zImage is stored.  It's been marked as read-only to keep you 
+  from blasting over the bootloader. :)  mtd1 is
+  for the ramdisk.gz image.  mtd2 is user flash space and can be
+  utilized for either JFFS or if you're feeling crazy, running ext2
+  on top of it. If you're not using the ADS bootloader, you're
+  welcome to blast over the mtd1 partition also.
+
+- 16bpp mode requires a different cable than what ships with the board.
+  Contact ADS or look through the manual to wire your own. Currently,
+  if you compile with 16bit mode support and switch into a lower bpp
+  mode, the timing is off so the image is corrupted.  This will be
+  fixed soon.
+
+Any contribution can be sent to nico@cam.org and will be greatly welcome!
diff -urN 2.4.7-rmk3/linux/Documentation/arm/SA1100/Neponset linux/Documentation/arm/SA1100/Neponset
--- 2.4.7-rmk3/linux/Documentation/arm/SA1100/Neponset	Wed Dec 31 19:00:00 1969
+++ linux/Documentation/arm/SA1100/Neponset	Sat Aug 11 21:38:39 2001
@@ -0,0 +1,20 @@
+*****************************************************************************
+
+Assabet/Neponset SMC91C96 driver changes
+Brad Parker <brad@parker.boston.ma.us>
+
+These changes are minor modifications to the smc9194.c driver in the
+ARM tree.  The changes are pretty simple and switch the code from 16
+bit to 8 bit accesses.  I left the "THINCLIENT" 16 bit code in with an
+#ifdef.
+
+caveats: the "phase2" (possibly rev2) Nepponset boards have a bug in
+the Neponset CPLD which makes the 91C96 not work (register accesses
+are corrupted).  If you have a rev2 board you need to update the CPLD
+with the cable which plugs into the Neponset J8 socket, Xilinx
+XPLA programming software and files from Intel.  Note that the CPLD
+update files on the Intel's web site won't program an 3128A CPLD.
+You'll need to contact Intel to get the right files (at least I did).
+
+
+-----------------------------------------------------------------------------
diff -urN 2.4.7-rmk3/linux/Documentation/arm/SA1100/Pangolin linux/Documentation/arm/SA1100/Pangolin
--- 2.4.7-rmk3/linux/Documentation/arm/SA1100/Pangolin	Sat Aug 11 15:42:12 2001
+++ linux/Documentation/arm/SA1100/Pangolin	Sun Aug 12 16:27:16 2001
@@ -2,7 +2,7 @@
 by Dialogue Technology (http://www.dialogue.com.tw/).
 It has EISA slots for ease of configuration with SDRAM/Flash
 memory card, USB/Serial/Audio card, Compact Flash card,
-and TFT-LCD card.
+PCMCIA/IDE card and TFT-LCD card.
 
 To compile for Pangolin, you must issue the following commands:
 
@@ -18,3 +18,7 @@
 - UDA1341 sound driver
 - SA1100 LCD controller for 800x600 16bpp TFT-LCD
 - MQ-200 driver for 800x600 16bpp TFT-LCD
+- Penmount(touch panel) driver
+- PCMCIA driver
+- SMC91C94 LAN driver
+- IDE driver (experimental)
diff -urN 2.4.7-rmk3/linux/Documentation/arm/SA1100/SA1100_USB linux/Documentation/arm/SA1100/SA1100_USB
--- 2.4.7-rmk3/linux/Documentation/arm/SA1100/SA1100_USB	Wed Dec 31 19:00:00 1969
+++ linux/Documentation/arm/SA1100/SA1100_USB	Sat Aug 11 21:38:39 2001
@@ -0,0 +1,344 @@
+StrongARM SA-1100 USB function Driver
+Ward Willats <ward.willats@extenex.com> -  08Mar01
+
+1. History
+''''''''''
+Brad Parker <brad@parker.boston.ma.us> ported the DEC/Compaq "Itsy"
+SA-1100 USB Function driver to the 2.4.x code base in late 2000, for
+use as an "ethernet over usb" link. His original notes are here in
+section 4. Nicolas Pitre <nico@cam.org> rewrote the transmitter and
+reciver (endpoints 1 and 2) in late 2000 to use the standard SA DMA
+API and I added a bulk character interface and reworked the control
+control module code and rewrote endpoint zero in early 2001.
+
+This release (22Feb01) is the first that completely separates 
+client modules (usb-eth.c and usb-char.c) from the SA-1100 USB core.
+(usb_ctl, usb_ep0, usb_send and usb_receive)and makes the whole
+mess a module. Oleg Drokin has done a huge amount of work, fixing
+things I break and adding support for the generic usbnet driver
+from the AC tree.
+
+2. Usage
+''''''''
+Turn on CONFIG_SA1100_USB_NETLINK to use the "ethernet over usb"
+functionality. Turn it off to use the character oriented
+interface. The character driver currently uses mknod c 10 240. 
+
+Programming:
+The public interface is in sa1100_usb.h. For a client USB service
+to use the SA-1100 USB core driver it should:
+
+1. Call sa1100_usb_open() to get the usb core assigned to it.
+
+2. Setup descriptors as appropriate for the task at hand. Esp.
+important are endpoint max packet lengths, vendor and product IDs,
+and type of endpoint (bulk or interrupt). Call 
+sa1100_get_descriptor_ptr() to get this.
+
+3. Call sa1100_usb_start() to actually start the usb hardware.
+At this time the host will configure the device.
+
+...at shutdown...
+
+4. Call sa1100_usb_stop() to stop the USB core.
+5. Call sa1100_usb_close() to free the core for use by another 
+client.
+
+3. Netlink Usage
+''''''''''''''''
+StrongARM SA-1100 USB function "ethernet over usb driver"
+Brad Parker <brad@parker.boston.ma.us>
+
+I ported the DEC "Itsy" usb "ethernet over usb driver" code to the 2.4.x
+base and made some enhacements and bug fixes.  This code has 2 sides and
+implements a simple "ethernet over usb" functionality.
+
+function (SA1100) side:
+- the driver has two endpoints and uses interrupt and bulk transfer to
+receive/send packets.  the driver does not require any other usb code
+and should work on most any sa1100.
+
+host (SA1111) side:
+- because the SA1111 usb host is not working yet I tested this driver
+(usb-net-host.c) on a 2.2.14 based PC with the latest usb backport.
+It has been fully converted to use URBs and worked well with my UHCI
+based controller.
+
+TESTING:
+
+To test you need an assabet on the 'function' side, a PC on the 'host'
+side and a USB A-B cable to connect them together.
+
+Boot a kernel on the assabet with "USB function and net-host support"
+(CONFIG_SA1100_USB) turned on.  This will define an interface named
+"usbf".  Once it's booted you can setup the interface with
+
+	mount -t proc /proc /proc
+	/sbin/ifconfig usbf 1.1.1.2
+
+I used a 2.2.14 kernel on a x86 PC for the host side.  It has a built
+in UHCI usb controller chip.  I installed the latest USB backport from
+http://www.linux-usb.org onto the 2.2.14 kernel sources and turned on
+"USB net-host" (CONFIG_USB_NET_HOST) as a module.  Load the module
+"usb-net-host.o" and connect the USB cable to the assabet.  Configure
+the usb network interface with
+
+	/sbin/ifconfig usb0 1.1.1.1
+
+You should be able to "ping" the assabet now with
+
+	ping -c 1 1.1.1.2
+
+If the assabet is running inetd the usual network services such as
+telnet and ftp should work.
+
+Oleg Drokin in 2.4.2-rmk1-np2 (08Mar01) added module config params for
+read and write size to the usb-eth.c client to allow dynamic setting
+of the DATA0/DATA1 packet size on the usb wire:
+
+usb_rsize - number of bytes in OUT packets from host to SA1100
+usb_wsize - number of bytes in IN packets from SA1100 to host
+
+This allows dynamic tuning for performance or to prevent overruning
+the the host with data.
+
+4. Known Issues
+'''''''''''''''
+- We are fiddling with various ways to set the IMP register in
+usb_send.c. A small percentage of the time, this value does not
+"take." 
+
+- I've started to bring back the /proc interface, but clients
+of the sa-usb core currently don't have a directory or something
+to put their stats into.
+
+- Only a useful subset of ep0 setup calls have been implemented.
+
+
+5. Mysteries of the Universe
+''''''''''''''''''''''''''''
+This driver has been hard to develop because the documentation
+provided by Intel is incomplete, and the UDC itself seems to have a
+variety of bugs. The errata for the part is particularly scary! This
+section is an attempt to document some of the discoveries and
+questions I have come across while working on this thing.
+
+pp 11-63 of the "Intel Strong ARM SA-1110 Microprocessor Advanced
+Developer Information" give an ominous warning about how "due to
+internal synchronization required by the UDC configuration registers,
+it is possible for the procesor to write the UDC refisters and FIFOs
+too fast." This has led to a variety of approaches that attempt to
+bang on the hardware repeatedly and read it back until the write
+"sticks."
+
+All of these approaches have been problematic. Currently some macros
+in udc_ctl.h that Nicolas wrote are being used. My hardware guy told
+me that writes would never be "lost" but stuck on some internal bus in
+the UDC module and propagated to the rest of the circuit when the time
+was right. Indeed this seemed to be the case, for example, it seems
+impossible to reliably read back the interrupt mask register of the UDC when in
+the interrupt service routine. Often times the state was not reflected
+on a read until after pending interrupt sources were cleared.
+
+I was feeling prety good about this and was ripping out the looping
+macros right and left until I came upon a situation where, while
+receiving a continuous set of 1 character packets, ep1 (usb_receive.c)
+could not clear receive packet complete (RPC). After much desperate
+faliling about it turns out changing the UDC_flip() macro to bang like
+crazy on the RPC bit did in fact clear it, and clear it
+consistently. So go figure.
+
+Other items of interest:
+
+- Upon emerging from a reset, the UDC will clear the mask register except
+for a mask on suspend.
+
+- USB 1.0 spec says maximum size of a DATA0/1 packet is 64 bytes,
+which is what the character driver is using. However, the UDC can do
+256 bytes and every host I've tried can handle it, even though they
+are not required to. (Perhaps it is a problem when hubs are on the
+line, but the SA UDC has other problems in a hub environment -- like
+even getting the correct address -- per the errata).
+
+- Endpoint zero FIFOs: ARGHHH! Just leave those routines alone.
+Believe me, I have tried every other variation you can think of.
+Probably. 
+
+- Sometimes I get a setup request of 0x80 from Windows hosts. I have
+not determined if this is a read_fifo error (none is reported) or if
+this is some undocumented secret Redmond handshake only known to
+initiates of the inner-order.
+
+6. Test Program
+'''''''''''''''
+This is now in the /proc interface. (For good or ill, probably don't
+actually need to dump all this stuff..)
+
+7. Errors and Notes on Intel's 1110 Documentation
+'''''''''''''''''''''''''''''''''''''''''''''''''
+These corrections apply to "Intel StrongARM SA-1110 Microprocessor,
+Advanced Developer's Manual of December 1999" Some of these have been
+corrected in later editions, some not. There have been several updates
+to this document published through 2000. Always use the latest
+available on http://developer.intel.com/design/strong/collateral.htm.
+
+pp 11-65 section 11.8.3.8 bit 2, reserved is now the resume interrupt
+mask. SRM is now SUSIM on SA-1110, and masks only the suspend
+interrupt.
+
+pp 11-67 section 11.8.6, Max IN register, end should be 9 _bytes_ 
+not 9 bits.
+
+pp 11-68 section 11.8.7.3, SST. This is set by the CPU _not_ the UDC.
+And it looks like you don't get a SST if you FST yourself.
+
+pp 11-68 section 11.8.7.5, DE. This is set by the CPU _not_ the UDC.
+
+pp 11-73 section 11.8.9.7, UDCCS2 table, bit 2, Should be "valid only
+when _TPC_ (not RPC) is set.
+
+pp 11-74 section 11.8.10, should end with a GET_DESCRIPTOR _or
+similar_ command. (Like, for example, GET_CONFIGURATION).
+
+
+8. Change History
+'''''''''''''''''
+Following are current chages  8Mar01 (released in 2.4.2-rmk1-np2?)
+
+- Resetting UDC when coming out of suspend helped enumeration get
+going considerably.
+
+- Added support for client-supplied notify routine to be called
+by the USB core when core reaches "configured" state. 
+
+- Added error returns from interrupt reads and buffer flush ioctl
+calls to usb-char. Added usb-char.h file for ioctl calls.
+
+- Fixed bug that kept usb-char transmitter from working the second
+time the module was loaded.
+
+- Turned off a lot of the noise in /proc
+
+- Added specialty routines in ep0 to set and clear bits.
+
+- More enumeration fiddling.
+
+- There are horrible hacks to set max IN length in usb_send
+  that ARE GOING AWAY SOON! REALLY!
+
+*** Following changes 26Feb01 (released in 2.4.2-rmk1-np1)
+
+- usb-eth integration with generic usbnet from AC tree.
+
+- Creation of public interface for usb clients in sa1100_usb.h
+and final separation into a "core" driver (usb_ctl.c, usb_ep0.c
+usb_recv.c usb_send.c) and "client" services (usb-eth.c and 
+usb-char.c). Modularized.
+
+- Descriptor handling rewritten. Support for string descriptors
+added. More bugs in ep0 fixed. More setup packets handled.
+
+- /proc interface in usb_ctl returning
+
+- removed client specific stuff from usbd_info_t and hid the
+structure in usb_ctl. Removed RAM-backing of address and pktsize
+in this structure. Now the descriptor values are gospel.
+
+- usb_dbg.h eliminated
+
+- Many bugs fixed in usb-char.c
+
+- Fiddled startup sequence so should start everytime.
+
+- Arch specific "soft connect" hook in usb_ctl.c
+
+- Bumped the interation count in write/set/clear macros
+in usb_ctl.h up to 10000. This seemed to help various bit 
+setting in ep0 and usb_send.c.
+
+*** Following changes 10Feb01 release:
+
+- endpoint zero entirely rewitten
+
+- Various changes by Oleg to make Netlink work again after the 
+  2.4.1-rmk1-np1 release.
+
+- Resetting of new max packet length done after clearing TPC
+in usb_send, per Nicolas Pitre.
+
+
+*** Following changes 23Jan01 (came out in 2.4.1-rmk1-np1): 
+
+- Moved host initiated SET/GET feature stall into endpoint code of
+usb_send.c and usb_receive.c and removed stallep from usb_ctl.c
+Opposite of a SET_FEATURE stall is a reset, so no code to unstall is
+provided.
+
+- Added explicit USB state machine to usb_ctl so driver and device
+state can be tracked closely and explicitly. Added hard-wired
+notification routines in endpoints 1 and 2 so they can track device
+state changes as required. State machine has notion of "zombie" state
+the covers USB states NONATTACHED, ATTACHED and POWERED since these
+are murky, and USB driver currently has no way to differentiate
+between the two.
+
+- Reworked ISR in usb_ctl so reset has higher priority than any other
+event. Stopped using sync macros to clear interrupt pending flags and set
+mask registers since it appears mask register changes are not
+always reflected on a mask register read until the pending flag is
+cleared (yet other tests show they are always cleared
+eventually). Toggle suspend/resume interrupt masks back and forth during
+suspend and resume to debounce and keep UDC internal state machine in
+sync per Intel documentation.
+
+- Flipped UDC flip, clear, write and set macros from do{}while to
+while() loops. Theory is you might save a loop iteration if value
+becomes valid immediately. Also, my hardware guy says writes are never
+"lost", just pipelined and not executed immediately depending on
+internal device conditions (like setting int masks when ints
+pending), so moved write cycles in macros outside of loops.
+
+- Added #defines to SA-1110.h for suspend and resume interrupt mask
+bits per Intel eratta. Submitted to ARM patch system (444/1).
+
+- Removed task queue and defered execution of configure() from
+usb_ctl.
+
+- Removed usb_write_reg() from usb_ctl.c, and various cruft from
+usb_ctl.h.
+
+- Added sa1100_usb_xmitter_avail() to usb_send.c. Makes implementing
+poll() fileop easier.
+
+- Added sa1100_usb_send_reset() to usb_send.c. Makes implementing
+transmitter timeout easier.
+
+- Added API to usb_ctl to set vendor and product ID
+
+- Changed BMATTR descriptor fron int to bulk, when not using netlink. (All
+the docs say UDC does not support INT xfers -- though, at the protocol
+level I don't see why not, since bulk and int are both just
+IN-DATA-ACK. I figure netlink may rely on this, and not just a
+continuous pending read from the host, but for "pure bulk" host 
+polling may not be generally correct.)
+
+- Removed unused rx_lock and tx_lock from usb_ctl
+
+- Converted everyone to SA-1100.h and nuked hardware defines in usb_ctl.h
+
+- Removed udc_init() in usb_ctl.c and folded functionality into udc_start().
+
+- Clear force stall (FST) in udc_start and reset so UDC actually runs when
+first turned on.
+
+- Emit NAK in receiver until ep1_start() for error (RPE) case too.
+
+- Remove enable/disable UDC from reset handler in udc_ctl. The UDC has 
+already been reset, so no need to do this again.
+
+- Explicitly set address to zero in ep0_reset()
+
+- Added "naking" boolean to usb_receiv.c. An attempt to solve a
+hypothetical race condition where we are in the critical section
+initiating a read from base-level code, a RPC happens, and start()
+might clear the condition before the packet is handled by the ISR.
diff -urN 2.4.7-rmk3/linux/Documentation/arm/SA1100/SA1111_USB linux/Documentation/arm/SA1100/SA1111_USB
--- 2.4.7-rmk3/linux/Documentation/arm/SA1100/SA1111_USB	Wed Dec 31 19:00:00 1969
+++ linux/Documentation/arm/SA1100/SA1111_USB	Sat Aug 11 21:38:39 2001
@@ -0,0 +1,33 @@
+StrongARM SA-1111 USB OHCI host controller driver
+Brad Parker <brad@parker.boston.ma.us>
+
+These diffs produce a kernel which may possible allow the SA-1111 OHCI
+controller to work.  I've tested it with various mice and keyboards.
+
+The diffs are against the -test8-rmk4-np3 version of usb-ohci.c
+
+Issues/problems:
+
+- this patch allocates the hcca, ed's & td's from consistent memory.
+Jamie's original patch was close but double frees an ED when a device
+is disconnected.  there is a fix in this patch for that problem;
+basically dl_del_list notices the one ed which should not be free'd
+(it's the urb's ed)
+
+- the patch works around the "A20 dma bug" in the SA-1111 by copying
+buffers.  It keeps two buffer pools, 1K and 64K.  To get properly
+aligned memory is allocated 2Mb of kernel pages.
+
+- there are bugs in the SA-1111 chip which this driver works around:
+
+1. the sound dma to be "exercised" before the DClk is enabled.  There
+is code in the patch to do this.
+
+2. the sa-1111 bus interface has a bug when its a bus master (dma).
+basically if an address with A20 asserted is used the transfer won't
+work and may correupt dram.
+
+A lot of the credit for this work goes to:
+James Hicks <jamey@crl.dec.com>
+"Graziano Meola <graziano.meola@crs4.it> "
+Kunihiko IMAI <imai@vasara.co.jp>
diff -urN 2.4.7-rmk3/linux/Documentation/arm/SA1100/light-test linux/Documentation/arm/SA1100/light-test
--- 2.4.7-rmk3/linux/Documentation/arm/SA1100/light-test	Wed Dec 31 19:00:00 1969
+++ linux/Documentation/arm/SA1100/light-test	Sat Aug 11 21:38:39 2001
@@ -0,0 +1,81 @@
+/* Created by (C) Chester Kuo <chester@linux.org.tw>,released under GPL
+ * , drived from sa1100_frontligt.c!
+ *
+ * Test the LCD backlight/contrast[/frontlight] driver. 
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "sa1100_frontlight.h"
+
+int main(void) {
+
+	int i, fd, retval;
+	int temp;
+   fd = open ("/dev/sa1100-fl", O_WRONLY);
+
+   if (fd ==  -1) {
+     perror("/dev/sa1100-fl");
+     exit(errno);
+   }
+
+   printf("\n\t\t\tFrontlight Driver Test Example.\n\n");
+
+   for (i=0; i<5; i++) {
+     printf("Turning OFF Frontlight...\n");
+     retval = ioctl(fd, _SA1100_FL_IOCTL_OFF, 0);
+     if (retval == -1) {
+       perror("ioctl");
+       exit(errno);
+     }
+
+     sleep(1);
+
+
+     printf("Turning ON Frontlight...\n");
+     retval = ioctl(fd, _SA1100_FL_IOCTL_ON, 0);
+     if (retval == -1) {
+       perror("ioctl");
+       exit(errno);
+     }
+
+     sleep(1);
+
+   }
+
+#if 0
+   printf("Turning OFF Frontlight...\n");
+   retval = ioctl(fd, _SA1100_FL_IOCTL_OFF, 0);
+   if (retval == -1) {
+     perror("ioctl");
+     exit(errno);
+   }
+#endif
+  
+   printf("Testing the backlight from 1 to 100\n");
+	for (temp=0;temp<=100;temp++)
+	retval = ioctl(fd,_SA1100_FL_IOCTL_BACKLIGHT,temp);
+   if (retval == -1) {
+      perror("error in ioctl at setting backlight\n");
+	exit(errno);
+    }
+
+	printf("Test the contrast from 1 to 100\n");
+        for (temp=0;temp<=100;temp++)
+    	retval = ioctl(fd,_SA1100_FL_IOCTL_CONTRAST,temp);
+    if (retval == -1) {
+ 	perror("error in ioctl at contrast \n");
+	exit(errno);
+     }
+
+   fprintf(stderr, "Done.\n");
+
+ }
+
+
diff -urN 2.4.7-rmk3/linux/Documentation/arm/mem_alignment linux/Documentation/arm/mem_alignment
--- 2.4.7-rmk3/linux/Documentation/arm/mem_alignment	Wed Dec 31 19:00:00 1969
+++ linux/Documentation/arm/mem_alignment	Sat Aug 11 21:38:39 2001
@@ -0,0 +1,51 @@
+Too many problems poped up because of unnoticed misaligned memory access in
+kernel code lately.  Therefore the alignment fixup is now unconditionally 
+configured in for SA11x0 based targets.  According to Alan Cox, this is a 
+bad idea to configure it out, but Russell King has some good reasons for
+doing so on some f***ed up ARM architectures like the EBSA110.  However
+this is not the case on many design I'm aware of, like all SA11x0 based
+ones.
+
+Of course this is a bad idea to rely on the alignment trap to perform
+unaligned memory access in general.  If those access are predictable, you
+are better to use the macros provided by include/asm/unaligned.h.  The
+alignment trap can fixup misaligned access for the exception cases, but at
+a high performance cost.  It better be rare.
+
+Now for user space applications, it is possible to configure the alignment
+trap to SIGBUS any code performing unaligned access (good for debugging bad
+code), or even fixup the access by software like for kernel code.  The later
+mode isn't recommended for performance reasons (just think about the
+floating point emulation that works about the same way).  Fix your code
+instead!
+
+To change the alignment trap behavior, simply echo one of the following mode
+numbers into /proc/sys/debug/alignment:
+
+mode		behavior
+----		--------
+
+0		unaligned access ignored, needed for compatibility with
+		older ARM binaries that used to do unaligned memory access
+		on purpose for their documented results.  This is the
+		ARM Linux legacy mode and the default.
+
+1		any process performing an unaligned memory access will be
+		killed with a SIGBUS.
+
+2		any process performing an unaligned memory access will have
+		its access fixed up by the kernel in software.  This is of
+		course slow (think about the floating point emulator) and
+		not recommended for production use.
+
+For example, you can do this on system boot:
+
+	echo 1 > /proc/sys/debug/alignment
+
+You can also read the content of the same file to get statistical
+information on unaligned access occurences plus the current mode of
+operation for user space code.
+
+
+Nicolas Pitre
+Mar 13, 2001
diff -urN 2.4.7-rmk3/linux/Documentation/h3650_ts.txt linux/Documentation/h3650_ts.txt
--- 2.4.7-rmk3/linux/Documentation/h3650_ts.txt	Wed Dec 31 19:00:00 1969
+++ linux/Documentation/h3650_ts.txt	Sat Aug 11 21:38:39 2001
@@ -0,0 +1,116 @@
+IMPORTANT!
+This document was last updated on Wed June 7th
+The ts driver will report events as printks but will not (yet)
+read data from user space. I anticipate it should be ready
+Thursday 8th June (Australian Time)
+
+Charlie
+
+The iPaq (h3650) touch screen driver
+====================================
+
+DRAFT Version 0.0	Last Updated May 24 00
+==============================================
+
+The h3650_ts driver is STILL UNDER DEVELOPMENT. The documentation and code
+is included for REFERENCE ONLY.
+
+Introduction
+------------
+This module (h3650_ts.c) is a driver designed for the iPAQ (H3650) hand held
+device which is powered by the StrongArm (sa1110) microprocessor.
+
+The iPAQ design uses an Atmel microcontroller to service a number of peripheral
+devices such as the touch screen, leds, buttons and others - a full list is
+show below.
+
+The Atmel acts as a proxy controller for the StrongArm.
+
+Commands are sent from the StrongArm using a simple serial packet format
+shown in figure 1. Events and responses also use this format.
+
+This communication is carried out via serial port1 of the sa1110.
+
+Packet Format
+-------------
+Commands, responses and events are transmitted using the following packet
+format. 
+
+  byte	  1	  2		  3 		 len + 4
+	+-------+---------------+---------------+--=------------+
+	|SOF	|id	|len	| len bytes	| Chksum	|
+	+-------+---------------+---------------+--=------------+
+  bit	0     7  8    11 12   15 16
+
+	+-------+---------------+-------+
+	|SOF	|id	|0	|Chksum	| - Note Chksum does not include SOF
+	+-------+---------------+-------+
+  bit	0     7  8    11 12   15 16
+
+	FIGURE1
+	------
+
+  SOF	(1 byte)
+	Start of Frame character (0x02)
+  id	(4bits)
+	Each command/respomse and event has an unique ID (see table below)
+  len	(4bits)
+	Each command/response or event may have a payload of 'len' bytes.
+	FIGURE 2 shows the touch screen payload format. Other formats TBD.
+  data	'len' bytes
+	This is the payload.
+  chk	(1byte)
+	This a modulo 256 checksum. It does not incluse the SOF.
+  
+
+Table of IDs
+------------
+
+There are 10 devices (or psuedo devices), each have an uniue ID.
+The devices and IDs are listed below.
+
+Device		ID	Description
+------------------------+----------------------------------------
+VERSION		0	Get or Set the version number.
+KEYBD_ID	2	Button events?.
+TOUCHS_ID	3	Touch Screen events.
+EEPROM_READ	4	Read from EEPROM.
+EEPROM_WRITED	5	Write to EEPROM
+LED		8	Switch on/off led.
+BATTERY		9	Get battery status.
+IIC_READ	0x0b	IIC read - get data via the IIC protocol.
+IIC_WRITE	0x0c	IIC write - send data via the IIC protocol.
+BACKLIGHT	0x0d	Backligh control command.
+
+A unique minor number is assigned to each of the above devices.
+All devices support blocking and non-blocking I/O where appropriate.
+
+EXAMPLE1 - the touch screen device is assigned minor number 3 and
+is initialised as follows:
+mknod /dev/ts c maj 3
+(major number is assigned dynamically and can be found using
+'cat proc/modules' )
+Control from user space will use standard read and ioctl functions.
+fd=open("/dev/ts",O_RDONLY");
+read(fd,buff,len);
+ioctl(fd,SET_RATE,arg);
+close(fd);
+
+
+EXAMPLE2 - the led device will not have a read(), write() and may be controlled
+as follows:
+mknod /dev/led c maj 5
+fd=open("/dev/led",O_RDWR");
+ioctl(fd,LED_ON,arg);
+ioctl(fd,LED_OFF,arg);
+close(fd);
+
+The raw touch screen data read from the Atmel is formatted as follows:
+	+-------+-------+-------+-------+
+	| Xmsb	| Xlsb	| Ymsb	| Ylsb	|
+	+-------+-------+-------+-------+
+	byte 0	  1	  2	  3
+
+	Xmsb - most significant byte of Xcoordinate
+	Xlsb - most significant byte of Xcoordinate
+	FIGURE 2
diff -urN 2.4.7-rmk3/linux/Documentation/ide.txt linux/Documentation/ide.txt
--- 2.4.7-rmk3/linux/Documentation/ide.txt	Sat Feb 26 23:32:12 2000
+++ linux/Documentation/ide.txt	Sat Aug 11 21:38:40 2001
@@ -266,6 +266,7 @@
  "hdx=nowerr"		: ignore the WRERR_STAT bit on this drive
  "hdx=cdrom"		: drive is present, and is a cdrom drive
  "hdx=cyl,head,sect"	: disk drive is present, with specified geometry
+ "hdx=present"		: disk drive is present, autodetect geometry
  "hdx=autotune"		: driver will attempt to tune interface speed
 				to the fastest PIO mode supported,
 				if possible for this drive only.
diff -urN 2.4.7-rmk3/linux/Makefile linux/Makefile
--- 2.4.7-rmk3/linux/Makefile	Sat Aug 11 15:42:12 2001
+++ linux/Makefile	Sat Aug 11 21:54:24 2001
@@ -1,11 +1,12 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 7
-EXTRAVERSION =-rmk3
+EXTRAVERSION =-rmk3-np1
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
+#ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
+ARCH := arm
 
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
 	  else if [ -x /bin/bash ]; then echo /bin/bash; \
@@ -18,7 +19,7 @@
 HOSTCC  	= gcc
 HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
 
-CROSS_COMPILE 	=
+CROSS_COMPILE 	= arm-linux-
 
 #
 # Include the make variables (CC, etc...)
diff -urN 2.4.7-rmk3/linux/arch/arm/Makefile linux/arch/arm/Makefile
--- 2.4.7-rmk3/linux/arch/arm/Makefile	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/Makefile	Sat Aug 11 21:38:40 2001
@@ -19,6 +19,12 @@
 CFLAGS		+=-g
 endif
 
+ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
+CC		+= -mbig-endian
+AS		+= -EB
+LD		+= -EB
+endif
+
 # Select CPU dependent flags.  Note that order of declaration is important;
 # the options further down the list override previous items.
 #
@@ -192,7 +198,7 @@
 arch/arm/kernel arch/arm/mm arch/arm/lib: dummy
 	$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
 
-bzImage zImage zinstall Image bootpImage install: vmlinux
+bzImage zImage zinstall Image bootpImage install %.swap: vmlinux
 	@$(MAKEBOOT) $@
 
 CLEAN_FILES	+= \
diff -urN 2.4.7-rmk3/linux/arch/arm/boot/Makefile linux/arch/arm/boot/Makefile
--- 2.4.7-rmk3/linux/arch/arm/boot/Makefile	Wed Jun 27 17:12:04 2001
+++ linux/arch/arm/boot/Makefile	Sun Aug 12 16:02:29 2001
@@ -90,6 +90,12 @@
 ifeq ($(CONFIG_SA1100_GRAPHICSCLIENT),y)
   ZTEXTADDR	 = 0xC0200000
 endif
+ifeq ($(CONFIG_SA1100_GRAPHICSMASTER),y)
+  ZTEXTADDR	 = 0xC0400000
+endif
+ifeq ($(CONFIG_SA1100_ADSBITSY),y)
+  ZTEXTADDR	 = 0xC0400000
+endif
 ifeq ($(CONFIG_SA1100_YOPY),y)
   ZTEXTADDR      = 0x00080000
   ZBSSADDR       = 0xc0200000
@@ -140,8 +146,14 @@
 zinstall: $(CONFIGURE) zImage
 	sh ./install.sh $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)"
 
+endianswap: endianswap.c
+	$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
+
+%.swap: % endianswap
+	./endianswap < $< > $@
+
 clean:
-	$(RM) Image zImage bootpImage
+	$(RM) Image zImage bootpImage endianswap *.swap
 	@$(MAKE) -C compressed clean
 	@$(MAKE) -C bootp clean
 
diff -urN 2.4.7-rmk3/linux/arch/arm/boot/compressed/Makefile linux/arch/arm/boot/compressed/Makefile
--- 2.4.7-rmk3/linux/arch/arm/boot/compressed/Makefile	Wed Jun 27 17:12:04 2001
+++ linux/arch/arm/boot/compressed/Makefile	Sat Aug 11 21:38:40 2001
@@ -65,6 +65,10 @@
 SEDFLAGS	+= s/BSS_START/ALIGN(4)/
 endif
 
+ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
+OBJS		+= big-endian.o
+endif
+
 all:		vmlinux
 
 vmlinux:	$(HEAD) $(OBJS) piggy.o vmlinux.lds
diff -urN 2.4.7-rmk3/linux/arch/arm/boot/compressed/big-endian.S linux/arch/arm/boot/compressed/big-endian.S
--- 2.4.7-rmk3/linux/arch/arm/boot/compressed/big-endian.S	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/boot/compressed/big-endian.S	Sat Aug 11 21:38:40 2001
@@ -0,0 +1,13 @@
+/*
+ *  linux/arch/arm/boot/compressed/big-endian.S
+ *
+ *  Switch CPU into big endian mode.
+ *  Author: Nicolas Pitre
+ */
+
+		.section ".start", #alloc, #execinstr
+
+		mrc	p15, 0, r0, c1, c0, 0	@ read control reg
+		orr	r0, r0, #(1 << 7)	@ enable big endian mode
+		mcr	p15, 0, r0, c1, c0, 0	@ write control reg
+
diff -urN 2.4.7-rmk3/linux/arch/arm/boot/compressed/head-sa1100.S linux/arch/arm/boot/compressed/head-sa1100.S
--- 2.4.7-rmk3/linux/arch/arm/boot/compressed/head-sa1100.S	Thu Feb  8 19:32:44 2001
+++ linux/arch/arm/boot/compressed/head-sa1100.S	Sun Aug 12 16:02:29 2001
@@ -17,6 +17,24 @@
 
 		@ Preserve r8/r7 i.e. kernel entry values
 
+#if defined(CONFIG_SA1100_GRAPHICSCLIENT) && !defined(CONFIG_ANGELBOOT)
+		mov	r7, #MACH_TYPE_GRAPHICSCLIENT
+		mov	r8, #0
+#endif
+#if defined(CONFIG_SA1100_GRAPHICSMASTER) && !defined(CONFIG_ANGELBOOT)
+		mov	r7, #MACH_TYPE_GRAPHICSMASTER
+		mov	r8, #0
+#endif
+#if defined(CONFIG_SA1100_ADSBITSY) && !defined(CONFIG_ANGELBOOT)
+		mov	r7, #MACH_TYPE_ADSBITSY
+		mov	r8, #0
+#endif
+
+#ifdef CONFIG_SA1100_PFS168
+		@ REVISIT_PFS168: Temporary until firmware updated to use assigned machine number
+		mov	r7, #MACH_TYPE_PFS168
+#endif
+
 #ifdef CONFIG_SA1100_VICTOR
 		teq	r7, #MACH_TYPE_VICTOR
 		bne	10f
@@ -50,14 +68,4 @@
 		bic	r0, r0, #0x0d		@ clear WB, DC, MMU
 		bic	r0, r0, #0x1000		@ clear Icache
 		mcr	p15, 0, r0, c1, c0, 0
-
-#ifdef CONFIG_ANGELBOOT
-/*
- * Pause for a short time so that we give enough time
- * for the host to start a terminal up.
- */
-		mov	r0, #0x00200000
-1:		subs	r0, r0, #1
-		bne	1b
-#endif
 
diff -urN 2.4.7-rmk3/linux/arch/arm/boot/compressed/setup-sa1100.S linux/arch/arm/boot/compressed/setup-sa1100.S
--- 2.4.7-rmk3/linux/arch/arm/boot/compressed/setup-sa1100.S	Wed Jun 27 17:12:04 2001
+++ linux/arch/arm/boot/compressed/setup-sa1100.S	Sun Aug 12 17:06:09 2001
@@ -28,13 +28,17 @@
 #define ICMR		0x04
 
 UART1_BASE:	.long	0x80010000
-UART3_BASE:	.long	0x80050000
+UART2_BASE: .long   0x80030000
+UART3_BASE: .long   0x80050000
+UART2_HS:   .long   0x80040000
 #define UTCR0           0x00
 #define UTCR1           0x04
 #define UTCR2           0x08
 #define UTCR3           0x0c
+#define UTCR4           0x10
 #define UTSR0           0x1c
 #define UTSR1           0x20
+#define HSCR0			0x60
 
 #ifndef CONFIG_SA1100_DEFAULT_BAUDRATE
 #define CONFIG_SA1100_DEFAULT_BAUDRATE	9600
@@ -100,6 +104,9 @@
 		teqne   r3, #MACH_TYPE_JORNADA720
 		teqne	r3, #MACH_TYPE_GRAPHICSCLIENT
 		teqne	r3, #MACH_TYPE_FLEXANET
+		//teqne	r3, #MACH_TYPE_GRAPHICSMASTER
+		//teqne	r3, #MACH_TYPE_ADSBITSY
+		teqne	r3, #MACH_TYPE_PANGOLIN
 		bne	skip_uart
 
 		@ UART3 if Assabet is used with Neponset
@@ -113,6 +120,23 @@
 		ldreq	r0, UART3_BASE
 		beq	uart_init
 
+#if 0
+		@ UART3 on GraphicsMaster
+		teq	r3, #MACH_TYPE_GRAPHICSMASTER
+		ldreq	r0, UART3_BASE
+		beq	uart_init
+
+		@ UART3 on ADSBitsy
+		teq	r3, #MACH_TYPE_ADSBITSY
+		ldreq	r0, UART3_BASE
+		beq	uart_init
+#endif
+		
+        @ UART3 or FIR on Pangolin
+	    teq     r3, #MACH_TYPE_PANGOLIN
+	    ldreq   r0, UART1_BASE
+	    beq     uart_init
+
 		@ At least for Brutus, the UART1 is used through
 		@ the alternate GPIO function...
 		teq	r3, #MACH_TYPE_BRUTUS
@@ -149,6 +173,53 @@
 		str	r1, [r0, #UTCR3]
 		mov	r1, #0xff		@ flush status reg
 		str	r1, [r0, #UTSR0]
+#ifdef CONFIG_SA1100_PANGOLIN
+        @ initial serial port 2/3
+        mov     r1, #0x80000000
+        add     r1, r1, #0x30000
+        teq     r0, r1
+        beq     uart3
+
+        mov     r1, #0x80000000
+        add     r1, r1, #0x50000
+        teq     r0, r1
+        beq     skip_uart
+#ifdef CONFIG_SA1100_FIR
+fir:
+        /* set serial port 2 as FIR */
+        ldr     r0, UART2_BASE          @ UTCR4 = 1
+        mov     r1, #1
+        str     r1, [r0, #UTCR4]
+        ldr     r0, UART2_HS            @ HSCR0 = 0
+        mov     r1, #0
+        str     r1, [r0, #HSCR0]
+        ldr     r0, UART2_HS            @ HSSR0 = 0x27
+        mov     r1, #0x27               @ HSSR0_EIF = 0x01
+        str     r1, [r0, #HSSR0]        @ HSSR0_TUR = 0
+										@ HSSR0_RAB = 0x04
+							            @ HSSR0_FRE = 0x20 => 0x27
+        teq     r3, #MACH_TYPE_PANGOLIN
+        ldreq   r0, UART2_BASE
+        beq     1b
+#else
+        /* set serial port 2 as normal UART */
+uart2:
+        ldr     r0, UART2_BASE          @ set UART2_UTCR4 = 0
+        mov     r1, #0
+        str     r1, [r0, #UTCR4]
+        ldr     r0, UART2_HS            @ set UART2_HSCR0 = 0
+        mov     r1, #0
+        str     r1, [r0, #HSCR0]
+        teq     r3, #MACH_TYPE_PANGOLIN
+        ldreq   r0, UART2_BASE
+        beq     1b
+#endif
+uart3:
+        teq     r3, #MACH_TYPE_PANGOLIN
+        ldreq   r0, UART3_BASE
+        beq     1b
+#endif
+	
 skip_uart:
 
 		@ Extra specific setup calls
diff -urN 2.4.7-rmk3/linux/arch/arm/boot/endianswap.c linux/arch/arm/boot/endianswap.c
--- 2.4.7-rmk3/linux/arch/arm/boot/endianswap.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/boot/endianswap.c	Sat Aug 11 21:38:40 2001
@@ -0,0 +1,50 @@
+/*
+ * endianswap.c : Swaps endianness on 4-byte boundaries.
+ * Author: 	Nicolas Pitre
+ * Copyright:	(C) 2001 MontaVista Software Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * The purpose of this tool is to convert a kernel image which is compiled
+ * to run in a different endianness than what the CPU is initially set with.
+ * The kernel will switch the CPU endian mode as required, but since the 
+ * bootloader lays the kernel in memory according to the current endianness
+ * we have to swap it over.  As long as the desired endianness is set before
+ * any memory access smaller than a word is performed there shouldn't be any
+ * problem executing such code.
+ */
+
+#include <stdio.h>
+
+int main(int argc, char *argv[])
+{
+	int a, b, c, d;
+
+	for (;;) {
+		a = getchar();
+		b = getchar();
+		c = getchar();
+		d = getchar();
+		if ((a|b|c|d) & ~0xff)
+			break;
+		putchar(d);
+		putchar(c);
+		putchar(b);
+		putchar(a);
+	}
+	if (a < 0)
+		return 0;
+	if (b < 0)
+		b = 0;
+	if (c < 0)
+		c = 0;
+	if (d < 0)
+		d = 0;
+	putchar(d);
+	putchar(c);
+	putchar(b);
+	putchar(a);
+	return 0;
+}
diff -urN 2.4.7-rmk3/linux/arch/arm/config.in linux/arch/arm/config.in
--- 2.4.7-rmk3/linux/arch/arm/config.in	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/config.in	Sun Aug 12 16:02:29 2001
@@ -96,14 +96,22 @@
 dep_bool '  Victor' CONFIG_SA1100_VICTOR $CONFIG_ARCH_SA1100
 dep_bool '  XP860' CONFIG_SA1100_XP860 $CONFIG_ARCH_SA1100
 dep_bool '  Yopy' CONFIG_SA1100_YOPY $CONFIG_ARCH_SA1100
+dep_bool '  GraphicsMaster' CONFIG_SA1100_GRAPHICSMASTER $CONFIG_ARCH_SA1100
+dep_bool '  ADS Bitsy' CONFIG_SA1100_ADSBITSY $CONFIG_ARCH_SA1100
 
 # Determine if SA1111 support is required
 if [ "$CONFIG_ASSABET_NEPONSET" = "y" -o \
      "$CONFIG_SA1100_JORNADA720" = "y" -o \
      "$CONFIG_SA1100_PFS168" = "y" -o \
-     "$CONFIG_SA1100_XP860" = "y" ]; then
+     "$CONFIG_SA1100_XP860" = "y" -o \
+     "$CONFIG_SA1100_GRAPHICSMASTER" = "y" -o \
+     "$CONFIG_SA1100_ADSBITSY" = "y" ]; then
    define_bool CONFIG_SA1111 y
 fi
+
+dep_tristate 'SA1100 USB function support' CONFIG_SA1100_USB $CONFIG_ARCH_SA1100
+dep_tristate '  Support for SA11x0 USB network link function' CONFIG_SA1100_USB_NETLINK $CONFIG_SA1100_USB
+dep_tristate '  Support for SA11x0 USB character device emulation' CONFIG_SA1100_USB_CHAR $CONFIG_SA1100_USB
 endmenu
 
 mainmenu_option next_comment
@@ -266,6 +274,8 @@
    define_bool CONFIG_DISCONTIGMEM n
 fi
 
+bool 'Generate big endian kernel' CONFIG_CPU_BIG_ENDIAN
+
 endmenu
 
 mainmenu_option next_comment
@@ -288,8 +298,7 @@
 if [ "$CONFIG_FOOTBRIDGE_HOST" = "y" -o \
      "$CONFIG_ARCH_SHARK" = "y" -o \
      "$CONFIG_ARCH_CLPS7500" = "y" -o \
-     "$CONFIG_ARCH_EBSA110" = "y" -o \
-     "$CONFIG_ARCH_SA1100" = "y" ]; then
+     "$CONFIG_ARCH_EBSA110" = "y" ]; then
    define_bool CONFIG_ISA y
 else
    define_bool CONFIG_ISA n
@@ -327,6 +336,10 @@
 tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
 dep_bool 'Power Management support (experimental)' CONFIG_PM $CONFIG_EXPERIMENTAL
+if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
+   dep_tristate 'Advanced power management support' CONFIG_APM $CONFIG_PM
+fi
+
 dep_tristate 'RISC OS personality' CONFIG_ARTHUR $CONFIG_CPU_32
 
 if [ "$CONFIG_ARCH_EBSA110" = "y" -o         \
@@ -337,6 +350,7 @@
      "$CONFIG_ARCH_P720T" = "y" -o	     \
      "$CONFIG_ARCH_ANAKIN" = "y" ]; then
    string 'Default kernel command string' CONFIG_CMDLINE ""
+   dep_bool 'Enable support for Tulsa command line parameters area' CONFIG_PFS168_CMDLINE $CONFIG_SA1100_PFS168
 fi
 if [ "$CONFIG_ARCH_NETWINDER" = "y" -o  \
      "$CONFIG_ARCH_EBSA110" = "y" -o    \
@@ -364,8 +378,13 @@
       define_bool CONFIG_LEDS_TIMER y
    fi
 fi
-if [ "$CONFIG_CPU_32" = "y" -a "$CONFIG_ARCH_EBSA110" != "y" ]; then
+if [ "$CONFIG_CPU_32" = "y" -a \
+     "$CONFIG_ARCH_EBSA110" != "y" -a \
+     "$CONFIG_ARCH_SA1100" != "y" ]; then
    bool 'Kernel-mode alignment trap handler' CONFIG_ALIGNMENT_TRAP
+fi
+if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
+   define_bool CONFIG_ALIGNMENT_TRAP y
 fi
 endmenu
 
diff -urN 2.4.7-rmk3/linux/arch/arm/def-configs/adsbitsy linux/arch/arm/def-configs/adsbitsy
--- 2.4.7-rmk3/linux/arch/arm/def-configs/adsbitsy	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/def-configs/adsbitsy	Sun Aug 12 16:02:29 2001
@@ -0,0 +1,674 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+CONFIG_ARM=y
+# CONFIG_EISA is not set
+# CONFIG_SBUS is not set
+# CONFIG_MCA is not set
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+# CONFIG_OBSOLETE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_KMOD is not set
+
+#
+# System Type
+#
+# CONFIG_ARCH_ANAKIN is not set
+# CONFIG_ARCH_ARCA5K is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_RPC is not set
+CONFIG_ARCH_SA1100=y
+# CONFIG_ARCH_SHARK is not set
+
+#
+# Archimedes/A5000 Implementations
+#
+# CONFIG_ARCH_ARC is not set
+# CONFIG_ARCH_A5K is not set
+
+#
+# Footbridge Implementations
+#
+# CONFIG_ARCH_CATS is not set
+# CONFIG_ARCH_PERSONAL_SERVER is not set
+# CONFIG_ARCH_EBSA285_ADDIN is not set
+# CONFIG_ARCH_EBSA285_HOST is not set
+# CONFIG_ARCH_NETWINDER is not set
+
+#
+# SA11x0 Implementations
+#
+# CONFIG_SA1100_ASSABET is not set
+# CONFIG_ASSABET_NEPONSET is not set
+# CONFIG_SA1100_BRUTUS is not set
+# CONFIG_SA1100_CERF is not set
+# CONFIG_SA1100_BITSY is not set
+# CONFIG_SA1100_EXTENEX1 is not set
+# CONFIG_SA1100_FLEXANET is not set
+# CONFIG_SA1100_FREEBIRD is not set
+# CONFIG_SA1100_GRAPHICSCLIENT is not set
+# CONFIG_SA1100_JORNADA720 is not set
+# CONFIG_SA1100_HUW_WEBPANEL is not set
+# CONFIG_SA1100_ITSY is not set
+# CONFIG_SA1100_LART is not set
+# CONFIG_SA1100_NANOENGINE is not set
+# CONFIG_SA1100_OMNIMETER is not set
+# CONFIG_SA1100_PANGOLIN is not set
+# CONFIG_SA1100_PLEB is not set
+# CONFIG_SA1100_SHERMAN is not set
+# CONFIG_SA1100_SIMPAD is not set
+# CONFIG_SA1100_PFS168 is not set
+# CONFIG_SA1100_VICTOR is not set
+# CONFIG_SA1100_XP860 is not set
+# CONFIG_SA1100_YOPY is not set
+# CONFIG_SA1100_GRAPHICSMASTER is not set
+CONFIG_SA1100_ADSBITSY=y
+CONFIG_SA1111=y
+# CONFIG_SA1100_USB is not set
+# CONFIG_SA1100_USB_NETLINK is not set
+# CONFIG_SA1100_USB_CHAR is not set
+
+#
+# CLPS711X/EP721X Implementations
+#
+# CONFIG_ARCH_P720T is not set
+# CONFIG_ARCH_ACORN is not set
+# CONFIG_FOOTBRIDGE is not set
+# CONFIG_FOOTBRIDGE_HOST is not set
+# CONFIG_FOOTBRIDGE_ADDIN is not set
+CONFIG_CPU_32=y
+# CONFIG_CPU_26 is not set
+# CONFIG_CPU_32v3 is not set
+CONFIG_CPU_32v4=y
+# CONFIG_CPU_ARM610 is not set
+# CONFIG_CPU_ARM710 is not set
+# CONFIG_CPU_ARM720T is not set
+# CONFIG_CPU_ARM920T is not set
+# CONFIG_CPU_ARM1020 is not set
+# CONFIG_CPU_SA110 is not set
+CONFIG_CPU_SA1100=y
+CONFIG_DISCONTIGMEM=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+
+#
+# General setup
+#
+# CONFIG_PCI is not set
+# CONFIG_ISA is not set
+# CONFIG_ISA_DMA is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_HOTPLUG=y
+
+#
+# PCMCIA/CardBus support
+#
+CONFIG_PCMCIA=y
+# CONFIG_I82365 is not set
+# CONFIG_TCIC is not set
+# CONFIG_PCMCIA_CLPS6700 is not set
+CONFIG_PCMCIA_SA1100=y
+CONFIG_NET=y
+CONFIG_SYSVIPC=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_FASTFPE is not set
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
+# CONFIG_APM is not set
+# CONFIG_ARTHUR is not set
+CONFIG_CMDLINE="ip=off"
+# CONFIG_PFS168_CMDLINE is not set
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_INITRD=y
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+# CONFIG_BLK_DEV_MD is not set
+# CONFIG_MD_LINEAR is not set
+# CONFIG_MD_RAID0 is not set
+# CONFIG_MD_RAID1 is not set
+# CONFIG_MD_RAID5 is not set
+# CONFIG_BLK_DEV_LVM is not set
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_FILTER is not set
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_INET_ECN is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_IPV6 is not set
+# CONFIG_KHTTPD is not set
+# CONFIG_ATM is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_DECNET is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_LLC is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+# CONFIG_SUNLANCE is not set
+# CONFIG_SUNBMAC is not set
+# CONFIG_SUNQE is not set
+# CONFIG_SUNLANCE is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_LANCE is not set
+# CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+# CONFIG_NET_ISA is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_NET_POCKET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_MYRI_SBUS is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+# CONFIG_NET_FC is not set
+# CONFIG_RCPCI is not set
+# CONFIG_SHAPER is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+
+#
+# PCMCIA network device support
+#
+CONFIG_NET_PCMCIA=y
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+CONFIG_PCMCIA_PCNET=y
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_ARCNET_COM20020_CS is not set
+# CONFIG_PCMCIA_IBMTR is not set
+# CONFIG_NET_PCMCIA_RADIO is not set
+
+#
+# Amateur Radio support
+#
+# CONFIG_HAMRADIO is not set
+
+#
+# IrDA (infrared) support
+#
+# CONFIG_IRDA is not set
+
+#
+# ATA/IDE/MFM/RLL support
+#
+CONFIG_IDE=y
+
+#
+# IDE, ATA and ATAPI Block devices
+#
+CONFIG_BLK_DEV_IDE=y
+# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set
+# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set
+# CONFIG_BLK_DEV_IDEDISK_IBM is not set
+# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set
+# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set
+# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set
+# CONFIG_BLK_DEV_IDEDISK_WD is not set
+# CONFIG_BLK_DEV_COMMERIAL is not set
+# CONFIG_BLK_DEV_TIVO is not set
+CONFIG_BLK_DEV_IDECS=y
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+# CONFIG_BLK_DEV_ISAPNP is not set
+# CONFIG_IDE_CHIPSETS is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_DMA_NONPCI is not set
+# CONFIG_BLK_DEV_IDE_MODES is not set
+
+#
+# SCSI support
+#
+# CONFIG_SCSI is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_BLOCK is not set
+# CONFIG_I2O_LAN is not set
+# CONFIG_I2O_SCSI is not set
+# CONFIG_I2O_PROC is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input core support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_KEYBDEV is not set
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+# CONFIG_VT_CONSOLE is not set
+# CONFIG_SERIAL is not set
+# CONFIG_SERIAL_EXTENDED is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_21285 is not set
+# CONFIG_SERIAL_21285_OLD is not set
+# CONFIG_SERIAL_21285_CONSOLE is not set
+# CONFIG_SERIAL_AMBA is not set
+# CONFIG_SERIAL_AMBA_CONSOLE is not set
+# CONFIG_SERIAL_CLPS711X is not set
+# CONFIG_SERIAL_CLPS711X_CONSOLE is not set
+CONFIG_SERIAL_SA1100=y
+CONFIG_SERIAL_SA1100_CONSOLE=y
+CONFIG_SA1100_DEFAULT_BAUDRATE=38400
+# CONFIG_SERIAL_8250 is not set
+# CONFIG_SERIAL_8250_CONSOLE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=32
+CONFIG_UCB1200=y
+CONFIG_TOUCHSCREEN_UCB1200=y
+CONFIG_AUDIO_UCB1200=y
+CONFIG_ADC_UCB1200=y
+# CONFIG_TOUCHSCREEN_BITSY is not set
+# CONFIG_PROFILER is not set
+# CONFIG_PFS168_SPI is not set
+# CONFIG_PFS168_DTMF is not set
+# CONFIG_PFS168_MISC is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Mice
+#
+# CONFIG_BUSMOUSE is not set
+# CONFIG_MOUSE is not set
+
+#
+# Joysticks
+#
+# CONFIG_JOYSTICK is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_INTEL_RNG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_RTC is not set
+# CONFIG_SA1100_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+
+#
+# PCMCIA character devices
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# File systems
+#
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADFS_FS_RW is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_BFS_FS is not set
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+# CONFIG_UMSDOS_FS is not set
+CONFIG_VFAT_FS=y
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+CONFIG_CRAMFS=y
+# CONFIG_TMPFS is not set
+CONFIG_RAMFS=y
+# CONFIG_ISO9660_FS is not set
+# CONFIG_JOLIET is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_HPFS_FS is not set
+CONFIG_PROC_FS=y
+# CONFIG_DEVFS_FS is not set
+# CONFIG_DEVFS_MOUNT is not set
+# CONFIG_DEVFS_DEBUG is not set
+CONFIG_DEVPTS_FS=y
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX4FS_RW is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_EXT2_FS=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_UDF_FS is not set
+# CONFIG_UDF_RW is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_UFS_FS_WRITE is not set
+
+#
+# Network File Systems
+#
+# CONFIG_CODA_FS is not set
+CONFIG_NFS_FS=y
+# CONFIG_NFS_V3 is not set
+CONFIG_ROOT_NFS=y
+# CONFIG_NFSD is not set
+# CONFIG_NFSD_V3 is not set
+CONFIG_SUNRPC=y
+CONFIG_LOCKD=y
+# CONFIG_SMB_FS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_SMALLDOS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_NCPFS_EXTRAS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_SMB_NLS is not set
+CONFIG_NLS=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Console drivers
+#
+CONFIG_PC_KEYMAP=y
+# CONFIG_VGA_CONSOLE is not set
+
+#
+# Frame-buffer support
+#
+CONFIG_FB=y
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FB_ACORN is not set
+# CONFIG_FB_CLPS711X is not set
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_SA1100=y
+# CONFIG_FB_ANAKIN is not set
+# CONFIG_FB_E1355 is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FBCON_ADVANCED is not set
+CONFIG_FBCON_CFB2=y
+CONFIG_FBCON_CFB4=y
+CONFIG_FBCON_CFB8=y
+CONFIG_FBCON_CFB16=y
+CONFIG_FBCON_FONTWIDTH8_ONLY=y
+CONFIG_FBCON_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_UHCI is not set
+# CONFIG_USB_UHCI_ALT is not set
+CONFIG_USB_OHCI=y
+CONFIG_USB_OHCI_NOPCI=y
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_BLUETOOTH is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_HID is not set
+# CONFIG_USB_KBD is not set
+CONFIG_USB_MOUSE=y
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_DC2XX is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_SCANNER is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_PWC is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_DABUSB is not set
+# CONFIG_USB_PLUSB is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_NET1080 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_RIO500 is not set
+
+#
+# Bluetooth support
+#
+# CONFIG_BLUEZ is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_NO_FRAME_POINTER is not set
+CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_NO_PGT_CACHE is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_DC21285_PORT is not set
+# CONFIG_DEBUG_CLPS711X_UART2 is not set
diff -urN 2.4.7-rmk3/linux/arch/arm/def-configs/assabet linux/arch/arm/def-configs/assabet
--- 2.4.7-rmk3/linux/arch/arm/def-configs/assabet	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/def-configs/assabet	Sat Aug 11 21:38:40 2001
@@ -357,6 +357,7 @@
 #
 # CONFIG_ACENIC is not set
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_DL2K is not set
 # CONFIG_MYRI_SBUS is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
@@ -442,6 +443,7 @@
 # CONFIG_WINBOND_FIR is not set
 # CONFIG_TOSHIBA_FIR is not set
 # CONFIG_SMC_IRCC_FIR is not set
+# CONFIG_ALI_FIR is not set
 CONFIG_SA1100_FIR=m
 
 #
@@ -577,6 +579,7 @@
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
 
 #
 # Ftape, the floppy tape device driver
@@ -588,6 +591,7 @@
 #
 # PCMCIA character devices
 #
+CONFIG_PCMCIA_SERIAL_CS=m
 
 #
 # Multimedia devices
@@ -736,10 +740,12 @@
 CONFIG_FB=y
 CONFIG_DUMMY_CONSOLE=y
 # CONFIG_FB_ACORN is not set
+# CONFIG_FB_ANAKIN is not set
 # CONFIG_FB_CLPS711X is not set
 # CONFIG_FB_CYBER2000 is not set
 CONFIG_FB_SA1100=y
-# CONFIG_FB_ANAKIN is not set
+# CONFIG_FB_PVR2 is not set
+# CONFIG_FB_PVR2_DEBUG is not set
 # CONFIG_FB_E1355 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FBCON_ADVANCED is not set
@@ -759,10 +765,6 @@
 # Sound
 #
 CONFIG_SOUND=y
-CONFIG_SOUND_ASSABET_UDA1341=y
-# CONFIG_SOUND_BITSY_UDA1341 is not set
-# CONFIG_SOUND_SA1111_UDA1341 is not set
-# CONFIG_SOUND_SA1100SSP is not set
 # CONFIG_SOUND_CMPCI is not set
 # CONFIG_SOUND_EMU10K1 is not set
 # CONFIG_SOUND_FUSION is not set
@@ -779,7 +781,12 @@
 # CONFIG_SOUND_MSNDPIN is not set
 # CONFIG_SOUND_VIA82CXXX is not set
 # CONFIG_MIDI_VIA82CXXX is not set
+CONFIG_SOUND_ASSABET_UDA1341=y
+# CONFIG_SOUND_BITSY_UDA1341 is not set
+# CONFIG_SOUND_SA1111_UDA1341 is not set
+# CONFIG_SOUND_SA1100SSP is not set
 # CONFIG_SOUND_OSS is not set
+# CONFIG_SOUND_WAVEARTIST is not set
 # CONFIG_SOUND_TVMIXER is not set
 
 #
diff -urN 2.4.7-rmk3/linux/arch/arm/def-configs/bitsy linux/arch/arm/def-configs/bitsy
--- 2.4.7-rmk3/linux/arch/arm/def-configs/bitsy	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/def-configs/bitsy	Sun Aug 12 10:38:09 2001
@@ -293,7 +293,7 @@
 # CONFIG_ATM is not set
 
 #
-#
+#  
 #
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
@@ -337,6 +337,7 @@
 #
 # CONFIG_ACENIC is not set
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_DL2K is not set
 # CONFIG_MYRI_SBUS is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
@@ -472,13 +473,15 @@
 CONFIG_SERIAL=m
 # CONFIG_SERIAL_EXTENDED is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_SERIAL_21285 is not set
-# CONFIG_SERIAL_21285_OLD is not set
-# CONFIG_SERIAL_21285_CONSOLE is not set
+# CONFIG_SERIAL_ANAKIN is not set
+# CONFIG_SERIAL_ANAKIN_CONSOLE is not set
 # CONFIG_SERIAL_AMBA is not set
 # CONFIG_SERIAL_AMBA_CONSOLE is not set
 # CONFIG_SERIAL_CLPS711X is not set
 # CONFIG_SERIAL_CLPS711X_CONSOLE is not set
+# CONFIG_SERIAL_21285 is not set
+# CONFIG_SERIAL_21285_OLD is not set
+# CONFIG_SERIAL_21285_CONSOLE is not set
 CONFIG_SERIAL_SA1100=y
 CONFIG_SERIAL_SA1100_CONSOLE=y
 CONFIG_SA1100_DEFAULT_BAUDRATE=38400
@@ -504,6 +507,23 @@
 # CONFIG_I2C is not set
 
 #
+# L3 serial bus support
+#
+# CONFIG_L3 is not set
+# CONFIG_L3_ALGOBIT is not set
+# CONFIG_L3_BIT_ASSABET is not set
+
+#
+# Other L3 adapters
+#
+# CONFIG_L3_SA1111 is not set
+
+#
+# L3 driver support
+#
+# CONFIG_L3_DRV_UDA1341 is not set
+
+#
 # Mice
 #
 # CONFIG_BUSMOUSE is not set
@@ -533,6 +553,7 @@
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
 
 #
 # Ftape, the floppy tape device driver
@@ -544,6 +565,7 @@
 #
 # PCMCIA character devices
 #
+CONFIG_PCMCIA_SERIAL_CS=m
 
 #
 # Multimedia devices
@@ -681,10 +703,12 @@
 CONFIG_FB=y
 CONFIG_DUMMY_CONSOLE=y
 # CONFIG_FB_ACORN is not set
+# CONFIG_FB_ANAKIN is not set
 # CONFIG_FB_CLPS711X is not set
 # CONFIG_FB_CYBER2000 is not set
 CONFIG_FB_SA1100=y
-# CONFIG_FB_ANAKIN is not set
+# CONFIG_FB_PVR2 is not set
+# CONFIG_FB_PVR2_DEBUG is not set
 # CONFIG_FB_E1355 is not set
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FBCON_ADVANCED=y
@@ -716,10 +740,6 @@
 # Sound
 #
 CONFIG_SOUND=y
-# CONFIG_SOUND_ASSABET_UDA1341 is not set
-CONFIG_SOUND_BITSY_UDA1341=m
-# CONFIG_SOUND_SA1111_UDA1341 is not set
-# CONFIG_SOUND_SA1100SSP is not set
 # CONFIG_SOUND_CMPCI is not set
 # CONFIG_SOUND_EMU10K1 is not set
 # CONFIG_SOUND_FUSION is not set
@@ -736,7 +756,12 @@
 # CONFIG_SOUND_MSNDPIN is not set
 # CONFIG_SOUND_VIA82CXXX is not set
 # CONFIG_MIDI_VIA82CXXX is not set
+# CONFIG_SOUND_ASSABET_UDA1341 is not set
+CONFIG_SOUND_BITSY_UDA1341=m
+# CONFIG_SOUND_SA1111_UDA1341 is not set
+# CONFIG_SOUND_SA1100SSP is not set
 # CONFIG_SOUND_OSS is not set
+# CONFIG_SOUND_WAVEARTIST is not set
 # CONFIG_SOUND_TVMIXER is not set
 
 #
diff -urN 2.4.7-rmk3/linux/arch/arm/def-configs/graphicsclient linux/arch/arm/def-configs/graphicsclient
--- 2.4.7-rmk3/linux/arch/arm/def-configs/graphicsclient	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/def-configs/graphicsclient	Sun Aug 12 16:02:29 2001
@@ -6,6 +6,8 @@
 # CONFIG_SBUS is not set
 # CONFIG_MCA is not set
 CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 
 #
 # Code maturity level options
@@ -23,16 +25,18 @@
 #
 # System Type
 #
+# CONFIG_ARCH_ANAKIN is not set
 # CONFIG_ARCH_ARCA5K is not set
 # CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_RPC is not set
 CONFIG_ARCH_SA1100=y
-# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_SHARK is not set
 
 #
 # Archimedes/A5000 Implementations
@@ -62,23 +66,28 @@
 # CONFIG_SA1100_CERF is not set
 # CONFIG_SA1100_BITSY is not set
 # CONFIG_SA1100_EXTENEX1 is not set
+# CONFIG_SA1100_FLEXANET is not set
 # CONFIG_SA1100_FREEBIRD is not set
 CONFIG_SA1100_GRAPHICSCLIENT=y
+# CONFIG_SA1100_JORNADA720 is not set
 # CONFIG_SA1100_HUW_WEBPANEL is not set
+# CONFIG_SA1100_ITSY is not set
 # CONFIG_SA1100_LART is not set
-# CONFIG_SA1100_PLEB is not set
 # CONFIG_SA1100_NANOENGINE is not set
+# CONFIG_SA1100_OMNIMETER is not set
 # CONFIG_SA1100_PANGOLIN is not set
+# CONFIG_SA1100_PLEB is not set
 # CONFIG_SA1100_SHERMAN is not set
+# CONFIG_SA1100_SIMPAD is not set
+# CONFIG_SA1100_PFS168 is not set
 # CONFIG_SA1100_VICTOR is not set
 # CONFIG_SA1100_XP860 is not set
 # CONFIG_SA1100_YOPY is not set
-# CONFIG_SA1100_PFS168 is not set
-CONFIG_SA1100_USB=m
-CONFIG_SA1100_USB_NETLINK=m
-CONFIG_SA1100_USB_CHAR=m
-# CONFIG_SA1100_FREQUENCY_SCALE is not set
-# CONFIG_SA1100_VOLTAGE_SCALE is not set
+# CONFIG_SA1100_GRAPHICSMASTER is not set
+# CONFIG_SA1100_ADSBITSY is not set
+# CONFIG_SA1100_USB is not set
+# CONFIG_SA1100_USB_NETLINK is not set
+# CONFIG_SA1100_USB_CHAR is not set
 
 #
 # CLPS711X/EP721X Implementations
@@ -104,18 +113,15 @@
 # CONFIG_CPU_SA110 is not set
 CONFIG_CPU_SA1100=y
 CONFIG_DISCONTIGMEM=y
+# CONFIG_CPU_BIG_ENDIAN is not set
 
 #
 # General setup
 #
-
-#
-# Please ensure that you have read the help on the next option
-#
-# CONFIG_ANGELBOOT is not set
 # CONFIG_PCI is not set
 # CONFIG_ISA is not set
 # CONFIG_ISA_DMA is not set
+# CONFIG_CPU_FREQ is not set
 CONFIG_HOTPLUG=y
 
 #
@@ -125,7 +131,7 @@
 # CONFIG_I82365 is not set
 # CONFIG_TCIC is not set
 # CONFIG_PCMCIA_CLPS6700 is not set
-CONFIG_PCMCIA_SA1100=m
+CONFIG_PCMCIA_SA1100=y
 CONFIG_NET=y
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
@@ -138,12 +144,14 @@
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 # CONFIG_PM is not set
+# CONFIG_APM is not set
 # CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="root=nfs"
+CONFIG_CMDLINE="ip=off"
 # CONFIG_PFS168_CMDLINE is not set
-# CONFIG_LEDS is not set
+CONFIG_LEDS=y
+CONFIG_LEDS_TIMER=y
+CONFIG_LEDS_CPU=y
 CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_UCB1200 is not set
 
 #
 # Parallel port support
@@ -153,65 +161,87 @@
 #
 # Memory Technology Devices (MTD)
 #
-CONFIG_MTD=m
+CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_BOOTLDR_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
 
 #
-# Disk-On-Chip Device Drivers
+# User Modules And Translation Layers
 #
-# CONFIG_MTD_DOC1000 is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOCPROBE is not set
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
 
 #
-# RAM/ROM Device Drivers
+# RAM/ROM/Flash chip drivers
 #
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_AMDSTD is not set
+# CONFIG_MTD_SHARP is not set
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
-# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_JEDEC is not set
 
 #
-# Linearly Mapped Flash Device Drivers
+# Mapping drivers for chip access
 #
-CONFIG_MTD_CFI=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_INTELEXT=m
-# CONFIG_MTD_CFI_AMDSTD is not set
-# CONFIG_MTD_AMDSTD is not set
-# CONFIG_MTD_SHARP is not set
-# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=800000
+CONFIG_MTD_PHYSMAP_LEN=1000000
+CONFIG_MTD_PHYSMAP_BUSWIDTH=4
+# CONFIG_MTD_SUN_UFLASH is not set
 # CONFIG_MTD_NORA is not set
 # CONFIG_MTD_PNC2000 is not set
 # CONFIG_MTD_RPXLITE is not set
+# CONFIG_MTD_TQM8XXL is not set
 # CONFIG_MTD_SC520CDP is not set
-# CONFIG_MTD_SBC_MEDIAGX is not set
+# CONFIG_MTD_NETSC520 is not set
+# CONFIG_MTD_SBC_GXX is not set
 # CONFIG_MTD_ELAN_104NC is not set
-CONFIG_MTD_SA1100=m
+CONFIG_MTD_SA1100=y
+# CONFIG_MTD_SA1100_REDBOOT_PARTITIONS is not set
+# CONFIG_MTD_SA1100_BOOTLDR_PARTITIONS is not set
 # CONFIG_MTD_DC21285 is not set
 # CONFIG_MTD_IQ80310 is not set
-# CONFIG_MTD_CSTM_CFI_JEDEC is not set
-# CONFIG_MTD_JEDEC is not set
+# CONFIG_MTD_DBOX2 is not set
+# CONFIG_MTD_CSTM_MIPS_IXX is not set
+# CONFIG_MTD_CFI_FLAGADM is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_SOLUTIONENGINE is not set
 # CONFIG_MTD_MIXMEM is not set
 # CONFIG_MTD_OCTAGON is not set
 # CONFIG_MTD_VMAX is not set
+# CONFIG_MTD_OCELOT is not set
+# CONFIG_MTD_L440GX is not set
 
 #
-# NAND Flash Device Drivers
+# Self-contained MTD device drivers
 #
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_SPIA is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_LART is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLKMTD is not set
 
 #
-# User Modules And Translation Layers
+# Disk-On-Chip Device Drivers
 #
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
+# CONFIG_MTD_DOC1000 is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOCPROBE is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
 
 #
 # Plug and Play configuration
@@ -258,6 +288,7 @@
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
@@ -302,22 +333,25 @@
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-# CONFIG_NET_SB1000 is not set
 
 #
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
+# CONFIG_SUNLANCE is not set
+# CONFIG_SUNBMAC is not set
+# CONFIG_SUNQE is not set
+# CONFIG_SUNLANCE is not set
+# CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_LANCE is not set
 CONFIG_NET_VENDOR_SMC=y
 # CONFIG_WD80x3 is not set
+# CONFIG_ULTRAMCA is not set
 # CONFIG_ULTRA is not set
 # CONFIG_ULTRA32 is not set
 CONFIG_SMC9194=y
 # CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
 # CONFIG_NET_ISA is not set
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_POCKET is not set
@@ -326,11 +360,14 @@
 # Ethernet (1000 Mbit)
 #
 # CONFIG_ACENIC is not set
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_MYRI_SBUS is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
 
@@ -359,7 +396,7 @@
 # CONFIG_PCMCIA_3C589 is not set
 # CONFIG_PCMCIA_3C574 is not set
 # CONFIG_PCMCIA_FMVJ18X is not set
-CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_PCNET=y
 # CONFIG_PCMCIA_NMCLAN is not set
 # CONFIG_PCMCIA_SMC91C92 is not set
 # CONFIG_PCMCIA_XIRC2PS is not set
@@ -380,19 +417,19 @@
 #
 # ATA/IDE/MFM/RLL support
 #
-CONFIG_IDE=m
+CONFIG_IDE=y
 
 #
 # IDE, ATA and ATAPI Block devices
 #
-CONFIG_BLK_DEV_IDE=m
+CONFIG_BLK_DEV_IDE=y
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_IDEDISK=m
+CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
 # CONFIG_BLK_DEV_IDEDISK_VENDOR is not set
 # CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set
@@ -403,7 +440,7 @@
 # CONFIG_BLK_DEV_IDEDISK_WD is not set
 # CONFIG_BLK_DEV_COMMERIAL is not set
 # CONFIG_BLK_DEV_TIVO is not set
-CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECS=y
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -452,19 +489,31 @@
 # CONFIG_SERIAL is not set
 # CONFIG_SERIAL_EXTENDED is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_21285 is not set
+# CONFIG_SERIAL_21285_OLD is not set
+# CONFIG_SERIAL_21285_CONSOLE is not set
+# CONFIG_SERIAL_AMBA is not set
+# CONFIG_SERIAL_AMBA_CONSOLE is not set
+# CONFIG_SERIAL_CLPS711X is not set
+# CONFIG_SERIAL_CLPS711X_CONSOLE is not set
 CONFIG_SERIAL_SA1100=y
 CONFIG_SERIAL_SA1100_CONSOLE=y
-CONFIG_SA1100_DEFAULT_BAUDRATE=9600
-# CONFIG_TOUCHSCREEN_UCB1200 is not set
+CONFIG_SA1100_DEFAULT_BAUDRATE=38400
+# CONFIG_SERIAL_8250 is not set
+# CONFIG_SERIAL_8250_CONSOLE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=32
+CONFIG_UCB1200=y
+CONFIG_TOUCHSCREEN_UCB1200=y
+CONFIG_AUDIO_UCB1200=y
+CONFIG_ADC_UCB1200=y
 # CONFIG_TOUCHSCREEN_BITSY is not set
 # CONFIG_PROFILER is not set
 # CONFIG_PFS168_SPI is not set
 # CONFIG_PFS168_DTMF is not set
 # CONFIG_PFS168_MISC is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=32
 
 #
 # I2C support
@@ -505,7 +554,10 @@
 # CONFIG_FTAPE is not set
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
-# CONFIG_PCMCIA_SERIAL is not set
+
+#
+# PCMCIA character devices
+#
 
 #
 # Multimedia devices
@@ -525,20 +577,22 @@
 # CONFIG_AFFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_BFS_FS is not set
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
 # CONFIG_UMSDOS_FS is not set
-CONFIG_VFAT_FS=m
+CONFIG_VFAT_FS=y
 # CONFIG_EFS_FS is not set
-CONFIG_JFFS_FS=m
+CONFIG_JFFS_FS=y
 CONFIG_JFFS_FS_VERBOSE=0
-CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_CRAMFS is not set
-CONFIG_RAMFS=m
+CONFIG_CRAMFS=y
+# CONFIG_TMPFS is not set
+CONFIG_RAMFS=y
 # CONFIG_ISO9660_FS is not set
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
+# CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
@@ -552,7 +606,6 @@
 # CONFIG_ROMFS_FS is not set
 CONFIG_EXT2_FS=y
 # CONFIG_SYSV_FS is not set
-# CONFIG_SYSV_FS_WRITE is not set
 # CONFIG_UDF_FS is not set
 # CONFIG_UDF_RW is not set
 # CONFIG_UFS_FS is not set
@@ -607,11 +660,13 @@
 # CONFIG_NLS_CODEPAGE_865 is not set
 # CONFIG_NLS_CODEPAGE_866 is not set
 # CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
 # CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
 # CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
@@ -619,11 +674,12 @@
 # CONFIG_NLS_ISO8859_5 is not set
 # CONFIG_NLS_ISO8859_6 is not set
 # CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
 # CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
 # CONFIG_NLS_ISO8859_14 is not set
 # CONFIG_NLS_ISO8859_15 is not set
 # CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
 
 #
@@ -631,7 +687,6 @@
 #
 CONFIG_PC_KEYMAP=y
 # CONFIG_VGA_CONSOLE is not set
-CONFIG_FB=y
 
 #
 # Frame-buffer support
@@ -642,6 +697,8 @@
 # CONFIG_FB_CLPS711X is not set
 # CONFIG_FB_CYBER2000 is not set
 CONFIG_FB_SA1100=y
+# CONFIG_FB_ANAKIN is not set
+# CONFIG_FB_E1355 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FBCON_ADVANCED is not set
 CONFIG_FBCON_CFB2=y
@@ -665,6 +722,11 @@
 # USB support
 #
 # CONFIG_USB is not set
+
+#
+# Bluetooth support
+#
+# CONFIG_BLUEZ is not set
 
 #
 # Kernel hacking
diff -urN 2.4.7-rmk3/linux/arch/arm/def-configs/graphicsmaster linux/arch/arm/def-configs/graphicsmaster
--- 2.4.7-rmk3/linux/arch/arm/def-configs/graphicsmaster	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/def-configs/graphicsmaster	Sun Aug 12 16:02:29 2001
@@ -0,0 +1,755 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+CONFIG_ARM=y
+# CONFIG_EISA is not set
+# CONFIG_SBUS is not set
+# CONFIG_MCA is not set
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+# CONFIG_OBSOLETE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_KMOD is not set
+
+#
+# System Type
+#
+# CONFIG_ARCH_ANAKIN is not set
+# CONFIG_ARCH_ARCA5K is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_RPC is not set
+CONFIG_ARCH_SA1100=y
+# CONFIG_ARCH_SHARK is not set
+
+#
+# Archimedes/A5000 Implementations
+#
+# CONFIG_ARCH_ARC is not set
+# CONFIG_ARCH_A5K is not set
+
+#
+# Footbridge Implementations
+#
+# CONFIG_ARCH_CATS is not set
+# CONFIG_ARCH_PERSONAL_SERVER is not set
+# CONFIG_ARCH_EBSA285_ADDIN is not set
+# CONFIG_ARCH_EBSA285_HOST is not set
+# CONFIG_ARCH_NETWINDER is not set
+
+#
+# SA11x0 Implementations
+#
+# CONFIG_SA1100_ASSABET is not set
+# CONFIG_ASSABET_NEPONSET is not set
+# CONFIG_SA1100_BRUTUS is not set
+# CONFIG_SA1100_CERF is not set
+# CONFIG_SA1100_BITSY is not set
+# CONFIG_SA1100_EXTENEX1 is not set
+# CONFIG_SA1100_FLEXANET is not set
+# CONFIG_SA1100_FREEBIRD is not set
+# CONFIG_SA1100_GRAPHICSCLIENT is not set
+# CONFIG_SA1100_JORNADA720 is not set
+# CONFIG_SA1100_HUW_WEBPANEL is not set
+# CONFIG_SA1100_ITSY is not set
+# CONFIG_SA1100_LART is not set
+# CONFIG_SA1100_NANOENGINE is not set
+# CONFIG_SA1100_OMNIMETER is not set
+# CONFIG_SA1100_PANGOLIN is not set
+# CONFIG_SA1100_PLEB is not set
+# CONFIG_SA1100_SHERMAN is not set
+# CONFIG_SA1100_SIMPAD is not set
+# CONFIG_SA1100_PFS168 is not set
+# CONFIG_SA1100_VICTOR is not set
+# CONFIG_SA1100_XP860 is not set
+# CONFIG_SA1100_YOPY is not set
+CONFIG_SA1100_GRAPHICSMASTER=y
+# CONFIG_SA1100_ADSBITSY is not set
+CONFIG_SA1111=y
+# CONFIG_SA1100_USB is not set
+# CONFIG_SA1100_USB_NETLINK is not set
+# CONFIG_SA1100_USB_CHAR is not set
+
+#
+# CLPS711X/EP721X Implementations
+#
+# CONFIG_ARCH_P720T is not set
+# CONFIG_ARCH_ACORN is not set
+# CONFIG_FOOTBRIDGE is not set
+# CONFIG_FOOTBRIDGE_HOST is not set
+# CONFIG_FOOTBRIDGE_ADDIN is not set
+CONFIG_CPU_32=y
+# CONFIG_CPU_26 is not set
+# CONFIG_CPU_32v3 is not set
+CONFIG_CPU_32v4=y
+# CONFIG_CPU_ARM610 is not set
+# CONFIG_CPU_ARM710 is not set
+# CONFIG_CPU_ARM720T is not set
+# CONFIG_CPU_ARM920T is not set
+# CONFIG_CPU_ARM1020 is not set
+# CONFIG_CPU_SA110 is not set
+CONFIG_CPU_SA1100=y
+CONFIG_DISCONTIGMEM=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+
+#
+# General setup
+#
+# CONFIG_PCI is not set
+# CONFIG_ISA is not set
+# CONFIG_ISA_DMA is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_HOTPLUG=y
+
+#
+# PCMCIA/CardBus support
+#
+CONFIG_PCMCIA=y
+# CONFIG_I82365 is not set
+# CONFIG_TCIC is not set
+# CONFIG_PCMCIA_CLPS6700 is not set
+CONFIG_PCMCIA_SA1100=y
+CONFIG_NET=y
+CONFIG_SYSVIPC=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_FASTFPE is not set
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_PM is not set
+# CONFIG_APM is not set
+# CONFIG_ARTHUR is not set
+CONFIG_CMDLINE="ip=off"
+# CONFIG_PFS168_CMDLINE is not set
+CONFIG_LEDS=y
+CONFIG_LEDS_TIMER=y
+CONFIG_LEDS_CPU=y
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_BOOTLDR_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_AMDSTD is not set
+# CONFIG_MTD_SHARP is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_JEDEC is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=800000
+CONFIG_MTD_PHYSMAP_LEN=1000000
+CONFIG_MTD_PHYSMAP_BUSWIDTH=4
+# CONFIG_MTD_SUN_UFLASH is not set
+# CONFIG_MTD_NORA is not set
+# CONFIG_MTD_PNC2000 is not set
+# CONFIG_MTD_RPXLITE is not set
+# CONFIG_MTD_TQM8XXL is not set
+# CONFIG_MTD_SC520CDP is not set
+# CONFIG_MTD_NETSC520 is not set
+# CONFIG_MTD_SBC_GXX is not set
+# CONFIG_MTD_ELAN_104NC is not set
+CONFIG_MTD_SA1100=y
+# CONFIG_MTD_SA1100_REDBOOT_PARTITIONS is not set
+# CONFIG_MTD_SA1100_BOOTLDR_PARTITIONS is not set
+# CONFIG_MTD_DC21285 is not set
+# CONFIG_MTD_IQ80310 is not set
+# CONFIG_MTD_DBOX2 is not set
+# CONFIG_MTD_CSTM_MIPS_IXX is not set
+# CONFIG_MTD_CFI_FLAGADM is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_SOLUTIONENGINE is not set
+# CONFIG_MTD_MIXMEM is not set
+# CONFIG_MTD_OCTAGON is not set
+# CONFIG_MTD_VMAX is not set
+# CONFIG_MTD_OCELOT is not set
+# CONFIG_MTD_L440GX is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_LART is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLKMTD is not set
+# CONFIG_MTD_DOC1000 is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOCPROBE is not set
+
+#
+# NAND Flash Device Drivers
+#
+# CONFIG_MTD_NAND is not set
+
+#
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_INITRD=y
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+# CONFIG_BLK_DEV_MD is not set
+# CONFIG_MD_LINEAR is not set
+# CONFIG_MD_RAID0 is not set
+# CONFIG_MD_RAID1 is not set
+# CONFIG_MD_RAID5 is not set
+# CONFIG_BLK_DEV_LVM is not set
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_FILTER is not set
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_INET_ECN is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_IPV6 is not set
+# CONFIG_KHTTPD is not set
+# CONFIG_ATM is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_DECNET is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_LLC is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+# CONFIG_SUNLANCE is not set
+# CONFIG_SUNBMAC is not set
+# CONFIG_SUNQE is not set
+# CONFIG_SUNLANCE is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_LANCE is not set
+CONFIG_NET_VENDOR_SMC=y
+# CONFIG_WD80x3 is not set
+# CONFIG_ULTRAMCA is not set
+# CONFIG_ULTRA is not set
+# CONFIG_ULTRA32 is not set
+CONFIG_SMC9194=y
+# CONFIG_NET_VENDOR_RACAL is not set
+# CONFIG_NET_ISA is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_NET_POCKET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_MYRI_SBUS is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+# CONFIG_NET_FC is not set
+# CONFIG_RCPCI is not set
+# CONFIG_SHAPER is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+
+#
+# PCMCIA network device support
+#
+CONFIG_NET_PCMCIA=y
+# CONFIG_PCMCIA_3C589 is not set
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+CONFIG_PCMCIA_PCNET=y
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_ARCNET_COM20020_CS is not set
+# CONFIG_PCMCIA_IBMTR is not set
+# CONFIG_NET_PCMCIA_RADIO is not set
+
+#
+# Amateur Radio support
+#
+# CONFIG_HAMRADIO is not set
+
+#
+# IrDA (infrared) support
+#
+# CONFIG_IRDA is not set
+
+#
+# ATA/IDE/MFM/RLL support
+#
+CONFIG_IDE=y
+
+#
+# IDE, ATA and ATAPI Block devices
+#
+CONFIG_BLK_DEV_IDE=y
+# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set
+# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set
+# CONFIG_BLK_DEV_IDEDISK_IBM is not set
+# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set
+# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set
+# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set
+# CONFIG_BLK_DEV_IDEDISK_WD is not set
+# CONFIG_BLK_DEV_COMMERIAL is not set
+# CONFIG_BLK_DEV_TIVO is not set
+CONFIG_BLK_DEV_IDECS=y
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+# CONFIG_BLK_DEV_ISAPNP is not set
+# CONFIG_IDE_CHIPSETS is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_DMA_NONPCI is not set
+# CONFIG_BLK_DEV_IDE_MODES is not set
+
+#
+# SCSI support
+#
+# CONFIG_SCSI is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+# CONFIG_I2O_BLOCK is not set
+# CONFIG_I2O_LAN is not set
+# CONFIG_I2O_SCSI is not set
+# CONFIG_I2O_PROC is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input core support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_KEYBDEV is not set
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+# CONFIG_VT_CONSOLE is not set
+# CONFIG_SERIAL is not set
+# CONFIG_SERIAL_EXTENDED is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_21285 is not set
+# CONFIG_SERIAL_21285_OLD is not set
+# CONFIG_SERIAL_21285_CONSOLE is not set
+# CONFIG_SERIAL_AMBA is not set
+# CONFIG_SERIAL_AMBA_CONSOLE is not set
+# CONFIG_SERIAL_CLPS711X is not set
+# CONFIG_SERIAL_CLPS711X_CONSOLE is not set
+CONFIG_SERIAL_SA1100=y
+CONFIG_SERIAL_SA1100_CONSOLE=y
+CONFIG_SA1100_DEFAULT_BAUDRATE=38400
+# CONFIG_SERIAL_8250 is not set
+# CONFIG_SERIAL_8250_CONSOLE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=32
+CONFIG_UCB1200=y
+CONFIG_TOUCHSCREEN_UCB1200=y
+CONFIG_AUDIO_UCB1200=y
+CONFIG_ADC_UCB1200=y
+# CONFIG_TOUCHSCREEN_BITSY is not set
+# CONFIG_PROFILER is not set
+# CONFIG_PFS168_SPI is not set
+# CONFIG_PFS168_DTMF is not set
+# CONFIG_PFS168_MISC is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Mice
+#
+# CONFIG_BUSMOUSE is not set
+# CONFIG_MOUSE is not set
+
+#
+# Joysticks
+#
+# CONFIG_JOYSTICK is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_INTEL_RNG is not set
+# CONFIG_NVRAM is not set
+# CONFIG_RTC is not set
+# CONFIG_SA1100_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+
+#
+# PCMCIA character devices
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# File systems
+#
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADFS_FS_RW is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_BFS_FS is not set
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+# CONFIG_UMSDOS_FS is not set
+CONFIG_VFAT_FS=y
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS_FS=y
+CONFIG_JFFS_FS_VERBOSE=0
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_CRAMFS=y
+# CONFIG_TMPFS is not set
+CONFIG_RAMFS=y
+# CONFIG_ISO9660_FS is not set
+# CONFIG_JOLIET is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_HPFS_FS is not set
+CONFIG_PROC_FS=y
+# CONFIG_DEVFS_FS is not set
+# CONFIG_DEVFS_MOUNT is not set
+# CONFIG_DEVFS_DEBUG is not set
+CONFIG_DEVPTS_FS=y
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX4FS_RW is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_EXT2_FS=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_UDF_FS is not set
+# CONFIG_UDF_RW is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_UFS_FS_WRITE is not set
+
+#
+# Network File Systems
+#
+# CONFIG_CODA_FS is not set
+CONFIG_NFS_FS=y
+# CONFIG_NFS_V3 is not set
+CONFIG_ROOT_NFS=y
+# CONFIG_NFSD is not set
+# CONFIG_NFSD_V3 is not set
+CONFIG_SUNRPC=y
+CONFIG_LOCKD=y
+# CONFIG_SMB_FS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_SMALLDOS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_NCPFS_EXTRAS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_SMB_NLS is not set
+CONFIG_NLS=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Console drivers
+#
+CONFIG_PC_KEYMAP=y
+# CONFIG_VGA_CONSOLE is not set
+
+#
+# Frame-buffer support
+#
+CONFIG_FB=y
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FB_ACORN is not set
+# CONFIG_FB_CLPS711X is not set
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_SA1100=y
+# CONFIG_FB_ANAKIN is not set
+# CONFIG_FB_E1355 is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FBCON_ADVANCED is not set
+CONFIG_FBCON_CFB2=y
+CONFIG_FBCON_CFB4=y
+CONFIG_FBCON_CFB8=y
+CONFIG_FBCON_CFB16=y
+CONFIG_FBCON_FONTWIDTH8_ONLY=y
+CONFIG_FBCON_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_UHCI is not set
+# CONFIG_USB_UHCI_ALT is not set
+CONFIG_USB_OHCI=y
+CONFIG_USB_OHCI_NOPCI=y
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_BLUETOOTH is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_HID is not set
+# CONFIG_USB_KBD is not set
+CONFIG_USB_MOUSE=y
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_DC2XX is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_SCANNER is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_PWC is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_DABUSB is not set
+# CONFIG_USB_PLUSB is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_NET1080 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_RIO500 is not set
+
+#
+# Bluetooth support
+#
+# CONFIG_BLUEZ is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_NO_FRAME_POINTER is not set
+CONFIG_DEBUG_ERRORS=y
+CONFIG_DEBUG_USER=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_NO_PGT_CACHE is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_DC21285_PORT is not set
+# CONFIG_DEBUG_CLPS711X_UART2 is not set
diff -urN 2.4.7-rmk3/linux/arch/arm/def-configs/neponset linux/arch/arm/def-configs/neponset
--- 2.4.7-rmk3/linux/arch/arm/def-configs/neponset	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/def-configs/neponset	Sat Aug 11 21:38:40 2001
@@ -354,6 +354,7 @@
 #
 # CONFIG_ACENIC is not set
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_DL2K is not set
 # CONFIG_MYRI_SBUS is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
@@ -546,6 +547,7 @@
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
 
 #
 # Ftape, the floppy tape device driver
@@ -557,6 +559,7 @@
 #
 # PCMCIA character devices
 #
+CONFIG_PCMCIA_SERIAL_CS=m
 
 #
 # Multimedia devices
@@ -705,10 +708,12 @@
 CONFIG_FB=y
 CONFIG_DUMMY_CONSOLE=y
 # CONFIG_FB_ACORN is not set
+# CONFIG_FB_ANAKIN is not set
 # CONFIG_FB_CLPS711X is not set
 # CONFIG_FB_CYBER2000 is not set
 CONFIG_FB_SA1100=y
-# CONFIG_FB_ANAKIN is not set
+# CONFIG_FB_PVR2 is not set
+# CONFIG_FB_PVR2_DEBUG is not set
 # CONFIG_FB_E1355 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FBCON_ADVANCED is not set
@@ -728,10 +733,6 @@
 # Sound
 #
 CONFIG_SOUND=y
-CONFIG_SOUND_ASSABET_UDA1341=m
-# CONFIG_SOUND_BITSY_UDA1341 is not set
-CONFIG_SOUND_SA1111_UDA1341=m
-# CONFIG_SOUND_SA1100SSP is not set
 # CONFIG_SOUND_CMPCI is not set
 # CONFIG_SOUND_EMU10K1 is not set
 # CONFIG_SOUND_FUSION is not set
@@ -748,7 +749,12 @@
 # CONFIG_SOUND_MSNDPIN is not set
 # CONFIG_SOUND_VIA82CXXX is not set
 # CONFIG_MIDI_VIA82CXXX is not set
+CONFIG_SOUND_ASSABET_UDA1341=m
+# CONFIG_SOUND_BITSY_UDA1341 is not set
+CONFIG_SOUND_SA1111_UDA1341=m
+# CONFIG_SOUND_SA1100SSP is not set
 # CONFIG_SOUND_OSS is not set
+# CONFIG_SOUND_WAVEARTIST is not set
 # CONFIG_SOUND_TVMIXER is not set
 
 #
@@ -769,7 +775,6 @@
 # CONFIG_USB_UHCI is not set
 # CONFIG_USB_UHCI_ALT is not set
 CONFIG_USB_OHCI=y
-CONFIG_USB_OHCI_NOPCI=y
 
 #
 # USB Device Class drivers
diff -urN 2.4.7-rmk3/linux/arch/arm/def-configs/pangolin linux/arch/arm/def-configs/pangolin
--- 2.4.7-rmk3/linux/arch/arm/def-configs/pangolin	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/def-configs/pangolin	Sun Aug 12 16:27:16 2001
@@ -1,11 +1,13 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 CONFIG_ARM=y
 # CONFIG_EISA is not set
 # CONFIG_SBUS is not set
 # CONFIG_MCA is not set
 CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 
 #
 # Code maturity level options
@@ -23,24 +25,22 @@
 #
 # System Type
 #
+# CONFIG_ARCH_ANAKIN is not set
 # CONFIG_ARCH_ARCA5K is not set
 # CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_RPC is not set
 CONFIG_ARCH_SA1100=y
-# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_SHARK is not set
 
 #
 # Archimedes/A5000 Implementations
 #
-
-#
-# Archimedes/A5000 Implementations (select only ONE)
-#
 # CONFIG_ARCH_ARC is not set
 # CONFIG_ARCH_A5K is not set
 
@@ -62,14 +62,20 @@
 # CONFIG_SA1100_CERF is not set
 # CONFIG_SA1100_BITSY is not set
 # CONFIG_SA1100_EXTENEX1 is not set
+# CONFIG_SA1100_FLEXANET is not set
 # CONFIG_SA1100_FREEBIRD is not set
 # CONFIG_SA1100_GRAPHICSCLIENT is not set
+# CONFIG_SA1100_JORNADA720 is not set
 # CONFIG_SA1100_HUW_WEBPANEL is not set
+# CONFIG_SA1100_ITSY is not set
 # CONFIG_SA1100_LART is not set
 # CONFIG_SA1100_NANOENGINE is not set
+# CONFIG_SA1100_OMNIMETER is not set
 CONFIG_SA1100_PANGOLIN=y
+CONFIG_SA1100_PANGOLIN_PCMCIA_IDE=y
 # CONFIG_SA1100_PLEB is not set
 # CONFIG_SA1100_SHERMAN is not set
+# CONFIG_SA1100_SIMPAD is not set
 # CONFIG_SA1100_PFS168 is not set
 # CONFIG_SA1100_VICTOR is not set
 # CONFIG_SA1100_XP860 is not set
@@ -77,8 +83,6 @@
 # CONFIG_SA1100_USB is not set
 # CONFIG_SA1100_USB_NETLINK is not set
 # CONFIG_SA1100_USB_CHAR is not set
-# CONFIG_SA1100_FREQUENCY_SCALE is not set
-# CONFIG_SA1100_VOLTAGE_SCALE is not set
 
 #
 # CLPS711X/EP721X Implementations
@@ -90,10 +94,6 @@
 # CONFIG_FOOTBRIDGE_ADDIN is not set
 CONFIG_CPU_32=y
 # CONFIG_CPU_26 is not set
-
-#
-# Processor Type
-#
 # CONFIG_CPU_32v3 is not set
 CONFIG_CPU_32v4=y
 # CONFIG_CPU_ARM610 is not set
@@ -104,18 +104,15 @@
 # CONFIG_CPU_SA110 is not set
 CONFIG_CPU_SA1100=y
 CONFIG_DISCONTIGMEM=y
+# CONFIG_CPU_BIG_ENDIAN is not set
 
 #
 # General setup
 #
-
-#
-# Please ensure that you have read the help on the next option
-#
-# CONFIG_ANGELBOOT is not set
 # CONFIG_PCI is not set
 # CONFIG_ISA is not set
 # CONFIG_ISA_DMA is not set
+# CONFIG_CPU_FREQ is not set
 CONFIG_HOTPLUG=y
 
 #
@@ -130,20 +127,20 @@
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_FASTFPE is not set
+# CONFIG_FPE_NWFPE is not set
+CONFIG_FPE_FASTFPE=y
 CONFIG_KCORE_ELF=y
 # CONFIG_KCORE_AOUT is not set
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 # CONFIG_PM is not set
+# CONFIG_APM is not set
 # CONFIG_ARTHUR is not set
 CONFIG_CMDLINE="keepinitrd"
 # CONFIG_PFS168_CMDLINE is not set
 # CONFIG_LEDS is not set
 CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_UCB1200 is not set
 
 #
 # Parallel port support
@@ -155,62 +152,84 @@
 #
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_BOOTLDR_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
 
 #
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC1000 is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOCPROBE is not set
-
-#
-# RAM/ROM Device Drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_MTDRAM is not set
-
-#
-# Linearly Mapped Flash Device Drivers
+# RAM/ROM/Flash chip drivers
 #
 CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_CFI_B1 is not set
+# CONFIG_MTD_CFI_B2 is not set
+CONFIG_MTD_CFI_B4=y
+# CONFIG_MTD_CFI_I1 is not set
+# CONFIG_MTD_CFI_I2 is not set
+CONFIG_MTD_CFI_I4=y
 CONFIG_MTD_CFI_INTELEXT=y
 # CONFIG_MTD_CFI_AMDSTD is not set
 # CONFIG_MTD_AMDSTD is not set
 # CONFIG_MTD_SHARP is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_JEDEC is not set
+
+#
+# Mapping drivers for chip access
+#
 # CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_SUN_UFLASH is not set
 # CONFIG_MTD_NORA is not set
 # CONFIG_MTD_PNC2000 is not set
 # CONFIG_MTD_RPXLITE is not set
+# CONFIG_MTD_TQM8XXL is not set
 # CONFIG_MTD_SC520CDP is not set
-# CONFIG_MTD_SBC_MEDIAGX is not set
+# CONFIG_MTD_NETSC520 is not set
+# CONFIG_MTD_SBC_GXX is not set
 # CONFIG_MTD_ELAN_104NC is not set
 CONFIG_MTD_SA1100=y
+# CONFIG_MTD_SA1100_REDBOOT_PARTITIONS is not set
+# CONFIG_MTD_SA1100_BOOTLDR_PARTITIONS is not set
 # CONFIG_MTD_DC21285 is not set
 # CONFIG_MTD_IQ80310 is not set
-# CONFIG_MTD_CSTM_CFI_JEDEC is not set
-# CONFIG_MTD_JEDEC is not set
+# CONFIG_MTD_DBOX2 is not set
+# CONFIG_MTD_CSTM_MIPS_IXX is not set
+# CONFIG_MTD_CFI_FLAGADM is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_SOLUTIONENGINE is not set
 # CONFIG_MTD_MIXMEM is not set
 # CONFIG_MTD_OCTAGON is not set
 # CONFIG_MTD_VMAX is not set
+# CONFIG_MTD_OCELOT is not set
+# CONFIG_MTD_L440GX is not set
 
 #
-# NAND Flash Device Drivers
+# Self-contained MTD device drivers
 #
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_NAND_SPIA is not set
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_LART is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLKMTD is not set
+# CONFIG_MTD_DOC1000 is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOCPROBE is not set
 
 #
-# User Modules And Translation Layers
+# NAND Flash Device Drivers
 #
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
+# CONFIG_MTD_NAND is not set
 
 #
 # Plug and Play configuration
@@ -264,10 +283,6 @@
 # CONFIG_IPV6 is not set
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
-
-#
-#
-#
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
 # CONFIG_DECNET is not set
@@ -295,22 +310,29 @@
 # ARCnet devices
 #
 # CONFIG_ARCNET is not set
-CONFIG_DUMMY=y
+# CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-# CONFIG_NET_SB1000 is not set
 
 #
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
+# CONFIG_SUNLANCE is not set
+# CONFIG_SUNBMAC is not set
+# CONFIG_SUNQE is not set
+# CONFIG_SUNLANCE is not set
+# CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
+CONFIG_NET_VENDOR_SMC=y
+# CONFIG_WD80x3 is not set
+# CONFIG_ULTRAMCA is not set
+# CONFIG_ULTRA is not set
+# CONFIG_ULTRA32 is not set
+CONFIG_SMC9194=y
 # CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
 # CONFIG_NET_ISA is not set
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_POCKET is not set
@@ -319,11 +341,14 @@
 # Ethernet (1000 Mbit)
 #
 # CONFIG_ACENIC is not set
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_MYRI_SBUS is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
 
@@ -358,8 +383,12 @@
 # CONFIG_PCMCIA_XIRC2PS is not set
 # CONFIG_ARCNET_COM20020_CS is not set
 # CONFIG_PCMCIA_IBMTR is not set
-# CONFIG_NET_PCMCIA_RADIO is not set
-CONFIG_PCMCIA_NETCARD=y
+CONFIG_NET_PCMCIA_RADIO=y
+# CONFIG_PCMCIA_RAYCS is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_AIRONET4500_CS is not set
+CONFIG_PCMCIA_WVLAN=y
 
 #
 # Amateur Radio support
@@ -374,19 +403,15 @@
 #
 # ATA/IDE/MFM/RLL support
 #
-CONFIG_IDE=y
+CONFIG_IDE=m
 
 #
 # IDE, ATA and ATAPI Block devices
 #
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
+CONFIG_BLK_DEV_IDE=m
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_BLK_DEV_IDEDISK=m
 # CONFIG_IDEDISK_MULTI_MODE is not set
 # CONFIG_BLK_DEV_IDEDISK_VENDOR is not set
 # CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set
@@ -397,15 +422,12 @@
 # CONFIG_BLK_DEV_IDEDISK_WD is not set
 # CONFIG_BLK_DEV_COMMERIAL is not set
 # CONFIG_BLK_DEV_TIVO is not set
-CONFIG_BLK_DEV_IDECS=y
+CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_PANGOLIN is not set
 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
-
-#
-# IDE chipset support/bugfixes
-#
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
@@ -446,19 +468,31 @@
 # CONFIG_SERIAL is not set
 # CONFIG_SERIAL_EXTENDED is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_21285 is not set
+# CONFIG_SERIAL_21285_OLD is not set
+# CONFIG_SERIAL_21285_CONSOLE is not set
+# CONFIG_SERIAL_AMBA is not set
+# CONFIG_SERIAL_AMBA_CONSOLE is not set
+# CONFIG_SERIAL_CLPS711X is not set
+# CONFIG_SERIAL_CLPS711X_CONSOLE is not set
 CONFIG_SERIAL_SA1100=y
 CONFIG_SERIAL_SA1100_CONSOLE=y
 CONFIG_SA1100_DEFAULT_BAUDRATE=115200
+# CONFIG_SERIAL_8250 is not set
+# CONFIG_SERIAL_8250_CONSOLE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=32
+# CONFIG_UCB1200 is not set
 # CONFIG_TOUCHSCREEN_UCB1200 is not set
+# CONFIG_AUDIO_UCB1200 is not set
+# CONFIG_ADC_UCB1200 is not set
 # CONFIG_TOUCHSCREEN_BITSY is not set
 CONFIG_PROFILER=y
 # CONFIG_PFS168_SPI is not set
 # CONFIG_PFS168_DTMF is not set
 # CONFIG_PFS168_MISC is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=32
 
 #
 # I2C support
@@ -475,10 +509,6 @@
 # Joysticks
 #
 # CONFIG_JOYSTICK is not set
-
-#
-# Input core support is needed for joysticks
-#
 # CONFIG_QIC02_TAPE is not set
 
 #
@@ -503,7 +533,6 @@
 #
 # PCMCIA character devices
 #
-# CONFIG_PCMCIA_SERIAL_CS is not set
 
 #
 # Multimedia devices
@@ -532,10 +561,12 @@
 CONFIG_JFFS_FS_VERBOSE=0
 # CONFIG_JFFS2_FS is not set
 CONFIG_CRAMFS=y
+# CONFIG_TMPFS is not set
 CONFIG_RAMFS=y
 # CONFIG_ISO9660_FS is not set
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
+# CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
@@ -549,7 +580,6 @@
 # CONFIG_ROMFS_FS is not set
 CONFIG_EXT2_FS=y
 # CONFIG_SYSV_FS is not set
-# CONFIG_SYSV_FS_WRITE is not set
 # CONFIG_UDF_FS is not set
 # CONFIG_UDF_RW is not set
 # CONFIG_UFS_FS is not set
@@ -604,11 +634,13 @@
 # CONFIG_NLS_CODEPAGE_865 is not set
 # CONFIG_NLS_CODEPAGE_866 is not set
 # CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
 # CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
 CONFIG_NLS_CODEPAGE_950=y
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
@@ -616,11 +648,12 @@
 # CONFIG_NLS_ISO8859_5 is not set
 # CONFIG_NLS_ISO8859_6 is not set
 # CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_8 is not set
 # CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
 # CONFIG_NLS_ISO8859_14 is not set
 # CONFIG_NLS_ISO8859_15 is not set
 # CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
 # CONFIG_NLS_UTF8 is not set
 
 #
@@ -628,7 +661,6 @@
 #
 CONFIG_PC_KEYMAP=y
 # CONFIG_VGA_CONSOLE is not set
-CONFIG_FB=y
 
 #
 # Frame-buffer support
@@ -640,12 +672,14 @@
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_SA1100 is not set
 CONFIG_FB_MQ200=y
+# CONFIG_FB_ANAKIN is not set
+# CONFIG_FB_E1355 is not set
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FBCON_ADVANCED=y
 # CONFIG_FBCON_MFB is not set
-# CONFIG_FBCON_CFB2 is not set
-# CONFIG_FBCON_CFB4 is not set
-# CONFIG_FBCON_CFB8 is not set
+CONFIG_FBCON_CFB2=y
+CONFIG_FBCON_CFB4=y
+CONFIG_FBCON_CFB8=y
 CONFIG_FBCON_CFB16=y
 # CONFIG_FBCON_CFB24 is not set
 # CONFIG_FBCON_CFB32 is not set
@@ -670,8 +704,11 @@
 # Sound
 #
 CONFIG_SOUND=y
-CONFIG_SOUND_UDA1341=y
-# CONFIG_SOUND_SA1100_SSP is not set
+# CONFIG_SOUND_ASSABET_UDA1341 is not set
+CONFIG_SOUND_PANGOLIN_UDA1341=y
+# CONFIG_SOUND_BITSY_UDA1341 is not set
+# CONFIG_SOUND_SA1111_UDA1341 is not set
+# CONFIG_SOUND_SA1100SSP is not set
 # CONFIG_SOUND_CMPCI is not set
 # CONFIG_SOUND_EMU10K1 is not set
 # CONFIG_SOUND_FUSION is not set
@@ -687,6 +724,7 @@
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
 # CONFIG_SOUND_VIA82CXXX is not set
+# CONFIG_MIDI_VIA82CXXX is not set
 # CONFIG_SOUND_OSS is not set
 # CONFIG_SOUND_TVMIXER is not set
 
@@ -694,6 +732,11 @@
 # USB support
 #
 # CONFIG_USB is not set
+
+#
+# Bluetooth support
+#
+# CONFIG_BLUEZ is not set
 
 #
 # Kernel hacking
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/changebit.S linux/arch/arm/lib/changebit.S
--- 2.4.7-rmk3/linux/arch/arm/lib/changebit.S	Mon Sep 18 18:15:25 2000
+++ linux/arch/arm/lib/changebit.S	Sat Aug 11 21:38:52 2001
@@ -14,7 +14,10 @@
 /* Purpose  : Function to change a bit
  * Prototype: int change_bit(int bit, void *addr)
  */
-ENTRY(change_bit)
+
+ENTRY(_change_bit_be)
+		eor	r0, r0, #0x18		@ big endian byte ordering
+ENTRY(_change_bit_le)
 		and	r2, r0, #7
 		mov	r3, #1
 		mov	r3, r3, lsl r2
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/clearbit.S linux/arch/arm/lib/clearbit.S
--- 2.4.7-rmk3/linux/arch/arm/lib/clearbit.S	Mon Sep 18 18:15:25 2000
+++ linux/arch/arm/lib/clearbit.S	Sat Aug 11 21:38:52 2001
@@ -16,7 +16,9 @@
  * Prototype: int clear_bit(int bit, void *addr)
  */
 
-ENTRY(clear_bit)
+ENTRY(_clear_bit_be)
+		eor	r0, r0, #0x18		@ big endian byte ordering
+ENTRY(_clear_bit_le)
 		and	r2, r0, #7
 		mov	r3, #1
 		mov	r3, r3, lsl r2
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/findbit.S linux/arch/arm/lib/findbit.S
--- 2.4.7-rmk3/linux/arch/arm/lib/findbit.S	Mon Sep 18 18:15:25 2000
+++ linux/arch/arm/lib/findbit.S	Sat Aug 11 21:38:52 2001
@@ -15,14 +15,14 @@
  * Purpose  : Find a 'zero' bit
  * Prototype: int find_first_zero_bit(void *addr, int maxbit);
  */
-ENTRY(find_first_zero_bit)
+ENTRY(_find_first_zero_bit_le)
 		mov	r2, #0
-.bytelp:	ldrb	r3, [r0, r2, lsr #3]
+1:		ldrb	r3, [r0, r2, lsr #3]
 		eors	r3, r3, #0xff		@ invert bits
 		bne	.found			@ any now set - found zero bit
 		add	r2, r2, #8		@ next bit pointer
 		cmp	r2, r1			@ any more?
-		bcc	.bytelp
+		bcc	1b
 		add	r0, r1, #1		@ no free bits
 		RETINSTR(mov,pc,lr)
 
@@ -30,15 +30,43 @@
  * Purpose  : Find next 'zero' bit
  * Prototype: int find_next_zero_bit(void *addr, int maxbit, int offset)
  */
-ENTRY(find_next_zero_bit)
+ENTRY(_find_next_zero_bit_le)
 		ands	ip, r2, #7
-		beq	.bytelp			@ If new byte, goto old routine
+		beq	1b			@ If new byte, goto old routine
 		ldrb	r3, [r0, r2, lsr#3]
 		eor	r3, r3, #0xff		@ now looking for a 1 bit
 		movs	r3, r3, lsr ip		@ shift off unused bits
+		bne	.found
+		orr	r2, r2, #7		@ if zero, then no bits here
+		add	r2, r2, #1		@ align bit pointer
+		b	1b			@ loop for next bit
+
+#ifdef __ARMEB__
+
+ENTRY(_find_first_zero_bit_be)
+		mov	r2, #0
+1:		eor	r3, r2, #0x18		@ big endian byte ordering
+		ldrb	r3, [r0, r3, lsr #3]
+		eors	r3, r3, #0xff		@ invert bits
+		bne	.found			@ any now set - found zero bit
+		add	r2, r2, #8		@ next bit pointer
+		cmp	r2, r1			@ any more?
+		bcc	1b
+		add	r0, r1, #1		@ no free bits
+		RETINSTR(mov,pc,lr)
+
+ENTRY(_find_next_zero_bit_be)
+		ands	ip, r2, #7
+		beq	1b			@ If new byte, goto old routine
+		eor	r3, r2, #0x18		@ big endian byte ordering
+		ldrb	r3, [r0, r3, lsr#3]
+		eor	r3, r3, #0xff		@ now looking for a 1 bit
+		movs	r3, r3, lsr ip		@ shift off unused bits
 		orreq	r2, r2, #7		@ if zero, then no bits here
 		addeq	r2, r2, #1		@ align bit pointer
-		beq	.bytelp			@ loop for next bit
+		beq	1b			@ loop for next bit
+
+#endif
 
 /*
  * One or more bits in the LSB of r3 are assumed to be set.
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/io-readsb.S linux/arch/arm/lib/io-readsb.S
--- 2.4.7-rmk3/linux/arch/arm/lib/io-readsb.S	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/lib/io-readsb.S	Sat Aug 11 21:38:52 2001
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/hardware.h>
 
 .insb_align:	rsb	ip, ip, #4
 		cmp	ip, r2
@@ -30,80 +29,87 @@
 		ands	ip, r1, #3
 		bne	.insb_align
 
-.insb_aligned:	stmfd	sp!, {r4 - r6, lr}
+.insb_aligned:	stmfd	sp!, {r4, r5, lr}
 
 		subs	r2, r2, #16
 		bmi	.insb_no_16
 
 .insb_16_lp:	ldrb	r3, [r0]
+		mov	r3, r3, lsl #byte(0)
 		ldrb	r4, [r0]
-		orr	r3, r3, r4, lsl #8
+		orr	r3, r3, r4, lsl #byte(1)
 		ldrb	r4, [r0]
-		orr	r3, r3, r4, lsl #16
+		orr	r3, r3, r4, lsl #byte(2)
 		ldrb	r4, [r0]
-		orr	r3, r3, r4, lsl #24
+		orr	r3, r3, r4, lsl #byte(3)
 		ldrb	r4, [r0]
+		mov	r4, r4, lsl #byte(0)
 		ldrb	r5, [r0]
-		orr	r4, r4, r5, lsl #8
+		orr	r4, r4, r5, lsl #byte(1)
 		ldrb	r5, [r0]
-		orr	r4, r4, r5, lsl #16
+		orr	r4, r4, r5, lsl #byte(2)
 		ldrb	r5, [r0]
-		orr	r4, r4, r5, lsl #24
+		orr	r4, r4, r5, lsl #byte(3)
 		ldrb	r5, [r0]
-		ldrb	r6, [r0]
-		orr	r5, r5, r6, lsl #8
-		ldrb	r6, [r0]
-		orr	r5, r5, r6, lsl #16
-		ldrb	r6, [r0]
-		orr	r5, r5, r6, lsl #24
-		ldrb	r6, [r0]
+		mov	r5, r5, lsl #byte(0)
 		ldrb	ip, [r0]
-		orr	r6, r6, ip, lsl #8
+		orr	r5, r5, ip, lsl #byte(1)
 		ldrb	ip, [r0]
-		orr	r6, r6, ip, lsl #16
+		orr	r5, r5, ip, lsl #byte(2)
 		ldrb	ip, [r0]
-		orr	r6, r6, ip, lsl #24
-		stmia	r1!, {r3 - r6}
+		orr	r5, r5, ip, lsl #byte(3)
+		ldrb	ip, [r0]
+		mov	ip, ip, lsl #byte(0)
+		ldrb	lr, [r0]
+		orr	ip, ip, lr, lsl #byte(1)
+		ldrb	lr, [r0]
+		orr	ip, ip, lr, lsl #byte(2)
+		ldrb	lr, [r0]
+		orr	ip, ip, lr, lsl #byte(3)
+		stmia	r1!, {r3 - r5, ip}
 
 		subs	r2, r2, #16
 		bpl	.insb_16_lp
 
 		tst	r2, #15
-		LOADREGS(eqfd, sp!, {r4 - r6, pc})
+		LOADREGS(eqfd, sp!, {r4, r5, pc})
 
 .insb_no_16:	tst	r2, #8
 		beq	.insb_no_8
 
 		ldrb	r3, [r0]
+		mov	r3, r3, lsl #byte(0)
 		ldrb	r4, [r0]
-		orr	r3, r3, r4, lsl #8
+		orr	r3, r3, r4, lsl #byte(1)
 		ldrb	r4, [r0]
-		orr	r3, r3, r4, lsl #16
+		orr	r3, r3, r4, lsl #byte(2)
 		ldrb	r4, [r0]
-		orr	r3, r3, r4, lsl #24
+		orr	r3, r3, r4, lsl #byte(3)
 		ldrb	r4, [r0]
+		mov	r4, r4, lsl #byte(0)
 		ldrb	r5, [r0]
-		orr	r4, r4, r5, lsl #8
+		orr	r4, r4, r5, lsl #byte(1)
 		ldrb	r5, [r0]
-		orr	r4, r4, r5, lsl #16
+		orr	r4, r4, r5, lsl #byte(2)
 		ldrb	r5, [r0]
-		orr	r4, r4, r5, lsl #24
+		orr	r4, r4, r5, lsl #byte(3)
 		stmia	r1!, {r3, r4}
 
 .insb_no_8:	tst	r2, #4
 		beq	.insb_no_4
 
 		ldrb	r3, [r0]
+		mov	r3, r3, lsl #byte(0)
 		ldrb	r4, [r0]
-		orr	r3, r3, r4, lsl #8
+		orr	r3, r3, r4, lsl #byte(1)
 		ldrb	r4, [r0]
-		orr	r3, r3, r4, lsl #16
+		orr	r3, r3, r4, lsl #byte(2)
 		ldrb	r4, [r0]
-		orr	r3, r3, r4, lsl #24
+		orr	r3, r3, r4, lsl #byte(3)
 		str	r3, [r1], #4
 
 .insb_no_4:	ands	r2, r2, #3
-		LOADREGS(eqfd, sp!, {r4 - r6, pc})
+		LOADREGS(eqfd, sp!, {r4, r5, pc})
 
 		cmp	r2, #2
 		ldrb	r3, [r0]
@@ -113,4 +119,4 @@
 		ldrgtb	r3, [r0]
 		strgtb	r3, [r1]
 
-		LOADREGS(fd, sp!, {r4 - r6, pc})
+		LOADREGS(fd, sp!, {r4, r5, pc})
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/io-readsl-armv4.S linux/arch/arm/lib/io-readsl-armv4.S
--- 2.4.7-rmk3/linux/arch/arm/lib/io-readsl-armv4.S	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/lib/io-readsl-armv4.S	Sat Aug 11 21:38:52 2001
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/hardware.h>
 
 /*
  * Note that some reads can be aligned on half-word boundaries.
@@ -31,6 +30,10 @@
 		blt	4f
 		bgt	6f
 
+#ifndef __ARMEB__
+
+		/* little endian code */
+
 		strh	ip, [r1], #2
 		mov	ip, ip, lsr #16
 3:		subs	r2, r2, #1
@@ -63,8 +66,50 @@
 		strne	ip, [r1], #4
 		movne	ip, r3, lsr #8
 		bne	7b
+		strh	ip, [r1], #2
+		mov	ip, ip, lsr #16
 		strb	ip, [r1], #1
-		mov	ip, ip, lsr #8
+		mov	pc, lr
+
+#else
+
+		/* big endian code */
+
+		mov	r3, ip, lsr #16
+		strh	r3, [r1], #2
+3:		mov	r3, ip, lsl #16
+		subs	r2, r2, #1
+		ldrne	ip, [r0]
+		orrne	r3, r3, ip, lsr #16
+		strne	r3, [r1], #4
+		bne	3b
 		strh	ip, [r1], #2
 		mov	pc, lr
 
+4:		mov	r3, ip, lsr #24
+		strb	r3, [r1], #1
+		mov	r3, ip, lsr #8
+		strh	r3, [r1], #2
+5:		mov	r3, ip, lsl #24
+		subs	r2, r2, #1
+		ldrne	ip, [r0]
+		orrne	r3, r3, ip, lsr #8
+		strne	r3, [r1], #4
+		bne	5b
+		strb	ip, [r1], #1
+		mov	pc, lr
+
+6:		mov	r3, ip, lsr #24
+		strb	r3, [r1], #1
+7:		mov	r3, ip, lsl #8
+		subs	r2, r2, #1
+		ldrne	ip, [r0]
+		orrne	r3, r3, ip, lsr #24
+		strne	r3, [r1], #4
+		bne	7b
+		mov	r3, ip, lsr #8
+		strh	r3, [r1], #2
+		strb	ip, [r1], #1
+		mov	pc, lr
+
+#endif
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/io-readsw-armv4.S linux/arch/arm/lib/io-readsw-armv4.S
--- 2.4.7-rmk3/linux/arch/arm/lib/io-readsw-armv4.S	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/lib/io-readsw-armv4.S	Sat Aug 11 21:38:52 2001
@@ -9,7 +9,14 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/hardware.h>
+
+		.macro	pack, rd, hw1, hw2
+#ifndef __ARMEB__
+		orr	\rd, \hw1, \hw2, lsl #16
+#else
+		orr	\rd, \hw2, \hw1, lsl #16
+#endif
+		.endm
 
 .insw_bad_alignment:
 		adr	r0, .insw_bad_align_msg
@@ -41,19 +48,19 @@
 
 .insw_8_lp:	ldrh	r3, [r0]
 		ldrh	r4, [r0]
-		orr	r3, r3, r4, lsl #16
+		pack	r3, r3, r4
 
 		ldrh	r4, [r0]
 		ldrh	r5, [r0]
-		orr	r4, r4, r5, lsl #16
+		pack	r4, r4, r5
 
 		ldrh	r5, [r0]
 		ldrh	ip, [r0]
-		orr	r5, r5, ip, lsl #16
+		pack	r5, r5, ip
 
 		ldrh	ip, [r0]
 		ldrh	lr, [r0]
-		orr	ip, ip, lr, lsl #16
+		pack	ip, ip, lr
 
 		stmia	r1!, {r3 - r5, ip}
 
@@ -68,11 +75,11 @@
 
 		ldrh	r3, [r0]
 		ldrh	r4, [r0]
-		orr	r3, r3, r4, lsl #16
+		pack	r3, r3, r4
 
 		ldrh	r4, [r0]
 		ldrh	ip, [r0]
-		orr	r4, r4, ip, lsl #16
+		pack	r4, r4, ip
 
 		stmia	r1!, {r3, r4}
 
@@ -81,7 +88,7 @@
 
 		ldrh	r3, [r0]
 		ldrh	ip, [r0]
-		orr	r3, r3, ip, lsl #16
+		pack	r3, r3, ip
 
 		str	r3, [r1], #4
 
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/io-writesb.S linux/arch/arm/lib/io-writesb.S
--- 2.4.7-rmk3/linux/arch/arm/lib/io-writesb.S	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/lib/io-writesb.S	Sat Aug 11 21:38:52 2001
@@ -9,7 +9,26 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/hardware.h>
+
+		.macro	outword, rd
+#ifndef __ARMEB__
+		strb	\rd, [r0]
+		mov	\rd, \rd, lsr #8
+		strb	\rd, [r0]
+		mov	\rd, \rd, lsr #8
+		strb	\rd, [r0]
+		mov	\rd, \rd, lsr #8
+		strb	\rd, [r0]
+#else
+		mov	lr, \rd, lsr #24
+		strb	lr, [r0]
+		mov	lr, \rd, lsr #16
+		strb	lr, [r0]
+		mov	lr, \rd, lsr #8
+		strb	lr, [r0]
+		strb	\rd, [r0]
+#endif
+		.endm
 
 .outsb_align:	rsb	ip, ip, #4
 		cmp	ip, r2
@@ -30,86 +49,37 @@
 		ands	ip, r1, #3
 		bne	.outsb_align
 
-.outsb_aligned:	stmfd	sp!, {r4 - r6, lr}
+.outsb_aligned:	stmfd	sp!, {r4, r5, lr}
 
 		subs	r2, r2, #16
 		bmi	.outsb_no_16
 
-.outsb_16_lp:	ldmia	r1!, {r3 - r6}
-
-		strb	r3, [r0]
-		mov	r3, r3, lsr #8
-		strb	r3, [r0]
-		mov	r3, r3, lsr #8
-		strb	r3, [r0]
-		mov	r3, r3, lsr #8
-		strb	r3, [r0]
-
-		strb	r4, [r0]
-		mov	r4, r4, lsr #8
-		strb	r4, [r0]
-		mov	r4, r4, lsr #8
-		strb	r4, [r0]
-		mov	r4, r4, lsr #8
-		strb	r4, [r0]
-
-		strb	r5, [r0]
-		mov	r5, r5, lsr #8
-		strb	r5, [r0]
-		mov	r5, r5, lsr #8
-		strb	r5, [r0]
-		mov	r5, r5, lsr #8
-		strb	r5, [r0]
-
-		strb	r6, [r0]
-		mov	r6, r6, lsr #8
-		strb	r6, [r0]
-		mov	r6, r6, lsr #8
-		strb	r6, [r0]
-		mov	r6, r6, lsr #8
-		strb	r6, [r0]
-
+.outsb_16_lp:	ldmia	r1!, {r3, r4, r5, ip}
+		outword	r3
+		outword	r4
+		outword	r5
+		outword	ip
 		subs	r2, r2, #16
 		bpl	.outsb_16_lp
 
 		tst	r2, #15
-		LOADREGS(eqfd, sp!, {r4 - r6, pc})
+		LOADREGS(eqfd, sp!, {r4, r5, pc})
 
 .outsb_no_16:	tst	r2, #8
 		beq	.outsb_no_8
 
 		ldmia	r1!, {r3, r4}
-
-		strb	r3, [r0]
-		mov	r3, r3, lsr #8
-		strb	r3, [r0]
-		mov	r3, r3, lsr #8
-		strb	r3, [r0]
-		mov	r3, r3, lsr #8
-		strb	r3, [r0]
-
-		strb	r4, [r0]
-		mov	r4, r4, lsr #8
-		strb	r4, [r0]
-		mov	r4, r4, lsr #8
-		strb	r4, [r0]
-		mov	r4, r4, lsr #8
-		strb	r4, [r0]
+		outword	r3
+		outword	r4
 
 .outsb_no_8:	tst	r2, #4
 		beq	.outsb_no_4
 
 		ldr	r3, [r1], #4
-		strb	r3, [r0]
-		mov	r3, r3, lsr #8
-		strb	r3, [r0]
-		mov	r3, r3, lsr #8
-		strb	r3, [r0]
-		mov	r3, r3, lsr #8
-		strb	r3, [r0]
+		outword	r3
 
 .outsb_no_4:	ands	r2, r2, #3
-		LOADREGS(eqfd, sp!, {r4 - r6, pc})
+		LOADREGS(eqfd, sp!, {r4, r5, pc})
 
 		cmp	r2, #2
 		ldrb	r3, [r1], #1
@@ -119,4 +89,4 @@
 		ldrgtb	r3, [r1]
 		strgtb	r3, [r0]
 
-		LOADREGS(fd, sp!, {r4 - r6, pc})
+		LOADREGS(fd, sp!, {r4, r5, pc})
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/io-writesl.S linux/arch/arm/lib/io-writesl.S
--- 2.4.7-rmk3/linux/arch/arm/lib/io-writesl.S	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/lib/io-writesl.S	Sat Aug 11 21:38:52 2001
@@ -9,7 +9,6 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/hardware.h>
 
 ENTRY(__raw_writesl)
 		teq	r2, #0		@ do we have to check for the zero len?
@@ -26,32 +25,34 @@
 2:		bic	r1, r1, #3
 		cmp	ip, #2
 		ldr	ip, [r1], #4
-		mov	ip, ip, lsr #16
-		blt	4f
-		bgt	5f
+		bgt	4f
+		blt	6f
 
+		mov	ip, ip, pull #16
 3:		ldr	r3, [r1], #4
-		orr	ip, ip, r3, lsl #16
+		orr	ip, ip, r3, push #16
 		str	ip, [r0]
-		mov	ip, r3, lsr #16
+		mov	ip, r3, pull #16
 		subs	r2, r2, #1
 		bne	3b
 		mov	pc, lr
 
-4:		ldr	r3, [r1], #4
-		orr	ip, ip, r3, lsl #8
+4:		mov	ip, ip, pull #24
+5:		ldr	r3, [r1], #4
+		orr	ip, ip, r3, push #8
 		str	ip, [r0]
-		mov	ip, r3, lsr #24
+		mov	ip, r3, pull #24
 		subs	r2, r2, #1
-		bne	4b
+		bne	5b
 		mov	pc, lr
 
-5:		ldr	r3, [r1], #4
-		orr	ip, ip, r3, lsl #24
+6:		mov	ip, ip, pull #8
+7:		ldr	r3, [r1], #4
+		orr	ip, ip, r3, push #24
 		str	ip, [r0]
-		mov	ip, r3, lsr #8
+		mov	ip, r3, pull #8
 		subs	r2, r2, #1
-		bne	5b
+		bne	7b
 		mov	pc, lr
 
 
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/io-writesw-armv4.S linux/arch/arm/lib/io-writesw-armv4.S
--- 2.4.7-rmk3/linux/arch/arm/lib/io-writesw-armv4.S	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/lib/io-writesw-armv4.S	Sat Aug 11 21:38:52 2001
@@ -9,7 +9,18 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/hardware.h>
+
+		.macro	outword, rd
+#ifndef __ARMEB__
+		strh	\rd, [r0]
+		mov	\rd, \rd, lsr #16
+		strh	\rd, [r0]
+#else
+		mov	lr, \rd, lsr #16
+		strh	lr, [r0]
+		strh	\rd, [r0]
+#endif
+		.endm
 
 .outsw_bad_alignment:
 		adr	r0, .outsw_bad_align_msg
@@ -40,20 +51,10 @@
 		bmi	.no_outsw_8
 
 .outsw_8_lp:	ldmia	r1!, {r3, r4, r5, ip}
-
-		strh	r3, [r0]
-		mov	r3, r3, lsr #16
-		strh	r3, [r0]
-		strh	r4, [r0]
-		mov	r4, r4, lsr #16
-		strh	r4, [r0]
-		strh	r5, [r0]
-		mov	r5, r5, lsr #16
-		strh	r5, [r0]
-		strh	ip, [r0]
-		mov	ip, ip, lsr #16
-		strh	ip, [r0]
-
+		outword	r3
+		outword	r4
+		outword	r5
+		outword	ip
 		subs	r2, r2, #8
 		bpl	.outsw_8_lp
 
@@ -64,20 +65,14 @@
 		beq	.no_outsw_4
 
 		ldmia	r1!, {r3, ip}
-		strh	r3, [r0]
-		mov	r3, r3, lsr #16
-		strh	r3, [r0]
-		strh	ip, [r0]
-		mov	ip, ip, lsr #16
-		strh	ip, [r0]
+		outword	r3
+		outword	ip
 
 .no_outsw_4:	tst	r2, #2
 		beq	.no_outsw_2
 
 		ldr	r3, [r1], #4
-		strh	r3, [r0]
-		mov	r3, r3, lsr #16
-		strh	r3, [r0]
+		outword	r3
 
 .no_outsw_2:	tst	r2, #1
 		ldrneh	r3, [r1]
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/memcpy.S linux/arch/arm/lib/memcpy.S
--- 2.4.7-rmk3/linux/arch/arm/lib/memcpy.S	Tue Mar  6 22:44:35 2001
+++ linux/arch/arm/lib/memcpy.S	Sat Aug 11 21:38:52 2001
@@ -99,24 +99,24 @@
 		cmp	r2, #12
 		blt	10f
 		sub	r2, r2, #12
-9:		mov	r3, r7, lsr #8
+9:		mov	r3, r7, pull #8
 		ldmia	r1!, {r4 - r7}
-		orr	r3, r3, r4, lsl #24
-		mov	r4, r4, lsr #8
-		orr	r4, r4, r5, lsl #24
-		mov	r5, r5, lsr #8
-		orr	r5, r5, r6, lsl #24
-		mov	r6, r6, lsr #8
-		orr	r6, r6, r7, lsl #24
+		orr	r3, r3, r4, push #24
+		mov	r4, r4, pull #8
+		orr	r4, r4, r5, push #24
+		mov	r5, r5, pull #8
+		orr	r5, r5, r6, push #24
+		mov	r6, r6, pull #8
+		orr	r6, r6, r7, push #24
 		stmia	r0!, {r3 - r6}
 		subs	r2, r2, #16
 		bge	9b
 		adds	r2, r2, #12
 		blt	100f
-10:		mov	r3, r7, lsr #8
+10:		mov	r3, r7, pull #8
 		ldr	r7, [r1], #4
 		subs	r2, r2, #4
-		orr	r3, r3, r7, lsl #24
+		orr	r3, r3, r7, push #24
 		str	r3, [r0], #4
 		bge	10b
 100:		sub	r1, r1, #3
@@ -125,24 +125,24 @@
 11:		cmp	r2, #12
 		blt	13f		/* */
 		sub	r2, r2, #12
-12:		mov	r3, r7, lsr #16
+12:		mov	r3, r7, pull #16
 		ldmia	r1!, {r4 - r7}
-		orr	r3, r3, r4, lsl #16
-		mov	r4, r4, lsr #16
-		orr	r4, r4, r5, lsl #16
-		mov	r5, r5, lsr #16
-		orr	r5, r5, r6, lsl #16
-		mov	r6, r6, lsr #16
-		orr	r6, r6, r7,LSL#16
+		orr	r3, r3, r4, push #16
+		mov	r4, r4, pull #16
+		orr	r4, r4, r5, push #16
+		mov	r5, r5, pull #16
+		orr	r5, r5, r6, push #16
+		mov	r6, r6, pull #16
+		orr	r6, r6, r7, push #16
 		stmia	r0!, {r3 - r6}
 		subs	r2, r2, #16
 		bge	12b
 		adds	r2, r2, #12
 		blt	14f
-13:		mov	r3, r7, lsr #16
+13:		mov	r3, r7, pull #16
 		ldr	r7, [r1], #4
 		subs	r2, r2, #4
-		orr	r3, r3, r7, lsl #16
+		orr	r3, r3, r7, push #16
 		str	r3, [r0], #4
 		bge	13b
 14:		sub	r1, r1, #2
@@ -151,24 +151,24 @@
 15:		cmp	r2, #12
 		blt	17f
 		sub	r2, r2, #12
-16:		mov	r3, r7, lsr #24
-		ldmia	r1!,{r4 - r7}
-		orr	r3, r3, r4, lsl #8
-		mov	r4, r4, lsr #24
-		orr	r4, r4, r5, lsl #8
-		mov	r5, r5, lsr #24
-		orr	r5, r5, r6, lsl #8
-		mov	r6, r6, lsr #24
-		orr	r6, r6, r7, lsl #8
+16:		mov	r3, r7, pull #24
+		ldmia	r1!, {r4 - r7}
+		orr	r3, r3, r4, push #8
+		mov	r4, r4, pull #24
+		orr	r4, r4, r5, push #8
+		mov	r5, r5, pull #24
+		orr	r5, r5, r6, push #8
+		mov	r6, r6, pull #24
+		orr	r6, r6, r7, push #8
 		stmia	r0!, {r3 - r6}
 		subs	r2, r2, #16
 		bge	16b
 		adds	r2, r2, #12
 		blt	18f
-17:		mov	r3, r7, lsr #24
+17:		mov	r3, r7, pull #24
 		ldr	r7, [r1], #4
 		subs	r2, r2, #4
-		orr	r3, r3, r7, lsl#8
+		orr	r3, r3, r7, push #8
 		str	r3, [r0], #4
 		bge	17b
 18:		sub	r1, r1, #1
@@ -240,24 +240,24 @@
 		cmp	r2, #12
 		blt	28f
 		sub	r2, r2, #12
-27:		mov	r7, r3, lsl #8
+27:		mov	r7, r3, push #8
 		ldmdb	r1!, {r3, r4, r5, r6}
-		orr	r7, r7, r6, lsr #24
-		mov	r6, r6, lsl #8
-		orr	r6, r6, r5, lsr #24
-		mov	r5, r5, lsl #8
-		orr	r5, r5, r4, lsr #24
-		mov	r4, r4, lsl #8
-		orr	r4, r4, r3, lsr #24
+		orr	r7, r7, r6, pull #24
+		mov	r6, r6, push #8
+		orr	r6, r6, r5, pull #24
+		mov	r5, r5, push #8
+		orr	r5, r5, r4, pull #24
+		mov	r4, r4, push #8
+		orr	r4, r4, r3, pull #24
 		stmdb	r0!, {r4, r5, r6, r7}
 		subs	r2, r2, #16
 		bge	27b
 		adds	r2, r2, #12
 		blt	29f
-28:		mov	ip, r3, lsl #8
+28:		mov	ip, r3, push #8
 		ldr	r3, [r1, #-4]!
 		subs	r2, r2, #4
-		orr	ip, ip, r3, lsr #24
+		orr	ip, ip, r3, pull #24
 		str	ip, [r0, #-4]!
 		bge	28b
 29:		add	r1, r1, #3
@@ -266,24 +266,24 @@
 30:		cmp	r2, #12
 		blt	32f
 		sub	r2, r2, #12
-31:		mov	r7, r3, lsl #16
+31:		mov	r7, r3, push #16
 		ldmdb	r1!, {r3, r4, r5, r6}
-		orr	r7, r7, r6, lsr #16
-		mov	r6, r6, lsl #16
-		orr	r6, r6, r5, lsr #16
-		mov	r5, r5, lsl #16
-		orr	r5, r5, r4, lsr #16
-		mov	r4, r4, lsl #16
-		orr	r4, r4, r3, lsr #16
+		orr	r7, r7, r6, pull #16
+		mov	r6, r6, push #16
+		orr	r6, r6, r5, pull #16
+		mov	r5, r5, push #16
+		orr	r5, r5, r4, pull #16
+		mov	r4, r4, push #16
+		orr	r4, r4, r3, pull #16
 		stmdb	r0!, {r4, r5, r6, r7}
 		subs	r2, r2, #16
 		bge	31b
 		adds	r2, r2, #12
 		blt	33f
-32:		mov	ip, r3, lsl #16
+32:		mov	ip, r3, push #16
 		ldr	r3, [r1, #-4]!
 		subs	r2, r2, #4
-		orr	ip, ip, r3, lsr #16
+		orr	ip, ip, r3, pull #16
 		str	ip, [r0, #-4]!
 		bge	32b
 33:		add	r1, r1, #2
@@ -292,24 +292,24 @@
 34:		cmp	r2, #12
 		blt	36f
 		sub	r2, r2, #12
-35:		mov	r7, r3, lsl #24
+35:		mov	r7, r3, push #24
 		ldmdb	r1!, {r3, r4, r5, r6}
-		orr	r7, r7, r6, lsr #8
-		mov	r6, r6, lsl #24
-		orr	r6, r6, r5, lsr #8
-		mov	r5, r5, lsl #24
-		orr	r5, r5, r4, lsr #8
-		mov	r4, r4, lsl #24
-		orr	r4, r4, r3, lsr #8
+		orr	r7, r7, r6, pull #8
+		mov	r6, r6, push #24
+		orr	r6, r6, r5, pull #8
+		mov	r5, r5, push #24
+		orr	r5, r5, r4, pull #8
+		mov	r4, r4, push #24
+		orr	r4, r4, r3, pull #8
 		stmdb	r0!, {r4, r5, r6, r7}
 		subs	r2, r2, #16
 		bge	35b
 		adds	r2, r2, #12
 		blt	37f
-36:		mov	ip, r3, lsl #24
+36:		mov	ip, r3, push #24
 		ldr	r3, [r1, #-4]!
 		subs	r2, r2, #4
-		orr	ip, ip, r3, lsr #8
+		orr	ip, ip, r3, pull #8
 		str	ip, [r0, #-4]!
 		bge	36b
 37:		add	r1, r1, #1
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/setbit.S linux/arch/arm/lib/setbit.S
--- 2.4.7-rmk3/linux/arch/arm/lib/setbit.S	Mon Sep 18 18:15:25 2000
+++ linux/arch/arm/lib/setbit.S	Sat Aug 11 21:38:52 2001
@@ -16,7 +16,9 @@
  * Prototype: int set_bit(int bit, void *addr)
  */
 
-ENTRY(set_bit)
+ENTRY(_set_bit_be)
+		eor	r0, r0, #0x18		@ big endian byte ordering
+ENTRY(_set_bit_le)
                 and     r2, r0, #7
                 mov     r3, #1
                 mov     r3, r3, lsl r2
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/testchangebit.S linux/arch/arm/lib/testchangebit.S
--- 2.4.7-rmk3/linux/arch/arm/lib/testchangebit.S	Mon Sep 18 18:15:25 2000
+++ linux/arch/arm/lib/testchangebit.S	Sat Aug 11 21:38:52 2001
@@ -11,7 +11,9 @@
 #include <asm/assembler.h>
                 .text
 
-ENTRY(test_and_change_bit)
+ENTRY(_test_and_change_bit_be)
+		eor	r0, r0, #0x18		@ big endian byte ordering
+ENTRY(_test_and_change_bit_le)
 		add	r1, r1, r0, lsr #3
 		and	r3, r0, #7
 		mov	r0, #1
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/testclearbit.S linux/arch/arm/lib/testclearbit.S
--- 2.4.7-rmk3/linux/arch/arm/lib/testclearbit.S	Mon Sep 18 18:15:25 2000
+++ linux/arch/arm/lib/testclearbit.S	Sat Aug 11 21:38:52 2001
@@ -11,7 +11,9 @@
 #include <asm/assembler.h>
                 .text
 
-ENTRY(test_and_clear_bit)
+ENTRY(_test_and_clear_bit_be)
+		eor	r0, r0, #0x18		@ big endian byte ordering
+ENTRY(_test_and_clear_bit_le)
 		add	r1, r1, r0, lsr #3	@ Get byte offset
 		and	r3, r0, #7		@ Get bit offset
 		mov	r0, #1
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/testsetbit.S linux/arch/arm/lib/testsetbit.S
--- 2.4.7-rmk3/linux/arch/arm/lib/testsetbit.S	Mon Sep 18 18:15:25 2000
+++ linux/arch/arm/lib/testsetbit.S	Sat Aug 11 21:38:52 2001
@@ -11,7 +11,9 @@
 #include <asm/assembler.h>
                 .text
 
-ENTRY(test_and_set_bit)
+ENTRY(_test_and_set_bit_be)
+		eor	r0, r0, #0x18		@ big endian byte ordering
+ENTRY(_test_and_set_bit_le)
 		add	r1, r1, r0, lsr #3	@ Get byte offset
 		and	r3, r0, #7		@ Get bit offset
 		mov	r0, #1
diff -urN 2.4.7-rmk3/linux/arch/arm/lib/uaccess.S linux/arch/arm/lib/uaccess.S
--- 2.4.7-rmk3/linux/arch/arm/lib/uaccess.S	Mon Sep 18 18:15:25 2000
+++ linux/arch/arm/lib/uaccess.S	Sat Aug 11 21:38:52 2001
@@ -115,9 +115,9 @@
 .c2u_1fupi:	subs	r2, r2, #4
 		addmi	ip, r2, #4
 		bmi	.c2u_1nowords
-		mov	r3, r7, lsr #8
+		mov	r3, r7, pull #8
 		ldr	r7, [r1], #4
-		orr	r3, r3, r7, lsl #24
+		orr	r3, r3, r7, push #24
 USER(		strt	r3, [r0], #4)			@ May fault
 		mov	ip, r0, lsl #32 - PAGE_SHIFT
 		rsb	ip, ip, #0
@@ -129,49 +129,49 @@
 		subs	ip, ip, #16
 		blt	.c2u_1rem8lp
 
-.c2u_1cpy8lp:	mov	r3, r7, lsr #8
+.c2u_1cpy8lp:	mov	r3, r7, pull #8
 		ldmia	r1!, {r4 - r7}
-		orr	r3, r3, r4, lsl #24
-		mov	r4, r4, lsr #8
-		orr	r4, r4, r5, lsl #24
-		mov	r5, r5, lsr #8
-		orr	r5, r5, r6, lsl #24
-		mov	r6, r6, lsr #8
-		orr	r6, r6, r7, lsl #24
+		orr	r3, r3, r4, push #24
+		mov	r4, r4, pull #8
+		orr	r4, r4, r5, push #24
+		mov	r5, r5, pull #8
+		orr	r5, r5, r6, push #24
+		mov	r6, r6, pull #8
+		orr	r6, r6, r7, push #24
 		stmia	r0!, {r3 - r6}			@ Shouldnt fault
 		subs	ip, ip, #16
 		bpl	.c2u_1cpy8lp
 .c2u_1rem8lp:	tst	ip, #8
-		movne	r3, r7, lsr #8
+		movne	r3, r7, pull #8
 		ldmneia	r1!, {r4, r7}
-		orrne	r3, r3, r4, lsl #24
-		movne	r4, r4, lsr #8
-		orrne	r4, r4, r7, lsl #24
+		orrne	r3, r3, r4, push #24
+		movne	r4, r4, pull #8
+		orrne	r4, r4, r7, push #24
 		stmneia	r0!, {r3 - r4}			@ Shouldnt fault
 		tst	ip, #4
-		movne	r3, r7, lsr #8
+		movne	r3, r7, pull #8
 		ldrne	r7, [r1], #4
-		orrne	r3, r3, r7, lsl #24
+		orrne	r3, r3, r7, push #24
 		strnet	r3, [r0], #4			@ Shouldnt fault
 		ands	ip, ip, #3
 		beq	.c2u_1fupi
-.c2u_1nowords:	mov	r3, r7, lsr #8
+.c2u_1nowords:	mov	r3, r7, lsr #byte(1)
 		teq	ip, #0
 		beq	.c2u_finished
 		cmp	ip, #2
 USER(		strbt	r3, [r0], #1)			@ May fault
-		movge	r3, r3, lsr #8
+		movge	r3, r7, lsr #byte(2)
 USER(		strgebt	r3, [r0], #1)			@ May fault
-		movgt	r3, r3, lsr #8
+		movgt	r3, r7, lsr #byte(3)
 USER(		strgtbt	r3, [r0], #1)			@ May fault
 		b	.c2u_finished
 
 .c2u_2fupi:	subs	r2, r2, #4
 		addmi	ip, r2, #4
 		bmi	.c2u_2nowords
-		mov	r3, r7, lsr #16
+		mov	r3, r7, pull #16
 		ldr	r7, [r1], #4
-		orr	r3, r3, r7, lsl #16
+		orr	r3, r3, r7, push #16
 USER(		strt	r3, [r0], #4)			@ May fault
 		mov	ip, r0, lsl #32 - PAGE_SHIFT
 		rsb	ip, ip, #0
@@ -183,38 +183,38 @@
 		subs	ip, ip, #16
 		blt	.c2u_2rem8lp
 
-.c2u_2cpy8lp:	mov	r3, r7, lsr #16
+.c2u_2cpy8lp:	mov	r3, r7, pull #16
 		ldmia	r1!, {r4 - r7}
-		orr	r3, r3, r4, lsl #16
-		mov	r4, r4, lsr #16
-		orr	r4, r4, r5, lsl #16
-		mov	r5, r5, lsr #16
-		orr	r5, r5, r6, lsl #16
-		mov	r6, r6, lsr #16
-		orr	r6, r6, r7, lsl #16
+		orr	r3, r3, r4, push #16
+		mov	r4, r4, pull #16
+		orr	r4, r4, r5, push #16
+		mov	r5, r5, pull #16
+		orr	r5, r5, r6, push #16
+		mov	r6, r6, pull #16
+		orr	r6, r6, r7, push #16
 		stmia	r0!, {r3 - r6}			@ Shouldnt fault
 		subs	ip, ip, #16
 		bpl	.c2u_2cpy8lp
 .c2u_2rem8lp:	tst	ip, #8
-		movne	r3, r7, lsr #16
+		movne	r3, r7, pull #16
 		ldmneia	r1!, {r4, r7}
-		orrne	r3, r3, r4, lsl #16
-		movne	r4, r4, lsr #16
-		orrne	r4, r4, r7, lsl #16
+		orrne	r3, r3, r4, push #16
+		movne	r4, r4, pull #16
+		orrne	r4, r4, r7, push #16
 		stmneia	r0!, {r3 - r4}			@ Shouldnt fault
 		tst	ip, #4
-		movne	r3, r7, lsr #16
+		movne	r3, r7, pull #16
 		ldrne	r7, [r1], #4
-		orrne	r3, r3, r7, lsl #16
+		orrne	r3, r3, r7, push #16
 		strnet	r3, [r0], #4			@ Shouldnt fault
 		ands	ip, ip, #3
 		beq	.c2u_2fupi
-.c2u_2nowords:	mov	r3, r7, lsr #16
+.c2u_2nowords:	mov	r3, r7, lsr #byte(2)
 		teq	ip, #0
 		beq	.c2u_finished
 		cmp	ip, #2
 USER(		strbt	r3, [r0], #1)			@ May fault
-		movge	r3, r3, lsr #8
+		movge	r3, r7, lsr #byte(3)
 USER(		strgebt	r3, [r0], #1)			@ May fault
 		ldrgtb	r3, [r1], #0
 USER(		strgtbt	r3, [r0], #1)			@ May fault
@@ -223,9 +223,9 @@
 .c2u_3fupi:	subs	r2, r2, #4
 		addmi	ip, r2, #4
 		bmi	.c2u_3nowords
-		mov	r3, r7, lsr #24
+		mov	r3, r7, pull #24
 		ldr	r7, [r1], #4
-		orr	r3, r3, r7, lsl #8
+		orr	r3, r3, r7, push #8
 USER(		strt	r3, [r0], #4)			@ May fault
 		mov	ip, r0, lsl #32 - PAGE_SHIFT
 		rsb	ip, ip, #0
@@ -237,40 +237,40 @@
 		subs	ip, ip, #16
 		blt	.c2u_3rem8lp
 
-.c2u_3cpy8lp:	mov	r3, r7, lsr #24
+.c2u_3cpy8lp:	mov	r3, r7, pull #24
 		ldmia	r1!, {r4 - r7}
-		orr	r3, r3, r4, lsl #8
-		mov	r4, r4, lsr #24
-		orr	r4, r4, r5, lsl #8
-		mov	r5, r5, lsr #24
-		orr	r5, r5, r6, lsl #8
-		mov	r6, r6, lsr #24
-		orr	r6, r6, r7, lsl #8
+		orr	r3, r3, r4, push #8
+		mov	r4, r4, pull #24
+		orr	r4, r4, r5, push #8
+		mov	r5, r5, pull #24
+		orr	r5, r5, r6, push #8
+		mov	r6, r6, pull #24
+		orr	r6, r6, r7, push #8
 		stmia	r0!, {r3 - r6}			@ Shouldnt fault
 		subs	ip, ip, #16
 		bpl	.c2u_3cpy8lp
 .c2u_3rem8lp:	tst	ip, #8
-		movne	r3, r7, lsr #24
+		movne	r3, r7, pull #24
 		ldmneia	r1!, {r4, r7}
-		orrne	r3, r3, r4, lsl #8
-		movne	r4, r4, lsr #24
-		orrne	r4, r4, r7, lsl #8
+		orrne	r3, r3, r4, push #8
+		movne	r4, r4, pull #24
+		orrne	r4, r4, r7, push #8
 		stmneia	r0!, {r3 - r4}			@ Shouldnt fault
 		tst	ip, #4
-		movne	r3, r7, lsr #24
+		movne	r3, r7, pull #24
 		ldrne	r7, [r1], #4
-		orrne	r3, r3, r7, lsl #8
+		orrne	r3, r3, r7, push #8
 		strnet	r3, [r0], #4			@ Shouldnt fault
 		ands	ip, ip, #3
 		beq	.c2u_3fupi
-.c2u_3nowords:	mov	r3, r7, lsr #24
+.c2u_3nowords:	mov	r3, r7, lsr #byte(3)
 		teq	ip, #0
 		beq	.c2u_finished
 		cmp	ip, #2
 USER(		strbt	r3, [r0], #1)			@ May fault
-		ldrge	r3, [r1], #0
+		ldrgeb	r3, [r1], #1
 USER(		strgebt	r3, [r0], #1)			@ May fault
-		movgt	r3, r3, lsr #8
+		ldrgtb	r3, [r1], #0
 USER(		strgtbt	r3, [r0], #1)			@ May fault
 		b	.c2u_finished
 
@@ -374,9 +374,9 @@
 .cfu_1fupi:	subs	r2, r2, #4
 		addmi	ip, r2, #4
 		bmi	.cfu_1nowords
-		mov	r3, r7, lsr #8
+		mov	r3, r7, pull #8
 USER(		ldrt	r7, [r1], #4)			@ May fault
-		orr	r3, r3, r7, lsl #24
+		orr	r3, r3, r7, push #24
 		str	r3, [r0], #4
 		mov	ip, r1, lsl #32 - PAGE_SHIFT
 		rsb	ip, ip, #0
@@ -388,49 +388,49 @@
 		subs	ip, ip, #16
 		blt	.cfu_1rem8lp
 
-.cfu_1cpy8lp:	mov	r3, r7, lsr #8
+.cfu_1cpy8lp:	mov	r3, r7, pull #8
 		ldmia	r1!, {r4 - r7}			@ Shouldnt fault
-		orr	r3, r3, r4, lsl #24
-		mov	r4, r4, lsr #8
-		orr	r4, r4, r5, lsl #24
-		mov	r5, r5, lsr #8
-		orr	r5, r5, r6, lsl #24
-		mov	r6, r6, lsr #8
-		orr	r6, r6, r7, lsl #24
+		orr	r3, r3, r4, push #24
+		mov	r4, r4, pull #8
+		orr	r4, r4, r5, push #24
+		mov	r5, r5, pull #8
+		orr	r5, r5, r6, push #24
+		mov	r6, r6, pull #8
+		orr	r6, r6, r7, push #24
 		stmia	r0!, {r3 - r6}
 		subs	ip, ip, #16
 		bpl	.cfu_1cpy8lp
 .cfu_1rem8lp:	tst	ip, #8
-		movne	r3, r7, lsr #8
+		movne	r3, r7, pull #8
 		ldmneia	r1!, {r4, r7}			@ Shouldnt fault
-		orrne	r3, r3, r4, lsl #24
-		movne	r4, r4, lsr #8
-		orrne	r4, r4, r7, lsl #24
+		orrne	r3, r3, r4, push #24
+		movne	r4, r4, pull #8
+		orrne	r4, r4, r7, push #24
 		stmneia	r0!, {r3 - r4}
 		tst	ip, #4
-		movne	r3, r7, lsr #8
+		movne	r3, r7, pull #8
 USER(		ldrnet	r7, [r1], #4)			@ May fault
-		orrne	r3, r3, r7, lsl #24
+		orrne	r3, r3, r7, push #24
 		strne	r3, [r0], #4
 		ands	ip, ip, #3
 		beq	.cfu_1fupi
-.cfu_1nowords:	mov	r3, r7, lsr #8
+.cfu_1nowords:	mov	r3, r7, lsr #byte(1)
 		teq	ip, #0
 		beq	.cfu_finished
 		cmp	ip, #2
 		strb	r3, [r0], #1
-		movge	r3, r3, lsr #8
+		movge	r3, r7, lsr #byte(2)
 		strgeb	r3, [r0], #1
-		movgt	r3, r3, lsr #8
+		movgt	r3, r7, lsr #byte(3)
 		strgtb	r3, [r0], #1
 		b	.cfu_finished
 
 .cfu_2fupi:	subs	r2, r2, #4
 		addmi	ip, r2, #4
 		bmi	.cfu_2nowords
-		mov	r3, r7, lsr #16
+		mov	r3, r7, pull #16
 USER(		ldrt	r7, [r1], #4)			@ May fault
-		orr	r3, r3, r7, lsl #16
+		orr	r3, r3, r7, push #16
 		str	r3, [r0], #4
 		mov	ip, r1, lsl #32 - PAGE_SHIFT
 		rsb	ip, ip, #0
@@ -442,38 +442,38 @@
 		subs	ip, ip, #16
 		blt	.cfu_2rem8lp
 
-.cfu_2cpy8lp:	mov	r3, r7, lsr #16
+.cfu_2cpy8lp:	mov	r3, r7, pull #16
 		ldmia	r1!, {r4 - r7}			@ Shouldnt fault
-		orr	r3, r3, r4, lsl #16
-		mov	r4, r4, lsr #16
-		orr	r4, r4, r5, lsl #16
-		mov	r5, r5, lsr #16
-		orr	r5, r5, r6, lsl #16
-		mov	r6, r6, lsr #16
-		orr	r6, r6, r7, lsl #16
+		orr	r3, r3, r4, push #16
+		mov	r4, r4, pull #16
+		orr	r4, r4, r5, push #16
+		mov	r5, r5, pull #16
+		orr	r5, r5, r6, push #16
+		mov	r6, r6, pull #16
+		orr	r6, r6, r7, push #16
 		stmia	r0!, {r3 - r6}
 		subs	ip, ip, #16
 		bpl	.cfu_2cpy8lp
 .cfu_2rem8lp:	tst	ip, #8
-		movne	r3, r7, lsr #16
+		movne	r3, r7, pull #16
 		ldmneia	r1!, {r4, r7}			@ Shouldnt fault
-		orrne	r3, r3, r4, lsl #16
-		movne	r4, r4, lsr #16
-		orrne	r4, r4, r7, lsl #16
+		orrne	r3, r3, r4, push #16
+		movne	r4, r4, pull #16
+		orrne	r4, r4, r7, push #16
 		stmneia	r0!, {r3 - r4}
 		tst	ip, #4
-		movne	r3, r7, lsr #16
+		movne	r3, r7, pull #16
 USER(		ldrnet	r7, [r1], #4)			@ May fault
-		orrne	r3, r3, r7, lsl #16
+		orrne	r3, r3, r7, push #16
 		strne	r3, [r0], #4
 		ands	ip, ip, #3
 		beq	.cfu_2fupi
-.cfu_2nowords:	mov	r3, r7, lsr #16
+.cfu_2nowords:	mov	r3, r7, lsr #byte(2)
 		teq	ip, #0
 		beq	.cfu_finished
 		cmp	ip, #2
 		strb	r3, [r0], #1
-		movge	r3, r3, lsr #8
+		movge	r3, r7, lsr #byte(3)
 		strgeb	r3, [r0], #1
 USER(		ldrgtbt	r3, [r1], #0)			@ May fault
 		strgtb	r3, [r0], #1
@@ -482,9 +482,9 @@
 .cfu_3fupi:	subs	r2, r2, #4
 		addmi	ip, r2, #4
 		bmi	.cfu_3nowords
-		mov	r3, r7, lsr #24
+		mov	r3, r7, pull #24
 USER(		ldrt	r7, [r1], #4)			@ May fault
-		orr	r3, r3, r7, lsl #8
+		orr	r3, r3, r7, push #8
 		str	r3, [r0], #4
 		mov	ip, r1, lsl #32 - PAGE_SHIFT
 		rsb	ip, ip, #0
@@ -496,40 +496,40 @@
 		subs	ip, ip, #16
 		blt	.cfu_3rem8lp
 
-.cfu_3cpy8lp:	mov	r3, r7, lsr #24
+.cfu_3cpy8lp:	mov	r3, r7, pull #24
 		ldmia	r1!, {r4 - r7}			@ Shouldnt fault
-		orr	r3, r3, r4, lsl #8
-		mov	r4, r4, lsr #24
-		orr	r4, r4, r5, lsl #8
-		mov	r5, r5, lsr #24
-		orr	r5, r5, r6, lsl #8
-		mov	r6, r6, lsr #24
-		orr	r6, r6, r7, lsl #8
+		orr	r3, r3, r4, push #8
+		mov	r4, r4, pull #24
+		orr	r4, r4, r5, push #8
+		mov	r5, r5, pull #24
+		orr	r5, r5, r6, push #8
+		mov	r6, r6, pull #24
+		orr	r6, r6, r7, push #8
 		stmia	r0!, {r3 - r6}
 		subs	ip, ip, #16
 		bpl	.cfu_3cpy8lp
 .cfu_3rem8lp:	tst	ip, #8
-		movne	r3, r7, lsr #24
+		movne	r3, r7, pull #24
 		ldmneia	r1!, {r4, r7}			@ Shouldnt fault
-		orrne	r3, r3, r4, lsl #8
-		movne	r4, r4, lsr #24
-		orrne	r4, r4, r7, lsl #8
+		orrne	r3, r3, r4, push #8
+		movne	r4, r4, pull #24
+		orrne	r4, r4, r7, push #8
 		stmneia	r0!, {r3 - r4}
 		tst	ip, #4
-		movne	r3, r7, lsr #24
+		movne	r3, r7, pull #24
 USER(		ldrnet	r7, [r1], #4)			@ May fault
-		orrne	r3, r3, r7, lsl #8
+		orrne	r3, r3, r7, push #8
 		strne	r3, [r0], #4
 		ands	ip, ip, #3
 		beq	.cfu_3fupi
-.cfu_3nowords:	mov	r3, r7, lsr #24
+.cfu_3nowords:	mov	r3, r7, lsr #byte(3)
 		teq	ip, #0
 		beq	.cfu_finished
 		cmp	ip, #2
 		strb	r3, [r0], #1
-USER(		ldrget	r3, [r1], #0)			@ May fault
+USER(		ldrgebt	r3, [r1], #1)			@ May fault
 		strgeb	r3, [r0], #1
-		movgt	r3, r3, lsr #8
+USER(		ldrgtbt	r3, [r1], #1)			@ May fault
 		strgtb	r3, [r0], #1
 		b	.cfu_finished
 
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/Makefile linux/arch/arm/mach-sa1100/Makefile
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/Makefile	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/mach-sa1100/Makefile	Sun Aug 12 16:02:29 2001
@@ -53,6 +53,8 @@
 obj-$(CONFIG_SA1100_VICTOR) += victor.o
 obj-$(CONFIG_SA1100_XP860) += xp860.o
 obj-$(CONFIG_SA1100_YOPY) += yopy.o
+obj-$(CONFIG_SA1100_GRAPHICSMASTER) += graphicsmaster.o
+obj-$(CONFIG_SA1100_ADSBITSY) += adsbitsy.o
 
 # LEDs support
 leds-y := leds.o
@@ -63,6 +65,23 @@
 leds-$(CONFIG_SA1100_GRAPHICSCLIENT) += leds-graphicsclient.o
 leds-$(CONFIG_SA1100_LART) += leds-lart.o
 leds-$(CONFIG_SA1100_PFS168) += leds-pfs168.o
+leds-$(CONFIG_SA1100_GRAPHICSMASTER) += leds-graphicsmaster.o
 obj-$(CONFIG_LEDS) += $(leds-y)
 
+# SA1110 USB client support
+list-multi += sa1100usb_core.o
+sa1100usb_core-objs := usb_ctl.o usb_ep0.o usb_recv.o usb_send.o
+obj-$(CONFIG_SA1100_USB) += sa1100usb_core.o
+obj-$(CONFIG_SA1100_USB_NETLINK) += usb-eth.o
+obj-$(CONFIG_SA1100_USB_CHAR) += usb-char.o
+
+# Miscelaneous functions
+obj-$(CONFIG_PROFILER) += hwtimer.o
+obj-$(CONFIG_APM)      += apm.o
+obj-$(CONFIG_PM) += power.o suspend.o
+obj-m += gpio.o registers.o
+
 include $(TOPDIR)/Rules.make
+
+sa1100usb_core.o: $(sa1100usb_core-objs)
+	$(LD) -r -o $@ $(sa1100usb_core-objs)
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/adsbitsy.c linux/arch/arm/mach-sa1100/adsbitsy.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/adsbitsy.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/adsbitsy.c	Sun Aug 12 16:02:29 2001
@@ -0,0 +1,113 @@
+/*
+ * linux/arch/arm/mach-sa1100/adsbitsy.c
+ *
+ * Author: Woojung Huh
+ *
+ * Pieces specific to the ADS Bitsy
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/ptrace.h>
+
+#include <asm/hardware.h>
+#include <asm/setup.h>
+#include <asm/irq.h>
+
+#include <asm/mach/irq.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
+
+#include <asm/arch/irq.h>
+
+#include "generic.h"
+#include "sa1111.h"
+
+static void __init adsbitsy_init_irq_sa1111(void)
+{
+	sa1111_init_irq(0);
+}
+
+static int __init adsbitsy_init(void)
+{
+	if (machine_is_adsbitsy()) {
+		// Reset SA1111
+		GPCR |= GPIO_GPIO26;
+		udelay(1000);
+		GPSR |= GPIO_GPIO26;
+
+		if (sa1111_init() < 0) 
+			return -EINVAL;
+
+		// Enable PWM control to control LCD
+		SKPCR |= SKPCR_PWMCLKEN;
+		SKPWM0 = 0x7F;				// VEE
+		SKPEN0 = 1;
+		SKPWM1 = 0x01;				// Backlight
+		SKPEN1 = 1;
+
+		SMCR = (SMCR_DTIM | SMCR_MBGE | SMCR_DRAC_0 | SMCR_DRAC_2 | SMCR_CLAT);
+		SKPCR |= SKPCR_DCLKEN;
+
+		adsbitsy_init_irq_sa1111();
+	}
+	else 
+		printk("ADS Bitsy board not present\n");
+
+	return 0;
+}
+
+__initcall(adsbitsy_init);
+
+static void __init adsbitsy_init_irq(void)
+{
+	/* First the standard SA1100 IRQs */
+	sa1100_init_irq();
+}
+
+
+/*
+ * Initialization fixup
+ */
+
+static void __init
+fixup_adsbitsy(struct machine_desc *desc, struct param_struct *params,
+		     char **cmdline, struct meminfo *mi)
+{
+	SET_BANK( 0, 0xc0000000, 32*1024*1024 );
+	mi->nr_banks = 1;
+
+	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	setup_ramdisk( 1, 0, 0, 8192 );
+	setup_initrd( __phys_to_virt(0xc0800000), 4*1024*1024 );
+}
+
+static struct map_desc adsbitsy_io_desc[] __initdata = {
+ /* virtual     physical    length      domain     r  w  c  b */
+  { 0xe8000000, 0x08000000, 0x01000000, DOMAIN_IO, 1, 1, 0, 0 }, /* Flash bank 1 */
+  { 0xf4000000, 0x18000000, 0x00800000, DOMAIN_IO, 1, 1, 0, 0 }, /* SA1111 */
+  LAST_DESC
+};
+
+static void __init adsbitsy_map_io(void)
+{
+	sa1100_map_io();
+	iotable_init(adsbitsy_io_desc);
+
+	sa1100_register_uart(0, 3);
+	sa1100_register_uart(1, 1);
+	sa1100_register_uart(2, 2);
+}
+
+MACHINE_START(ADSBITSY, "ADS Bitsy")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	FIXUP(fixup_adsbitsy)
+	MAPIO(adsbitsy_map_io)
+	INITIRQ(adsbitsy_init_irq)
+MACHINE_END
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/apm.c linux/arch/arm/mach-sa1100/apm.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/apm.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/apm.c	Sat Aug 11 21:38:52 2001
@@ -0,0 +1,701 @@
+/*
+ * bios-less APM driver for ARM Linux 
+ *  Jamey Hicks <jamey@crl.dec.com>
+ *  adapted from the APM BIOS driver for Linux by Stephen Rothwell (sfr@linuxcare.com)
+ *
+ * APM 1.2 Reference:
+ *   Intel Corporation, Microsoft Corporation. Advanced Power Management
+ *   (APM) BIOS Interface Specification, Revision 1.2, February 1996.
+ *
+ * [This document is available from Microsoft at:
+ *    http://www.microsoft.com/hwdev/busbios/amp_12.htm]
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+
+#include <linux/poll.h>
+#include <linux/types.h>
+#include <linux/stddef.h>
+#include <linux/timer.h>
+#include <linux/fcntl.h>
+#include <linux/malloc.h>
+#include <linux/stat.h>
+#include <linux/proc_fs.h>
+#include <linux/miscdevice.h>
+#include <linux/apm_bios.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/pm.h>
+#include <linux/kernel.h>
+#include <linux/smp_lock.h>
+
+#include <asm/system.h>
+#include <asm/hardware.h>
+#include <asm/arch/power.h>
+
+#ifdef CONFIG_MAGIC_SYSRQ
+extern void (*sysrq_power_off)(void);
+#endif
+#if defined(CONFIG_APM_DISPLAY_BLANK) && defined(CONFIG_VT)
+extern int (*console_blank_hook)(int);
+#endif
+
+struct apm_bios_info apm_bios_info = {
+        /* this driver simulates APM version 1.2 */
+        version: 0x102,
+        flags: APM_32_BIT_SUPPORT
+};
+
+/*
+ * The apm_bios device is one of the misc char devices.
+ * This is its minor number.
+ */
+#define	APM_MINOR_DEV	134
+
+/*
+ * See Documentation/Config.help for the configuration options.
+ *
+ * Various options can be changed at boot time as follows:
+ * (We allow underscores for compatibility with the modules code)
+ *	apm=on/off			enable/disable APM
+ *	    [no-]debug			log some debugging messages
+ *	    [no-]power[-_]off		power off on shutdown
+ */
+
+/*
+ * Need to poll the APM BIOS every second
+ */
+#define APM_CHECK_TIMEOUT	(HZ)
+
+/*
+ * Ignore suspend events for this amount of time after a resume
+ */
+#define DEFAULT_BOUNCE_INTERVAL		(3 * HZ)
+
+/*
+ * Maximum number of events stored
+ */
+#define APM_MAX_EVENTS		20
+
+/*
+ * The per-file APM data
+ */
+struct apm_user {
+	int		magic;
+	struct apm_user *	next;
+	int		suser: 1;
+	int		suspend_wait: 1;
+	int		suspend_result;
+	int		suspends_pending;
+	int		standbys_pending;
+	int		suspends_read;
+	int		standbys_read;
+	int		event_head;
+	int		event_tail;
+	apm_event_t	events[APM_MAX_EVENTS];
+};
+
+/*
+ * The magic number in apm_user
+ */
+#define APM_BIOS_MAGIC		0x4101
+
+/*
+ * Local variables
+ */
+static int			suspends_pending;
+static int			standbys_pending;
+static int			ignore_normal_resume;
+
+#ifdef CONFIG_APM_RTC_IS_GMT
+#	define	clock_cmos_diff	0
+#	define	got_clock_diff	1
+#else
+static long			clock_cmos_diff;
+static int			got_clock_diff;
+#endif
+static int			debug;
+static int			apm_disabled;
+#ifdef CONFIG_SMP
+static int			power_off;
+#else
+static int			power_off = 1;
+#endif
+static int			exit_kapmd;
+static int			kapmd_running;
+
+static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);
+static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);
+static struct apm_user *	user_list = NULL;
+
+static char			driver_version[] = "1.13";	/* no spaces */
+
+static char *	apm_event_name[] = {
+	"system standby",
+	"system suspend",
+	"normal resume",
+	"critical resume",
+	"low battery",
+	"power status change",
+	"update time",
+	"critical suspend",
+	"user standby",
+	"user suspend",
+	"system standby resume",
+	"capabilities change"
+};
+#define NR_APM_EVENT_NAME	\
+		(sizeof(apm_event_name) / sizeof(apm_event_name[0]))
+
+typedef struct lookup_t {
+	int	key;
+	char *	msg;
+} lookup_t;
+
+static const lookup_t error_table[] = {
+/* N/A	{ APM_SUCCESS,		"Operation succeeded" }, */
+	{ APM_DISABLED,		"Power management disabled" },
+	{ APM_CONNECTED,	"Real mode interface already connected" },
+	{ APM_NOT_CONNECTED,	"Interface not connected" },
+	{ APM_16_CONNECTED,	"16 bit interface already connected" },
+/* N/A	{ APM_16_UNSUPPORTED,	"16 bit interface not supported" }, */
+	{ APM_32_CONNECTED,	"32 bit interface already connected" },
+	{ APM_32_UNSUPPORTED,	"32 bit interface not supported" },
+	{ APM_BAD_DEVICE,	"Unrecognized device ID" },
+	{ APM_BAD_PARAM,	"Parameter out of range" },
+	{ APM_NOT_ENGAGED,	"Interface not engaged" },
+	{ APM_BAD_FUNCTION,     "Function not supported" },
+	{ APM_RESUME_DISABLED,	"Resume timer disabled" },
+	{ APM_BAD_STATE,	"Unable to enter requested state" },
+/* N/A	{ APM_NO_EVENTS,	"No events pending" }, */
+	{ APM_NO_ERROR,		"BIOS did not set a return code" },
+	{ APM_NOT_PRESENT,	"No APM present" }
+};
+#define ERROR_COUNT	(sizeof(error_table)/sizeof(lookup_t))
+
+static int __init apm_driver_version(u_short *val)
+{
+        /* no bios, so we hardcode version 1.2 */ 
+        *val = 0x102;
+	return APM_SUCCESS;
+}
+
+static int apm_get_power_status(u_char *ac_line_status,
+                                u_char *battery_status,
+                                u_char *battery_flag,
+                                u_char *battery_percentage,
+                                u_short *battery_life)
+{
+#ifdef CONFIG_SA1100_BITSY
+        h3600_apm_get_power_status(ac_line_status, battery_status, battery_flag, battery_percentage, battery_life);
+#endif
+	return APM_SUCCESS;
+}
+
+static int apm_engage_power_management(u_short device, int enable)
+{
+	if ((enable == 0) && (device == APM_DEVICE_ALL)
+	    && (apm_bios_info.flags & APM_BIOS_DISABLED))
+		return APM_DISABLED;
+	if (device == APM_DEVICE_ALL) {
+		if (enable)
+			apm_bios_info.flags &= ~APM_BIOS_DISENGAGED;
+		else
+			apm_bios_info.flags |= APM_BIOS_DISENGAGED;
+	}
+	return APM_SUCCESS;
+}
+
+static void apm_error(char *str, int err)
+{
+	int	i;
+
+	for (i = 0; i < ERROR_COUNT; i++)
+		if (error_table[i].key == err) break;
+	if (i < ERROR_COUNT)
+		printk(KERN_NOTICE "apm: %s: %s\n", str, error_table[i].msg);
+	else
+		printk(KERN_NOTICE "apm: %s: unknown error code %#2.2x\n",
+			str, err);
+}
+
+static int queue_empty(struct apm_user *as)
+{
+	return as->event_head == as->event_tail;
+}
+
+static apm_event_t get_queued_event(struct apm_user *as)
+{
+	as->event_tail = (as->event_tail + 1) % APM_MAX_EVENTS;
+	return as->events[as->event_tail];
+}
+
+static void queue_event(apm_event_t event, struct apm_user *sender)
+{
+	struct apm_user *	as;
+
+	if (user_list == NULL)
+		return;
+	for (as = user_list; as != NULL; as = as->next) {
+		if (as == sender)
+			continue;
+		as->event_head = (as->event_head + 1) % APM_MAX_EVENTS;
+		if (as->event_head == as->event_tail) {
+			static int notified;
+
+			if (notified++ == 0)
+			    printk(KERN_ERR "apm: an event queue overflowed\n");
+			as->event_tail = (as->event_tail + 1) % APM_MAX_EVENTS;
+		}
+		as->events[as->event_head] = event;
+		if (!as->suser)
+			continue;
+		switch (event) {
+		case APM_SYS_SUSPEND:
+		case APM_USER_SUSPEND:
+			as->suspends_pending++;
+			suspends_pending++;
+			break;
+
+		case APM_SYS_STANDBY:
+		case APM_USER_STANDBY:
+			as->standbys_pending++;
+			standbys_pending++;
+			break;
+		}
+	}
+	wake_up_interruptible(&apm_waitqueue);
+}
+
+static void set_time(void)
+{
+#if 0
+	unsigned long	flags;
+
+	if (got_clock_diff) {	/* Must know time zone in order to set clock */
+		save_flags(flags);
+		cli();
+		CURRENT_TIME = get_cmos_time() + clock_cmos_diff;
+		restore_flags(flags);
+	}
+#endif
+}
+
+static void get_time_diff(void)
+{
+#if 0
+#ifndef CONFIG_APM_RTC_IS_GMT
+	unsigned long	flags;
+
+	/*
+	 * Estimate time zone so that set_time can update the clock
+	 */
+	save_flags(flags);
+	clock_cmos_diff = -get_cmos_time();
+	cli();
+	clock_cmos_diff += CURRENT_TIME;
+	got_clock_diff = 1;
+	restore_flags(flags);
+#endif
+#endif
+}
+
+static void reinit_timer(void)
+{
+
+}
+
+extern void pm_do_suspend(void);
+
+static int suspend(void)
+{
+	int		err;
+	struct apm_user	*as;
+
+	printk("*** suspend()\n");
+
+#if 0
+	get_time_diff();
+	cli();
+	err = pm_send_all(PM_SUSPEND, NULL);
+	if (err) 
+		return err;
+
+	err = sa1110_suspend();
+
+	reinit_timer();
+	set_time();
+	if (err == APM_NO_ERROR)
+		err = APM_SUCCESS;
+	if (err != APM_SUCCESS)
+		apm_error("suspend", err);
+	pm_send_all(PM_RESUME, NULL);
+	sti();
+#else
+	pm_do_suspend();
+#endif
+	queue_event(APM_NORMAL_RESUME, NULL);
+	for (as = user_list; as != NULL; as = as->next) {
+		as->suspend_wait = 0;
+		as->suspend_result = ((err == APM_SUCCESS) ? 0 : -EIO);
+	}
+	ignore_normal_resume = 1;
+	wake_up_interruptible(&apm_suspend_waitqueue);
+	return err;
+}
+
+static void standby(void)
+{
+	int	err;
+
+	get_time_diff();
+        err = pm_send_all(PM_STANDBY, NULL);
+	if ((err != APM_SUCCESS) && (err != APM_NO_ERROR))
+		apm_error("standby", err);
+}
+
+static int check_apm_user(struct apm_user *as, const char *func)
+{
+	if ((as == NULL) || (as->magic != APM_BIOS_MAGIC)) {
+		printk(KERN_ERR "apm: %s passed bad filp\n", func);
+		return 1;
+	}
+	return 0;
+}
+
+static ssize_t do_read(struct file *fp, char *buf, size_t count, loff_t *ppos)
+{
+	struct apm_user *	as;
+	int			i;
+	apm_event_t		event;
+	DECLARE_WAITQUEUE(wait, current);
+
+	as = fp->private_data;
+	if (check_apm_user(as, "read"))
+		return -EIO;
+	if (count < sizeof(apm_event_t))
+		return -EINVAL;
+	if (queue_empty(as)) {
+		if (fp->f_flags & O_NONBLOCK)
+			return -EAGAIN;
+		add_wait_queue(&apm_waitqueue, &wait);
+                printk("do_read: waiting\n");
+repeat:
+		set_current_state(TASK_INTERRUPTIBLE);
+		if (queue_empty(as) && !signal_pending(current)) {
+			schedule();
+			goto repeat;
+		}
+		set_current_state(TASK_RUNNING);
+		remove_wait_queue(&apm_waitqueue, &wait);
+	}
+	i = count;
+	while ((i >= sizeof(event)) && !queue_empty(as)) {
+		event = get_queued_event(as);
+                printk("  do_read: event=%d\n", event);
+		if (copy_to_user(buf, &event, sizeof(event))) {
+			if (i < count)
+				break;
+			return -EFAULT;
+		}
+		switch (event) {
+		case APM_SYS_SUSPEND:
+		case APM_USER_SUSPEND:
+			as->suspends_read++;
+			break;
+
+		case APM_SYS_STANDBY:
+		case APM_USER_STANDBY:
+			as->standbys_read++;
+			break;
+		}
+		buf += sizeof(event);
+		i -= sizeof(event);
+	}
+	if (i < count)
+		return count - i;
+	if (signal_pending(current))
+		return -ERESTARTSYS;
+	return 0;
+}
+
+static unsigned int do_poll(struct file *fp, poll_table * wait)
+{
+	struct apm_user * as;
+
+	as = fp->private_data;
+	if (check_apm_user(as, "poll"))
+		return 0;
+	poll_wait(fp, &apm_waitqueue, wait);
+	if (!queue_empty(as))
+		return POLLIN | POLLRDNORM;
+	return 0;
+}
+
+static int do_ioctl(struct inode * inode, struct file *filp,
+		    u_int cmd, u_long arg)
+{
+        int err;
+	struct apm_user *	as;
+	DECLARE_WAITQUEUE(wait, current);
+
+	as = filp->private_data;
+	if (check_apm_user(as, "ioctl"))
+		return -EIO;
+	if (!as->suser)
+		return -EPERM;
+	switch (cmd) {
+	case APM_IOC_STANDBY: {
+                pm_send_all(PM_STANDBY, NULL);
+        } break;
+        case APM_IOC_SUSPEND: {
+                err = pm_send_all(PM_SUSPEND, (void *)2);
+                if (err) 
+                        return err;
+
+                err = sa1110_suspend();
+
+                err = pm_send_all(PM_RESUME, (void *)0);
+                if (err)
+                        return err;
+        } break;
+	default:
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static int do_release(struct inode * inode, struct file * filp)
+{
+	struct apm_user *	as;
+
+	as = filp->private_data;
+	if (check_apm_user(as, "release"))
+		return 0;
+	filp->private_data = NULL;
+	lock_kernel();
+	unlock_kernel();
+	kfree(as);
+	return 0;
+}
+
+static int do_open(struct inode * inode, struct file * filp)
+{
+	struct apm_user *	as;
+
+	as = (struct apm_user *)kmalloc(sizeof(*as), GFP_KERNEL);
+	if (as == NULL) {
+		printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
+		       sizeof(*as));
+		return -ENOMEM;
+	}
+	as->magic = APM_BIOS_MAGIC;
+	as->event_tail = as->event_head = 0;
+	as->suspends_pending = as->standbys_pending = 0;
+	as->suspends_read = as->standbys_read = 0;
+	/*
+	 * XXX - this is a tiny bit broken, when we consider BSD
+         * process accounting. If the device is opened by root, we
+	 * instantly flag that we used superuser privs. Who knows,
+	 * we might close the device immediately without doing a
+	 * privileged operation -- cevans
+	 */
+	as->suser = capable(CAP_SYS_ADMIN);
+	as->next = user_list;
+	user_list = as;
+	filp->private_data = as;
+	return 0;
+}
+
+static int apm_get_info(char *buf, char **start, off_t fpos, int length)
+{
+	char *		p;
+	unsigned short	dx;
+	unsigned short	error;
+	unsigned char   ac_line_status = 0xff;
+	unsigned char   battery_status = 0xff;
+	unsigned char   battery_flag   = 0xff;
+        unsigned char   percentage     = 0xff;
+	int             time_units     = -1;
+	char            *units         = "?";
+
+	p = buf;
+
+	if ((smp_num_cpus == 1) &&
+	    !(error = apm_get_power_status(&ac_line_status,
+                                           &battery_status, &battery_flag, &percentage, &dx))) {
+		if (apm_bios_info.version > 0x100) {
+			if (dx != 0xffff) {
+				units = (dx & 0x8000) ? "min" : "sec";
+				time_units = dx & 0x7fff;
+			}
+		}
+	}
+	/* Arguments, with symbols from linux/apm_bios.h.  Information is
+	   from the Get Power Status (0x0a) call unless otherwise noted.
+
+	   0) Linux driver version (this will change if format changes)
+	   1) APM BIOS Version.  Usually 1.0, 1.1 or 1.2.
+	   2) APM flags from APM Installation Check (0x00):
+	      bit 0: APM_16_BIT_SUPPORT
+	      bit 1: APM_32_BIT_SUPPORT
+	      bit 2: APM_IDLE_SLOWS_CLOCK
+	      bit 3: APM_BIOS_DISABLED
+	      bit 4: APM_BIOS_DISENGAGED
+	   3) AC line status
+	      0x00: Off-line
+	      0x01: On-line
+	      0x02: On backup power (BIOS >= 1.1 only)
+	      0xff: Unknown
+	   4) Battery status
+	      0x00: High
+	      0x01: Low
+	      0x02: Critical
+	      0x03: Charging
+	      0x04: Selected battery not present (BIOS >= 1.2 only)
+	      0xff: Unknown
+	   5) Battery flag
+	      bit 0: High
+	      bit 1: Low
+	      bit 2: Critical
+	      bit 3: Charging
+	      bit 7: No system battery
+	      0xff: Unknown
+	   6) Remaining battery life (percentage of charge):
+	      0-100: valid
+	      -1: Unknown
+	   7) Remaining battery life (time units):
+	      Number of remaining minutes or seconds
+	      -1: Unknown
+	   8) min = minutes; sec = seconds */
+
+	p += sprintf(p, "%s %d.%d 0x%02x 0x%02x 0x%02x 0x%02x %d%% %d %s\n",
+		     driver_version,
+		     (apm_bios_info.version >> 8) & 0xff,
+		     apm_bios_info.version & 0xff,
+		     apm_bios_info.flags,
+		     ac_line_status,
+		     battery_status,
+		     battery_flag,
+		     percentage,
+		     time_units,
+		     units);
+
+	return p - buf;
+}
+
+#ifndef MODULE
+static int __init apm_setup(char *str)
+{
+	int	invert;
+
+	while ((str != NULL) && (*str != '\0')) {
+		if (strncmp(str, "off", 3) == 0)
+			apm_disabled = 1;
+		if (strncmp(str, "on", 2) == 0)
+			apm_disabled = 0;
+		invert = (strncmp(str, "no-", 3) == 0);
+		if (invert)
+			str += 3;
+		if (strncmp(str, "debug", 5) == 0)
+			debug = !invert;
+		if ((strncmp(str, "power-off", 9) == 0) ||
+		    (strncmp(str, "power_off", 9) == 0))
+			power_off = !invert;
+		str = strchr(str, ',');
+		if (str != NULL)
+			str += strspn(str, ", \t");
+	}
+	return 1;
+}
+
+__setup("apm=", apm_setup);
+#endif
+
+static struct file_operations apm_bios_fops = {
+	owner:		THIS_MODULE,
+	read:		do_read,
+	poll:		do_poll,
+	ioctl:		do_ioctl,
+	open:		do_open,
+	release:	do_release,
+};
+
+static struct miscdevice apm_device = {
+	APM_MINOR_DEV,
+	"apm_bios",
+	&apm_bios_fops
+};
+
+#define APM_INIT_ERROR_RETURN	return -1
+
+/*
+ * Just start the APM thread. We do NOT want to do APM BIOS
+ * calls from anything but the APM thread, if for no other reason
+ * than the fact that we don't trust the APM BIOS. This way,
+ * most common APM BIOS problems that lead to protection errors
+ * etc will have at least some level of being contained...
+ *
+ * In short, if something bad happens, at least we have a choice
+ * of just killing the apm thread..
+ */
+static int __init apm_init(void)
+{
+	if (apm_bios_info.version == 0) {
+		printk(KERN_INFO "apm: BIOS not found.\n");
+		APM_INIT_ERROR_RETURN;
+	}
+	printk(KERN_INFO
+		"apm: BIOS version %d.%d Flags 0x%02x (Driver version %s)\n",
+		((apm_bios_info.version >> 8) & 0xff),
+		(apm_bios_info.version & 0xff),
+		apm_bios_info.flags,
+		driver_version);
+
+	if (apm_disabled) {
+		printk(KERN_NOTICE "apm: disabled on user request.\n");
+		APM_INIT_ERROR_RETURN;
+	}
+
+	if (PM_IS_ACTIVE()) {
+		printk(KERN_NOTICE "apm: overridden by ACPI.\n");
+		APM_INIT_ERROR_RETURN;
+	}
+	pm_active = 1;
+
+	create_proc_info_entry("apm", 0, NULL, apm_get_info);
+
+	misc_register(&apm_device);
+
+	return 0;
+}
+
+static void __exit apm_exit(void)
+{
+	misc_deregister(&apm_device);
+	remove_proc_entry("apm", NULL);
+#ifdef CONFIG_MAGIC_SYSRQ
+	sysrq_power_off = NULL;
+#endif
+	if (power_off)
+		pm_power_off = NULL;
+	exit_kapmd = 1;
+	while (kapmd_running)
+		schedule();
+	pm_active = 0;
+}
+
+module_init(apm_init);
+module_exit(apm_exit);
+
+MODULE_AUTHOR("Stephen Rothwell");
+MODULE_DESCRIPTION("Advanced Power Management");
+MODULE_PARM(debug, "i");
+MODULE_PARM_DESC(debug, "Enable debug mode");
+MODULE_PARM(power_off, "i");
+MODULE_PARM_DESC(power_off, "Enable power off");
+MODULE_PARM(bounce_interval, "i");
+MODULE_PARM_DESC(bounce_interval, "Set the number of ticks to ignore suspend bounces");
+
+EXPORT_NO_SYMBOLS;
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/gpio.c linux/arch/arm/mach-sa1100/gpio.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/gpio.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/gpio.c	Sat Aug 11 21:39:13 2001
@@ -0,0 +1,65 @@
+/*
+ * SA11x0 GPIO management
+ * (C) 2000 Nicolas Pitre
+ * This code is GPL.
+ * 
+ * This should eventually serve as a GPIO ressource manager.
+ * For now we only have useful debugging stuff.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/proc_fs.h>
+#include <linux/string.h>
+
+#include <asm/hardware.h>
+
+
+
+static int proc_gpio_read(char *page, char **start, off_t off,
+			  int count, int *eof, void *data)
+{
+	char *p = page;
+	int len, i;
+	long gpdr = GPDR, gplr = GPLR;
+
+	for (i = 0; i <= 27; i++)
+		p += sprintf(p, "%d\t%s\t%s\n", i, 
+				(gpdr & GPIO_GPIO(i)) ? "out" : "in",
+				(gplr & GPIO_GPIO(i)) ? "set" : "clear");
+
+
+	len = (p - page) - off;
+	if (len < 0)
+		len = 0;
+
+	*eof = (len <= count) ? 1 : 0;
+	*start = page + off;
+
+	return len;
+}
+
+
+static struct proc_dir_entry *proc_gpio;
+
+static int __init gpio_init(void)
+{
+	proc_gpio = create_proc_entry("gpio", 0, 0);
+	if (proc_gpio)
+		proc_gpio->read_proc = proc_gpio_read;
+	return 0;
+}
+
+static int __exit gpio_exit(void)
+{
+	if (proc_gpio)
+		remove_proc_entry( "gpio", 0);
+	return 0;
+
+}
+
+
+module_init(gpio_init);
+module_exit(gpio_exit);
+
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/graphicsclient.c linux/arch/arm/mach-sa1100/graphicsclient.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/graphicsclient.c	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/mach-sa1100/graphicsclient.c	Sun Aug 12 16:02:29 2001
@@ -131,14 +131,15 @@
 	mi->nr_banks = 2;
 
 	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
-	setup_ramdisk( 1, 0, 0, 4096 );
+	setup_ramdisk( 1, 0, 0, 8192 );
 	setup_initrd( __phys_to_virt(0xc0800000), 4*1024*1024 );
 }
 
 static struct map_desc graphicsclient_io_desc[] __initdata = {
  /* virtual     physical    length      domain     r  w  c  b */
-  { 0xe8000000, 0x08000000, 0x01000000, DOMAIN_IO, 1, 1, 0, 0 }, /* Flash bank 1 */
+  { 0xe8000000, 0x08000000, 0x02000000, DOMAIN_IO, 1, 1, 0, 0 }, /* Flash bank 1 */
   { 0xf0000000, 0x10000000, 0x00400000, DOMAIN_IO, 0, 1, 0, 0 }, /* CPLD */
+  { 0xf1000000, 0x18000000, 0x00400000, DOMAIN_IO, 0, 1, 0, 0 }, /* CAN */
   LAST_DESC
 };
 
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/graphicsmaster.c linux/arch/arm/mach-sa1100/graphicsmaster.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/graphicsmaster.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/graphicsmaster.c	Sun Aug 12 16:02:29 2001
@@ -0,0 +1,196 @@
+/*
+ * linux/arch/arm/mach-sa1100/graphicsmaster.c
+ *
+ * Pieces specific to the GraphicsMaster board
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/ptrace.h>
+
+#include <asm/hardware.h>
+#include <asm/setup.h>
+#include <asm/irq.h>
+
+#include <asm/mach/irq.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
+
+#include <asm/arch/irq.h>
+
+#include "generic.h"
+#include "sa1111.h"
+
+static void __init graphicsmaster_init_irq_sa1111(void)
+{
+	// 7/6/01 Woojung
+	// See inside of sa1111_init_irq()
+	sa1111_init_irq(-1);
+}
+
+static int __init graphicsmaster_init(void)
+{
+	if (machine_is_graphicsmaster()) {
+		if (sa1111_init() < 0)
+			return -EINVAL;
+
+		// Enable PWM control to control LCD
+		SKPCR |= SKPCR_PWMCLKEN;
+		SKPWM0 = 0x7F;				// VEE
+		SKPEN0 = 1;
+		SKPWM1 = 0x01;				// Backlight
+		SKPEN1 = 1;
+
+		SMCR = (SMCR_DTIM | SMCR_MBGE | SMCR_DRAC_0 | SMCR_DRAC_1);
+		SKPCR |= SKPCR_DCLKEN;
+
+		graphicsmaster_init_irq_sa1111();
+	} else
+		printk("GraphicsMaster board not present\n");
+
+	return 0;
+}
+
+__initcall(graphicsmaster_init);
+
+/*
+ * Handlers for GraphicsMaster's external IRQ logic
+ */
+
+static void ADS_IRQ_demux( int irq, void *dev_id, struct pt_regs *regs )
+{
+	int i;
+
+	while( (irq = ADS_INT_ST1 | (ADS_INT_ST2 << 8)) ){
+		for( i = 0; i < 16; i++ )
+			if( irq & (1<<i) ) {
+				do_IRQ( ADS_EXT_IRQ(i), regs );
+			}
+	}
+}
+
+static struct irqaction ADS_ext_irq = {
+	name:		"ADS_ext_IRQ",
+	handler:	ADS_IRQ_demux,
+	flags:		SA_INTERRUPT
+};
+
+static void ADS_mask_and_ack_irq0(unsigned int irq)
+{
+	int mask = (1 << (irq - ADS_EXT_IRQ(0)));
+	ADS_INT_EN1 &= ~mask;
+	ADS_INT_ST1 = mask;
+}
+
+static void ADS_mask_irq0(unsigned int irq)
+{
+	ADS_INT_ST1 = (1 << (irq - ADS_EXT_IRQ(0)));
+}
+
+static void ADS_unmask_irq0(unsigned int irq)
+{
+	ADS_INT_EN1 |= (1 << (irq - ADS_EXT_IRQ(0)));
+}
+
+static void ADS_mask_and_ack_irq1(unsigned int irq)
+{
+	int mask = (1 << (irq - ADS_EXT_IRQ(8)));
+	ADS_INT_EN2 &= ~mask;
+	ADS_INT_ST2 = mask;
+}
+
+static void ADS_mask_irq1(unsigned int irq)
+{
+	ADS_INT_ST2 = (1 << (irq - ADS_EXT_IRQ(8)));
+}
+
+static void ADS_unmask_irq1(unsigned int irq)
+{
+	ADS_INT_EN2 |= (1 << (irq - ADS_EXT_IRQ(8)));
+}
+
+static void __init graphicsmaster_init_irq(void)
+{
+	int irq;
+
+	/* First the standard SA1100 IRQs */
+	sa1100_init_irq();
+
+	/* disable all IRQs */
+	ADS_INT_EN1 = 0;
+	ADS_INT_EN2 = 0;
+	/* clear all IRQs */
+	ADS_INT_ST1 = 0xff;
+	ADS_INT_ST2 = 0xff;
+
+	for (irq = ADS_EXT_IRQ(0); irq <= ADS_EXT_IRQ(7); irq++) {
+		irq_desc[irq].valid	= 1;
+		irq_desc[irq].probe_ok	= 1;
+		irq_desc[irq].mask_ack	= ADS_mask_and_ack_irq0;
+		irq_desc[irq].mask	= ADS_mask_irq0;
+		irq_desc[irq].unmask	= ADS_unmask_irq0;
+	}
+	for (irq = ADS_EXT_IRQ(8); irq <= ADS_EXT_IRQ(15); irq++) {
+		irq_desc[irq].valid	= 1;
+		irq_desc[irq].probe_ok	= 1;
+		irq_desc[irq].mask_ack	= ADS_mask_and_ack_irq1;
+		irq_desc[irq].mask	= ADS_mask_irq1;
+		irq_desc[irq].unmask	= ADS_unmask_irq1;
+	}
+	GPDR &= ~GPIO_GPIO0;
+	set_GPIO_IRQ_edge(GPIO_GPIO0, GPIO_FALLING_EDGE);
+	setup_arm_irq( IRQ_GPIO0, &ADS_ext_irq );
+}
+
+
+/*
+ * Initialization fixup
+ */
+
+static void __init
+fixup_graphicsmaster(struct machine_desc *desc, struct param_struct *params,
+		     char **cmdline, struct meminfo *mi)
+{
+	SET_BANK( 0, 0xc0000000, 16*1024*1024 );
+	mi->nr_banks = 1;
+	/*
+	SET_BANK( 1, 0xc8000000, 16*1024*1024 );
+	mi->nr_banks = 2;
+	*/
+
+	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
+	setup_ramdisk( 1, 0, 0, 8192 );
+	setup_initrd( __phys_to_virt(0xc0800000), 4*1024*1024 );
+}
+
+static struct map_desc graphicsmaster_io_desc[] __initdata = {
+ /* virtual     physical    length      domain     r  w  c  b */
+  { 0xe8000000, 0x08000000, 0x02000000, DOMAIN_IO, 1, 1, 0, 0 }, /* Flash bank 1 */
+  { 0xf0000000, 0x10000000, 0x00400000, DOMAIN_IO, 1, 1, 0, 0 }, /* CPLD */
+  { 0xf1000000, 0x40000000, 0x00400000, DOMAIN_IO, 1, 1, 0, 0 }, /* CAN */
+  { 0xf4000000, 0x18000000, 0x00800000, DOMAIN_IO, 1, 1, 0, 0 }, /* SA-1111 */
+  LAST_DESC
+};
+
+static void __init graphicsmaster_map_io(void)
+{
+	sa1100_map_io();
+	iotable_init(graphicsmaster_io_desc);
+
+	sa1100_register_uart(0, 3);
+	sa1100_register_uart(1, 1);
+	sa1100_register_uart(2, 2);
+}
+
+MACHINE_START(GRAPHICSMASTER, "ADS GraphicsMaster")
+	BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+	FIXUP(fixup_graphicsmaster)
+	MAPIO(graphicsmaster_map_io)
+	INITIRQ(graphicsmaster_init_irq)
+MACHINE_END
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/hwtimer.c linux/arch/arm/mach-sa1100/hwtimer.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/hwtimer.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/hwtimer.c	Sat Aug 11 21:39:13 2001
@@ -0,0 +1,303 @@
+/*
+ * Code to multiplex the SA1100 Timer 
+ * Copyright (c) Compaq Computer Corporation, 1999
+ *
+ * Use consistent with the GNU GPL is permitted,
+ * provided that this copyright notice is
+ * preserved in its entirety in all copies and derived works.
+ *
+ * COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED,
+ * AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS
+ * FITNESS FOR ANY PARTICULAR PURPOSE.
+ *
+ * Authors: Deborah A. Wallach and Lawrence S. Brakmo
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <asm/hardware/hwtimer.h>
+
+#include <asm/io.h>
+#include <linux/config.h>
+
+#include <asm/arch/irqs.h>
+
+#include <net/tcp.h>
+
+#ifdef CONFIG_POWERMGR
+#include <linux/powermgr.h>
+#endif
+
+/*************************************************************************/
+
+static int timer2_in_use = 0;
+
+static __inline__ void clear_timer2 (void)
+{
+  OSSR = 0x4;
+}
+
+static  __inline__ void set_timer2 (unsigned long when)
+{
+  unsigned long now;
+
+  OSMR2 = when;
+  if (!timer2_in_use) {
+    unsigned long i = OIER;
+    i |= 4;
+    OIER = i;
+    OSSR = 0x4;
+    timer2_in_use = 1;
+  }
+  if ((now=OSCR) > when  &&  (now-when) < 36864000) { /* LSB */
+    printk("set_timer2, when: 0x%lx, now: 0x%lx\n", when, now);
+    OSMR2 = now+2000;
+  }
+}
+
+extern __inline__ void cleanup_timer2 (void)
+{
+  unsigned long i;
+  i = OIER;
+  i &= ~0x4;
+  OIER = i;
+  timer2_in_use = 0;
+  OSSR = 0x4;
+}
+
+/*************************************************************************/
+
+volatile struct hwtimer_list *head = NULL;
+volatile int inside_timer2_interrupts=0;
+
+static inline int islt(unsigned long a, unsigned long b)
+{
+  return(before(a, b));
+}
+
+static inline int isle(unsigned long a, unsigned long b)
+{
+  if (a==b) return(1);
+  else return(islt(a, b));
+}
+
+static inline void internal_add_hwtimer(struct hwtimer_list *timer)
+{
+  if ((!head) || islt(timer->expires, head->expires)) {
+    timer->next = (struct hwtimer_list *)head;
+    head = timer;
+    if (!inside_timer2_interrupts)
+      set_timer2(timer->expires);
+  }
+  else {
+    struct hwtimer_list *ptr1 = (struct hwtimer_list *)head;
+    struct hwtimer_list *ptr2 = (struct hwtimer_list *)head->next;
+    while ((ptr2 != NULL) && islt(ptr2->expires, timer->expires)) {
+      ptr1 = ptr2;
+      ptr2 = ptr2->next;
+    }
+    ptr1->next = timer;
+    timer->next = ptr2;
+  }
+}
+
+void add_hwtimer(struct hwtimer_list *timer, int delay) 
+{
+  unsigned long flags;
+  unsigned long now;
+
+  MOD_INC_USE_COUNT;
+
+  /*   printk("add_hwtimer OSCR:0x%x delay:%d data:%d inUse:%d head:%p\n",  */
+  /* 	 (int) OSCR, */
+  /* 	 delay, (int) timer->data, timer2_in_use, head); */
+  save_flags_cli(flags);
+  now = OSCR;
+  timer->expires = now + delay;
+  internal_add_hwtimer(timer);
+  restore_flags(flags);
+  /*   printk("set_timer2 OSMR2:0x%x OSCR: 0x%x OIER:%x OSSR:0x%x\n",  */
+  /* 	 (int) OSMR2, (int) OSCR, */
+  /* 	 (int) OIER, (int) OSSR); */
+}
+
+static inline int detach_hwtimer(struct hwtimer_list *timer)
+{
+  struct hwtimer_list *ptr = (struct hwtimer_list *)head;
+  if (!head) return(0);
+  if (head == timer) {
+    head = timer->next;
+    if (head == NULL) cleanup_timer2();
+    else if (timer->expires != head->expires) {
+      set_timer2(head->expires);
+    }
+    return(1);
+  }
+  while((ptr != NULL) && (ptr->next != timer)) {
+    ptr = ptr->next;
+  }
+  if (ptr==NULL) return(0);
+  ptr->next = timer->next;
+  return(1);
+}
+
+int del_hwtimer(struct hwtimer_list * timer)
+{
+	int ret;
+	unsigned long flags;
+	/* 	printk("del_hwtimer data:%d\n", (int) timer->data); */
+	/* 	printk(" OSMR2:0x%x OSCR: 0x%x OIER:0x%x OSSR:0x%x ICMR:0x%x\n",  */
+	/* 	 (int) OSMR2, (int) OSCR, */
+	/* 	 (int) OIER, (int) OSSR, (int) *IRQ_ICMR); */
+	save_flags(flags);
+	cli();
+	ret = detach_hwtimer(timer);
+	timer->next = 0;
+	restore_flags(flags);
+	if (ret)
+		MOD_DEC_USE_COUNT;
+	return ret;
+}
+
+static void timer2_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+  unsigned long now;
+  unsigned long flags;
+  struct hwtimer_list *ptr;
+
+  save_flags_cli(flags);
+  inside_timer2_interrupts = 1;
+  now = OSCR;
+  clear_timer2();
+  while((head != NULL) && isle(head->expires, now)) {  
+    void (*fn)(int, void *, struct pt_regs *, unsigned long) = head->function;
+    unsigned long data = head->data;
+    ptr = (struct hwtimer_list *)head;
+    head = head->next;
+    ptr->next = NULL;
+    /*     sti(); */
+    /*     restore_flags(flags); */
+    fn(irq, dev_id, regs, data);
+    /*     printk("calling timer2 with data: %d\n", (int) data); */
+    cli();
+    now = OSCR;  
+  }
+  inside_timer2_interrupts = 0;
+  if (head != NULL) {
+    set_timer2(head->expires);
+  }
+  else {
+    cleanup_timer2();
+  }
+  restore_flags(flags);
+}
+
+unsigned int us_check_hwtimer(void)
+{
+  unsigned long now;
+  if (!head) return(0xffffffff);
+  else { 
+    now = OSCR;  
+    return(head->expires-now);
+  }
+}
+
+#ifdef ITSY_CONFIG_POWERMGR
+/* This code is only works with the Itsy powermanagement scheme */
+
+static unsigned long OSMR2_saved, OIER_saved;
+
+extern unsigned long ticks_slept; /* defined in rtc.c */
+
+static int
+suspend (void *unused, int suspend_flags)
+{
+  OSMR2_saved = OSMR2;
+  OIER_saved = OIER;
+  return 1;
+}
+
+static int
+resume (void *unused, int resume_flags)
+{
+  struct hwtimer_list *ptr = head;
+  unsigned long now = OSCR;  
+
+  while (ptr != NULL) { 
+    if (ticks_slept == 0xffffffff) ptr->expires = now; 
+    else { 
+      ptr->expires -= ticks_slept; 
+      if (islt(ptr->expires, now)) ptr->expires = now; 
+    } 
+    ptr = ptr->next;
+  }
+  if (head != NULL) OSMR2 = head->expires+5000;
+  else OSMR2 =  OSMR2_saved; /* XXX this else clause is necessary to prevent triggering
+				    * a compiler bug on the version of the compiler on the alphas
+				    * egcs-2.91.55 19980824 (gcc2 ss-980609 experimental)
+				    */
+
+  if (OIER_saved & 0x4) {
+    unsigned long i = OIER;
+    i |= 4;
+    OIER = i;
+  }
+  *IRQ_ICMR |= (1 << IRQ_OST2);
+  /*   printk("hwtimer resume OIER:0x%x, OSSR:0x%x, ICMR:0x%x\n", */
+  /* 	 (int) OIER, (int) OSSR, (int) *IRQ_ICMR); */
+  /*   { */
+  /*     unsigned long i = IRQ_ICMR; */
+  /*     i |= IRQ_OST2; */
+  /*     IRQ_ICMR = i; */
+  /*   } */
+  return 1;
+}
+
+static const powermgr_client hwtimer_powermgr = {
+  /* callback functions */
+  NULL,
+  suspend,
+  resume,
+  NULL,
+  POWERMGR_ID_INVALID,
+  "hwtimer",
+  0,
+0
+};
+
+#endif /* ITSY_CONFIG_POWERMGR */
+    
+void init_hwtimer(struct hwtimer_list *timer)
+{
+  timer->next = NULL;
+}
+
+
+int __init hwtime_setup(void)
+{
+  int ret;
+  
+  ret = request_irq(IRQ_OST2, timer2_interrupt, SA_INTERRUPT, "OST2 - gp", NULL);
+  if (ret) {
+    printk("IRQ initialization failed!\n");
+    return ret;
+  }
+  return 0;
+}
+
+module_init(hwtime_setup);
+
+void __exit hwtime_cleanup(void)
+{
+  free_irq(IRQ_OST2, NULL);
+}
+
+module_exit(hwtime_cleanup);
+
+
+EXPORT_SYMBOL(init_hwtimer);
+EXPORT_SYMBOL(add_hwtimer);
+EXPORT_SYMBOL(del_hwtimer);
+
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/leds-graphicsmaster.c linux/arch/arm/mach-sa1100/leds-graphicsmaster.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/leds-graphicsmaster.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/leds-graphicsmaster.c	Sun Aug 12 16:02:29 2001
@@ -0,0 +1,104 @@
+/*
+ *  linux/arch/arm/mach-sa1100/leds-graphicsmaster.c
+ *
+ * GraphicsClient Plus LEDs support
+ * Woojung Huh, Feb 13, 2001
+ */
+#include <linux/config.h>
+#include <linux/init.h>
+
+#include <asm/hardware.h>
+#include <asm/leds.h>
+#include <asm/system.h>
+
+#include "leds.h"
+
+
+#define LED_STATE_ENABLED	1
+#define LED_STATE_CLAIMED	2
+
+static unsigned int led_state;
+static unsigned int hw_led_state;
+
+#define LED_TIMER       ADS_LED0  /* green heartbeat */
+#define LED_USER        ADS_LED1  /* amber, boots to on */
+#define LED_IDLE        ADS_LED2  /* red has the idle led, if any */
+
+#define LED_MASK	(ADS_LED0|ADS_LED1|ADS_LED2)
+
+void graphicsmaster_leds_event(led_event_t evt)
+{
+	unsigned long flags;
+
+	save_flags_cli(flags);
+
+	switch (evt) {
+	case led_start:
+		hw_led_state = 0;        /* gc leds are positive logic */
+		led_state = LED_STATE_ENABLED;
+		break;
+
+	case led_stop:
+		led_state &= ~LED_STATE_ENABLED;
+		break;
+
+	case led_claim:
+		led_state |= LED_STATE_CLAIMED;
+		hw_led_state = LED_MASK;
+		break;
+
+	case led_release:
+		led_state &= ~LED_STATE_CLAIMED;
+		hw_led_state = LED_MASK;
+		break;
+
+#ifdef CONFIG_LEDS_TIMER
+	case led_timer:
+		if (!(led_state & LED_STATE_CLAIMED))
+			hw_led_state ^= LED_TIMER;
+		break;
+#endif
+
+#ifdef CONFIG_LEDS_CPU
+	case led_idle_start:
+		if (!(led_state & LED_STATE_CLAIMED))
+			hw_led_state &= ~LED_IDLE;
+		break;
+
+	case led_idle_end:
+		if (!(led_state & LED_STATE_CLAIMED))
+			hw_led_state |= LED_IDLE;
+		break;
+#endif
+
+	case led_green_on:
+		break;
+
+	case led_green_off:
+		break;
+
+	case led_amber_on:
+		hw_led_state |= LED_USER;
+		break;
+
+	case led_amber_off:
+		hw_led_state &= ~LED_USER;
+		break;
+
+	case led_red_on:
+		break;
+
+	case led_red_off:
+		break;
+
+	default:
+		break;
+	}
+
+	if  (led_state & LED_STATE_ENABLED) {
+		GPSR = hw_led_state;
+		GPCR = hw_led_state ^ LED_MASK;
+	}
+
+	restore_flags(flags);
+}
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/leds.c linux/arch/arm/mach-sa1100/leds.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/leds.c	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/mach-sa1100/leds.c	Sun Aug 12 16:02:29 2001
@@ -30,6 +30,8 @@
 		leds_event = lart_leds_event;
 	if (machine_is_pfs168())
 		leds_event = pfs168_leds_event;
+	if (machine_is_graphicsmaster())
+		leds_event = graphicsmaster_leds_event;
 
 	leds_event(led_start);
 	return 0;
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/leds.h linux/arch/arm/mach-sa1100/leds.h
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/leds.h	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/mach-sa1100/leds.h	Sun Aug 12 16:02:29 2001
@@ -5,4 +5,4 @@
 extern void graphicsclient_leds_event(led_event_t evt);
 extern void lart_leds_event(led_event_t evt);
 extern void pfs168_leds_event(led_event_t evt);
-
+extern void graphicsmaster_leds_event(led_event_t evt);
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/pangolin.c linux/arch/arm/mach-sa1100/pangolin.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/pangolin.c	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/mach-sa1100/pangolin.c	Sun Aug 12 16:27:16 2001
@@ -20,7 +20,7 @@
 fixup_pangolin(struct machine_desc *desc, struct param_struct *params,
 	       char **cmdline, struct meminfo *mi)
 {
-	SET_BANK( 0, 0xc0000000, 64*1024*1024 );
+	SET_BANK( 0, 0xc0000000, 128*1024*1024 );
 	mi->nr_banks = 1;
 
 	ROOT_DEV = MKDEV(RAMDISK_MAJOR,0);
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/power.c linux/arch/arm/mach-sa1100/power.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/power.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/power.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,282 @@
+/*
+ * SA1110 Power Management Routines
+ *
+ * Copyright (c) 2001 Cliff Brake <cbrake@accelent.com>
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License.
+ *
+ * History:
+ *
+ * 2001-02-06: Cliff Brake         Initial code
+ *
+ * 2001-02-25: Sukjae Cho <sjcho@east.isi.edu> & 
+ * 			   Chester Kuo <chester@linux.org.tw>
+ * 			   Save more value for the resume function! Support
+ * 			   Bitsy/Assabet/Freebird board
+ *
+ */
+
+/*
+ *  Debug macros 
+ */
+#define DEBUG 1
+#ifdef DEBUG
+#  define DPRINTK(fmt, args...)	printk("%s: " fmt, __FUNCTION__ , ## args)
+#else
+#  define DPRINTK(fmt, args...)
+#endif
+
+
+#include <linux/init.h>
+#include <linux/pm.h>
+#include <linux/malloc.h>
+#include <linux/sysctl.h>
+#include <linux/acpi.h>
+
+#include <asm/mach-types.h>
+#include <asm/hardware.h>
+#include <asm/memory.h>
+#include <asm/system.h>
+#include <asm/proc-fns.h>
+#include <asm/arch/power.h>
+
+static struct {
+        u32 osmr0, osmr1, osmr2, osmr3, oscr;
+        u32 ower, oier;
+
+        u32 gpdr, grer, gfer, gafr;
+        u32 icmr, iclr, iccr;
+        u32 ppdr, ppsr, ppar, psdr;
+		/* FIXME this part should in the serial port driver ,Control register*/
+        u32 serutcr0, serutcr1, serutcr2, serutcr3;
+
+} sys_ctx;
+
+extern unsigned long *sleep_param;	/* virtual address */
+extern unsigned long  sleep_param_p;	/* physical address */
+extern void cpu_sa1100_resume(void);	/* function the bootloader will call back */
+
+extern int cpu_sa1100_do_suspend(void);
+
+int sa1110_suspend(void)
+{
+
+	/* set up pointer to sleep parameters */
+	sleep_param = kmalloc (SLEEP_PARAM_SIZE*sizeof(long), GFP_ATOMIC);
+	if (!sleep_param)
+		return -ENOMEM;
+	sleep_param_p = virt_to_phys(sleep_param);
+	
+	DPRINTK("*** sa1100_suspend()\n");
+	DPRINTK("*** sleep_param_p = 0x%08lx\n", sleep_param_p);
+	DPRINTK("*** resume_return() = 0x%08lx\n", virt_to_phys(cpu_sa1100_resume));
+
+	/* disable interrupts */
+	cli();
+	RCNR = xtime.tv_sec;
+
+	/* save vital registers */
+        sys_ctx.osmr0 = OSMR0;
+        sys_ctx.osmr1 = OSMR1;
+        sys_ctx.osmr2 = OSMR2;
+        sys_ctx.osmr3 = OSMR3;
+        sys_ctx.oscr  = OSCR;
+        sys_ctx.ower = OWER;
+        sys_ctx.oier = OIER;
+
+        sys_ctx.gpdr = GPDR;
+        sys_ctx.grer = GRER;
+        sys_ctx.gfer = GFER;
+        sys_ctx.gafr = GAFR;
+
+        sys_ctx.iclr = ICLR;
+        sys_ctx.icmr = ICMR;
+        sys_ctx.iccr = ICCR;
+
+        sys_ctx.ppdr = PPDR;
+        sys_ctx.ppsr = PPSR;
+        sys_ctx.ppar = PPAR;
+        sys_ctx.psdr = PSDR;
+
+	/* XXX Should be in serial driver */
+	/* Save serial port context for quick restore */
+#if defined(CONFIG_SA1100_ASSABET) || defined(CONFIG_SA1100_FREEBIRD)
+        sys_ctx.serutcr0 = Ser1UTCR0;
+        sys_ctx.serutcr1 = Ser1UTCR1;
+        sys_ctx.serutcr2 = Ser1UTCR2;
+        sys_ctx.serutcr3 = Ser1UTCR3;
+              DPRINTK("save serial port 1 value\n");
+#else
+        sys_ctx.serutcr0 = Ser3UTCR0;
+        sys_ctx.serutcr1 = Ser3UTCR1;
+        sys_ctx.serutcr2 = Ser3UTCR2;
+        sys_ctx.serutcr3 = Ser3UTCR3;
+#endif
+
+	/* set wake up sources and power management registers */
+	if (machine_is_accelent_sa()) {
+		PWER = 0x1;
+		GRER = 0x1;
+		GFER = 0x1;
+		GEDR = 0x1;
+	} else if (machine_is_bitsy()) {
+                /* will add more sources later */		
+	
+		/* Wake up by releasing the power button or by RTC */
+		PWER = 0x1 | (1 << 31); 
+		GRER = 0x1; 
+		/* Wakened by pushing button will cause cpu 
+		 * by following button release,
+		 * so disable falling edge detection */
+		GFER = 0x0;
+		GEDR = 0x1; 
+
+		/* Clear previous reset status */
+		RCSR = RCSR_HWR | RCSR_SWR | RCSR_WDR | RCSR_SMR;
+
+        	PCFR = PCFR_OPDE | PCFR_FP | PCFR_FS;
+        	PGSR = 0x00000000;
+	} else if (machine_is_assabet()) {
+		PWER = 0x1;
+		GRER = 0x1;
+		GFER = 0x0;
+		GEDR = 0x1;
+
+		RCSR = RCSR_HWR | RCSR_SWR | RCSR_WDR | RCSR_SMR;
+		/* Clear reset status */
+		PCFR = PCFR_OPDE | PCFR_FP | PCFR_FS;
+		PGSR = 0x00000000;
+	} else if (machine_is_freebird()) {
+		PWER = 0x1;
+		GRER = 0x1;
+		GFER = 0x0;
+		GEDR = 0x1;
+
+		RCSR = RCSR_HWR | RCSR_SWR | RCSR_WDR | RCSR_SMR;
+		PCFR = PCFR_OPDE | PCFR_FP | PCFR_FS;
+		PGSR = 0x0;
+		DPRINTK("just print at freebird board\n");
+	}
+
+	/* set resume return address */
+	PSPR = virt_to_phys(cpu_sa1100_resume);
+
+	cpu_sa1100_do_suspend();
+
+	DPRINTK("*** made it back from resume\n");
+
+	/* restore registers */
+        GPDR = sys_ctx.gpdr;
+        GRER = sys_ctx.grer;
+        GFER = sys_ctx.gfer;
+        GAFR = sys_ctx.gafr;
+
+	/* XXX Should be in serial driver */
+#if defined(CONFIG_SA1100_ASSABET) || defined (CONFIG_SA1100_FREEBIRD)
+        Ser1UTCR0 = sys_ctx.serutcr0;
+        Ser1UTCR1 = sys_ctx.serutcr1;
+        Ser1UTCR2 = sys_ctx.serutcr2;
+        Ser1UTCR3 = sys_ctx.serutcr3;
+              DPRINTK("restore serial port 1 value\n");
+#else
+        Ser3UTCR0 = sys_ctx.serutcr0;
+        Ser3UTCR1 = sys_ctx.serutcr1;
+        Ser3UTCR2 = sys_ctx.serutcr2;
+        Ser3UTCR3 = sys_ctx.serutcr3;
+#endif
+
+        PPDR = sys_ctx.ppdr;
+        PPSR = sys_ctx.ppsr;
+        PPAR = sys_ctx.ppar;
+        PSDR = sys_ctx.psdr;
+
+        OSMR0 = sys_ctx.osmr0;
+        OSMR1 = sys_ctx.osmr1;
+        OSMR2 = sys_ctx.osmr2;
+        OSMR3 = sys_ctx.osmr3;
+        OSCR = sys_ctx.oscr;
+        OWER = sys_ctx.ower;
+        OIER = sys_ctx.oier;
+
+        ICLR = sys_ctx.iclr;
+        ICCR = sys_ctx.iccr;
+        ICMR = sys_ctx.icmr;
+
+#if defined(CONFIG_SA1100_BITSY)
+	if (machine_is_bitsy()) {
+		if (ICIP & IC_GPIO0) { 
+			/* if wakeup source is power button, clear interrupt 
+				 flag to prevent sleeping again */
+			GEDR = GPIO_GPIO0; 
+        		ICIP = GPIO_GPIO0; 
+		}
+	}
+#endif
+#if defined(CONFIG_SA1100_ASSABET)
+       if (machine_is_assabet()) {
+               if (ICIP & IC_GPIO0) {
+                       GEDR = GPIO_GPIO0;
+               ICIP = GPIO_GPIO0;
+               }
+       }
+#endif
+#if defined(CONFIG_SA1100_FREEBIRD)
+       if (machine_is_freebird()) {
+               if (ICIP & IC_GPIO0) {
+                       GEDR = GPIO_GPIO0;
+               ICIP = GPIO_GPIO0;
+               }
+       }
+#endif
+
+	xtime.tv_sec = RCNR;
+	sti();
+	kfree (sleep_param);
+
+	return 0;
+}
+
+int pm_do_suspend(void)
+{
+	int retval;
+	
+	DPRINTK("yea\n");
+	
+	retval = pm_send_all(PM_SUSPEND, (void *)2);
+	if (retval) 
+		return retval;
+
+	retval = sa1110_suspend();
+
+	retval = pm_send_all(PM_RESUME, (void *)0);
+	if (retval)
+		return retval;
+
+	return 0;
+}
+
+
+static struct ctl_table pm_table[] = 
+{
+	{ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, (proc_handler *)&pm_do_suspend},
+	{0}
+};
+
+static struct ctl_table pm_dir_table[] =
+{
+	{CTL_ACPI, "pm", NULL, 0, 0555, pm_table},
+	{0}
+};
+
+/*
+ * Initialize power interface
+ */
+static int __init pm_init(void)
+{
+	register_sysctl_table(pm_dir_table, 1);
+	return 0;
+}
+
+__initcall(pm_init);
+
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/registers.c linux/arch/arm/mach-sa1100/registers.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/registers.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/registers.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,358 @@
+/****************************************************************************
+
+  registers.c: Register monitor of SA-1110
+
+Date: Fri, 2 Feb 2001 10:03:10 -0500
+From: Sukjae Cho <sjcho@east.isi.edu>
+
+The code has a long table but simple. It makes proc file of each special
+registers in SA-1110 under /proc/cpu/registers directory. And you can read
+and write to each registers using shell command such as "cat / echo". For
+example,
+
+(none):~# insmod ./registers.o
+(none):~# cd /proc/cpu/registers/
+(none):/proc/cpu/registers# ls
+ClrDCSR0  DBTA1  GFER     ICPR     MSC0   PSPR       Ser1UTCR1  SetDCSR0
+ClrDCSR1  DBTA2  GPCLKR0  LCCR0    MSC1   PSSR       Ser1UTCR2  SetDCSR1
+ClrDCSR2  DBTA3  GPCLKR1  LCCR1    MSC2   PWER       Ser1UTCR3  SetDCSR2
+ClrDCSR3  DBTA4  GPCLKR2  LCCR2    OIER   RCNR       Ser1UTDR   SetDCSR3
+ClrDCSR4  DBTA5  GPCLKR3  LCCR3    OSCR   RCSR       Ser1UTSR0  SetDCSR4
+ClrDCSR5  DBTB0  GPCR     LCSR     OSMR0  RSRR       Ser1UTSR1  SetDCSR5
+DBAR1     DBTB1  GPDR     MCCR0    OSMR1  RTAR       Ser2UTCR0  TUCR
+DBAR2     DBTB2  GPLR     MCCR1    OSMR2  RTSR       Ser2UTCR1  UDCAR
+DBSA0     DBTB3  GPSR     MCDR0    OSMR3  RTTR       Ser2UTCR2  UDCCR
+DBSA1     DBTB4  GRER     MCDR1    OSSR   RdDCSR0    Ser2UTCR3  UDCCS0
+DBSA2     DBTB5  HSCR0    MCDR2    OWER   RdDCSR1    Ser2UTCR4  UDCCS1
+DBSA3     DCAR1  HSCR1    MCSR     PCFR   RdDCSR2    Ser2UTDR   UDCCS2
+DBSA4     DCAR2  HSCR2    MDCAS00  PGSR   RdDCSR3    Ser2UTSR0  UDCD0
+DBSA5     DDAR0  HSDR     MDCAS01  PMCR   RdDCSR4    Ser2UTSR1  UDCDR
+DBSB0     DDAR1  HSSR0    MDCAS02  POSR   RdDCSR5    Ser3UTCR0  UDCIMP
+DBSB1     DDAR2  HSSR1    MDCAS20  PPAR   SMCNFG     Ser3UTCR1  UDCOMP
+DBSB2     DDAR3  ICCR     MDCAS21  PPCR   SSCR0      Ser3UTCR2  UDCSR
+DBSB3     DDAR4  ICFP     MDCAS22  PPDR   SSCR1      Ser3UTCR3  UDCWC
+DBSB4     DDAR5  ICIP     MDCNFG   PPFR   SSDR       Ser3UTDR
+DBSB5     GAFR   ICLR     MDREFR   PPSR   SSSR       Ser3UTSR0
+DBTA0     GEDR   ICMR     MECR     PSDR   Ser1UTCR0  Ser3UTSR1
+(none):/proc/cpu/registers# cat PSPR
+0x00000011
+(none):/proc/cpu/registers# echo 0x12345678 >PSPR
+(none):/proc/cpu/registers# cat PSPR
+0x12345678
+(none):/proc/cpu/registers#
+
+This module does not implement full file i/o support, and is made for just
+debugging and testing purpose. And I used this much but I didn't test it
+much.
+
+-Sukjae
+
+****************************************************************************/
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/module.h>               /* because we are a module */
+#include <linux/init.h>                 /* for the __init macros */
+#include <linux/proc_fs.h>              /* all the /proc functions */
+#include <linux/ioport.h>
+#include <asm/uaccess.h>                /* to copy to/from userspace */
+#include <asm/arch/hardware.h>
+
+#define MODULE_NAME "regmon"
+#define CPU_DIRNAME "cpu"
+#define REG_DIRNAME "registers"
+
+static ssize_t proc_read_reg(struct file * file, char * buf,
+		size_t nbytes, loff_t *ppos);
+static ssize_t proc_write_reg(struct file * file, const char * buffer,
+		size_t count, loff_t *ppos);
+
+static struct file_operations proc_reg_operations = {
+	read:	proc_read_reg,
+	write:	proc_write_reg
+};
+
+typedef struct sa1110_reg_entry {
+	u32 phyaddr;
+	char* name;
+	char* description;
+	unsigned short low_ino;
+} sa1110_reg_entry_t;
+
+static sa1110_reg_entry_t sa1110_regs[] =
+{
+/*	{ phyaddr,    name,     description } */
+	{ 0x80000000, "UDCCR", "UDC control register" },
+	{ 0x80000004, "UDCAR", "UDC address register" },
+	{ 0x80000008, "UDCOMP", "UDC OUT max packet register" },
+	{ 0x8000000C, "UDCIMP", "UDC IN max packet register" },
+	{ 0x80000010, "UDCCS0", "UDC endpoint 0 control/status register" },
+	{ 0x80000014, "UDCCS1", "UDC endpoint 1 (out) control/status register" },
+	{ 0x80000018, "UDCCS2", "UDC endpoint 2 (in) control/status register" },
+	{ 0x8000001C, "UDCD0", "UDC endpoint 0 data register" },
+	{ 0x80000020, "UDCWC", "UDC endpoint 0 write count register" },
+	{ 0x80000028, "UDCDR", "UDC transmit/receive data register (FIFOs)" },
+	{ 0x80000030, "UDCSR", "UDC status/interrupt register" },
+	{ 0x80010000, "Ser1UTCR0", "UART control register 0" },
+	{ 0x80010004, "Ser1UTCR1", "UART control register 1" },
+	{ 0x80010008, "Ser1UTCR2", "UART control register 2" },
+	{ 0x8001000C, "Ser1UTCR3", "UART control register 3" },
+	{ 0x80010014, "Ser1UTDR", "UART data register" },
+	{ 0x8001001C, "Ser1UTSR0", "UART status register 0" },
+	{ 0x80010020, "Ser1UTSR1", "UART status register 1" },
+	{ 0x80020060, "GPCLKR0", "GPCLK Control Register 0" },
+	{ 0x80020064, "GPCLKR1", "GPCLK Control Register 1" },
+	{ 0x8002006C, "GPCLKR2", "GPCLK Control Register 2" },
+	{ 0x80020070, "GPCLKR3", "GPCLK Control Register 3" },
+	{ 0x80030000, "Ser2UTCR0", "UART control register 0" },
+	{ 0x80030004, "Ser2UTCR1", "UART control register 1" },
+	{ 0x80030008, "Ser2UTCR2", "UART control register 2" },
+	{ 0x8003000C, "Ser2UTCR3", "UART control register 3" },
+	{ 0x80030010, "Ser2UTCR4", "UART control register 4" },
+	{ 0x80030014, "Ser2UTDR", "UART data register" },
+	{ 0x8003001C, "Ser2UTSR0", "UART status register 0" },
+	{ 0x80030020, "Ser2UTSR1", "UART status register 1" },
+	{ 0x80040060, "HSCR0", "HSSP control register 0" },
+	{ 0x80040064, "HSCR1", "HSSP control register 1" },
+	{ 0x8004006C, "HSDR", "HSSP data register" },
+	{ 0x80040074, "HSSR0", "HSSP status register 0" },
+	{ 0x80040078, "HSSR1", "HSSP status register 1" },
+	{ 0x80050000, "Ser3UTCR0", "UART control register 0" },
+	{ 0x80050004, "Ser3UTCR1", "UART control register 1" },
+	{ 0x80050008, "Ser3UTCR2", "UART control register 2" },
+	{ 0x8005000C, "Ser3UTCR3", "UART control register 3" },
+	{ 0x80050014, "Ser3UTDR", "UART data register" },
+	{ 0x8005001C, "Ser3UTSR0", "UART status register 0" },
+	{ 0x80050020, "Ser3UTSR1", "UART status register 1" },
+	{ 0x80060000, "MCCR0", "MCP control register 0" },
+	{ 0x80060008, "MCDR0", "MCP data register 0" },
+	{ 0x8006000C, "MCDR1", "MCP data register 1" },
+	{ 0x80060010, "MCDR2", "MCP data register 2" },
+	{ 0x80060018, "MCSR", "MCP status register" },
+	{ 0x80070060, "SSCR0", "SSP control register 0" },
+	{ 0x80070064, "SSCR1", "SSP control register 1" },
+	{ 0x8007006C, "SSDR", "SSP data register" },
+	{ 0x80070074, "SSSR", "SSP status register" },
+	{ 0x90000000, "OSMR0", "OS timer match registers 0" },
+	{ 0x90000004, "OSMR1", "OS timer match registers 1" },
+	{ 0x90000008, "OSMR2", "OS timer match registers 2" },
+	{ 0x9000000C, "OSMR3", "OS timer match registers 3" },
+	{ 0x90000010, "OSCR", "OS timer counter register" },
+	{ 0x90000014, "OSSR", "OS timer status register" },
+	{ 0x90000018, "OWER", "OS timer watchdog enable register" },
+	{ 0x9000001C, "OIER", "OS timer interrupt enable register" },
+	{ 0x90010000, "RTAR", "Real-time clock alarm register" },
+	{ 0x90010004, "RCNR", "Real-time clock count register" },
+	{ 0x90010008, "RTTR", "Real-time clock trim register" },
+	{ 0x90010010, "RTSR", "Real-time clock status register" },
+	{ 0x90020000, "PMCR", "Power manager control register" },
+	{ 0x90020004, "PSSR", "Power manager sleep status register" },
+	{ 0x90020008, "PSPR", "Power manager scratchpad register" },
+	{ 0x9002000C, "PWER", "Power manager wakeup enable register" },
+	{ 0x90020010, "PCFR", "Power manager configuration register" },
+	{ 0x90020014, "PPCR", "Power manager PLL configuration register" },
+	{ 0x90020018, "PGSR", "Power manager GPIO sleep state register" },
+	{ 0x9002001C, "POSR", "Power manager oscillator status register" },
+	{ 0x90030000, "RSRR", "Reset controller software reset register" },
+	{ 0x90030004, "RCSR", "Reset controller status register" },
+	{ 0x90030008, "TUCR", "Reserved for test" },
+	{ 0x90040000, "GPLR", "GPIO pin level register" },
+	{ 0x90040004, "GPDR", "GPIO pin direction register" },
+	{ 0x90040008, "GPSR", "GPIO pin output set register" },
+	{ 0x9004000C, "GPCR", "GPIO pin output clear register" },
+	{ 0x90040010, "GRER", "GPIO rising-edge register" },
+	{ 0x90040014, "GFER", "GPIO falling-edge register" },
+	{ 0x90040018, "GEDR", "GPIO edge detect status register" },
+	{ 0x9004001C, "GAFR", "GPIO alternate function register" },
+	{ 0x90050000, "ICIP", "Interrupt controller irq pending register" },
+	{ 0x90050004, "ICMR", "Interrupt controller mask register" },
+	{ 0x90050008, "ICLR", "Interrupt controller FIQ level register" },
+	{ 0x9005000C, "ICCR", "Interrupt controller control register" },
+	{ 0x90050010, "ICFP", "Interrupt controller FIQ pending register" },
+	{ 0x90050020, "ICPR", "Interrupt controller pending register" },
+	{ 0x90060000, "PPDR", "PPC pin direction register" },
+	{ 0x90060004, "PPSR", "PPC pin state register" },
+	{ 0x90060008, "PPAR", "PPC pin assignment register" },
+	{ 0x9006000C, "PSDR", "PPC sleep mode direction register" },
+	{ 0x90060010, "PPFR", "PPC pin flag register" },
+	{ 0x90060028, "HSCR2", "HSSP control register 2" },
+	{ 0x90060030, "MCCR1", "MCP control register 1" },
+	{ 0xA0000000, "MDCNFG", "DRAM configuration register" },
+	{ 0xA0000004, "MDCAS00", "DRAM CAS waveform rotate register 0 for DRAM bank pair 0/1" },
+	{ 0xA0000008, "MDCAS01", "DRAM CAS waveform rotate register 1 for DRAM bank pair 0/1" },
+	{ 0xA000000C, "MDCAS02", "DRAM CAS waveform rotate register 2 for DRAM bank pair 0/1" },
+	{ 0xA0000010, "MSC0", "Static memory control register 0" },
+	{ 0xA0000014, "MSC1", "Static memory control register 1" },
+	{ 0xA0000018, "MECR", "Expansion bus configuration register" },
+	{ 0xA000001C, "MDREFR", "DRAM refresh control register" },
+	{ 0xA0000020, "MDCAS20", "DRAM CAS waveform rotate register 0 for DRAM bank pair 2/3" },
+	{ 0xA0000024, "MDCAS21", "DRAM CAS waveform rotate register 1 for DRAM bank pair 2/3" },
+	{ 0xA0000028, "MDCAS22", "DRAM CAS waveform rotate register 2 for DRAM bank pair 2/3" },
+	{ 0xA000002C, "MSC2", "Static memory control register 2" },
+	{ 0xA0000030, "SMCNFG", "SMROM configuration register" },
+	{ 0xB0000000, "DDAR0", "DMA device address register" },
+	{ 0xB0000004, "SetDCSR0", "DMA control/status register 0 - write ones to set" },
+	{ 0xB0000008, "ClrDCSR0", "DMA control/status register 0 - write ones to clear" },
+	{ 0xB000000C, "RdDCSR0", "DMA control/status register 0 - read only" },
+	{ 0xB0000010, "DBSA0", "DMA buffer A start address 0" },
+	{ 0xB0000014, "DBTA0", "DMA buffer A transfer count 0" },
+	{ 0xB0000018, "DBSB0", "DMA buffer B start address 0" },
+	{ 0xB000001C, "DBTB0", "DMA buffer B transfer count 0" },
+	{ 0xB0000020, "DDAR1", "DMA device address register 1" },
+	{ 0xB0000024, "SetDCSR1", "DMA control/status register 1 - write ones to set" },
+	{ 0xB0000028, "ClrDCSR1", "DMA control/status register 1 - write ones to clear" },
+	{ 0xB000002C, "RdDCSR1", "DMA control/status register 1 - read only" },
+	{ 0xB0000030, "DBSA1", "DMA buffer A start address 1" },
+	{ 0xB0000034, "DBTA1", "DMA buffer A transfer count 1" },
+	{ 0xB0000038, "DBSB1", "DMA buffer B start address 1" },
+	{ 0xB000003C, "DBTB1", "DMA buffer B transfer count 1" },
+	{ 0xB0000040, "DDAR2", "DMA device address register 2" },
+	{ 0xB0000044, "SetDCSR2", "DMA control/status register 2 - write ones to set" },
+	{ 0xB0000048, "ClrDCSR2", "DMA control/status register 2 - write ones to clear" },
+	{ 0xB000004C, "RdDCSR2", "DMA control/status register 2 - read only" },
+	{ 0xB0000050, "DBSA2", "DMA buffer A start address 2" },
+	{ 0xB0000054, "DBTA2", "DMA buffer A transfer count 2" },
+	{ 0xB0000058, "DBSB2", "DMA buffer B start address 2" },
+	{ 0xB000005C, "DBTB2", "DMA buffer B transfer count 2" },
+	{ 0xB0000060, "DDAR3", "DMA device address register 3" },
+	{ 0xB0000064, "SetDCSR3", "DMA control/status register 3 - write ones to set" },
+	{ 0xB0000068, "ClrDCSR3", "DMA control/status register 3 - Write ones to clear" },
+	{ 0xB000006C, "RdDCSR3", "DMA control/status register 3 - Read only" },
+	{ 0xB0000070, "DBSA3", "DMA buffer A start address 3" },
+	{ 0xB0000074, "DBTA3", "DMA buffer A transfer count 3" },
+	{ 0xB0000078, "DBSB3", "DMA buffer B start address 3" },
+	{ 0xB000007C, "DBTB3", "DMA buffer B transfer count 3" },
+	{ 0xB0000080, "DDAR4", "DMA device address register 4" },
+	{ 0xB0000084, "SetDCSR4", "DMA control/status register 4 - write ones to set" },
+	{ 0xB0000088, "ClrDCSR4", "DMA control/status register 4 - write ones to clear" },
+	{ 0xB000008C, "RdDCSR4", "DMA control/status register 4 - read only" },
+	{ 0xB0000090, "DBSA4", "DMA buffer A start address 4" },
+	{ 0xB0000094, "DBTA4", "DMA buffer A transfer count 4" },
+	{ 0xB0000098, "DBSB4", "DMA buffer B start address 4" },
+	{ 0xB000009C, "DBTB4", "DMA buffer B transfer count 4" },
+	{ 0xB00000A0, "DDAR5", "DMA device address register 5" },
+	{ 0xB00000A4, "SetDCSR5", "DMA control/status register 5 - write ones to set" },
+	{ 0xB00000A8, "ClrDCSR5", "DMA control/status register 5 - write ones to clear" },
+	{ 0xB00000AC, "RdDCSR5", "DMA control/status register 5 - read only" },
+	{ 0xB00000B0, "DBSA5", "DMA buffer A start address 5" },
+	{ 0xB00000B4, "DBTA5", "DMA buffer A transfer count 5" },
+	{ 0xB00000B8, "DBSB5", "DMA buffer B start address 5" },
+	{ 0xB00000BC, "DBTB5", "DMA buffer B transfer count 5" },
+	{ 0xB0100000, "LCCR0", "LCD controller control register 0" },
+	{ 0xB0100004, "LCSR", "LCD controller status register" },
+	{ 0xB0100010, "DBAR1", "DMA channel 1 base address register" },
+	{ 0xB0100014, "DCAR1", "DMA channel 1 current address register" },
+	{ 0xB0100018, "DBAR2", "DMA channel 2 base address register" },
+	{ 0xB010001C, "DCAR2", "DMA channel 2 current address register" },
+	{ 0xB0100020, "LCCR1", "LCD controller control register 1" },
+	{ 0xB0100024, "LCCR2", "LCD controller control register 2" },
+	{ 0xB0100028, "LCCR3", "LCD controller control register 3" }
+};
+
+#define NUM_OF_SA1110_REG_ENTRY	(sizeof(sa1110_regs)/sizeof(sa1110_reg_entry_t))
+
+static int proc_read_reg(struct file * file, char * buf,
+		size_t nbytes, loff_t *ppos)
+{
+	int i_ino = (file->f_dentry->d_inode)->i_ino;
+	char outputbuf[15];
+	int count;
+	int i;
+	sa1110_reg_entry_t* current_reg=NULL;
+	if (*ppos>0) /* Assume reading completed in previous read*/
+		return 0;
+	for (i=0;i<NUM_OF_SA1110_REG_ENTRY;i++) {
+		if (sa1110_regs[i].low_ino==i_ino) {
+			current_reg = &sa1110_regs[i];
+			break;
+		}
+	}
+	if (current_reg==NULL)
+		return -EINVAL;
+
+	count = sprintf(outputbuf, "0x%08X\n",
+			*((volatile Word *) io_p2v(current_reg->phyaddr)));
+	*ppos+=count;
+	if (count>nbytes)  /* Assume output can be read at one time */
+		return -EINVAL;
+	if (copy_to_user(buf, outputbuf, count))
+		return -EFAULT;
+	return count;
+}
+
+static ssize_t proc_write_reg(struct file * file, const char * buffer,
+		size_t count, loff_t *ppos)
+{
+	int i_ino = (file->f_dentry->d_inode)->i_ino;
+	sa1110_reg_entry_t* current_reg=NULL;
+	int i;
+	unsigned long newRegValue;
+	char *endp;
+
+	for (i=0;i<NUM_OF_SA1110_REG_ENTRY;i++) {
+		if (sa1110_regs[i].low_ino==i_ino) {
+			current_reg = &sa1110_regs[i];
+			break;
+		}
+	}
+	if (current_reg==NULL)
+		return -EINVAL;
+
+	newRegValue = simple_strtoul(buffer,&endp,0);
+	*((volatile Word *) io_p2v(current_reg->phyaddr))=newRegValue;
+	return (count+endp-buffer);
+}
+
+static struct proc_dir_entry *regdir;
+static struct proc_dir_entry *cpudir;
+
+static int __init init_reg_monitor(void)
+{
+	struct proc_dir_entry *entry;
+	int i;
+
+	cpudir = proc_mkdir(CPU_DIRNAME, &proc_root);
+	if (cpudir == NULL) {
+		printk(KERN_ERR MODULE_NAME": can't create /proc/" CPU_DIRNAME "\n");
+		return(-ENOMEM);
+	}
+
+	regdir = proc_mkdir(REG_DIRNAME, cpudir);
+	if (regdir == NULL) {
+		printk(KERN_ERR MODULE_NAME": can't create /proc/" CPU_DIRNAME "/" REG_DIRNAME "\n");
+		return(-ENOMEM);
+	}
+
+	for(i=0;i<NUM_OF_SA1110_REG_ENTRY;i++) {
+		entry = create_proc_entry(sa1110_regs[i].name,
+				S_IWUSR |S_IRUSR | S_IRGRP | S_IROTH,
+				regdir);
+		if(entry) {
+			sa1110_regs[i].low_ino = entry->low_ino;
+			entry->proc_fops = &proc_reg_operations;
+		} else {
+			printk( KERN_ERR MODULE_NAME
+				": can't create /proc/" REG_DIRNAME
+				"/%s\n", sa1110_regs[i].name);
+			return(-ENOMEM);
+		}
+	}
+	return (0);
+}
+
+static void __exit cleanup_reg_monitor(void)
+{
+	int i;
+	for(i=0;i<NUM_OF_SA1110_REG_ENTRY;i++)
+		remove_proc_entry(sa1110_regs[i].name,regdir);
+	remove_proc_entry(REG_DIRNAME, cpudir);
+	remove_proc_entry(CPU_DIRNAME, &proc_root);
+}
+
+module_init(init_reg_monitor);
+module_exit(cleanup_reg_monitor);
+
+MODULE_AUTHOR("Sukjae Cho (sjcho@redwood.snu.ac.kr)");
+MODULE_DESCRIPTION("SA1110 Register monitor");
+
+EXPORT_NO_SYMBOLS;
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/sa1100_usb.h linux/arch/arm/mach-sa1100/sa1100_usb.h
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/sa1100_usb.h	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/sa1100_usb.h	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,193 @@
+/*
+ * sa1100_usb.h
+ *
+ * Public interface to the sa1100 USB core. For use by client modules
+ * like usb-eth and usb-char.
+ *
+ */
+
+#ifndef _SA1100_USB_H
+#define _SA1100_USB_H
+#include <asm/byteorder.h>
+
+typedef void (*usb_callback_t)(int flag, int size);
+
+/* in usb_ctl.c (see also descriptor methods at bottom of file) */
+
+// Open the USB client for client and initialize data structures
+// to default values, but _do not_ start UDC.
+int sa1100_usb_open( const char * client_name );
+
+// Start UDC running
+int sa1100_usb_start( void );
+
+// Immediately stop udc, fire off completion routines w/-EINTR
+int sa1100_usb_stop( void ) ;
+
+// Disconnect client from usb core
+int sa1100_usb_close( void ) ;
+
+// set notify callback for when core reaches configured state
+// return previous pointer (if any)
+typedef void (*usb_notify_t)(void);
+usb_notify_t sa1100_set_configured_callback( usb_notify_t callback );
+
+/* in usb_send.c */
+int sa1100_usb_xmitter_avail( void );
+int sa1100_usb_send(char *buf, int len, usb_callback_t callback);
+void sa1100_usb_send_reset(void);
+
+/* in usb_recev.c */
+int sa1100_usb_recv(char *buf, int len, usb_callback_t callback);
+void sa1100_usb_recv_reset(void);
+
+//////////////////////////////////////////////////////////////////////////////
+// Descriptor Management
+//////////////////////////////////////////////////////////////////////////////
+
+#define DescriptorHeader \
+	__u8 bLength;        \
+	__u8 bDescriptorType 
+
+
+// --- Device Descriptor -------------------
+
+typedef struct {
+	 DescriptorHeader;
+	 __u16 bcdUSB;		   	/* USB specification revision number in BCD */
+	 __u8  bDeviceClass;	/* USB class for entire device */
+	 __u8  bDeviceSubClass; /* USB subclass information for entire device */
+	 __u8  bDeviceProtocol; /* USB protocol information for entire device */	
+	 __u8  bMaxPacketSize0; /* Max packet size for endpoint zero */
+	 __u16 idVendor;        /* USB vendor ID */
+	 __u16 idProduct;       /* USB product ID */
+	 __u16 bcdDevice;       /* vendor assigned device release number */
+	 __u8  iManufacturer;	/* index of manufacturer string */
+	 __u8  iProduct;        /* index of string that describes product */
+	 __u8  iSerialNumber;	/* index of string containing device serial number */
+	 __u8  bNumConfigurations; /* number fo configurations */
+} __attribute__ ((packed)) device_desc_t;
+
+// --- Configuration Descriptor ------------
+
+typedef struct {
+	 DescriptorHeader;
+	 __u16 wTotalLength;	    /* total # of bytes returned in the cfg buf 4 this cfg */
+	 __u8  bNumInterfaces;      /* number of interfaces in this cfg */
+	 __u8  bConfigurationValue; /* used to uniquely ID this cfg */
+	 __u8  iConfiguration;      /* index of string describing configuration */
+	 __u8  bmAttributes;        /* bitmap of attributes for ths cfg */
+	 __u8  MaxPower;		    /* power draw in 2ma units */
+} __attribute__ ((packed)) config_desc_t;
+
+// bmAttributes:
+enum { USB_CONFIG_REMOTEWAKE=0x20, USB_CONFIG_SELFPOWERED=0x40,
+	   USB_CONFIG_BUSPOWERED=0x80 };
+// MaxPower:
+#define USB_POWER( x)  ((x)>>1) /* convert mA to descriptor units of A for MaxPower */
+
+// --- Interface Descriptor ---------------
+
+typedef struct {
+	 DescriptorHeader;
+	 __u8  bInterfaceNumber;   /* Index uniquely identfying this interface */
+	 __u8  bAlternateSetting;  /* ids an alternate setting for this interface */
+	 __u8  bNumEndpoints;      /* number of endpoints in this interface */
+	 __u8  bInterfaceClass;    /* USB class info applying to this interface */
+	 __u8  bInterfaceSubClass; /* USB subclass info applying to this interface */
+	 __u8  bInterfaceProtocol; /* USB protocol info applying to this interface */
+	 __u8  iInterface;         /* index of string describing interface */
+} __attribute__ ((packed)) intf_desc_t;
+
+// --- Endpoint  Descriptor ---------------
+
+typedef struct {
+	 DescriptorHeader;
+	 __u8  bEndpointAddress;  /* 0..3 ep num, bit 7: 0 = 0ut 1= in */
+	 __u8  bmAttributes;      /* 0..1 = 0: ctrl, 1: isoc, 2: bulk 3: intr */
+	 __u16 wMaxPacketSize;    /* data payload size for this ep in this cfg */
+	 __u8  bInterval;         /* polling interval for this ep in this cfg */
+} __attribute__ ((packed)) ep_desc_t;
+
+// bEndpointAddress:
+enum { USB_OUT= 0, USB_IN=1 };
+#define USB_EP_ADDRESS(a,d) (((a)&0xf) | ((d) << 7))
+// bmAttributes:
+enum { USB_EP_CNTRL=0, USB_EP_BULK=2, USB_EP_INT=3 };
+
+// --- String Descriptor -------------------
+
+typedef struct {
+	 DescriptorHeader;
+	 __u16 bString[1];		  /* unicode string .. actaully 'n' __u16s */
+} __attribute__ ((packed)) string_desc_t;
+
+/*=======================================================
+ * Handy helpers when working with above
+ *
+ */
+// these are x86-style 16 bit "words" ...
+#define make_word_c( w ) __constant_cpu_to_le16(w)
+#define make_word( w )   __cpu_to_le16(w)
+	 
+// descriptor types
+enum { USB_DESC_DEVICE=1, USB_DESC_CONFIG=2, USB_DESC_STRING=3,
+	   USB_DESC_INTERFACE=4, USB_DESC_ENDPOINT=5 };
+
+
+/*=======================================================
+ * Default descriptor layout for SA-1100 and SA-1110 UDC
+ */
+
+/* "config descriptor buffer" - that is, one config,
+   ..one interface and 2 endpoints */
+struct cdb {
+	 config_desc_t cfg;
+	 intf_desc_t   intf;
+	 ep_desc_t     ep1;
+	 ep_desc_t     ep2;
+} __attribute__ ((packed));
+
+
+/* all SA device descriptors */
+typedef struct {
+	 device_desc_t dev;   /* device descriptor */
+	 struct cdb b;        /* bundle of descriptors for this cfg */
+} __attribute__ ((packed)) desc_t;
+
+
+/*=======================================================
+ * Descriptor API
+ */
+
+/* Get the address of the statically allocated desc_t structure
+   in the usb core driver. Clients can modify this between
+   the time they call sa1100_usb_open() and sa1100_usb_start()
+*/
+desc_t *
+sa1100_usb_get_descriptor_ptr( void );
+
+
+/* Set a pointer to the string descriptor at "index". The driver 
+ ..has room for 8 string indicies internally. Index zero holds
+ ..a LANGID code and is set to US English by default. Inidices
+ ..1-7 are available for use in the config descriptors as client's
+ ..see fit. This pointer is assumed to be good as long as the 
+ ..SA usb core is open (so statically allocate them). Returnes -EINVAL
+ ..if index out of range */
+int sa1100_usb_set_string_descriptor( int index, string_desc_t * p );
+
+/* reverse of above */
+string_desc_t *
+sa1100_usb_get_string_descriptor( int index );
+
+/* kmalloc() a string descriptor and convert "p" to unicode in it */
+string_desc_t *
+sa1100_usb_kmalloc_string_descriptor( const char * p );
+
+
+
+
+
+
+#endif /* _SA1100_USB_H */
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/sa1111.c linux/arch/arm/mach-sa1100/sa1111.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/sa1111.c	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/mach-sa1100/sa1111.c	Sun Aug 12 16:02:29 2001
@@ -194,11 +194,15 @@
 		irq_desc[irq].unmask	= sa1111_unmask_highirq;
 	}
 
+#ifdef CONFIG_SA1100_GRAPHICSMASTER
+	setup_arm_irq (ADS_EXT_IRQ(0), &sa1111_irq);
+#else
 	/* Not every machines has the SA1111 interrupt routed to a GPIO */
 	if (gpio_nr >= 0) {
 		set_GPIO_IRQ_edge (GPIO_GPIO(gpio_nr), GPIO_RISING_EDGE);
 		setup_arm_irq (SA1100_GPIO_TO_IRQ(gpio_nr), &sa1111_irq);
 	}
+#endif
 }
 
 /* ----------------- */
@@ -208,6 +212,9 @@
 #if defined(CONFIG_SA1100_XP860) || defined(CONFIG_ASSABET_NEPONSET) || defined(CONFIG_SA1100_PFS168)
 #define PwrSensePolLow  1
 #define PwrCtrlPolLow   1
+#elif defined(CONFIG_SA1100_GRAPHICSMASTER) || defined(CONFIG_SA1100_ADSBITSY)
+#define PwrSensePolLow  1
+#define PwrCtrlPolLow   0
 #else
 #define PwrSensePolLow  0
 #define PwrCtrlPolLow   0
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/suspend.S linux/arch/arm/mach-sa1100/suspend.S
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/suspend.S	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/suspend.S	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,379 @@
+/*
+ * SA1110 Assembler Power Management Routines
+ *
+ * Copyright (c) 2001 Cliff Brake <cbrake@accelent.com>
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License.
+ *
+ * History:
+ *
+ * 2001-12-06: Cliff Brake         Initial code
+ *
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/hardware.h>
+#include <asm/arch/power.h>
+
+/* 
+ * cpu_sa1100_do_suspend()
+ * 
+ * Causes sa11x0 to enter sleep state
+ * 
+ */
+
+	.text
+
+
+	.global	sleep_param
+	.global	sleep_param_p
+
+sleep_param:	.word	0		@ virtual address of parameter array
+sleep_param_p:	.word	0		@ physical address of parameter array
+
+
+ENTRY(cpu_sa1100_do_suspend)
+	@ save registers on stack
+	stmfd	sp!, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, lr}
+
+	@ load virtual address for sleep_param array
+	ldr	r0, sleep_param
+
+	@ save cpsr
+	mrs	r1, cpsr
+	str	r1, [r0, #(SLEEP_PARAM_CPSR*4)]
+
+	@ save register for all modes 
+	@ we are currently in SVC mode
+	str	r13, [r0, #(SLEEP_PARAM_SVC_R13*4)]
+	str	r14, [r0, #(SLEEP_PARAM_SVC_R14*4)]
+	mrs	r1, spsr
+	str	r1, [r0, #(SLEEP_PARAM_SVC_SPSR*4)]
+	
+	@ usr mode
+	mrs	r3, cpsr	@ save for later
+	bic	r1, r3, #0x1F
+	orr	r1, r1, #0xDF
+	msr	cpsr, r1
+	str	r13, [r0, #(SLEEP_PARAM_USER_R13*4)]
+	str	r14, [r0, #(SLEEP_PARAM_USER_R14*4)]
+	
+	@ abort mode
+	mrs	r1, cpsr
+	bic	r1, r1, #0x1F
+	orr	r1, r1, #0xD7
+	msr	cpsr, r1
+	str	r13, [r0, #(SLEEP_PARAM_ABORT_R13*4)]
+	str	r14, [r0, #(SLEEP_PARAM_ABORT_R14*4)]
+	mrs	r1, spsr
+	str	r1, [r0, #(SLEEP_PARAM_ABORT_SPSR*4)]
+
+	@ undef mode
+	mrs	r1, cpsr
+	bic	r1, r1, #0x1F
+	orr	r1, r1, #0xDB
+	msr	cpsr, r1
+	str	r13, [r0, #(SLEEP_PARAM_UNDEF_R13*4)]
+	str	r14, [r0, #(SLEEP_PARAM_UNDEF_R14*4)]
+	mrs	r1, spsr
+	str	r1, [r0, #(SLEEP_PARAM_UNDEF_SPSR*4)]
+
+	@ irq mode
+	mrs	r1, cpsr
+	bic	r1, r1, #0x1F
+	orr	r1, r1, #0xD2
+	msr	cpsr, r1
+	str	r13, [r0, #(SLEEP_PARAM_IRQ_R13*4)]
+	str	r14, [r0, #(SLEEP_PARAM_IRQ_R14*4)]
+	mrs	r1, spsr
+	str	r1, [r0, #(SLEEP_PARAM_IRQ_SPSR*4)]
+
+	@ fiq mode
+	mrs	r1, cpsr
+	bic	r1, r1, #0x1F
+	orr	r1, r1, #0xD1
+	msr	cpsr, r1
+	str	r8, [r0, #(SLEEP_PARAM_FIQ_R8*4)]
+	str	r9, [r0, #(SLEEP_PARAM_FIQ_R9*4)]
+	str	r10, [r0, #(SLEEP_PARAM_FIQ_R10*4)]
+	str	r11, [r0, #(SLEEP_PARAM_FIQ_R11*4)]
+	str	r12, [r0, #(SLEEP_PARAM_FIQ_R12*4)]
+	str	r13, [r0, #(SLEEP_PARAM_FIQ_R13*4)]
+	str	r14, [r0, #(SLEEP_PARAM_IRQ_R14*4)]
+	mrs	r1, spsr
+	str	r1, [r0, #(SLEEP_PARAM_IRQ_SPSR*4)]
+
+	@ go back to svc mode
+	mrs	r1, cpsr
+	bic	r1, r1, #0x1F
+	orr	r1, r1, #0xD3
+	msr	cpsr, r1
+
+	@ save coprocessor registers
+	mrc 	p15, 0, r1, c1, c0, 0
+	str	r1, [r0, #(SLEEP_PARAM_CP15_R1*4)]
+	mrc 	p15, 0, r1, c2, c0, 0
+	str	r1, [r0, #(SLEEP_PARAM_CP15_R2*4)]
+	mrc 	p15, 0, r1, c3, c0, 0
+	str	r1, [r0, #(SLEEP_PARAM_CP15_R3*4)]
+	mrc 	p15, 0, r1, c5, c0, 0
+	str	r1, [r0, #(SLEEP_PARAM_CP15_R5*4)]
+	mrc 	p15, 0, r1, c6, c0, 0
+	str	r1, [r0, #(SLEEP_PARAM_CP15_R6*4)]
+	mrc 	p15, 0, r1, c13, c0, 0
+	str	r1, [r0, #(SLEEP_PARAM_CP15_R13*4)]
+
+	@ clean data cache and invalidate WB
+	bl	cpu_sa1100_cache_clean_invalidate_all
+
+	@ disable clock switching
+	mcr	p15, 0, r1, c15, c2, 2
+	
+	@ save address of sleep_param in r4
+	mov	r0, r4
+
+        @ Adjust memory timing before lowering CPU clock
+	@ Clock speed ajdustment without changing memory timing makes
+	@ CPU hang in some cases
+        ldr     r0, =MDREFR
+        ldr     r1, [r0]
+        orr     r1, r1, #MDREFR_K1DB2
+        str     r1, [r0]
+	
+	@ delay 90us and set CPU PLL to lowest speed
+	@ fixes resume problem on high speed SA1110
+	mov	r0, #90
+	bl	SYMBOL_NAME(udelay)
+	ldr	r0, =PPCR
+	mov	r1, #0
+	str	r1, [r0]
+	mov	r0, #90
+	bl	SYMBOL_NAME(udelay)
+
+
+/* setup up register contents for jump to page containing SA1110 SDRAM controller bug fix suspend code
+ *
+ * r0 points to MSC0 register
+ * r1 points to MSC1 register
+ * r2 points to MSC2 register
+ * r3 is MSC0 value
+ * r4 is MSC1 value
+ * r5 is MSC2 value
+ * r6 points to MDREFR register
+ * r7 is first MDREFR value
+ * r8 is second MDREFR value
+ * r9 is pointer to MDCNFG register
+ * r10 is MDCNFG value
+ * r11 is third MDREFR value
+ * r12 is pointer to PMCR register
+ * r13 is PMCR value (1)
+ *
+ */
+
+	ldr	r0, =MSC0
+	ldr	r1, =MSC1
+	ldr	r2, =MSC2
+
+        ldr     r3, [r0]
+        bic     r3, r3, #FMsk(MSC_RT)
+        bic     r3, r3, #FMsk(MSC_RT)<<16
+
+        ldr     r4, [r1]
+        bic     r4, r4, #FMsk(MSC_RT)
+        bic     r4, r4, #FMsk(MSC_RT)<<16
+
+        ldr     r5, [r2]
+        bic     r5, r5, #FMsk(MSC_RT)
+        bic     r5, r5, #FMsk(MSC_RT)<<16
+
+        ldr     r6, =MDREFR
+
+        ldr     r7, [r6]
+        bic     r7, r7, #0x0000FF00
+        bic     r7, r7, #0x000000F0
+        orr     r8, r7, #MDREFR_SLFRSH
+
+        ldr     r9, =MDCNFG
+        ldr     r10, [r9]
+        bic     r10, r10, #(MDCNFG_DE0+MDCNFG_DE1)
+        bic     r10, r10, #(MDCNFG_DE2+MDCNFG_DE3)  
+
+        bic     r11, r8, #MDREFR_SLFRSH
+        bic     r11, r11, #MDREFR_E1PIN
+
+        ldr     r12, =PMCR
+
+        mov     r13, #PMCR_SF
+
+	b	sa1110_sdram_controller_fix
+
+	.align 5
+sa1110_sdram_controller_fix:
+
+	@ Step 1 clear RT field of all MSCx registers
+	str 	r3, [r0]
+	str	r4, [r1]
+	str	r5, [r2]
+
+	@ Step 2 clear DRI field in MDREFR
+	str	r7, [r6]
+
+	@ Step 3 set SLFRSH bit in MDREFR
+	str	r8, [r6]
+
+	@ Step 4 clear DE bis in MDCNFG
+	str	r10, [r9]
+
+	@ Step 5 clear DRAM refresh control register
+	str	r11, [r6]
+
+	@ Wow, now the hardware suspend request pins can be used, that makes them functional for 
+	@ about 7 ns out of the	entire time that the CPU is running!
+
+	@ Step 6 set force sleep bit in PMCR
+
+	str	r13, [r12]
+	
+20:
+	b	20b			@ loop waiting for sleep
+
+/*
+ * cpu_sa1100_resume()
+ *
+ * entry point from bootloader into kernel during resume
+ * 
+ */
+
+	.align 5
+ENTRY(cpu_sa1100_resume)
+
+	@ load physical address of sleep_param into r0
+	adr	r0, sleep_param_p
+	ldr	r0, [r0]
+
+	@ restore cp15_r3, domain id
+	ldr	r1, [r0, #(SLEEP_PARAM_CP15_R3*4)]
+	mcr 	p15, 0, r1, c3, c0 ,0
+
+	@ restore cp15_r2, translation table base address
+	ldr	r1, [r0, #(SLEEP_PARAM_CP15_R2*4)]
+	mcr 	p15, 0, r1, c2, c0 ,0
+
+	mov	r1, #0
+	mcr	p15, 0, r1, c8, c7, 0   	@ flush I+D TLBs
+	mcr	p15, 0, r1, c7, c7, 0		@ flush I&D cache 
+	
+	@ get saved cp15 r1 (control register)
+	ldr	r1, [r0, #(SLEEP_PARAM_CP15_R1*4)]
+
+	@ get address to jump to after turning on MMU
+	ldr	r2, =resume_after_mmu 
+
+	cmp	r2, #0				
+
+	b	resume_turn_on_mmu
+
+	.align 5
+resume_turn_on_mmu:
+
+	@ turn on mmu
+	mcr 	p15, 0, r1, c1, c0 ,0
+
+	@ jump to resume_after_mmu	
+	mov	pc, r2
+	nop
+	nop
+
+	.align 5
+resume_after_mmu:
+	
+	@ load virtual address for sleep_param array
+	ldr	r0, sleep_param
+
+	ldr	r1, [r0, #(SLEEP_PARAM_CP15_R13*4)]
+	mcr	p15, 0, r1, c13, c0, 0
+
+	@ Restore the rest of the CPU state
+	
+	@ svc
+	ldr	r13, [r0, #(SLEEP_PARAM_SVC_R13*4)]
+	ldr	r14, [r0, #(SLEEP_PARAM_SVC_R14*4)]
+	ldr	r1, [r0, #(SLEEP_PARAM_SVC_SPSR*4)]
+	msr	spsr, r1 
+
+	@ usr
+	mrs     r1, cpsr			
+	bic     r1, r1, #0x1F		
+	orr	r1, r1, #0xDF
+	msr     cpsr, r1	
+	ldr	r13, [r0, #(SLEEP_PARAM_USER_R13*4)]
+	ldr	r14, [r0, #(SLEEP_PARAM_USER_R14*4)]
+
+	@ abort
+	mrs     r1, cpsr
+	bic     r1, r1, #0x1F
+	orr	r1, r1, #0xD7
+	msr     cpsr, r1	
+	ldr	r13, [r0, #(SLEEP_PARAM_ABORT_R13*4)]
+	ldr	r14, [r0, #(SLEEP_PARAM_ABORT_R14*4)]
+	ldr	r1, [r0, #(SLEEP_PARAM_ABORT_SPSR*4)]
+	msr	spsr, r1
+
+	@ undef
+	mrs     r1, cpsr
+	bic     r1, r1, #0x1F
+	orr	r1, r1, #0xDB
+	msr     cpsr, r1
+	ldr	r13, [r0, #(SLEEP_PARAM_UNDEF_R13*4)]
+	ldr	r14, [r0, #(SLEEP_PARAM_UNDEF_R14*4)]
+	ldr	r1, [r0, #(SLEEP_PARAM_UNDEF_SPSR*4)]
+	msr	spsr, r0
+
+	@ irq
+	mrs     r1, cpsr
+	bic     r1, r1, #0x1F
+	orr	r1, r1, #0xD2
+	msr     cpsr, r1
+	ldr	r13, [r0, #(SLEEP_PARAM_IRQ_R13*4)]
+	ldr	r14, [r0, #(SLEEP_PARAM_IRQ_R14*4)]
+	ldr	r1, [r0, #(SLEEP_PARAM_IRQ_SPSR*4)]
+	msr	spsr, r1
+
+	@ fiq
+	mrs     r1, cpsr
+	bic     r1, r1, #0x1F
+	orr	r1, r1, #0xD1
+	msr     cpsr, r1
+	ldr	r8, [r0, #(SLEEP_PARAM_FIQ_R8*4)]
+	ldr	r9, [r0, #(SLEEP_PARAM_FIQ_R9*4)]
+	ldr	r10, [r0, #(SLEEP_PARAM_FIQ_R10*4)]
+	ldr	r11, [r0, #(SLEEP_PARAM_FIQ_R11*4)]
+	ldr	r12, [r0, #(SLEEP_PARAM_FIQ_R12*4)]
+	ldr	r13, [r0, #(SLEEP_PARAM_FIQ_R13*4)]
+	ldr	r14, [r0, #(SLEEP_PARAM_FIQ_R14*4)]
+	ldr	r1, [r0, #(SLEEP_PARAM_FIQ_SPSR*4)]
+	msr	spsr, r1
+
+	@ switch to svc mode
+	mrs     r1, cpsr
+	bic     r1, r1, #0x1F
+	orr	r1, r1, #0xD3
+	msr     cpsr, r1
+
+	@ Restore rest of Coprocessor state
+	ldr	r1, [r0, #(SLEEP_PARAM_CP15_R5*4)]
+	mcr 	p15, 0, r1, c5, c0 ,0
+	
+	ldr	r1, [r0, #(SLEEP_PARAM_CP15_R6*4)]
+	mcr 	p15, 0, r1, c6, c0 ,0
+
+	@ restore cpsr
+	ldr	r1, [r0, #(SLEEP_PARAM_CPSR*4)]
+	msr	cpsr, r1
+
+	@ return to caller
+	ldmfd	sp!, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, pc}
+
+
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb-char.c linux/arch/arm/mach-sa1100/usb-char.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb-char.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/usb-char.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,723 @@
+/*
+ * (C) Copyright 2000-2001 Extenex Corporation
+ *
+ *	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.
+ * 
+ *  usb-char.c 
+ *  
+ *  Miscellaneous character device interface for SA1100 USB function
+ *	driver.
+ *
+ *  Background:
+ *  The SA1100 function driver ported from the Compaq Itsy project 
+ *  has an interface, usb-eth.c, to feed network packets over the
+ *  usb wire and into the Linux TCP/IP stack. 
+ *
+ *  This file replaces that one with a simple character device 
+ *  interface that allows unstructured "byte pipe" style reads and
+ *  writes over the USB bulk endpoints by userspace programs.
+ *
+ *  A new define, CONFIG_SA1100_USB_NETLINK, has been created that,
+ *  when set, (the default) causes the ethernet interface to be used.
+ *  When not set, this more pedestrian character interface is linked
+ *  in instead.
+ *
+ *  Please see linux/Documentation/arm/SA1100/SA1100_USB for details.
+ *
+ *  ward.willats@extenex.com
+ *
+ *  To do:
+ *  - Can't dma into ring buffer directly with pci_map/unmap usb_recv
+ *    uses and get bytes out at the same time DMA is going on. Investigate:
+ *    a) changing usb_recv to use alloc_consistent() at client request; or
+ *    b) non-ring-buffer based data structures. In the meantime, I am using
+ *    a bounce buffer. Simple, but wasteful.
+ */
+
+#include <linux/module.h>
+#include <linux/config.h>
+#include <linux/miscdevice.h>
+#include <linux/malloc.h>
+#include <linux/init.h>
+#include <linux/cache.h>
+#include <linux/poll.h>
+#include <linux/circ_buf.h>
+#include <linux/timer.h>
+
+#include <asm/io.h>
+#include <asm/semaphore.h>
+#include <asm/proc/page.h>
+#include <asm/mach-types.h>
+
+#include "usb-char.h"
+#include "sa1100_usb.h"
+
+
+
+//////////////////////////////////////////////////////////////////////////////
+// Driver  Options
+//////////////////////////////////////////////////////////////////////////////
+
+#define VERSION 	"0.4"
+
+
+#define VERBOSITY 1
+
+#if VERBOSITY
+# define	PRINTK(x, a...)	printk (x, ## a)
+#else
+# define	PRINTK(x, a...)	/**/
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+// Globals - Macros - Enums - Structures
+//////////////////////////////////////////////////////////////////////////////
+#ifndef MIN
+#define MIN( a, b ) ((a)<(b)?(a):(b))
+#endif
+
+typedef int bool; enum { false = 0, true = 1 };
+
+static const char pszMe[] = "usbchr: ";
+
+static wait_queue_head_t wq_read;
+static wait_queue_head_t wq_write;
+static wait_queue_head_t wq_poll;
+
+/* Serialze multiple writers onto the transmit hardware
+.. since we sleep the writer during transmit to stay in
+.. sync. (Multiple writers don't make much sense, but..) */
+static DECLARE_MUTEX( xmit_sem );
+
+// size of usb DATA0/1 packets. 64 is standard maximum
+// for bulk transport, though most hosts seem to be able
+// to handle larger.
+#define TX_PACKET_SIZE 64
+#define RX_PACKET_SIZE 64
+#define RBUF_SIZE  (4*PAGE_SIZE)
+
+static struct wcirc_buf {
+  char *buf;
+  int in;
+  int out;
+} rx_ring = { NULL, 0, 0 };
+
+static struct {
+	 unsigned long  cnt_rx_complete;
+	 unsigned long  cnt_rx_errors;
+	 unsigned long  bytes_rx;
+	 unsigned long  cnt_tx_timeouts;
+	 unsigned long  cnt_tx_errors;
+	 unsigned long  bytes_tx;
+} charstats;
+
+
+static char * tx_buf = NULL;
+static char * packet_buffer = NULL;
+static int sending = 0;
+static int usb_ref_count = 0;
+static int last_tx_result = 0;
+static int last_rx_result = 0;
+static int last_tx_size = 0;
+static struct timer_list tx_timer;
+
+//////////////////////////////////////////////////////////////////////////////
+// Prototypes
+//////////////////////////////////////////////////////////////////////////////
+static char * 	what_the_f( int e );
+static void 	free_txrx_buffers( void );
+static void     twiddle_descriptors( void );
+static void     free_string_descriptors( void ) ;
+static int      usbc_open( struct inode *pInode, struct file *pFile );
+static void     rx_done_callback_packet_buffer( int flag, int size );
+
+static void     tx_timeout( unsigned long );
+static void     tx_done_callback( int flag, int size );
+
+static ssize_t  usbc_read( struct file *, char *, size_t, loff_t * );
+static ssize_t  usbc_write( struct file *, const char *, size_t, loff_t * );
+static unsigned int usbc_poll( struct file *pFile, poll_table * pWait );
+static int usbc_ioctl( struct inode *pInode, struct file *pFile,
+                       unsigned int nCmd, unsigned long argument );
+static int      usbc_close( struct inode *pInode, struct file *pFile );
+
+#ifdef CONFIG_SA1100_EXTENEX1
+static void     extenex_configured_notify_proc( void );
+#endif
+//////////////////////////////////////////////////////////////////////////////
+// Private Helpers
+//////////////////////////////////////////////////////////////////////////////
+
+static char * what_the_f( int e )
+{
+	 char * p;
+	 switch( e ) {
+	 case 0:
+		  p = "noErr";
+		  break;
+	 case -ENODEV:
+		  p = "ENODEV - usb not in config state";
+		  break;
+	 case -EBUSY:
+		  p = "EBUSY - another request on the hardware";
+		  break;
+	 case -EAGAIN:
+		  p = "EAGAIN";
+		  break;
+	 case -EINTR:
+		  p = "EINTR - interrupted\n";
+		  break;
+	 case -EPIPE:
+		  p = "EPIPE - zero length xfer\n";
+		  break;
+	 default:
+		  p = "????";
+		  break;
+	 }
+	 return p;
+}
+
+static void free_txrx_buffers( void )
+{
+	 if ( rx_ring.buf != NULL ) {
+		  kfree( rx_ring.buf );
+		  rx_ring.buf = NULL;
+	 }
+	 if ( packet_buffer != NULL ) {
+		  kfree( packet_buffer );
+		  packet_buffer = NULL;
+	 }
+	 if ( tx_buf != NULL ) {
+		  kfree( tx_buf );
+		  tx_buf = NULL;
+	 }
+}
+
+/* twiddle_descriptors()
+ * It is between open() and start(). Setup descriptors.
+ */
+static void twiddle_descriptors( void )
+{
+	 desc_t * pDesc = sa1100_usb_get_descriptor_ptr();
+	 string_desc_t * pString;
+
+	 pDesc->b.ep1.wMaxPacketSize = make_word_c( RX_PACKET_SIZE );
+	 pDesc->b.ep1.bmAttributes   = USB_EP_BULK;
+	 pDesc->b.ep2.wMaxPacketSize = make_word_c( TX_PACKET_SIZE );
+	 pDesc->b.ep2.bmAttributes   = USB_EP_BULK;
+
+	 if ( machine_is_extenex1() ) {
+#ifdef CONFIG_SA1100_EXTENEX1
+		  pDesc->dev.idVendor = make_word_c( 0xC9F );
+		  pDesc->dev.idProduct = 1;
+		  pDesc->dev.bcdDevice = make_word_c( 0x0001 );
+		  pDesc->b.cfg.bmAttributes = USB_CONFIG_SELFPOWERED;
+		  pDesc->b.cfg.MaxPower = 0;
+
+		  pString = sa1100_usb_kmalloc_string_descriptor( "Extenex" );
+		  if ( pString ) {
+			   sa1100_usb_set_string_descriptor( 1, pString );
+			   pDesc->dev.iManufacturer = 1;
+		  }
+
+		  pString = sa1100_usb_kmalloc_string_descriptor( "Handheld Theater" );
+		  if ( pString ) {
+			   sa1100_usb_set_string_descriptor( 2, pString );
+			   pDesc->dev.iProduct = 2;
+		  }
+
+		  pString = sa1100_usb_kmalloc_string_descriptor( "00000000" );
+		  if ( pString ) {
+			   sa1100_usb_set_string_descriptor( 3, pString );
+			   pDesc->dev.iSerialNumber = 3;
+		  }
+
+		  pString = sa1100_usb_kmalloc_string_descriptor( "HHT Bulk Transfer" );
+		  if ( pString ) {
+			   sa1100_usb_set_string_descriptor( 4, pString );
+			   pDesc->b.intf.iInterface = 4;
+		  }
+		  sa1100_set_configured_callback( extenex_configured_notify_proc );
+#endif
+	 }
+}
+
+static void free_string_descriptors( void ) 
+{
+	 if ( machine_is_extenex1() ) {
+		  string_desc_t * pString;
+		  int i;
+		  for( i = 1 ; i <= 4 ; i++ ) {
+			   pString = sa1100_usb_get_string_descriptor( i );
+			   if ( pString )
+					kfree( pString );
+		  }
+	 }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// ASYNCHRONOUS
+//////////////////////////////////////////////////////////////////////////////
+static  void kick_start_rx( void )
+{
+	 if ( usb_ref_count ) {
+		  int total_space  = CIRC_SPACE( rx_ring.in, rx_ring.out, RBUF_SIZE );
+		  if ( total_space >= RX_PACKET_SIZE ) {
+			   sa1100_usb_recv( packet_buffer,
+								RX_PACKET_SIZE,
+								rx_done_callback_packet_buffer
+						      );
+		  }
+	 }
+}
+/* 
+ * rx_done_callback_packet_buffer()
+ * We have completed a DMA xfer into the temp packet buffer.
+ * Move to ring.
+ *
+ * flag values:
+ * on init,  -EAGAIN
+ * on reset, -EINTR
+ * on RPE, -EIO
+ * on short packet -EPIPE
+ */
+static void
+rx_done_callback_packet_buffer( int flag, int size )
+{
+	 charstats.cnt_rx_complete++;
+
+	 if ( flag == 0 || flag == -EPIPE ) {
+		  size_t n;
+
+		  charstats.bytes_rx += size;
+
+		  n = CIRC_SPACE_TO_END( rx_ring.in, rx_ring.out, RBUF_SIZE );
+		  n = MIN( n, size );
+		  size -= n;
+
+		  memcpy( &rx_ring.buf[ rx_ring.in ], packet_buffer, n );
+		  rx_ring.in = (rx_ring.in + n) & (RBUF_SIZE-1);  
+		  memcpy( &rx_ring.buf[ rx_ring.in ], packet_buffer + n, size );
+		  rx_ring.in = (rx_ring.in + size) & (RBUF_SIZE-1);  
+
+		  wake_up_interruptible( &wq_read );
+		  wake_up_interruptible( &wq_poll );
+
+		  last_rx_result = 0;
+
+		  kick_start_rx();
+
+	 } else if ( flag != -EAGAIN ) {
+		  charstats.cnt_rx_errors++;
+		  last_rx_result = flag;
+		  wake_up_interruptible( &wq_read );
+		  wake_up_interruptible( &wq_poll );
+	 }
+	 else  /* init, start a read */
+		  kick_start_rx();
+}
+
+
+static void tx_timeout( unsigned long unused )
+{
+	printk( "%stx timeout\n", pszMe );
+	sa1100_usb_send_reset();
+	charstats.cnt_tx_timeouts++;
+}
+
+
+// on init, -EAGAIN
+// on reset, -EINTR
+// on TPE, -EIO
+static void tx_done_callback( int flags, int size )
+{
+	 if ( flags == 0 )
+		  charstats.bytes_tx += size;
+	 else
+		  charstats.cnt_tx_errors++;
+	 last_tx_size = size;
+	 last_tx_result = flags;
+	 sending = 0;
+	 wake_up_interruptible( &wq_write );
+	 wake_up_interruptible( &wq_poll );
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+// Workers
+//////////////////////////////////////////////////////////////////////////////
+
+static int usbc_open( struct inode *pInode, struct file *pFile )
+{
+	 int retval = 0;
+
+	 PRINTK( KERN_DEBUG "%sopen()\n", pszMe );
+
+	 /* start usb core */
+	 retval = sa1100_usb_open( "usb-char" );
+	 if ( retval ) return retval;
+
+	 /* allocate memory */
+	 if ( usb_ref_count == 0 ) {
+		  tx_buf = (char*) kmalloc( TX_PACKET_SIZE, GFP_KERNEL | GFP_DMA );
+		  if ( tx_buf == NULL ) {
+			   printk( "%sARGHH! COULD NOT ALLOCATE TX BUFFER\n", pszMe );
+			   goto malloc_fail;
+		  }
+		  rx_ring.buf = 
+			(char*) kmalloc( RBUF_SIZE, GFP_KERNEL );
+
+		  if ( rx_ring.buf == NULL ) {
+			   printk( "%sARGHH! COULD NOT ALLOCATE RX BUFFER\n", pszMe );
+			   goto malloc_fail;
+		  }
+
+		  packet_buffer = 
+			(char*) kmalloc( RX_PACKET_SIZE, GFP_KERNEL | GFP_DMA  );
+
+		  if ( packet_buffer == NULL ) {
+			   printk( "%sARGHH! COULD NOT ALLOCATE RX PACKET BUFFER\n", pszMe );
+			   goto malloc_fail;
+		  }
+		  rx_ring.in = rx_ring.out = 0;
+		  memset( &charstats, 0, sizeof( charstats ) );
+		  sending = 0;
+		  last_tx_result = 0;
+		  last_tx_size = 0;
+	 }
+	 
+	 /* modify default descriptors */
+	 twiddle_descriptors();
+
+	 retval = sa1100_usb_start();
+	 if ( retval ) {
+		  printk( "%sAGHH! Could not USB core\n", pszMe );
+		  free_txrx_buffers();
+		  return retval;
+	 }
+	 usb_ref_count++;   /* must do _before_ kick_start() */
+	 MOD_INC_USE_COUNT;
+	 kick_start_rx();
+	 return 0;
+
+ malloc_fail:
+	 free_txrx_buffers();
+	 return -ENOMEM;
+}
+
+/*
+ * Read endpoint. Note that you can issue a read to an 
+ * unconfigured endpoint. Eventually, the host may come along
+ * and configure underneath this module and data will appear.
+ */
+static ssize_t usbc_read( struct file *pFile, char *pUserBuffer,
+                        size_t stCount, loff_t *pPos )
+{
+	 ssize_t retval;
+	 int flags;
+	 DECLARE_WAITQUEUE( wait, current );
+
+	 PRINTK( KERN_DEBUG "%sread()\n", pszMe );
+
+	 local_irq_save( flags );
+	 if ( last_rx_result == 0 ) {
+		  local_irq_restore( flags );
+	 } else {  /* an error happended and receiver is paused */
+		  local_irq_restore( flags );
+		  last_rx_result = 0;
+		  kick_start_rx();
+	 }
+
+	 add_wait_queue( &wq_read, &wait );
+	 while( 1 ) {
+		  ssize_t bytes_avail;
+		  ssize_t bytes_to_end;
+
+		  set_current_state( TASK_INTERRUPTIBLE );
+
+		  /* snap ring buf state */
+		  local_irq_save( flags );
+		  bytes_avail  = CIRC_CNT( rx_ring.in, rx_ring.out, RBUF_SIZE );
+		  bytes_to_end = CIRC_CNT_TO_END( rx_ring.in, rx_ring.out, RBUF_SIZE );
+		  local_irq_restore( flags );
+
+		  if ( bytes_avail != 0 ) {
+			   ssize_t bytes_to_move = MIN( stCount, bytes_avail );
+			   retval = 0;		// will be bytes transfered
+			   if ( bytes_to_move != 0 ) {
+					size_t n = MIN( bytes_to_end, bytes_to_move );
+					if ( copy_to_user( pUserBuffer,
+									   &rx_ring.buf[ rx_ring.out ],
+									   n ) ) {
+						 retval = -EFAULT;
+						 break;
+					}
+					bytes_to_move -= n;
+ 					retval += n;
+					// might go 1 char off end, so wrap
+					rx_ring.out = ( rx_ring.out + n ) & (RBUF_SIZE-1);
+					if ( copy_to_user( pUserBuffer + n,
+									   &rx_ring.buf[ rx_ring.out ],
+									   bytes_to_move )
+						 ) {
+						 retval = -EFAULT;
+						 break;
+					}
+					rx_ring.out += bytes_to_move;		// cannot wrap
+					retval += bytes_to_move;
+					kick_start_rx();
+			   }
+			   break;
+		  }
+		  else if ( last_rx_result ) {
+			   retval = last_rx_result;
+			   break;
+		  }
+		  else if ( pFile->f_flags & O_NONBLOCK ) {  // no data, can't sleep
+			   retval = -EAGAIN;
+			   break;
+		  }
+		  else if ( signal_pending( current ) ) {   // no data, can sleep, but signal
+			   retval = -ERESTARTSYS;
+			   break;
+		  }
+		  schedule();					   			// no data, can sleep
+	 }			
+	 set_current_state( TASK_RUNNING );
+	 remove_wait_queue( &wq_read, &wait );
+
+	 if ( retval < 0 )
+		  printk( "%sread error %d - %s\n", pszMe, retval, what_the_f( retval ) ); 
+	 return retval;
+}
+
+/*
+ * Write endpoint. This routine attempts to break the passed in buffer
+ * into usb DATA0/1 packet size chunks and send them to the host. 
+ * (The lower-level driver tries to do this too, but easier for us
+ * to manage things here.) 
+ *
+ * We are at the mercy of the host here, in that it must send an IN 
+ * token to us to pull this data back, so hopefully some higher level
+ * protocol is expecting traffic to flow in that direction so the host
+ * is actually polling us. To guard against hangs, a 5 second timeout
+ * is used.
+ *
+ * This routine takes some care to only report bytes sent that have
+ * actually made it across the wire. Thus we try to stay in lockstep
+ * with the completion routine and only have one packet on the xmit
+ * hardware at a time. Multiple simultaneous writers will get 
+ * "undefined" results.
+ *
+  */
+static ssize_t  usbc_write( struct file *pFile, const char * pUserBuffer,
+							 size_t stCount, loff_t *pPos )
+{
+	 ssize_t retval = 0;
+	 ssize_t stSent = 0;
+
+	 DECLARE_WAITQUEUE( wait, current );
+
+	 PRINTK( KERN_DEBUG "%swrite() %d bytes\n", pszMe, stCount );
+
+	 down( &xmit_sem );  // only one thread onto the hardware at a time
+
+	 while( stCount != 0 && retval == 0 ) {
+		  int nThisTime  = MIN( TX_PACKET_SIZE, stCount );
+		  copy_from_user( tx_buf, pUserBuffer, nThisTime );
+		  sending = nThisTime;
+ 		  retval = sa1100_usb_send( tx_buf, nThisTime, tx_done_callback );
+		  if ( retval < 0 ) {
+			   char * p = what_the_f( retval );
+			   printk( "%sCould not queue xmission. rc=%d - %s\n", 
+					   pszMe, retval, p );
+			   sending = 0;
+			   break;
+		  }
+		  /* now have something on the diving board */
+		  add_wait_queue( &wq_write, &wait );
+		  tx_timer.expires = jiffies + ( HZ * 5 );
+		  add_timer( &tx_timer );
+		  while( 1 ) {
+			   set_current_state( TASK_INTERRUPTIBLE );
+			   if ( sending == 0 ) {  /* it jumped into the pool */
+					del_timer( &tx_timer );
+					retval = last_tx_result;
+					if ( retval == 0 ) {
+						 stSent		 += last_tx_size;
+						 pUserBuffer += last_tx_size;
+						 stCount     -= last_tx_size;
+					}
+					else
+						 printk( "%sxmission error rc=%d - %s\n", 
+								 pszMe, retval, what_the_f(retval) );
+					break;
+			   }
+			   else if ( signal_pending( current ) ) {
+					del_timer( &tx_timer );
+					printk( "%ssignal\n", pszMe  );
+					retval = -ERESTARTSYS;
+					break;
+			   }
+			   schedule();
+		  }
+		  set_current_state( TASK_RUNNING );
+		  remove_wait_queue( &wq_write, &wait );
+	 }
+
+	 up( &xmit_sem );
+
+	 if ( 0 == retval )
+		  retval = stSent;
+	 return retval;
+}
+
+static unsigned int usbc_poll( struct file *pFile, poll_table * pWait )
+{
+	 unsigned int retval = 0;
+
+	 PRINTK( KERN_DEBUG "%poll()\n", pszMe );
+
+	 poll_wait( pFile, &wq_poll, pWait );
+
+	 if ( CIRC_CNT( rx_ring.in, rx_ring.out, RBUF_SIZE ) )
+		  retval |= POLLIN | POLLRDNORM;
+	 if ( sa1100_usb_xmitter_avail() )
+		  retval |= POLLOUT | POLLWRNORM;
+	 return retval;
+}
+
+static int usbc_ioctl( struct inode *pInode, struct file *pFile,
+                       unsigned int nCmd, unsigned long argument )
+{
+	 int retval = 0;
+
+	 switch( nCmd ) {
+
+	 case USBC_IOC_FLUSH_RECEIVER:
+		  sa1100_usb_recv_reset();	   	
+		  rx_ring.in = rx_ring.out = 0; 
+		  break;
+
+	 case USBC_IOC_FLUSH_TRANSMITTER:
+		  sa1100_usb_send_reset();
+		  break;
+
+	 case USBC_IOC_FLUSH_ALL:
+		  sa1100_usb_recv_reset();	   	
+		  rx_ring.in = rx_ring.out = 0; 
+		  sa1100_usb_send_reset();
+		  break;
+
+	 default:
+		  retval = -ENOIOCTLCMD;
+		  break;
+
+	 }
+	 return retval;
+}
+
+
+static int usbc_close( struct inode *pInode, struct file * pFile )
+{
+	PRINTK( KERN_DEBUG "%sclose()\n", pszMe );
+	if ( --usb_ref_count == 0 ) {
+		 down( &xmit_sem );
+		 sa1100_usb_stop();
+		 free_txrx_buffers();
+		 free_string_descriptors();
+		 del_timer( &tx_timer );
+		 sa1100_usb_close();
+		 up( &xmit_sem );
+	}
+    MOD_DEC_USE_COUNT;  
+    return 0;
+}
+
+#ifdef CONFIG_SA1100_EXTENEX1
+#include "../../../drivers/char/ex_gpio.h"
+void extenex_configured_notify_proc( void ) 
+{
+	 if ( exgpio_play_string( "440,1:698,1" ) == -EAGAIN )
+		  printk( "%sWanted to BEEP but ex_gpio not open\n", pszMe );
+}
+#endif
+//////////////////////////////////////////////////////////////////////////////
+// Initialization
+//////////////////////////////////////////////////////////////////////////////
+
+static struct file_operations usbc_fops = {
+		owner:      THIS_MODULE,
+		open:		usbc_open,
+		read:		usbc_read,
+		write:		usbc_write,
+		poll:		usbc_poll,
+		ioctl:		usbc_ioctl,
+		release:	usbc_close,
+};
+
+static struct miscdevice usbc_misc_device = {
+    USBC_MINOR, "usb_char", &usbc_fops
+};
+
+/*
+ * usbc_init()
+ */
+
+int __init usbc_init( void )
+{
+	 int rc;
+
+#if !defined( CONFIG_ARCH_SA1100 )
+	 return -ENODEV;
+#endif
+
+	 if ( (rc = misc_register( &usbc_misc_device )) != 0 ) {
+		  printk( KERN_WARNING "%sCould not register device 10, "
+				  "%d. (%d)\n", pszMe, USBC_MINOR, rc );
+		  return -EBUSY;
+	 }
+
+	 // initialize wait queues
+	 init_waitqueue_head( &wq_read );
+	 init_waitqueue_head( &wq_write );
+	 init_waitqueue_head( &wq_poll );
+
+	 // initialize tx timeout timer
+	 init_timer( &tx_timer );
+	 tx_timer.function = tx_timeout;
+
+	  printk( KERN_INFO "USB Function Character Driver Interface"
+				  " - %s, (C) 2001, Extenex Corp.\n", VERSION 
+		   );
+        
+	 return rc;
+}
+
+void __exit usbc_exit( void )
+{
+}
+
+EXPORT_NO_SYMBOLS;
+
+module_init(usbc_init);
+module_exit(usbc_exit);
+
+
+
+// end: usb-char.c
+
+
+
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb-char.h linux/arch/arm/mach-sa1100/usb-char.h
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb-char.h	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/usb-char.h	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2001 Extenex Corporation
+ *
+ * usb-char.h 
+ *
+ * Character device emulation client for SA-1100 client usb core.
+ *
+ *
+ *
+ */
+#ifndef _USB_CHAR_H
+#define _USB_CHAR_H
+
+#define USBC_MAJOR 10      /* miscellaneous character device */
+#define USBC_MINOR 240     /* in the "reserved for local use" range */
+
+#define USBC_MAGIC 0x8E
+
+/* zap everything in receive ring buffer */
+#define USBC_IOC_FLUSH_RECEIVER    _IO( USBC_MAGIC, 0x01 )
+
+/* reset transmitter */
+#define USBC_IOC_FLUSH_TRANSMITTER _IO( USBC_MAGIC, 0x02 )
+
+/* do both of above */
+#define USBC_IOC_FLUSH_ALL         _IO( USBC_MAGIC, 0x03 )
+
+
+
+
+
+
+#endif /* _USB_CHAR_H */
+
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb-eth.c linux/arch/arm/mach-sa1100/usb-eth.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb-eth.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/usb-eth.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,447 @@
+ /*
+ * Ethernet driver for the SA1100 USB client function
+ * Copyright (c) 2001 by Nicolas Pitre
+ *
+ * This code was loosely inspired by the original initial ethernet test driver
+ * Copyright (c) Compaq Computer Corporation, 1999
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This is still work in progress...
+ * 
+ * 19/02/2001 - Now we are compatible with generic usbnet driver. green@iXcelerator.com
+ * 09/03/2001 - Dropped 'framing' scheme, as it seems to cause a lot of problems with little benefit.
+ *		Now, since we do not know what size of packet we are receiving
+ *		last usb packet in sequence will always be less than max packet
+ *		receive endpoint can accept.
+ *		Now the only way to check correct start of frame is to compare
+ *		MAC address. Also now we are stalling on each receive error.
+ *
+ * 15/03/2001 - Using buffer to get data from UDC. DMA needs to have 8 byte
+ *		aligned buffer, but this breaks IP code (unaligned access).
+ *
+ * 01/04/2001 - stall endpoint operations appeared to be very unstable, so
+ *              they are disabled now.
+ *
+ * 03/06/2001 - Readded "zerocopy" receive path (tunable).
+ *
+ */
+
+// Define DMA_NO_COPY if you want data to arrive directly into the
+// receive network buffers, instead of arriving into bounce buffer
+// and then get copied to network buffer.
+// This does not work correctly right now.
+#undef DMA_NO_COPY
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/timer.h>
+
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <linux/random.h>
+
+#include "sa1100_usb.h"
+
+
+#define ETHERNET_VENDOR_ID 0x49f
+#define ETHERNET_PRODUCT_ID 0x505A
+#define MAX_PACKET 32768
+#define MIN(a, b) (((a) < (b)) ? (a) : (b))
+
+// Should be global, so that insmod can change these
+int usb_rsize=64;
+int usb_wsize=64;
+
+static struct usbe_info_t {
+  struct net_device *dev;
+  u16 packet_id;
+  struct net_device_stats stats;
+} usbe_info;
+
+static char usb_eth_name[16] = "usbf";
+static struct net_device usb_eth_device;
+static struct sk_buff *cur_tx_skb, *next_tx_skb;
+static struct sk_buff *cur_rx_skb, *next_rx_skb;
+static volatile int terminating;
+#ifndef DMA_NO_COPY
+static char *dmabuf; // we need that, as dma expect it's buffers to be aligned on 8 bytes boundary
+#endif
+
+static int usb_change_mtu (struct net_device *net, int new_mtu)
+{
+	if (new_mtu <= sizeof (struct ethhdr) || new_mtu > MAX_PACKET)
+		return -EINVAL;
+	// no second zero-length packet read wanted after mtu-sized packets
+	if (((new_mtu + sizeof (struct ethhdr)) % usb_rsize) == 0)
+		return -EDOM;
+
+	net->mtu = new_mtu;
+	return 0;
+}
+
+static struct sk_buff * 
+usb_new_recv_skb(void)
+{
+	struct sk_buff *skb = alloc_skb( 2 + sizeof (struct ethhdr) + usb_eth_device.mtu,GFP_ATOMIC);
+
+	if (skb) {
+		skb_reserve(skb, 2);
+	}
+	return skb;
+}
+
+static u8 bcast_hwaddr[ETH_ALEN]={0xff,0xff,0xff,0xff,0xff,0xff};
+static void 
+usb_recv_callback(int flag, int size)
+{
+	struct sk_buff *skb;
+	
+	if (terminating) 
+		return;
+	
+	skb = cur_rx_skb;
+
+	/* flag validation */
+	if (flag == 0) {
+		if ( skb_tailroom (skb) < size ) { // hey! we are overloaded!!!
+			usbe_info.stats.rx_over_errors++;
+			goto error;
+		}
+#ifndef DMA_NO_COPY
+		memcpy(skb->tail,dmabuf,size);
+#endif
+		skb_put(skb, size);
+	} else { 
+		if (flag == -EIO) {
+			usbe_info.stats.rx_errors++;
+		}
+		goto error;
+	}
+
+	/* validate packet length */
+	if (size == usb_rsize ) {
+		/* packet not complete yet */
+		skb = NULL;
+	}
+	
+	/* 
+	 * At this point skb is non null if we have a complete packet.
+	 * If so take a fresh skb right away and restart USB receive without
+	 * further delays, then process the packet.  Otherwise resume USB
+	 * receive on the current skb and exit.
+	 */
+
+	if (skb)
+		cur_rx_skb = next_rx_skb;
+#ifndef DMA_NO_COPY
+	sa1100_usb_recv(dmabuf, usb_rsize, 
+			usb_recv_callback);
+#else
+	sa1100_usb_recv(cur_rx_skb->tail, MIN(usb_rsize, skb_tailroom (cur_rx_skb)),
+			usb_recv_callback);
+#endif
+	if (!skb)
+		return;
+
+	next_rx_skb = usb_new_recv_skb();
+	if (!next_rx_skb) {
+		/*
+		 * We can't aford loosing buffer space...  
+		 * So we drop the current packet and recycle its skb.
+		 */
+		printk("%s: can't allocate new skb\n", __FUNCTION__);
+		usbe_info.stats.rx_dropped++;
+		skb_trim(skb, 0);
+		next_rx_skb = skb;
+		return;
+	}
+	if ( skb->len >= sizeof(struct ethhdr)) {
+		if (memcmp(skb->data,usb_eth_device.dev_addr,ETH_ALEN) && memcmp(skb->data,bcast_hwaddr,ETH_ALEN) ) {
+			// This frame is not for us. nor it is broadcast
+			usbe_info.stats.rx_frame_errors++;
+			kfree_skb(skb);
+			goto error;
+		}
+	}
+
+	if (skb->len) {
+		int     status;
+// FIXME: eth_copy_and_csum "small" packets to new SKB (small < ~200 bytes) ?
+
+		skb->dev = &usb_eth_device;
+		skb->protocol = eth_type_trans (skb, &usb_eth_device);
+		usbe_info.stats.rx_packets++;
+		usbe_info.stats.rx_bytes += skb->len;
+		skb->ip_summed = CHECKSUM_NONE;
+		status = netif_rx (skb);
+		if (status != NET_RX_SUCCESS)
+			printk("netif_rx failed with code %d\n",status);
+	} else {
+error:
+		/* 
+		 * Error due to HW addr mismatch, or IO error.
+		 * Recycle the current skb and reset USB reception.
+		 */
+		skb_trim(cur_rx_skb, 0);
+//		if ( flag == -EINTR || flag == -EAGAIN ) // only if we are coming out of stall
+#ifndef DMA_NO_COPY
+			sa1100_usb_recv(dmabuf, usb_rsize, usb_recv_callback);
+#else
+			sa1100_usb_recv(cur_rx_skb->tail, MIN(usb_rsize, skb_tailroom (cur_rx_skb)), usb_recv_callback);
+#endif
+	}
+}
+
+
+static void 
+usb_send_callback(int flag, int size)
+{
+	struct net_device *dev = usbe_info.dev;
+	struct net_device_stats *stats;
+	struct sk_buff *skb=cur_tx_skb;
+	int ret;
+
+	if (terminating)
+		return;
+
+	stats = &usbe_info.stats;
+	switch (flag) {
+	    case 0:
+		stats->tx_packets++;
+		stats->tx_bytes += size;
+		break;
+	    case -EIO:
+		stats->tx_errors++;
+		break;
+	    default:
+		stats->tx_dropped++;
+		break;
+	}
+
+	cur_tx_skb = next_tx_skb;
+	next_tx_skb = NULL;
+	dev_kfree_skb_irq(skb);
+	if (!cur_tx_skb)
+		return;
+	
+	dev->trans_start = jiffies;
+	ret = sa1100_usb_send(cur_tx_skb->data, cur_tx_skb->len, usb_send_callback);
+	if (ret) {
+		/* If the USB core can't accept the packet, we drop it. */
+		dev_kfree_skb_irq(cur_tx_skb);
+		cur_tx_skb = NULL;
+		usbe_info.stats.tx_carrier_errors++;
+	}
+	netif_wake_queue(dev);
+}
+
+static int 
+usb_eth_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+	int ret;
+	long flags;
+	
+	if (next_tx_skb) {
+		printk("%s: called with next_tx_skb != NULL\n", __FUNCTION__);
+		return 1;
+	}
+
+	if (skb_shared (skb)) {
+		struct sk_buff  *skb2 = skb_unshare(skb, GFP_ATOMIC);
+		if (!skb2) {
+			usbe_info.stats.tx_dropped++;
+			dev_kfree_skb(skb);
+			return 1;
+		}
+		skb = skb2;
+	}
+
+	if ((skb->len % usb_wsize) == 0) {
+		skb->len++; // other side will ignore this one, anyway.
+	}
+
+	save_flags_cli(flags);
+	if (cur_tx_skb) {
+		next_tx_skb = skb;
+		netif_stop_queue(dev);
+	} else {
+		cur_tx_skb = skb;
+		dev->trans_start = jiffies;
+		ret = sa1100_usb_send(skb->data, skb->len, usb_send_callback);
+		if (ret) {
+			/* If the USB core can't accept the packet, we drop it. */
+			dev_kfree_skb(skb);
+			cur_tx_skb = NULL;
+			usbe_info.stats.tx_carrier_errors++;
+		}
+	}
+	restore_flags(flags);
+	return 0;
+}
+
+static void 
+usb_xmit_timeout(struct net_device *dev )
+{
+	sa1100_usb_send_reset();
+	dev->trans_start = jiffies;
+	netif_wake_queue(dev);
+}
+
+
+static int 
+usb_eth_open(struct net_device *dev)
+{
+	terminating = 0;
+	cur_tx_skb = next_tx_skb = NULL;
+	cur_rx_skb = usb_new_recv_skb();
+	next_rx_skb = usb_new_recv_skb();
+	if (!cur_rx_skb || !next_rx_skb) {
+		printk("%s: can't allocate new skb\n", __FUNCTION__);
+		if (cur_rx_skb)
+			kfree_skb(cur_rx_skb);
+		if (next_rx_skb)
+			kfree_skb(next_rx_skb);
+		return -ENOMEM;;
+	}
+	
+	MOD_INC_USE_COUNT;
+#ifndef DMA_NO_COPY
+	sa1100_usb_recv(dmabuf, usb_rsize, usb_recv_callback);
+#else
+	sa1100_usb_recv(cur_rx_skb->tail, MIN(usb_rsize, skb_tailroom (cur_rx_skb)),
+			usb_recv_callback);
+#endif
+	return 0;
+}
+
+static int 
+usb_eth_release(struct net_device *dev)
+{
+	terminating = 1;
+	sa1100_usb_send_reset();
+	sa1100_usb_recv_reset();
+	if (cur_tx_skb)
+		kfree_skb(cur_tx_skb);
+	if (next_tx_skb)
+		kfree_skb(next_tx_skb);
+	if (cur_rx_skb)
+		kfree_skb(cur_rx_skb);
+	if (next_rx_skb)
+		kfree_skb(next_rx_skb);
+	MOD_DEC_USE_COUNT;
+	return 0;
+}
+
+static struct net_device_stats *
+usb_eth_stats(struct net_device *dev)
+{
+	struct usbe_info_t *priv =  (struct usbe_info_t*) dev->priv;
+	struct net_device_stats *stats=NULL;
+
+	if (priv)
+		stats = &priv->stats;
+	return stats;
+}
+
+static int 
+usb_eth_probe(struct net_device *dev)
+{
+	u8 node_id [ETH_ALEN];
+
+	get_random_bytes (node_id, sizeof node_id);
+	node_id [0] &= 0xfe;    // clear multicast bit
+
+	/* 
+	 * Assign the hardware address of the board: 
+	 * generate it randomly, as there can be many such
+	 * devices on the bus.
+	 */
+	memcpy (dev->dev_addr, node_id, sizeof node_id);
+   
+	dev->open = usb_eth_open;
+	dev->change_mtu = usb_change_mtu;
+	dev->stop = usb_eth_release;
+	dev->hard_start_xmit = usb_eth_xmit;
+	dev->get_stats = usb_eth_stats;
+	dev->watchdog_timeo = 1*HZ;
+	dev->tx_timeout = usb_xmit_timeout;
+	dev->priv = &usbe_info;
+
+	usbe_info.dev = dev;
+
+	/* clear the statistics */
+	memset(&usbe_info.stats, 0, sizeof(struct net_device_stats));
+
+	ether_setup(dev);
+	dev->flags &= ~IFF_MULTICAST;
+	dev->flags &= ~IFF_BROADCAST;
+	//dev->flags |= IFF_NOARP;
+
+	return 0;
+}
+
+#ifdef MODULE
+MODULE_PARM(usb_rsize, "1i");
+MODULE_PARM_DESC(usb_rsize, "number of bytes in packets from host to sa1100");
+MODULE_PARM(usb_wsize, "1i");
+MODULE_PARM_DESC(usb_wsize, "number of bytes in packets from sa1100 to host");
+#endif
+
+static int __init
+usb_eth_init(void)
+{
+	int rc; 
+
+#ifndef DMA_NO_COPY
+	dmabuf = kmalloc( usb_rsize, GFP_KERNEL | GFP_DMA );
+	if (!dmabuf)
+		return -ENOMEM;
+#endif
+	strncpy(usb_eth_device.name, usb_eth_name, IFNAMSIZ);
+	usb_eth_device.init = usb_eth_probe;
+	if (register_netdev(&usb_eth_device) != 0)
+		return -EIO;
+
+	rc = sa1100_usb_open( "usb-eth" );
+	if ( rc == 0 ) {
+		 string_desc_t * pstr;
+		 desc_t * pd = sa1100_usb_get_descriptor_ptr();
+
+		 pd->b.ep1.wMaxPacketSize = make_word( usb_rsize );
+		 pd->b.ep2.wMaxPacketSize = make_word( usb_wsize );
+		 pd->dev.idVendor	  = ETHERNET_VENDOR_ID;
+		 pd->dev.idProduct     = ETHERNET_PRODUCT_ID;
+		 pstr = sa1100_usb_kmalloc_string_descriptor( "SA1100 USB NIC" );
+		 if ( pstr ) {
+			  sa1100_usb_set_string_descriptor( 1, pstr );
+			  pd->dev.iProduct = 1;
+		 }
+		 rc = sa1100_usb_start();
+	}
+	return rc;
+}
+
+module_init(usb_eth_init);
+
+static void __exit
+usb_eth_cleanup(void)
+{
+	string_desc_t * pstr;
+	sa1100_usb_stop();
+	sa1100_usb_close();
+	if ( (pstr = sa1100_usb_get_string_descriptor(1)) != NULL )
+		kfree( pstr );
+#ifndef DMA_NO_COPY
+	kfree(dmabuf);
+#endif
+	unregister_netdev(&usb_eth_device);
+}
+
+module_exit(usb_eth_cleanup);
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb_ctl.c linux/arch/arm/mach-sa1100/usb_ctl.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb_ctl.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/usb_ctl.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,773 @@
+ /*
+ *	Copyright (C) Compaq Computer Corporation, 1998, 1999
+ *  Copyright (C) Extenex Corporation, 2001
+ *
+ *  usb_ctl.c
+ *
+ *  SA1100 USB controller core driver.
+ *
+ *  This file provides interrupt routing and overall coordination
+ *  of the three endpoints in usb_ep0, usb_receive (1),  and usb_send (2).
+ *
+ *  Please see linux/Documentation/arm/SA1100/SA1100_USB for details.
+ *
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/proc_fs.h>
+#include <linux/tqueue.h>
+#include <linux/delay.h>
+#include <linux/malloc.h>
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+
+#include "sa1100_usb.h"
+#include "usb_ctl.h"
+
+//////////////////////////////////////////////////////////////////////////////
+// Prototypes
+//////////////////////////////////////////////////////////////////////////////
+
+int usbctl_next_state_on_event( int event );
+static void udc_int_hndlr(int, void *, struct pt_regs *);
+static void initialize_descriptors( void );
+static void soft_connect_hook( int enable );
+static void udc_disable(void);
+static void udc_enable(void);
+
+#if CONFIG_PROC_FS
+#define PROC_NODE_NAME "sausb"
+static int usbctl_read_proc(char *page, char **start, off_t off,
+							int count, int *eof, void *data);
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+// Globals
+//////////////////////////////////////////////////////////////////////////////
+static const char pszMe[] = "usbctl: ";
+struct usb_info_t usbd_info;  /* global to ep0, usb_recv, usb_send */
+
+/* device descriptors */
+static desc_t desc;
+
+#define MAX_STRING_DESC 8
+static string_desc_t * string_desc_array[ MAX_STRING_DESC ];
+static string_desc_t sd_zero;  /* special sd_zero holds language codes */
+
+// called when configured
+static usb_notify_t configured_callback = NULL;
+
+enum {	kStateZombie  = 0,  kStateZombieSuspend  = 1,
+		kStateDefault = 2,  kStateDefaultSuspend = 3,
+		kStateAddr    = 4,  kStateAddrSuspend    = 5,
+		kStateConfig  = 6,  kStateConfigSuspend  = 7 
+};
+
+static int device_state_machine[8][6] = {
+//                suspend               reset          resume     adddr config deconfig
+/* zombie */  {  kStateZombieSuspend,  kStateDefault, kError,    kError, kError, kError },
+/* zom sus */ {  kError, kStateDefault, kStateZombie, kError, kError, kError },
+/* default */ {  kStateDefaultSuspend, kError, kStateDefault, kStateAddr, kError, kError },
+/* def sus */ {  kError, kStateDefault, kStateDefault, kError, kError, kError },
+/* addr */    {  kStateAddrSuspend, kStateDefault, kError, kError, kStateConfig, kError },
+/* addr sus */{  kError, kStateDefault, kStateAddr, kError, kError, kError },
+/* config */  {  kStateConfigSuspend, kStateDefault, kError, kError, kError, kStateAddr },
+/* cfg sus */ {  kError, kStateDefault, kStateConfig, kError, kError, kError }
+};
+
+/* "device state" is the usb device framework state, as opposed to the
+   "state machine state" which is whatever the driver needs and is much
+   more fine grained
+*/
+static int sm_state_to_device_state[8] =
+//  zombie           zom suspend          default            default sus
+{ USB_STATE_POWERED, USB_STATE_SUSPENDED, USB_STATE_DEFAULT, USB_STATE_SUSPENDED,
+// addr              addr sus             config                config sus
+  USB_STATE_ADDRESS, USB_STATE_SUSPENDED, USB_STATE_CONFIGURED, USB_STATE_SUSPENDED
+};
+
+static char * state_names[8] = 
+{ "zombie", "zombie suspended", "default", "default suspended",
+  "address", "address suspended", "configured", "config suspended"
+};
+
+static char * event_names[6] = 
+{ "suspend", "reset", "resume", 
+  "address assigned", "configure", "de-configure"
+};
+
+static char * device_state_names[] =
+{ "not attached", "attached", "powered", "default",
+  "address", "configured", "suspended" };
+
+static int sm_state = kStateZombie;
+
+//////////////////////////////////////////////////////////////////////////////
+// Async
+//////////////////////////////////////////////////////////////////////////////
+static void core_kicker(void);
+
+static inline void enable_resume_mask_suspend( void );
+static inline void enable_suspend_mask_resume(void);
+
+static void
+udc_int_hndlr(int irq, void *dev_id, struct pt_regs *regs)
+{
+  	__u32 status = Ser0UDCSR;
+
+	/* ReSeT Interrupt Request - UDC has been reset */
+	if ( status & UDCSR_RSTIR )
+	{
+		if ( usbctl_next_state_on_event( kEvReset ) != kError )
+		{
+			/* starting 20ms or so reset sequence now... */
+			printk("%sResetting\n", pszMe);
+			ep0_reset();  // just set state to idle
+			ep1_reset();  // flush dma, clear false stall
+			ep2_reset();  // flush dma, clear false stall
+		}
+		// mask reset ints, they flood during sequence, enable
+		// suspend and resume
+		Ser0UDCCR |= UDCCR_REM;    // mask reset
+		Ser0UDCCR &= ~(UDCCR_SUSIM | UDCCR_RESIM); // enable suspend and resume
+		UDC_flip(  Ser0UDCSR, status );	// clear all pending sources
+		return;		// <-- no reason to continue if resetting
+	}
+	// else we have done something other than reset, so be sure reset enabled
+	UDC_clear( Ser0UDCCR, UDCCR_REM );
+
+	/* RESume Interrupt Request */
+	if ( status & UDCSR_RESIR )
+	{
+		usbctl_next_state_on_event( kEvResume );
+		core_kicker();
+		enable_suspend_mask_resume();
+	}		
+
+	/* SUSpend Interrupt Request */
+	if ( status & UDCSR_SUSIR )
+	{
+		usbctl_next_state_on_event( kEvSuspend );
+		enable_resume_mask_suspend();
+	}
+
+	UDC_flip(Ser0UDCSR, status); // clear all pending sources
+
+	if (status & UDCSR_EIR)
+		 ep0_int_hndlr();
+
+	if (status & UDCSR_RIR)
+		ep1_int_hndlr(status);
+
+	if (status & UDCSR_TIR)
+		ep2_int_hndlr(status);
+}
+
+static inline void enable_resume_mask_suspend( void )
+{
+	 int i = 0;
+
+	 while( 1 ) {
+		  Ser0UDCCR |= UDCCR_SUSIM; // mask future suspend events		  
+		  udelay( i );
+		  if ( (Ser0UDCCR & UDCCR_SUSIM) || (Ser0UDCSR & UDCSR_RSTIR) )
+			   break;
+		  if ( ++i == 50 ) {
+			   printk( "%senable_resume(): Could not set SUSIM %8.8X\n",
+					   pszMe, Ser0UDCCR );
+			   break;
+		  }
+	 }
+
+	 i = 0;
+	 while( 1 ) {
+		  Ser0UDCCR &= ~UDCCR_RESIM;
+		  udelay( i );
+		  if ( ( Ser0UDCCR & UDCCR_RESIM ) == 0 
+			   ||
+			   (Ser0UDCSR & UDCSR_RSTIR)
+			 )
+			   break;
+		  if ( ++i == 50 ) {
+			   printk( "%senable_resume(): Could not clear RESIM %8.8X\n",
+					   pszMe, Ser0UDCCR );
+			   break;
+		  }
+	 }
+}
+
+static inline void enable_suspend_mask_resume(void)
+{
+	 int i = 0;
+	 while( 1 ) {
+		  Ser0UDCCR |= UDCCR_RESIM; // mask future resume events
+		  udelay( i );
+		  if ( Ser0UDCCR & UDCCR_RESIM || (Ser0UDCSR & UDCSR_RSTIR) )
+			   break;
+		  if ( ++i == 50 ) {
+			   printk( "%senable_suspend(): Could not set RESIM %8.8X\n",
+					   pszMe, Ser0UDCCR );
+			   break;
+		  }
+	 }
+	 i = 0;
+	 while( 1 ) {
+		  Ser0UDCCR &= ~UDCCR_SUSIM;
+		  udelay( i );
+		  if ( ( Ser0UDCCR & UDCCR_SUSIM ) == 0 
+			   ||
+			   (Ser0UDCSR & UDCSR_RSTIR)
+			 )
+			   break;
+		  if ( ++i == 50 ) {
+			   printk( "%senable_suspend(): Could not clear SUSIM %8.8X\n",
+					   pszMe, Ser0UDCCR );
+			   break;
+		  }
+	 }
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+// Public Interface
+//////////////////////////////////////////////////////////////////////////////
+
+/* Open SA usb core on behalf of a client, but don't start running */
+
+int
+sa1100_usb_open( const char * client )
+{
+	 if ( usbd_info.client_name != NULL )
+		  return -EBUSY;
+
+	 usbd_info.client_name = (char*) client;
+	 memset(&usbd_info.stats, 0, sizeof(struct usb_stats_t));
+	 memset(string_desc_array, 0, sizeof(string_desc_array));
+
+	 /* hack to start in zombie suspended state */
+	 sm_state = kStateZombieSuspend;
+	 usbd_info.state = USB_STATE_SUSPENDED;
+
+	 /* create descriptors for enumeration */
+	 initialize_descriptors();
+
+	 printk( "%sOpened for %s\n", pszMe, client );
+	 return 0;
+}
+
+/* Start running. Must have called usb_open (above) first */
+int
+sa1100_usb_start( void )
+{
+	 if ( usbd_info.client_name == NULL ) {
+		  printk( "%s%s - no client registered\n",
+				  pszMe, __FUNCTION__ );
+		  return -EPERM;
+	 }
+	 
+	 /* start UDC internal machinery running */
+	 udc_enable();    
+	 udelay( 100 );
+
+	 /* clear stall - receiver seems to start stalled? 19Jan01ww */
+	 /* also clear other stuff just to be thurough 22Feb01ww */
+	 UDC_clear(Ser0UDCCS1, UDCCS1_FST | UDCCS1_RPE | UDCCS1_RPC );
+	 UDC_clear(Ser0UDCCS2, UDCCS2_FST | UDCCS2_TPE | UDCCS2_TPC );
+
+	 /* mask everything */
+	 Ser0UDCCR = 0xFC;
+
+	 /* flush DMA and fire through some -EAGAINs */
+	 ep1_init( usbd_info.dmach_rx );
+	 ep2_init( usbd_info.dmach_tx );	
+
+	 /* give endpoint notification we are starting */
+	 ep1_state_change_notify( USB_STATE_SUSPENDED );
+	 ep2_state_change_notify( USB_STATE_SUSPENDED );
+
+	 /* enable any platform specific hardware */
+	 soft_connect_hook( 1 );
+
+	/* clear all top-level sources */
+	 Ser0UDCSR = UDCSR_RSTIR | UDCSR_RESIR | UDCSR_EIR   |
+		         UDCSR_RIR   | UDCSR_TIR   | UDCSR_SUSIR ;
+
+	 /* EXERIMENT - a short line in the spec says toggling this
+	  ..bit diddles the internal state machine in the udc to 
+	  ..expect a suspend */
+	 Ser0UDCCR  |= UDCCR_RESIM;	
+	 /* END EXPERIMENT 10Feb01ww */
+
+	 /* enable any platform specific hardware */
+	 soft_connect_hook( 1 );
+
+	 /* enable interrupts. If you are unplugged you will
+	    immediately get a suspend interrupt. If you are plugged 
+	    and have a soft connect-circuit, you will get a reset
+        If you are plugged without a soft-connect, I think you
+	    also get suspend. In short, start with suspend masked 
+	    and everything else enabled */
+	 UDC_write( Ser0UDCCR, UDCCR_SUSIM );
+
+	 printk( "%sStarted for %s\n", pszMe, usbd_info.client_name );
+	 return 0;
+}
+
+/* Stop USB core from running */
+int
+sa1100_usb_stop( void ) 
+{
+	 if ( usbd_info.client_name == NULL ) {
+		  printk( "%s%s - no client registered\n",
+				  pszMe, __FUNCTION__ );
+		  return -EPERM;
+	 }
+	 /* mask everything */
+	 Ser0UDCCR = 0xFC;
+	 ep1_reset();
+	 ep2_reset();
+	 udc_disable();
+	 printk( "%sStopped\n", pszMe );
+	 return 0;
+}
+
+/* Tell SA core client is through using it */
+int
+sa1100_usb_close( void ) 
+{
+	 if ( usbd_info.client_name == NULL ) {
+		  printk( "%s%s - no client registered\n",
+				  pszMe, __FUNCTION__ );
+		  return -EPERM;
+	 }
+	 usbd_info.client_name = NULL;
+	 printk( "%sClosed\n", pszMe );
+	 return 0;
+}
+
+/* set a proc to be called when device is configured */
+usb_notify_t sa1100_set_configured_callback( usb_notify_t func )
+{
+	 usb_notify_t retval = configured_callback;
+	 configured_callback = func;
+	 return retval;
+}
+
+/*====================================================
+ * Descriptor Manipulation.
+ * Use these between open() and start() above to setup
+ * the descriptors for your device.
+ *
+ */
+
+/* get pointer to static default descriptor */
+desc_t *
+sa1100_usb_get_descriptor_ptr( void ) { return &desc; }
+
+/* optional: set a string descriptor */
+int
+sa1100_usb_set_string_descriptor( int i, string_desc_t * p )
+{
+	 int retval;
+	 if ( i < MAX_STRING_DESC ) {
+		  string_desc_array[i] = p;
+		  retval = 0;
+	 } else {
+		  retval = -EINVAL;
+	 }
+	 return retval;
+}
+ 
+/* optional: get a previously set string descriptor */
+string_desc_t *
+sa1100_usb_get_string_descriptor( int i )
+{
+	 return ( i < MAX_STRING_DESC )
+		    ? string_desc_array[i] 
+		    : NULL;
+}
+
+
+/* optional: kmalloc and unicode up a string descriptor */
+string_desc_t *
+sa1100_usb_kmalloc_string_descriptor( const char * p )
+{
+	 string_desc_t * pResult = NULL;
+
+	 if ( p ) {
+		  int len = strlen( p );
+		  int uni_len = len * sizeof( __u16 );
+		  pResult = (string_desc_t*) kmalloc( uni_len + 2, GFP_KERNEL ); /* ugh! */
+		  if ( pResult != NULL ) {
+			   int i;
+			   pResult->bLength = uni_len + 2;
+			   pResult->bDescriptorType = USB_DESC_STRING;
+			   for( i = 0; i < len ; i++ ) {
+					pResult->bString[i] = make_word( (__u16) p[i] );
+			   }
+		  }
+	 }
+	 return pResult;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// Exports to rest of driver
+//////////////////////////////////////////////////////////////////////////////
+
+/* called by the int handler here and the two endpoint files when interesting
+   .."events" happen */
+
+int
+usbctl_next_state_on_event( int event )
+{
+	int next_state = device_state_machine[ sm_state ][ event ];
+	if ( next_state != kError )
+	{
+		int next_device_state = sm_state_to_device_state[ next_state ];
+		printk( "%s%s --> [%s] --> %s. Device in %s state.\n",
+				pszMe, state_names[ sm_state ], event_names[ event ],
+				state_names[ next_state ], device_state_names[ next_device_state ] );
+
+		sm_state = next_state;
+		if ( usbd_info.state != next_device_state )
+		{
+			if ( configured_callback != NULL
+				 &&
+				 next_device_state == USB_STATE_CONFIGURED
+				 &&
+				 usbd_info.state != USB_STATE_SUSPENDED
+			   ) {
+			  configured_callback();
+			}
+			usbd_info.state = next_device_state;
+			ep1_state_change_notify( next_device_state );
+			ep2_state_change_notify( next_device_state );
+		}
+	}
+#if 0
+	else
+		printk( "%s%s --> [%s] --> ??? is an error.\n",
+				pszMe, state_names[ sm_state ], event_names[ event ] );
+#endif
+	return next_state;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// Private Helpers
+//////////////////////////////////////////////////////////////////////////////
+
+/* setup default descriptors */
+
+static void
+initialize_descriptors(void)
+{
+	desc.dev.bLength               = sizeof( device_desc_t );
+	desc.dev.bDescriptorType       = USB_DESC_DEVICE;
+	desc.dev.bcdUSB                = 0x100; /* 1.0 */
+	desc.dev.bDeviceClass          = 0xFF;	/* vendor specific */
+	desc.dev.bDeviceSubClass       = 0; 		
+	desc.dev.bDeviceProtocol       = 0;     
+	desc.dev.bMaxPacketSize0       = 8;	/* ep0 max fifo size */
+	desc.dev.idVendor              = 0;	/* vendor ID undefined */
+	desc.dev.idProduct             = 0; /* product */
+	desc.dev.bcdDevice             = 0; /* vendor assigned device release num */
+	desc.dev.iManufacturer         = 0;	/* index of manufacturer string */
+	desc.dev.iProduct              = 0; /* index of product description string */
+	desc.dev.iSerialNumber         = 0;	/* index of string holding product s/n */
+	desc.dev.bNumConfigurations    = 1;
+
+	desc.b.cfg.bLength             = sizeof( config_desc_t );
+	desc.b.cfg.bDescriptorType     = USB_DESC_CONFIG;
+	desc.b.cfg.wTotalLength        = make_word_c( sizeof(struct cdb) );
+	desc.b.cfg.bNumInterfaces      = 1;
+	desc.b.cfg.bConfigurationValue = 1;
+	desc.b.cfg.iConfiguration      = 0;
+	desc.b.cfg.bmAttributes        = USB_CONFIG_BUSPOWERED;
+	desc.b.cfg.MaxPower            = USB_POWER( 500 );
+
+	desc.b.intf.bLength            = sizeof( intf_desc_t );
+	desc.b.intf.bDescriptorType    = USB_DESC_INTERFACE;
+	desc.b.intf.bInterfaceNumber   = 0; /* unique intf index*/
+	desc.b.intf.bAlternateSetting  = 0; 
+	desc.b.intf.bNumEndpoints      = 2;
+	desc.b.intf.bInterfaceClass    = 0xFF; /* vendor specific */
+	desc.b.intf.bInterfaceSubClass = 0;
+	desc.b.intf.bInterfaceProtocol = 0;
+	desc.b.intf.iInterface         = 0;
+
+	desc.b.ep1.bLength             = sizeof( ep_desc_t );
+	desc.b.ep1.bDescriptorType     = USB_DESC_ENDPOINT;
+	desc.b.ep1.bEndpointAddress    = USB_EP_ADDRESS( 1, USB_OUT );
+	desc.b.ep1.bmAttributes        = USB_EP_BULK;
+	desc.b.ep1.wMaxPacketSize      = make_word_c( 64 );
+	desc.b.ep1.bInterval           = 0;
+
+	desc.b.ep2.bLength             = sizeof( ep_desc_t );
+	desc.b.ep2.bDescriptorType     = USB_DESC_ENDPOINT;
+	desc.b.ep2.bEndpointAddress    = USB_EP_ADDRESS( 2, USB_IN );
+	desc.b.ep2.bmAttributes        = USB_EP_BULK;
+	desc.b.ep2.wMaxPacketSize      = make_word_c( 64 );
+	desc.b.ep2.bInterval           = 0;
+
+	/* set language */
+	/* See: http://www.usb.org/developers/data/USB_LANGIDs.pdf */
+	sd_zero.bDescriptorType = USB_DESC_STRING;
+	sd_zero.bLength         = sizeof( string_desc_t );
+	sd_zero.bString[0]      = make_word_c( 0x409 ); /* American English */
+	sa1100_usb_set_string_descriptor( 0, &sd_zero );
+}
+
+/* soft_connect_hook()
+ * Some devices have platform-specific circuitry to make USB
+ * not seem to be plugged in, even when it is. This allows 
+ * software to control when a device 'appears' on the USB bus
+ * (after Linux has booted and this driver has loaded, for 
+ * example). If you have such a circuit, control it here.
+ */
+static void
+soft_connect_hook( int enable )
+{
+#ifdef CONFIG_SA1100_EXTENEX1
+	 if (machine_is_extenex1() ) {
+		  if ( enable ) {
+			   PPDR |= PPC_USB_SOFT_CON;
+			   PPSR |= PPC_USB_SOFT_CON;
+		  } else {
+			   PPSR &= ~PPC_USB_SOFT_CON;
+			   PPDR &= ~PPC_USB_SOFT_CON;
+		  }
+	 }
+#endif
+}
+
+/* disable the UDC at the source */
+static void
+udc_disable(void)
+{
+	soft_connect_hook( 0 );
+	UDC_set( Ser0UDCCR, UDCCR_UDD );
+}
+
+
+/*  enable the udc at the source */
+static void
+udc_enable(void)
+{
+	UDC_clear(Ser0UDCCR, UDCCR_UDD);
+}
+
+// HACK DEBUG  3Mar01ww
+// Well, maybe not, it really seems to help!  08Mar01ww
+static void
+core_kicker( void )
+{
+	 __u32 car = Ser0UDCAR;
+	 __u32 imp = Ser0UDCIMP;
+	 __u32 omp = Ser0UDCOMP;
+
+	 UDC_set( Ser0UDCCR, UDCCR_UDD );	 
+	 udelay( 300 );
+	 UDC_clear(Ser0UDCCR, UDCCR_UDD);
+
+	 Ser0UDCAR = car;
+	 Ser0UDCIMP = imp;
+	 Ser0UDCOMP = omp;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// Proc Filesystem Support
+//////////////////////////////////////////////////////////////////////////////
+
+#if CONFIG_PROC_FS
+
+#define SAY( fmt, args... )  p += sprintf(p, fmt, ## args )
+#define SAYV(  num )         p += sprintf(p, num_fmt, "Value", num )
+#define SAYC( label, yn )    p += sprintf(p, yn_fmt, label, yn )
+#define SAYS( label, v )     p += sprintf(p, cnt_fmt, label, v )
+
+static int usbctl_read_proc(char *page, char **start, off_t off,
+			    int count, int *eof, void *data)
+{
+	 const char * num_fmt   = "%25.25s: %8.8lX\n";
+	 const char * cnt_fmt   = "%25.25s: %lu\n";
+	 const char * yn_fmt    = "%25.25s: %s\n";
+	 const char * yes       = "YES";
+	 const char * no        = "NO";
+	 unsigned long v;
+	 char * p = page;
+	 int len;
+
+ 	 SAY( "SA1100 USB Controller Core\n" );
+	 SAY( "USB state: %s (%s) %d\n",
+		  device_state_names[ sm_state_to_device_state[ sm_state ] ],
+		  state_names[ sm_state ],
+		  sm_state );
+
+	 SAYS( "ep0 bytes read", usbd_info.stats.ep0_bytes_read );
+	 SAYS( "ep0 bytes written", usbd_info.stats.ep0_bytes_written );
+	 SAYS( "ep0 FIFO read failures", usbd_info.stats.ep0_fifo_write_failures );
+	 SAYS( "ep0 FIFO write failures", usbd_info.stats.ep0_fifo_write_failures );
+
+	 SAY( "\n" );
+
+	 v = Ser0UDCAR;
+	 SAY( "%25.25s: 0x%8.8lX - %ld\n", "Address Register", v, v );
+	 v = Ser0UDCIMP;
+	 SAY( "%25.25s: %ld (%8.8lX)\n", "IN  max packet size", v+1, v );
+	 v = Ser0UDCOMP;
+	 SAY( "%25.25s: %ld (%8.8lX)\n", "OUT max packet size", v+1, v );
+
+	 v = Ser0UDCCR;
+	 SAY( "\nUDC Mask Register\n" );
+	 SAYV( v );
+	 SAYC( "UDC Active",                ( v & UDCCR_UDA ) ? yes : no );
+	 SAYC( "Suspend interrupts masked", ( v & UDCCR_SUSIM ) ? yes : no );
+	 SAYC( "Resume interrupts masked",  ( v & UDCCR_RESIM ) ? yes : no );
+	 SAYC( "Reset interrupts masked",   ( v & UDCCR_REM ) ? yes : no );
+
+	 v = Ser0UDCSR;
+	 SAY( "\nUDC Interrupt Request Register\n" );  
+	 SAYV( v );
+	 SAYC( "Reset pending",      ( v & UDCSR_RSTIR ) ? yes : no );
+	 SAYC( "Suspend pending",    ( v & UDCSR_SUSIR ) ? yes : no );
+	 SAYC( "Resume pending",     ( v & UDCSR_RESIR ) ? yes : no );
+	 SAYC( "ep0 pending",        ( v & UDCSR_EIR )   ? yes : no );
+	 SAYC( "receiver pending",   ( v & UDCSR_RIR )   ? yes : no );
+	 SAYC( "tramsitter pending", ( v & UDCSR_TIR )   ? yes : no );
+
+#ifdef CONFIG_SA1100_EXTENEX1
+	 SAYC( "\nSoft connect", (PPSR & PPC_USB_SOFT_CON) ? "Visible" : "Hidden" );
+#endif
+
+#if 0
+	 v = Ser0UDCCS0;
+	 SAY( "\nUDC Endpoint Zero Status Register\n" );
+	 SAYV( v );
+	 SAYC( "Out Packet Ready", ( v & UDCCS0_OPR ) ? yes : no );
+	 SAYC( "In Packet Ready",  ( v & UDCCS0_IPR ) ? yes : no );
+	 SAYC( "Sent Stall",       ( v & UDCCS0_SST ) ? yes : no );
+	 SAYC( "Force Stall",      ( v & UDCCS0_FST ) ? yes : no );
+	 SAYC( "Data End",         ( v & UDCCS0_DE )  ? yes : no );
+	 SAYC( "Data Setup End",   ( v & UDCCS0_SE )  ? yes : no );
+	 SAYC( "Serviced (SO)",    ( v & UDCCS0_SO )  ? yes : no );
+
+	 v = Ser0UDCCS1;
+	 SAY( "\nUDC Receiver Status Register\n" );
+	 SAYV( v );
+	 SAYC( "Receive Packet Complete", ( v & UDCCS1_RPC ) ? yes : no );
+	 SAYC( "Sent Stall",              ( v & UDCCS1_SST ) ? yes : no );
+	 SAYC( "Force Stall",             ( v & UDCCS1_FST ) ? yes : no );
+	 SAYC( "Receive Packet Error",    ( v & UDCCS1_RPE ) ? yes : no );
+	 SAYC( "Receive FIFO not empty",  ( v & UDCCS1_RNE ) ? yes : no );
+
+	 v = Ser0UDCCS2;
+	 SAY( "\nUDC Transmitter Status Register\n" );
+	 SAYV( v );
+	 SAYC( "FIFO has < 8 of 16 chars", ( v & UDCCS2_TFS ) ? yes : no );
+	 SAYC( "Transmit Packet Complete", ( v & UDCCS2_TPC ) ? yes : no );
+	 SAYC( "Transmit FIFO underrun",   ( v & UDCCS2_TUR ) ? yes : no );
+	 SAYC( "Transmit Packet Error",    ( v & UDCCS2_TPE ) ? yes : no );
+	 SAYC( "Sent Stall",               ( v & UDCCS2_SST ) ? yes : no );
+	 SAYC( "Force Stall",              ( v & UDCCS2_FST ) ? yes : no );
+#endif
+
+	 len = ( p - page ) - off;
+	 if ( len < 0 )
+		  len = 0;
+	 *eof = ( len <=count ) ? 1 : 0;
+	 *start = page + off;
+	 return len;
+}
+
+#endif  /* CONFIG_PROC_FS */
+
+//////////////////////////////////////////////////////////////////////////////
+// Module Initialization and Shutdown 
+//////////////////////////////////////////////////////////////////////////////
+/*
+ * usbctl_init()
+ * Module load time. Allocate dma and interrupt resources. Setup /proc fs
+ * entry. Leave UDC disabled.
+ */
+int __init usbctl_init( void )
+{
+	int retval = 0;
+
+	udc_disable();
+
+	memset( &usbd_info, 0, sizeof( usbd_info ) );
+
+#if CONFIG_PROC_FS
+	create_proc_read_entry ( PROC_NODE_NAME, 0, NULL, usbctl_read_proc, NULL);
+#endif
+
+	/* setup rx dma */
+	retval = sa1100_request_dma(&usbd_info.dmach_rx, "USB receive", DMA_Ser0UDCRd);    
+	if (retval) {
+		printk("%sunable to register for rx dma rc=%d\n", pszMe, retval );
+		goto err_rx_dma;
+	}
+	
+	/* setup tx dma */
+	retval = sa1100_request_dma(&usbd_info.dmach_tx, "USB transmit", DMA_Ser0UDCWr);    
+	if (retval) {
+		printk("%sunable to register for tx dma rc=%d\n",pszMe,retval);
+		goto err_tx_dma;
+	}
+	
+	/* now allocate the IRQ. */
+	retval = request_irq(IRQ_Ser0UDC, udc_int_hndlr, SA_INTERRUPT, 
+			  "SA USB core", NULL);
+	if (retval) {
+		printk("%sCouldn't request USB irq rc=%d\n",pszMe, retval);
+		goto err_irq;
+	}
+
+	printk( "SA1100 USB Controller Core Initialized\n");
+	return 0;
+
+err_irq:
+	sa1100_free_dma(usbd_info.dmach_tx);
+	usbd_info.dmach_tx = 0;
+err_tx_dma:
+	sa1100_free_dma(usbd_info.dmach_rx);
+	usbd_info.dmach_rx = 0;
+err_rx_dma:
+	return retval;
+}
+/*
+ * usbctl_exit()
+ * Release DMA and interrupt resources
+ */
+void __exit usbctl_exit( void )
+{
+    printk("Unloading SA1100 USB Controller\n");
+
+	udc_disable();
+
+#if CONFIG_PROC_FS
+    remove_proc_entry ( PROC_NODE_NAME, NULL);
+#endif
+
+    sa1100_free_dma(usbd_info.dmach_rx);
+    sa1100_free_dma(usbd_info.dmach_tx);
+    free_irq(IRQ_Ser0UDC, NULL); 
+}
+
+EXPORT_SYMBOL( sa1100_usb_open );
+EXPORT_SYMBOL( sa1100_usb_start );
+EXPORT_SYMBOL( sa1100_usb_stop );
+EXPORT_SYMBOL( sa1100_usb_close );
+
+
+EXPORT_SYMBOL( sa1100_usb_get_descriptor_ptr );
+EXPORT_SYMBOL( sa1100_usb_set_string_descriptor );
+EXPORT_SYMBOL( sa1100_usb_get_string_descriptor );
+EXPORT_SYMBOL( sa1100_usb_kmalloc_string_descriptor );
+
+
+module_init( usbctl_init );
+module_exit( usbctl_exit );
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb_ctl.h linux/arch/arm/mach-sa1100/usb_ctl.h
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb_ctl.h	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/usb_ctl.h	Sun Aug 12 10:50:10 2001
@@ -0,0 +1,123 @@
+/* 
+ *	Copyright (C)  Compaq Computer Corporation, 1998, 1999
+ *	Copyright (C)  Extenex Corporation 2001
+ *
+ *  usb_ctl.h 
+ *
+ *  PRIVATE interface used to share info among components of the SA-1100 USB
+ *  core: usb_ctl, usb_ep0, usb_recv and usb_send. Clients of the USB core 
+ *  should use sa1100_usb.h.
+ *  
+ */
+
+#ifndef _USB_CTL_H
+#define _USB_CTL_H
+
+#include <asm/dma.h>  /* dmach_t */
+
+
+/*
+ * These states correspond to those in the USB specification v1.0
+ * in chapter 8, Device Framework.
+ */
+enum { USB_STATE_NOTATTACHED=0, USB_STATE_ATTACHED=1,USB_STATE_POWERED=2,
+	   USB_STATE_DEFAULT=3, USB_STATE_ADDRESS=4, USB_STATE_CONFIGURED=5,
+	   USB_STATE_SUSPENDED=6};
+
+struct usb_stats_t {
+	 unsigned long ep0_fifo_write_failures;
+	 unsigned long ep0_bytes_written;
+	 unsigned long ep0_fifo_read_failures;
+	 unsigned long ep0_bytes_read;
+};
+
+struct usb_info_t
+{
+	 char * client_name;
+	 dmach_t dmach_tx, dmach_rx;
+	 int state;
+	 unsigned char address;
+	 struct usb_stats_t stats;
+};
+
+/* in usb_ctl.c */
+extern struct usb_info_t usbd_info;
+
+/*
+ * Function Prototypes
+ */
+enum { kError=-1, kEvSuspend=0, kEvReset=1, 
+	   kEvResume=2, kEvAddress=3, kEvConfig=4, kEvDeConfig=5 };
+int usbctl_next_state_on_event( int event );
+
+/* endpoint zero */
+void ep0_reset(void);
+void ep0_int_hndlr(void);
+
+/* receiver */
+void ep1_state_change_notify( int new_state );
+int  ep1_recv(void); 
+int  ep1_init(int chn);
+void ep1_int_hndlr(int status);
+void ep1_reset(void);
+void ep1_stall(void);
+
+/* xmitter */
+void ep2_state_change_notify( int new_state );
+void ep2_reset(void);
+int  ep2_init(int chn);
+void ep2_int_hndlr(int status);
+void ep2_stall(void);
+
+#define UDC_write(reg, val) { \
+	int i = 10000; \
+	do { \
+	  	(reg) = (val); \
+		if (i-- <= 0) { \
+			printk( "%s [%d]: write %#x to %p (%#x) failed\n", \
+				__FUNCTION__, __LINE__, (val), &(reg), (reg)); \
+			break; \
+		} \
+	} while((reg) != (val)); \
+}
+
+#define UDC_set(reg, val) { \
+	int i = 10000; \
+	do { \
+		(reg) |= (val); \
+		if (i-- <= 0) { \
+			printk( "%s [%d]: set %#x of %p (%#x) failed\n", \
+				__FUNCTION__, __LINE__, (val), &(reg), (reg)); \
+			break; \
+		} \
+	} while(!((reg) & (val))); \
+}
+
+#define UDC_clear(reg, val) { \
+	int i = 10000; \
+	do { \
+		(reg) &= ~(val); \
+		if (i-- <= 0) { \
+			printk( "%s [%d]: clear %#x of %p (%#x) failed\n", \
+				__FUNCTION__, __LINE__, (val), &(reg), (reg)); \
+			break; \
+		} \
+	} while((reg) & (val)); \
+}
+
+#define UDC_flip(reg, val) { \
+	int i = 10000; \
+	(reg) = (val); \
+	do { \
+		(reg) = (val); \
+		if (i-- <= 0) { \
+			printk( "%s [%d]: flip %#x of %p (%#x) failed\n", \
+				__FUNCTION__, __LINE__, (val), &(reg), (reg)); \
+			break; \
+		} \
+	} while(((reg) & (val))); \
+}
+
+
+#define CHECK_ADDRESS { if ( Ser0UDCAR == 1 ) { printk("%s:%d I lost my address!!!\n",__FUNCTION__, __LINE__);}}
+#endif /* _USB_CTL_H */
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb_ep0.c linux/arch/arm/mach-sa1100/usb_ep0.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb_ep0.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/usb_ep0.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,911 @@
+/*
+ * Copyright (C) Extenex Corporation 2001
+ * Much folklore gleaned from original code:
+ *    Copyright (C) Compaq Computer Corporation, 1998, 1999
+ *
+ *  usb_ep0.c - SA1100 USB controller driver.
+ *              Endpoint zero management
+ *
+ *  Please see:
+ *    linux/Documentation/arm/SA1100/SA1100_USB
+ *  for details. (Especially since Intel docs are full of
+ *  errors about ep0 operation.) ward.willats@extenex.com.
+ *
+ * Intel also has a "Universal Serial Bus Client Device 
+ * Validation for the StrongARM SA-1100 Microprocessor" 
+ * document, which has flow charts and assembler test driver,
+ * but be careful, since it is just for validation and not
+ * a "real world" solution.
+ *
+ * A summary of three types of data-returning setups:
+ *
+ * 1. Setup request <= 8 bytes. That is, requests that can
+ *    be fullfilled in one write to the FIFO. DE is set
+ *    with IPR in queue_and_start_write(). (I don't know
+ *    if there really are any of these!)
+ *
+ * 2. Setup requests > 8 bytes (requiring more than one
+ *    IN to get back to the host), and we have at least
+ *    as much or more data than the host requested. In
+ *    this case we pump out everything we've got, and 
+ *    when the final interrupt comes in due to the UDC
+ *    clearing the last IPR, we just set DE.
+ *
+ * 3. Setup requests > 8 bytes, but we don't have enough
+ *    data to satisfy the request. In this case, we send
+ *    everything we've got, and when the final interrupt
+ *    comes in due to the UDC clearing the last IPR 
+ *    we write nothing to the FIFO and set both IPR and DE 
+ *    so the UDC sends an empty packet and forces the host 
+ *    to perform short packet retirement instead of stalling
+ *    out.
+ *
+ */
+
+#include <linux/delay.h>
+#include "sa1100_usb.h"  /* public interface */
+#include "usb_ctl.h"     /* private stuff */
+
+
+// 1 == lots of trace noise,  0 = only "important' stuff
+#define VERBOSITY 0
+
+enum { true = 1, false = 0 };
+typedef int bool;
+#ifndef MIN
+#define MIN( a, b ) ((a)<(b)?(a):(b))
+#endif
+
+#if 1 && !defined( ASSERT )
+#  define ASSERT(expr) \
+          if(!(expr)) { \
+          printk( "Assertion failed! %s,%s,%s,line=%d\n",\
+          #expr,__FILE__,__FUNCTION__,__LINE__); \
+          }
+#else
+#  define ASSERT(expr)
+#endif
+
+#if VERBOSITY
+#define PRINTKD(fmt, args...) printk( fmt , ## args)
+#else
+#define PRINTKD(fmt, args...)
+#endif
+
+/*================================================
+ * USB Protocol Stuff
+ */
+
+/* Request Codes   */
+enum { GET_STATUS=0,         CLEAR_FEATURE=1,     SET_FEATURE=3,
+	   SET_ADDRESS=5,        GET_DESCRIPTOR=6,	  SET_DESCRIPTOR=7,
+	   GET_CONFIGURATION=8,  SET_CONFIGURATION=9, GET_INTERFACE=10,
+	   SET_INTERFACE=11 };
+
+
+/* USB Device Requests */
+typedef struct 
+{
+    __u8 bmRequestType;
+    __u8 bRequest;
+    __u16 wValue;
+    __u16 wIndex;
+    __u16 wLength;
+} usb_dev_request_t  __attribute__ ((packed));
+
+/***************************************************************************
+Prototypes
+***************************************************************************/
+/* "setup handlers" -- the main functions dispatched to by the 
+   .. isr. These represent the major "modes" of endpoint 0 operaton */
+static void sh_setup_begin(void);				/* setup begin (idle) */
+static void sh_write( void );      				/* writing data */
+static void sh_write_with_empty_packet( void ); /* empty packet at end of xfer*/
+/* called before both sh_write routines above */
+static void common_write_preamble( void );
+
+/* other subroutines */
+static __u32  queue_and_start_write( void * p, int req, int act );
+static void write_fifo( void );
+static int read_fifo( usb_dev_request_t * p );
+static void get_descriptor( usb_dev_request_t * pReq );
+
+/* some voodo helpers  01Mar01ww */
+static void set_cs_bits( __u32 set_bits );
+static void set_de( void );
+static void set_ipr( void );
+static void set_ipr_and_de( void );
+static bool clear_opr( void );
+
+/***************************************************************************
+Inline Helpers
+***************************************************************************/
+
+/* Data extraction from usb_request_t fields */
+enum { kTargetDevice=0, kTargetInterface=1, kTargetEndpoint=2 };
+static inline int request_target( __u8 b ) { return (int) ( b & 0x0F); }
+
+static inline int windex_to_ep_num( __u16 w ) { return (int) ( w & 0x000F); }
+inline int type_code_from_request( __u8 by ) { return (( by >> 4 ) & 3); }
+
+/* following is hook for self-powered flag in GET_STATUS. Some devices
+   .. might like to override and return real info */
+static inline bool self_powered_hook( void ) { return true; }
+
+/* print string descriptor */
+static inline void psdesc( string_desc_t * p )
+{
+	 int i;
+	 int nchars = ( p->bLength - 2 ) / sizeof( __u16 );
+	 printk( "'" );
+	 for( i = 0 ; i < nchars ; i++ ) {
+		  printk( "%c", (char) p->bString[i] );
+	 }
+	 printk( "'\n" );
+}
+
+
+#if VERBOSITY 
+/* "pcs" == "print control status" */
+static inline void pcs( void )
+{
+	 __u32 foo = Ser0UDCCS0;
+	 printk( "%8.8X: %s %s %s %s\n",
+			 foo,
+			 foo & UDCCS0_SE ? "SE" : "",
+			 foo & UDCCS0_OPR ? "OPR" : "",
+			 foo & UDCCS0_IPR ? "IPR" : "",
+			 foo & UDCCS0_SST ? "SST" : ""
+	 );
+}
+static inline void preq( usb_dev_request_t * pReq )
+{
+	 static char * tnames[] = { "dev", "intf", "ep", "oth" };
+	 static char * rnames[] = { "std", "class", "vendor", "???" };
+	 char * psz;
+	 switch( pReq->bRequest ) {
+	 case GET_STATUS: psz = "get stat"; break;
+	 case CLEAR_FEATURE: psz = "clr feat"; break;	  
+	 case SET_FEATURE: psz = "set feat"; break;	  
+	 case SET_ADDRESS: psz = "set addr"; break;	  
+	 case GET_DESCRIPTOR: psz = "get desc"; break;	  
+	 case SET_DESCRIPTOR: psz = "set desc"; break;	  
+	 case GET_CONFIGURATION: psz = "get cfg"; break;	  
+	 case SET_CONFIGURATION: psz = "set cfg"; break;	  
+	 case GET_INTERFACE: psz = "get intf"; break;	  
+	 case SET_INTERFACE: psz = "set intf"; break;	  
+	 default: psz = "unknown"; break;	  
+	 }
+	 printk( "- [%s: %s req to %s. dir=%s]\n", psz,
+			 rnames[ (pReq->bmRequestType >> 5) & 3 ],
+			 tnames[ pReq->bmRequestType & 3 ],
+			 ( pReq->bmRequestType & 0x80 ) ? "in" : "out" );
+}
+
+#else
+static inline void pcs( void ){}
+static inline void preq( void ){}
+#endif
+
+/***************************************************************************
+Globals
+***************************************************************************/
+static const char pszMe[] = "usbep0: ";
+
+/* pointer to current setup handler */
+static void (*current_handler)(void) = sh_setup_begin;
+
+/* global write struct to keep write 
+   ..state around across interrupts */
+static struct {
+		unsigned char *p;
+		int bytes_left;
+} wr;
+
+/***************************************************************************
+Public Interface
+***************************************************************************/
+
+/* reset received from HUB (or controller just went nuts and reset by itself!)
+  so udc core has been reset, track this state here  */
+void 
+ep0_reset(void)
+{
+	 /* reset state machine */
+	 current_handler = sh_setup_begin;
+	 wr.p = NULL;
+	 wr.bytes_left = 0;
+	 usbd_info.address=0;
+}
+
+/* handle interrupt for endpoint zero */
+void 
+ep0_int_hndlr( void )
+{   
+	 PRINTKD( "/\\(%d)\n", Ser0UDCAR );
+	 pcs();
+
+	 /* if not in setup begin, we are returning data.
+		execute a common preamble to both write handlers 
+	 */
+	 if ( current_handler != sh_setup_begin ) 
+		  common_write_preamble();
+
+	 (*current_handler)();
+
+	 PRINTKD( "---\n" );
+	 pcs();
+	 PRINTKD( "\\/\n" );  
+}
+
+/***************************************************************************
+Setup Handlers
+***************************************************************************/
+/*
+ * sh_setup_begin()
+ * This setup handler is the "idle" state of endpoint zero. It looks for OPR
+ * (OUT packet ready) to see if a setup request has been been received from the
+ * host. Requests without a return data phase are immediately handled. Otherwise,
+ * in the case of GET_XXXX the handler may be set to one of the sh_write_xxxx
+ * data pumpers if more than 8 bytes need to get back to the host.
+ *
+ */
+static void
+sh_setup_begin( void ) 
+{
+	 unsigned char status_buf[2];  /* returned in GET_STATUS */
+	 usb_dev_request_t req;
+	 int request_type;
+	 int n;
+	 __u32 cs_bits;
+	 __u32 address;
+	 __u32 cs_reg_in = Ser0UDCCS0;
+
+	 if (cs_reg_in & UDCCS0_SST) {
+		  PRINTKD( "%ssetup begin: sent stall. Continuing\n", pszMe );
+		  set_cs_bits( UDCCS0_SST );  		 
+	}
+
+	 if ( cs_reg_in & UDCCS0_SE ) {
+		  PRINTKD( "%ssetup begin: Early term of setup. Continuing\n", pszMe );
+		  set_cs_bits( UDCCS0_SSE );  		 /* clear setup end */
+	 }
+
+	 /* Be sure out packet ready, otherwise something is wrong */
+	 if ( (cs_reg_in & UDCCS0_OPR) == 0 ) {
+		  /* we can get here early...if so, we'll int again in a moment  */
+		  PRINTKD( "%ssetup begin: no OUT packet available. Exiting\n", pszMe );
+		  goto sh_sb_end;
+	 }
+
+	 /* read the setup request */
+	 n = read_fifo( &req );
+	 if ( n != sizeof( req ) ) {
+		  printk( "%ssetup begin: fifo READ ERROR wanted %d bytes got %d. "
+				  " Stalling out...\n",
+				  pszMe, sizeof( req ), n );
+		  /* force stall, serviced out */
+		  set_cs_bits( UDCCS0_FST | UDCCS0_SO  ); 
+		  goto sh_sb_end;
+	 }
+
+	 /* Is it a standard request? (not vendor or class request) */
+	 request_type = type_code_from_request( req.bmRequestType );
+	 if ( request_type != 0 ) {
+		  printk( "%ssetup begin: unsupported bmRequestType: %d ignored\n",
+				  pszMe, request_type );
+		  set_cs_bits( UDCCS0_DE | UDCCS0_SO );
+		  goto sh_sb_end;
+	 }
+
+#if VERBOSITY
+	 {
+	 unsigned char * pdb = (unsigned char *) &req;
+	 PRINTKD( "%2.2X %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X %2.2X ",
+			 pdb[0], pdb[1], pdb[2], pdb[3], pdb[4], pdb[5], pdb[6], pdb[7] 
+		  );
+	 preq( &req );
+	 }
+#endif
+
+	 /* Handle it */
+	 switch( req.bRequest ) {
+
+		  /* This first bunch have no data phase */
+
+	 case SET_ADDRESS:
+		  address = (__u32) (req.wValue & 0x7F);
+		  /* when SO and DE sent, UDC will enter status phase and ack,
+			 ..propagating new address to udc core. Next control transfer
+			 ..will be on the new address. You can't see the change in a
+			 ..read back of CAR until then. (about 250us later, on my box).
+			 ..The original Intel driver sets S0 and DE and code to check
+			 ..that address has propagated here. I tried this, but it 
+			 ..would only work sometimes! The rest of the time it would
+			 ..never propagate and we'd spin forever. So now I just set
+			 ..it and pray...
+		  */
+		  Ser0UDCAR = address;
+		  usbd_info.address = address;
+		  usbctl_next_state_on_event( kEvAddress );
+		  set_cs_bits( UDCCS0_SO | UDCCS0_DE );  /* no data phase */
+		  printk( "%sI have been assigned address: %d\n", pszMe, address );
+		  break;
+
+
+	 case SET_CONFIGURATION:
+		  if ( req.wValue == 1 ) {
+			   /* configured */
+			   if (usbctl_next_state_on_event( kEvConfig ) != kError){
+								/* (re)set the out and in max packet sizes */
+					desc_t * pDesc = sa1100_usb_get_descriptor_ptr();
+					__u32 out = __le16_to_cpu( pDesc->b.ep1.wMaxPacketSize );
+					__u32 in  = __le16_to_cpu( pDesc->b.ep2.wMaxPacketSize );
+					Ser0UDCOMP = ( out - 1 );
+					Ser0UDCIMP = ( in - 1 );
+					printk( "%sConfigured (OMP=%8.8X IMP=%8.8X)\n", pszMe, out, in );
+			   }
+		  } else if ( req.wValue == 0 ) {
+			   /* de-configured */
+			   if (usbctl_next_state_on_event( kEvDeConfig ) != kError )
+					printk( "%sDe-Configured\n", pszMe );
+		  } else {
+			   printk( "%ssetup phase: Unknown "
+					   "\"set configuration\" data %d\n",
+					   pszMe, req.wValue );
+		  }
+		  set_cs_bits( UDCCS0_SO | UDCCS0_DE );  /* no data phase */
+		  break;
+
+	 case CLEAR_FEATURE:
+		  /* could check data length, direction...26Jan01ww */
+		  if ( req.wValue == 0 ) { /* clearing ENDPOINT_HALT/STALL */
+			   int ep = windex_to_ep_num( req.wIndex ); 
+			   if ( ep == 1 ) {
+					printk( "%sclear feature \"endpoint halt\" "
+							" on receiver\n", pszMe );
+					ep1_reset();
+			   }
+			   else if ( ep == 2 ) {
+					printk( "%sclear feature \"endpoint halt\" "
+							"on xmitter\n", pszMe );
+					ep2_reset();
+			   } else {
+					printk( "%sclear feature \"endpoint halt\" "
+							"on unsupported ep # %d\n",
+							pszMe, ep );
+			   }
+		  } else {
+			   printk( "%sUnsupported feature selector (%d) "
+					   "in clear feature. Ignored.\n" ,
+					   pszMe, req.wValue );
+		  }
+		  set_cs_bits( UDCCS0_SO | UDCCS0_DE );  /* no data phase */
+		  break;
+
+	 case SET_FEATURE:
+		  if ( req.wValue == 0 ) { /* setting ENDPOINT_HALT/STALL */
+			   int ep = windex_to_ep_num( req.wValue );
+			   if ( ep == 1 ) {
+					printk( "%set feature \"endpoint halt\" "
+							"on receiver\n", pszMe );
+					ep1_stall();
+			   }
+			   else if ( ep == 2 ) {
+					printk( "%sset feature \"endpoint halt\" "
+							" on xmitter\n", pszMe );
+					ep2_stall();
+			   } else {
+					printk( "%sset feature \"endpoint halt\" "
+							"on unsupported ep # %d\n",
+							pszMe, ep );
+			   }
+		  }
+		  else {
+			   printk( "%sUnsupported feature selector "
+					   "(%d) in set feature\n", 
+					   pszMe, req.wValue );
+		  }
+		  set_cs_bits( UDCCS0_SO | UDCCS0_DE );  /* no data phase */
+		  break;
+
+
+		  /* The rest have a data phase that writes back to the host */
+	 case GET_STATUS:
+		  /* return status bit flags */
+		  status_buf[0] = status_buf[1] = 0;
+		  n = request_target(req.bmRequestType);
+		  switch( n ) {
+		  case kTargetDevice:
+			   if ( self_powered_hook() )
+					status_buf[0] |= 1;
+			   break;
+		  case kTargetInterface:
+			   break;
+		  case kTargetEndpoint:
+			   /* return stalled bit */
+			   n = windex_to_ep_num( req.wIndex );
+			   if ( n == 1 )
+					status_buf[0] |= (Ser0UDCCS1 & UDCCS1_FST) >> 4;
+			   else if ( n == 2 )
+					status_buf[0] |= (Ser0UDCCS2 & UDCCS2_FST) >> 5;
+			   else {
+					printk( "%sUnknown endpoint (%d) "
+							"in GET_STATUS\n", pszMe, n );
+			   }
+			   break;
+		  default:
+			   printk( "%sUnknown target (%d) in GET_STATUS\n",
+					   pszMe, n );
+			   /* fall thru */
+			   break;
+		  }
+		  cs_bits  = queue_and_start_write( status_buf, 
+											req.wLength,
+											sizeof( status_buf ) );
+		  set_cs_bits( cs_bits );
+		  break;		
+	 case GET_DESCRIPTOR:
+		  get_descriptor( &req );
+		  break;
+
+	 case GET_CONFIGURATION:
+		  status_buf[0] = (usbd_info.state ==  USB_STATE_CONFIGURED)
+			   ? 1
+			   : 0;
+		  cs_bits = queue_and_start_write( status_buf, req.wLength, 1 );
+		  set_cs_bits( cs_bits );
+		  break;				
+	 case GET_INTERFACE:
+		  printk( "%sfixme: get interface not supported\n", pszMe );
+		  cs_bits = queue_and_start_write( NULL, req.wLength, 0 );
+		  set_cs_bits( cs_bits );
+		  break;
+	 case SET_INTERFACE:
+		  printk( "%sfixme: set interface not supported\n", pszMe );
+		  set_cs_bits( UDCCS0_DE | UDCCS0_SO );
+		  break;
+	 default :
+		  printk("%sunknown request 0x%x\n", pszMe, req.bRequest);
+		  break;
+	 } /* switch( bRequest ) */
+		
+sh_sb_end:
+	 return;
+
+}
+/*
+ * common_wrtie_preamble()
+ * Called before execution of sh_write() or sh_write_with_empty_packet()
+ * Handles common abort conditions.
+ *
+ */
+static void common_write_preamble( void )
+{
+	 /* If "setup end" has been set, the usb controller has
+		..terminated a setup transaction before we set DE. This
+		..happens during enumeration with some hosts. For example,
+		..the host will ask for our device descriptor and specify
+		..a return of 64 bytes. When we hand back the first 8, the
+		..host will know our max packet size and turn around and
+		..issue a new setup immediately. This causes the UDC to auto-ack
+		..the new setup and set SE. We must then "unload" (process)
+		..the new setup, which is what will happen after this preamble
+		..is finished executing.
+	 */
+	 __u32 cs_reg_in = Ser0UDCCS0;
+
+	 if ( cs_reg_in & UDCCS0_SE ) {
+		  PRINTKD( "%swrite_preamble(): Early termination of setup\n", pszMe );
+		  Ser0UDCCS0 =  UDCCS0_SSE;  		 /* clear setup end */
+		  current_handler = sh_setup_begin;
+	 }
+
+	 if ( cs_reg_in & UDCCS0_SST ) {
+		  PRINTKD( "%swrite_preamble(): UDC sent stall\n", pszMe );
+		  Ser0UDCCS0 = UDCCS0_SST;  		 /* clear setup end */
+		  current_handler = sh_setup_begin;
+	 }
+
+	 if ( cs_reg_in & UDCCS0_OPR ) {
+		  PRINTKD( "%swrite_preamble(): see OPR. Stopping write to "
+				   "handle new SETUP\n", pszMe );
+		  /* very rarely, you can get OPR and leftover IPR. Try to clear */
+		  UDC_clear( Ser0UDCCS0, UDCCS0_IPR );
+		  current_handler = sh_setup_begin;
+	 }
+}
+
+/*
+ * sh_write()
+ * This is the setup handler when we are in the data return phase of 
+ * a setup request and have as much (or more) data than the host 
+ * requested. If we enter this routine and bytes left is zero, the
+ * last data packet has gone (int is because IPR was just cleared)
+ * so we just set DE and reset. Otheriwse, we write another packet
+ * and set IPR.
+ */
+static void sh_write()
+{
+	 PRINTKD( "W\n" );
+
+	 if ( Ser0UDCCS0 & UDCCS0_IPR ) {
+		  PRINTKD( "%ssh_write(): IPR set, exiting\n", pszMe );
+		  return;
+	 }
+
+	 /* If bytes left is zero, we are coming in on the
+		..interrupt after the last packet went out. And
+		..we know we don't have to empty packet this transfer
+		..so just set DE and we are done */
+
+	 if ( 0 == wr.bytes_left ) {
+		  /* that's it, so data end  */
+		  set_de();
+		  wr.p = NULL;  				/* be anal */
+		  current_handler = sh_setup_begin;
+	 } else {
+		  /* Otherwise, more data to go */
+		  write_fifo();
+		  set_ipr();
+	 }
+}
+/*
+ * sh_write_with_empty_packet()
+ * This is the setup handler when we don't have enough data to 
+ * satisfy the host's request. After we send everything we've got
+ * we must send an empty packet (by setting IPR and DE) so the
+ * host can perform "short packet retirement" and not stall.
+ *
+ */
+static void sh_write_with_empty_packet( void )
+{
+	 __u32 cs_reg_out = 0;
+	 PRINTKD( "WE\n" );
+
+	 if ( Ser0UDCCS0 & UDCCS0_IPR ) {
+		  PRINTKD( "%ssh_write(): IPR set, exiting\n", pszMe );
+		  return;
+	 }
+
+	 /* If bytes left is zero, we are coming in on the
+		..interrupt after the last packet went out. 
+		..we must do short packet suff, so set DE and IPR
+	 */
+
+	 if ( 0 == wr.bytes_left ) {
+		  set_ipr_and_de();
+		  wr.p = NULL;  			
+		  current_handler = sh_setup_begin;
+		  PRINTKD( "%ssh_write empty() Sent empty packet \n", pszMe );
+	 }  else {
+		  write_fifo();				/* send data */
+		  set_ipr();				/* flag a packet is ready */
+	 }
+	 Ser0UDCCS0 = cs_reg_out;
+}
+
+/***************************************************************************
+Other Private Subroutines
+***************************************************************************/
+/*
+ * queue_and_start_write()
+ * p == data to send
+ * req == bytes host requested
+ * act == bytes we actually have
+ * Returns: bits to be flipped in ep0 control/status register
+ *
+ * Called from sh_setup_begin() to begin a data return phase. Sets up the
+ * global "wr"-ite structure and load the outbound FIFO with data.
+ * If can't send all the data, set appropriate handler for next interrupt.
+ *
+ */
+static __u32  queue_and_start_write( void * in, int req, int act )
+{
+	 __u32 cs_reg_bits = UDCCS0_IPR;
+	 unsigned char * p = (unsigned char*) in;
+
+	 PRINTKD( "Qr=%d a=%d\n",req,act );
+
+	/* thou shalt not enter data phase until the serviced OUT is clear */
+	 if ( ! clear_opr() ) {
+		  printk( "%sSO did not clear OPR\n", pszMe );
+		  return ( UDCCS0_DE | UDCCS0_SO ) ;
+	 }
+	 wr.p = p;
+	 wr.bytes_left = MIN( act, req );
+
+	 write_fifo();
+
+	 if ( 0 == wr.bytes_left ) {
+		  cs_reg_bits |= UDCCS0_DE;	/* out in 1 so data end */
+		  wr.p = NULL;  				/* be anal */
+	 }
+	 else if ( act < req )   /* we are going to short-change host */
+		  current_handler = sh_write_with_empty_packet; /* so need nul to not stall */
+	 else /* we have as much or more than requested */
+		  current_handler = sh_write;
+
+	 return cs_reg_bits; /* note: IPR was set uncondtionally at start of routine */
+}
+/*
+ * write_fifo()
+ * Stick bytes in the 8 bytes endpoint zero FIFO. 
+ * This version uses a variety of tricks to make sure the bytes
+ * are written correctly. 1. The count register is checked to
+ * see if the byte went in, and the write is attempted again 
+ * if not. 2. An overall counter is used to break out so we
+ * don't hang in those (rare) cases where the UDC reverses 
+ * direction of the FIFO underneath us without notification
+ * (in response to host aborting a setup transaction early).
+ * 
+ */
+static void write_fifo( void )
+{
+	int bytes_this_time = MIN( wr.bytes_left, 8 );
+	int bytes_written = 0;
+	int i=0;
+
+	PRINTKD( "WF=%d: ", bytes_this_time );
+
+	while( bytes_this_time-- ) {
+		 PRINTKD( "%2.2X ", *wr.p );
+		 i = 0;
+		 do {
+			  Ser0UDCD0 = *wr.p;
+			  udelay( 20 );  /* voodo 28Feb01ww */
+			  i++;
+		 } while( Ser0UDCWC == bytes_written && i < 10 );
+		 if ( i == 50 ) {
+			  printk( "%swrite_fifo: write failure\n", pszMe );
+			  usbd_info.stats.ep0_fifo_write_failures++;
+		 }
+
+		 wr.p++;
+		 bytes_written++;
+	}
+	wr.bytes_left -= bytes_written;
+
+	/* following propagation voodo so maybe caller writing IPR in 
+	   ..a moment might actually get it to stick 28Feb01ww */
+	udelay( 300 ); 
+
+	usbd_info.stats.ep0_bytes_written += bytes_written;
+	PRINTKD( "L=%d WCR=%8.8X\n", wr.bytes_left, Ser0UDCWC );
+}
+/* 
+ * read_fifo()
+ * Read 1-8 bytes out of FIFO and put in request.
+ * Called to do the initial read of setup requests
+ * from the host. Return number of bytes read.
+ *
+ * Like write fifo above, this driver uses multiple
+ * reads checked agains the count register with an
+ * overall timeout.
+ *
+ */
+static int 
+read_fifo( usb_dev_request_t * request )
+{
+	int bytes_read = 0;
+	int fifo_count;
+	int i;
+
+	unsigned char * pOut = (unsigned char*) request;
+		
+	fifo_count = ( Ser0UDCWC & 0xFF ); 
+
+	ASSERT( fifo_count <= 8 );
+	PRINTKD( "RF=%d ", fifo_count );
+
+	while( fifo_count-- ) {
+		 i = 0;
+		 do {
+			  *pOut = (unsigned char) Ser0UDCD0;
+			  udelay( 10 );
+		 } while( ( Ser0UDCWC & 0xFF ) != fifo_count && i < 10 );
+		 if ( i == 10 ) {
+			  printk( "%sread_fifo(): read failure\n", pszMe );
+			  usbd_info.stats.ep0_fifo_read_failures++;
+		 }
+		 pOut++;
+		 bytes_read++;
+	}
+
+	PRINTKD( "fc=%d\n", bytes_read );
+	usbd_info.stats.ep0_bytes_read++;
+	return bytes_read;
+}
+
+/*
+ * get_descriptor()
+ * Called from sh_setup_begin to handle data return
+ * for a GET_DESCRIPTOR setup request.
+ */
+static void get_descriptor( usb_dev_request_t * pReq )
+{
+	 __u32 cs_bits = 0;
+	 string_desc_t * pString;
+	 ep_desc_t * pEndpoint;
+
+	 desc_t * pDesc = sa1100_usb_get_descriptor_ptr();
+	 int type = pReq->wValue >> 8;
+	 int idx  = pReq->wValue & 0xFF;
+
+	 switch( type ) {
+	 case USB_DESC_DEVICE:
+		  cs_bits =
+			   queue_and_start_write( &pDesc->dev,
+									  pReq->wLength,
+									  pDesc->dev.bLength );
+		  break;
+
+		  // return config descriptor buffer, cfg, intf, 2 ep
+	 case USB_DESC_CONFIG: 
+		  cs_bits =
+			   queue_and_start_write( &pDesc->b,
+									  pReq->wLength, 
+									  sizeof( struct cdb ) );
+		  break;
+
+		  // not quite right, since doesn't do language code checking
+	 case USB_DESC_STRING: 
+		  pString = sa1100_usb_get_string_descriptor( idx );
+		  if ( pString ) {
+			   if ( idx != 0 ) {  // if not language index
+					printk( "%sReturn string %d: ", pszMe, idx );
+					psdesc( pString );
+			   }
+			   cs_bits =
+					queue_and_start_write( pString,
+										   pReq->wLength, 
+										   pString->bLength );
+		  }
+		  else {
+			   printk("%sunkown string index %d Stall.\n", pszMe, idx );
+			   cs_bits = ( UDCCS0_DE | UDCCS0_SO | UDCCS0_FST );
+		  }
+		  break;
+
+	 case USB_DESC_INTERFACE:
+		  if ( idx == pDesc->b.intf.bInterfaceNumber ) {
+			   cs_bits =
+					queue_and_start_write( &pDesc->b.intf,
+										   pReq->wLength, 
+										   pDesc->b.intf.bLength );
+		  }
+		  break;
+
+	 case USB_DESC_ENDPOINT: /* correct? 21Feb01ww */
+		  if ( idx == 1 ) 
+			   pEndpoint = &pDesc->b.ep1;
+		  else if ( idx == 2 )
+			   pEndpoint = &pDesc->b.ep2;
+		  else
+			   pEndpoint = NULL;
+		  if ( pEndpoint ) {
+			   cs_bits =
+					queue_and_start_write( pEndpoint,
+										   pReq->wLength, 
+										   pEndpoint->bLength );
+		  } else {
+			   printk("%sunkown endpoint index %d Stall.\n", pszMe, idx );
+			   cs_bits = ( UDCCS0_DE | UDCCS0_SO | UDCCS0_FST );
+		  }
+		  break;
+
+
+	 default :
+		  printk("%sunknown descriptor type %d. Stall.\n", pszMe, type );
+		  cs_bits = ( UDCCS0_DE | UDCCS0_SO | UDCCS0_FST );
+		  break;
+
+	 }
+	 set_cs_bits( cs_bits );
+}
+
+
+/* some voodo I am adding, since the vanilla macros just aren't doing it  1Mar01ww */
+
+#define ABORT_BITS ( UDCCS0_SST | UDCCS0_SE )
+#define OK_TO_WRITE (!( Ser0UDCCS0 & ABORT_BITS ))
+#define BOTH_BITS (UDCCS0_IPR | UDCCS0_DE)
+
+static void set_cs_bits( __u32 bits )
+{
+	 if ( bits & ( UDCCS0_SO | UDCCS0_SSE | UDCCS0_FST ) )
+		  Ser0UDCCS0 = bits;
+	 else if ( (bits & BOTH_BITS) == BOTH_BITS )
+		  set_ipr_and_de();
+	 else if ( bits & UDCCS0_IPR )
+		  set_ipr();
+	 else if ( bits & UDCCS0_DE )
+		  set_de();
+}
+
+static void set_de( void )
+{
+	 int i = 1;
+	 while( 1 ) {
+		  if ( OK_TO_WRITE ) {
+				Ser0UDCCS0 |= UDCCS0_DE;
+		  } else {
+			   PRINTKD( "%sQuitting set DE because SST or SE set\n", pszMe );
+			   break;
+		  }			   
+		  if ( Ser0UDCCS0 & UDCCS0_DE )
+			   break;
+		  udelay( i );
+		  if ( ++i == 50  ) {
+			   printk( "%sDangnabbbit! Cannot set DE! (DE=%8.8X CCS0=%8.8X)\n",
+					   pszMe, UDCCS0_DE, Ser0UDCCS0 );
+			   break;
+		  }
+	 }
+}
+
+static void set_ipr( void ) 
+{
+	 int i = 1;
+	 while( 1 ) {
+		  if ( OK_TO_WRITE ) {
+				Ser0UDCCS0 |= UDCCS0_IPR;
+		  } else {
+			   PRINTKD( "%sQuitting set IPR because SST or SE set\n", pszMe );
+			   break;
+		  }			   
+		  if ( Ser0UDCCS0 & UDCCS0_IPR )
+			   break;
+		  udelay( i );
+		  if ( ++i == 50  ) {
+			   printk( "%sDangnabbbit! Cannot set IPR! (IPR=%8.8X CCS0=%8.8X)\n",
+					   pszMe, UDCCS0_IPR, Ser0UDCCS0 );
+			   break;
+		  }
+	 }
+}
+
+
+
+static void set_ipr_and_de( void )
+{
+	 int i = 1;
+	 while( 1 ) {
+		  if ( OK_TO_WRITE ) {
+			   Ser0UDCCS0 |= BOTH_BITS;
+		  } else {
+			   PRINTKD( "%sQuitting set IPR/DE because SST or SE set\n", pszMe );
+			   break;
+		  }			   
+		  if ( (Ser0UDCCS0 & BOTH_BITS) == BOTH_BITS)
+			   break;
+		  udelay( i );
+		  if ( ++i == 50  ) {
+			   printk( "%sDangnabbbit! Cannot set DE/IPR! (DE=%8.8X IPR=%8.8X CCS0=%8.8X)\n",
+					   pszMe, UDCCS0_DE, UDCCS0_IPR, Ser0UDCCS0 );
+			   break;
+		  }
+	 }
+}
+
+static bool clear_opr( void )
+{
+	 int i = 10000;
+	 bool is_clear;
+	 do {
+		  Ser0UDCCS0 = UDCCS0_SO;
+		  is_clear  = ! ( Ser0UDCCS0 & UDCCS0_OPR );
+		  if ( i-- <= 0 ) {
+			   printk( "%sclear_opr(): failed\n", pszMe );
+			   break;
+		  }
+	 } while( ! is_clear );
+	 return is_clear;
+}
+
+
+
+
+
+/* end usb_ep0.c */
+
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb_recv.c linux/arch/arm/mach-sa1100/usb_recv.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb_recv.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/usb_recv.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,205 @@
+/*
+ * Generic receive layer for the SA1100 USB client function
+ * Copyright (c) 2001 by Nicolas Pitre
+ * 
+ * This code was loosely inspired by the original version which was
+ * Copyright (c) Compaq Computer Corporation, 1998-1999
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ * 
+ * This is still work in progress...
+ * 
+ * Please see linux/Documentation/arm/SA1100/SA1100_USB for details.
+ */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/errno.h>
+#include <asm/dma.h>
+#include <asm/system.h>
+
+#include "sa1100_usb.h"
+#include "usb_ctl.h"
+
+
+static char *ep1_buf;
+static int ep1_len;
+static usb_callback_t ep1_callback;
+static char *ep1_curdmabuf;
+static dma_addr_t ep1_curdmapos;
+static int ep1_curdmalen;
+static int ep1_remain;
+static int dmachn_rx;
+static int rx_pktsize;	
+
+static int naking;
+
+static void
+ep1_start(void)
+{
+	sa1100_dma_flush_all(dmachn_rx);
+	if (!ep1_curdmalen) {
+	  	ep1_curdmalen = rx_pktsize;
+		if (ep1_curdmalen > ep1_remain)
+			ep1_curdmalen = ep1_remain;
+		ep1_curdmapos = pci_map_single(NULL, ep1_curdmabuf, ep1_curdmalen, 
+					       PCI_DMA_FROMDEVICE);
+	}
+	sa1100_dma_queue_buffer(dmachn_rx, NULL, ep1_curdmapos, ep1_curdmalen);
+	if ( naking ) {
+		/* turn off NAK of OUT packets, if set */
+		UDC_flip( Ser0UDCCS1, UDCCS1_RPC );
+		naking = 0;
+	}
+}
+
+static void
+ep1_done(int flag)
+{
+	int size = ep1_len - ep1_remain;
+
+	if (!ep1_len)
+		return;
+	if (ep1_curdmalen)
+		pci_unmap_single(NULL, ep1_curdmapos, ep1_curdmalen, 
+				 PCI_DMA_FROMDEVICE);
+	ep1_len = ep1_curdmalen = 0;
+	if (ep1_callback) {
+		ep1_callback(flag, size);
+	}
+}
+
+void
+ep1_state_change_notify( int new_state )
+{
+
+}
+
+void
+ep1_stall( void )
+{
+	/* SET_FEATURE force stall at UDC */
+	UDC_set( Ser0UDCCS1, UDCCS1_FST );  
+}
+
+int 
+ep1_init(int chn)
+{
+	desc_t * pd = sa1100_usb_get_descriptor_ptr();
+	rx_pktsize = __le16_to_cpu( pd->b.ep1.wMaxPacketSize );
+	dmachn_rx = chn;
+	sa1100_dma_flush_all(dmachn_rx);
+	ep1_done(-EAGAIN);  
+	return 0;
+}
+
+void
+ep1_reset(void)
+{
+	desc_t * pd = sa1100_usb_get_descriptor_ptr();
+	rx_pktsize = __le16_to_cpu( pd->b.ep1.wMaxPacketSize );
+	sa1100_dma_flush_all(dmachn_rx);
+	UDC_clear(Ser0UDCCS1, UDCCS1_FST);
+	ep1_done(-EINTR);
+}
+
+void 
+ep1_int_hndlr(int udcsr)
+{
+	dma_addr_t dma_addr;
+	unsigned int len;
+	int status = Ser0UDCCS1;
+
+	if ( naking ) printk( "%sEh? in ISR but naking = %d\n", "usbrx: ", naking );
+
+	if (status & UDCCS1_RPC) {
+
+		if (!ep1_curdmalen) {
+			printk("usb_recv: RPC for non-existent buffer\n");
+			naking=1;
+			return;
+		}
+		
+		sa1100_dma_stop(dmachn_rx);
+
+		if (status & UDCCS1_SST) {
+			printk("usb_recv: stall sent OMP=%d\n",Ser0UDCOMP);
+			UDC_flip(Ser0UDCCS1, UDCCS1_SST);
+			ep1_done(-EIO); // UDC aborted current transfer, so we do
+			return;
+		}
+
+		if (status & UDCCS1_RPE) {
+		    printk("usb_recv: RPError %x\n", status);
+			UDC_flip(Ser0UDCCS1, UDCCS1_RPC);
+			ep1_done(-EIO);
+			return;
+		}
+		
+		sa1100_dma_get_current(dmachn_rx, NULL, &dma_addr);
+		pci_unmap_single(NULL, ep1_curdmapos, ep1_curdmalen, 
+				 PCI_DMA_FROMDEVICE);
+		len = dma_addr - ep1_curdmapos;
+		if (len < ep1_curdmalen) {
+			char *buf = ep1_curdmabuf + len;
+			while (Ser0UDCCS1 & UDCCS1_RNE) {
+				if (len >= ep1_curdmalen) {
+					printk("usb_recv: too much data in fifo\n");
+					break;
+				}
+				*buf++ = Ser0UDCDR;
+				len++;
+			}
+		} else if (Ser0UDCCS1 & UDCCS1_RNE) {
+			printk("usb_recv: fifo screwed, shouldn't contain data\n");
+			len = 0;
+		}
+		ep1_curdmalen = 0;  /* dma unmap already done */
+		ep1_remain -= len;
+		naking = 1;
+		ep1_done((len) ? 0 : -EPIPE);
+	}
+	/* else, you can get here if we are holding NAK */
+}
+
+int
+sa1100_usb_recv(char *buf, int len, usb_callback_t callback)
+{
+	int flags;
+
+	if (ep1_len)
+		return -EBUSY;
+
+	local_irq_save(flags);
+	ep1_buf = buf;
+	ep1_len = len;
+	ep1_callback = callback;
+	ep1_remain = len;
+	ep1_curdmabuf = buf;
+	ep1_curdmalen = 0;
+	ep1_start();
+	local_irq_restore(flags);
+	
+	return 0;
+}
+
+EXPORT_SYMBOL(sa1100_usb_recv);
+
+void
+sa1100_usb_recv_reset(void)
+{
+	ep1_reset();
+}
+
+EXPORT_SYMBOL(sa1100_usb_recv_reset);
+
+void
+sa1100_usb_recv_stall(void)
+{
+	ep1_stall();
+}
+
+EXPORT_SYMBOL(sa1100_usb_recv_stall);
+
diff -urN 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb_send.c linux/arch/arm/mach-sa1100/usb_send.c
--- 2.4.7-rmk3/linux/arch/arm/mach-sa1100/usb_send.c	Wed Dec 31 19:00:00 1969
+++ linux/arch/arm/mach-sa1100/usb_send.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,205 @@
+/*
+ * Generic xmit layer for the SA1100 USB client function
+ * Copyright (c) 2001 by Nicolas Pitre
+ * 
+ * This code was loosely inspired by the original version which was
+ * Copyright (c) Compaq Computer Corporation, 1998-1999
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ * 
+ * This is still work in progress...
+ * 
+ * Please see linux/Documentation/arm/SA1100/SA1100_USB for details.
+ * 15/03/2001 - ep2_start now sets UDCAR to overcome something that is hardware
+ * 		bug, I think. green@iXcelerator.com
+ */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/errno.h>
+#include <linux/delay.h> // for the massive_attack hack 28Feb01ww
+#include <asm/hardware.h>
+#include <asm/dma.h>
+#include <asm/system.h>
+#include <asm/byteorder.h>
+
+#include "sa1100_usb.h"
+#include "usb_ctl.h"
+
+
+static char *ep2_buf;
+static int ep2_len;
+static usb_callback_t ep2_callback;
+static dma_addr_t ep2_dma;
+static dma_addr_t ep2_curdmapos;
+static int ep2_curdmalen;
+static int ep2_remain;
+static int dmachn_tx;
+static int tx_pktsize;	
+
+/* device state is changing, async */
+void
+ep2_state_change_notify( int new_state )
+{
+}
+
+/* set feature stall executing, async */
+void
+ep2_stall( void )
+{
+	UDC_set( Ser0UDCCS2, UDCCS2_FST );  /* force stall at UDC */
+}
+
+static void 
+ep2_start(void)
+{
+	if (!ep2_len)
+		return;
+
+	ep2_curdmalen = tx_pktsize;
+	if (ep2_curdmalen > ep2_remain)
+		ep2_curdmalen = ep2_remain;
+
+	/* must do this _before_ queue buffer.. */
+	UDC_flip( Ser0UDCCS2,UDCCS2_TPC );  /* stop NAKing IN tokens */
+	UDC_write( Ser0UDCIMP, ep2_curdmalen-1 );
+
+	/* Remove if never seen...8Mar01ww */
+	{
+		 int massive_attack = 20;
+		 while ( Ser0UDCIMP != ep2_curdmalen-1 && massive_attack-- ) {
+			  printk( "usbsnd: Oh no you don't! Let me spin..." );
+			  udelay( 500 );
+			  printk( "and try again...\n" );
+			  UDC_write( Ser0UDCIMP, ep2_curdmalen-1 );
+		 }
+		 if ( massive_attack != 20 ) {
+			  if ( Ser0UDCIMP != ep2_curdmalen-1 )
+				   printk( "usbsnd: Massive attack FAILED :-( %d\n", 
+						   20 - massive_attack );
+			  else 
+				   printk( "usbsnd: Massive attack WORKED :-) %d\n",
+						   20 - massive_attack );
+		 }
+	}
+	/* End remove if never seen... 8Mar01ww */
+
+	Ser0UDCAR = usbd_info.address; // fighting stupid silicon bug
+	sa1100_dma_queue_buffer(dmachn_tx, NULL, ep2_curdmapos, ep2_curdmalen);
+}
+
+static void
+ep2_done(int flag)
+{
+	int size = ep2_len - ep2_remain;
+	if (ep2_len) {
+		pci_unmap_single(NULL, ep2_dma, ep2_len, PCI_DMA_TODEVICE);
+		ep2_len = 0;
+		if (ep2_callback)
+			ep2_callback(flag, size);
+	}
+}
+
+int 
+ep2_init(int chn)
+{
+	desc_t * pd = sa1100_usb_get_descriptor_ptr();
+	tx_pktsize = __le16_to_cpu( pd->b.ep2.wMaxPacketSize );
+	dmachn_tx = chn;
+	sa1100_dma_flush_all(dmachn_tx);
+	ep2_done(-EAGAIN);
+	return 0;
+}
+
+void
+ep2_reset(void)
+{
+	desc_t * pd = sa1100_usb_get_descriptor_ptr();
+	tx_pktsize = __le16_to_cpu( pd->b.ep2.wMaxPacketSize );
+	UDC_clear(Ser0UDCCS2, UDCCS2_FST);
+	sa1100_dma_flush_all(dmachn_tx);
+	ep2_done(-EINTR);
+}
+
+void
+ep2_int_hndlr(int udcsr)
+{
+	int status = Ser0UDCCS2;
+
+	if (Ser0UDCAR != usbd_info.address) // check for stupid silicon bug.
+		Ser0UDCAR = usbd_info.address; 
+
+	UDC_flip(Ser0UDCCS2, UDCCS2_SST);
+
+	if (status & UDCCS2_TPC) {
+		sa1100_dma_flush_all(dmachn_tx);
+
+		if (status & (UDCCS2_TPE | UDCCS2_TUR)) {
+			printk("usb_send: transmit error %x\n", status);
+			ep2_done(-EIO);
+		} else {
+#if 1 // 22Feb01ww/Oleg
+			ep2_curdmapos += ep2_curdmalen;
+			ep2_remain -= ep2_curdmalen;
+#else
+			ep2_curdmapos += Ser0UDCIMP + 1; // this is workaround
+			ep2_remain -= Ser0UDCIMP + 1;    // for case when setting of Ser0UDCIMP was failed
+#endif
+
+			if (ep2_remain != 0) {
+				ep2_start();
+			} else {
+				ep2_done(0);
+			}
+		}
+	} else {
+		printk("usb_send: Not TPC: UDCCS2 = %x\n", status);
+	}
+}
+
+int
+sa1100_usb_send(char *buf, int len, usb_callback_t callback)
+{
+	int flags;
+	
+	if (usbd_info.state != USB_STATE_CONFIGURED)
+		return -ENODEV;
+
+	if (ep2_len)
+		return -EBUSY;
+	
+	local_irq_save(flags);
+	ep2_buf = buf;
+	ep2_len = len;
+	ep2_dma = pci_map_single(NULL, buf, len, PCI_DMA_TODEVICE);
+	ep2_callback = callback;
+	ep2_remain = len;
+	ep2_curdmapos = ep2_dma;
+	ep2_start();
+	local_irq_restore(flags);
+	
+	return 0;
+}
+
+
+void
+sa1100_usb_send_reset(void)
+{
+	ep2_reset();
+}
+
+int sa1100_usb_xmitter_avail( void )
+{
+	if (usbd_info.state != USB_STATE_CONFIGURED)
+		return -ENODEV;
+	if (ep2_len)
+		return -EBUSY;
+	return 0;
+}
+
+
+EXPORT_SYMBOL(sa1100_usb_xmitter_avail);
+EXPORT_SYMBOL(sa1100_usb_send);
+EXPORT_SYMBOL(sa1100_usb_send_reset);
diff -urN 2.4.7-rmk3/linux/arch/arm/mm/fault-armv.c linux/arch/arm/mm/fault-armv.c
--- 2.4.7-rmk3/linux/arch/arm/mm/fault-armv.c	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/mm/fault-armv.c	Sat Aug 11 21:39:21 2001
@@ -84,7 +84,11 @@
 static unsigned long ai_word;
 static unsigned long ai_multi;
 
+static int ai_usermode;
+
 #ifdef CONFIG_SYSCTL
+static char *usermode_action[] = { "ignored", "SIGBUS", "fixed up" };
+
 static int proc_alignment_read(char *page, char **start, off_t off,
 			       int count, int *eof, void *data)
 {
@@ -97,6 +101,8 @@
 	p += sprintf(p, "Half:\t\t%li\n", ai_half);
 	p += sprintf(p, "Word:\t\t%li\n", ai_word);
 	p += sprintf(p, "Multi:\t\t%li\n", ai_multi);
+	p += sprintf(p, "User faults:\t%s [%u]\n", 
+			usermode_action[ai_usermode], ai_usermode);
 
 	len = (p - page) - off;
 	if (len < 0)
@@ -108,14 +114,34 @@
 	return len;
 }
 
+static int proc_alignment_write(struct file *file, const char *buffer,
+			       unsigned long count, void *data)
+{
+	int mode;
+
+	if (count > 0) {
+		if (get_user(mode, buffer))
+			return -EFAULT;
+		switch (mode) {
+		case '0'...'2':
+			   ai_usermode = mode - '0';
+		}
+	}
+	return count;
+}
+
 /*
  * This needs to be done after sysctl_init, otherwise sys/
  * will be overwritten.
  */
 static int __init alignment_init(void)
 {
-	create_proc_read_entry("sys/debug/alignment", 0, NULL,
-				proc_alignment_read, NULL);
+	struct proc_dir_entry *res;
+	res = create_proc_entry("sys/debug/alignment", 0, NULL);
+	if (!res)
+		return -1;
+	res->read_proc = proc_alignment_read;
+	res->write_proc = proc_alignment_write;
 	return 0;
 }
 
@@ -422,10 +448,27 @@
 	int (*handler)(unsigned long addr, unsigned long instr, struct pt_regs *regs);
 	unsigned int type;
 
-	if (user_mode(regs))
-		goto user;
-
-	ai_sys += 1;
+	if (user_mode(regs)) {
+		ai_user += 1;
+		switch (ai_usermode) {
+		case 0:	/* ignore */
+			set_cr(cr_no_alignment);
+			return 0;
+		case 1:	/* SIGBUS */
+#ifdef CONFIG_DEBUG_USER
+			printk( KERN_DEBUG "%s(%d): Unaligned memory access "
+				"at pc=0x%08lx, lr=0x%08lx "
+				"(bad address=0x%08lx, code %d)\n",
+				current->comm, current->pid,
+				regs->ARM_pc, regs->ARM_lr, addr, error_code );
+#endif
+			force_sig(SIGBUS, current);
+			return 0;
+		case 2:	/* fixup */
+			break;
+		}
+	} else
+		ai_sys += 1;
 
 	instrptr = instruction_pointer(regs);
 	instr = *(unsigned long *)instrptr;
@@ -515,11 +558,6 @@
 		"%08lx at [<%08lx>]", instr, instrptr);
 	ai_skipped += 1;
 	return 1;
-
-user:
-	set_cr(cr_no_alignment);
-	ai_user += 1;
-	return 0;
 }
 
 #else
diff -urN 2.4.7-rmk3/linux/arch/arm/nwfpe/ARM-gcc.h linux/arch/arm/nwfpe/ARM-gcc.h
--- 2.4.7-rmk3/linux/arch/arm/nwfpe/ARM-gcc.h	Thu Jun 17 04:11:35 1999
+++ linux/arch/arm/nwfpe/ARM-gcc.h	Sat Aug 11 21:39:21 2001
@@ -4,7 +4,11 @@
 One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
 -------------------------------------------------------------------------------
 */
+#ifndef __ARMEB__
 #define LITTLEENDIAN
+#else
+#define BIGENDIAN
+#endif
 
 /*
 -------------------------------------------------------------------------------
diff -urN 2.4.7-rmk3/linux/arch/arm/nwfpe/fpa11_cpdt.c linux/arch/arm/nwfpe/fpa11_cpdt.c
--- 2.4.7-rmk3/linux/arch/arm/nwfpe/fpa11_cpdt.c	Sat Aug 11 15:42:12 2001
+++ linux/arch/arm/nwfpe/fpa11_cpdt.c	Sat Aug 11 21:39:21 2001
@@ -43,8 +43,13 @@
    unsigned int *p;
    p = (unsigned int*)&fpa11->fpreg[Fn].fDouble;
    fpa11->fType[Fn] = typeDouble;
+#ifdef __ARMEB__
+   get_user(p[0], &pMem[0]);
+   get_user(p[1], &pMem[1]); /* sign & exponent */
+#else
    get_user(p[0], &pMem[1]);
    get_user(p[1], &pMem[0]); /* sign & exponent */
+#endif
 }   
 
 static inline
@@ -55,8 +60,13 @@
    p = (unsigned int*)&fpa11->fpreg[Fn].fExtended;
    fpa11->fType[Fn] = typeExtended;
    get_user(p[0], &pMem[0]);  /* sign & exponent */
+#ifdef __ARMEB__
+   get_user(p[1], &pMem[1]);  /* ls bits */
+   get_user(p[2], &pMem[2]);  /* ms bits */
+#else
    get_user(p[1], &pMem[2]);  /* ls bits */
    get_user(p[2], &pMem[1]);  /* ms bits */
+#endif
 }   
 
 static inline
@@ -83,9 +93,14 @@
    
       case typeExtended:
       {
+#ifdef __ARMEB__
+         get_user(p[1], &pMem[1]);
+         get_user(p[2], &pMem[2]);  /* msw */
+#else
          get_user(p[1], &pMem[2]);
          get_user(p[2], &pMem[1]);  /* msw */
-         p[0] = (x & 0x80003fff);      
+#endif
+	 p[0] = (x & 0x80003fff);      
       }
       break;
    }
@@ -133,8 +148,13 @@
 
       default: val = fpa11->fpreg[Fn].fDouble;
    }
+#ifdef __ARMEB__
+   put_user(p[0], &pMem[0]);	/* msw */
+   put_user(p[1], &pMem[1]);	/* lsw */
+#else
    put_user(p[1], &pMem[0]);	/* msw */
    put_user(p[0], &pMem[1]);	/* lsw */
+#endif
 }   
 
 static inline
@@ -158,8 +178,13 @@
    }
    
    put_user(p[0], &pMem[0]); /* sign & exp */
+#ifdef __ARMEB__
+   put_user(p[1], &pMem[1]); /* msw */
+   put_user(p[2], &pMem[2]);
+#else
    put_user(p[1], &pMem[2]);
    put_user(p[2], &pMem[1]); /* msw */
+#endif
 }   
 
 static inline
@@ -184,8 +209,13 @@
    
       case typeExtended:
       {
+#ifdef __ARMEB__
+	 put_user(p[1], &pMem[1]); /* msw */
+	 put_user(p[2], &pMem[2]);
+#else
 	 put_user(p[2], &pMem[1]); /* msw */
 	 put_user(p[1], &pMem[2]);
+#endif
 	 put_user((p[0] & 0x80003fff) | (nType << 14), &pMem[0]);
       }
       break;
diff -urN 2.4.7-rmk3/linux/drivers/char/Config.in linux/drivers/char/Config.in
--- 2.4.7-rmk3/linux/drivers/char/Config.in	Sat Aug 11 15:42:12 2001
+++ linux/drivers/char/Config.in	Sat Aug 11 21:39:21 2001
@@ -130,6 +130,18 @@
    dep_tristate 'Support for user-space parallel port device drivers' CONFIG_PPDEV $CONFIG_PARPORT
 fi
 
+if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
+   dep_tristate 'UCB1200 support' CONFIG_UCB1200 $CONFIG_EXPERIMENTAL
+   dep_tristate '   UCB1200 touchscreen support' CONFIG_TOUCHSCREEN_UCB1200 $CONFIG_UCB1200
+   dep_tristate '   UCB1200 audio support' CONFIG_AUDIO_UCB1200 $CONFIG_UCB1200
+   dep_tristate '   UCB1200 ADC support' CONFIG_ADC_UCB1200 $CONFIG_UCB1200
+   tristate 'Bitsy touchscreen support' CONFIG_TOUCHSCREEN_BITSY
+   tristate 'Profiling support (only on SA1100 for now)' CONFIG_PROFILER
+   dep_tristate 'PFS-168 SPI char device driver' CONFIG_PFS168_SPI $CONFIG_SA1100_PFS168
+   dep_tristate 'PFS-168 DTMF char device driver' CONFIG_PFS168_DTMF $CONFIG_SA1100_PFS168
+   dep_tristate 'PFS-168 Miscellaneous I/O access via proc' CONFIG_PFS168_MISC $CONFIG_SA1100_PFS168
+fi
+
 source drivers/i2c/Config.in
 source drivers/l3/Config.in
 
diff -urN 2.4.7-rmk3/linux/drivers/char/Makefile linux/drivers/char/Makefile
--- 2.4.7-rmk3/linux/drivers/char/Makefile	Sat Aug 11 15:42:12 2001
+++ linux/drivers/char/Makefile	Sat Aug 11 21:39:21 2001
@@ -81,6 +81,13 @@
   ifeq ($(CONFIG_KMI_KEYB),y)
     KEYBD    := amba_kmi_keyb.o
   endif
+  ifeq ($(CONFIG_SA1111),y)
+    KEYBD    = sa1111_keyb.o
+  endif
+  ifeq ($(CONFIG_SA1100_GRAPHICSCLIENT),y)
+    KEYMAP	 = gckeymap.o
+    KEYBD    = gc_keyb.o
+  endif
 endif
 
 ifeq ($(ARCH),sh)
@@ -138,6 +145,20 @@
 obj-$(CONFIG_SERIAL_AMBA) += serial_amba.o
 obj-$(CONFIG_SERIAL_CLPS711X) += serial_clps711x.o
 obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o
+ifeq ($(CONFIG_SERIAL_SA1100_OLD),y)
+   obj-y := $(obj-y:serial_sa1100.o=serial_sa1100_old.o)
+endif
+
+list-multi += ucb1200_core.o
+ucb1200_core-objs := ucb1200_generic.o ucb1200_sa1100.o
+export-objs += ucb1200_generic.o ucb1200_sa1100.o
+obj-$(CONFIG_UCB1200) += ucb1200_core.o
+obj-$(CONFIG_TOUCHSCREEN_UCB1200) += ucb1200_ts.o
+obj-$(CONFIG_ADC_UCB1200) += ucb1200_adc.o
+obj-$(CONFIG_AUDIO_UCB1200) += ucb1200_audio.o
+
+obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts.o
+obj-$(CONFIG_PROFILER) += profiler.o
 
 obj-$(CONFIG_TOUCHSCREEN_ANAKIN) += anakin_ts.o
 
@@ -242,6 +263,10 @@
 obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
 obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
 
+obj-$(CONFIG_PFS168_SPI) += pfs168_spi.o
+obj-$(CONFIG_PFS168_DTMF) += pfs168_dtmf.o
+obj-$(CONFIG_PFS168_MISC) += pfs168_misc.o
+
 ifeq ($(CONFIG_ARCH_ACORN),y)
 mod-subdirs	+= ../acorn/char
 subdir-y	+= ../acorn/char
@@ -262,3 +287,9 @@
 
 defkeymap.c: defkeymap.map
 	loadkeys --mktable defkeymap.map > defkeymap.c
+
+jornada720map.c: jornada720map.map
+	loadkeys --mktable jornada720map.map > jornada720map.c
+
+ucb1200_core.o: $(ucb1200_core-objs)
+	$(LD) -r -o $@ $(ucb1200_core-objs)
diff -urN 2.4.7-rmk3/linux/drivers/char/gc_kbmap.h linux/drivers/char/gc_kbmap.h
--- 2.4.7-rmk3/linux/drivers/char/gc_kbmap.h	Wed Dec 31 19:00:00 1969
+++ linux/drivers/char/gc_kbmap.h	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,162 @@
+
+
+#define KK_NONE		0x7f
+#define KK_ESC		0x00
+#define KK_F1		0x01
+#define KK_F2		0x02
+#define KK_F3		0x03
+#define KK_F4		0x04
+#define KK_F5		0x05
+#define KK_F6		0x06
+#define KK_F7		0x07
+#define KK_F8		0x08
+#define KK_F9		0x09
+#define KK_F10		0x0a
+#define KK_F11		0x0b
+#define KK_F12		0x0c
+#define KK_PRNT		0x0d
+#define KK_SCRL		0x0e
+#define KK_BRK		0x0f
+#define KK_AGR		0x10
+#define KK_1		0x11
+#define KK_2		0x12
+#define KK_3		0x13
+#define KK_4		0x14
+#define KK_5		0x15
+#define KK_6		0x16
+#define KK_7		0x17
+#define KK_8		0x18
+#define KK_9		0x19
+#define KK_0		0x1a
+#define KK_MINS		0x1b
+#define KK_EQLS		0x1c
+#define KK_BKSP		0x1e
+#define KK_INS		0x1f
+#define KK_HOME		0x20
+#define KK_PGUP		0x21
+#define KK_NUML		0x22
+#define KP_SLH		0x23
+#define KP_STR		0x24
+#define KP_MNS		0x3a
+#define KK_TAB		0x26
+#define KK_Q		0x27
+#define KK_W		0x28
+#define KK_E		0x29
+#define KK_R		0x2a
+#define KK_T		0x2b
+#define KK_Y		0x2c
+#define KK_U		0x2d
+#define KK_I		0x2e
+#define KK_O		0x2f
+#define KK_P		0x30
+#define KK_LSBK		0x31
+#define KK_RSBK		0x32
+#define KK_ENTR		0x47
+#define KK_DEL		0x34
+#define KK_END		0x35
+#define KK_PGDN		0x36
+#define KP_7		0x37
+#define KP_8		0x38
+#define KP_9		0x39
+#define KP_PLS		0x4b
+#define KK_CAPS		0x5d
+#define KK_A		0x3c
+#define KK_S		0x3d
+#define KK_D		0x3e
+#define KK_F		0x3f
+#define KK_G		0x40
+#define KK_H		0x41
+#define KK_J		0x42
+#define KK_K		0x43
+#define KK_L		0x44
+#define KK_SEMI		0x45
+#define KK_SQOT		0x46
+#define KK_HASH		0x1d
+#define KP_4		0x48
+#define KP_5		0x49
+#define KP_6		0x4a
+#define KK_LSFT		0x4c
+#define KK_BSLH		0x33
+#define KK_Z		0x4e
+#define KK_X		0x4f
+#define KK_C		0x50
+#define KK_V		0x51
+#define KK_B		0x52
+#define KK_N		0x53
+#define KK_M		0x54
+#define KK_COMA		0x55
+#define KK_DOT		0x56
+#define KK_FSLH		0x57
+#define KK_RSFT		0x58
+#define KK_UP		0x59
+#define KP_1		0x5a
+#define KP_2		0x5b
+#define KP_3		0x5c
+#define KP_ENT		0x67
+#define KK_LCTL		0x3b
+#define KK_LALT		0x5e
+#define KK_SPCE		0x5f
+#define KK_RALT		0x60
+#define KK_RCTL		0x61
+#define KK_LEFT		0x62
+#define KK_DOWN		0x63
+#define KK_RGHT		0x64
+#define KP_0		0x65
+#define KP_DOT		0x66
+
+static char kbmap[128] = {
+KK_NONE, KK_LALT, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_AGR,  KK_BSLH, KK_TAB,  KK_Z,    KK_A,    KK_X,    KK_NONE,
+KK_NONE, KK_NONE, KK_LSFT, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_LCTL, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, 0x21,   KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_ESC,  KK_DEL,  KK_Q,    KK_CAPS, KK_S,    KK_C,    KK_3,
+KK_NONE, KK_1,    KK_NONE, KK_W,    KK_NONE, KK_D,    KK_V,    KK_4,
+KK_NONE, KK_2,    KK_T,    KK_E,    KK_NONE, KK_F,    KK_B,    KK_5, 
+KK_NONE, KK_9,    KK_Y,    KK_R,    KK_K,    KK_G,    KK_N,    KK_6,
+KK_NONE, KK_0,    KK_U,    KK_O,    KK_L,    KK_H,    KK_M,    KK_7,
+KK_NONE, KK_MINS, KK_I,    KK_P,    KK_SEMI, KK_J,    KK_COMA, KK_8,
+KK_NONE, KK_EQLS, KK_ENTR, KK_LSBK, KK_BSLH, KK_FSLH, KK_DOT,  KK_NONE,
+KK_NONE, KK_NONE, KK_RSFT, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_BKSP, KK_DOWN, KK_RSBK, KK_UP,   KK_LEFT, KK_SPCE, KK_RGHT,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE};
+
+static char kbmapFN[128] = {
+KK_NONE, KK_LALT, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_LSFT, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_LCTL, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE,   0x21, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_F3,
+KK_NONE, KK_F1,   KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_F4,
+KK_NONE, KK_F2,   KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_F5,
+KK_NONE, KK_F9,   KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_F6,
+KK_NONE, KK_F10,  KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_F7,
+KK_NONE, KK_NUML, KK_NONE, KK_INS,  KK_PRNT, KK_NONE, KK_NONE, KK_F8,
+KK_NONE, KK_BRK,  KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_RSFT, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_PGDN, KK_SCRL, KK_PGUP, KK_HOME, KK_NONE, KK_END,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE};
+
+static char kbmapNL[128] = {
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KP_9,   KK_NONE, KK_NONE, KP_2,   KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KP_STR, KP_4,   KP_6,   KP_3,   KK_NONE, KP_0,   KP_7,
+KK_NONE, KK_NONE, KP_5,   KP_MNS, KP_PLS, KP_1,   KK_NONE, KP_8,
+KK_NONE, KK_NONE, KP_ENT, KK_NONE, KK_NONE, KP_SLH, KP_DOT, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE,
+KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE, KK_NONE};
+
+
+
diff -urN 2.4.7-rmk3/linux/drivers/char/gc_keyb.c linux/drivers/char/gc_keyb.c
--- 2.4.7-rmk3/linux/drivers/char/gc_keyb.c	Wed Dec 31 19:00:00 1969
+++ linux/drivers/char/gc_keyb.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,1143 @@
+/*
+ * linux/arch/arm/drivers/char/gc_keyb.c
+ *
+ * Copyright 2000 Applied Data Systems
+ *
+ * Keyboard & Smartio driver for GraphicsClient ARM Linux.
+ * Graphics Client is SA1110 based single board computer by 
+ *    Applied Data Systems (http://www.applieddata.net)
+ *
+ * Change log:
+ *    7-10/6/01 Thomas Thaele <tthaele@papenmeier.de>
+ *       - Added Keyboard Sniffer on /dev/sio12 <minor = 12>
+ *       - First implementation of PC- compatible Scancodes (thanks to pc_keyb.c)
+ *       3/23/01 Woojung Huh
+ *          Power Management added
+ * 		12/01/00 Woojung Huh
+ * 			Bug fixed
+ * 		11/16/00 Woojung Huh [whuh@applieddata.net]
+ * 			Added smartio device driver on it
+ */
+
+/*
+ * Introduced setkeycode, ketkeycode for the GC+ by Thomas Thaele
+ * <tthaele@papenmeier.de> GC+ now performs like a real PC on the keyboard.
+ * Warning: this code is still beta! PrntScrn and Pause keys are not
+ * completely tested and implemented!!! Keyboard driver can be confused
+ * by hacking like crazy on the keyboard. (hardware problem on serial line?)
+ */
+
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/kbd_ll.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/kbd_kern.h>
+
+#include <asm/irq.h>
+#include <asm/hardware.h>
+#include <asm/keyboard.h>
+#include <linux/tqueue.h>
+#include <linux/proc_fs.h>
+#include <linux/pm.h>
+
+#define ADS_AVR_IRQ	63
+
+#define	SMARTIO_IOCTL_BASES		's'
+#define	SMARTIO_KPD_TIMEOUT		_IOW(SMARTIO_IOCTL_BASES, 0, int)
+#define	SMARTIO_KPD_SETUP		_IOW(SMARTIO_IOCTL_BASES, 1, short)
+#define	SMARTIO_BL_CONTROL		_IOW(SMARTIO_IOCTL_BASES, 2, char)
+#define	SMARTIO_BL_CONTRAST		_IOW(SMARTIO_IOCTL_BASES, 3, char)
+#define SMARTIO_PORT_CONFIG		_IOW(SMARTIO_IOCTL_BASES, 4, char)
+#define SMARTIO_SNIFFER_TIMEOUT		_IOW(SMARTIO_IOCTL_BASES, 5, long)
+
+
+/* Simple translation table for the SysRq keys */
+
+#ifdef CONFIG_MAGIC_SYSRQ
+unsigned char pckbd_sysrq_xlate[128] =
+	"\000\0331234567890-=\177\t"			/* 0x00 - 0x0f */
+	"qwertyuiop[]\r\000as"				/* 0x10 - 0x1f */
+	"dfghjkl;'`\000\\zxcv"				/* 0x20 - 0x2f */
+	"bnm,./\000*\000 \000\201\202\203\204\205"	/* 0x30 - 0x3f */
+	"\206\207\210\211\212\000\000789-456+1"		/* 0x40 - 0x4f */
+	"230\177\000\000\213\214\000\000\000\000\000\000\000\000\000\000" /* 0x50 - 0x5f */
+	"\r\000/";					/* 0x60 - 0x6f */
+#endif
+
+/*
+ * Translation of escaped scancodes to keycodes.
+ * This is now user-settable.
+ * The keycodes 1-88,96-111,119 are fairly standard, and
+ * should probably not be changed - changing might confuse X.
+ * X also interprets scancode 0x5d (KEY_Begin).
+ *
+ * For 1-88 keycode equals scancode.
+ */
+
+#define E0_KPENTER 96
+#define E0_RCTRL   97
+#define E0_KPSLASH 98
+#define E0_PRSCR   99
+#define E0_RALT    100
+#define E0_BREAK   101  /* (control-pause) */
+#define E0_HOME    102
+#define E0_UP      103
+#define E0_PGUP    104
+#define E0_LEFT    105
+#define E0_RIGHT   106
+#define E0_END     107
+#define E0_DOWN    108
+#define E0_PGDN    109
+#define E0_INS     110
+#define E0_DEL     111
+
+#define E1_PAUSE   119
+
+/*
+ * The keycodes below are randomly located in 89-95,112-118,120-127.
+ * They could be thrown away (and all occurrences below replaced by 0),
+ * but that would force many users to use the `setkeycodes' utility, where
+ * they needed not before. It does not matter that there are duplicates, as
+ * long as no duplication occurs for any single keyboard.
+ */
+#define SC_LIM 89
+
+#define FOCUS_PF1 85           /* actual code! */
+#define FOCUS_PF2 89
+#define FOCUS_PF3 90
+#define FOCUS_PF4 91
+#define FOCUS_PF5 92
+#define FOCUS_PF6 93
+#define FOCUS_PF7 94
+#define FOCUS_PF8 95
+#define FOCUS_PF9 120
+#define FOCUS_PF10 121
+#define FOCUS_PF11 122
+#define FOCUS_PF12 123
+
+#define JAP_86     124
+/* tfj@olivia.ping.dk:
+ * The four keys are located over the numeric keypad, and are
+ * labelled A1-A4. It's an rc930 keyboard, from
+ * Regnecentralen/RC International, Now ICL.
+ * Scancodes: 59, 5a, 5b, 5c.
+ */
+#define RGN1 124
+#define RGN2 125
+#define RGN3 126
+#define RGN4 127
+
+static unsigned char high_keys[128 - SC_LIM] = {
+  RGN1, RGN2, RGN3, RGN4, 0, 0, 0,                   /* 0x59-0x5f */
+  0, 0, 0, 0, 0, 0, 0, 0,                            /* 0x60-0x67 */
+  0, 0, 0, 0, 0, FOCUS_PF11, 0, FOCUS_PF12,          /* 0x68-0x6f */
+  0, 0, 0, FOCUS_PF2, FOCUS_PF9, 0, 0, FOCUS_PF3,    /* 0x70-0x77 */
+  FOCUS_PF4, FOCUS_PF5, FOCUS_PF6, FOCUS_PF7,        /* 0x78-0x7b */
+  FOCUS_PF8, JAP_86, FOCUS_PF10, 0                   /* 0x7c-0x7f */
+};
+
+/* BTC */
+#define E0_MACRO   112
+/* LK450 */
+#define E0_F13     113
+#define E0_F14     114
+#define E0_HELP    115
+#define E0_DO      116
+#define E0_F17     117
+#define E0_KPMINPLUS 118
+/*
+ * My OmniKey generates e0 4c for  the "OMNI" key and the
+ * right alt key does nada. [kkoller@nyx10.cs.du.edu]
+ */
+#define E0_OK	124
+/*
+ * New microsoft keyboard is rumoured to have
+ * e0 5b (left window button), e0 5c (right window button),
+ * e0 5d (menu button). [or: LBANNER, RBANNER, RMENU]
+ * [or: Windows_L, Windows_R, TaskMan]
+ */
+#define E0_MSLW	125
+#define E0_MSRW	126
+#define E0_MSTM	127
+
+static unsigned char e0_keys[128] = {
+  0, 0, 0, 0, 0, 0, 0, 0,			      /* 0x00-0x07 */
+  0, 0, 0, 0, 0, 0, 0, 0,			      /* 0x08-0x0f */
+  0, 0, 0, 0, 0, 0, 0, 0,			      /* 0x10-0x17 */
+  0, 0, 0, 0, E0_KPENTER, E0_RCTRL, 0, 0,	      /* 0x18-0x1f */
+  0, 0, 0, 0, 0, 0, 0, 0,			      /* 0x20-0x27 */
+  0, 0, 0, 0, 0, 0, 0, 0,			      /* 0x28-0x2f */
+  0, 0, 0, 0, 0, E0_KPSLASH, 0, E0_PRSCR,	      /* 0x30-0x37 */
+  E0_RALT, 0, 0, 0, 0, E0_F13, E0_F14, E0_HELP,	      /* 0x38-0x3f */
+  E0_DO, E0_F17, 0, 0, 0, 0, E0_BREAK, E0_HOME,	      /* 0x40-0x47 */
+  E0_UP, E0_PGUP, 0, E0_LEFT, E0_OK, E0_RIGHT, E0_KPMINPLUS, E0_END,/* 0x48-0x4f */
+  E0_DOWN, E0_PGDN, E0_INS, E0_DEL, 0, 0, 0, 0,	      /* 0x50-0x57 */
+  0, 0, 0, E0_MSLW, E0_MSRW, E0_MSTM, 0, 0,	      /* 0x58-0x5f */
+  0, 0, 0, 0, 0, 0, 0, 0,			      /* 0x60-0x67 */
+  0, 0, 0, 0, 0, 0, 0, E0_MACRO,		      /* 0x68-0x6f */
+  0, 0, 0, 0, 0, 0, 0, 0,			      /* 0x70-0x77 */
+  0, 0, 0, 0, 0, 0, 0, 0			      /* 0x78-0x7f */
+};
+
+int gc_kbd_setkeycode(unsigned int scancode, unsigned int keycode)
+{
+	if (scancode < SC_LIM || scancode > 255 || keycode > 127)
+	  return -EINVAL;
+	if (scancode < 128)
+	  high_keys[scancode - SC_LIM] = keycode;
+	else
+	  e0_keys[scancode - 128] = keycode;
+	return 0;
+}
+
+int gc_kbd_getkeycode(unsigned int scancode)
+{
+	return
+	  (scancode < SC_LIM || scancode > 255) ? -EINVAL :
+	  (scancode < 128) ? high_keys[scancode - SC_LIM] :
+	    e0_keys[scancode - 128];
+}
+
+int gc_kbd_translate(unsigned char scancode, unsigned char *keycode,
+		    char raw_mode)
+{
+	static int prev_scancode;
+
+	/* special prefix scancodes.. */
+	if (scancode == 0xe0 || scancode == 0xe1) {
+		prev_scancode = scancode;
+		return 0;
+	}
+
+	/* 0xFF is sent by a few keyboards, ignore it. 0x00 is error */
+	if (scancode == 0x00 || scancode == 0xff) {
+		prev_scancode = 0;
+		return 0;
+	}
+
+	scancode &= 0x7f;
+
+	if (prev_scancode) {
+	  /*
+	   * usually it will be 0xe0, but a Pause key generates
+	   * e1 1d 45 e1 9d c5 when pressed, and nothing when released
+	   */
+	  if (prev_scancode != 0xe0) {
+	      if (prev_scancode == 0xe1 && scancode == 0x1d) {
+		  prev_scancode = 0x100;
+		  return 0;
+	      } else if (prev_scancode == 0x100 && scancode == 0x45) {
+		  *keycode = E1_PAUSE;
+		  prev_scancode = 0;
+	      } else {
+#ifdef KBD_REPORT_UNKN
+		  if (!raw_mode)
+		    printk(KERN_INFO "keyboard: unknown e1 escape sequence\n");
+#endif
+		  prev_scancode = 0;
+		  return 0;
+	      }
+	  } else {
+	      prev_scancode = 0;
+	      /*
+	       *  The keyboard maintains its own internal caps lock and
+	       *  num lock statuses. In caps lock mode E0 AA precedes make
+	       *  code and E0 2A follows break code. In num lock mode,
+	       *  E0 2A precedes make code and E0 AA follows break code.
+	       *  We do our own book-keeping, so we will just ignore these.
+	       */
+	      /*
+	       *  For my keyboard there is no caps lock mode, but there are
+	       *  both Shift-L and Shift-R modes. The former mode generates
+	       *  E0 2A / E0 AA pairs, the latter E0 B6 / E0 36 pairs.
+	       *  So, we should also ignore the latter. - aeb@cwi.nl
+	       */
+	      if (scancode == 0x2a || scancode == 0x36)
+		return 0;
+
+	      if (e0_keys[scancode])
+		*keycode = e0_keys[scancode];
+	      else {
+#ifdef KBD_REPORT_UNKN
+		  if (!raw_mode)
+		    printk(KERN_INFO "keyboard: unknown scancode e0 %02x\n",
+			   scancode);
+#endif
+		  return 0;
+	      }
+	  }
+	} else if (scancode >= SC_LIM) {
+	    /* This happens with the FOCUS 9000 keyboard
+	       Its keys PF1..PF12 are reported to generate
+	       55 73 77 78 79 7a 7b 7c 74 7e 6d 6f
+	       Moreover, unless repeated, they do not generate
+	       key-down events, so we have to zero up_flag below */
+	    /* Also, Japanese 86/106 keyboards are reported to
+	       generate 0x73 and 0x7d for \ - and \ | respectively. */
+	    /* Also, some Brazilian keyboard is reported to produce
+	       0x73 and 0x7e for \ ? and KP-dot, respectively. */
+
+	  *keycode = high_keys[scancode - SC_LIM];
+
+	  if (!*keycode) {
+	      if (!raw_mode) {
+#ifdef KBD_REPORT_UNKN
+		  printk(KERN_INFO "keyboard: unrecognized scancode (%02x)"
+			 " - ignored\n", scancode);
+#endif
+	      }
+	      return 0;
+	  }
+ 	} else
+	  *keycode = scancode;
+ 	return 1;
+}
+
+// this table converts the hardware dependent codes of a MF-2 Keyboard to
+// the codes normally comming out of a i8042. This table is 128 Bytes too
+// big, but for stability reasons it should be kept like it is!
+// There is no range checking in the code!
+static int mf_two_kbdmap[256] = {
+	00, 67, 65, 63, 61, 59, 60, 88, 00, 68, 66, 64, 62, 15, 41, 00,
+	00, 56, 42, 00, 29, 16, 02, 00, 00, 00, 44, 31, 30, 17, 03, 00,
+	00, 46, 45, 32, 18, 05, 04, 00, 00, 57, 47, 33, 20, 19, 06, 00,
+	00, 49, 48, 35, 34, 21,  7, 00, 00, 00, 50, 36, 22,  8,  9, 00,
+	00, 51, 37, 23, 24, 11, 10, 00, 00, 52, 53, 38, 39, 25, 12, 00,
+	00, 00, 40, 00, 26, 13, 00, 00, 58, 54, 28, 27, 00, 43, 00, 00, 
+	00, 86, 00, 00, 00, 00, 14, 00, 00, 79, 00, 75, 71, 00, 00, 00, 
+	82, 83, 80, 76, 77, 72, 01, 69, 87, 78, 81, 74, 55, 73, 70, 00,
+	00, 00, 00, 65, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+	00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+	00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+	00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+	00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+	00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+	00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00,
+	00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00 };
+
+
+// some texts displayed by the proc_file_system
+static char *kbd_sniff[2] = { "off", "on" };
+static char *kbd_sniff_mode[2] = { "passive", "active" };
+
+#define PASSIVE 0
+#define ACTIVE  1
+
+// is the sniffer active (1) or inactive (0)
+static int  SNIFFER = 0;
+// do we get a copy (SNIFFMODE = PASSIVE) or do we get the original data (SNIFFMODE = ACTIVE)
+// and have to reinsert the data
+static int  SNIFFMODE = PASSIVE;
+
+// we allow only one process to sniff
+static int sniffer_in_use = 0;
+
+// timeout for the keyboard sniffer -1 = blocking, otherwise timeout in msecs
+static long sniffer_timeout = -1;
+
+// the value we sniffed from the keyboard
+static int sniffed_value;
+
+static char *smartio_version = "1.02 MF-II compatibility patch <tthaele@papenmeier.de>";
+static char *smartio_date = "Jun-07-2001";
+
+static int sio_reset_flag;
+static int kbd_press_flag;
+
+static void send_SSP_msg(unchar *pBuf, int num)
+{
+	ushort	tmp;
+	int		i;
+
+	for (i=0;i<num;i++) {
+		while ((Ser4SSSR & SSSR_TNF) == 0);
+		tmp = pBuf[i];
+		Ser4SSDR = (tmp << 8);
+	}
+	
+	// Throw away Echo
+	for (i=0;i<num;i++) {
+		while ((Ser4SSSR & SSSR_RNE) == 0);
+		tmp = Ser4SSDR;
+	}
+}
+
+static unchar ReadSSPByte(void)
+{
+	if (Ser4SSSR & SSSR_ROR) {
+		printk("%s() : Overrun\n", __FUNCTION__);
+		return 0;
+	}
+
+	Ser4SSDR = 0x00;
+
+	while ((Ser4SSSR & SSSR_RNE) == 0);
+
+	return ((unchar) Ser4SSDR);
+}
+
+static ulong read_SSP_response(int num)
+{
+	int		i;
+	ulong	ret;
+	
+	// discard leading 0x00 and command echo 0 (command group value)
+	while (ReadSSPByte() == 0);
+	// discard command echo 1 (command code value)
+	ReadSSPByte();
+
+	// data from SMARTIO
+	// It assumes LSB first.
+	// NOTE:Some command uses MSB first order
+	ret = 0;
+	for (i=0;i<num;i++) {
+		ret |= ReadSSPByte() << (8*i);
+	}
+
+	return ret;
+}
+
+typedef	struct	t_SMARTIO_CMD {
+	unchar	Group;
+	unchar	Code; 
+	unchar  Opt[2];
+}	SMARTIO_CMD;
+
+static	SMARTIO_CMD RD_INT_CMD = { 0x83, 0x01, { 0x00, 0x00 } };
+static	SMARTIO_CMD RD_KBD_CMD = { 0x83, 0x02, { 0x00, 0x00 } };
+static	SMARTIO_CMD RD_ADC_CMD = { 0x83, 0x28, { 0x00, 0x00 } };
+static	SMARTIO_CMD RD_KPD_CMD = { 0x83, 0x04, { 0x00, 0x00 } };
+
+static	volatile ushort	adc_value;
+static	volatile unchar	kpd_value;
+static	unsigned int	kpd_timeout = 10000;			// 10000 msec
+
+static  ulong kbd_int, kpd_int, adc_int;
+
+static void smartio_interrupt_task(void *data);
+
+static struct tq_struct tq_smartio = {
+		{ NULL,	NULL },		// struct list_head
+		0,			// unsigned long sync
+		smartio_interrupt_task,	// void (*routine)(void *)
+		NULL,			// void *data
+};
+
+DECLARE_WAIT_QUEUE_HEAD(smartio_queue);
+DECLARE_WAIT_QUEUE_HEAD(smartio_adc_queue);
+DECLARE_WAIT_QUEUE_HEAD(smartio_kpd_queue);
+DECLARE_WAIT_QUEUE_HEAD(keyboard_done_queue);
+DECLARE_WAIT_QUEUE_HEAD(sniffer_queue);
+
+static spinlock_t smartio_busy_lock = SPIN_LOCK_UNLOCKED;
+static atomic_t	smartio_busy = ATOMIC_INIT(0);
+
+static int f_five_pressed = 0;
+static int f_seven_pressed = 0;
+//static int e_null_counter = 0;
+//static int f_null_counter = 0;
+//static int keydown = 0;
+static unchar previous_code = 0;
+//static int e0 = 0;
+
+static void smartio_interrupt_task(void *arg)
+{
+	unchar	code;
+	unsigned long flags;
+	unchar  dummy;
+
+	spin_lock_irqsave(&smartio_busy_lock, flags);
+	if (atomic_read(&smartio_busy) == 1) {
+		spin_unlock_irqrestore(&smartio_busy_lock, flags);
+		queue_task(&tq_smartio, &tq_timer);
+	}
+	else {
+		atomic_set(&smartio_busy, 1);
+		spin_unlock_irqrestore(&smartio_busy_lock, flags);
+	}
+
+	/* Read SMARTIO Interrupt Status to check which Interrupt is occurred 
+	 * and Clear SMARTIO Interrupt */
+	send_SSP_msg((unchar *) &RD_INT_CMD, 2);
+	code = (unchar) (read_SSP_response(1) & 0xFF);
+
+#ifdef CONFIG_VT
+	if (code  & 0x04) {					// Keyboard Interrupt
+		kbd_int++;
+		/* Read Scan code */
+		send_SSP_msg((unchar *) &RD_KBD_CMD, 2);
+		code = (unchar) (read_SSP_response(1) & 0xFF);
+		dummy = code & 0x80;
+		if ((code == 0xE0) || (code == 0xE1) || (code == 0xF0)) {	// combined code
+			if (code == 0xF0) {
+				if (!previous_code) {
+					code = 0xE0;
+					previous_code = 0xF0;
+				} else {
+					code = mf_two_kbdmap[code & 0x7F] | dummy;
+					previous_code = 0;
+				}
+			} else if (code == 0xE0) {
+				if (previous_code != 0) {
+					code = mf_two_kbdmap[code & 0x7F] | dummy;
+					previous_code = 0;
+				} else previous_code = code;
+			} else {						// 0xE1
+				if (!previous_code) {
+					code = mf_two_kbdmap[code &0x7F] | dummy;
+					previous_code = 0;
+				} else {
+					previous_code = code;
+				}
+			}
+		} else {
+			if (code == 0x03) {
+				f_five_pressed = 1;
+			} else if (code == 0x83) {
+				if (f_five_pressed != 0) {
+					f_five_pressed = 0;
+					code = 0x03;
+				} else if (f_seven_pressed == 0) {
+					f_seven_pressed = 1;
+					code = 2;
+					dummy = 0;
+				} else {
+					f_seven_pressed = 0;
+					code = 2;
+				}
+			}
+			previous_code = 0;
+			code &= 0x7F;
+			code = mf_two_kbdmap[code] | dummy;
+		}
+		sniffed_value = (ushort)code;
+		if (SNIFFER) wake_up_interruptible(&sniffer_queue);
+		if (SNIFFMODE == PASSIVE) {
+			handle_scancode( code, (code & 0x80) ? 0 : 1 );
+			if (code & 0x80) {
+				wake_up_interruptible(&keyboard_done_queue);
+				udelay(10000);		// this makes the whole thing a bit more stable
+							// keyboard handling can be corrupted when hitting
+							// thousands of keys like crazy. kbd_translate might catch up
+							// with irq routine? or there is simply a buffer overflow on
+							// the serial device? somehow it looses some key sequences.
+							// if a break code is lost or coruppted the keyboard starts
+							// to autorepeat like crazy and appears to hang.
+							// this needs further investigations! Thomas
+				kbd_press_flag = 0;
+			}
+			else
+				kbd_press_flag = 1;
+		}
+		code = 0;       // prevent furthermore if ... then to react!
+	}
+#endif
+	// ADC resolution is 10bit (0x000 ~ 0x3FF)
+	if (code & 0x02) {					// ADC Complete Interrupt
+		adc_int++;
+		send_SSP_msg((unchar *) &RD_ADC_CMD, 2);
+		adc_value = (ushort) (read_SSP_response(2) & 0x3FF);
+		wake_up_interruptible(&smartio_adc_queue);
+	}
+
+	if (code & 0x08) { 					// Keypad interrupt
+		kpd_int++;
+		send_SSP_msg((unchar *) &RD_KPD_CMD, 2);
+		kpd_value = (unchar) (read_SSP_response(1) & 0xFF);
+		wake_up_interruptible(&smartio_kpd_queue);
+	}
+
+	spin_lock_irqsave(&smartio_busy_lock, flags);
+	atomic_set(&smartio_busy, 0);
+	spin_unlock_irqrestore(&smartio_busy_lock, flags);
+
+	enable_irq(ADS_AVR_IRQ);
+
+	wake_up_interruptible(&smartio_queue);
+}
+
+static void gc_sio_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+#ifdef CONFIG_VT
+	kbd_pt_regs = regs;
+#endif
+
+	// *NOTE*
+	// ADS SMARTIO interrupt is cleared after reading interrupt status
+	// from smartio. 
+	// disable SMARTIO IRQ here and re-enable at samrtio_bh.
+	// 11/13/00 Woojung
+	disable_irq(ADS_AVR_IRQ);
+
+	queue_task(&tq_smartio, &tq_immediate);
+	mark_bh(IMMEDIATE_BH);
+}
+
+void gc_kbd_disable_irq( void )
+{
+}
+
+void gc_kbd_enable_irq( void )
+{
+}
+
+void gc_kbd_leds(unsigned char leds)
+{
+}
+
+static inline void gc_sio_init(void)
+{
+	GPDR |= (GPIO_GPIO10 | GPIO_GPIO12 | GPIO_GPIO13); 	// Output
+	GPDR &= ~GPIO_GPIO11;
+
+	// Alternative Function
+	GAFR |= (GPIO_GPIO10 | GPIO_GPIO11 | GPIO_GPIO12 | GPIO_GPIO13);
+
+	Ser4SSCR0 = 0xA707;
+	Ser4SSSR = SSSR_ROR;
+	Ser4SSCR1 = 0x0010;
+	Ser4SSCR0 = 0xA787;
+
+	// Reset SMARTIO
+	ADS_AVR_REG &= 0xFE;
+	udelay(300*1000);			// 10 mSec
+	ADS_AVR_REG |= 0x01;
+	udelay(10*1000);			// 10 mSec
+
+}
+
+void __init gc_kbd_init_hw(void)
+{
+	printk (KERN_INFO "Graphics Client keyboard driver v1.0\n");
+
+	gc_sio_init();
+
+	if (request_irq(ADS_AVR_IRQ,gc_sio_interrupt,0,"smartio", NULL) != 0)
+		printk("Could not allocate SMARTIO IRQ!\n");
+
+	sio_reset_flag = 1;
+}
+
+/* SMARTIO ADC Interface */
+#define SMARTIO_VERSION				0
+#define SMARTIO_PORT_A				1
+#define SMARTIO_PORT_B				2
+#define SMARTIO_PORT_C				3
+#define SMARTIO_PORT_D				4
+#define SMARTIO_SELECT_OPTION			5
+#define SMARTIO_BACKLITE			6
+#define SMARTIO_KEYPAD				7
+#define SMARTIO_ADC				8
+#define	SMARTIO_VEE_PWM				9
+#define SMARTIO_SLEEP				11
+#define SMARTIO_KBD_SNIFFER			12
+
+static	SMARTIO_CMD CONV_ADC_CMD = { 0x80, 0x28, { 0x00, 0x00 } };
+static	SMARTIO_CMD READ_PORT_CMD = { 0x82, 0x00, { 0x00, 0x00 } };
+
+static	SMARTIO_CMD READ_DEVVER_CMD = { 0x82, 0x05, { 0x00, 0x00 } };
+static	SMARTIO_CMD READ_DEVTYPE_CMD = { 0x82, 0x06, { 0x00, 0x00 } };
+static	SMARTIO_CMD READ_FWLEVEL_CMD = { 0x82, 0x07, { 0x00, 0x00 } };
+
+static int lock_smartio(unsigned long *flags)
+{
+	spin_lock_irqsave(&smartio_busy_lock, *flags);
+	if (atomic_read(&smartio_busy) == 1) {
+		spin_unlock_irqrestore(&smartio_busy_lock, *flags);
+		interruptible_sleep_on(&smartio_queue);
+	}
+	else {
+		atomic_set(&smartio_busy, 1);
+		spin_unlock_irqrestore(&smartio_busy_lock, *flags);
+	}
+
+	return 1;
+}
+
+static int unlock_smartio(unsigned long *flags)
+{
+	spin_lock_irqsave(&smartio_busy_lock, *flags);
+	atomic_set(&smartio_busy, 0);
+	spin_unlock_irqrestore(&smartio_busy_lock, *flags);
+
+	return 1;
+}
+
+static ushort read_sio_adc(int channel)
+{
+	unsigned long	flags;
+
+	if ((channel < 0) || (channel > 7)) 
+		return 0xFFFF;
+
+	CONV_ADC_CMD.Opt[0] = (unchar) channel;
+
+	lock_smartio(&flags);
+	send_SSP_msg((unchar *) &CONV_ADC_CMD, 3);
+	unlock_smartio(&flags);
+
+	interruptible_sleep_on(&smartio_adc_queue);
+
+	return adc_value & 0x3FF;
+}
+
+static ushort read_sio_port(int port)
+{
+	unsigned long	flags;
+	ushort			ret;
+
+	if ((port < SMARTIO_PORT_B) || (port > SMARTIO_PORT_D)) 
+		return 0xFFFF;
+
+	READ_PORT_CMD.Code = (unchar) port;
+
+	lock_smartio(&flags);
+	send_SSP_msg((unchar *) &READ_PORT_CMD, 2);
+	ret = read_SSP_response(1);
+	unlock_smartio(&flags);
+
+	return ret;
+}
+
+static ushort read_sio_kpd(void)
+{
+	long	timeout;
+
+	// kpd_timeout is mSec order
+	// interrupt_sleep_on_timeout is based on 10msec timer tick
+	if (kpd_timeout == -1) {
+		interruptible_sleep_on(&smartio_kpd_queue);
+	}
+	else {
+		timeout = interruptible_sleep_on_timeout(&smartio_kpd_queue,
+								kpd_timeout/10);
+		if (timeout == 0) {
+			// timeout without keypad input
+			return 0xFFFF;
+		}
+	}
+	return kpd_value;
+}
+
+static ushort read_sio_sniff(void)
+{
+        long    timeout;
+
+        // kpd_timeout is mSec order
+        // interrupt_sleep_on_timeout is based on 10msec timer tick
+        if (sniffer_timeout == -1) {
+                interruptible_sleep_on(&sniffer_queue);
+        }
+        else {
+                timeout = interruptible_sleep_on_timeout(&sniffer_queue,
+                                                                sniffer_timeout/10);
+                if (timeout == 0) {
+                        // timeout without keypad input
+                        return -1;
+                }
+        }
+        return (ushort)sniffed_value;
+}
+
+static struct sio_ver {
+	uint	DevVer;
+	uint	DevType;
+	uint	FwLevel;
+};
+
+static ushort read_sio_version(struct sio_ver *ptr)
+{
+	unsigned long	flags;
+	ushort          ret;
+
+	// Read Device Version 
+	lock_smartio(&flags);
+	send_SSP_msg((unchar *) &READ_DEVVER_CMD, 2);
+	ret = read_SSP_response(1);
+	unlock_smartio(&flags);
+	ptr->DevVer = (uint)ret;
+	// Read Device Type
+	lock_smartio(&flags);
+	send_SSP_msg((unchar *) &READ_DEVTYPE_CMD, 2);
+	ret = read_SSP_response(2);
+	unlock_smartio(&flags);
+	// swap MSB & LSB
+	ret = ((ret & 0xFF) << 8) | ((ret & 0xFF00) >> 8);
+	ptr->DevType = (uint)ret;
+	// Read Firmware Level
+	lock_smartio(&flags);
+	send_SSP_msg((unchar *) &READ_FWLEVEL_CMD, 2);
+	ret = read_SSP_response(2);
+	unlock_smartio(&flags);
+	// swap MSB & LSB
+	ret = ((ret & 0xFF) << 8) | ((ret & 0xFF00) >> 8);
+	ptr->FwLevel = (uint)ret;
+
+	return 0;
+}
+
+static ssize_t sio_read(struct file *file, char *buf, size_t count, loff_t *ppos)
+{
+	struct inode *inode = file->f_dentry->d_inode;
+	unsigned int minor = MINOR(inode->i_rdev);
+	ushort	*ret = (ushort *)buf;
+
+	switch (minor) {
+	case	SMARTIO_ADC:
+			if ((*ret = read_sio_adc(buf[0])) != 0xFFFF)
+				return sizeof(ushort);					// 2 bytes
+	case	SMARTIO_PORT_B:
+	case	SMARTIO_PORT_C:
+	case	SMARTIO_PORT_D:
+			if ((*ret = read_sio_port(minor)) != 0xFFFF)
+				return sizeof(ushort);
+	case	SMARTIO_VERSION:
+			if ((read_sio_version((struct sio_ver *)buf)) != 0xFFFF)
+				return sizeof(struct sio_ver);
+	case	SMARTIO_KEYPAD:
+			if ((*ret = read_sio_kpd()) != 0xFFFF)
+				return sizeof(ushort);
+	case	SMARTIO_KBD_SNIFFER:
+			if ((*ret = read_sio_sniff()) != (ushort)-1)
+				return 1;
+	default :
+			return -ENXIO;
+	}
+}
+
+static	SMARTIO_CMD WRITE_PORT_CMD = { 0x81, 0x00, { 0x00, 0x00 } };
+static	SMARTIO_CMD SELECT_OPT_CMD = { 0x80, 0x00, { 0x00, 0x00 } };
+static	SMARTIO_CMD CONTROL_BL_CMD = { 0x80, 0x00, { 0x00, 0x00 } };
+static	SMARTIO_CMD CONTRAST_BL_CMD = { 0x80, 0x21, { 0x00, 0x00 } };
+static	SMARTIO_CMD CONTROL_KPD_CMD = { 0x80, 0x27, { 0x00, 0x00 } };
+static	SMARTIO_CMD CONTROL_VEE_CMD = { 0x80, 0x22, { 0x00, 0x00 } };
+
+static ushort write_sio_port(int port, unchar value)
+{
+	unsigned long	flags;
+
+	if ((port < SMARTIO_PORT_B) || (port > SMARTIO_PORT_D)) 
+		return 0xFFFF;
+
+	WRITE_PORT_CMD.Code = (unchar) port;
+	WRITE_PORT_CMD.Opt[0] = (unchar) value;
+
+	lock_smartio(&flags);
+	send_SSP_msg((unchar *) &WRITE_PORT_CMD, 3);
+	unlock_smartio(&flags);
+
+	return 0;
+}
+
+static ushort write_sio_select(unchar select)
+{
+	unsigned long	flags;
+
+	if ((select < 1) || (select > 2)) 
+		return 0xFFFF;
+
+	SELECT_OPT_CMD.Code = (unchar) (select + 0x28);
+
+	lock_smartio(&flags);
+	send_SSP_msg((unchar *) &SELECT_OPT_CMD, 2);
+	unlock_smartio(&flags);
+
+	return 0;
+}
+
+static ushort control_sio_backlite(int cmd, int value)
+{
+	unsigned long	flags;
+
+	if (cmd == SMARTIO_BL_CONTRAST) {
+		value &= 0xFF;
+		CONTRAST_BL_CMD.Opt[0] = (unchar) value;
+
+		lock_smartio(&flags);
+		send_SSP_msg((unchar *) &CONTRAST_BL_CMD, 3);
+		unlock_smartio(&flags);
+	}
+	else if (cmd == SMARTIO_BL_CONTROL) {
+		if (value == 0x00) {
+			// Backlite OFF
+			CONTROL_BL_CMD.Code = 0x24;
+		}
+		else {
+			// Backlite ON
+			CONTROL_BL_CMD.Code = 0x23;
+		}
+		lock_smartio(&flags);
+		send_SSP_msg((unchar *) &CONTROL_BL_CMD, 2);
+		unlock_smartio(&flags);
+	}
+	else 
+		return 0xFFFF;
+
+	return 0;
+}
+
+static ushort control_sio_keypad(int x, int y)
+{
+	unsigned long	flags;
+
+	if ( (x<1) || (x>8) || (y<1) || (y>8)) {
+		return 0xFFFF;
+	}
+
+	CONTROL_KPD_CMD.Opt[0] = (unchar) x;
+	CONTROL_KPD_CMD.Opt[1] = (unchar) y;
+
+	lock_smartio(&flags);
+	send_SSP_msg((unchar *) &CONTROL_KPD_CMD, 4);
+	unlock_smartio(&flags);
+
+	return 0;
+}
+
+static ushort control_sio_vee(int value)
+{
+	unsigned long	flags;
+
+	value &= 0xFF;
+	CONTROL_VEE_CMD.Opt[0] = (unchar) value;
+
+	lock_smartio(&flags);
+	send_SSP_msg((unchar *) &CONTROL_VEE_CMD, 3);
+	unlock_smartio(&flags);
+									   
+	return 0;
+}
+
+static ssize_t sio_write(struct file *file, const char *buf, size_t cont, loff_t *ppos)
+{
+	struct inode *inode = file->f_dentry->d_inode;
+	unsigned int minor = MINOR(inode->i_rdev);
+
+	switch (minor) {
+	case	SMARTIO_PORT_B:
+	case	SMARTIO_PORT_C:
+	case	SMARTIO_PORT_D:
+			if (write_sio_port(minor, buf[0]) != 0xFFFF)
+				return 1;
+	case	SMARTIO_SELECT_OPTION:
+			if (write_sio_select(buf[0]) != 0xFFFF)
+				return 1;
+	case	SMARTIO_BACKLITE:
+			if (control_sio_backlite(SMARTIO_BL_CONTROL, buf[0]) != 0xFFFF)
+				return 1;
+	case	SMARTIO_KEYPAD:
+			if (control_sio_keypad(buf[0], buf[1]) != 0xFFFF)
+				return 2;
+	case	SMARTIO_VEE_PWM:
+			if (control_sio_vee(buf[0]) != 0xFFFF)
+				return 1;
+	case	SMARTIO_KBD_SNIFFER:
+			// here are the scancodes injected
+			handle_scancode((unchar)buf[0], (buf[0] & 0x80) ? 0 : 1);
+			wake_up_interruptible(&keyboard_done_queue);
+			// give some time to process! File IO is a bit faster than manual typing ;-)
+			udelay(10000);
+			return 1;
+	default:
+		return -ENXIO;
+	}
+}
+
+static unsigned int sio_poll(struct file *file, struct poll_table_struct *wait)
+{
+	return 0;
+}
+
+static	SMARTIO_CMD IOCTL_PORT_CMD = { 0x81, 0x00, { 0x00, 0x00 } };
+
+static ushort ioctl_sio_port(int port, unchar value)
+{
+	unsigned long	flags;
+
+	if ((port < SMARTIO_PORT_B) || (port > SMARTIO_PORT_D)) 
+		return 0xFFFF;
+
+	IOCTL_PORT_CMD.Code = (unchar) port + 0x04;		// 0x05 ~ 0x08
+	if (port == SMARTIO_PORT_B) {
+		// Port B has 4 bits only
+		IOCTL_PORT_CMD.Opt[0] = (unchar) value & 0x0F;
+	}
+	else
+		IOCTL_PORT_CMD.Opt[0] = (unchar) value;
+
+	lock_smartio(&flags);
+	send_SSP_msg((unchar *) &IOCTL_PORT_CMD, 3);
+	unlock_smartio(&flags);
+
+	return 0;
+}
+
+static int sio_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+{
+	unsigned int minor = MINOR(inode->i_rdev);
+	unchar	*buf = (unchar *)arg;
+
+	switch (minor) {
+	case	SMARTIO_PORT_B:
+	case	SMARTIO_PORT_C:
+	case	SMARTIO_PORT_D:
+			if (cmd == SMARTIO_PORT_CONFIG) {
+				if (ioctl_sio_port(minor, buf[0]) != 0xFFFF)
+					return 0;
+			}
+			return -EINVAL;
+	case	SMARTIO_SELECT_OPTION:
+			if (write_sio_select(buf[0]) != 0xFFFF) return 0;
+			return -EINVAL;
+	case	SMARTIO_BACKLITE:
+			if (cmd == SMARTIO_BL_CONTROL) {
+				if (control_sio_backlite(SMARTIO_BL_CONTROL, buf[0]) != 0xFFFF) return 0;
+			}
+			else if (cmd == SMARTIO_BL_CONTRAST) {
+				if (control_sio_backlite(SMARTIO_BL_CONTRAST, buf[0]) != 0xFFFF) return 0;
+			}
+			else return -EINVAL;
+	case	SMARTIO_KEYPAD:
+			if (cmd == SMARTIO_KPD_TIMEOUT) {
+				kpd_timeout = *(long*)buf;
+				return 0;
+			}
+			else if (cmd == SMARTIO_KPD_SETUP) {
+				if (control_sio_keypad(buf[0], buf[1]) != 0xFFFF) return 0;
+			}
+			return -EINVAL;
+	case	SMARTIO_VEE_PWM:
+			if (control_sio_vee(buf[0]) != 0xFFFF) return 0;
+			return -EINVAL;
+	case	SMARTIO_KBD_SNIFFER:
+			if (cmd == SMARTIO_SNIFFER_TIMEOUT) {
+				sniffer_timeout = *(long*)buf;
+				if (sniffer_timeout < 0) sniffer_timeout = -1;
+				// the value will be devided by 10 later on
+				if (!sniffer_timeout) sniffer_timeout = 10;
+				return 0;
+			}
+			return -EINVAL;
+	default:
+		return -ENXIO;
+	}
+}
+
+static int sio_open(struct inode *inode, struct file *file)
+{
+        unsigned int minor = MINOR(inode->i_rdev);
+
+	// we open all by default. we only have a special handler for the kbd sniffer
+	switch (minor) {
+		case SMARTIO_KBD_SNIFFER:
+			if (sniffer_in_use) return -EBUSY;
+			sniffer_in_use = 1;
+			SNIFFER = 1;
+			// sniff in active or passive mode
+			if ((file->f_flags & O_RDWR) == O_RDWR) SNIFFMODE = 1; else SNIFFMODE = 0;
+			// do we have a blocking or non blocking sniffer?
+			if ((file->f_flags & O_NONBLOCK) == O_NONBLOCK) sniffer_timeout = 100; else sniffer_timeout = -1;
+			break;
+		default:
+			break;
+	}
+	return 0;
+}
+
+static int sio_close(struct inode *inode, struct file *file)
+{
+        unsigned int minor = MINOR(inode->i_rdev);
+
+	switch (minor) {
+		case SMARTIO_KBD_SNIFFER:
+			SNIFFER = 0;
+			SNIFFMODE = 0;
+			sniffer_in_use = 0;
+			break;
+		default:
+			break;
+	}
+	return 0;
+}
+
+static struct file_operations sio_fops = {
+	read: 		sio_read,
+	write:		sio_write,
+	poll:		sio_poll,
+	ioctl:		sio_ioctl,
+	open:		sio_open,
+	release:	sio_close,
+};
+
+static struct proc_dir_entry *sio_dir, *parent_dir = NULL;
+
+#define	SMARTIO_MAJOR	58
+#define	MAJOR_NR	SMARTIO_MAJOR
+
+#define	PROC_NAME	"sio"
+
+static int sio_read_proc(char *buf, char **start, off_t pos, int count, int *eof, void *data) 
+{
+	char	*p = buf;
+
+	p += sprintf(p, "ADS SMARTIO Status: \n");
+	p += sprintf(p, "\t Keyboard Interrupt : %lu\n", kbd_int);
+	p += sprintf(p, "\t Keypad Interrupt : %lu\n", kpd_int);
+	p += sprintf(p, "\t ADC Interrupt : %lu\n", adc_int);
+	p += sprintf(p, "\t Keyboard Sniffer : %s mode : %s\n", kbd_sniff[ SNIFFER ], kbd_sniff_mode [ SNIFFMODE ]);
+
+	return (p-buf);
+}
+
+#ifdef	CONFIG_PM
+static int pm_smartio_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
+{
+	switch (rqst) {
+		case	PM_RESUME:
+			gc_sio_init();
+			break;
+		case	PM_SUSPEND:
+			// 4/5/01 Woojung
+			// It checks Keybard received pair of press/release code.
+			// System can sleep before receiving release code
+			if (kbd_press_flag) {
+				interruptible_sleep_on(&keyboard_done_queue);
+			}
+			break;
+	}
+
+	return 0;
+}
+#endif
+
+void __init sio_init(void)
+{
+	if (register_chrdev(MAJOR_NR, "sio", &sio_fops)) {
+		printk("smartio : unable to get major %d\n", MAJOR_NR);
+		return;
+	}
+	else {
+		printk("smartio driver initialized. version %s, date:%s\n", 
+				smartio_version, smartio_date);
+		
+		if (sio_reset_flag != 1) {
+			gc_sio_init();
+			if (request_irq(ADS_AVR_IRQ, gc_sio_interrupt,0,"sio",NULL) != 0){ 
+				printk("smartio : Could not allocate IRQ!\n");
+				return;
+			}
+		}
+
+		if ((sio_dir = create_proc_entry(PROC_NAME, 0, parent_dir)) == NULL) {
+			printk("smartio : Unable to create /proc entry\n");
+			return;
+		}
+		else {
+			sio_dir->read_proc = sio_read_proc;
+#ifdef	CONFIG_PM
+			pm_register(PM_SYS_DEV, PM_SYS_KBC, pm_smartio_callback);
+#endif
+		}
+	}
+}
diff -urN 2.4.7-rmk3/linux/drivers/char/gckeymap.c linux/drivers/char/gckeymap.c
--- 2.4.7-rmk3/linux/drivers/char/gckeymap.c	Wed Dec 31 19:00:00 1969
+++ linux/drivers/char/gckeymap.c	Sun Aug 12 16:02:29 2001
@@ -0,0 +1,262 @@
+/* Do not edit this file! It was automatically generated by   */
+/*    loadkeys --mktable defkeymap.map > defkeymap.c          */
+
+#include <linux/types.h>
+#include <linux/keyboard.h>
+#include <linux/kd.h>
+
+u_short plain_map[NR_KEYS] = {
+	0xf200,	0xf01b,	0xf031,	0xf032,	0xf033,	0xf034,	0xf035,	0xf036,
+	0xf037,	0xf038,	0xf039,	0xf030,	0xf02d,	0xf03d,	0xf07f,	0xf009,
+	0xfb71,	0xfb77,	0xfb65,	0xfb72,	0xfb74,	0xfb79,	0xfb75,	0xfb69,
+	0xfb6f,	0xfb70,	0xf05b,	0xf05d,	0xf201,	0xf702,	0xfb61,	0xfb73,
+	0xfb64,	0xfb66,	0xfb67,	0xfb68,	0xfb6a,	0xfb6b,	0xfb6c,	0xf03b,
+	0xf027,	0xf060,	0xf700,	0xf05c,	0xfb7a,	0xfb78,	0xfb63,	0xfb76,
+	0xfb62,	0xfb6e,	0xfb6d,	0xf02c,	0xf02e,	0xf02f,	0xf700,	0xf30c,
+	0xf703,	0xf020,	0xf207,	0xf100,	0xf101,	0xf102,	0xf103,	0xf104,
+	0xf105,	0xf106,	0xf107,	0xf108,	0xf109,	0xf208,	0xf209,	0xf307,
+	0xf308,	0xf309,	0xf30b,	0xf304,	0xf305,	0xf306,	0xf30a,	0xf301,
+	0xf302,	0xf303,	0xf300,	0xf310,	0xf206,	0xf200,	0xf03c,	0xf10a,
+	0xf10b,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf30e,	0xf702,	0xf30d,	0xf01c,	0xf701,	0xf205,	0xf114,	0xf603,
+	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf119,	0xf115,	0xf116,
+	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+};
+
+u_short shift_map[NR_KEYS] = {
+	0xf200,	0xf01b,	0xf021,	0xf040,	0xf023,	0xf024,	0xf025,	0xf05e,
+	0xf026,	0xf02a,	0xf028,	0xf029,	0xf05f,	0xf02b,	0xf07f,	0xf009,
+	0xfb51,	0xfb57,	0xfb45,	0xfb52,	0xfb54,	0xfb59,	0xfb55,	0xfb49,
+	0xfb4f,	0xfb50,	0xf07b,	0xf07d,	0xf201,	0xf702,	0xfb41,	0xfb53,
+	0xfb44,	0xfb46,	0xfb47,	0xfb48,	0xfb4a,	0xfb4b,	0xfb4c,	0xf03a,
+	0xf022,	0xf07e,	0xf700,	0xf07c,	0xfb5a,	0xfb58,	0xfb43,	0xfb56,
+	0xfb42,	0xfb4e,	0xfb4d,	0xf03c,	0xf03e,	0xf03f,	0xf700,	0xf30c,
+	0xf703,	0xf020,	0xf207,	0xf10a,	0xf10b,	0xf10c,	0xf10d,	0xf10e,
+	0xf10f,	0xf110,	0xf111,	0xf112,	0xf113,	0xf213,	0xf203,	0xf307,
+	0xf308,	0xf309,	0xf30b,	0xf304,	0xf305,	0xf306,	0xf30a,	0xf301,
+	0xf302,	0xf303,	0xf300,	0xf310,	0xf206,	0xf200,	0xf03e,	0xf10a,
+	0xf10b,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf30e,	0xf702,	0xf30d,	0xf200,	0xf701,	0xf205,	0xf114,	0xf603,
+	0xf20b,	0xf601,	0xf602,	0xf117,	0xf600,	0xf20a,	0xf115,	0xf116,
+	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+};
+
+u_short altgr_map[NR_KEYS] = {
+	0xf200,	0xf200,	0xf200,	0xf040,	0xf200,	0xf024,	0xf200,	0xf200,
+	0xf07b,	0xf05b,	0xf05d,	0xf07d,	0xf05c,	0xf200,	0xf200,	0xf200,
+	0xfb71,	0xfb77,	0xf918,	0xfb72,	0xfb74,	0xfb79,	0xfb75,	0xfb69,
+	0xfb6f,	0xfb70,	0xf200,	0xf07e,	0xf201,	0xf702,	0xf914,	0xfb73,
+	0xf917,	0xf919,	0xfb67,	0xfb68,	0xfb6a,	0xfb6b,	0xfb6c,	0xf200,
+	0xf200,	0xf200,	0xf700,	0xf200,	0xfb7a,	0xfb78,	0xf916,	0xfb76,
+	0xf915,	0xfb6e,	0xfb6d,	0xf200,	0xf200,	0xf200,	0xf700,	0xf30c,
+	0xf703,	0xf200,	0xf207,	0xf50c,	0xf50d,	0xf50e,	0xf50f,	0xf510,
+	0xf511,	0xf512,	0xf513,	0xf514,	0xf515,	0xf208,	0xf202,	0xf911,
+	0xf912,	0xf913,	0xf30b,	0xf90e,	0xf90f,	0xf910,	0xf30a,	0xf90b,
+	0xf90c,	0xf90d,	0xf90a,	0xf310,	0xf206,	0xf200,	0xf07c,	0xf516,
+	0xf517,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf30e,	0xf702,	0xf30d,	0xf200,	0xf701,	0xf205,	0xf114,	0xf603,
+	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf119,	0xf115,	0xf116,
+	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+};
+
+u_short ctrl_map[NR_KEYS] = {
+	0xf200,	0xf200,	0xf200,	0xf000,	0xf01b,	0xf01c,	0xf01d,	0xf01e,
+	0xf01f,	0xf07f,	0xf200,	0xf200,	0xf01f,	0xf200,	0xf008,	0xf200,
+	0xf011,	0xf017,	0xf005,	0xf012,	0xf014,	0xf019,	0xf015,	0xf009,
+	0xf00f,	0xf010,	0xf01b,	0xf01d,	0xf201,	0xf702,	0xf001,	0xf013,
+	0xf004,	0xf006,	0xf007,	0xf008,	0xf00a,	0xf00b,	0xf00c,	0xf200,
+	0xf007,	0xf000,	0xf700,	0xf01c,	0xf01a,	0xf018,	0xf003,	0xf016,
+	0xf002,	0xf00e,	0xf00d,	0xf200,	0xf20e,	0xf07f,	0xf700,	0xf30c,
+	0xf703,	0xf000,	0xf207,	0xf100,	0xf101,	0xf102,	0xf103,	0xf104,
+	0xf105,	0xf106,	0xf107,	0xf108,	0xf109,	0xf208,	0xf204,	0xf307,
+	0xf308,	0xf309,	0xf30b,	0xf304,	0xf305,	0xf306,	0xf30a,	0xf301,
+	0xf302,	0xf303,	0xf300,	0xf310,	0xf206,	0xf200,	0xf200,	0xf10a,
+	0xf10b,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf30e,	0xf702,	0xf30d,	0xf01c,	0xf701,	0xf205,	0xf114,	0xf603,
+	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf119,	0xf115,	0xf116,
+	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+};
+
+u_short shift_ctrl_map[NR_KEYS] = {
+	0xf200,	0xf200,	0xf200,	0xf000,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf01f,	0xf200,	0xf200,	0xf200,
+	0xf011,	0xf017,	0xf005,	0xf012,	0xf014,	0xf019,	0xf015,	0xf009,
+	0xf00f,	0xf010,	0xf200,	0xf200,	0xf201,	0xf702,	0xf001,	0xf013,
+	0xf004,	0xf006,	0xf007,	0xf008,	0xf00a,	0xf00b,	0xf00c,	0xf200,
+	0xf200,	0xf200,	0xf700,	0xf200,	0xf01a,	0xf018,	0xf003,	0xf016,
+	0xf002,	0xf00e,	0xf00d,	0xf200,	0xf200,	0xf200,	0xf700,	0xf30c,
+	0xf703,	0xf200,	0xf207,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf208,	0xf200,	0xf307,
+	0xf308,	0xf309,	0xf30b,	0xf304,	0xf305,	0xf306,	0xf30a,	0xf301,
+	0xf302,	0xf303,	0xf300,	0xf310,	0xf206,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf30e,	0xf702,	0xf30d,	0xf200,	0xf701,	0xf205,	0xf114,	0xf603,
+	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf119,	0xf115,	0xf116,
+	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+};
+
+u_short alt_map[NR_KEYS] = {
+	0xf200,	0xf81b,	0xf831,	0xf832,	0xf833,	0xf834,	0xf835,	0xf836,
+	0xf837,	0xf838,	0xf839,	0xf830,	0xf82d,	0xf83d,	0xf87f,	0xf809,
+	0xf871,	0xf877,	0xf865,	0xf872,	0xf874,	0xf879,	0xf875,	0xf869,
+	0xf86f,	0xf870,	0xf85b,	0xf85d,	0xf80d,	0xf702,	0xf861,	0xf873,
+	0xf864,	0xf866,	0xf867,	0xf868,	0xf86a,	0xf86b,	0xf86c,	0xf83b,
+	0xf827,	0xf860,	0xf700,	0xf85c,	0xf87a,	0xf878,	0xf863,	0xf876,
+	0xf862,	0xf86e,	0xf86d,	0xf82c,	0xf82e,	0xf82f,	0xf700,	0xf30c,
+	0xf703,	0xf820,	0xf207,	0xf500,	0xf501,	0xf502,	0xf503,	0xf504,
+	0xf505,	0xf506,	0xf507,	0xf508,	0xf509,	0xf208,	0xf209,	0xf907,
+	0xf908,	0xf909,	0xf30b,	0xf904,	0xf905,	0xf906,	0xf30a,	0xf901,
+	0xf902,	0xf903,	0xf900,	0xf310,	0xf206,	0xf200,	0xf83c,	0xf50a,
+	0xf50b,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf30e,	0xf702,	0xf30d,	0xf01c,	0xf701,	0xf205,	0xf114,	0xf603,
+	0xf118,	0xf210,	0xf211,	0xf117,	0xf600,	0xf119,	0xf115,	0xf116,
+	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+};
+
+u_short ctrl_alt_map[NR_KEYS] = {
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf811,	0xf817,	0xf805,	0xf812,	0xf814,	0xf819,	0xf815,	0xf809,
+	0xf80f,	0xf810,	0xf200,	0xf200,	0xf201,	0xf702,	0xf801,	0xf813,
+	0xf804,	0xf806,	0xf807,	0xf808,	0xf80a,	0xf80b,	0xf80c,	0xf200,
+	0xf200,	0xf200,	0xf700,	0xf200,	0xf81a,	0xf818,	0xf803,	0xf816,
+	0xf802,	0xf80e,	0xf80d,	0xf200,	0xf200,	0xf200,	0xf700,	0xf30c,
+	0xf703,	0xf200,	0xf207,	0xf500,	0xf501,	0xf502,	0xf503,	0xf504,
+	0xf505,	0xf506,	0xf507,	0xf508,	0xf509,	0xf208,	0xf200,	0xf307,
+	0xf308,	0xf309,	0xf30b,	0xf304,	0xf305,	0xf306,	0xf30a,	0xf301,
+	0xf302,	0xf303,	0xf300,	0xf20c,	0xf206,	0xf200,	0xf200,	0xf50a,
+	0xf50b,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+	0xf30e,	0xf702,	0xf30d,	0xf200,	0xf701,	0xf205,	0xf114,	0xf603,
+	0xf118,	0xf601,	0xf602,	0xf117,	0xf600,	0xf119,	0xf115,	0xf20c,
+	0xf11a,	0xf10c,	0xf10d,	0xf11b,	0xf11c,	0xf110,	0xf311,	0xf11d,
+	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,	0xf200,
+};
+
+ushort *key_maps[MAX_NR_KEYMAPS] = {
+	plain_map, shift_map, altgr_map, 0,
+	ctrl_map, shift_ctrl_map, 0, 0,
+	alt_map, 0, 0, 0,
+	ctrl_alt_map,	0
+};
+
+unsigned int keymap_count = 7;
+
+/*
+ * Philosophy: most people do not define more strings, but they who do
+ * often want quite a lot of string space. So, we statically allocate
+ * the default and allocate dynamically in chunks of 512 bytes.
+ */
+
+char func_buf[] = {
+	'\033', '[', '[', 'A', 0, 
+	'\033', '[', '[', 'B', 0, 
+	'\033', '[', '[', 'C', 0, 
+	'\033', '[', '[', 'D', 0, 
+	'\033', '[', '[', 'E', 0, 
+	'\033', '[', '1', '7', '~', 0, 
+	'\033', '[', '1', '8', '~', 0, 
+	'\033', '[', '1', '9', '~', 0, 
+	'\033', '[', '2', '0', '~', 0, 
+	'\033', '[', '2', '1', '~', 0, 
+	'\033', '[', '2', '3', '~', 0, 
+	'\033', '[', '2', '4', '~', 0, 
+	'\033', '[', '2', '5', '~', 0, 
+	'\033', '[', '2', '6', '~', 0, 
+	'\033', '[', '2', '8', '~', 0, 
+	'\033', '[', '2', '9', '~', 0, 
+	'\033', '[', '3', '1', '~', 0, 
+	'\033', '[', '3', '2', '~', 0, 
+	'\033', '[', '3', '3', '~', 0, 
+	'\033', '[', '3', '4', '~', 0, 
+	'\033', '[', '1', '~', 0, 
+	'\033', '[', '2', '~', 0, 
+	'\033', '[', '3', '~', 0, 
+	'\033', '[', '4', '~', 0, 
+	'\033', '[', '5', '~', 0, 
+	'\033', '[', '6', '~', 0, 
+	'\033', '[', 'M', 0, 
+	'\033', '[', 'P', 0, 
+};
+
+char *funcbufptr = func_buf;
+int funcbufsize = sizeof(func_buf);
+int funcbufleft = 0;          /* space left */
+
+char *func_table[MAX_NR_FUNC] = {
+	func_buf + 0,
+	func_buf + 5,
+	func_buf + 10,
+	func_buf + 15,
+	func_buf + 20,
+	func_buf + 25,
+	func_buf + 31,
+	func_buf + 37,
+	func_buf + 43,
+	func_buf + 49,
+	func_buf + 55,
+	func_buf + 61,
+	func_buf + 67,
+	func_buf + 73,
+	func_buf + 79,
+	func_buf + 85,
+	func_buf + 91,
+	func_buf + 97,
+	func_buf + 103,
+	func_buf + 109,
+	func_buf + 115,
+	func_buf + 120,
+	func_buf + 125,
+	func_buf + 130,
+	func_buf + 135,
+	func_buf + 140,
+	func_buf + 145,
+	0,
+	0,
+	func_buf + 149,
+	0,
+};
+
+struct kbdiacr accent_table[MAX_DIACR] = {
+	{'`', 'A', '\300'},	{'`', 'a', '\340'},
+	{'\'', 'A', '\301'},	{'\'', 'a', '\341'},
+	{'^', 'A', '\302'},	{'^', 'a', '\342'},
+	{'~', 'A', '\303'},	{'~', 'a', '\343'},
+	{'"', 'A', '\304'},	{'"', 'a', '\344'},
+	{'O', 'A', '\305'},	{'o', 'a', '\345'},
+	{'0', 'A', '\305'},	{'0', 'a', '\345'},
+	{'A', 'A', '\305'},	{'a', 'a', '\345'},
+	{'A', 'E', '\306'},	{'a', 'e', '\346'},
+	{',', 'C', '\307'},	{',', 'c', '\347'},
+	{'`', 'E', '\310'},	{'`', 'e', '\350'},
+	{'\'', 'E', '\311'},	{'\'', 'e', '\351'},
+	{'^', 'E', '\312'},	{'^', 'e', '\352'},
+	{'"', 'E', '\313'},	{'"', 'e', '\353'},
+	{'`', 'I', '\314'},	{'`', 'i', '\354'},
+	{'\'', 'I', '\315'},	{'\'', 'i', '\355'},
+	{'^', 'I', '\316'},	{'^', 'i', '\356'},
+	{'"', 'I', '\317'},	{'"', 'i', '\357'},
+	{'-', 'D', '\320'},	{'-', 'd', '\360'},
+	{'~', 'N', '\321'},	{'~', 'n', '\361'},
+	{'`', 'O', '\322'},	{'`', 'o', '\362'},
+	{'\'', 'O', '\323'},	{'\'', 'o', '\363'},
+	{'^', 'O', '\324'},	{'^', 'o', '\364'},
+	{'~', 'O', '\325'},	{'~', 'o', '\365'},
+	{'"', 'O', '\326'},	{'"', 'o', '\366'},
+	{'/', 'O', '\330'},	{'/', 'o', '\370'},
+	{'`', 'U', '\331'},	{'`', 'u', '\371'},
+	{'\'', 'U', '\332'},	{'\'', 'u', '\372'},
+	{'^', 'U', '\333'},	{'^', 'u', '\373'},
+	{'"', 'U', '\334'},	{'"', 'u', '\374'},
+	{'\'', 'Y', '\335'},	{'\'', 'y', '\375'},
+	{'T', 'H', '\336'},	{'t', 'h', '\376'},
+	{'s', 's', '\337'},	{'"', 'y', '\377'},
+	{'s', 'z', '\337'},	{'i', 'j', '\377'},
+};
+
+unsigned int accent_table_size = 68;
diff -urN 2.4.7-rmk3/linux/drivers/char/gckeymap.map linux/drivers/char/gckeymap.map
--- 2.4.7-rmk3/linux/drivers/char/gckeymap.map	Wed Dec 31 19:00:00 1969
+++ linux/drivers/char/gckeymap.map	Sun Aug 12 16:02:29 2001
@@ -0,0 +1,357 @@
+# Default kernel keymap. This uses 7 modifier combinations.
+keymaps 0-2,4-5,8,12
+# Change the above line into
+#	keymaps 0-2,4-6,8,12
+# in case you want the entries
+#	altgr   control keycode  83 = Boot            
+#	altgr   control keycode 111 = Boot            
+# below.
+#
+# In fact AltGr is used very little, and one more keymap can
+# be saved by mapping AltGr to Alt (and adapting a few entries):
+# keycode 100 = Alt
+#
+keycode   1 = Escape           Escape          
+	alt     keycode   1 = Meta_Escape     
+keycode   2 = one              exclam          
+	alt     keycode   2 = Meta_one        
+keycode   3 = two              at               at              
+	control	keycode   3 = nul             
+	shift	control	keycode   3 = nul             
+	alt	keycode   3 = Meta_two        
+keycode   4 = three            numbersign      
+	control keycode   4 = Escape          
+	alt     keycode   4 = Meta_three      
+keycode   5 = four             dollar           dollar          
+	control keycode   5 = Control_backslash
+	alt     keycode   5 = Meta_four       
+keycode   6 = five             percent         
+	control keycode   6 = Control_bracketright
+	alt     keycode   6 = Meta_five       
+keycode   7 = six              asciicircum     
+	control keycode   7 = Control_asciicircum
+	alt     keycode   7 = Meta_six        
+keycode   8 = seven            ampersand        braceleft       
+	control keycode   8 = Control_underscore
+	alt     keycode   8 = Meta_seven      
+keycode   9 = eight            asterisk         bracketleft     
+	control keycode   9 = Delete          
+	alt     keycode   9 = Meta_eight      
+keycode  10 = nine             parenleft        bracketright    
+	alt     keycode  10 = Meta_nine       
+keycode  11 = zero             parenright       braceright      
+	alt     keycode  11 = Meta_zero       
+keycode  12 = minus            underscore       backslash       
+	control	keycode  12 = Control_underscore
+	shift	control	keycode  12 = Control_underscore
+	alt	keycode  12 = Meta_minus      
+keycode  13 = equal            plus            
+	alt     keycode  13 = Meta_equal      
+keycode  14 = Delete           Delete          
+	control keycode  14 = BackSpace
+	alt     keycode  14 = Meta_Delete     
+keycode  15 = Tab              Tab             
+	alt     keycode  15 = Meta_Tab        
+keycode  16 = q               
+keycode  17 = w               
+keycode  18 = e
+	altgr   keycode  18 = Hex_E   
+keycode  19 = r               
+keycode  20 = t               
+keycode  21 = y               
+keycode  22 = u               
+keycode  23 = i               
+keycode  24 = o               
+keycode  25 = p               
+keycode  26 = bracketleft      braceleft       
+	control keycode  26 = Escape          
+	alt     keycode  26 = Meta_bracketleft
+keycode  27 = bracketright     braceright       asciitilde      
+	control keycode  27 = Control_bracketright
+	alt     keycode  27 = Meta_bracketright
+keycode  28 = Return          
+	alt     keycode  28 = Meta_Control_m  
+keycode  29 = Control         
+keycode  30 = a
+	altgr   keycode  30 = Hex_A
+keycode  31 = s               
+keycode  32 = d
+	altgr   keycode  32 = Hex_D   
+keycode  33 = f
+	altgr   keycode  33 = Hex_F               
+keycode  34 = g               
+keycode  35 = h               
+keycode  36 = j               
+keycode  37 = k               
+keycode  38 = l               
+keycode  39 = semicolon        colon           
+	alt     keycode  39 = Meta_semicolon  
+keycode  40 = apostrophe       quotedbl        
+	control keycode  40 = Control_g       
+	alt     keycode  40 = Meta_apostrophe 
+keycode  41 = grave            asciitilde      
+	control keycode  41 = nul             
+	alt     keycode  41 = Meta_grave      
+keycode  42 = Shift           
+keycode  43 = backslash        bar             
+	control keycode  43 = Control_backslash
+	alt     keycode  43 = Meta_backslash  
+keycode  44 = z               
+keycode  45 = x               
+keycode  46 = c
+	altgr   keycode  46 = Hex_C   
+keycode  47 = v               
+keycode  48 = b
+	altgr   keycode  48 = Hex_B
+keycode  49 = n               
+keycode  50 = m               
+keycode  51 = comma            less            
+	alt     keycode  51 = Meta_comma      
+keycode  52 = period           greater         
+	control keycode  52 = Compose         
+	alt     keycode  52 = Meta_period     
+keycode  53 = slash            question        
+	control keycode  53 = Delete          
+	alt     keycode  53 = Meta_slash      
+keycode  54 = Shift           
+keycode  55 = KP_Multiply     
+keycode  56 = Alt             
+keycode  57 = space            space           
+	control keycode  57 = nul             
+	alt     keycode  57 = Meta_space      
+keycode  58 = Caps_Lock       
+keycode  59 = F1               F11              Console_13      
+	control keycode  59 = F1              
+	alt     keycode  59 = Console_1       
+	control alt     keycode  59 = Console_1       
+keycode  60 = F2               F12              Console_14      
+	control keycode  60 = F2              
+	alt     keycode  60 = Console_2       
+	control alt     keycode  60 = Console_2       
+keycode  61 = F3               F13              Console_15      
+	control keycode  61 = F3              
+	alt     keycode  61 = Console_3       
+	control alt     keycode  61 = Console_3       
+keycode  62 = F4               F14              Console_16      
+	control keycode  62 = F4              
+	alt     keycode  62 = Console_4       
+	control alt     keycode  62 = Console_4       
+keycode  63 = F5               F15              Console_17      
+	control keycode  63 = F5              
+	alt     keycode  63 = Console_5       
+	control alt     keycode  63 = Console_5       
+keycode  64 = F6               F16              Console_18      
+	control keycode  64 = F6              
+	alt     keycode  64 = Console_6       
+	control alt     keycode  64 = Console_6       
+keycode  65 = F7               F17              Console_19      
+	control keycode  65 = F7              
+	alt     keycode  65 = Console_7       
+	control alt     keycode  65 = Console_7       
+keycode  66 = F8               F18              Console_20      
+	control keycode  66 = F8              
+	alt     keycode  66 = Console_8       
+	control alt     keycode  66 = Console_8       
+keycode  67 = F9               F19              Console_21      
+	control keycode  67 = F9              
+	alt     keycode  67 = Console_9       
+	control alt     keycode  67 = Console_9       
+keycode  68 = F10              F20              Console_22      
+	control keycode  68 = F10             
+	alt     keycode  68 = Console_10      
+	control alt     keycode  68 = Console_10      
+keycode  69 = Num_Lock
+	shift   keycode  69 = Bare_Num_Lock
+keycode  70 = Scroll_Lock      Show_Memory      Show_Registers  
+	control keycode  70 = Show_State      
+	alt     keycode  70 = Scroll_Lock     
+keycode  71 = KP_7            
+	alt     keycode  71 = Ascii_7         
+	altgr   keycode  71 = Hex_7         
+keycode  72 = KP_8            
+	alt     keycode  72 = Ascii_8         
+	altgr   keycode  72 = Hex_8         
+keycode  73 = KP_9            
+	alt     keycode  73 = Ascii_9         
+	altgr   keycode  73 = Hex_9         
+keycode  74 = KP_Subtract     
+keycode  75 = KP_4            
+	alt     keycode  75 = Ascii_4         
+	altgr   keycode  75 = Hex_4         
+keycode  76 = KP_5            
+	alt     keycode  76 = Ascii_5         
+	altgr   keycode  76 = Hex_5         
+keycode  77 = KP_6            
+	alt     keycode  77 = Ascii_6         
+	altgr   keycode  77 = Hex_6         
+keycode  78 = KP_Add          
+keycode  79 = KP_1            
+	alt     keycode  79 = Ascii_1         
+	altgr   keycode  79 = Hex_1         
+keycode  80 = KP_2            
+	alt     keycode  80 = Ascii_2         
+	altgr   keycode  80 = Hex_2         
+keycode  81 = KP_3            
+	alt     keycode  81 = Ascii_3         
+	altgr   keycode  81 = Hex_3         
+keycode  82 = KP_0            
+	alt     keycode  82 = Ascii_0         
+	altgr   keycode  82 = Hex_0         
+keycode  83 = KP_Period       
+#	altgr   control keycode  83 = Boot            
+	control alt     keycode  83 = Boot            
+keycode  84 = Last_Console    
+keycode  85 =
+keycode  86 = less             greater          bar             
+	alt     keycode  86 = Meta_less       
+keycode  87 = F11              F11              Console_23      
+	control keycode  87 = F11             
+	alt     keycode  87 = Console_11      
+	control alt     keycode  87 = Console_11      
+keycode  88 = F12              F12              Console_24      
+	control keycode  88 = F12             
+	alt     keycode  88 = Console_12      
+	control alt     keycode  88 = Console_12      
+keycode  89 =
+keycode  90 =
+keycode  91 =
+keycode  92 =
+keycode  93 =
+keycode  94 =
+keycode  95 =
+keycode  96 = KP_Enter        
+keycode  97 = Control         
+keycode  98 = KP_Divide       
+keycode  99 = Control_backslash
+	control keycode  99 = Control_backslash
+	alt     keycode  99 = Control_backslash
+keycode 100 = AltGr           
+keycode 101 = Break           
+keycode 102 = Find            
+keycode 103 = Up              
+keycode 104 = Prior           
+	shift   keycode 104 = Scroll_Backward 
+keycode 105 = Left            
+	alt     keycode 105 = Decr_Console
+keycode 106 = Right           
+	alt     keycode 106 = Incr_Console
+keycode 107 = Select          
+keycode 108 = Down            
+keycode 109 = Next            
+	shift   keycode 109 = Scroll_Forward  
+keycode 110 = Insert          
+keycode 111 = Remove          
+#	altgr   control keycode 111 = Boot            
+	control alt     keycode 111 = Boot            
+keycode 112 = Macro           
+keycode 113 = F13             
+keycode 114 = F14             
+keycode 115 = Help            
+keycode 116 = Do              
+keycode 117 = F17             
+keycode 118 = KP_MinPlus      
+keycode 119 = Pause           
+keycode 120 =
+keycode 121 =
+keycode 122 =
+keycode 123 =
+keycode 124 =
+keycode 125 =
+keycode 126 =
+keycode 127 =
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to 'À'
+compose '`' 'a' to 'à'
+compose '\'' 'A' to 'Á'
+compose '\'' 'a' to 'á'
+compose '^' 'A' to 'Â'
+compose '^' 'a' to 'â'
+compose '~' 'A' to 'Ã'
+compose '~' 'a' to 'ã'
+compose '"' 'A' to 'Ä'
+compose '"' 'a' to 'ä'
+compose 'O' 'A' to 'Å'
+compose 'o' 'a' to 'å'
+compose '0' 'A' to 'Å'
+compose '0' 'a' to 'å'
+compose 'A' 'A' to 'Å'
+compose 'a' 'a' to 'å'
+compose 'A' 'E' to 'Æ'
+compose 'a' 'e' to 'æ'
+compose ',' 'C' to 'Ç'
+compose ',' 'c' to 'ç'
+compose '`' 'E' to 'È'
+compose '`' 'e' to 'è'
+compose '\'' 'E' to 'É'
+compose '\'' 'e' to 'é'
+compose '^' 'E' to 'Ê'
+compose '^' 'e' to 'ê'
+compose '"' 'E' to 'Ë'
+compose '"' 'e' to 'ë'
+compose '`' 'I' to 'Ì'
+compose '`' 'i' to 'ì'
+compose '\'' 'I' to 'Í'
+compose '\'' 'i' to 'í'
+compose '^' 'I' to 'Î'
+compose '^' 'i' to 'î'
+compose '"' 'I' to 'Ï'
+compose '"' 'i' to 'ï'
+compose '-' 'D' to 'Ð'
+compose '-' 'd' to 'ð'
+compose '~' 'N' to 'Ñ'
+compose '~' 'n' to 'ñ'
+compose '`' 'O' to 'Ò'
+compose '`' 'o' to 'ò'
+compose '\'' 'O' to 'Ó'
+compose '\'' 'o' to 'ó'
+compose '^' 'O' to 'Ô'
+compose '^' 'o' to 'ô'
+compose '~' 'O' to 'Õ'
+compose '~' 'o' to 'õ'
+compose '"' 'O' to 'Ö'
+compose '"' 'o' to 'ö'
+compose '/' 'O' to 'Ø'
+compose '/' 'o' to 'ø'
+compose '`' 'U' to 'Ù'
+compose '`' 'u' to 'ù'
+compose '\'' 'U' to 'Ú'
+compose '\'' 'u' to 'ú'
+compose '^' 'U' to 'Û'
+compose '^' 'u' to 'û'
+compose '"' 'U' to 'Ü'
+compose '"' 'u' to 'ü'
+compose '\'' 'Y' to 'Ý'
+compose '\'' 'y' to 'ý'
+compose 'T' 'H' to 'Þ'
+compose 't' 'h' to 'þ'
+compose 's' 's' to 'ß'
+compose '"' 'y' to 'ÿ'
+compose 's' 'z' to 'ß'
+compose 'i' 'j' to 'ÿ'
diff -urN 2.4.7-rmk3/linux/drivers/char/h3600_ts.c linux/drivers/char/h3600_ts.c
--- 2.4.7-rmk3/linux/drivers/char/h3600_ts.c	Wed Dec 31 19:00:00 1969
+++ linux/drivers/char/h3600_ts.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,1654 @@
+/*
+*
+* Driver for the h3600 Touch Screen and other Atmel controlled devices.
+*
+* Copyright 2000 Compaq Computer Corporation.
+*
+* Use consistent with the GNU GPL is permitted,
+* provided that this copyright notice is
+* preserved in its entirety in all copies and derived works.
+*
+* COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED,
+* AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS
+* FITNESS FOR ANY PARTICULAR PURPOSE.
+*
+* Author: Charles Flynn.
+*
+*/
+
+#include <linux/module.h>
+#include <linux/version.h>
+
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/delay.h>
+#include <linux/poll.h>
+#include <asm/uaccess.h>        /* get_user,copy_to_user */
+#include <linux/string.h>
+#include <linux/interrupt.h>
+#include <linux/sysctl.h>
+
+#include <linux/tqueue.h>
+#include <linux/sched.h>
+#include <linux/pm.h>
+#include <asm/hardware.h>
+#include <asm/irq.h>
+
+#include <linux/kbd_ll.h>
+#include <linux/h3600_ts.h>
+#include <linux/apm_bios.h>
+
+#define _INLINE_ inline
+/* Note this define only works if TXBUF_MAX is a power of 2 */
+#define INCBUF(x,mod) ( (++x) & ( mod - 1) )
+#define DECBUF(x,mod) ( (--x) & ( mod - 1) )
+
+/* ++++++++++++local function defines ++++++++++++*/
+static int checkDevice(struct inode *pInode);
+
+static int initSerial( void );
+
+/* These are the touch screen functions */
+static int tsEvent(ID *);	/* event handler */
+static TS_EVENT tsFilter(TS_EVENT);     /* event fitler */
+static int tsRead(ID *);	/* file operations _read() */
+static int tsReadRaw(ID *);	/* file operations _read() */
+static int tsIoctl(void * , unsigned int , unsigned long );
+static int tsInit(ID *);
+
+static int keyEvent(ID *);	/* buttons event handler */
+static int keyRead(ID *);	/* file operations _read() */
+
+static int ackRes(ID *);	/* generic cmd Acknowledgement */
+static int verRes(ID * );	/* Version response handler */
+static int epromRdRes(ID * );   /* read eeprom response handler */
+static int iicRdRes(ID * );     /* read iic response handler*/
+static int battRdEvent(ID * );  /* read power/battery info */
+
+/* ++++++++++++local function defines ++++++++++++*/
+
+
+/* +++++++++++++globals ++++++++++++++++*/
+static int gMajor = 0;			/* TODO dynamic major for now */
+
+
+static VER_RET verRet;		/* The structure returned to the client */
+
+static KEY_DEV keyDev;		/*  bit7=1=on bit7=0=off bits0:3=key num */
+unsigned char keyRet;
+
+static TS_DEV tsDev;
+static TS_RET tsRet = {0,0,0,0};
+
+static EEPROM_READ epromRdRet;
+
+static BAT_DEV battRet;
+
+static SPI_READ iicRdRet;	/* TODO change iicFuncs() to spiFuncs() */
+
+static unsigned char flite_brightness=25; 
+static unsigned char touchScreenSilenced = 0;
+static int h3600_ts_ready = 0;
+
+/*
+	++++++++++++++ start of driver structures ++++++++++++++
+	Each Atmel microcontroller device is represented in this array.
+*/
+static EVENT g_Events[MAX_MINOR] = {
+        { processRead: tsRead, 	   processIoctl: tsIoctl, id: TOUCHS_ID },	/* TS minor = 0 */
+        { processRead: tsReadRaw,  processIoctl: tsIoctl, id: TOUCHS_ID },	/* TSRAW minor = 1 */
+        { processRead: keyRead,    id: KEYBD_ID }    		                /* KEY minor = 2 */
+};
+
+static ID g_Ids[MAX_ID] = {
+
+        {
+                0, (void *)&verRet, verRes,0,0,sizeof(VER_RET),0
+        }, /*ID=0 VERSION*/
+
+        { 0,0,0,0,0,0,0 },	/* ID=1 N/A */
+
+        {	/* ID=2 keybd */
+                (void *)&keyDev,(void *)&keyRet,keyEvent,0,sizeof(KEY_DEV),sizeof(keyRet),0
+        },
+
+        {	/* ID=3 Touch Screen */
+                (void *)&tsDev,(void *)&tsRet,tsEvent,tsInit,sizeof(TS_DEV),sizeof(tsRet),0
+        },
+
+        {	/* ID=4 EEPROM READ */
+                0, (void *)&epromRdRet,epromRdRes,0, 0,sizeof(epromRdRet),0
+        },
+
+        {	/* ID=5 EEPROM WRITE */
+                0, 0,ackRes,0, 0,0,0
+        },
+
+        { 0,0,0,0,0,0,0 },	/* ID=6 N/A */
+        { 0,0,0,0,0,0,0 },	/* ID=7 N/A */
+
+        { 0, 0, ackRes ,0, 0,0,0 }, /* ID=8 LED */
+
+        {	/* ID=9 Power/Battery Status */
+                0, (void *)&battRet,battRdEvent,0, 0,sizeof(battRet),0
+        },
+
+        { 0,0,0,0,0,0,0 },	/* ID=10 N/A */
+
+        {	/* ID=11 SPI Read TODO rename all iicXXXFuncs to spiXXXFuncts*/
+                0, (void *)&iicRdRet,iicRdRes,0, 0,sizeof(iicRdRet),0
+        },
+
+        {	/* ID=12 SPI WRITE */
+                0, 0,ackRes,0, 0,0,0
+        },
+
+        { 0, 0, ackRes ,0, 0,0,0 } /* ID=13 Front Light */
+
+};
+
+/* ++++++++++++++ end driver structures ++++++++++++++*/
+
+static RXDEV rxdev;		/* receive ISR state */
+static TXDEV txdev;		/* send */
+/* +++++++++++++globals ++++++++++++++++*/
+
+
+/* +++++++++++++File operations ++++++++++++++*/
+static int h3600_fasync(int fd, struct file *filp, int mode);
+static ssize_t h3600_read(struct file * , char * , size_t , loff_t * l);
+static int h3600_open(struct inode * inode, struct file * filp);
+static int h3600_release(struct inode * inode, struct file * filp);
+
+int h3600_ioctl(struct inode * inode, struct file *filp, unsigned int cmd , unsigned long arg);
+static unsigned int h3600_poll(struct file * filp, struct poll_table_struct * wait);
+
+static void eventIsr(int , void *, struct pt_regs *);	/* ISR :*/
+
+struct file_operations ts_fops = {
+	read:           h3600_read,
+        poll:           h3600_poll,
+	ioctl:		h3600_ioctl,
+        fasync:         h3600_fasync,
+	open:		h3600_open,
+	release:	h3600_release,
+};
+
+/*
+	This function implements a simple block and wait mechanism
+	instead of the interruptible_sleep_on_timeout()
+
+	Return 0 for success 1 for timeout
+*/
+static _INLINE_ int wait_for_ack(ID * pid )
+{
+	unsigned int loops = 100;
+	unsigned int esn = pid->sn+1;	/* expected sequence number */
+	/* Block - wait on the response - should take ~1.5 m/s */
+	while( (pid->sn != esn) && --loops )
+		udelay(100);
+	return ( pid->sn == esn ) ? 1 : 0;
+}
+
+/*
+	sendBytes
+*/
+static _INLINE_ void sendBytes(const char * buff, size_t count,int id)
+{
+        unsigned char chksum;
+        unsigned int space,head,tail;
+
+        /* TODO TODO TODO (event << 4) compiles even though event is NOT defined */
+        chksum = ( (unsigned char)((id << 4) | count ) );
+
+        while(1)	/* this loop guarantees the payload is sent */
+        {
+                /* check if enough space - if not wait until the ISR frees some */
+                head = txdev.head;
+                tail = txdev.tail;
+                /* size is the number of bytes waiting to be transmitted */
+                space = ( head > tail ) ? head - tail : tail - head;
+                space = TXBUF_MAX - space;
+                if ( space >= ( count + FRAME_OVERHEAD ) )
+                {
+			int flags;
+                        unsigned cnt = count;
+                        txdev.buf[head]= (unsigned char)CHAR_SOF;
+                        head=INCBUF(head,TXBUF_MAX);
+                        txdev.buf[head]= chksum;
+                        head=INCBUF(head,TXBUF_MAX);
+                        while(cnt--)
+                        {
+                                txdev.buf[head]= *buff;	
+                                head=INCBUF(head,TXBUF_MAX);
+                                chksum += (unsigned char)(*buff++);
+                        }
+                        txdev.buf[head]=chksum;
+                        txdev.head=INCBUF(head,TXBUF_MAX);
+                        /* if not enabled then enable Tx IRQs */
+			save_flags_cli(flags);
+                        Ser1UTCR3 |= UTCR3_TIE;
+			restore_flags(flags);
+                        break;	/* all done */	
+                }
+        }
+}
+
+/* +++++++++++++File operations ++++++++++++++*/
+
+static int h3600_fasync(int fd, struct file *filp, int mode)
+{
+        /* TODO TODO put this data into file private data */
+        int minor = checkDevice( filp->f_dentry->d_inode);
+        if ( minor == - 1)
+                return -ENODEV;
+#if 0
+        printk("fasync:called minor=%d\n",minor);
+#endif
+
+        return( fasync_helper(fd, filp, mode, &g_Events[minor].aq) );
+}
+
+
+int h3600_ioctl(struct inode * inode, struct file *filp,
+                unsigned int cmd , unsigned long arg)
+{
+        unsigned char buf[28]; /* TODO optimal dimension for this buffer */
+        ID * pid;
+        int minor;
+        unsigned rxcnt=0,txcnt=0,sn,id,offset=0;
+        int status = 0;	/* TODO success */
+	unsigned char tmp;
+
+
+        minor = checkDevice( inode );
+        if ( minor == - 1)
+                return -ENODEV;
+
+#if 0
+        printk("h3600_ioctl: minor=%08x cmd=%d\n",minor,cmd);
+#endif
+
+
+        /*
+	  We copy rxcnt bytes from the user. This buffer contains the
+	  command sequence as well as storage for an (optional) response.
+
+	  We transmit txcnt bytes starting at buf[XXX_CMD_OFFSET]
+
+          We return 'pid->lenRet' bytes in 'pid->pReturn' to the user.
+
+        */
+        switch (cmd)
+        {
+	case LED_ON:
+                rxcnt=txcnt=sizeof(LED_IN);
+		id=NOTIFY_LED_ID;
+                break;
+	case GET_VERSION:
+                id=VERSION_ID;
+                break;
+	case READ_EEPROM:
+		txcnt=EEPROM_READ_CMD_LEN;  /*# of bytes sent to the Atmel */
+		rxcnt=sizeof(READ_EEPROM);  /*# of bytes read from user */
+		id=EEPROM_READ_ID;
+                break;
+#if defined EEPROM_WRITE_ENABLED
+	case WRITE_EEPROM:
+		rxcnt=sizeof(EEPROM_WRITE);
+		offset=EEPROM_WRITE_CMD_OFFSET;
+		id=EEPROM_WRITE_ID;
+                break;
+#endif
+	case READ_SPI:
+		txcnt=SPI_READ_CMD_LEN;
+		rxcnt = sizeof(SPI_READ);
+		offset=SPI_READ_CMD_OFFSET;
+		id=SPI_READ_ID;
+                break;
+	case WRITE_SPI:
+		rxcnt=sizeof(SPI_WRITE);
+		offset=SPI_WRITE_CMD_OFFSET;
+		id=SPI_WRITE_ID;
+                break;
+        case GET_THERMAL:
+		id=THERMAL_ID;
+		break;
+        case GET_BATTERY_STATUS:
+		id=BATTERY_ID;
+		break;
+	case FLITE_ON:
+		rxcnt=txcnt=FLITE_CMD_LEN;
+                id=FLITE_ID;
+                break;
+	default:
+	{
+                EVENT * pev = &g_Events[minor];
+                ID * pid = &g_Ids[pev->id];
+                printk("ts_ioctl: default minor=%d cmd=%d\n", minor, cmd);
+                if( pev->processIoctl )
+                        return ( (*pev->processIoctl)(pid->pdev,cmd,arg) );
+		else
+		{
+			printk("Unknown IOCTL cmd=%d\n",cmd);
+			return -EINVAL;
+		}
+                return 0;
+	}
+        }
+
+	/* Copy rxcnt bytes from the user */
+        pid = &g_Ids[id];
+        if( rxcnt )
+                __copy_from_user(buf, (char *)arg, rxcnt );
+
+	/* Now check lengths and txcnts now we have read the user buffer */
+        switch (cmd)
+	{
+        case READ_EEPROM:
+		/* Check the length is within limits */
+		if( ((EEPROM_READ *)buf)->len > EEPROM_RD_BUFSIZ )
+			return -EIO;
+		break;
+        case WRITE_EEPROM:
+		txcnt = ((EEPROM_WRITE *)buf)->len;
+		if(txcnt > EEPROM_WR_BUFSIZ )
+		{
+		    printk("EEPROM WRITE bad len=%d\n",txcnt);
+		    return -EIO;
+		}
+		txcnt <<= 1;	/* convert words to bytes */
+		++txcnt;	/* adjust for 8bit addr field */		
+		break;
+        case READ_SPI:
+		/* Check the length is within limits */
+		if( ((SPI_READ *)buf)->len > SPI_RD_BUFSIZ )
+			return -EIO;
+		break;
+        case WRITE_SPI:
+		txcnt = ((SPI_WRITE *)buf)->len;
+		if(txcnt > SPI_WR_BUFSIZ)
+		{
+		    printk("SPI WRITE bad len=%d\n",txcnt);
+		    return -EIO;
+		}
+		txcnt +=2;		/* Add the 16bit addr field */
+		break;
+	case FLITE_ON:
+		tmp = ((FLITE_IN *)buf)->brightness;
+		tmp >>=3;	/* attenuate brightness to save power */ 
+                flite_brightness = tmp;
+		((FLITE_IN *)buf)->brightness = tmp;
+		break;
+        }
+
+	/* Send txcnt bytes from calculated offset */
+	sendBytes( buf + offset, txcnt, id );
+
+        /* now wait on response */
+        sn = pid->sn;
+	rxcnt = pid->lenRet;	/* reuse this variable to return data to user*/	
+        interruptible_sleep_on_timeout(&pid->wq, (2 * HZ) ); /*wait 2 secs*/
+        if ( pid->sn == ( sn + 1 ) )
+        {
+                if( rxcnt)
+                        __copy_to_user((char *)arg,(char *)pid->pReturn,rxcnt);
+        }
+        else
+                status = -EIO;
+
+        return status;
+}
+
+unsigned int h3600_flite_control(enum flite_pwr pwr, unsigned char brightness)
+{
+        if (h3600_ts_ready) {
+                FLITE_IN req = { FLITE_MODE1, pwr, brightness >> 3 };
+
+		/* Attenuate the brightness to save battery */
+                flite_brightness = brightness >> 3;
+
+                sendBytes( (char*)(char*)&req, sizeof(req), FLITE_ID);
+
+		/* Block - wait on the response - should take ~1.5 m/s */
+		if( !wait_for_ack(&g_Ids[FLITE_ID]) )
+		{
+			printk("h3600_flite_control: timeout\n");
+			return 0;
+		}
+                return 1;
+        } else {
+                return 0;
+        }
+}
+
+/*
+ * h3600_flite_power: enables or disables power to frontlight, using last brightness setting.
+ */
+unsigned int h3600_flite_power(enum flite_pwr pwr)
+{
+        if (h3600_ts_ready) {
+                FLITE_IN req = { FLITE_MODE1, pwr, ((pwr == FLITE_PWR_OFF) ? 0 : flite_brightness) };
+
+                if (pwr == FLITE_PWR_OFF) 
+                        touchScreenSilenced = 1;
+                else
+                        touchScreenSilenced = 0;
+
+                if (0) printk("h3600_flite_power: pwr=%d brightness=%d sizeof(req)=%d\n", req.pwr, req.brightness, sizeof(FLITE_IN));
+
+                sendBytes( (char*)&req, sizeof(req), FLITE_ID);
+		
+		/* Block - wait on the response - should take ~1.5 m/s */
+		if( !wait_for_ack(&g_Ids[FLITE_ID]) )
+		{
+			printk("h3600_flite_power: timeout\n");
+			return 1;
+		}
+
+                return 0;
+
+        } else {
+                return 1;
+        }
+}
+
+#ifdef CONFIG_PM
+static int suspended = 0;
+static int h3600_ts_pm_callback(struct pm_dev *pm_dev, pm_request_t req, void *data)
+{
+        printk("  " __FUNCTION__ ": req=%d\n", req);
+	switch (req) {
+	case PM_SUSPEND: /* enter D1-D3 */
+                suspended = 1;
+                h3600_flite_power(FLITE_PWR_OFF);
+                break;
+	case PM_BLANK:
+                if (!suspended) 
+                        h3600_flite_power(FLITE_PWR_OFF);
+		break;
+	case PM_RESUME:  /* enter D0 */
+	case PM_UNBLANK:
+                if (suspended) {
+                        initSerial();
+                        suspended = 0;
+                }
+		h3600_flite_power(FLITE_PWR_ON);
+                break;
+	}
+	return 0;
+}
+#endif
+
+EXPORT_SYMBOL(h3600_apm_get_power_status);
+unsigned int h3600_apm_get_power_status(u_char *ac_line_status,
+                                        u_char *battery_status, u_char *battery_flag, u_char *battery_percentage, u_short *battery_life)
+{
+        if (h3600_ts_ready) {
+                ID *pid = &g_Ids[BATTERY_ID];
+                BAT_DEV *pbatt = (BAT_DEV *)pid->pReturn;
+                int percentage;
+
+                if (pbatt == NULL)
+                        return 0;
+
+                sendBytes( NULL, 0, BATTERY_ID);
+
+		/* Block - wait on the response - should take ~1.5 m/s */
+		if( !wait_for_ack( pid ) )
+		{
+			printk("h3600_flite_power: timeout\n");
+			return 0;
+		}
+
+
+                if (0) printk(__FUNCTION__ ": status=%x raw_voltage=%d voltage=%dmV\n",
+                              pbatt->batt1_status, 
+                              pbatt->batt1_voltage,
+                              (1000 * pbatt->batt1_voltage) / 228);
+                /* now translate result into APM terms */
+                if (ac_line_status != NULL) {
+                        u_char stat = APM_AC_UNKNOWN;
+                        switch (pbatt->ac_status) {
+                        case H3600_AC_STATUS_AC_OFFLINE:
+                                stat = APM_AC_OFFLINE;
+                                break;
+                        case H3600_AC_STATUS_AC_ONLINE:
+                                stat = APM_AC_ONLINE;
+                                break;
+                        case H3600_AC_STATUS_AC_BACKUP:
+                                stat = APM_AC_BACKUP;
+                                break;
+                        }
+                        *ac_line_status = stat;
+                }
+                if (battery_status != NULL) {
+                        u_char stat = APM_BATTERY_STATUS_UNKNOWN;
+                        switch (pbatt->batt1_status) {
+                        case H3600_BATT_STATUS_HIGH:
+                                stat = APM_BATTERY_STATUS_HIGH;
+                                break;
+                        case H3600_BATT_STATUS_LOW:
+                                stat = APM_BATTERY_STATUS_LOW;
+                                break;
+                        case H3600_BATT_STATUS_CRITICAL:
+                                stat = APM_BATTERY_STATUS_CRITICAL;
+                                break;
+                        case H3600_BATT_STATUS_CHARGING:
+                                stat = APM_BATTERY_STATUS_CHARGING;
+                                break;
+                        case H3600_BATT_STATUS_NOBATT:
+                                stat = APM_BATTERY_STATUS_UNKNOWN;
+                                break;
+
+                        }
+                }
+                percentage = (425 * pbatt->batt1_voltage) / 1000 - 298;
+                if (battery_percentage != NULL) {
+                        *battery_percentage = percentage;
+                }
+                /* assuming C/5 discharge rate */
+                if (battery_life != NULL) {
+                        *battery_life = 300 * percentage / 100;
+                }
+                        
+                return 1;
+        } else {
+                return 0;
+        }
+}
+
+unsigned int h3600_microcontroller_request(int id, void *req, int len)
+{
+        if (h3600_ts_ready) {
+
+                sendBytes( req, len, id);
+
+		/* Block - wait on the response - should take ~1.5 m/s */
+		if( !wait_for_ack(&g_Ids[id]) )
+		{
+			printk("h3600_microcontroller_request: timeout\n");
+			return 1;
+		}
+		
+                return 0;
+        } else {
+                return 1;
+        }
+}
+
+unsigned int h3600_eeprom_read(unsigned char address, char *data, unsigned char len)
+{
+        int status;
+        epromRdRet.addr = address; epromRdRet.len = len;
+        status = h3600_microcontroller_request(EEPROM_READ_ID, (char*)&epromRdRet, len + 2);
+        memcpy(data, &epromRdRet.buff, len);
+        return 0;
+}
+
+/* TODO change this to h3600_spi_read */
+unsigned int h3600_iic_read(unsigned char address, char *data, unsigned char len)
+{
+        int status;
+        iicRdRet.addr = address; iicRdRet.len = len;
+        printk(__FUNCTION__ ": calling microcontroller\n");
+        status = h3600_microcontroller_request(SPI_READ_ID, (char*)&iicRdRet, len + 2);
+        printk(__FUNCTION__ ": req.len=%d\n", iicRdRet.len);
+        memcpy(data, &iicRdRet.buff, len);
+        return 0;
+}
+
+EXPORT_SYMBOL(h3600_eeprom_read);
+EXPORT_SYMBOL(h3600_iic_read);
+
+/*
+	Generic poll
+*/
+unsigned int h3600_poll(struct file * filp, struct poll_table_struct * wait)
+{
+        int minor;
+        EVENT * pev;
+        ID * pid;
+
+        minor = checkDevice( filp->f_dentry->d_inode);
+        if ( minor == - 1)
+                return -ENODEV;
+
+#if 0
+        printk("h3600_poll:\n");
+#endif
+
+        pev = &g_Events[minor];
+        pid = &g_Ids[pev->id];
+        poll_wait(filp,&pid->wq,wait);
+        return ( pev->head == pev->tail) ? 0 : (POLLIN | POLLRDNORM);
+}
+
+/*
+	Generic read operation.	
+*/
+
+ssize_t h3600_read(struct file * filp, char * buf, size_t count, loff_t * l)
+{
+        int nonBlocking = filp->f_flags & O_NONBLOCK;
+        int minor;
+        EVENT * pev;
+        ID * pid;
+
+
+        minor = checkDevice( filp->f_dentry->d_inode );
+        if ( minor == - 1)
+                return -ENODEV;
+
+
+        pev = &g_Events[minor];
+        pid = &g_Ids[pev->id];
+
+#if 0
+        printk("h3600_read: minor=%d id=%d\n",minor,pev->id);
+#endif
+
+        if( nonBlocking )
+        {
+                if( ( pev->head != pev->tail ) && pev->processRead )
+                {
+                        int count;
+                        count = (*pev->processRead)(pid);
+                        /* returns length to be copied otherwise errno -Exxx */
+                        if( count > 0 )
+                                /* TODO TODO use __copy or copy ? */
+                                __copy_to_user(buf,(char *)pid->pReturn,count );
+                        return count;
+                }
+                else
+                        return -EINVAL;
+
+        }
+        else
+        {
+                /* check , when woken, there is a complete event to read */
+        retry:
+                if( ( pev->head != pev->tail ) && pev->processRead )
+                {
+                        int rcount;
+                        rcount = (*pev->processRead)(pid);
+                        /* returns length to be copied otherwise errno -Exxx */
+                        if( rcount > 0 )
+                        {
+                                __copy_to_user(buf,(char *)pid->pReturn,rcount );
+                        }
+                        return rcount;	/* TODO fmtLen if success -Exxx if error */
+                }
+                else
+                {
+                        interruptible_sleep_on(&pid->wq);
+                        goto retry;
+                }
+
+	
+        }
+}
+
+int h3600_open(struct inode * inode, struct file * filp)
+{
+        int minor;
+        EVENT * pev;
+
+        minor = checkDevice( inode );
+        if ( minor == - 1)
+                return -ENODEV;
+
+#if 0
+        printk("h3600_open:minor=%d\n",minor);
+#endif
+	MOD_INC_USE_COUNT;
+
+        /* initialise event buffer */
+        pev = &g_Events[minor];
+        pev->tail = pev->head;
+
+        return 0;
+}
+
+int h3600_release(struct inode * inode, struct file * filp)
+{
+
+#if 0
+        printk("h3600_release:minor=%d\n",minor);
+#endif
+	MOD_DEC_USE_COUNT;
+
+        return 0;
+}
+
+
+
+/*
+	Returns the Minor number from the inode.
+*/
+static int checkDevice(struct inode *pInode)
+{
+	int minor;
+	kdev_t dev = pInode->i_rdev;
+
+	if( MAJOR(dev) != gMajor)
+	{
+		printk("checkDevice bad major = %d\n",MAJOR(dev) );
+		return -1;
+	}
+	minor = MINOR(dev);
+
+	if ( minor < MAX_MINOR )
+		return minor;
+	else
+	{
+		printk("checkDevice bad minor = %d\n",minor );
+		return -1;
+	}
+}
+
+/* +++++++++++++++++ Start of ISR code ++++++++++++++++++++++++++ */
+
+
+/*
+	Sets up serial port 1
+	baud rate = 115k
+	8 bits no parity 1 stop bit
+*/
+
+static int initSerial( )
+{
+        /* Clean up CR3 for now */
+        Ser1UTCR3 = 0;
+
+        /* 8 bits no parity 1 stop bit */
+        Ser1UTCR0 = 0x08;
+
+        /* Set baud rate MS nibble to zero. */
+        Ser1UTCR1 = 0;
+
+        /* Set baud rate LS nibble to 115K bits/sec */
+        Ser1UTCR2 = 0x1;
+
+        /*
+	  SR0 has sticky bits, must write ones to them to clear.
+          the only way you can clear a status reg is to write a '1' to clear.
+        */
+        Ser1UTSR0 = 0xff;
+
+        /*
+          enable rx fifo interrupt (SAM 11-116/7)
+          If RIE=0 then sr0.RFS and sr0.RID are ignored ELSE
+          if RIE=1 then whenever sro.RFS OR sr0.RID are high an
+          interrupt will be generated.
+          Also enable the transmitter and receiver.
+        */
+        Ser1UTCR3 = UTCR3_TXE | UTCR3_RXE | UTCR3_RIE;
+
+        /*
+          initialize Serial channel protocol frame
+        */
+        rxdev.state = STATE_SOF;
+        rxdev.event = rxdev.len = 0;
+        memset(&rxdev.buf[0],0,sizeof(rxdev.buf));
+        txdev.head = txdev.tail=0;
+        return 0;	/* TODO how do we denote an error */
+} // End of function initSerial
+
+/*
+	This function takes a single byte and detects the frame
+*/
+static _INLINE_ void processChar(unsigned char rxchar)
+{
+        switch ( rxdev.state )
+        {
+		/*
+                  We are looking for the SOF in this state.
+		*/
+        case STATE_SOF:
+                if ( rxchar == CHAR_SOF )
+                {
+				/* found it - next byte is the id and len */
+                        rxdev.state=STATE_ID;
+                }
+                break;
+		/*
+                  We now expect the id and len byte
+		*/
+        case STATE_ID:
+                rxdev.event = (rxchar & 0xf0) >> 4 ;
+                rxdev.len = (rxchar & 0x0f);
+                rxdev.idx=0;
+                if (rxdev.event >= MAX_ID )
+                {
+				/* increment error counter 1 */
+                        printk("Error1\n");
+                        ++rxdev.counter[0];
+                        rxdev.state = STATE_SOF;
+                        break;
+                }
+                rxdev.chksum = rxchar;
+                rxdev.state=( rxdev.len > 0 ) ? STATE_DATA : STATE_EOF;
+                break;
+		/*
+                  We now expect 'len' data bytes.
+		*/
+        case STATE_DATA:
+                rxdev.chksum += rxchar;
+                rxdev.buf[rxdev.idx]= rxchar;
+                if( ++rxdev.idx == rxdev.len )
+                {
+				/* look for the EOF char next */
+                        rxdev.state = STATE_EOF;
+                }
+                break;
+		/*
+                  We now expect to find the STATE_EOF
+                  TODO TODO not sure if this is an STATE_EOF marker
+                  or simply the checksum byte
+		*/
+        case STATE_EOF:
+                rxdev.state = STATE_SOF;
+                if (rxchar == CHAR_EOF || rxchar == rxdev.chksum )
+                {
+                        ID * pid = &g_Ids[(unsigned)rxdev.event];
+                        if( pid->processEvent )
+                        {
+                                /*printk(" [%d]\n",(unsigned)rxdev.event);*/
+                                if ( (*pid->processEvent)(pid) == 0 )
+                                        wake_up_interruptible(&pid->wq);
+                        }
+                }
+                else
+                {
+                        ++rxdev.counter[1];
+                        printk("\nbadFrame: event=%d ", rxdev.event);
+                }
+                break;
+        default:
+                ++rxdev.counter[2];
+                printk("Error3\n");
+                break;
+
+        }	/* end switch */
+
+}  /* end of in-line function */
+
+
+/*
+
+	Frame format
+  byte	  1	  2		  3 		 len + 4
+	+-------+---------------+---------------+--=------------+
+	|SOF	|id	|len	| len bytes	| Chksum	|
+	+-------+---------------+---------------+--=------------+
+  bit	0     7  8    11 12   15 16
+
+	+-------+---------------+-------+
+	|SOF	|id	|0	|Chksum	| - Note Chksum does not include SOF
+	+-------+---------------+-------+
+  bit	0     7  8    11 12   15 16
+
+*/
+
+static void eventIsr(int irq, void *dev_id, struct pt_regs *regs)
+{
+	int status0 = Ser1UTSR0;
+
+	/* clear flags now to avoid races */
+	Ser1UTSR0 = status0;
+
+	if (status0 & (UTSR0_RID|UTSR0_RFS))
+		while (Ser1UTSR1 & UTSR1_RNE)
+			processChar(Ser1UTDR);
+
+	if (status0 & UTSR0_TFS) {
+		unsigned int tail=txdev.tail;
+		unsigned int head=txdev.head;
+		/* Tx FIFO below low water mark and needs replenished */
+		while (Ser1UTSR1 & UTSR1_TNF) {
+			Ser1UTDR = txdev.buf[tail];
+			if ( (tail=INCBUF(tail,TXBUF_MAX) ) == head )
+			{
+				/* nothing more to Tx - disable interrupts */
+				Ser1UTCR3 &= ~UTCR3_TIE;
+				break;
+			}
+		}
+		txdev.tail=tail;
+	}
+
+	if (status0 & UTSR0_EIF)
+	{
+		/* Detected a Parity,Frame or Overrun error */
+		printk("IRQ EIF\n");
+	}
+
+	if (status0 & (UTSR0_RBB|UTSR0_REB))
+	{
+		/* must be a Begin/End of break that caused IRQ */
+		printk("IRQ RBB | REB\n");
+	}
+}	//end of function
+
+static void action_button_handler(int irq, void *dev_id, struct pt_regs *regs)
+{
+	int scancode = H3600_SCANCODE_ACTION;
+	int down = (GPLR & GPIO_BITSY_ACTION_BUTTON) ? 0 : 1;
+	handle_scancode(scancode, down);
+}
+
+static int suspend_button_pushed = 0;
+static void suspend_button_task_handler(void *data) 
+{
+        extern void pm_do_suspend(void);
+        udelay(200); /* debounce */
+        pm_do_suspend();
+        suspend_button_pushed = 0;
+}
+
+static struct tq_struct suspend_button_task = {
+        routine: suspend_button_task_handler
+};
+
+static int suspend_button_mode = PBM_SUSPEND;
+static void npower_button_handler(int irq, void *dev_id, struct pt_regs *regs)
+{
+        int scancode = H3600_SCANCODE_SUSPEND;
+        int down = (GPLR & GPIO_BITSY_NPOWER_BUTTON) ? 0 : 1;
+        if (dev_id != npower_button_handler)
+                return;
+
+        if (suspend_button_mode == PBM_GENERATE_KEYPRESS) {
+                if (0) printk(__FUNCTION__ ": scancode=%d down=%d\n", scancode, down);
+                handle_scancode(scancode, down);
+        } else {
+                if (!suspend_button_pushed) {
+                        suspend_button_pushed = 1;
+                        schedule_task(&suspend_button_task);
+                }
+        }
+}
+
+
+static unsigned char scancodes[] = {
+        0, /* unused */
+        H3600_SCANCODE_RECORD, /* 1 -> record button */
+        H3600_SCANCODE_CALENDAR, /* 2 -> calendar */
+        H3600_SCANCODE_CONTACTS, /* 3 -> contact */
+        H3600_SCANCODE_Q, /* 4 -> Q button */
+        H3600_SCANCODE_START, /* 5 -> start menu */
+        H3600_SCANCODE_UP, /* 6 -> up */
+        H3600_SCANCODE_RIGHT, /* 7 -> right */
+        H3600_SCANCODE_LEFT, /* 8 -> left */
+        H3600_SCANCODE_DOWN, /* 9 -> down */
+};
+
+/* +++++++++++++++++ end of ISR code ++++++++++++++++++++++++++ */
+/****************** start of device handlers section ***********************/
+
+/*
+	Buttons - returned as a single byte
+	7 6 5 4 3 2 1 0
+	S x x x N N N N
+
+	S	switch state ( 0=pressed 1=released)
+	x	Unused.
+	NNNN	switch number 0-15
+
+*/
+static int keyEvent(ID * pDev )		/* touch screen event handler */
+{
+        KEY_DEV * pKeyDev = (KEY_DEV *)pDev->pdev;
+        EVENT * pev = &g_Events[KEY_MINOR];
+        unsigned char * pKey = &pKeyDev->buf[pev->head];
+
+        *pKey=rxdev.buf[0];	/* store current key state */
+
+        pev->head=INCBUF(pev->head,MAX_KEY_EVENTS );
+        /* Send an interrupt (SIGIO) to the client's signal handler */
+        if (pev->aq)
+                kill_fasync(&pev->aq, SIGIO, POLL_IN);
+
+        { 
+           unsigned char key = *pKey;
+           unsigned char scancode = scancodes[key&KEY_NUM];
+           unsigned char down = (key&KEY_RELEASED) ? 0 : 1;
+
+           if (0) printk(__FUNCTION__ ": key=%#x scancode=%d down=%d\n", key, scancode, down);
+           handle_scancode(scancode, down);
+        }
+        return 0;
+
+}
+
+static int keyRead(ID * pDev)
+{
+        /* generic line for all readers */
+        KEY_DEV * pKeyDev = (KEY_DEV *)pDev->pdev;
+        EVENT * pev = &g_Events[KEY_MINOR];
+        unsigned char * pKey = &pKeyDev->buf[pev->tail];
+        keyRet = *pKey;
+        pev->tail=INCBUF(pev->tail,MAX_KEY_EVENTS );
+        return 1;	/* TODO make this a sizeof() */
+}
+
+
+/*	ID=3 TOUCHSCREEN EVENTS
+	TouchScreen event data is formatted as shown below:-
+
+	+-------+-------+-------+-------+
+	| Xmsb	| Xlsb	| Ymsb	| Ylsb	|
+	+-------+-------+-------+-------+
+	byte 0	  1	  2	  3
+
+*/
+
+static int tsEvent(ID * pDev )		/* touch screen event handler */
+{
+        if (!touchScreenSilenced) {
+                unsigned head;
+                /* This is where we will store the event */
+                EVENT * pev = &g_Events[TS_MINOR];
+                EVENT * pevraw = &g_Events[TSRAW_MINOR];
+                TS_DEV * pTsDev = ( TS_DEV * )pDev->pdev;
+                TS_EVENT * pEvent;
+                TS_EVENT * pFilteredEvent;
+
+                head = pev->head;
+                pEvent = &pTsDev->events[head];
+                pFilteredEvent = &pTsDev->filtered_events[head];
+
+                if( rxdev.len == TS_DATA_LEN )
+                {
+                        /*
+                          There are 3 sub-events within the TS_EVENT
+                          PEN_UP		- user has just lifted pen off screen.
+                          PEN_FLEETING	- user has just put pen DOWN for the first time.
+                          - we ignore this event.
+                          PEN_DOWN	- this is a true sample.
+                        */
+                        switch(pTsDev->penStatus)
+                        {
+                        case PEN_FLEETING:
+                                /* TODO how many fleeting before we pronounce a PEN_DOWN? */
+                                pTsDev->penStatus = PEN_DOWN;
+                                /* OK to use this data -  pass thru to next case*/
+                        case PEN_DOWN:
+                        {
+                                /* store raw x,y & pressure to ts_dev.event[head] */
+                                unsigned  short x,y;
+                                /* Extract RAW coords from event data  */
+                                /* TODO TODO check this!! */
+                                x = rxdev.buf[0]; x <<= 8; x += rxdev.buf[1];
+                                y = rxdev.buf[2]; y <<= 8; y += rxdev.buf[3];
+                                /* dont calibrate it until the user asks for it */
+                                pEvent->x = x;
+                                pEvent->y = y;
+                                pEvent->pressure = 1;
+                                *pFilteredEvent = tsFilter(*pEvent);
+                                /* increment heads */
+                                pev->head = INCBUF(head,MAX_TS_EVENTS);
+                                pevraw->head=pev->head;
+#if 0
+                                printk("PEN_DOWN: x=%d y=%d p=%d ++h=%d:%d\n",
+                                       pEvent->x,pEvent->y,
+                                       pEvent->pressure,pev->head,pevraw->head);
+#endif
+                        }
+                        break;
+                        case PEN_UP:
+                                /* Pen was previously UP dont trust this sample */
+                                pTsDev->penStatus = PEN_FLEETING;
+#if 0
+                                printk("PEN_FLEETING\n");
+#endif
+                                return 1; 
+                        default:
+                                pTsDev->penStatus = PEN_UP;
+                                printk("PEN_UNKNOWN\n");
+                                return -1;
+                        }
+
+                }
+                else if (rxdev.len == 0)
+                {
+                        /* PEN_UP - since we have no data in the frame */
+                        pTsDev->penStatus = PEN_UP;
+                        pEvent->x = pEvent->y = pEvent->pressure = 0; 
+                        *pFilteredEvent = tsFilter(*pEvent);
+                        /* increment heads */
+                        pev->head = INCBUF(head,MAX_TS_EVENTS);
+                        pevraw->head=pev->head;
+#if 0
+                        printk("PEN_UP head=%d\n",pev->head);
+#endif
+                }
+                else
+                {
+                        /* we have a length over or under run */
+                        printk("LENGTH_UNKNOWN\n");
+                        return -1;
+                }
+
+                /* There is an event to report - Async notification */
+                if (pev->aq)
+                        kill_fasync(&pev->aq, SIGIO, POLL_IN);
+                if (pevraw->aq)
+                        kill_fasync(&pevraw->aq, SIGIO, POLL_IN);
+
+                return 0;	/* event to report */
+
+        }
+	else
+	    return -1;	/* return error if disabled */
+
+} /* end of tsEvent() */
+
+
+/* 
+        a function that will return a filtered/normalized co-ordinate
+        based on the history of previous co-ordinates. 
+
+        SHOULD ONLY BE USED FROM tsEvent.  Currently can only be used over
+        one set of points as needs to keep history.  If used from two places
+        it will be unpredictable.  
+
+        Avg the value,
+        Check for sudden jumps (slightly ruined by the avg)
+        check for jittering (don't allow very slight movement)
+        return average value.
+
+        return 0 all if don't have enough information for filtering.
+*/
+#define DEFAULT_JITTER_DIST_SQR         2
+#define DEFAULT_JUMP_DIST_SQR        3000
+#define FLTR_BUFFER_MAX_SIZE_LOG2 	6
+#define FLTR_BUFFER_MAX_SIZE    	(1 << FLTR_BUFFER_MAX_SIZE_LOG2)
+#define DEFAULT_FLTR_BUFFER_SIZE_LOG2   3
+#define DEFAULT_FLTR_BUFFER_SIZE    	(1 << DEFAULT_FLTR_BUFFER_SIZE_LOG2)
+
+static int jitter_dist_sqr = DEFAULT_JITTER_DIST_SQR;
+static int jump_dist_sqr = DEFAULT_JUMP_DIST_SQR;
+static int fltr_buffer_size = DEFAULT_FLTR_BUFFER_SIZE;
+static int fltr_buffer_size_log2 = DEFAULT_FLTR_BUFFER_SIZE_LOG2;
+
+static TS_EVENT tsFilter(TS_EVENT raw) { 
+        TS_EVENT return_val;
+        static unsigned int count=0;
+        static unsigned int xprev=0;
+        static unsigned int yprev=0;	
+        static unsigned int buffer_x[FLTR_BUFFER_MAX_SIZE];
+        static unsigned int buffer_y[FLTR_BUFFER_MAX_SIZE];
+        static unsigned int avg_x=0;
+        static unsigned int avg_y=0;
+        static int b_pos = 0;
+        static unsigned int xprev_raw=0;
+        static unsigned int yprev_raw=0;	
+        static signed int xlast_diff=0;	
+        static signed int ylast_diff=0;	
+
+        fltr_buffer_size = (1 << fltr_buffer_size_log2);
+
+        return_val = raw; 
+
+        buffer_x[b_pos]= raw.x;
+        avg_x += raw.x;
+        buffer_y[b_pos]= raw.y;
+        avg_y += raw.y;
+        b_pos = INCBUF(b_pos, fltr_buffer_size);
+
+        if (raw.pressure != 0) {
+                int dx;
+                int dy;
+
+                switch(count) {
+                case 0: 
+                        /* first position */
+                        count++;
+                        /* store xprev, and yprev, but return as if 
+                         * new position */
+                        xprev_raw = raw.x;
+                        yprev_raw = raw.y;
+                        return_val.x = return_val.y 
+                                = return_val.pressure = 0;
+                        break;
+                case 1:
+                        /* second position */
+                        count++;
+                        xlast_diff = raw.x - xprev_raw;
+                        ylast_diff = raw.y - yprev_raw;
+                        xprev_raw = raw.x;
+                        yprev_raw = raw.y;
+                        return_val.x = return_val.y 
+                                = return_val.pressure = 0;
+                        break; 
+                default:
+                        if ((count+1) >= fltr_buffer_size) {
+                                /* added more than 4, need to 
+                                 * take one off */
+                                return_val.x = avg_x>>fltr_buffer_size_log2;
+                                return_val.y = avg_y>>fltr_buffer_size_log2;
+                                avg_x -= buffer_x[b_pos];
+                                avg_y -= buffer_y[b_pos];
+                        } else {
+                                count++;
+                                xlast_diff = raw.x - xprev_raw;
+                                ylast_diff = raw.y - yprev_raw;
+                                xprev_raw = raw.x;
+                                yprev_raw = raw.y; 
+                                return_val.x = return_val.y = 
+                                        return_val.pressure = 0;
+                                break;
+                        }
+                        /* third position or later */
+                        dx = raw.x - xprev_raw;
+                        dy = raw.y - yprev_raw;
+                        if ((((dx - xlast_diff)*(dx - xlast_diff)) +
+                             ((dy - ylast_diff)*(dy - ylast_diff)))
+                                        > jump_dist_sqr) { 
+                                /* possible jump, lets assume so, 
+                                 * fix by setting pen up.  Also, 
+                                 * so can continue, need to rexet 
+                                 * trap info, so reset count as well */
+                                return_val.x = return_val.y = 
+                                        return_val.pressure = 0;
+                                count = 0;
+                                avg_x = avg_y = 0;
+                                break; 
+                        }
+                        xlast_diff = dx;
+                        ylast_diff = dy;
+                        xprev_raw = raw.x;
+                        yprev_raw = raw.y;
+                        /* stable over last three positions, 
+                         * can process this */
+                        dx = return_val.x - xprev;
+                        dy = return_val.y - yprev;
+      
+                        /* process Jitter filter */
+                        if(((dx*dx) + (dy*dy)) > jitter_dist_sqr) {
+                                xprev=return_val.x;
+                                yprev=return_val.y;
+                        } else {
+                                return_val.x = xprev;
+                                return_val.y = yprev;
+                        } 
+                }
+        } else { 
+                /* pen up, reset data, return_val already = raw */
+                count = 0; 
+                avg_x = avg_y = 0;
+        }
+        return(return_val);
+}
+
+/*
+	Read() function for the touch screen.
+	IN:  raw data
+	OUT: Calibrated data pointed to by pReturn.
+        as part of calibration, may filter out 'noise' and report
+        up if not enough data to give a 'good' value
+
+        Works by looking back in buffer for any changes in possiton
+        greater than magic number X. in this case the magic number 
+        is 81.  I must stress that this is the first test of this filter
+        and it will be refined as tested.  Mostly it will be made to be 
+        less ugly, better code etc.
+*/
+static int tsRead(ID * pDev)
+{
+	/* generic line for all readers */
+        TS_DEV * pTsDev = (TS_DEV *)pDev->pdev;
+        EVENT * pev = &g_Events[TS_MINOR];
+        TS_EVENT filtered = pTsDev->filtered_events[pev->tail];
+        TS_RET * fmt = (TS_RET *)pDev->pReturn;
+
+        if (filtered.pressure != 0) { 
+                fmt->x=((pTsDev->cal.xscale*filtered.x)>>8)+pTsDev->cal.xtrans;
+                fmt->y=((pTsDev->cal.yscale*filtered.y)>>8)+pTsDev->cal.ytrans;
+                fmt->pressure = 1;
+        } else {
+                /* pen really up */
+                fmt->x = fmt->y = fmt->pressure = 0;
+        }
+
+        /* TODO there may be other stuff to copy to the return buffer */
+        pev->tail=INCBUF(pev->tail,MAX_TS_EVENTS);
+#if 0
+        printk("\ntsRead: h=%d ++t=%d x=%d y=%d p=%d\n",
+               pDev->head,pDev->tail,fmt->x,fmt->y,fmt->pressure);
+#endif
+
+        return sizeof(TS_RET);		/* success */
+}
+
+/*
+	RAW Touch screen data - used by the calibration utility.
+	Read() function for the touch screen.
+	IN:  raw data
+	OUT: Calibrated data pointed to by pReturn.
+*/
+static int tsReadRaw(ID * pDev)
+{
+	/* generic line for all readers */
+        TS_DEV * pTsDev = (TS_DEV *)pDev->pdev;
+        EVENT * pev = &g_Events[TSRAW_MINOR];
+        TS_EVENT raw = pTsDev->events[pev->tail];
+        TS_RET * ret = (TS_RET *)pDev->pReturn;
+
+#if 0
+	printk("tsReadRaw:rawX=%d rawY=%d\n", raw.x,raw.y );
+#endif
+	/* Raw data including PEN_UP */
+        ret->x = raw.x;
+        ret->y = raw.y;
+        ret->pressure = raw.pressure;
+
+        /* TODO there may be other stuff to copy to the return buffer */
+
+        pev->tail=INCBUF(pev->tail,MAX_TS_EVENTS);
+
+#if 0
+        printk("\ntsReadRaw:h=%d ++t=%d p=%d\n",pev->head,pev->tail,ret->pressure);
+#endif
+
+        return sizeof(TS_RET);		/* success */
+}
+/*
+	ts_ioctl - ioctl function for touch screen device
+*/
+static int tsIoctl( void * pDevice, unsigned int cmd, unsigned long arg)
+{
+        TS_DEV * pdev = (TS_DEV *)pDevice;
+
+        printk("tsIoctl: cmd %04x pdev=%p\n",cmd,pdev);
+
+        switch(cmd)
+        {
+	case TS_GET_RATE:	/* TODO TODO */
+                return pdev->rate;
+                break;
+	case TS_SET_RATE:	/* TODO TODO */
+                pdev->rate = arg;
+                break;
+	case TS_GET_CAL:
+                printk("TS_GET_CAL\n");
+                __copy_to_user((char *)arg, (char *)&pdev->cal, sizeof(TS_CAL) );
+                break;
+	case TS_SET_CAL:
+                printk("\n\nTS_SET_CAL: ");
+                __copy_from_user( (char *)&pdev->cal,(char *)arg ,sizeof(TS_CAL) );
+	    
+                printk("xscale=%d xtrans=%d yscale=%d ytrans=%d\n\n",
+                       pdev->cal.xscale,pdev->cal.xtrans,
+                       pdev->cal.yscale,pdev->cal.ytrans);
+                break;
+	default:
+                printk("IOCTL: unknowncmd %04x\n",cmd);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int tsInit(ID * pDev)
+{
+        TS_DEV * pTsDev = (TS_DEV *)pDev->pdev;
+
+        /* TODO this is zero'd at init_module - need to do it again? */
+
+        pTsDev->penStatus=PEN_DOWN;
+        /* default calibration */
+        pTsDev->cal.xscale = -93;
+        pTsDev->cal.xtrans = 346;
+        pTsDev->cal.yscale = -64;
+        pTsDev->cal.ytrans = 251;
+
+        return 0;
+}
+
+/* 
+	Stub functions 
+*/
+#if 0
+static int xxInit(ID * pdev )
+{
+	printk("xxInit: not implemented\n");
+	return 0;
+}
+
+#endif
+
+/*
+	generic response handler - assumes no data - simply an Ack
+	All it does is increment a MOD255 sequence number.
+*/
+static int ackRes(ID * pDev )
+{
+        ++pDev->sn;
+#if 0
+        printk("ackRes sn=%d\n",pDev->sn);
+#endif
+        return 0;
+}
+
+/*
+	Response handler for GET version number.
+	Ver Number returned as 4 bytes XX.YY
+*/
+static int verRes(ID * pDev )
+{
+        VER_RET * pVer = (VER_RET *)pDev->pReturn;
+	unsigned int len = rxdev.len;
+	switch(len)
+	{
+	    case 4:
+		memcpy(pVer->host_version,rxdev.buf,4);
+		pVer->host_version[4]=0;
+		pVer->pack_version[0]=0;
+		break;
+	    case 9:
+		memcpy(pVer->host_version,rxdev.buf,4);
+		pVer->host_version[4]=0;
+		memcpy(pVer->pack_version,&rxdev.buf[4],4);
+		pVer->pack_version[4]=0;
+		pVer->boot_type=rxdev.buf[8];
+		break;
+	    default:
+		printk("verRes Unknown len = %d\n",len);
+		break;
+	}
+#if 0
+    {
+	unsigned i;
+	printk("ver=%s option_pack_ver=%s boot_type=%02x\n",
+		pVer->host_version,pVer->pack_version,pVer->boot_type);
+	for(i=0; i < rxdev.len; i++ )
+        	printk("%02x:",rxdev.buf[i]);
+	printk("\n");
+    }
+#endif
+    ++pDev->sn;
+    return 0;
+}
+
+static int epromRdRes(ID * pDev)
+{
+    EEPROM_READ *pER = (EEPROM_READ *)pDev->pReturn;
+    unsigned int len = rxdev.len >> 1;	/* len = len/2 */
+    unsigned int i,j;
+    unsigned short x;
+
+    if( len > EEPROM_RD_BUFSIZ )
+    {
+	printk("WARNING epromRdRes bad length = %d\n",len);
+	return -1;
+    }
+
+    for( i=0,j=0 ; i < len ; i++, j++)
+    {
+	x = rxdev.buf[j];
+	x <<= 8;
+	x += rxdev.buf[++j];
+#if 0
+	printk("epromRdRes: i=%d,j=%d,x=%04x\n",i,j,x);
+#endif
+	pER->buff[i]=x;
+    }
+
+    pER->len=len;
+    ++pDev->sn;
+    return 0;
+
+}
+
+
+static int iicRdRes(ID * pDev)
+{
+    SPI_READ *pER = (SPI_READ *)pDev->pReturn;
+    unsigned int i,len;
+
+    len = rxdev.len;
+
+    for( i=0 ; i < len ; i++)
+    {
+#if 0
+	printk("iicRdRes: %02x\n",rxdev.buf[i]);
+#endif
+	pER->buff[i]=rxdev.buf[i];
+    }
+
+    pER->len=len;
+    ++pDev->sn;
+    return 0;
+}
+
+
+static int battRdEvent(ID * pDev)
+{
+        BAT_DEV *pbattinfo = (BAT_DEV *)pDev->pReturn;
+        {
+#if 0
+                unsigned i;
+                printk(__FUNCTION__ ": len=%d\n",rxdev.len);
+                for (i=0 ; i < rxdev.len ; i++ )
+                        printk("%02x",rxdev.buf[i]);
+                printk("\n\n");
+#endif
+
+                pbattinfo->ac_status = rxdev.buf[0];
+                pbattinfo->batt1_chemistry = rxdev.buf[1];
+                pbattinfo->batt1_voltage = ((rxdev.buf[3]<<8)| rxdev.buf[2]);
+                pbattinfo->batt1_status = rxdev.buf[4];                
+        }
+
+        ++pDev->sn;
+        return 0;
+}
+
+
+
+
+static struct ctl_table h3600_ts_table[] = 
+{
+	{1, "suspend_button_mode", &suspend_button_mode, sizeof(int), 0666, NULL, &proc_dointvec},
+	{2, "calibration", &tsDev.cal, sizeof(tsDev.cal), 0600, NULL, &proc_dointvec },
+        {3, "jitter_dist_sqr", &jitter_dist_sqr, sizeof(int), 0600, NULL, &proc_dointvec },
+        {4, "jump_dist_sqr", &jump_dist_sqr, sizeof(int), 0600, NULL, &proc_dointvec },
+        {3, "fltr_buffer_size_log2", data: &fltr_buffer_size_log2, maxlen: sizeof(int), mode: 0600, proc_handler: &proc_dointvec_minmax, 
+         extra1: (void*)0, extra2: (void*)FLTR_BUFFER_MAX_SIZE_LOG2 },
+	{0}
+};
+
+static struct ctl_table h3600_ts_dir_table[] =
+{
+	{11, "ts", NULL, 0, 0555, h3600_ts_table},
+	{0}
+};
+
+static struct ctl_table_header *h3600_ts_sysctl_header = NULL;
+
+
+
+/* int __init h3600_init(void) */
+int __init h3600_init_module(void)
+{
+	/* TODO TODO what happens if there is an error - see pdriver */
+	int result;
+	unsigned i;
+	ID * pid;
+
+        /* register our character device */
+        //printk(__FUNCTION__ ":init_module registering char device\n");
+        result = register_chrdev(0, MOD_NAME, &ts_fops);
+        if (result < 0) {
+                printk(__FUNCTION__ ": can't get major number\n");
+                return result;
+        }
+
+	gMajor = result;
+
+	result = request_irq(TS_IRQ, eventIsr, SA_INTERRUPT,
+                             "h3600_ts", NULL);
+	if (result) {
+		printk("can't get IRQ for the microcontroller serial port\n");
+		return result;
+	}
+	initSerial();
+
+        set_GPIO_IRQ_edge( GPIO_BITSY_ACTION_BUTTON, GPIO_BOTH_EDGES );
+        set_GPIO_IRQ_edge( GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE );
+
+	result = request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler, SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM,
+                              "h3600_action", action_button_handler);
+	result |= request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler, SA_SHIRQ | SA_INTERRUPT | SA_SAMPLE_RANDOM,
+                              "h3600_suspend", npower_button_handler);
+
+	if (!result)
+	{	
+                printk("init_module successful init major= %d irq=%d\n",
+                       gMajor,TS_IRQ);
+
+                for(i=0 ; i < MAX_ID ; i++)
+                {
+                        /* Zero device specific structures */
+                        pid = &g_Ids[i];
+                        pid->sn=0;
+                        memset(pid->pdev,0,pid->lenDev);		
+                        init_waitqueue_head(&pid->wq);
+                        memset(pid->pReturn,0,pid->lenRet);		
+                        if( pid->initDev )
+                                (*pid->initDev)( pid );
+                }
+		h3600_flite_control(1, 25);	/* default brightness */
+#ifdef CONFIG_PM
+                pm_register(PM_ILLUMINATION_DEV, PM_SYS_LIGHT, h3600_ts_pm_callback);
+                //printk(__FUNCTION__ " registered pm callback=%p\n", h3600_ts_pm_callback);
+#endif
+                h3600_ts_sysctl_header = register_sysctl_table(h3600_ts_dir_table, 0);
+                h3600_ts_ready = 1;
+	}
+	else
+		printk("init_module error from irq %d\n", result);
+	return 0;
+}
+
+void h3600_cleanup_module(void)
+{
+	printk("cleanup_module:\n");
+
+        flush_scheduled_tasks();
+        unregister_sysctl_table(h3600_ts_sysctl_header);
+	Ser1UTCR3 = 0;
+	free_irq(TS_IRQ, NULL);
+	free_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler);
+	free_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler);
+#ifdef CONFIG_PM
+	pm_unregister_all(h3600_ts_pm_callback);
+#endif
+	unregister_chrdev(gMajor, MOD_NAME);
+}
+
+module_init(h3600_init_module);
+module_exit(h3600_cleanup_module);
diff -urN 2.4.7-rmk3/linux/drivers/char/pfs168_dtmf.c linux/drivers/char/pfs168_dtmf.c
--- 2.4.7-rmk3/linux/drivers/char/pfs168_dtmf.c	Wed Dec 31 19:00:00 1969
+++ linux/drivers/char/pfs168_dtmf.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,216 @@
+/*
+ *  linux/drivers/char/pfs168_dtmf.c
+ *
+ *  Copyright (C) 2001, MontaVista Software, Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  15 February 2001 - created.
+ */
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/malloc.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/poll.h>
+#include <linux/sched.h>
+#include <linux/switches.h>
+#include <linux/wait.h>
+#include <linux/spinlock.h>
+
+#include <asm/hardware.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+
+
+#define PFS168_DTMF_NAME "pfs168_dtmf"
+
+#define DTMF_BUF_SIZE		64
+
+struct dtmf_queue {
+	unsigned long head;
+	unsigned long tail;
+	wait_queue_head_t proc_list;
+	unsigned char buf[DTMF_BUF_SIZE];
+};
+
+static struct dtmf_queue *queue;        /* DTMF data buffer. */
+static int dtmf_count = 0;
+
+static spinlock_t dtmf_lock = SPIN_LOCK_UNLOCKED;
+
+
+static void pfs168_dtmf_handler(int, void *, struct pt_regs *);
+
+static unsigned char get_from_queue(void)
+{
+       unsigned char result;
+       unsigned long flags;
+
+       spin_lock_irqsave(&dtmf_lock, flags);
+       result = queue->buf[queue->tail];
+       queue->tail = (queue->tail + 1) & (DTMF_BUF_SIZE-1);
+       spin_unlock_irqrestore(&dtmf_lock, flags);
+
+       return result;
+}
+
+
+static inline int queue_empty(void)
+{
+       return queue->head == queue->tail;
+}
+
+
+static ssize_t dtmf_read(struct file *file, char *buffer, size_t count, loff_t *pos) {
+	DECLARE_WAITQUEUE(wait, current);
+	ssize_t i = count;
+	unsigned char c;
+
+	if (queue_empty()) {
+		if (file->f_flags & O_NONBLOCK)
+			return -EAGAIN;
+
+		add_wait_queue(&queue->proc_list, &wait);
+
+repeat:
+		set_current_state(TASK_INTERRUPTIBLE);
+
+		if (queue_empty() && !signal_pending(current)) {
+			schedule();
+			goto repeat;
+		}
+
+		current->state = TASK_RUNNING;
+		remove_wait_queue(&queue->proc_list, &wait);
+	}
+
+	while (i > 0 && !queue_empty()) {
+		c = get_from_queue();
+		put_user(c, buffer++);
+		i--;
+	}
+
+	if (count-i) {
+		file->f_dentry->d_inode->i_atime = CURRENT_TIME;
+		return count-i;
+	}
+
+	if (signal_pending(current))
+		return -ERESTARTSYS;
+
+	return 0;
+}
+
+static ssize_t dtmf_write(struct file *file, const char *buffer, size_t count, loff_t *ppos) {
+	return -EINVAL;
+}
+
+static unsigned int dtmf_poll(struct file *file, poll_table *wait) {
+       poll_wait(file, &queue->proc_list, wait);
+
+       if (!queue_empty())
+               return POLLIN | POLLRDNORM;
+
+       return 0;
+}
+
+static int dtmf_open(struct inode *inode, struct file *file) {
+	if(dtmf_count > 0)
+		return -EBUSY;
+
+	queue->head = queue->tail = 0;          /* Flush input queue */
+
+	MOD_INC_USE_COUNT;
+	++dtmf_count;
+
+	return 0;
+}
+
+static int dtmf_release(struct inode *inode, struct file *file) {
+	--dtmf_count;
+	MOD_DEC_USE_COUNT;
+
+	return 0;
+}
+
+static struct file_operations dtmf_ops = {
+	read:		dtmf_read,
+	write:		dtmf_write,
+	poll:		dtmf_poll,
+	open:		dtmf_open,
+	release:	dtmf_release
+};
+
+static struct miscdevice dtmf_misc = {
+	MISC_DYNAMIC_MINOR, PFS168_DTMF_NAME, &dtmf_ops
+};
+
+
+static int dtmf_init(void) {
+	queue = (struct dtmf_queue *) kmalloc(sizeof(*queue), GFP_KERNEL);
+	memset(queue, 0, sizeof(*queue));
+	queue->head = queue->tail = 0;
+	init_waitqueue_head(&queue->proc_list);
+
+	set_GPIO_IRQ_edge(GPIO_GPIO16, GPIO_RISING_EDGE);
+
+	if (request_irq(IRQ_GPIO16, pfs168_dtmf_handler, SA_INTERRUPT, PFS168_DTMF_NAME, NULL) < 0) {
+		printk(KERN_ERR "%s: unable to register IRQ for GPIO 16\n", PFS168_DTMF_NAME);
+		return -EIO;
+	}
+
+	return 0;
+}
+
+static int dtmf_shutdown(void) {
+	free_irq(IRQ_GPIO16, NULL);
+	kfree(queue);
+	return 0;
+}
+
+static void pfs168_dtmf_handler(int irq, void *dev_id, struct pt_regs *regs) {
+	if (dtmf_count) {
+		int head = queue->head;
+
+		queue->buf[head]  = "d1234567890*#abc"[PFS168_SYSDTMF & 0x0f];
+		head = (head + 1) & (DTMF_BUF_SIZE-1);
+		if (head != queue->tail) {
+			queue->head = head;
+			wake_up_interruptible(&queue->proc_list);
+		}	/* Else, Queue is full, so throw it away... */
+	}
+}
+
+static int __init pfs168_dtmf_init(void) {
+	if (dtmf_init() < 0) {
+		printk(KERN_ERR "%s: unable to initialize PFS-168 DTMF\n", PFS168_DTMF_NAME);
+		return -EIO;
+	}
+
+	if (misc_register(&dtmf_misc)<0) {
+		printk(KERN_ERR "%s: unable to register misc device\n", PFS168_DTMF_NAME);
+		return -EIO;
+	}
+
+	printk("PFS-168 DTMF initialized\n");
+
+	return 0;
+}
+
+static void __exit pfs168_dtmf_exit(void) {
+	dtmf_shutdown();
+
+	if (misc_deregister(&dtmf_misc) < 0)
+		printk(KERN_ERR "%s: unable to deregister misc device\n", PFS168_DTMF_NAME);
+}
+
+module_init(pfs168_dtmf_init);
+module_exit(pfs168_dtmf_exit);
diff -urN 2.4.7-rmk3/linux/drivers/char/pfs168_misc.c linux/drivers/char/pfs168_misc.c
--- 2.4.7-rmk3/linux/drivers/char/pfs168_misc.c	Wed Dec 31 19:00:00 1969
+++ linux/drivers/char/pfs168_misc.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,309 @@
+/****************************************************************************
+****************************************************************************/
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/module.h>               /* because we are a module */
+#include <linux/init.h>                 /* for the __init macros */
+#include <linux/proc_fs.h>              /* all the /proc functions */
+#include <linux/ioport.h>
+#include <asm/uaccess.h>                /* to copy to/from userspace */
+#include <asm/arch/hardware.h>
+
+#define MODULE_NAME "pfs168_misc"
+#define PFS168_PROC_DIR "pfs168"
+
+static struct proc_dir_entry *pfs168_proc_dir;
+
+
+static ssize_t pfs168_misc_opto1_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos);
+static ssize_t pfs168_misc_opto2_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos);
+static ssize_t pfs168_misc_mdetect_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos);
+static ssize_t pfs168_misc_mgain_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos);
+static ssize_t pfs168_misc_pxon_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos);
+static ssize_t pfs168_misc_rly_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos);
+static ssize_t pfs168_misc_bklt_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos);
+
+static ssize_t pfs168_misc_mgain_write(struct file * file, const char * buffer, size_t count, loff_t *ppos);
+static ssize_t pfs168_misc_pxon_write(struct file * file, const char * buffer, size_t count, loff_t *ppos);
+static ssize_t pfs168_misc_rly_write(struct file * file, const char * buffer, size_t count, loff_t *ppos);
+static ssize_t pfs168_misc_bklt_write(struct file * file, const char * buffer, size_t count, loff_t *ppos);
+
+static struct file_operations pfs168_misc_opto1_fops =	{ read: pfs168_misc_opto1_read,	write: NULL };
+static struct file_operations pfs168_misc_opto2_fops =	{ read: pfs168_misc_opto2_read,	write: NULL };
+static struct file_operations pfs168_misc_mdetect_fops ={ read: pfs168_misc_mdetect_read,	write: NULL };
+static struct file_operations pfs168_misc_mgain_fops =	{ read: pfs168_misc_mgain_read,	write: pfs168_misc_mgain_write };
+static struct file_operations pfs168_misc_pxon_fops =	{ read: pfs168_misc_pxon_read,	write: pfs168_misc_pxon_write };
+static struct file_operations pfs168_misc_rly_fops =	{ read: pfs168_misc_rly_read,	write: pfs168_misc_rly_write };
+static struct file_operations pfs168_misc_bklt_fops =	{ read: pfs168_misc_bklt_read,	write: pfs168_misc_bklt_write };
+
+
+typedef struct pfs168_misc_entry {
+	char * name;
+	char * description;
+	struct file_operations * const fops;
+	unsigned short low_ino;
+} pfs168_misc_entry_t;
+
+static pfs168_misc_entry_t pfs168_misc_proc_entry[] =
+{
+/*	{ name,		description } */
+	{ "opto1",	"Opto-Iso 1 (ro)",	&pfs168_misc_opto1_fops },
+	{ "opto2",	"Opto-Iso 1 (ro)",	&pfs168_misc_opto2_fops },
+	{ "mdetect",	"Motion Detect (ro)",	&pfs168_misc_mdetect_fops },
+	{ "mgain",	"Motion Detector Gain (r/w)", &pfs168_misc_mgain_fops },
+	{ "pxon",	"Telephone Extension Solid State Relay (r/w)", &pfs168_misc_pxon_fops },
+	{ "rly",	"Mechanical Relay (r/w)",	&pfs168_misc_rly_fops },
+	{ "bklt",	"LCD Backlight Inverter (r/w)",	&pfs168_misc_bklt_fops },
+};
+
+#define PFS168_MISC_NUM_ENTRIES	(sizeof(pfs168_misc_proc_entry)/sizeof(pfs168_misc_entry_t))
+
+
+static int pfs168_misc_opto1_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos)
+{
+	char outputbuf[15];
+	int count;
+
+	if (*ppos > 0) /* Assume reading completed in previous read*/
+		return 0;
+
+	count = sprintf(outputbuf, "%1x\n", GPLR & GPIO_GPIO(0));
+
+	*ppos += count;
+
+	if (count > nbytes)  /* Assume output can be read at one time */
+		return -EINVAL;
+
+	if (copy_to_user(buf, outputbuf, count))
+		return -EFAULT;
+
+	return count;
+}
+
+static int pfs168_misc_opto2_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos)
+{
+	char outputbuf[15];
+	int count;
+
+	if (*ppos > 0) /* Assume reading completed in previous read*/
+		return 0;
+
+	count = sprintf(outputbuf, "%1x\n", GPLR & GPIO_GPIO(1));
+
+	*ppos += count;
+
+	if (count > nbytes)  /* Assume output can be read at one time */
+		return -EINVAL;
+
+	if (copy_to_user(buf, outputbuf, count))
+		return -EFAULT;
+
+	return count;
+}
+
+static int pfs168_misc_mdetect_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos)
+{
+	char outputbuf[15];
+	int count;
+
+	if (*ppos > 0) /* Assume reading completed in previous read*/
+		return 0;
+
+	count = sprintf(outputbuf, "%1x\n", PFS168_SYSC1DSR & 1);
+
+	*ppos += count;
+
+	if (count > nbytes)  /* Assume output can be read at one time */
+		return -EINVAL;
+
+	if (copy_to_user(buf, outputbuf, count))
+		return -EFAULT;
+
+	return count;
+}
+
+static int pfs168_misc_mgain_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos)
+{
+	char outputbuf[15];
+	int count;
+
+	if (*ppos > 0) /* Assume reading completed in previous read*/
+		return 0;
+
+	count = sprintf(outputbuf, "%1x\n", PFS168_SYSCTLB & 3);
+
+	*ppos += count;
+
+	if (count > nbytes)  /* Assume output can be read at one time */
+		return -EINVAL;
+
+	if (copy_to_user(buf, outputbuf, count))
+		return -EFAULT;
+
+	return count;
+}
+
+static int pfs168_misc_pxon_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos)
+{
+	char outputbuf[15];
+	int count;
+
+	if (*ppos > 0) /* Assume reading completed in previous read*/
+		return 0;
+
+	count = sprintf(outputbuf, "%1x\n", (PFS168_SYSCTLA & 4) >> 2);
+
+	*ppos += count;
+
+	if (count > nbytes)  /* Assume output can be read at one time */
+		return -EINVAL;
+
+	if (copy_to_user(buf, outputbuf, count))
+		return -EFAULT;
+
+	return count;
+}
+
+static int pfs168_misc_rly_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos)
+{
+	char outputbuf[15];
+	int count;
+
+	if (*ppos > 0) /* Assume reading completed in previous read*/
+		return 0;
+
+	count = sprintf(outputbuf, "%1x\n", (PFS168_SYSCTLA & 2) >> 1);
+
+	*ppos += count;
+
+	if (count > nbytes)  /* Assume output can be read at one time */
+		return -EINVAL;
+
+	if (copy_to_user(buf, outputbuf, count))
+		return -EFAULT;
+
+	return count;
+}
+
+static int pfs168_misc_bklt_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos)
+{
+	char outputbuf[15];
+	int count;
+
+	if (*ppos > 0) /* Assume reading completed in previous read*/
+		return 0;
+
+	count = sprintf(outputbuf, "%1x\n", PFS168_SYSCTLA & 1);
+
+	*ppos += count;
+
+	if (count > nbytes)  /* Assume output can be read at one time */
+		return -EINVAL;
+
+	if (copy_to_user(buf, outputbuf, count))
+		return -EFAULT;
+
+	return count;
+}
+
+static ssize_t pfs168_misc_mgain_write(struct file * file, const char * buffer, size_t count, loff_t *ppos)
+{
+	unsigned long newRegValue;
+	char *endp;
+
+	newRegValue = PFS168_SYSCTLB & 3;
+	newRegValue |= simple_strtoul(buffer, &endp, 0) & 3;
+	PFS168_SYSCTLB = newRegValue;
+
+	return (count + endp - buffer);
+}
+
+static ssize_t pfs168_misc_pxon_write(struct file * file, const char * buffer, size_t count, loff_t *ppos)
+{
+	unsigned long newRegValue;
+	char *endp;
+
+	newRegValue = simple_strtoul(buffer, &endp, 0);
+
+	if (newRegValue & 1)
+		PFS168_SYSCTLA |= 4;
+	else
+		PFS168_SYSCTLA &= ~4;
+
+	return (count + endp - buffer);
+}
+
+static ssize_t pfs168_misc_rly_write(struct file * file, const char * buffer, size_t count, loff_t *ppos)
+{
+	unsigned long newRegValue;
+	char *endp;
+
+	newRegValue = simple_strtoul(buffer, &endp, 0);
+
+	if (newRegValue & 1)
+		PFS168_SYSCTLA |= 2;
+	else
+		PFS168_SYSCTLA &= ~2;
+
+	return (count + endp - buffer);
+}
+
+static ssize_t pfs168_misc_bklt_write(struct file * file, const char * buffer, size_t count, loff_t *ppos)
+{
+	unsigned long newRegValue;
+	char *endp;
+
+	newRegValue = simple_strtoul(buffer, &endp, 0);
+
+	if (newRegValue & 1)
+		PFS168_SYSCTLA |= 1;
+	else
+		PFS168_SYSCTLA &= ~1;
+
+	return (count + endp - buffer);
+}
+
+static int __init pfs168_misc_init(void)
+{
+	struct proc_dir_entry *entry;
+	int i;
+
+	pfs168_proc_dir = proc_mkdir(PFS168_PROC_DIR, &proc_root);
+
+	if (pfs168_proc_dir == NULL) {
+		printk(KERN_ERR MODULE_NAME ": can't create /proc/" PFS168_PROC_DIR "\n");
+		return(-ENOMEM);
+	}
+
+	for (i = 0; i < PFS168_MISC_NUM_ENTRIES; i++) {
+		entry = create_proc_entry(pfs168_misc_proc_entry[i].name, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH, pfs168_proc_dir);
+
+		if (entry) {
+			entry->proc_fops = pfs168_misc_proc_entry[i].fops;
+		} else {
+			printk( KERN_ERR MODULE_NAME ": can't create /proc/" PFS168_PROC_DIR "/%s\n", pfs168_misc_proc_entry[i].name);
+			return(-ENOMEM);
+		}
+	}
+
+	return (0);
+}
+
+static void __exit pfs168_misc_cleanup(void)
+{
+	int i;
+
+	for (i = 0; i < PFS168_MISC_NUM_ENTRIES; i++)
+		remove_proc_entry(pfs168_misc_proc_entry[i].name, pfs168_proc_dir);
+
+	remove_proc_entry(PFS168_PROC_DIR, pfs168_proc_dir);
+}
+
+module_init(pfs168_misc_init);
+module_exit(pfs168_misc_cleanup);
+
+MODULE_AUTHOR("George G. Davis");
+MODULE_DESCRIPTION("PFS-168 Misc I/O");
+
+EXPORT_NO_SYMBOLS;
diff -urN 2.4.7-rmk3/linux/drivers/char/pfs168_spi.c linux/drivers/char/pfs168_spi.c
--- 2.4.7-rmk3/linux/drivers/char/pfs168_spi.c	Wed Dec 31 19:00:00 1969
+++ linux/drivers/char/pfs168_spi.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,472 @@
+/*
+ * linux/arch/arm/drivers/char/pfs168_spi.c
+ *
+ * SA-1110 Ser4SSP SPI driver for PFS-168.
+ *
+ * Changelog:
+ */
+
+#include <linux/config.h>
+
+#include <linux/spinlock.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <linux/mm.h>
+#include <linux/signal.h>
+#include <linux/init.h>
+#include <linux/kbd_ll.h>
+#include <linux/delay.h>
+#include <linux/random.h>
+#include <linux/poll.h>
+#include <linux/miscdevice.h>
+#include <linux/malloc.h>
+#include <linux/kbd_kern.h>
+
+#include <asm/bitops.h>
+#include <asm/uaccess.h>
+#include <asm/irq.h>
+#include <asm/system.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+
+
+#define SPI_BUF_SIZE	32
+
+
+spinlock_t pfs168_spi_controller_lock = SPIN_LOCK_UNLOCKED;
+
+
+struct pfs168_spi_queue {
+	unsigned long head;
+	unsigned long tail;
+	wait_queue_head_t proc_list;
+	struct fasync_struct *fasync;
+	unsigned char buf[SPI_BUF_SIZE];
+};                                                                                                                                            
+
+static struct pfs168_spi_queue *queue;	 /* spi data buffer. */
+
+static int pfs168_spi_count = 0;
+
+
+static void send_SSP_msg(unchar *pBuf, int num)
+{
+	ushort	tmp;
+	int		i;
+
+	for (i = 0; i < num; i++) {
+		while ((Ser4SSSR & SSSR_TNF) == 0)
+			;
+
+		tmp = pBuf[i];
+		Ser4SSDR = (tmp << 8);
+	}
+
+	// Throw away Echo
+	for (i = 0; i < num; i++) {
+		while ((Ser4SSSR & SSSR_RNE) == 0)
+			;
+
+		tmp = Ser4SSDR;
+	}
+}
+
+
+static unchar ReadSSPByte(void)
+{
+	if (Ser4SSSR & SSSR_ROR) {
+		printk("%s() : Overrun\n", __FUNCTION__);
+		return 0;
+	}
+
+	Ser4SSDR = 0x00;
+
+	while ((Ser4SSSR & SSSR_RNE) == 0)
+		;
+
+	return ((unchar) Ser4SSDR);
+}
+
+
+static ulong read_SSP_response(int num)
+{
+	int		i;
+	ulong	ret;
+	
+	while (ReadSSPByte() == 0)
+		;
+
+	ReadSSPByte();
+
+	ret = 0;
+
+	for (i = 0; i < num; i++) {
+		ret <<= 8;
+		ret |= ReadSSPByte();
+	}
+
+	return ret;
+}
+
+
+#if	0
+typedef	struct	pfs168_spi_cmd {
+	unchar	group, code; 
+}	pfs168_spi_cmd;
+
+
+static void pfs168_spi_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+	pfs168_spi_cmd	RD_INT_CMD = { 0x83, 0x01 };
+	pfs168_spi_cmd	RD_SPI_CMD = { 0x83, 0x02 };
+	unchar	code;
+
+	/* Read AVR Interrupt Status to check which Interrupt occurred 
+	 * and Clear AVR Interrupt */
+	send_SSP_msg((unchar *) &RD_INT_CMD, 2);
+	code = (unchar) (read_SSP_response(1) & 0xFF);
+
+#if	0
+	if (code  & (1 << 2)) {
+		/* Read Scan code */
+		send_SSP_msg((unchar *) &RD_SPI_CMD, 2);
+		code = (unchar) (read_SSP_response(1) & 0xFF);
+		handle_scancode( code, (code & 0x80) ? 0 : 1 );
+	}
+#endif
+}
+#endif
+
+
+static inline void pfs168_spi_disable_irq(void)
+{
+	disable_irq(IRQ_GPIO14);
+}
+
+
+static inline void pfs168_spi_enable_irq(void)
+{
+	enable_irq(IRQ_GPIO14);
+}
+
+/* -------------------------------------------------------------------- */
+
+
+static void pfs168_spi_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+	unsigned long flags;
+
+	spin_lock_irqsave(&pfs168_spi_controller_lock, flags);
+
+	if (pfs168_spi_count) {
+		int head = queue->head;
+		int tmp;
+
+		/* This is *_awful_*, but for now... */
+
+		while (Ser4SSSR & SSSR_RNE)
+			tmp = Ser4SSDR;	/* Discard anything laying around */
+
+		queue->buf[head] = ReadSSPByte();
+
+		head = (head + 1) & (SPI_BUF_SIZE-1);
+
+		if (head != queue->tail) {
+			queue->head = head;
+
+			if (queue->fasync)
+				kill_fasync(&queue->fasync, SIGIO, POLL_IN);
+
+			wake_up_interruptible(&queue->proc_list);
+		}
+	}
+
+	/*tasklet_schedule(&pfs168_spi_tasklet);*/
+
+	spin_unlock_irqrestore(&pfs168_spi_controller_lock, flags);
+}
+
+
+int pfs168_spi_startup_reset __initdata = 1;
+
+/* for "spi-reset" cmdline param */
+static int __init pfs168_spi_reset_setup(char *str)
+{
+	pfs168_spi_startup_reset = 1;
+
+	return 1;
+}
+
+__setup("spi-reset", pfs168_spi_reset_setup);
+
+
+/*
+ * Send a byte to the spi.
+ */
+
+static void pfs168_spi_write_dev(char *p, int n)
+{
+	int i;
+	unsigned int tmp;
+
+	DECLARE_WAITQUEUE(wait, current);
+
+	add_wait_queue(&queue->proc_list, &wait);
+
+	printk("pfs168_spi_write_dev: %d Bytes to send\n", n);
+
+	pfs168_spi_disable_irq();
+
+xmit_wait:
+	set_current_state(TASK_INTERRUPTIBLE);
+
+	if (Ser4SSSR & SSSR_BSY) {
+		printk("pfs168_spi_write_dev: SSSR_BSY loop 1\n", n);
+		schedule();
+		goto xmit_wait;
+	}
+
+	current->state = TASK_RUNNING;
+
+	for (i = 0; i < n; i++) {
+		tmp = *p++;
+		Ser4SSDR = tmp << 8;
+
+echo_wait:
+		set_current_state(TASK_INTERRUPTIBLE);
+
+		if (Ser4SSSR & SSSR_BSY) {
+			printk("pfs168_spi_write_dev: SSSR_BSY loop 2\n", n);
+			schedule();
+			goto echo_wait;
+		}
+
+		current->state = TASK_RUNNING;
+
+		// Throw away Echo
+		tmp = Ser4SSDR;
+	}
+
+	remove_wait_queue(&queue->proc_list, &wait);
+
+	pfs168_spi_enable_irq();
+}
+
+
+static unsigned char get_from_queue(void)
+{
+	unsigned char result;
+	unsigned long flags;
+
+	spin_lock_irqsave(&pfs168_spi_controller_lock, flags);
+	result = queue->buf[queue->tail];
+	queue->tail = (queue->tail + 1) & (SPI_BUF_SIZE-1);
+	spin_unlock_irqrestore(&pfs168_spi_controller_lock, flags);
+
+	return result;
+}
+
+
+static inline int queue_empty(void)
+{
+	return queue->head == queue->tail;
+}
+
+
+static int pfs168_spi_fasync(int fd, struct file *filp, int on)
+{
+	int retval;
+
+	retval = fasync_helper(fd, filp, on, &queue->fasync);
+
+	if (retval < 0)
+		return retval;
+
+	return 0;
+}
+
+
+static int pfs168_spi_release(struct inode * inode, struct file * file)
+{
+	pfs168_spi_fasync(-1, file, 0);
+
+	if (!pfs168_spi_count)
+		return 0;
+
+	pfs168_spi_count -= 1;
+
+	free_irq(IRQ_GPIO14, NULL);
+
+	return 0;
+}
+
+
+/*
+ * Install interrupt handler.
+ */
+
+static int pfs168_spi_open(struct inode * inode, struct file * file)
+{
+	if (pfs168_spi_count) {
+		return -EBUSY;
+	}
+
+	pfs168_spi_count += 1;
+
+	queue->head = queue->tail = 0;	   /* Flush input queue */
+
+	if (request_irq (IRQ_GPIO14, pfs168_spi_interrupt, 0, "SA-1110 SSP", NULL) != 0) {
+		printk("Could not allocate spi IRQ!\n");
+		pfs168_spi_count--;
+		return -EBUSY;
+	}
+
+	return 0;
+}
+
+/*
+ * Put bytes from input queue to buffer.
+ */
+
+static ssize_t pfs168_spi_read(struct file * file, char * buffer, size_t count, loff_t *ppos)
+{
+	DECLARE_WAITQUEUE(wait, current);
+	ssize_t i = count;
+	unsigned char c;
+
+	if (queue_empty()) {
+		if (file->f_flags & O_NONBLOCK)
+			return -EAGAIN;
+
+		add_wait_queue(&queue->proc_list, &wait);
+
+repeat:
+		set_current_state(TASK_INTERRUPTIBLE);
+
+		if (queue_empty() && !signal_pending(current)) {
+			schedule();
+			goto repeat;
+		}
+
+		current->state = TASK_RUNNING;
+		remove_wait_queue(&queue->proc_list, &wait);
+	}
+
+	while (i > 0 && !queue_empty()) {
+		c = get_from_queue();
+		put_user(c, buffer++);
+		i--;
+	}
+
+	if (count-i) {
+		file->f_dentry->d_inode->i_atime = CURRENT_TIME;
+		return count-i;
+	}
+
+	if (signal_pending(current))
+		return -ERESTARTSYS;
+
+	return 0;
+}
+
+
+/*
+ * Write to the spi device.
+ */
+
+static ssize_t pfs168_spi_write(struct file * file, const char * buffer, size_t count, loff_t *ppos)
+{
+	ssize_t retval = 0;
+	char kbuf[8];
+
+	if (count) {
+		if (count > 8)
+			count = 8; /* Limit to 8 bytes. */
+
+		copy_from_user(kbuf, buffer, count);
+
+		pfs168_spi_write_dev(kbuf, count);
+
+		retval = count;
+
+		file->f_dentry->d_inode->i_mtime = CURRENT_TIME;
+	}
+
+	return retval;
+}
+
+
+static unsigned int pfs168_spi_poll(struct file *file, poll_table * wait)
+{
+	poll_wait(file, &queue->proc_list, wait);
+
+	if (!queue_empty())
+		return POLLIN | POLLRDNORM;
+
+	return 0;
+}
+
+
+static inline void pfs168_spi_init_dev(void)
+{
+	GPDR |= (GPIO_GPIO10 | GPIO_GPIO12 | GPIO_GPIO13);
+	GPDR &= ~GPIO_GPIO11;
+
+	GAFR |= (GPIO_GPIO10 | GPIO_GPIO11 | GPIO_GPIO12 | GPIO_GPIO13);
+
+	Ser4SSCR0 = SSCR0_SerClkDiv(0xa9) | SSCR0_Motorola | SSCR0_DataSize(8);
+	Ser4SSSR = SSSR_ROR;
+	Ser4SSCR1 = SSCR1_SP;
+	Ser4SSCR0 |= SSCR0_SSE;
+
+	/* Release AT89S53 reset line. */
+	PFS168_SYSLCDDE &= ~0x4;
+}
+
+
+struct file_operations pfs168_spi_fops = {
+	read:		pfs168_spi_read,
+	write:		pfs168_spi_write,
+	poll:		pfs168_spi_poll,
+	open:		pfs168_spi_open,
+	release:	pfs168_spi_release,
+	fasync:		pfs168_spi_fasync,
+};
+
+
+static struct miscdevice pfs168_spi_dev = {
+	MISC_DYNAMIC_MINOR, "spi", &pfs168_spi_fops
+};
+
+
+static void __init pfs168_spi_init(void)
+{
+	printk (KERN_INFO "PFS-168 SA-1110 SPI Driver v1.0\n");
+
+	pfs168_spi_init_dev();
+
+	misc_register(&pfs168_spi_dev);
+
+	queue = (struct pfs168_spi_queue *) kmalloc(sizeof(*queue), GFP_KERNEL);
+	memset(queue, 0, sizeof(*queue));
+	queue->head = queue->tail = 0;
+	init_waitqueue_head(&queue->proc_list);
+
+	set_GPIO_IRQ_edge(GPIO_GPIO(14), GPIO_RISING_EDGE);
+}
+
+ 
+static void __exit pfs168_spi_exit(void)
+{
+	misc_deregister(&pfs168_spi_dev);
+}
+
+module_init(pfs168_spi_init);
+module_exit(pfs168_spi_exit);
+
+MODULE_AUTHOR("George G. Davis");
+MODULE_DESCRIPTION("PFS-168 SPI Driver");
+
+EXPORT_NO_SYMBOLS;
diff -urN 2.4.7-rmk3/linux/drivers/char/profiler.c linux/drivers/char/profiler.c
--- 2.4.7-rmk3/linux/drivers/char/profiler.c	Wed Dec 31 19:00:00 1969
+++ linux/drivers/char/profiler.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,1348 @@
+/*
+ * Itsy SA1100 Statistical Profiler
+ * Copyright (c) Compaq Computer Corporation, 1999
+ *
+ * Use consistent with the GNU GPL is permitted,
+ * provided that this copyright notice is
+ * preserved in its entirety in all copies and derived works.
+ *
+ * COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED,
+ * AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS
+ * FITNESS FOR ANY PARTICULAR PURPOSE.
+ *
+ * Author: Carl Waldspurger
+ *
+ * $Log: itsy_prof.c,v $
+ * Revision 2.8  2000/11/22  10:27:07  kerr
+ * Port to 2.4.X Linux.  Made less Itsy specific.
+ *
+ * Revision 2.7  2000/06/02  19:23:21  kerr
+ * Made modifications to share the general purpose timer (OST2).
+ *
+ * Revision 2.6  1999/12/23  01:27:56  kerr
+ * Updated Copyright information for entire source tree.
+ *
+ * Revision 2.5  1999/08/17  01:05:45  caw
+ * Bug fix: avoid invalid inode lookups.  Distinguish nomap, kernel samples.
+ *
+ * Revision 2.4  1999/08/13 01:28:25  caw
+ * Report information about sampling period in "/proc/prof".
+ *
+ * Revision 2.3  1999/08/13 00:44:14  caw
+ * Changed sampling rate implementation (specify samples per second).
+ * Added support for ITSY_PROF_{GET,SET}_CTL ioctls.
+ *
+ * Revision 2.2  1999/08/11 21:59:25  caw
+ * Reduced logging, other minor modifications.
+ *
+ * Revision 2.1  1999/08/10  02:06:37  caw
+ * Initial revision.
+ *
+ */
+
+/*
+ * Overview
+ *
+ * This driver performs interrupt-driven statistical profiling
+ * of the entire running system.  Since it uses a high-priority
+ * OS timer, virtually all interruptible code will be profiled.
+ *
+ */
+
+/*
+ * debugging 
+ *
+ */
+
+#define	PROF_DEBUG			(1)
+#define	PROF_DEBUG_VERBOSE		(0)
+
+/*
+ * includes
+ *
+ */
+
+#include <linux/config.h>
+
+#ifdef	MODULE
+#include <linux/module.h>
+#include <linux/version.h>
+#endif
+
+#include <linux/types.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/malloc.h>
+#include <linux/sched.h>
+#include <linux/major.h>
+#include <linux/ctype.h>
+#include <linux/wrapper.h>
+#include <linux/errno.h>
+
+#ifdef	CONFIG_PROC_FS
+#include <linux/stat.h>
+#include <linux/proc_fs.h>
+#endif
+
+#include <asm/segment.h>
+#include <asm/io.h>
+#include <asm/uaccess.h>
+#include <asm/arch/irqs.h>
+
+#include <asm/hardware/hwtimer.h>
+
+#include <linux/profiler.h>
+
+/*
+ * constants
+ *
+ */
+
+/* names */
+#define	PROF_NAME		"profiler"
+#define	PROF_NAME_VERBOSE	"profiling driver"
+#define	PROF_VERSION_STRING	"$Revision: 2.8 $"
+
+/* device numbers */
+int gMajor = 0;
+
+/* hardware timer */
+#define PROF_TIMER_FREQ		(3686400)
+#define	PROF_TIMER_NUM		(2)
+#define	PROF_TIMER_MASK		(1 << PROF_TIMER_NUM)
+
+/* sample buffer */
+#define	PROF_BUF_LG_PAGES	(5)
+#define	PROF_BUF_NBYTES		(PAGE_SIZE << PROF_BUF_LG_PAGES)
+#define	PROF_BUF_NSAMPLES	(PROF_BUF_NBYTES / sizeof(profiler_sample))
+#define	PROF_BUF_WAKEUP_MASK	(0x0f)
+#define	PROF_BUF_MIN_XFER	(8)
+
+/* randomized sampling defaults */
+#define	PROF_RANDOMIZE_DEFAULT	(1)
+#define	PROF_RANDOM_SEED	(101)
+
+/* clients */
+#define	PROF_CLIENT_ID_INVALID	(-1)
+
+/*
+ * types
+ *
+ */
+
+/* convenient abbrevs */
+typedef profiler_sample prof_sample;
+typedef profiler_stats  prof_stats;
+typedef profiler_pos    prof_pos;
+typedef profiler_ctl    prof_ctl;
+
+/* user-space profiling client */
+typedef int prof_client_id;
+typedef struct prof_client {
+  /* linked list */
+  struct prof_client *prev, *next;
+
+  /* identifier */
+  prof_client_id id;
+
+  /* position (in samples) */
+  prof_pos position;
+  int reset;
+
+  /* dropped samples */
+  ulong dropped;
+  int drop_fail;
+} prof_client;
+
+/* profiler state */
+typedef struct {
+  struct hwtimer_list timers;
+
+  /* random numbers */
+  ulong random_seed;
+
+  /* control parameters */
+  prof_ctl control;
+
+  /* sampling period */
+  ulong period_base;
+  ulong period_rnd_mask;
+  ulong period_last;
+
+  /* interrupts */
+  int handle_interrupts;
+
+  /* samples */
+  wait_queue_head_t waitq;
+  profiler_sample *buf;
+  prof_pos position;
+  uint wakeup_mask;
+  uint next_mask;
+
+  /* clients */
+  prof_client_id client_id_next;
+  prof_client *clients;
+  int nclients;
+  
+  /* statistics */
+  prof_stats stats;
+
+} prof_dev;
+
+/*
+ * globals
+ *
+ */
+
+static prof_dev prof_global;
+
+/*
+ * list operations
+ *
+ */
+
+static void prof_client_insert(prof_client **head, prof_client *e)
+{
+  prof_client *h = *head;
+
+  /* add element to head of list */
+  e->next = h;
+  if (h != NULL)
+    h->prev = e;
+  *head = e;
+  e->prev = NULL;
+}
+
+static void prof_client_remove(prof_client **head, prof_client *e)
+{
+  /* splice element out of list */
+  if (e->prev != NULL)
+    e->prev->next = e->next;
+  else
+    *head = e->next;
+  if (e->next != NULL)
+    e->next->prev = e->prev;
+}
+
+/*
+ * utility operations
+ *
+ */
+ 
+#ifndef	MIN
+#define MIN(a,b)                (((a)<(b))?(a):(b))
+#define MAX(a,b)                (((a)>(b))?(a):(b))
+#endif
+
+static int lg(int value)
+{
+  /*
+   * modifies: nothing
+   * effects:  Returns the log base 2 of value.
+   *
+   */
+
+  int result = 0;
+
+  while (value > 1)
+    {
+      result++;
+      value >>= 1;
+    }
+
+  return(result);
+}
+
+/*
+ * prof_position operations
+ *
+ */
+
+static inline u32 prof_pos_low32(prof_pos pos)
+{
+  return((u32) (pos & 0xffffffff));
+}
+
+static inline prof_pos prof_pos_get_user(const prof_pos *ptr)
+{
+  /* copyin from user space */
+  prof_pos value;
+  if (copy_from_user((void *) &value, (const void *) ptr, sizeof(prof_pos))) return (prof_pos) -EFAULT;
+  return(value);
+}
+
+static inline int prof_pos_put_user(prof_pos value, prof_pos *ptr)
+{
+  /* copyout to user space */
+  if (copy_to_user((void *) ptr, (const void *) &value, sizeof(prof_pos))) return -EFAULT;
+  return 0;
+}
+
+/*
+ * procfs operations
+ *
+ */
+
+#ifdef	CONFIG_PROC_FS
+static int prof_get_info(char *page,
+			 char **start,
+			 off_t off,
+			 int count, 
+			 int *eof,
+			 void *unused)
+{
+  prof_dev *dev = &prof_global;
+  prof_stats *stats = &dev->stats;
+  int len;
+  char *out = page;
+
+  /* shared stats */
+  out += sprintf(out,
+		 "major:    %8d\n"
+		 "intrs:    %8lu\n"
+		 "position: %8u\n"
+		 "samples:  %8lu\n"
+		 "  user:   %8lu\n"
+		 "  kern:   %8lu\n"
+		 "  nomap:  %8lu\n"
+		 "clients:  %8d\n"
+		 "wakeups:  %8lu\n",
+		 gMajor,
+		 stats->interrupts,
+		 prof_pos_low32(dev->position),
+		 stats->samples,
+		 stats->user,
+		 stats->kernel,
+		 stats->nomap,
+		 dev->nclients,
+		 stats->wakeups);
+  
+  if (PROF_DEBUG)
+    out += sprintf(out,
+		   "\n"
+		   "base per:  %8lu\n"
+		   "rnd mask:  %8lx\n"
+		   "last per:  %8lu\n"
+		   "rnd seed:  %8lx\n",
+		   dev->period_base,
+		   dev->period_rnd_mask,
+		   dev->period_last,
+		   dev->random_seed);
+
+  len = out - page;
+  len -= off;
+  if (len < count) {
+    *eof = 1;
+    if (len <= 0)
+      return 0;
+  } else
+    len = count;
+  
+  *start = page + off;
+  
+  return(len);  
+}
+#endif	/* CONFIG_PROC_FS */
+
+/*
+ * prof_client operations
+ *
+ */
+
+static void prof_client_destroy(prof_client *client)
+{
+  /*
+   * modifies: client
+   * effects:  Reclaims all storage associated with client.
+   *
+   */
+
+  /* sanity check */
+  if (client == NULL)
+    return;
+
+  /* deallocate container */
+  kfree((void *)client);
+}
+
+static prof_client *prof_client_create(void)
+{
+  /*
+   * modifies: nothing
+   * effects:  Creates and returns a new, initialized prof_client object.
+   *           Returns NULL iff unable to allocate storage.
+   *
+   */
+
+  prof_client *client;
+
+  /* allocate client, fail if unable */
+  if ((client = (prof_client *) kmalloc(sizeof(prof_client), GFP_KERNEL)) == NULL)
+    return(NULL);
+
+  /* initialize client */
+  memset((void *) client, 0, sizeof(prof_client));
+  client->id = PROF_CLIENT_ID_INVALID;
+
+  /* initialize reset flag */
+  client->reset = 1;
+
+  /* everything OK */
+  return(client);
+}
+
+/*
+ * prof_dev operations
+ *
+ */
+
+static int prof_dev_set_ctl_prim(prof_dev *dev, const prof_ctl *ctl)
+{
+  /*
+   * modifies: dev
+   * effects:  Sets the control parameters for dev using ctl.
+   *
+   */
+
+  ulong period_base, period_rnd, period_rnd_mask;
+  prof_ctl control;
+  ulong flags;
+
+  /* ensure valid frequency range */
+  if ((ctl->frequency < PROFILER_FREQ_MIN) ||
+      (ctl->frequency > PROFILER_FREQ_MAX))
+    return(-EINVAL);
+
+  /* convert ctl parameters to period data */
+  period_base = PROF_TIMER_FREQ / ctl->frequency;
+
+  /* XXX random range is hardcoded as +/- 1/16 of base freq */
+  period_rnd = (1 << lg(period_base >> 4));
+  period_rnd_mask = (ctl->randomize ? (period_rnd - 1) : 0);
+
+  /* install parameters (critical section) */
+  save_flags_cli(flags);
+  {
+    dev->control = control;
+    dev->period_base = period_base;
+    dev->period_rnd_mask = period_rnd_mask;
+  }
+  restore_flags(flags);
+
+  /* debugging */
+  if (PROF_DEBUG_VERBOSE)
+    printk(PROF_NAME ": prof_dev_set_ctl: base=%lu, rnd_mask=%lx\n",
+	   dev->period_base,
+	   dev->period_rnd_mask);
+
+  /* everything OK */
+  return(0);
+}
+
+static void prof_interrupt(int irq, void *dev_id, struct pt_regs *regs, unsigned long unused);
+
+static void prof_dev_init(prof_dev *dev)
+{
+  /* initialize */
+  memset((void *) dev, 0, sizeof(prof_dev));
+
+  /* memory-mapped registers */
+  init_hwtimer(&dev->timers);
+  dev->timers.function = prof_interrupt;
+
+  /* random numbers */
+  dev->random_seed = PROF_RANDOM_SEED;
+
+  /* control parameters */
+  dev->control.frequency = PROFILER_FREQ_DEFAULT;
+  dev->control.randomize = PROFILER_RND_DEFAULT;
+
+  /* sampling period */
+  prof_dev_set_ctl_prim(dev, &dev->control);
+
+  /* samples */
+  init_waitqueue_head(&dev->waitq);
+  dev->buf = NULL;
+  dev->position = 0;
+  dev->wakeup_mask = PROF_BUF_WAKEUP_MASK;
+  dev->next_mask = PROF_BUF_NSAMPLES - 1;
+
+  /* clients */
+  dev->clients  = NULL;
+  dev->nclients = 0;
+
+}
+
+
+static prof_client *prof_dev_client_create(prof_dev *dev)
+{
+  /*
+   * modifies: dev
+   * effects:  Creates a new, initialized client of dev.
+   *           Returns the new client iff successful, otherwise NULL.
+   *
+   */
+
+  prof_client *client;
+  ulong flags;
+
+  /* allocate new client, fail if unable */
+  if ((client = prof_client_create()) == NULL)
+    return(NULL);
+  
+  /* generate new client id */
+  client->id = dev->client_id_next++;
+
+  /* critical section */
+  save_flags_cli(flags);
+  {
+    /* add to client list */
+    prof_client_insert(&dev->clients, client);
+    dev->nclients++;
+  }
+  restore_flags(flags);
+
+  if (PROF_DEBUG_VERBOSE)
+    printk(PROF_NAME ": prof_dev_client_create: id=%u\n", client->id);
+
+  /* everything OK */
+  return(client);
+}
+
+static int prof_dev_client_destroy(prof_dev *dev, prof_client *client)
+{
+  /*
+   * modifies: dev
+   * effects:  Detaches client from dev, and reclaims all associated storage.
+   *           Returns 0 iff successful, otherwise error code.
+   *
+   */
+
+  ulong flags;
+
+  if (PROF_DEBUG_VERBOSE)
+    printk(PROF_NAME ": prof_dev_client_destroy: id=%d\n", client->id);
+
+  /* critical section */
+  save_flags_cli(flags);
+  {
+    /* remove from client list */
+    prof_client_remove(&dev->clients, client);
+    dev->nclients--;
+  }
+  restore_flags(flags);
+
+  /* reclaim storage */
+  prof_client_destroy(client);
+
+  /* everything OK */
+  return(0);
+}
+
+static inline prof_pos prof_dev_get_position(const prof_dev *dev)
+{
+  /*
+   * modifies: nothing
+   * effects:  Returns a consistent snapshot of the current sample
+   *           position associated with dev.
+   *
+   */
+
+  prof_pos pos;
+  ulong flags;
+
+  /* critical section */
+  save_flags_cli(flags);
+  {
+    pos = dev->position;
+  }
+  restore_flags(flags);
+
+  return(pos);
+}
+
+static int prof_client_get_position(prof_client *client,
+				    prof_pos *pos)
+{
+  /*
+   * requires: pos is a user-space pointer
+   * modifies: pos
+   * effects:  Sets pos to the current stream position (in samples)
+   *           associated with client.
+   *
+   */
+
+  if (PROF_DEBUG_VERBOSE)
+    printk(PROF_NAME ": prof_client_get_position\n");
+
+  /* copyout reply value */
+  return(prof_pos_put_user(client->position, pos));
+}
+
+static void prof_dev_buf_destroy(prof_dev *dev)
+{
+  /*
+   * modifies: dev
+   * effects:  Reclaims sample buffer storage associated with dev.
+   *
+   */
+
+  /* sanity check */
+  if (dev == NULL)
+    return;
+
+  /* deallocate circular buffer */
+  if (dev->buf != NULL)
+    {
+      free_pages((ulong) dev->buf, PROF_BUF_LG_PAGES);
+      dev->buf = NULL;
+    }
+}
+
+static int prof_dev_buf_create(prof_dev *dev)
+{
+  /*
+   * modifies: nothing
+   * effects:  Creates sample buffer storage associated with dev.
+   *           Returns 0 iff successful, otherwise error code.
+   *
+   */
+
+  /* allocate buffer */
+  dev->buf = (prof_sample *) __get_dma_pages(GFP_KERNEL, PROF_BUF_LG_PAGES);
+  if (dev->buf == NULL)
+    {
+      /* cleanup and fail */
+      prof_dev_buf_destroy(dev);
+      return(-ENOMEM);
+    }
+
+  /* initialize */
+  memset((void *) dev->buf, 0, PROF_BUF_NBYTES);
+  dev->position = 0;
+  
+  /* everything OK */
+  return(0);
+}
+
+static int prof_dev_buf_copyout(prof_dev *dev, 
+				prof_sample *to,
+				prof_pos start,
+				int nsamples)
+{
+  /*
+   * requires: to is a user-space pointer
+   * modifies: to
+   * effects:  Transfers nsamples of profiling data to user-space buffer.
+   *
+   */  
+
+  uint next, mask;
+  int i;
+
+  /* XXX grossly inefficient */
+  mask = dev->next_mask;
+  next = start & mask;
+  for (i = 0; i < nsamples; i++, next++)
+    if (copy_to_user((void *) &to[i],
+		(const void *) &dev->buf[next & mask],
+		     sizeof(prof_sample))) return -EFAULT;
+  return 0;
+}
+
+static int prof_dev_get_ctl(prof_dev *dev, prof_ctl *ctl)
+{
+  /*
+   * requires: ctl is a user-space pointer
+   * modifies: ctl
+   * effects:  Sets ctl to the current control parameters for dev.
+   *
+   */
+
+  /* copyout reply value */
+  if (copy_to_user((void *) ctl, (const void *) &dev->control, sizeof(prof_ctl))) return -EFAULT;
+  return(0);
+}
+
+static int prof_dev_set_ctl(prof_dev *dev, const prof_ctl *ctl)
+{
+  /*
+   * requires: ctl is a user-space pointer
+   * modifies: dev
+   * effects:  Sets the control parameters for dev using ctl.
+   *
+   */
+
+  prof_ctl control;
+
+  /* copy argument from user space */
+  if (copy_from_user((void *) &control, (const void *) ctl, sizeof(prof_ctl))) return -EFAULT;
+
+  /* update control parameters */
+  return(prof_dev_set_ctl_prim(dev, &control));
+}
+
+static int prof_client_get_dropped(const prof_client *client,
+				   prof_pos *count)
+{
+  /*
+   * requires: count is a user-space pointer
+   * modifies: count
+   * effects:  Sets count to the number of samples dropped by client.
+   *
+   */
+
+  /* sanity check */
+  if (client == NULL)
+    return(-EINVAL);
+
+  /* copyout reply value */
+  return(prof_pos_put_user(client->dropped, count));
+  return(0);
+}
+
+static int prof_client_set_dropped(prof_client *client,
+				   const prof_pos *count)
+{
+  /*
+   * requires: count is a user-space pointer
+   * modifies: client
+   * effects:  Sets the number of samples dropped by client to count.
+   *
+   */
+
+  /* sanity check */
+  if (client == NULL)
+    return(-EINVAL);
+
+  /* copy argument from user space */
+  client->dropped = prof_pos_get_user(count);
+  return(0);
+}
+
+static int prof_client_set_drop_fail(prof_client *client, int fail)
+{
+  /*
+   * modifies: client
+   * effects:  Specifies client behavior when samples are dropped.
+   *           If fail is set, dropped samples will result in EIO
+   *           errors for relevant system calls.
+   *
+   */
+
+  /* update client state */
+  client->drop_fail = fail;
+
+  /* everything OK */
+  return(0);
+}
+
+static int prof_client_set_position(prof_dev *dev,
+				    prof_client *client,
+				    prof_pos *pos)
+{
+  /*
+   * requires: pos is a user-space pointer
+   * modifies: client, pos
+   * effects:  Sets stream position associated with client to the
+   *           current position associated with dev plus pos.
+   *           Updates pos to contain the modified client value.
+   *           Returns 0 iff successful, otherwise error code.
+   *
+   */
+
+  prof_pos delta;
+
+  /* sanity check */
+  if (client == NULL)
+    return(-EINVAL);
+  
+  /* copy argument from user space */
+  delta = prof_pos_get_user(pos);
+  
+  /* update client stream position */
+  client->position = prof_dev_get_position(dev) + delta;
+
+  /* update argument value */
+  prof_pos_put_user(client->position, pos);
+
+  /* everything OK */
+  return(0);
+}
+
+/*
+ * interrupt processing
+ *
+ */
+
+static int prof_map_pc(struct task_struct *task,
+		       ulong pc,
+		       prof_sample *sample)
+{
+  /*
+   * modifies: sample
+   * effects:  Maps pc to an executable image (device, inode) and
+   *           the offset within that executable image.  Updates
+   *           corresponding fields within sample.  Returns 0 iff
+   *           successful, otherwise error code.
+   *
+   */
+
+  struct vm_area_struct *map;
+
+  /* sanity checks */
+  if ((task == NULL) || (task->mm == NULL))
+    return(-EINVAL);
+
+  /* search for map containing pc */
+  for (map = task->mm->mmap; map != NULL; map = map->vm_next)
+    if ((pc >= map->vm_start) && (pc <= map->vm_end))
+      {
+	struct inode* vm_inode = map->vm_file->f_dentry->d_inode;
+
+	/* fail if not mapped image */
+	if (vm_inode == NULL)
+	  return(-EINVAL);
+
+	/* map pc -> <device, inode, offset> */
+	sample->device = vm_inode->i_dev;
+	sample->inode  = vm_inode->i_ino;
+	sample->offset = pc - map->vm_start;
+	return(0);
+      }
+
+  /* not found */
+  return(-ESRCH);
+}
+
+static inline ulong prof_random(ulong seed)
+{
+  /* requires: "long long" is 64 bits, "long" is 32 bits
+   * modifies: nothing
+   * effects:  Generates the next random number in the pseudo-random
+   *           sequence defined by the multiplicative linear congruential
+   *           generator S' = 16807 * S mod (2^31 - 1).  This is the ACM
+   *           "minimal standard random number generator".  Based on
+   *           method described by D.G. Carta in CACM, January 1990.
+   */
+
+  unsigned long long product;
+  ulong product_lo, product_hi;
+  long test;
+
+  product = 33614 * (unsigned long long) seed;
+
+  product_lo = product & (0xffffffff);
+  product_hi = product >> 32;
+  product_lo >>= 1;
+
+  test = product_lo + product_hi;
+
+  if (test > 0)
+    return(test);
+
+  test &= 0x7fffffff;
+  return(test + 1);
+}
+
+static void prof_interrupt(int irq, void *dev_id, struct pt_regs *regs, unsigned long unused)
+{
+  /*
+   * modifies: prof_global
+   * effects:  Handle profiling interrupt.  Records sample data in a
+   *           circular buffer, wakes up clients waiting for more data,
+   *           and updates statistics.
+   *
+   */
+
+  prof_dev *dev = &prof_global;
+  prof_stats *stats = &dev->stats;
+
+  ulong next, pc, period;
+  profiler_sample *s;
+
+  /* update statistics */
+  stats->interrupts++;
+
+  if (PROF_DEBUG_VERBOSE)
+  {
+    static int count = 0;
+    if ((count++ & 0xff) == 0)
+      printk(PROF_NAME ": prof_interrupt: count=%d\n", count);      
+  }
+
+  /* sanity check */
+  if (!dev->handle_interrupts)
+    {
+      if (PROF_DEBUG)
+	printk(PROF_NAME ": prof_interrupt: !handle_interrupts\n");
+      return;
+    }
+
+  /* locate next buffer entry, advance position */
+  next = dev->position & dev->next_mask;
+  dev->position++;
+
+  /* capture sample data */
+  s = &dev->buf[next];
+  s->count = 1;
+  s->mode = processor_mode(regs);
+  s->pid = current->pid;
+
+  /* find executable image associated with pc */
+  pc = instruction_pointer(regs);
+  if (user_mode(regs))
+    {
+      /* user-mode sample: map pc to associated image */
+      stats->user++;
+      if (prof_map_pc(current, pc, s) != 0)
+	{
+	  /* unable to map, keep pc */
+	  s->device = PROFILER_DEVICE_NONE;
+	  s->inode  = PROFILER_INODE_NONE;
+	  s->offset = pc;
+	  stats->nomap++;
+	}
+    }
+  else
+    {
+      /* kernel-mode sample: raw pc */
+      stats->kernel++;
+      s->device = PROFILER_DEVICE_NONE;
+      s->inode  = PROFILER_INODE_KERNEL;
+      s->offset = pc;
+    }
+
+  /* wakeup waiters periodically */
+  if ((next & dev->wakeup_mask) == 0)
+    {
+      /* update statistics */
+      stats->wakeups++;
+
+      /* wake up waiters */
+      wake_up_interruptible(&dev->waitq);  /* XXX timeout? */
+    }
+
+  /* update statistics */
+  stats->samples++;
+
+  /* compute sampling period */
+  period = dev->period_base;
+  if (dev->period_rnd_mask != 0)
+    {
+      ulong sign_mask = dev->period_rnd_mask + 1;
+      dev->random_seed = prof_random(dev->random_seed);
+      if (dev->random_seed & sign_mask)
+	period += (dev->random_seed & dev->period_rnd_mask);
+      else
+	period -= (dev->random_seed & dev->period_rnd_mask);
+    }
+
+  /* reset timer */
+
+  add_hwtimer(&dev->timers, period);
+  dev->period_last = period;
+}
+
+/*
+ * file operations
+ *
+ */
+
+static int prof_read_dropped(const prof_dev *dev, prof_client *client)
+{
+  /*
+   * modifies: client
+   * effects:  If client is too far behind current device position,
+   *           drops entire buffer; client skips over dropped samples.
+   *           Returns TRUE iff samples were dropped.
+   *
+   */
+
+  prof_pos position, behind, dropped;
+
+  /* snapshot stream position */
+  position = prof_dev_get_position(dev);
+  
+  /* done if not too far behind */
+  behind = position - client->position;
+  if (behind <= PROF_BUF_NSAMPLES)
+    return(0);
+
+  /* drop entire buffer, update stats */
+  dropped = behind - PROF_BUF_NSAMPLES;
+  client->position = position;
+  client->dropped += behind;
+  
+  /* debugging */
+  if (PROF_DEBUG_VERBOSE)
+    printk(PROF_NAME ": prof_read_dropped: dropped %u, total %u\n",
+	   prof_pos_low32(behind),
+	   prof_pos_low32(client->dropped));
+	  
+  /* dropped samples */
+  return(1);
+}
+
+static ssize_t prof_read(struct file *file,
+			 char *buffer,
+			 size_t count,
+			 loff_t *ptr)
+{
+  prof_client *client = (prof_client *) file->private_data;
+  prof_dev *dev = &prof_global;
+  int total, err, interrupted;
+  ulong flags;
+
+  if (PROF_DEBUG_VERBOSE)
+    printk(PROF_NAME ": prof_read: count=%d\n", count);
+
+  /* Can't seek (pread) on this device */
+  if (ptr != &file->f_pos)
+    return -ESPIPE;
+
+  /* enable interrupt-driven input */
+  save_flags_cli(flags);
+  {
+    if (!dev->handle_interrupts)
+      {
+	add_hwtimer(&dev->timers, dev->period_base);
+	dev->handle_interrupts = 1;
+      }
+  }
+  restore_flags(flags);
+
+  /* initialize */
+  interrupted = 0;
+  total = 0;
+
+  while ((count > 0) && (!interrupted))
+    {
+      int count_samples, chunk_bytes, chunk_samples, min_xfer;
+      prof_pos position, behind;
+
+      /* snapshot current stream position */
+      position = prof_dev_get_position(dev);
+
+      /* handle client resets */
+      if (client->reset)
+	{
+	  /* warp current stream position */
+	  client->position = position;
+	  client->reset  = 0;
+	}
+      behind = position - client->position;
+
+      /* debugging */
+      if (PROF_DEBUG_VERBOSE)
+	printk(PROF_NAME ": prof_read: dpos=%u, cpos=%u, behind=%u\n",
+	       prof_pos_low32(position),
+	       prof_pos_low32(client->position),
+	       prof_pos_low32(behind));
+
+      /* wait until sufficient data ready for client transfer */
+      min_xfer = MIN(count, PROF_BUF_MIN_XFER);
+      if (behind < min_xfer)
+	{
+	  /* don't wait if non-blocking */
+	  if (file->f_flags & O_NONBLOCK)
+	    return((total > 0) ? total : -EAGAIN);
+
+	  if (PROF_DEBUG_VERBOSE)
+	    printk(PROF_NAME ": prof_read: wait\n");
+
+	  /* wait for more data to become available */
+	  interruptible_sleep_on(&dev->waitq);
+
+	  /* handle interrupted system call */
+	  if (signal_pending(current)) 
+	    interrupted = 1;
+	}
+
+      /* skip over dropped samples */
+      if (prof_read_dropped(dev, client))
+	{
+	  /* fail with I/O error, if specified by client */
+	  if (client->drop_fail)
+	    return(-EIO);
+	  continue;
+	}
+
+      /* snapshot current stream position */
+      position = prof_dev_get_position(dev);
+      behind = position - client->position;
+
+      /* copy chunk of data to user-space */
+      count_samples = count / sizeof(prof_sample);
+      chunk_samples = MIN(behind, count_samples);
+      chunk_bytes = chunk_samples * sizeof(prof_sample);
+      if ((err = prof_dev_buf_copyout(dev, 
+			   (prof_sample *) buffer,
+			   client->position,
+			   chunk_samples)) != 0)
+	return(err);
+
+      /* ensure no samples dropped during copy */
+      if (prof_read_dropped(dev, client))
+	{
+	  /* fail with I/O error, if specified by client */
+	  if (client->drop_fail)
+	    return(-EIO);
+	  continue;
+	}
+
+      /* update counts */
+      total  += chunk_bytes;
+      buffer += chunk_bytes;
+      count  -= chunk_bytes;
+      
+      /* update stream position */
+      file->f_pos      += chunk_bytes;
+      client->position += chunk_samples;
+      
+      /* debugging */
+      if (PROF_DEBUG_VERBOSE)
+	printk(PROF_NAME ": prof_read: chunk_bytes=%d\n", chunk_bytes);
+    }
+
+  /* handle interrupted read */
+  if (interrupted && (total == 0))
+    return(-EINTR);
+
+  /* read complete */
+  return(total);
+}
+
+static int prof_ioctl(struct inode *inode,
+		      struct file *file,
+		      uint command,
+		      ulong arg)
+{
+  prof_client *client = (prof_client *) file->private_data;
+  prof_dev *dev = &prof_global;
+  int size, err;
+
+  if (PROF_DEBUG_VERBOSE)
+    printk(PROF_NAME ": prof_ioctl: cmd=%d, arg=%lu\n", command, arg);
+
+  /* sanity checks */
+  if ((_IOC_TYPE(command) != PROFILER_IOCTL_TYPE) ||
+      (_IOC_NR(command) > PROFILER_IOCTL_MAXNR))
+    return(-EINVAL);
+  if (client == NULL)
+    return(-EINVAL);
+
+  /* verify transfer memory */
+  size = _IOC_SIZE(command);
+  if (_IOC_DIR(command) & _IOC_READ)
+    if ((err = verify_area(VERIFY_WRITE, (void *) arg, size)) != 0)
+      return(err);
+  if (_IOC_DIR(command) & _IOC_WRITE)
+    if ((err = verify_area(VERIFY_READ,  (void *) arg, size)) != 0)
+      return(err);
+
+  /* dispatch based on command */
+  switch (command) {
+  case PROFILER_GET_CTL:
+    return(prof_dev_get_ctl(dev, (prof_ctl *) arg));
+  case PROFILER_SET_CTL:
+    return(prof_dev_set_ctl(dev, (prof_ctl *) arg));
+
+  case PROFILER_GET_POSITION:
+    return(prof_client_get_position(client, (prof_pos *) arg));
+  case PROFILER_SET_POSITION:
+    return(prof_client_set_position(dev, client, (prof_pos *) arg));
+
+  case PROFILER_GET_DROPPED:
+    return(prof_client_get_dropped(client, (prof_pos *) arg));
+  case PROFILER_SET_DROPPED:
+    return(prof_client_set_dropped(client, (prof_pos *) arg));
+  case PROFILER_SET_DROP_FAIL:
+    return(prof_client_set_drop_fail(client, arg));
+  }
+
+  /* invalid command */
+  return(-EINVAL);
+}
+
+static int prof_open(struct inode *inode, struct file *file)
+{
+  prof_dev *dev = &prof_global;
+  prof_client *client;
+  int status, nclients;
+
+  /* debugging */
+  if (PROF_DEBUG_VERBOSE)
+    printk(PROF_NAME ": prof_open\n");
+
+  /* initialize */
+  client = NULL;
+  status = -ENOMEM;
+
+  /* create new client */
+  nclients = dev->nclients;
+  if ((client = prof_dev_client_create(dev)) == NULL)
+    goto prof_open_fail;
+
+  /* create profiling buffer, if necessary */
+  if (dev->buf == NULL)
+    if (prof_dev_buf_create(dev) != 0)
+      goto prof_open_fail;
+
+#ifdef	MODULE
+  MOD_INC_USE_COUNT;
+#endif
+
+  /* attach client state to file */
+  file->private_data = client;
+
+  /* everything OK */
+  return(0);
+
+prof_open_fail:
+
+  /* reclaim storage and fail */
+  if (client != NULL) 
+    prof_dev_client_destroy(dev, client);
+  return(status);
+}
+
+static void prof_dev_shutdown(prof_dev *dev)
+{
+  /* cleanup if no clients */
+  if (dev->nclients == 0)
+    {
+      /* disable interrupts */
+      if (dev->handle_interrupts) {
+	del_hwtimer(&dev->timers);
+	dev->handle_interrupts = 0;
+      }
+
+      /* reclaim buffer */
+      prof_dev_buf_destroy(dev);
+    }
+}
+
+static int prof_release(struct inode *inode, struct file *file)
+{
+  prof_client *client = (prof_client *) file->private_data;
+  prof_dev *dev = &prof_global;
+
+  /* detach client state from file */
+  file->private_data = NULL;
+
+  /* detach client */
+  if (client != NULL)
+    {
+      prof_dev_client_destroy(dev, client);
+      prof_dev_shutdown(dev);
+    }
+
+#ifdef	MODULE
+  MOD_DEC_USE_COUNT;
+#endif
+  return(0);
+}
+
+/*
+ * initialization
+ *
+ */
+
+static struct file_operations prof_fops =
+{
+  read: prof_read,		
+  ioctl: prof_ioctl,
+  open: prof_open,
+  release: prof_release,
+};
+
+static char *prof_version(void)
+{
+  /*
+   * modifies: nothing
+   * effects:  Returns the current cvs revision number.
+   * storage:  Return value is statically-allocated.
+   *
+   */
+
+  static char version[8];
+  char *revision;
+  int i = 0;
+
+  /* extract version number from cvs string */
+  for (revision = PROF_VERSION_STRING; *revision != '\0'; revision++)
+    if (isdigit((int) *revision) || (*revision == '.'))
+      version[i++] = *revision;
+  version[i] = '\0';
+
+  return(version);
+}
+
+int profiler_init(void)
+{
+  prof_dev *dev = &prof_global;
+  int result;
+
+  if (PROF_DEBUG_VERBOSE)
+    printk(PROF_NAME ": profiler_init\n");
+  if (PROF_DEBUG_VERBOSE)
+    printk(PROF_NAME ": sizeof(prof_sample)=%d\n", sizeof(prof_sample));
+
+  /* initialize global state */
+  prof_dev_init(dev);
+
+  /* register device */
+  if ((result = register_chrdev(0, PROF_NAME, &prof_fops)) < 0)
+    {
+      /* log error and fail */
+      printk(PROF_NAME ": can't get major number\n");
+      return(result);
+    }
+  else {
+    gMajor = result;
+  }
+
+#ifdef	CONFIG_PROC_FS
+  /* register procfs device */
+  {
+    struct proc_dir_entry *prof_proc_entry = NULL;
+    prof_proc_entry = create_proc_entry(PROF_NAME, S_IFREG|S_IRUGO, &proc_root);
+    if (prof_proc_entry == NULL) {
+      printk("idle_dev: unable to initialise /proc/prof\n");
+      return -EBUSY;   /* YYY kerr need to find right error to return */
+    }
+    prof_proc_entry->read_proc = prof_get_info;
+  }
+#endif	/* CONFIG_PROC_FS */
+
+  /* log device registration */
+  printk(PROF_NAME_VERBOSE " version %s initialized, major number %d\n", prof_version(), gMajor);
+
+  /* everything OK */
+  return(0);
+}
+
+#ifdef	MODULE
+int init_module(void)
+{
+  if (PROF_DEBUG_VERBOSE)
+    printk(PROF_NAME ": init_module\n");
+
+  return(profiler_init());
+}
+
+void cleanup_module(void)
+{
+#ifdef	CONFIG_PROC_FS
+  /* unregister procfs entry */
+  remove_proc_entry(PROF_NAME, &proc_root);
+#endif	/* CONFIG_PROC_FS */
+
+  /* unregister driver */
+  unregister_chrdev(gMajor, PROF_NAME);
+
+  /* log device unload */
+  printk(PROF_NAME_VERBOSE " unloaded\n");
+}
+#endif	/* MODULE */
diff -urN 2.4.7-rmk3/linux/drivers/char/sa1111_keyb.c linux/drivers/char/sa1111_keyb.c
--- 2.4.7-rmk3/linux/drivers/char/sa1111_keyb.c	Wed Dec 31 19:00:00 1969
+++ linux/drivers/char/sa1111_keyb.c	Sat Aug 11 21:39:21 2001
@@ -0,0 +1,1132 @@
+/*
+ * SA1111 PS/2 keyboard/mouse driver
+ *
+ * 2000 by VASARA RESEARCH INC.
+ *
+ * Changelog:
+ *     Jun.xx,2000:    Kunihiko IMAI <imai@vasara.co.jp>
+ *                     Port to 2.4.0test1-ac19-rmk1-np1
+ *     Apr.17,2000:    Takafumi Kawana <kawana@pro.or.jp>
+ *                     Internal Release for XP860
+ *
+ *
+ * This driver is based on linux/drivers/char/pc_keyb.c
+ * Original declaration follows:
+
+ *
+ * linux/drivers/char/pc_keyb.c
+ *
+ * Separation of the PC low-level part by Geert Uytterhoeven, May 1997
+ * See keyboard.c for the whole history.
+ *
+ * Major cleanup by Martin Mares, May 1997
+ *
+ * Combined the keyboard and PS/2 mouse handling into one file,
+ * because they share the same hardware.
+ * Johan Myreen <jem@iki.fi> 1998-10-08.
+ *
+ * Code fixes to handle mouse ACKs properly.
+ * C. Scott Ananian <cananian@alumni.princeton.edu> 1999-01-29.
+ *
+ */
+
+#include <linux/config.h>
+
+#include <linux/spinlock.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+#include <linux/mm.h>
+#include <linux/signal.h>
+#include <linux/init.h>
+#include <linux/kbd_ll.h>
+#include <linux/delay.h>
+#include <linux/random.h>
+#include <linux/poll.h>
+#include <linux/miscdevice.h>
+#include <linux/malloc.h>
+#include <linux/kbd_kern.h>
+
+//#include <asm/keyboard.h>
+#include <asm/bitops.h>
+#include <asm/uaccess.h>
+#include <asm/irq.h>
+#include <asm/system.h>
+
+#include <asm/io.h>
+
+/* Some configuration switches are present in the include file... */
+
+#include <linux/pc_keyb.h>
+#include <asm/keyboard.h>
+
+/* Simple translation table for the SysRq keys */
+
+#ifdef CONFIG_MAGIC_SYSRQ
+unsigned char sa1111_sysrq_xlate[128] =
+       "\000\0331234567890-=\177\t"                    /* 0x00 - 0x0f */
+       "qwertyuiop[]\r\000as"                          /* 0x10 - 0x1f */
+       "dfghjkl;'`\000\\zxcv"                          /* 0x20 - 0x2f */
+       "bnm,./\000*\000 \000\201\202\203\204\205"      /* 0x30 - 0x3f */
+       "\206\207\210\211\212\000\000789-456+1"         /* 0x40 - 0x4f */
+       "230\177\000\000\213\214\000\000\000\000\000\000\000\000\000\000" /* 0x50 - 0x5f */
+       "\r\000/";                                      /* 0x60 - 0x6f */
+#endif
+
+// static void kbd_write_command_w(int data);
+static void kbd_write_output_w(int data);
+
+spinlock_t kbd_controller_lock = SPIN_LOCK_UNLOCKED;
+static unsigned int handle_kbd_event(void);
+
+/* used only by send_data - set by keyboard_interrupt */
+static volatile unsigned char reply_expected = 0;
+static volatile unsigned char acknowledge = 0;
+static volatile unsigned char resend = 0;
+
+
+#if defined CONFIG_PSMOUSE
+/*
+ *     PS/2 Auxiliary Device
+ */
+
+static int __init psaux_init(void);
+
+static struct aux_queue *queue;        /* Mouse data buffer. */
+static int aux_count = 0;
+/* used when we send commands to the mouse that expect an ACK. */
+static unsigned char mouse_reply_expected = 0;
+
+#define AUX_INTS_OFF (KBD_MODE_KCC | KBD_MODE_DISABLE_MOUSE | KBD_MODE_SYS | KBD_MODE_KBD_INT)
+#define AUX_INTS_ON  (KBD_MODE_KCC | KBD_MODE_SYS | KBD_MODE_MOUSE_INT | KBD_MODE_KBD_INT)
+
+#define MAX_RETRIES    60              /* some aux operations take long time*/
+#endif /* CONFIG_PSMOUSE */
+
+/*
+ * Wait for keyboard controller input buffer to drain.
+ *
+ * Don't use 'jiffies' so that we don't depend on
+ * interrupts..
+ *
+ * Quote from PS/2 System Reference Manual:
+ *
+ * "Address hex 0060 and address hex 0064 should be written only when
+ * the input-buffer-full bit and output-buffer-full bit in the
+ * Controller Status register are set 0."
+ */
+
+static void kb_wait(void)
+{
+       unsigned long timeout = KBC_TIMEOUT;
+
+       do {
+               /*
+                * "handle_kbd_event()" will handle any incoming events
+                * while we wait - keypresses or mouse movement.
+                */
+               handle_kbd_event();
+               if (KBDSTAT & KBD_STAT_TXE)
+                       return;
+               mdelay(1);
+               timeout--;
+       } while (timeout);
+#ifdef KBD_REPORT_TIMEOUTS
+       printk(KERN_WARNING "Keyboard timed out[1]\n");
+#endif
+}
+
+static void ms_wait(void)
+{
+       unsigned long timeout = KBC_TIMEOUT;
+
+       do {
+               /*
+                * "handle_kbd_event()" will handle any incoming events
+                * while we wait - keypresses or mouse movement.
+                */
+               handle_kbd_event();
+               if (MSESTAT & MSE_STAT_TXE)
+                       return;
+               mdelay(1);
+               timeout--;
+       } while (timeout);
+#ifdef KBD_REPORT_TIMEOUTS
+       printk(KERN_WARNING "Mouse timed out[1]\n");
+#endif
+}
+
+/*
+ * Translation of escaped scancodes to keycodes.
+ * This is now user-settable.
+ * The keycodes 1-88,96-111,119 are fairly standard, and
+ * should probably not be changed - changing might confuse X.
+ * X also interprets scancode 0x5d (KEY_Begin).
+ *
+ * For 1-88 keycode equals scancode.
+ */
+
+#define E0_KPENTER 96
+#define E0_RCTRL   97
+#define E0_KPSLASH 98
+#define E0_PRSCR   99
+#define E0_RALT    100
+#define E0_BREAK   101  /* (control-pause) */
+#define E0_HOME    102
+#define E0_UP      103
+#define E0_PGUP    104
+#define E0_LEFT    105
+#define E0_RIGHT   106
+#define E0_END     107
+#define E0_DOWN    108
+#define E0_PGDN    109
+#define E0_INS     110
+#define E0_DEL     111
+
+/* for USB 106 keyboard */
+#define E0_YEN         124
+#define E0_BACKSLASH   89
+
+
+#define E1_PAUSE   119
+
+/*
+ * The keycodes below are randomly located in 89-95,112-118,120-127.
+ * They could be thrown away (and all occurrences below replaced by 0),
+ * but that would force many users to use the `setkeycodes' utility, where
+ * they needed not before. It does not matter that there are duplicates, as
+ * long as no duplication occurs for any single keyboard.
+ */
+#define SC_LIM 89
+
+#define FOCUS_PF1 85           /* actual code! */
+#define FOCUS_PF2 89
+#define FOCUS_PF3 90
+#define FOCUS_PF4 91
+#define FOCUS_PF5 92
+#define FOCUS_PF6 93
+#define FOCUS_PF7 94
+#define FOCUS_PF8 95
+#define FOCUS_PF9 120
+#define FOCUS_PF10 121
+#define FOCUS_PF11 122
+#define FOCUS_PF12 123
+
+#define JAP_86     124
+/* tfj@olivia.ping.dk:
+ * The four keys are located over the numeric keypad, and are
+ * labelled A1-A4. It's an rc930 keyboard, from
+ * Regnecentralen/RC International, Now ICL.
+ * Scancodes: 59, 5a, 5b, 5c.
+ */
+#define RGN1 124
+#define RGN2 125
+#define RGN3 126
+#define RGN4 127
+
+static unsigned char high_keys[128 - SC_LIM] = {
+  RGN1, RGN2, RGN3, RGN4, 0, 0, 0,                   /* 0x59-0x5f */
+  0, 0, 0, 0, 0, 0, 0, 0,                            /* 0x60-0x67 */
+  0, 0, 0, 0, 0, FOCUS_PF11, 0, FOCUS_PF12,          /* 0x68-0x6f */
+  0, 0, 0, FOCUS_PF2, FOCUS_PF9, 0, 0, FOCUS_PF3,    /* 0x70-0x77 */
+  FOCUS_PF4, FOCUS_PF5, FOCUS_PF6, FOCUS_PF7,        /* 0x78-0x7b */
+  FOCUS_PF8, JAP_86, FOCUS_PF10, 0                   /* 0x7c-0x7f */
+};
+
+/* BTC */
+#define E0_MACRO   112
+/* LK450 */
+#define E0_F13     113
+#define E0_F14     114
+#define E0_HELP    115
+#define E0_DO      116
+#define E0_F17     117
+#define E0_KPMINPLUS 118
+/*
+ * My OmniKey generates e0 4c for  the "OMNI" key and the
+ * right alt key does nada. [kkoller@nyx10.cs.du.edu]
+ */
+#define E0_OK  124
+/*
+ * New microsoft keyboard is rumoured to have
+ * e0 5b (left window button), e0 5c (right window button),
+ * e0 5d (menu button). [or: LBANNER, RBANNER, RMENU]
+ * [or: Windows_L, Windows_R, TaskMan]
+ */
+#define E0_MSLW        125
+#define E0_MSRW        126
+#define E0_MSTM        127
+
+static unsigned char e0_keys[128] = {
+  0, 0, 0, 0, 0, 0, 0, 0,                            /* 0x00-0x07 */
+  0, 0, 0, 0, 0, 0, 0, 0,                            /* 0x08-0x0f */
+  0, 0, 0, 0, 0, 0, 0, 0,                            /* 0x10-0x17 */
+  0, 0, 0, 0, E0_KPENTER, E0_RCTRL, 0, 0,            /* 0x18-0x1f */
+  0, 0, 0, 0, 0, 0, 0, 0,                            /* 0x20-0x27 */
+  0, 0, 0, 0, 0, 0, 0, 0,                            /* 0x28-0x2f */
+  0, 0, 0, 0, 0, E0_KPSLASH, 0, E0_PRSCR,            /* 0x30-0x37 */
+  E0_RALT, 0, 0, 0, 0, E0_F13, E0_F14, E0_HELP,              /* 0x38-0x3f */
+  E0_DO, E0_F17, 0, 0, 0, 0, E0_BREAK, E0_HOME,              /* 0x40-0x47 */
+  E0_UP, E0_PGUP, 0, E0_LEFT, E0_OK, E0_RIGHT, E0_KPMINPLUS, E0_END,/* 0x48-0x4f */
+  E0_DOWN, E0_PGDN, E0_INS, E0_DEL, 0, 0, 0, 0,              /* 0x50-0x57 */
+  0, 0, 0, E0_MSLW, E0_MSRW, E0_MSTM, 0, 0,          /* 0x58-0x5f */
+  0, 0, 0, 0, 0, 0, 0, 0,                            /* 0x60-0x67 */
+  0, 0, 0, 0, 0, 0, 0, E0_MACRO,                     /* 0x68-0x6f */
+  //0, 0, 0, 0, 0, 0, 0, 0,                          /* 0x70-0x77 */
+  0, 0, 0, 0, 0, E0_BACKSLASH, 0, 0,                         /* 0x70-0x77 */
+  0, 0, 0, E0_YEN, 0, 0, 0, 0                        /* 0x78-0x7f */
+};
+
+int sa1111_setkeycode(unsigned int scancode, unsigned int keycode)
+{
+       if (scancode < SC_LIM || scancode > 255 || keycode > 127)
+         return -EINVAL;
+       if (scancode < 128)
+         high_keys[scancode - SC_LIM] = keycode;
+       else
+         e0_keys[scancode - 128] = keycode;
+       return 0;
+}
+
+int sa1111_getkeycode(unsigned int scancode)
+{
+       return
+         (scancode < SC_LIM || scancode > 255) ? -EINVAL :
+         (scancode < 128) ? high_keys[scancode - SC_LIM] :
+           e0_keys[scancode - 128];
+}
+
+static int do_acknowledge(unsigned char scancode)
+{
+       if (reply_expected) {
+         /* Unfortunately, we must recognise these codes only if we know they
+          * are known to be valid (i.e., after sending a command), because there
+          * are some brain-damaged keyboards (yes, FOCUS 9000 again) which have
+          * keys with such codes :(
+          */
+               if (scancode == KBD_REPLY_ACK) {
+                       acknowledge = 1;
+                       reply_expected = 0;
+                       return 0;
+               } else if (scancode == KBD_REPLY_RESEND) {
+                       resend = 1;
+                       reply_expected = 0;
+                       return 0;
+               }
+               /* Should not happen... */
+#if 0
+               printk(KERN_DEBUG "keyboard reply expected - got %02x\n",
+                      scancode);
+#endif
+       }
+       return 1;
+}
+
+int sa1111_translate(unsigned char scancode, unsigned char *keycode,
+                   char raw_mode)
+{
+       static int prev_scancode = 0;
+
+       /* special prefix scancodes.. */
+       if (scancode == 0xe0 || scancode == 0xe1) {
+               prev_scancode = scancode;
+               return 0;
+       }
+
+       /* 0xFF is sent by a few keyboards, ignore it. 0x00 is error */
+       if (scancode == 0x00 || scancode == 0xff) {
+               prev_scancode = 0;
+               return 0;
+       }
+
+       scancode &= 0x7f;
+
+       if (prev_scancode) {
+         /*
+          * usually it will be 0xe0, but a Pause key generates
+          * e1 1d 45 e1 9d c5 when pressed, and nothing when released
+          */
+         if (prev_scancode != 0xe0) {
+             if (prev_scancode == 0xe1 && scancode == 0x1d) {
+                 prev_scancode = 0x100;
+                 return 0;
+             } else if (prev_scancode == 0x100 && scancode == 0x45) {
+                 *keycode = E1_PAUSE;
+                 prev_scancode = 0;
+             } else {
+#ifdef KBD_REPORT_UNKN
+                 if (!raw_mode)
+                   printk(KERN_INFO "keyboard: unknown e1 escape sequence\n");
+#endif
+                 prev_scancode = 0;
+                 return 0;
+             }
+         } else {
+             prev_scancode = 0;
+             /*
+              *  The keyboard maintains its own internal caps lock and
+              *  num lock statuses. In caps lock mode E0 AA precedes make
+              *  code and E0 2A follows break code. In num lock mode,
+              *  E0 2A precedes make code and E0 AA follows break code.
+              *  We do our own book-keeping, so we will just ignore these.
+              */
+             /*
+              *  For my keyboard there is no caps lock mode, but there are
+              *  both Shift-L and Shift-R modes. The former mode generates
+              *  E0 2A / E0 AA pairs, the latter E0 B6 / E0 36 pairs.
+              *  So, we should also ignore the latter. - aeb@cwi.nl
+              */
+             if (scancode == 0x2a || scancode == 0x36)
+               return 0;
+
+             if (e0_keys[scancode])
+               *keycode = e0_keys[scancode];
+             else {
+#ifdef KBD_REPORT_UNKN
+                 if (!raw_mode)
+                   printk(KERN_INFO "keyboard: unknown scancode e0 %02x\n",
+                          scancode);
+#endif
+                 return 0;
+             }
+         }
+       } else if (scancode >= SC_LIM) {
+           /* This happens with the FOCUS 9000 keyboard
+              Its keys PF1..PF12 are reported to generate
+              55 73 77 78 79 7a 7b 7c 74 7e 6d 6f
+              Moreover, unless repeated, they do not generate
+              key-down events, so we have to zero up_flag below */
+           /* Also, Japanese 86/106 keyboards are reported to
+              generate 0x73 and 0x7d for \ - and \ | respectively. */
+           /* Also, some Brazilian keyboard is reported to produce
+              0x73 and 0x7e for \ ? and KP-dot, respectively. */
+
+         *keycode = high_keys[scancode - SC_LIM];
+
+         if (!*keycode) {
+             if (!raw_mode) {
+#ifdef KBD_REPORT_UNKN
+                 printk(KERN_INFO "keyboard: unrecognized scancode (%02x)"
+                        " - ignored\n", scancode);
+#endif
+             }
+             return 0;
+         }
+       } else
+         *keycode = scancode;
+       return 1;
+}
+
+char sa1111_unexpected_up(unsigned char keycode)
+{
+       /* unexpected, but this can happen: maybe this was a key release for a
+          FOCUS 9000 PF key; if we want to see it, we have to clear up_flag */
+       if (keycode >= SC_LIM || keycode == 85)
+           return 0;
+       else
+           return 0200;
+}
+
+static inline void handle_mouse_event(unsigned char scancode)
+{
+#ifdef CONFIG_PSMOUSE
+       if (mouse_reply_expected) {
+               if (scancode == AUX_ACK) {
+                       mouse_reply_expected--;
+                       return;
+               }
+               mouse_reply_expected = 0;
+       }
+
+       add_mouse_randomness(scancode);
+       if (aux_count) {
+               int head = queue->head;
+
+               queue->buf[head] = scancode;
+               head = (head + 1) & (AUX_BUF_SIZE-1);
+               if (head != queue->tail) {
+                       queue->head = head;
+                       if (queue->fasync)
+                               kill_fasync(&queue->fasync, SIGIO, POLL_IN);
+                       wake_up_interruptible(&queue->proc_list);
+               }
+       }
+#endif
+}
+
+static unsigned char kbd_exists = 1;
+
+static inline void handle_keyboard_event(unsigned char scancode)
+{
+#ifdef CONFIG_VT
+       kbd_exists = 1;
+       if (do_acknowledge(scancode))
+               handle_scancode(scancode, !(scancode & 0x80));
+#endif
+       tasklet_schedule(&keyboard_tasklet);
+}
+
+/*
+ * This reads the keyboard status port, and does the
+ * appropriate action.
+ *
+ * It requires that we hold the keyboard controller
+ * spinlock.
+ */
+static unsigned int handle_kbd_event(void)
+{
+       unsigned int status = KBDSTAT;
+       unsigned int msests = MSESTAT;
+       unsigned int work = 10000;
+       unsigned char scancode;
+
+       while ((status & KBD_STAT_RXF) || (msests & MSE_STAT_RXF)) {
+               while (status & KBD_STAT_RXF) {
+                       scancode = KBDDATA & 0xff;
+                       if (! (status & KBD_STAT_STP))
+                               handle_keyboard_event(scancode);
+                       if (!--work) {
+                               printk(KERN_ERR "pc_keyb: keyboard controller jammed (0x%02X).\n", status);
+                               return status;
+                       }
+                       status = KBDSTAT;
+               }
+               while (msests & MSE_STAT_RXF) {
+