Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Oct 2006 02:35:20 +0000 (19:35 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Oct 2006 02:35:20 +0000 (19:35 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC32]: Fix prom.c build warning
  [SPARC64]: Update defconfig.
  [SPARC64]: Fix of_device bus_id settings.
  [SPARC64]: Update MAINTAINERS entry.

37 files changed:
arch/mips/Kconfig
arch/mips/au1000/common/Makefile
arch/mips/au1000/common/usbdev.c [deleted file]
arch/mips/au1000/db1x00/board_setup.c
arch/mips/au1000/mtx-1/board_setup.c
arch/mips/au1000/pb1000/board_setup.c
arch/mips/au1000/pb1100/board_setup.c
arch/mips/au1000/pb1500/board_setup.c
arch/mips/configs/pb1100_defconfig
arch/mips/configs/pb1500_defconfig
arch/mips/dec/int-handler.S
arch/mips/kernel/cpu-probe.c
arch/mips/kernel/entry.S
arch/mips/kernel/genex.S
arch/mips/kernel/proc.c
arch/mips/kernel/process.c
arch/mips/kernel/ptrace.c
arch/mips/kernel/ptrace32.c
arch/mips/kernel/smp.c
arch/mips/kernel/smtc-asm.S
arch/mips/kernel/traps.c
arch/mips/math-emu/cp1emu.c
arch/mips/mips-boards/malta/malta_int.c
arch/mips/tx4927/common/tx4927_setup.c
arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
arch/mips/tx4938/common/irq.c
arch/mips/tx4938/common/setup.c
arch/mips/tx4938/toshiba_rbtx4938/irq.c
arch/powerpc/platforms/82xx/mpc82xx.c
arch/powerpc/platforms/82xx/mpc82xx_ads.c
arch/powerpc/platforms/82xx/pq2ads.h
arch/powerpc/sysdev/qe_lib/qe_io.c
drivers/char/qtronix.c [deleted file]
drivers/char/rtc.c
include/asm-mips/fpu.h
include/asm-mips/mach-au1x00/au1000_usbdev.h [deleted file]
include/linux/config.h [deleted file]

index 731b942..14af6cc 100644 (file)
@@ -1010,11 +1010,6 @@ endchoice
 config ARC32
        bool
 
-config AU1X00_USB_DEVICE
-       bool
-       depends on MIPS_PB1500 || MIPS_PB1100 || MIPS_PB1000
-       default n
-
 config BOOT_ELF32
        bool
 
index bf682f5..4c35525 100644 (file)
@@ -10,6 +10,5 @@ obj-y += prom.o irq.o puts.o time.o reset.o \
        au1xxx_irqmap.o clocks.o platform.o power.o setup.o \
        sleeper.o cputable.o dma.o dbdma.o gpio.o
 
-obj-$(CONFIG_AU1X00_USB_DEVICE)        += usbdev.o
 obj-$(CONFIG_KGDB)             += dbg_io.o
 obj-$(CONFIG_PCI)              += pci.o
diff --git a/arch/mips/au1000/common/usbdev.c b/arch/mips/au1000/common/usbdev.c
deleted file mode 100644 (file)
index 70dc82e..0000000
+++ /dev/null
@@ -1,1552 +0,0 @@
-/*
- * BRIEF MODULE DESCRIPTION
- *     Au1000 USB Device-Side (device layer)
- *
- * Copyright 2001-2002 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *             stevel@mvista.com or source@mvista.com
- *
- *  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  SOFTWARE  IS PROVIDED          ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,          INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED          TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA, OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN         CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <linux/errno.h>
-#include <linux/poll.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/fcntl.h>
-#include <linux/module.h>
-#include <linux/spinlock.h>
-#include <linux/list.h>
-#include <linux/smp_lock.h>
-#define DEBUG
-#include <linux/usb.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/irq.h>
-#include <asm/mipsregs.h>
-#include <asm/au1000.h>
-#include <asm/au1000_dma.h>
-#include <asm/au1000_usbdev.h>
-
-#ifdef DEBUG
-#undef VDEBUG
-#ifdef VDEBUG
-#define vdbg(fmt, arg...) printk(KERN_DEBUG __FILE__ ": " fmt "\n" , ## arg)
-#else
-#define vdbg(fmt, arg...) do {} while (0)
-#endif
-#else
-#define vdbg(fmt, arg...) do {} while (0)
-#endif
-
-#define ALLOC_FLAGS (in_interrupt () ? GFP_ATOMIC : GFP_KERNEL)
-
-#define EP_FIFO_DEPTH 8
-
-typedef enum {
-       SETUP_STAGE = 0,
-       DATA_STAGE,
-       STATUS_STAGE
-} ep0_stage_t;
-
-typedef struct {
-       int read_fifo;
-       int write_fifo;
-       int ctrl_stat;
-       int read_fifo_status;
-       int write_fifo_status;
-} endpoint_reg_t;
-
-typedef struct {
-       usbdev_pkt_t *head;
-       usbdev_pkt_t *tail;
-       int count;
-} pkt_list_t;
-
-typedef struct {
-       int active;
-       struct usb_endpoint_descriptor *desc;
-       endpoint_reg_t *reg;
-       /* Only one of these are used, unless this is the control ep */
-       pkt_list_t inlist;
-       pkt_list_t outlist;
-       unsigned int indma, outdma; /* DMA channel numbers for IN, OUT */
-       /* following are extracted from endpoint descriptor for easy access */
-       int max_pkt_size;
-       int type;
-       int direction;
-       /* WE assign endpoint addresses! */
-       int address;
-       spinlock_t lock;
-} endpoint_t;
-
-
-static struct usb_dev {
-       endpoint_t ep[6];
-       ep0_stage_t ep0_stage;
-
-       struct usb_device_descriptor *   dev_desc;
-       struct usb_interface_descriptor* if_desc;
-       struct usb_config_descriptor *   conf_desc;
-       u8 *                             full_conf_desc;
-       struct usb_string_descriptor *   str_desc[6];
-
-       /* callback to function layer */
-       void (*func_cb)(usbdev_cb_type_t type, unsigned long arg,
-                       void *cb_data);
-       void* cb_data;
-
-       usbdev_state_t state;   // device state
-       int suspended;          // suspended flag
-       int address;            // device address
-       int interface;
-       int num_ep;
-       u8 alternate_setting;
-       u8 configuration;       // configuration value
-       int remote_wakeup_en;
-} usbdev;
-
-
-static endpoint_reg_t ep_reg[] = {
-       // FIFO's 0 and 1 are EP0 default control
-       {USBD_EP0RD, USBD_EP0WR, USBD_EP0CS, USBD_EP0RDSTAT, USBD_EP0WRSTAT },
-       {0},
-       // FIFO 2 is EP2, IN
-       { -1, USBD_EP2WR, USBD_EP2CS, -1, USBD_EP2WRSTAT },
-       // FIFO 3 is EP3, IN
-       {    -1,     USBD_EP3WR, USBD_EP3CS,     -1,         USBD_EP3WRSTAT },
-       // FIFO 4 is EP4, OUT
-       {USBD_EP4RD,     -1,     USBD_EP4CS, USBD_EP4RDSTAT,     -1         },
-       // FIFO 5 is EP5, OUT
-       {USBD_EP5RD,     -1,     USBD_EP5CS, USBD_EP5RDSTAT,     -1         }
-};
-
-static struct {
-       unsigned int id;
-       const char *str;
-} ep_dma_id[] = {
-       { DMA_ID_USBDEV_EP0_TX, "USBDev EP0 IN" },
-       { DMA_ID_USBDEV_EP0_RX, "USBDev EP0 OUT" },
-       { DMA_ID_USBDEV_EP2_TX, "USBDev EP2 IN" },
-       { DMA_ID_USBDEV_EP3_TX, "USBDev EP3 IN" },
-       { DMA_ID_USBDEV_EP4_RX, "USBDev EP4 OUT" },
-       { DMA_ID_USBDEV_EP5_RX, "USBDev EP5 OUT" }
-};
-
-#define DIR_OUT 0
-#define DIR_IN  (1<<3)
-
-#define CONTROL_EP USB_ENDPOINT_XFER_CONTROL
-#define BULK_EP    USB_ENDPOINT_XFER_BULK
-
-static inline endpoint_t *
-epaddr_to_ep(struct usb_dev* dev, int ep_addr)
-{
-       if (ep_addr >= 0 && ep_addr < 2)
-               return &dev->ep[0];
-       if (ep_addr < 6)
-               return &dev->ep[ep_addr];
-       return NULL;
-}
-
-static const char* std_req_name[] = {
-       "GET_STATUS",
-       "CLEAR_FEATURE",
-       "RESERVED",
-       "SET_FEATURE",
-       "RESERVED",
-       "SET_ADDRESS",
-       "GET_DESCRIPTOR",
-       "SET_DESCRIPTOR",
-       "GET_CONFIGURATION",
-       "SET_CONFIGURATION",
-       "GET_INTERFACE",
-       "SET_INTERFACE",
-       "SYNCH_FRAME"
-};
-
-static inline const char*
-get_std_req_name(int req)
-{
-       return (req >= 0 && req <= 12) ? std_req_name[req] : "UNKNOWN";
-}
-
-#if 0
-static void
-dump_setup(struct usb_ctrlrequest* s)
-{
-       dbg("%s: requesttype=%d", __FUNCTION__, s->requesttype);
-       dbg("%s: request=%d %s", __FUNCTION__, s->request,
-           get_std_req_name(s->request));
-       dbg("%s: value=0x%04x", __FUNCTION__, s->wValue);
-       dbg("%s: index=%d", __FUNCTION__, s->index);
-       dbg("%s: length=%d", __FUNCTION__, s->length);
-}
-#endif
-
-static inline usbdev_pkt_t *
-alloc_packet(endpoint_t * ep, int data_size, void* data)
-{
-       usbdev_pkt_t* pkt = kmalloc(sizeof(usbdev_pkt_t) + data_size,
-                                   ALLOC_FLAGS);
-       if (!pkt)
-               return NULL;
-       pkt->ep_addr = ep->address;
-       pkt->size = data_size;
-       pkt->status = 0;
-       pkt->next = NULL;
-       if (data)
-               memcpy(pkt->payload, data, data_size);
-
-       return pkt;
-}
-
-
-/*
- * Link a packet to the tail of the enpoint's packet list.
- * EP spinlock must be held when calling.
- */
-static void
-link_tail(endpoint_t * ep, pkt_list_t * list, usbdev_pkt_t * pkt)
-{
-       if (!list->tail) {
-               list->head = list->tail = pkt;
-               list->count = 1;
-       } else {
-               list->tail->next = pkt;
-               list->tail = pkt;
-               list->count++;
-       }
-}
-
-/*
- * Unlink and return a packet from the head of the given packet
- * list. It is the responsibility of the caller to free the packet.
- * EP spinlock must be held when calling.
- */
-static usbdev_pkt_t *
-unlink_head(pkt_list_t * list)
-{
-       usbdev_pkt_t *pkt;
-
-       pkt = list->head;
-       if (!pkt || !list->count) {
-               return NULL;
-       }
-
-       list->head = pkt->next;
-       if (!list->head) {
-               list->head = list->tail = NULL;
-               list->count = 0;
-       } else
-               list->count--;
-
-       return pkt;
-}
-
-/*
- * Create and attach a new packet to the tail of the enpoint's
- * packet list. EP spinlock must be held when calling.
- */
-static usbdev_pkt_t *
-add_packet(endpoint_t * ep, pkt_list_t * list, int size)
-{
-       usbdev_pkt_t *pkt = alloc_packet(ep, size, NULL);
-       if (!pkt)
-               return NULL;
-
-       link_tail(ep, list, pkt);
-       return pkt;
-}
-
-
-/*
- * Unlink and free a packet from the head of the enpoint's
- * packet list. EP spinlock must be held when calling.
- */
-static inline void
-free_packet(pkt_list_t * list)
-{
-       kfree(unlink_head(list));
-}
-
-/* EP spinlock must be held when calling. */
-static inline void
-flush_pkt_list(pkt_list_t * list)
-{
-       while (list->count)
-               free_packet(list);
-}
-
-/* EP spinlock must be held when calling */
-static inline void
-flush_write_fifo(endpoint_t * ep)
-{
-       if (ep->reg->write_fifo_status >= 0) {
-               au_writel(USBDEV_FSTAT_FLUSH | USBDEV_FSTAT_UF |
-                         USBDEV_FSTAT_OF,
-                         ep->reg->write_fifo_status);
-               //udelay(100);
-               //au_writel(USBDEV_FSTAT_UF | USBDEV_FSTAT_OF,
-               //        ep->reg->write_fifo_status);
-       }
-}
-
-/* EP spinlock must be held when calling */
-static inline void
-flush_read_fifo(endpoint_t * ep)
-{
-       if (ep->reg->read_fifo_status >= 0) {
-               au_writel(USBDEV_FSTAT_FLUSH | USBDEV_FSTAT_UF |
-                         USBDEV_FSTAT_OF,
-                         ep->reg->read_fifo_status);
-               //udelay(100);
-               //au_writel(USBDEV_FSTAT_UF | USBDEV_FSTAT_OF,
-               //        ep->reg->read_fifo_status);
-       }
-}
-
-
-/* EP spinlock must be held when calling. */
-static void
-endpoint_flush(endpoint_t * ep)
-{
-       // First, flush all packets
-       flush_pkt_list(&ep->inlist);
-       flush_pkt_list(&ep->outlist);
-
-       // Now flush the endpoint's h/w FIFO(s)
-       flush_write_fifo(ep);
-       flush_read_fifo(ep);
-}
-
-/* EP spinlock must be held when calling. */
-static void
-endpoint_stall(endpoint_t * ep)
-{
-       u32 cs;
-
-       warn("%s", __FUNCTION__);
-
-       cs = au_readl(ep->reg->ctrl_stat) | USBDEV_CS_STALL;
-       au_writel(cs, ep->reg->ctrl_stat);
-}
-
-/* EP spinlock must be held when calling. */
-static void
-endpoint_unstall(endpoint_t * ep)
-{
-       u32 cs;
-
-       warn("%s", __FUNCTION__);
-
-       cs = au_readl(ep->reg->ctrl_stat) & ~USBDEV_CS_STALL;
-       au_writel(cs, ep->reg->ctrl_stat);
-}
-
-static void
-endpoint_reset_datatoggle(endpoint_t * ep)
-{
-       // FIXME: is this possible?
-}
-
-
-/* EP spinlock must be held when calling. */
-static int
-endpoint_fifo_read(endpoint_t * ep)
-{
-       int read_count = 0;
-       u8 *bufptr;
-       usbdev_pkt_t *pkt = ep->outlist.tail;
-
-       if (!pkt)
-               return -EINVAL;
-
-       bufptr = &pkt->payload[pkt->size];
-       while (au_readl(ep->reg->read_fifo_status) & USBDEV_FSTAT_FCNT_MASK) {
-               *bufptr++ = au_readl(ep->reg->read_fifo) & 0xff;
-               read_count++;
-               pkt->size++;
-       }
-
-       return read_count;
-}
-
-#if 0
-/* EP spinlock must be held when calling. */
-static int
-endpoint_fifo_write(endpoint_t * ep, int index)
-{
-       int write_count = 0;
-       u8 *bufptr;
-       usbdev_pkt_t *pkt = ep->inlist.head;
-
-       if (!pkt)
-               return -EINVAL;
-
-       bufptr = &pkt->payload[index];
-       while ((au_readl(ep->reg->write_fifo_status) &
-               USBDEV_FSTAT_FCNT_MASK) < EP_FIFO_DEPTH) {
-               if (bufptr < pkt->payload + pkt->size) {
-                       au_writel(*bufptr++, ep->reg->write_fifo);
-                       write_count++;
-               } else {
-                       break;
-               }
-       }
-
-       return write_count;
-}
-#endif
-
-/*
- * This routine is called to restart transmission of a packet.
- * The endpoint's TSIZE must be set to the new packet's size,
- * and DMA to the write FIFO needs to be restarted.
- * EP spinlock must be held when calling.
- */
-static void
-kickstart_send_packet(endpoint_t * ep)
-{
-       u32 cs;
-       usbdev_pkt_t *pkt = ep->inlist.head;
-
-       vdbg("%s: ep%d, pkt=%p", __FUNCTION__, ep->address, pkt);
-
-       if (!pkt) {
-               err("%s: head=NULL! list->count=%d", __FUNCTION__,
-                   ep->inlist.count);
-               return;
-       }
-
-       dma_cache_wback_inv((unsigned long)pkt->payload, pkt->size);
-
-       /*
-        * make sure FIFO is empty
-        */
-       flush_write_fifo(ep);
-
-       cs = au_readl(ep->reg->ctrl_stat) & USBDEV_CS_STALL;
-       cs |= (pkt->size << USBDEV_CS_TSIZE_BIT);
-       au_writel(cs, ep->reg->ctrl_stat);
-
-       if (get_dma_active_buffer(ep->indma) == 1) {
-               set_dma_count1(ep->indma, pkt->size);
-               set_dma_addr1(ep->indma, virt_to_phys(pkt->payload));
-               enable_dma_buffer1(ep->indma);  // reenable
-       } else {
-               set_dma_count0(ep->indma, pkt->size);
-               set_dma_addr0(ep->indma, virt_to_phys(pkt->payload));
-               enable_dma_buffer0(ep->indma);  // reenable
-       }
-       if (dma_halted(ep->indma))
-               start_dma(ep->indma);
-}
-
-
-/*
- * This routine is called when a packet in the inlist has been
- * completed. Frees the completed packet and starts sending the
- * next. EP spinlock must be held when calling.
- */
-static usbdev_pkt_t *
-send_packet_complete(endpoint_t * ep)
-{
-       usbdev_pkt_t *pkt = unlink_head(&ep->inlist);
-
-       if (pkt) {
-               pkt->status =
-                       (au_readl(ep->reg->ctrl_stat) & USBDEV_CS_NAK) ?
-                       PKT_STATUS_NAK : PKT_STATUS_ACK;
-
-               vdbg("%s: ep%d, %s pkt=%p, list count=%d", __FUNCTION__,
-                    ep->address, (pkt->status & PKT_STATUS_NAK) ?
-                    "NAK" : "ACK", pkt, ep->inlist.count);
-       }
-
-       /*
-        * The write fifo should already be drained if things are
-        * working right, but flush it anyway just in case.
-        */
-       flush_write_fifo(ep);
-
-       // begin transmitting next packet in the inlist
-       if (ep->inlist.count) {
-               kickstart_send_packet(ep);
-       }
-
-       return pkt;
-}
-
-/*
- * Add a new packet to the tail of the given ep's packet
- * inlist. The transmit complete interrupt frees packets from
- * the head of this list. EP spinlock must be held when calling.
- */
-static int
-send_packet(struct usb_dev* dev, usbdev_pkt_t *pkt, int async)
-{
-       pkt_list_t *list;
-       endpoint_t* ep;
-
-       if (!pkt || !(ep = epaddr_to_ep(dev, pkt->ep_addr)))
-               return -EINVAL;
-
-       if (!pkt->size)
-               return 0;
-
-       list = &ep->inlist;
-
-       if (!async && list->count) {
-               halt_dma(ep->indma);
-               flush_pkt_list(list);
-       }
-
-       link_tail(ep, list, pkt);
-
-       vdbg("%s: ep%d, pkt=%p, size=%d, list count=%d", __FUNCTION__,
-            ep->address, pkt, pkt->size, list->count);
-
-       if (list->count == 1) {
-               /*
-                * if the packet count is one, it means the list was empty,
-                * and no more data will go out this ep until we kick-start
-                * it again.
-                */
-               kickstart_send_packet(ep);
-       }
-
-       return pkt->size;
-}
-
-/*
- * This routine is called to restart reception of a packet.
- * EP spinlock must be held when calling.
- */
-static void
-kickstart_receive_packet(endpoint_t * ep)
-{
-       usbdev_pkt_t *pkt;
-
-       // get and link a new packet for next reception
-       if (!(pkt = add_packet(ep, &ep->outlist, ep->max_pkt_size))) {
-               err("%s: could not alloc new packet", __FUNCTION__);
-               return;
-       }
-
-       if (get_dma_active_buffer(ep->outdma) == 1) {
-               clear_dma_done1(ep->outdma);
-               set_dma_count1(ep->outdma, ep->max_pkt_size);
-               set_dma_count0(ep->outdma, 0);
-               set_dma_addr1(ep->outdma, virt_to_phys(pkt->payload));
-               enable_dma_buffer1(ep->outdma); // reenable
-       } else {
-               clear_dma_done0(ep->outdma);
-               set_dma_count0(ep->outdma, ep->max_pkt_size);
-               set_dma_count1(ep->outdma, 0);
-               set_dma_addr0(ep->outdma, virt_to_phys(pkt->payload));
-               enable_dma_buffer0(ep->outdma); // reenable
-       }
-       if (dma_halted(ep->outdma))
-               start_dma(ep->outdma);
-}
-
-
-/*
- * This routine is called when a packet in the outlist has been
- * completed (received) and we need to prepare for a new packet
- * to be received. Halts DMA and computes the packet size from the
- * remaining DMA counter. Then prepares a new packet for reception
- * and restarts DMA. FIXME: what if another packet comes in
- * on top of the completed packet? Counter would be wrong.
- * EP spinlock must be held when calling.
- */
-static usbdev_pkt_t *
-receive_packet_complete(endpoint_t * ep)
-{
-       usbdev_pkt_t *pkt = ep->outlist.tail;
-       u32 cs;
-
-       halt_dma(ep->outdma);
-
-       cs = au_readl(ep->reg->ctrl_stat);
-
-       if (!pkt)
-               return NULL;
-
-       pkt->size = ep->max_pkt_size - get_dma_residue(ep->outdma);
-       if (pkt->size)
-               dma_cache_inv((unsigned long)pkt->payload, pkt->size);
-       /*
-        * need to pull out any remaining bytes in the FIFO.
-        */
-       endpoint_fifo_read(ep);
-       /*
-        * should be drained now, but flush anyway just in case.
-        */
-       flush_read_fifo(ep);
-
-       pkt->status = (cs & USBDEV_CS_NAK) ? PKT_STATUS_NAK : PKT_STATUS_ACK;
-       if (ep->address == 0 && (cs & USBDEV_CS_SU))
-               pkt->status |= PKT_STATUS_SU;
-
-       vdbg("%s: ep%d, %s pkt=%p, size=%d", __FUNCTION__,
-            ep->address, (pkt->status & PKT_STATUS_NAK) ?
-            "NAK" : "ACK", pkt, pkt->size);
-
-       kickstart_receive_packet(ep);
-
-       return pkt;
-}
-
-
-/*
- ****************************************************************************
- * Here starts the standard device request handlers. They are
- * all called by do_setup() via a table of function pointers.
- ****************************************************************************
- */
-
-static ep0_stage_t
-do_get_status(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       switch (setup->bRequestType) {
-       case 0x80:      // Device
-               // FIXME: send device status
-               break;
-       case 0x81:      // Interface
-               // FIXME: send interface status
-               break;
-       case 0x82:      // End Point
-               // FIXME: send endpoint status
-               break;
-       default:
-               // Invalid Command
-               endpoint_stall(&dev->ep[0]); // Stall End Point 0
-               break;
-       }
-
-       return STATUS_STAGE;
-}
-
-static ep0_stage_t
-do_clear_feature(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       switch (setup->bRequestType) {
-       case 0x00:      // Device
-               if ((le16_to_cpu(setup->wValue) & 0xff) == 1)
-                       dev->remote_wakeup_en = 0;
-       else
-                       endpoint_stall(&dev->ep[0]);
-               break;
-       case 0x02:      // End Point
-               if ((le16_to_cpu(setup->wValue) & 0xff) == 0) {
-                       endpoint_t *ep =
-                               epaddr_to_ep(dev,
-                                            le16_to_cpu(setup->wIndex) & 0xff);
-
-                       endpoint_unstall(ep);
-                       endpoint_reset_datatoggle(ep);
-               } else
-                       endpoint_stall(&dev->ep[0]);
-               break;
-       }
-
-       return SETUP_STAGE;
-}
-
-static ep0_stage_t
-do_reserved(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       // Invalid request, stall End Point 0
-       endpoint_stall(&dev->ep[0]);
-       return SETUP_STAGE;
-}
-
-static ep0_stage_t
-do_set_feature(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       switch (setup->bRequestType) {
-       case 0x00:      // Device
-               if ((le16_to_cpu(setup->wValue) & 0xff) == 1)
-                       dev->remote_wakeup_en = 1;
-               else
-                       endpoint_stall(&dev->ep[0]);
-               break;
-       case 0x02:      // End Point
-               if ((le16_to_cpu(setup->wValue) & 0xff) == 0) {
-                       endpoint_t *ep =
-                               epaddr_to_ep(dev,
-                                            le16_to_cpu(setup->wIndex) & 0xff);
-
-                       endpoint_stall(ep);
-               } else
-                       endpoint_stall(&dev->ep[0]);
-               break;
-       }
-
-       return SETUP_STAGE;
-}
-
-static ep0_stage_t
-do_set_address(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       int new_state = dev->state;
-       int new_addr = le16_to_cpu(setup->wValue);
-
-       dbg("%s: our address=%d", __FUNCTION__, new_addr);
-
-       if (new_addr > 127) {
-                       // usb spec doesn't tell us what to do, so just go to
-                       // default state
-               new_state = DEFAULT;
-               dev->address = 0;
-       } else if (dev->address != new_addr) {
-               dev->address = new_addr;
-               new_state = ADDRESS;
-       }
-
-       if (dev->state != new_state) {
-               dev->state = new_state;
-               /* inform function layer of usbdev state change */
-               dev->func_cb(CB_NEW_STATE, dev->state, dev->cb_data);
-       }
-
-       return SETUP_STAGE;
-}
-
-static ep0_stage_t
-do_get_descriptor(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       int strnum, desc_len = le16_to_cpu(setup->wLength);
-
-               switch (le16_to_cpu(setup->wValue) >> 8) {
-               case USB_DT_DEVICE:
-                       // send device descriptor!
-               desc_len = desc_len > dev->dev_desc->bLength ?
-                       dev->dev_desc->bLength : desc_len;
-                       dbg("sending device desc, size=%d", desc_len);
-               send_packet(dev, alloc_packet(&dev->ep[0], desc_len,
-                                             dev->dev_desc), 0);
-                       break;
-               case USB_DT_CONFIG:
-                       // If the config descr index in low-byte of
-                       // setup->wValue        is valid, send config descr,
-                       // otherwise stall ep0.
-                       if ((le16_to_cpu(setup->wValue) & 0xff) == 0) {
-                               // send config descriptor!
-                               if (desc_len <= USB_DT_CONFIG_SIZE) {
-                                       dbg("sending partial config desc, size=%d",
-                                            desc_len);
-                               send_packet(dev,
-                                           alloc_packet(&dev->ep[0],
-                                                        desc_len,
-                                                        dev->conf_desc),
-                                           0);
-                               } else {
-                               int len = le16_to_cpu(dev->conf_desc->wTotalLength);
-                               dbg("sending whole config desc,"
-                                   " size=%d, our size=%d", desc_len, len);
-                               desc_len = desc_len > len ? len : desc_len;
-                               send_packet(dev,
-                                           alloc_packet(&dev->ep[0],
-                                                        desc_len,
-                                                        dev->full_conf_desc),
-                                           0);
-                               }
-                       } else
-                       endpoint_stall(&dev->ep[0]);
-                       break;
-               case USB_DT_STRING:
-                       // If the string descr index in low-byte of setup->wValue
-                       // is valid, send string descr, otherwise stall ep0.
-                       strnum = le16_to_cpu(setup->wValue) & 0xff;
-                       if (strnum >= 0 && strnum < 6) {
-                               struct usb_string_descriptor *desc =
-                               dev->str_desc[strnum];
-                               desc_len = desc_len > desc->bLength ?
-                                       desc->bLength : desc_len;
-                               dbg("sending string desc %d", strnum);
-                       send_packet(dev,
-                                   alloc_packet(&dev->ep[0], desc_len,
-                                                desc), 0);
-                       } else
-                       endpoint_stall(&dev->ep[0]);
-                       break;
-       default:
-               // Invalid request
-               err("invalid get desc=%d, stalled",
-                           le16_to_cpu(setup->wValue) >> 8);
-               endpoint_stall(&dev->ep[0]);    // Stall endpoint 0
-                       break;
-               }
-
-       return STATUS_STAGE;
-}
-
-static ep0_stage_t
-do_set_descriptor(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       // TODO: implement
-       // there will be an OUT data stage (the descriptor to set)
-       return DATA_STAGE;
-}
-
-static ep0_stage_t
-do_get_configuration(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       // send dev->configuration
-       dbg("sending config");
-       send_packet(dev, alloc_packet(&dev->ep[0], 1, &dev->configuration),
-                   0);
-       return STATUS_STAGE;
-}
-
-static ep0_stage_t
-do_set_configuration(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       // set active config to low-byte of setup->wValue
-       dev->configuration = le16_to_cpu(setup->wValue) & 0xff;
-       dbg("set config, config=%d", dev->configuration);
-       if (!dev->configuration && dev->state > DEFAULT) {
-               dev->state = ADDRESS;
-               /* inform function layer of usbdev state change */
-               dev->func_cb(CB_NEW_STATE, dev->state, dev->cb_data);
-       } else if (dev->configuration == 1) {
-               dev->state = CONFIGURED;
-               /* inform function layer of usbdev state change */
-               dev->func_cb(CB_NEW_STATE, dev->state, dev->cb_data);
-       } else {
-               // FIXME: "respond with request error" - how?
-       }
-
-       return SETUP_STAGE;
-}
-
-static ep0_stage_t
-do_get_interface(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-               // interface must be zero.
-       if ((le16_to_cpu(setup->wIndex) & 0xff) || dev->state == ADDRESS) {
-                       // FIXME: respond with "request error". how?
-       } else if (dev->state == CONFIGURED) {
-               // send dev->alternate_setting
-                       dbg("sending alt setting");
-               send_packet(dev, alloc_packet(&dev->ep[0], 1,
-                                             &dev->alternate_setting), 0);
-               }
-
-       return STATUS_STAGE;
-
-}
-
-static ep0_stage_t
-do_set_interface(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       if (dev->state == ADDRESS) {
-                       // FIXME: respond with "request error". how?
-       } else if (dev->state == CONFIGURED) {
-               dev->interface = le16_to_cpu(setup->wIndex) & 0xff;
-               dev->alternate_setting =
-                           le16_to_cpu(setup->wValue) & 0xff;
-                       // interface and alternate_setting must be zero
-               if (dev->interface || dev->alternate_setting) {
-                               // FIXME: respond with "request error". how?
-                       }
-               }
-
-       return SETUP_STAGE;
-}
-
-static ep0_stage_t
-do_synch_frame(struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       // TODO
-       return SETUP_STAGE;
-}
-
-typedef ep0_stage_t (*req_method_t)(struct usb_dev* dev,
-                                   struct usb_ctrlrequest* setup);
-
-
-/* Table of the standard device request handlers */
-static const req_method_t req_method[] = {
-       do_get_status,
-       do_clear_feature,
-       do_reserved,
-       do_set_feature,
-       do_reserved,
-       do_set_address,
-       do_get_descriptor,
-       do_set_descriptor,
-       do_get_configuration,
-       do_set_configuration,
-       do_get_interface,
-       do_set_interface,
-       do_synch_frame
-};
-
-
-// SETUP packet request dispatcher
-static void
-do_setup (struct usb_dev* dev, struct usb_ctrlrequest* setup)
-{
-       req_method_t m;
-
-       dbg("%s: req %d %s", __FUNCTION__, setup->bRequestType,
-           get_std_req_name(setup->bRequestType));
-
-       if ((setup->bRequestType & USB_TYPE_MASK) != USB_TYPE_STANDARD ||
-           (setup->bRequestType & USB_RECIP_MASK) != USB_RECIP_DEVICE) {
-               err("%s: invalid requesttype 0x%02x", __FUNCTION__,
-                   setup->bRequestType);
-               return;
-               }
-
-       if ((setup->bRequestType & 0x80) == USB_DIR_OUT && setup->wLength)
-               dbg("%s: OUT phase! length=%d", __FUNCTION__, setup->wLength);
-
-       if (setup->bRequestType < sizeof(req_method)/sizeof(req_method_t))
-               m = req_method[setup->bRequestType];
-                       else
-               m = do_reserved;
-
-       dev->ep0_stage = (*m)(dev, setup);
-}
-
-/*
- * A SETUP, DATA0, or DATA1 packet has been received
- * on the default control endpoint's fifo.
- */
-static void
-process_ep0_receive (struct usb_dev* dev)
-{
-       endpoint_t *ep0 = &dev->ep[0];
-       usbdev_pkt_t *pkt;
-
-       spin_lock(&ep0->lock);
-
-               // complete packet and prepare a new packet
-       pkt = receive_packet_complete(ep0);
-       if (!pkt) {
-               // FIXME: should  put a warn/err here.
-               spin_unlock(&ep0->lock);
-                       return;
-               }
-
-       // unlink immediately from endpoint.
-       unlink_head(&ep0->outlist);
-
-       // override current stage if h/w says it's a setup packet
-       if (pkt->status & PKT_STATUS_SU)
-               dev->ep0_stage = SETUP_STAGE;
-
-       switch (dev->ep0_stage) {
-       case SETUP_STAGE:
-               vdbg("SU bit is %s in setup stage",
-                    (pkt->status & PKT_STATUS_SU) ? "set" : "not set");
-
-                       if (pkt->size == sizeof(struct usb_ctrlrequest)) {
-#ifdef VDEBUG
-                       if (pkt->status & PKT_STATUS_ACK)
-                               vdbg("received SETUP");
-                               else
-                               vdbg("received NAK SETUP");
-#endif
-                       do_setup(dev, (struct usb_ctrlrequest*)pkt->payload);
-               } else
-                       err("%s: wrong size SETUP received", __FUNCTION__);
-               break;
-       case DATA_STAGE:
-               /*
-                * this setup has an OUT data stage. Of the standard
-                * device requests, only set_descriptor has this stage,
-                * so this packet is that descriptor. TODO: drop it for
-                * now, set_descriptor not implemented.
-                *
-                * Need to place a byte in the write FIFO here, to prepare
-                * to send a zero-length DATA ack packet to the host in the
-                * STATUS stage.
-                */
-               au_writel(0, ep0->reg->write_fifo);
-               dbg("received OUT stage DATAx on EP0, size=%d", pkt->size);
-               dev->ep0_stage = SETUP_STAGE;
-               break;
-       case STATUS_STAGE:
-               // this setup had an IN data stage, and host is ACK'ing
-               // the packet we sent during that stage.
-               if (pkt->size != 0)
-                       warn("received non-zero ACK on EP0??");
-#ifdef VDEBUG
-               else
-                       vdbg("received ACK on EP0");
-#endif
-               dev->ep0_stage = SETUP_STAGE;
-               break;
-       }
-
-       spin_unlock(&ep0->lock);
-       // we're done processing the packet, free it
-       kfree(pkt);
-}
-
-
-/*
- * A DATA0/1 packet has been received on one of the OUT endpoints (4 or 5)
- */
-static void
-process_ep_receive (struct usb_dev* dev, endpoint_t *ep)
-{
-       usbdev_pkt_t *pkt;
-
-               spin_lock(&ep->lock);
-       pkt = receive_packet_complete(ep);
-               spin_unlock(&ep->lock);
-
-       dev->func_cb(CB_PKT_COMPLETE, (unsigned long)pkt, dev->cb_data);
-}
-
-
-
-/* This ISR handles the receive complete and suspend events */
-static void req_sus_intr (int irq, void *dev_id)
-{
-       struct usb_dev *dev = (struct usb_dev *) dev_id;
-       u32 status;
-
-       status = au_readl(USBD_INTSTAT);
-       au_writel(status, USBD_INTSTAT);        // ack'em
-
-       if (status & (1<<0))
-               process_ep0_receive(dev);
-       if (status & (1<<4))
-               process_ep_receive(dev, &dev->ep[4]);
-       if (status & (1<<5))
-               process_ep_receive(dev, &dev->ep[5]);
-}
-
-
-/* This ISR handles the DMA done events on EP0 */
-static void dma_done_ep0_intr(int irq, void *dev_id)
-{
-       struct usb_dev *dev = (struct usb_dev *) dev_id;
-       usbdev_pkt_t* pkt;
-       endpoint_t *ep0 = &dev->ep[0];
-       u32 cs0, buff_done;
-
-       spin_lock(&ep0->lock);
-       cs0 = au_readl(ep0->reg->ctrl_stat);
-
-       // first check packet transmit done
-       if ((buff_done = get_dma_buffer_done(ep0->indma)) != 0) {
-               // transmitted a DATAx packet during DATA stage
-               // on control endpoint 0
-               // clear DMA done bit
-               if (buff_done & DMA_D0)
-                       clear_dma_done0(ep0->indma);
-               if (buff_done & DMA_D1)
-                       clear_dma_done1(ep0->indma);
-
-               pkt = send_packet_complete(ep0);
-               kfree(pkt);
-       }
-
-       /*
-        * Now check packet receive done. Shouldn't get these,
-        * the receive packet complete intr should happen
-        * before the DMA done intr occurs.
-        */
-       if ((buff_done = get_dma_buffer_done(ep0->outdma)) != 0) {
-               // clear DMA done bit
-               if (buff_done & DMA_D0)
-                       clear_dma_done0(ep0->outdma);
-               if (buff_done & DMA_D1)
-                       clear_dma_done1(ep0->outdma);
-
-               //process_ep0_receive(dev);
-       }
-
-       spin_unlock(&ep0->lock);
-}
-
-/* This ISR handles the DMA done events on endpoints 2,3,4,5 */
-static void dma_done_ep_intr(int irq, void *dev_id)
-{
-       struct usb_dev *dev = (struct usb_dev *) dev_id;
-       int i;
-
-       for (i = 2; i < 6; i++) {
-       u32 buff_done;
-               usbdev_pkt_t* pkt;
-               endpoint_t *ep = &dev->ep[i];
-
-               if (!ep->active) continue;
-
-       spin_lock(&ep->lock);
-
-               if (ep->direction == USB_DIR_IN) {
-                       buff_done = get_dma_buffer_done(ep->indma);
-                       if (buff_done != 0) {
-                               // transmitted a DATAx pkt on the IN ep
-               // clear DMA done bit
-               if (buff_done & DMA_D0)
-                       clear_dma_done0(ep->indma);
-               if (buff_done & DMA_D1)
-                       clear_dma_done1(ep->indma);
-
-                               pkt = send_packet_complete(ep);
-
-                               spin_unlock(&ep->lock);
-                               dev->func_cb(CB_PKT_COMPLETE,
-                                            (unsigned long)pkt,
-                                            dev->cb_data);
-                               spin_lock(&ep->lock);
-                       }
-               } else {
-       /*
-                        * Check packet receive done (OUT ep). Shouldn't get
-                        * these, the rx packet complete intr should happen
-        * before the DMA done intr occurs.
-        */
-                       buff_done = get_dma_buffer_done(ep->outdma);
-                       if (buff_done != 0) {
-                               // received a DATAx pkt on the OUT ep
-               // clear DMA done bit
-               if (buff_done & DMA_D0)
-                       clear_dma_done0(ep->outdma);
-               if (buff_done & DMA_D1)
-                       clear_dma_done1(ep->outdma);
-
-                               //process_ep_receive(dev, ep);
-       }
-       }
-
-               spin_unlock(&ep->lock);
-       }
-}
-
-
-/***************************************************************************
- * Here begins the external interface functions
- ***************************************************************************
- */
-
-/*
- * allocate a new packet
- */
-int
-usbdev_alloc_packet(int ep_addr, int data_size, usbdev_pkt_t** pkt)
-{
-       endpoint_t * ep = epaddr_to_ep(&usbdev, ep_addr);
-       usbdev_pkt_t* lpkt = NULL;
-
-       if (!ep || !ep->active || ep->address < 2)
-               return -ENODEV;
-       if (data_size > ep->max_pkt_size)
-               return -EINVAL;
-
-       lpkt = *pkt = alloc_packet(ep, data_size, NULL);
-       if (!lpkt)
-               return -ENOMEM;
-       return 0;
-}
-
-
-/*
- * packet send
- */
-int
-usbdev_send_packet(int ep_addr, usbdev_pkt_t * pkt)
-{
-       unsigned long flags;
-       int count;
-       endpoint_t * ep;
-
-       if (!pkt || !(ep = epaddr_to_ep(&usbdev, pkt->ep_addr)) ||
-           !ep->active || ep->address < 2)
-               return -ENODEV;
-       if (ep->direction != USB_DIR_IN)
-               return -EINVAL;
-
-       spin_lock_irqsave(&ep->lock, flags);
-       count = send_packet(&usbdev, pkt, 1);
-       spin_unlock_irqrestore(&ep->lock, flags);
-
-       return count;
-}
-
-/*
- * packet receive
- */
-int
-usbdev_receive_packet(int ep_addr, usbdev_pkt_t** pkt)
-{
-       unsigned long flags;
-       usbdev_pkt_t* lpkt = NULL;
-       endpoint_t *ep = epaddr_to_ep(&usbdev, ep_addr);
-
-       if (!ep || !ep->active || ep->address < 2)
-               return -ENODEV;
-       if (ep->direction != USB_DIR_OUT)
-               return -EINVAL;
-
-       spin_lock_irqsave(&ep->lock, flags);
-       if (ep->outlist.count > 1)
-               lpkt = unlink_head(&ep->outlist);
-       spin_unlock_irqrestore(&ep->lock, flags);
-
-       if (!lpkt) {
-               /* no packet available */
-               *pkt = NULL;
-               return -ENODATA;
-       }
-
-       *pkt = lpkt;
-
-       return lpkt->size;
-}
-
-
-/*
- * return total queued byte count on the endpoint.
- */
-int
-usbdev_get_byte_count(int ep_addr)
-{
-        unsigned long flags;
-        pkt_list_t *list;
-        usbdev_pkt_t *scan;
-        int count = 0;
-       endpoint_t * ep = epaddr_to_ep(&usbdev, ep_addr);
-
-       if (!ep || !ep->active || ep->address < 2)
-               return -ENODEV;
-
-       if (ep->direction == USB_DIR_IN) {
-               list = &ep->inlist;
-
-               spin_lock_irqsave(&ep->lock, flags);
-               for (scan = list->head; scan; scan = scan->next)
-                       count += scan->size;
-               spin_unlock_irqrestore(&ep->lock, flags);
-       } else {
-               list = &ep->outlist;
-
-               spin_lock_irqsave(&ep->lock, flags);
-               if (list->count > 1) {
-                       for (scan = list->head; scan != list->tail;
-                            scan = scan->next)
-                               count += scan->size;
-       }
-               spin_unlock_irqrestore(&ep->lock, flags);
-       }
-
-       return count;
-}
-
-
-void
-usbdev_exit(void)
-{
-       endpoint_t *ep;
-       int i;
-
-       au_writel(0, USBD_INTEN);       // disable usb dev ints
-       au_writel(0, USBD_ENABLE);      // disable usb dev
-
-       free_irq(AU1000_USB_DEV_REQ_INT, &usbdev);
-       free_irq(AU1000_USB_DEV_SUS_INT, &usbdev);
-
-       // free all control endpoint resources
-       ep = &usbdev.ep[0];
-       free_au1000_dma(ep->indma);
-       free_au1000_dma(ep->outdma);
-       endpoint_flush(ep);
-
-       // free ep resources
-       for (i = 2; i < 6; i++) {
-               ep = &usbdev.ep[i];
-               if (!ep->active) continue;
-
-               if (ep->direction == USB_DIR_IN) {
-                       free_au1000_dma(ep->indma);
-               } else {
-               free_au1000_dma(ep->outdma);
-               }
-               endpoint_flush(ep);
-       }
-
-       kfree(usbdev.full_conf_desc);
-}
-
-int
-usbdev_init(struct usb_device_descriptor* dev_desc,
-           struct usb_config_descriptor* config_desc,
-           struct usb_interface_descriptor* if_desc,
-           struct usb_endpoint_descriptor* ep_desc,
-           struct usb_string_descriptor* str_desc[],
-           void (*cb)(usbdev_cb_type_t, unsigned long, void *),
-           void* cb_data)
-{
-       endpoint_t *ep0;
-       int i, ret=0;
-       u8* fcd;
-
-       if (dev_desc->bNumConfigurations > 1 ||
-           config_desc->bNumInterfaces > 1 ||
-           if_desc->bNumEndpoints > 4) {
-               err("Only one config, one i/f, and no more "
-                   "than 4 ep's allowed");
-               ret = -EINVAL;
-               goto out;
-       }
-
-       if (!cb) {
-               err("Function-layer callback required");
-               ret = -EINVAL;
-               goto out;
-       }
-
-       if (dev_desc->bMaxPacketSize0 != USBDEV_EP0_MAX_PACKET_SIZE) {
-               warn("EP0 Max Packet size must be %d",
-                    USBDEV_EP0_MAX_PACKET_SIZE);
-               dev_desc->bMaxPacketSize0 = USBDEV_EP0_MAX_PACKET_SIZE;
-       }
-
-       memset(&usbdev, 0, sizeof(struct usb_dev));
-
-       usbdev.state = DEFAULT;
-       usbdev.dev_desc = dev_desc;
-       usbdev.if_desc = if_desc;
-       usbdev.conf_desc = config_desc;
-       for (i=0; i<6; i++)
-               usbdev.str_desc[i] = str_desc[i];
-       usbdev.func_cb = cb;
-       usbdev.cb_data = cb_data;
-
-       /* Initialize default control endpoint */
-       ep0 = &usbdev.ep[0];
-       ep0->active = 1;
-       ep0->type = CONTROL_EP;
-       ep0->max_pkt_size = USBDEV_EP0_MAX_PACKET_SIZE;
-       spin_lock_init(&ep0->lock);
-       ep0->desc = NULL;       // ep0 has no descriptor
-       ep0->address = 0;
-       ep0->direction = 0;
-       ep0->reg = &ep_reg[0];
-
-       /* Initialize the other requested endpoints */
-       for (i = 0; i < if_desc->bNumEndpoints; i++) {
-               struct usb_endpoint_descriptor* epd = &ep_desc[i];
-       endpoint_t *ep;
-
-               if ((epd->bEndpointAddress & 0x80) == USB_DIR_IN) {
-                       ep = &usbdev.ep[2];
-                       ep->address = 2;
-                       if (ep->active) {
-                               ep = &usbdev.ep[3];
-                               ep->address = 3;
-                               if (ep->active) {
-                                       err("too many IN ep's requested");
-                                       ret = -ENODEV;
-                                       goto out;
-       }
-       }
-               } else {
-                       ep = &usbdev.ep[4];
-                       ep->address = 4;
-                       if (ep->active) {
-                               ep = &usbdev.ep[5];
-                               ep->address = 5;
-                               if (ep->active) {
-                                       err("too many OUT ep's requested");
-                                       ret = -ENODEV;
-                                       goto out;
-       }
-       }
-               }
-
-               ep->active = 1;
-               epd->bEndpointAddress &= ~0x0f;
-               epd->bEndpointAddress |= (u8)ep->address;
-               ep->direction = epd->bEndpointAddress & 0x80;
-               ep->type = epd->bmAttributes & 0x03;
-               ep->max_pkt_size = le16_to_cpu(epd->wMaxPacketSize);
-               spin_lock_init(&ep->lock);
-               ep->desc = epd;
-               ep->reg = &ep_reg[ep->address];
-               }
-
-       /*
-        * initialize the full config descriptor
-        */
-       usbdev.full_conf_desc = fcd = kmalloc(le16_to_cpu(config_desc->wTotalLength),
-                                             ALLOC_FLAGS);
-       if (!fcd) {
-               err("failed to alloc full config descriptor");
-               ret = -ENOMEM;
-               goto out;
-       }
-
-       memcpy(fcd, config_desc, USB_DT_CONFIG_SIZE);
-       fcd += USB_DT_CONFIG_SIZE;
-       memcpy(fcd, if_desc, USB_DT_INTERFACE_SIZE);
-       fcd += USB_DT_INTERFACE_SIZE;
-       for (i = 0; i < if_desc->bNumEndpoints; i++) {
-               memcpy(fcd, &ep_desc[i], USB_DT_ENDPOINT_SIZE);
-               fcd += USB_DT_ENDPOINT_SIZE;
-       }
-
-       /* Now we're ready to enable the controller */
-       au_writel(0x0002, USBD_ENABLE);
-       udelay(100);
-       au_writel(0x0003, USBD_ENABLE);
-       udelay(100);
-
-       /* build and send config table based on ep descriptors */
-       for (i = 0; i < 6; i++) {
-               endpoint_t *ep;
-               if (i == 1)
-                       continue; // skip dummy ep
-               ep = &usbdev.ep[i];
-               if (ep->active) {
-                       au_writel((ep->address << 4) | 0x04, USBD_CONFIG);
-                       au_writel(((ep->max_pkt_size & 0x380) >> 7) |
-                                 (ep->direction >> 4) | (ep->type << 4),
-                                 USBD_CONFIG);
-                       au_writel((ep->max_pkt_size & 0x7f) << 1, USBD_CONFIG);
-                       au_writel(0x00, USBD_CONFIG);
-                       au_writel(ep->address, USBD_CONFIG);
-               } else {
-                       u8 dir = (i==2 || i==3) ? DIR_IN : DIR_OUT;
-                       au_writel((i << 4) | 0x04, USBD_CONFIG);
-                       au_writel(((16 & 0x380) >> 7) | dir |
-                                 (BULK_EP << 4), USBD_CONFIG);
-                       au_writel((16 & 0x7f) << 1, USBD_CONFIG);
-                       au_writel(0x00, USBD_CONFIG);
-                       au_writel(i, USBD_CONFIG);
-               }
-       }
-
-       /*
-        * Enable Receive FIFO Complete interrupts only. Transmit
-        * complete is being handled by the DMA done interrupts.
-        */
-       au_writel(0x31, USBD_INTEN);
-
-       /*
-        * Controller is now enabled, request DMA and IRQ
-        * resources.
-        */
-
-       /* request the USB device transfer complete interrupt */
-       if (request_irq(AU1000_USB_DEV_REQ_INT, req_sus_intr, IRQF_DISABLED,
-                       "USBdev req", &usbdev)) {
-               err("Can't get device request intr");
-               ret = -ENXIO;
-               goto out;
-       }
-       /* request the USB device suspend interrupt */
-       if (request_irq(AU1000_USB_DEV_SUS_INT, req_sus_intr, IRQF_DISABLED,
-                       "USBdev sus", &usbdev)) {
-               err("Can't get device suspend intr");
-               ret = -ENXIO;
-               goto out;
-       }
-
-       /* Request EP0 DMA and IRQ */
-       if ((ep0->indma = request_au1000_dma(ep_dma_id[0].id,
-                                            ep_dma_id[0].str,
-                                            dma_done_ep0_intr,
-                                            IRQF_DISABLED,
-                                            &usbdev)) < 0) {
-               err("Can't get %s DMA", ep_dma_id[0].str);
-               ret = -ENXIO;
-               goto out;
-       }
-       if ((ep0->outdma = request_au1000_dma(ep_dma_id[1].id,
-                                             ep_dma_id[1].str,
-                                             NULL, 0, NULL)) < 0) {
-               err("Can't get %s DMA", ep_dma_id[1].str);
-               ret = -ENXIO;
-               goto out;
-       }
-
-       // Flush the ep0 buffers and FIFOs
-       endpoint_flush(ep0);
-       // start packet reception on ep0
-       kickstart_receive_packet(ep0);
-
-       /* Request DMA and IRQ for the other endpoints */
-       for (i = 2; i < 6; i++) {
-               endpoint_t *ep = &usbdev.ep[i];
-               if (!ep->active)
-                       continue;
-
-               // Flush the endpoint buffers and FIFOs
-               endpoint_flush(ep);
-
-               if (ep->direction == USB_DIR_IN) {
-                       ep->indma =
-                               request_au1000_dma(ep_dma_id[ep->address].id,
-                                                  ep_dma_id[ep->address].str,
-                                                  dma_done_ep_intr,
-                                                  IRQF_DISABLED,
-                                                  &usbdev);
-                       if (ep->indma < 0) {
-                               err("Can't get %s DMA",
-                                   ep_dma_id[ep->address].str);
-                               ret = -ENXIO;
-                               goto out;
-                       }
-               } else {
-                       ep->outdma =
-                               request_au1000_dma(ep_dma_id[ep->address].id,
-                                                  ep_dma_id[ep->address].str,
-                                                  NULL, 0, NULL);
-                       if (ep->outdma < 0) {
-                               err("Can't get %s DMA",
-                                   ep_dma_id[ep->address].str);
-                               ret = -ENXIO;
-                               goto out;
-                       }
-
-                       // start packet reception on OUT endpoint
-                       kickstart_receive_packet(ep);
-               }
-       }
-
- out:
-       if (ret)
-               usbdev_exit();
-       return ret;
-}
-
-EXPORT_SYMBOL(usbdev_init);
-EXPORT_SYMBOL(usbdev_exit);
-EXPORT_SYMBOL(usbdev_alloc_packet);
-EXPORT_SYMBOL(usbdev_receive_packet);
-EXPORT_SYMBOL(usbdev_send_packet);
-EXPORT_SYMBOL(usbdev_get_byte_count);
index 7a79293..8b08edb 100644 (file)
@@ -58,11 +58,6 @@ void __init board_setup(void)
 
        pin_func = 0;
        /* not valid for 1550 */
-#ifdef CONFIG_AU1X00_USB_DEVICE
-       // 2nd USB port is USB device
-       pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
-       au_writel(pin_func, SYS_PINFUNC);
-#endif
 
 #if defined(CONFIG_IRDA) && (defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1100))
        /* set IRFIRSEL instead of GPIO15 */
index e917e54..13f9bf5 100644 (file)
@@ -51,15 +51,11 @@ void board_reset (void)
 
 void __init board_setup(void)
 {
-#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
-#ifdef CONFIG_AU1X00_USB_DEVICE
-       // 2nd USB port is USB device
-       au_writel(au_readl(SYS_PINFUNC) & (u32)(~0x8000), SYS_PINFUNC);
-#endif
+#ifdef CONFIG_USB_OHCI
        // enable USB power switch
        au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
        au_writel( 0x100000, GPIO2_OUTPUT );
-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
+#endif // defined (CONFIG_USB_OHCI)
 
 #ifdef CONFIG_PCI
 #if defined(__MIPSEB__)
index 1cf18e1..824cfaf 100644 (file)
@@ -54,7 +54,7 @@ void __init board_setup(void)
        au_writel(0, SYS_PINSTATERD);
        udelay(100);
 
-#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
+#ifdef CONFIG_USB_OHCI
        /* zero and disable FREQ2 */
        sys_freqctrl = au_readl(SYS_FREQCTRL0);
        sys_freqctrl &= ~0xFFF00000;
@@ -104,23 +104,19 @@ void __init board_setup(void)
         */
 #ifdef CONFIG_USB_OHCI
        sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
-#endif
-#ifdef CONFIG_AU1X00_USB_DEVICE
-       sys_clksrc |= ((4<<7) | (0<<6) | (0<<5));
 #endif
        au_writel(sys_clksrc, SYS_CLKSRC);
 
        // configure pins GPIO[14:9] as GPIO
        pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8080);
 
-#ifndef CONFIG_AU1X00_USB_DEVICE
        // 2nd USB port is USB host
        pin_func |= 0x8000;
-#endif
+
        au_writel(pin_func, SYS_PINFUNC);
        au_writel(0x2800, SYS_TRIOUTCLR);
        au_writel(0x0030, SYS_OUTPUTCLR);
-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
+#endif // defined (CONFIG_USB_OHCI)
 
        // make gpio 15 an input (for interrupt line)
        pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x100);
index db27b93..2d1533f 100644 (file)
@@ -55,7 +55,7 @@ void __init board_setup(void)
        au_writel(0, SYS_PININPUTEN);
        udelay(100);
 
-#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
+#ifdef CONFIG_USB_OHCI
        // configure pins GPIO[14:9] as GPIO
        pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x80);
 
@@ -92,12 +92,10 @@ void __init board_setup(void)
 
        // get USB Functionality pin state (device vs host drive pins)
        pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
-#ifndef CONFIG_AU1X00_USB_DEVICE
        // 2nd USB port is USB host
        pin_func |= 0x8000;
-#endif
        au_writel(pin_func, SYS_PINFUNC);
-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
+#endif // defined (CONFIG_USB_OHCI)
 
        /* Enable sys bus clock divider when IDLE state or no bus activity. */
        au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
index 1a9a293..0ffdb4f 100644 (file)
@@ -56,7 +56,7 @@ void __init board_setup(void)
        au_writel(0, SYS_PINSTATERD);
        udelay(100);
 
-#if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
+#ifdef CONFIG_USB_OHCI
 
        /* GPIO201 is input for PCMCIA card detect */
        /* GPIO203 is input for PCMCIA interrupt request */
@@ -87,20 +87,15 @@ void __init board_setup(void)
         */
 #ifdef CONFIG_USB_OHCI
        sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
-#endif
-#ifdef CONFIG_AU1X00_USB_DEVICE
-       sys_clksrc |= ((4<<7) | (0<<6) | (0<<5));
 #endif
        au_writel(sys_clksrc, SYS_CLKSRC);
 
 
        pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
-#ifndef CONFIG_AU1X00_USB_DEVICE
        // 2nd USB port is USB host
        pin_func |= 0x8000;
-#endif
        au_writel(pin_func, SYS_PINFUNC);
-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
+#endif // defined (CONFIG_USB_OHCI)
 
 
 
index 741f825..9e672f6 100644 (file)
@@ -76,7 +76,6 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_SOC_AU1100=y
 CONFIG_SOC_AU1X00=y
 CONFIG_SWAP_IO_SPACE=y
-# CONFIG_AU1X00_USB_DEVICE is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 #
index 8576340..d0c0f4a 100644 (file)
@@ -75,7 +75,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_SOC_AU1500=y
 CONFIG_SOC_AU1X00=y
-# CONFIG_AU1X00_USB_DEVICE is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
 #
index 55d60d5..31dd47d 100644 (file)
 handle_it:
                LONG_L  s0, TI_REGS($28)
                LONG_S  sp, TI_REGS($28)
-               jal     do_IRQ
-               LONG_S  s0, TI_REGS($28)
-
-               j       ret_from_irq
+               PTR_LA  ra, ret_from_irq
+               j       do_IRQ
                 nop
 
 #ifdef CONFIG_32BIT
@@ -279,9 +277,8 @@ fpu:
 #endif
 
 spurious:
-               jal     spurious_interrupt
-                nop
-               j       ret_from_irq
+               PTR_LA  ra, _ret_from_irq
+               j       spurious_interrupt
                 nop
                END(plat_irq_dispatch)
 
index 9fbf843..8485af3 100644 (file)
@@ -135,7 +135,6 @@ static inline void check_wait(void)
        case CPU_R5000:
        case CPU_NEVADA:
        case CPU_RM7000:
-       case CPU_RM9000:
        case CPU_4KC:
        case CPU_4KEC:
        case CPU_4KSC:
@@ -164,6 +163,14 @@ static inline void check_wait(void)
                } else
                        printk(" unavailable.\n");
                break;
+       case CPU_RM9000:
+               if ((c->processor_id & 0x00ff) >= 0x40) {
+                       cpu_wait = r4k_wait;
+                       printk(" available.\n");
+               } else {
+                       printk(" unavailable.\n");
+               }
+               break;
        default:
                printk(" unavailable.\n");
                break;
index e93e43e..417c08a 100644 (file)
 #include <asm/mipsmtregs.h>
 #endif
 
-#ifdef CONFIG_PREEMPT
-       .macro  preempt_stop
-       .endm
-#else
+#ifndef CONFIG_PREEMPT
        .macro  preempt_stop
        local_irq_disable
        .endm
 
        .text
        .align  5
+FEXPORT(ret_from_irq)
+       LONG_S  s0, TI_REGS($28)
+#ifdef CONFIG_PREEMPT
+FEXPORT(ret_from_exception)
+#else
+       b       _ret_from_irq
 FEXPORT(ret_from_exception)
        preempt_stop
-FEXPORT(ret_from_irq)
+#endif
+FEXPORT(_ret_from_irq)
        LONG_L  t0, PT_STATUS(sp)               # returning to kernel mode?
        andi    t0, t0, KU_USER
        beqz    t0, resume_kernel
index 50ed772..5baca16 100644 (file)
@@ -133,9 +133,8 @@ NESTED(handle_int, PT_SIZE, sp)
 
        LONG_L  s0, TI_REGS($28)
        LONG_S  sp, TI_REGS($28)
-       jal     plat_irq_dispatch
-       LONG_S  s0, TI_REGS($28)
-       j       ret_from_irq
+       PTR_LA  ra, ret_from_irq
+       j       plat_irq_dispatch
        END(handle_int)
 
        __INIT
@@ -224,9 +223,8 @@ NESTED(except_vec_vi_handler, 0, sp)
 
        LONG_L  s0, TI_REGS($28)
        LONG_S  sp, TI_REGS($28)
-       jalr    v0
-       LONG_S  s0, TI_REGS($28)
        PTR_LA  ra, ret_from_irq
+       jr      v0
        END(except_vec_vi_handler)
 
 /*
index 46ee5a6..4ed37ba 100644 (file)
@@ -107,7 +107,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 
        seq_printf(m, "processor\t\t: %ld\n", n);
        sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
-               cpu_has_fpu ? "  FPU V%d.%d" : "");
+               cpu_data[n].options & MIPS_CPU_FPU ? "  FPU V%d.%d" : "");
        seq_printf(m, fmt, cpu_name[cpu_data[n].cputype <= CPU_LAST ?
                                    cpu_data[n].cputype : CPU_UNKNOWN],
                                   (version >> 4) & 0x0f, version & 0x0f,
index 045d987..9f307eb 100644 (file)
@@ -115,7 +115,7 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
        status |= KU_USER;
        regs->cp0_status = status;
        clear_used_math();
-       lose_fpu();
+       clear_fpu_owner();
        if (cpu_has_dsp)
                __init_dsp();
        regs->cp0_epc = pc;
index 362d172..258d74f 100644 (file)
@@ -106,6 +106,7 @@ int ptrace_setregs (struct task_struct *child, __s64 __user *data)
 int ptrace_getfpregs (struct task_struct *child, __u32 __user *data)
 {
        int i;
+       unsigned int tmp;
 
        if (!access_ok(VERIFY_WRITE, data, 33 * 8))
                return -EIO;
@@ -121,10 +122,10 @@ int ptrace_getfpregs (struct task_struct *child, __u32 __user *data)
 
        __put_user (child->thread.fpu.fcr31, data + 64);
 
+       preempt_disable();
        if (cpu_has_fpu) {
-               unsigned int flags, tmp;
+               unsigned int flags;
 
-               preempt_disable();
                if (cpu_has_mipsmt) {
                        unsigned int vpflags = dvpe();
                        flags = read_c0_status();
@@ -138,11 +139,11 @@ int ptrace_getfpregs (struct task_struct *child, __u32 __user *data)
                        __asm__ __volatile__("cfc1\t%0,$0" : "=r" (tmp));
                        write_c0_status(flags);
                }
-               preempt_enable();
-               __put_user (tmp, data + 65);
        } else {
-               __put_user ((__u32) 0, data + 65);
+               tmp = 0;
        }
+       preempt_enable();
+       __put_user (tmp, data + 65);
 
        return 0;
 }
@@ -245,16 +246,17 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                        unsigned int mtflags;
 #endif /* CONFIG_MIPS_MT_SMTC */
 
-                       if (!cpu_has_fpu)
+                       preempt_disable();
+                       if (!cpu_has_fpu) {
+                               preempt_enable();
                                break;
+                       }
 
 #ifdef CONFIG_MIPS_MT_SMTC
                        /* Read-modify-write of Status must be atomic */
                        local_irq_save(irqflags);
                        mtflags = dmt();
 #endif /* CONFIG_MIPS_MT_SMTC */
-
-                       preempt_disable();
                        if (cpu_has_mipsmt) {
                                unsigned int vpflags = dvpe();
                                flags = read_c0_status();
index f40ecd8..d9a39c1 100644 (file)
@@ -175,7 +175,9 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
                        unsigned int mtflags;
 #endif /* CONFIG_MIPS_MT_SMTC */
 
+                       preempt_disable();
                        if (!cpu_has_fpu) {
+                               preempt_enable();
                                tmp = 0;
                                break;
                        }
@@ -186,7 +188,6 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
                        mtflags = dmt();
 #endif /* CONFIG_MIPS_MT_SMTC */
 
-                       preempt_disable();
                        if (cpu_has_mipsmt) {
                                unsigned int vpflags = dvpe();
                                flags = read_c0_status();
index 2218958..1af3612 100644 (file)
@@ -467,14 +467,18 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
 
 static int __init topology_init(void)
 {
-       int cpu;
-       int ret;
+       int i, ret;
 
-       for_each_present_cpu(cpu) {
-               ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu);
+#ifdef CONFIG_NUMA
+       for_each_online_node(i)
+               register_one_node(i);
+#endif /* CONFIG_NUMA */
+
+       for_each_present_cpu(i) {
+               ret = register_cpu(&per_cpu(cpu_devices, i), i);
                if (ret)
                        printk(KERN_WARNING "topology_init: register_cpu %d "
-                              "failed (%d)\n", cpu, ret);
+                              "failed (%d)\n", i, ret);
        }
 
        return 0;
index 76cb31d..1cb9441 100644 (file)
@@ -97,15 +97,12 @@ FEXPORT(__smtc_ipi_vector)
        SAVE_ALL
        CLI
        TRACE_IRQS_OFF
-       move    a0,sp
        /* Function to be invoked passed stack pad slot 5 */
        lw      t0,PT_PADSLOT5(sp)
        /* Argument from sender passed in stack pad slot 4 */
-       lw      a1,PT_PADSLOT4(sp)
-       jalr    t0
-       nop
-       j       ret_from_irq
-       nop
+       lw      a0,PT_PADSLOT4(sp)
+       PTR_LA  ra, _ret_from_irq
+       jr      t0
 
 /*
  * Called from idle loop to provoke processing of queued IPIs
index b7292a5..cce8313 100644 (file)
@@ -66,7 +66,7 @@ extern asmlinkage void handle_mcheck(void);
 extern asmlinkage void handle_reserved(void);
 
 extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
-       struct mips_fpu_struct *ctx);
+       struct mips_fpu_struct *ctx, int has_fpu);
 
 void (*board_be_init)(void);
 int (*board_be_handler)(struct pt_regs *regs, int is_fixup);
@@ -641,7 +641,7 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
                preempt_enable();
 
                /* Run the emulator */
-               sig = fpu_emulator_cop1Handler (regs, &current->thread.fpu);
+               sig = fpu_emulator_cop1Handler (regs, &current->thread.fpu, 1);
 
                preempt_disable();
 
@@ -791,11 +791,13 @@ asmlinkage void do_cpu(struct pt_regs *regs)
                        set_used_math();
                }
 
-               preempt_enable();
-
-               if (!cpu_has_fpu) {
-                       int sig = fpu_emulator_cop1Handler(regs,
-                                               &current->thread.fpu);
+               if (cpu_has_fpu) {
+                       preempt_enable();
+               } else {
+                       int sig;
+                       preempt_enable();
+                       sig = fpu_emulator_cop1Handler(regs,
+                                               &current->thread.fpu, 0);
                        if (sig)
                                force_sig(sig, current);
 #ifdef CONFIG_MIPS_MT_FPAFF
index 3f0d5d2..80531b3 100644 (file)
@@ -38,8 +38,6 @@
 
 #include <asm/inst.h>
 #include <asm/bootinfo.h>
-#include <asm/cpu.h>
-#include <asm/cpu-features.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/signal.h>
@@ -1233,7 +1231,8 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
        return 0;
 }
 
-int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx)
+int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
+       int has_fpu)
 {
        unsigned long oldepc, prevepc;
        mips_instruction insn;
@@ -1263,7 +1262,7 @@ int fpu_emulator_cop1Handler(struct pt_regs *xcp, struct mips_fpu_struct *ctx)
                        ieee754_csr.rm = mips_rm[ieee754_csr.rm];
                }
 
-               if (cpu_has_fpu)
+               if (has_fpu)
                        break;
                if (sig)
                        break;
index ed221dc..6244d0e 100644 (file)
@@ -212,23 +212,23 @@ static inline unsigned int irq_ffs(unsigned int pending)
        unsigned int a0 = 7;
        unsigned int t0;
 
-       t0 = s0 & 0xf000;
+       t0 = pending & 0xf000;
        t0 = t0 < 1;
        t0 = t0 << 2;
        a0 = a0 - t0;
-       s0 = s0 << t0;
+       pending = pending << t0;
 
-       t0 = s0 & 0xc000;
+       t0 = pending & 0xc000;
        t0 = t0 < 1;
        t0 = t0 << 1;
        a0 = a0 - t0;
-       s0 = s0 << t0;
+       pending = pending << t0;
 
-       t0 = s0 & 0x8000;
+       t0 = pending & 0x8000;
        t0 = t0 < 1;
        //t0 = t0 << 2;
        a0 = a0 - t0;
-       //s0 = s0 << t0;
+       //pending = pending << t0;
 
        return a0;
 #endif
index 3ace403..4658b2a 100644 (file)
@@ -53,19 +53,9 @@ void __init tx4927_time_init(void);
 void dump_cp0(char *key);
 
 
-void (*__wbflush) (void);
-
-static void tx4927_write_buffer_flush(void)
-{
-       __asm__ __volatile__
-           ("sync\n\t" "nop\n\t" "loop: bc0f loop\n\t" "nop\n\t");
-}
-
-
 void __init plat_mem_setup(void)
 {
        board_time_init = tx4927_time_init;
-       __wbflush = tx4927_write_buffer_flush;
 
 #ifdef CONFIG_TOSHIBA_RBTX4927
        {
index 3e24413..0c3c3f6 100644 (file)
@@ -129,6 +129,7 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
 #include <asm/processor.h>
 #include <asm/reboot.h>
 #include <asm/time.h>
+#include <asm/wbflush.h>
 #include <linux/bootmem.h>
 #include <linux/blkdev.h>
 #ifdef CONFIG_RTC_DS1742
index b602474..77fe245 100644 (file)
@@ -30,6 +30,7 @@
 #include <asm/irq.h>
 #include <asm/mipsregs.h>
 #include <asm/system.h>
+#include <asm/wbflush.h>
 #include <asm/tx4938/rbtx4938.h>
 
 /**********************************************************************************/
index 71859c4..f415a1f 100644 (file)
@@ -41,29 +41,10 @@ void __init tx4938_setup(void);
 void __init tx4938_time_init(void);
 void dump_cp0(char *key);
 
-void (*__wbflush) (void);
-
-static void
-tx4938_write_buffer_flush(void)
-{
-       mmiowb();
-
-       __asm__ __volatile__(
-               ".set   push\n\t"
-               ".set   noreorder\n\t"
-               "lw     $0,%0\n\t"
-               "nop\n\t"
-               ".set   pop"
-               : /* no output */
-               : "m" (*(int *)KSEG1)
-               : "memory");
-}
-
 void __init
 plat_mem_setup(void)
 {
        board_time_init = tx4938_time_init;
-       __wbflush = tx4938_write_buffer_flush;
        toshiba_rbtx4938_setup();
 }
 
index bbb3390..102e473 100644 (file)
@@ -83,6 +83,7 @@ IRQ  Device
 #include <asm/processor.h>
 #include <asm/reboot.h>
 #include <asm/time.h>
+#include <asm/wbflush.h>
 #include <linux/bootmem.h>
 #include <asm/tx4938/rbtx4938.h>
 
index 89d702d..0f5b30d 100644 (file)
@@ -11,7 +11,6 @@
  * option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
index 0cea42a..bb9acbb 100644 (file)
@@ -12,8 +12,6 @@
  * option) any later version.
  */
 
-
-#include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
index a734821..fb2f92b 100644 (file)
@@ -22,8 +22,6 @@
 #ifndef __MACH_ADS8260_DEFS
 #define __MACH_ADS8260_DEFS
 
-#include <linux/config.h>
-
 #include <asm/ppcboot.h>
 
 /* For our show_cpuinfo hooks. */
index aea4359..0afe6bf 100644 (file)
@@ -14,7 +14,6 @@
  * option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/char/qtronix.c b/drivers/char/qtronix.c
deleted file mode 100644 (file)
index 5c94777..0000000
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- *
- * BRIEF MODULE DESCRIPTION
- *     Qtronix 990P infrared keyboard driver.
- *
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *             ppopov@mvista.com or source@mvista.com
- *
- *
- *  The bottom portion of this driver was take from 
- *  pc_keyb.c  Please see that file for copyrights.
- *
- *  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  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.
- */
-
-
-/* 
- * NOTE:  
- *
- *     This driver has only been tested with the Consumer IR
- *     port of the ITE 8172 system controller.
- *
- *     You do not need this driver if you are using the ps/2 or
- *     USB adapter that the keyboard ships with.  You only need 
- *     this driver if your board has a IR port and the keyboard
- *     data is being sent directly to the IR.  In that case,
- *     you also need some low-level IR support. See it8172_cir.c.
- *     
- */
-
-#ifdef CONFIG_QTRONIX_KEYBOARD
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-
-#include <asm/it8172/it8172.h>
-#include <asm/it8172/it8172_int.h>
-#include <asm/it8172/it8172_cir.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/poll.h>
-#include <linux/miscdevice.h>
-#include <linux/slab.h>
-#include <linux/kbd_kern.h>
-#include <linux/smp_lock.h>
-#include <asm/io.h>
-#include <linux/pc_keyb.h>
-
-#include <asm/keyboard.h>
-#include <linux/bitops.h>
-#include <asm/uaccess.h>
-#include <asm/irq.h>
-#include <asm/system.h>
-
-#define leading1 0
-#define leading2 0xF
-
-#define KBD_CIR_PORT 0
-#define AUX_RECONNECT 170 /* scancode when ps2 device is plugged (back) in */
-
-static int data_index;
-struct cir_port *cir;
-static unsigned char kbdbytes[5];
-static unsigned char cir_data[32]; /* we only need 16 chars */
-
-static void kbd_int_handler(int irq, void *dev_id);
-static int handle_data(unsigned char *p_data);
-static inline void handle_mouse_event(unsigned char scancode);
-static inline void handle_keyboard_event(unsigned char scancode, int down);
-static int __init psaux_init(void);
-
-static struct aux_queue *queue;        /* Mouse data buffer. */
-static int aux_count = 0;
-
-/*
- * Keys accessed through the 'Fn' key
- * The Fn key does not produce a key-up sequence. So, the first
- * time the user presses it, it will be key-down event. The key
- * stays down until the user presses it again.
- */
-#define NUM_FN_KEYS 56
-static unsigned char fn_keys[NUM_FN_KEYS] = {
-       0,0,0,0,0,0,0,0,        /* 0 7   */
-       8,9,10,93,0,0,0,0,      /* 8 15  */
-       0,0,0,0,0,0,0,5,        /* 16 23 */
-       6,7,91,0,0,0,0,0,       /* 24 31 */
-       0,0,0,0,0,2,3,4,        /* 32 39 */
-       92,0,0,0,0,0,0,0,       /* 40 47 */
-       0,0,0,0,11,0,94,95        /* 48 55 */
-
-};
-
-void __init init_qtronix_990P_kbd(void)
-{
-       int retval;
-
-       cir = (struct cir_port *)kmalloc(sizeof(struct cir_port), GFP_KERNEL);
-       if (!cir) {
-               printk("Unable to initialize Qtronix keyboard\n");
-               return;
-       }
-
-       /* 
-        * revisit
-        * this should be programmable, somehow by the, by the user.
-        */
-       cir->port = KBD_CIR_PORT;
-       cir->baud_rate = 0x1d;
-       cir->rdwos = 0;
-       cir->rxdcr = 0x3;
-       cir->hcfs = 0;
-       cir->fifo_tl = 0;
-       cir->cfq = 0x1d;
-       cir_port_init(cir);
-
-       retval = request_irq(IT8172_CIR0_IRQ, kbd_int_handler, 
-                       (unsigned long )(IRQF_DISABLED|IRQF_SHARED),
-                       (const char *)"Qtronix IR Keyboard", (void *)cir);
-
-       if (retval) {
-               printk("unable to allocate cir %d irq %d\n", 
-                               cir->port, IT8172_CIR0_IRQ);
-       }
-#ifdef CONFIG_PSMOUSE
-       psaux_init();
-#endif
-}
-
-static inline unsigned char BitReverse(unsigned short key)
-{
-       unsigned char rkey = 0;
-       rkey |= (key & 0x1) << 7;
-       rkey |= (key & 0x2) << 5;
-       rkey |= (key & 0x4) << 3;
-       rkey |= (key & 0x8) << 1;
-       rkey |= (key & 0x10) >> 1;
-       rkey |= (key & 0x20) >> 3;
-       rkey |= (key & 0x40) >> 5;
-       rkey |= (key & 0x80) >> 7;
-       return rkey;
-
-}
-
-
-static inline u_int8_t UpperByte(u_int8_t data)
-{
-       return (data >> 4);
-}
-
-
-static inline u_int8_t LowerByte(u_int8_t data)
-{
-       return (data & 0xF);
-}
-
-
-int CheckSumOk(u_int8_t byte1, u_int8_t byte2, 
-               u_int8_t byte3, u_int8_t byte4, u_int8_t byte5)
-{
-       u_int8_t CheckSum;
-
-       CheckSum = (byte1 & 0x0F) + byte2 + byte3 + byte4 + byte5;
-       if ( LowerByte(UpperByte(CheckSum) + LowerByte(CheckSum)) != UpperByte(byte1) )
-               return 0;
-       else
-               return 1;
-}
-
-
-static void kbd_int_handler(int irq, void *dev_id)
-{
-       struct cir_port *cir;
-       int j;
-       unsigned char int_status;
-
-       cir = (struct cir_port *)dev_id;
-       int_status = get_int_status(cir);
-       if (int_status & 0x4) {
-               clear_fifo(cir);
-               return;
-       }
-
-       while (cir_get_rx_count(cir)) {
-
-               cir_data[data_index] = cir_read_data(cir);
-
-               if (data_index == 0) {/* expecting first byte */
-                       if (cir_data[data_index] != leading1) {
-                               //printk("!leading byte %x\n", cir_data[data_index]);
-                               set_rx_active(cir);
-                               clear_fifo(cir);
-                               continue;
-                       }
-               }
-               if (data_index == 1) {
-                       if ((cir_data[data_index] & 0xf) != leading2) {
-                               set_rx_active(cir);
-                               data_index = 0; /* start over */
-                               clear_fifo(cir);
-                               continue;
-                       }
-               }
-
-               if ( (cir_data[data_index] == 0xff)) { /* last byte */
-                       //printk("data_index %d\n", data_index);
-                       set_rx_active(cir);
-#if 0
-                       for (j=0; j<=data_index; j++) {
-                               printk("rx_data %d:  %x\n", j, cir_data[j]);
-                       }
-#endif
-                       data_index = 0;
-                       handle_data(cir_data);
-                       return;
-               }
-               else if (data_index>16) {
-                       set_rx_active(cir);
-#if 0
-                       printk("warning: data_index %d\n", data_index);
-                       for (j=0; j<=data_index; j++) {
-                               printk("rx_data %d:  %x\n", j, cir_data[j]);
-                       }
-#endif
-                       data_index = 0;
-                       clear_fifo(cir);
-                       return;
-               }
-               data_index++;
-       }
-}
-
-
-#define NUM_KBD_BYTES 5
-static int handle_data(unsigned char *p_data)
-{
-       u_int32_t bit_bucket;
-       u_int32_t i, j;
-       u_int32_t got_bits, next_byte;
-       int down = 0;
-
-       /* Reorganize the bit stream */
-       for (i=0; i<16; i++)
-               p_data[i] = BitReverse(~p_data[i]);
-
-       /* 
-        * We've already previously checked that p_data[0]
-        * is equal to leading1 and that (p_data[1] & 0xf)
-        * is equal to leading2. These twelve bits are the
-        * leader code.  We can now throw them away (the 12
-        * bits) and continue parsing the stream.
-        */
-       bit_bucket = p_data[1] << 12;
-       got_bits = 4;
-       next_byte = 2;
-
-       /* 
-        * Process four bits at a time
-        */
-       for (i=0; i<NUM_KBD_BYTES; i++) {
-
-               kbdbytes[i]=0;
-
-               for (j=0; j<8; j++) /* 8 bits per byte */
-               {
-                       if (got_bits < 4) {
-                               bit_bucket |= (p_data[next_byte++] << (8 - got_bits));
-                               got_bits += 8;
-                       }
-
-                       if ((bit_bucket & 0xF000) == 0x8000) { 
-                               /* Convert 1000b to 1 */
-                               kbdbytes[i] = 0x80 | (kbdbytes[i] >> 1);
-                               got_bits -= 4;
-                               bit_bucket = bit_bucket << 4;
-                       }
-                       else if ((bit_bucket & 0xC000) == 0x8000) {
-                               /* Convert 10b to 0 */
-                               kbdbytes[i] =  kbdbytes[i] >> 1;
-                               got_bits -= 2;
-                               bit_bucket = bit_bucket << 2;
-                       }
-                       else {
-                               /* bad serial stream */
-                               return 1;
-                       }
-
-                       if (next_byte > 16) {
-                               //printk("error: too many bytes\n");
-                               return 1;
-                       }
-               }
-       }
-
-
-       if (!CheckSumOk(kbdbytes[0], kbdbytes[1], 
-                               kbdbytes[2], kbdbytes[3], kbdbytes[4])) {
-               //printk("checksum failed\n");
-               return 1;
-       }
-
-       if (kbdbytes[1] & 0x08) {
-               //printk("m: %x %x %x\n", kbdbytes[1], kbdbytes[2], kbdbytes[3]);
-               handle_mouse_event(kbdbytes[1]);
-               handle_mouse_event(kbdbytes[2]);
-               handle_mouse_event(kbdbytes[3]);
-       }
-       else {
-               if (kbdbytes[2] == 0) down = 1;
-#if 0
-               if (down)
-                       printk("down %d\n", kbdbytes[3]);
-               else
-                       printk("up %d\n", kbdbytes[3]);
-#endif
-               handle_keyboard_event(kbdbytes[3], down);
-       }
-       return 0;
-}
-
-
-DEFINE_SPINLOCK(kbd_controller_lock);
-static unsigned char handle_kbd_event(void);
-
-
-int kbd_setkeycode(unsigned int scancode, unsigned int keycode)
-{
-       printk("kbd_setkeycode scancode %x keycode %x\n", scancode, keycode);
-       return 0;
-}
-
-int kbd_getkeycode(unsigned int scancode)
-{
-       return scancode;
-}
-
-
-int kbd_translate(unsigned char scancode, unsigned char *keycode,
-                   char raw_mode)
-{
-       static int prev_scancode = 0;
-
-       if (scancode == 0x00 || scancode == 0xff) {
-               prev_scancode = 0;
-               return 0;
-       }
-
-       /* todo */
-       if (!prev_scancode && scancode == 160) { /* Fn key down */
-               //printk("Fn key down\n");
-               prev_scancode = 160;
-               return 0;
-       }
-       else if (prev_scancode && scancode == 160) { /* Fn key up */
-               //printk("Fn key up\n");
-               prev_scancode = 0;
-               return 0;
-       }
-
-       /* todo */
-       if (prev_scancode == 160) {
-               if (scancode <= NUM_FN_KEYS) {
-                       *keycode = fn_keys[scancode];
-                       //printk("fn keycode %d\n", *keycode);
-               }
-               else
-                       return 0;
-       } 
-       else if (scancode <= 127) {
-               *keycode = scancode;
-       }
-       else
-               return 0;
-
-
-       return 1;
-}
-
-char kbd_unexpected_up(unsigned char keycode)
-{
-       //printk("kbd_unexpected_up\n");
-       return 0;
-}
-
-static unsigned char kbd_exists = 1;
-
-static inline void handle_keyboard_event(unsigned char scancode, int down)
-{
-       kbd_exists = 1;
-       handle_scancode(scancode, down);
-       tasklet_schedule(&keyboard_tasklet);
-}      
-
-
-void kbd_leds(unsigned char leds)
-{
-}
-
-/* dummy */
-void kbd_init_hw(void)
-{
-}
-
-
-
-static inline void handle_mouse_event(unsigned char scancode)
-{
-       if(scancode == AUX_RECONNECT){
-               queue->head = queue->tail = 0;  /* Flush input queue */
-       //      __aux_write_ack(AUX_ENABLE_DEV);  /* ping the mouse :) */
-               return;
-       }
-
-       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;
-                       kill_fasync(&queue->fasync, SIGIO, POLL_IN);
-                       wake_up_interruptible(&queue->proc_list);
-               }
-       }
-}
-
-static unsigned char get_from_queue(void)
-{
-       unsigned char result;
-       unsigned long flags;
-
-       spin_lock_irqsave(&kbd_controller_lock, flags);
-       result = queue->buf[queue->tail];
-       queue->tail = (queue->tail + 1) & (AUX_BUF_SIZE-1);
-       spin_unlock_irqrestore(&kbd_controller_lock, flags);
-       return result;
-}
-
-
-static inline int queue_empty(void)
-{
-       return queue->head == queue->tail;
-}
-
-static int fasync_aux(int fd, struct file *filp, int on)
-{
-       int retval;
-
-       //printk("fasync_aux\n");
-       retval = fasync_helper(fd, filp, on, &queue->fasync);
-       if (retval < 0)
-               return retval;
-       return 0;
-}
-
-
-/*
- * Random magic cookie for the aux device
- */
-#define AUX_DEV ((void *)queue)
-
-static int release_aux(struct inode * inode, struct file * file)
-{
-       fasync_aux(-1, file, 0);
-       aux_count--;
-       return 0;
-}
-
-static int open_aux(struct inode * inode, struct file * file)
-{
-       if (aux_count++) {
-               return 0;
-       }
-       queue->head = queue->tail = 0;          /* Flush input queue */
-       return 0;
-}
-
-/*
- * Put bytes from input queue to buffer.
- */
-
-static ssize_t read_aux(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) {
-               struct inode *inode = file->f_dentry->d_inode;
-               inode->i_atime = current_fs_time(inode->i_sb);
-               return count-i;
-       }
-       if (signal_pending(current))
-               return -ERESTARTSYS;
-       return 0;
-}
-
-/*
- * Write to the aux device.
- */
-
-static ssize_t write_aux(struct file * file, const char * buffer,
-                        size_t count, loff_t *ppos)
-{
-       /*
-        * The ITE boards this was tested on did not have the
-        * transmit wires connected.
-        */
-       return count;
-}
-
-static unsigned int aux_poll(struct file *file, poll_table * wait)
-{
-       poll_wait(file, &queue->proc_list, wait);
-       if (!queue_empty())
-               return POLLIN | POLLRDNORM;
-       return 0;
-}
-
-struct file_operations psaux_fops = {
-       .read           = read_aux,
-       .write          = write_aux,
-       .poll           = aux_poll,
-       .open           = open_aux,
-       .release        = release_aux,
-       .fasync         = fasync_aux,
-};
-
-/*
- * Initialize driver.
- */
-static struct miscdevice psaux_mouse = {
-       PSMOUSE_MINOR, "psaux", &psaux_fops
-};
-
-static int __init psaux_init(void)
-{
-       int retval;
-
-       retval = misc_register(&psaux_mouse);
-       if(retval < 0)
-               return retval;
-
-       queue = (struct aux_queue *) kmalloc(sizeof(*queue), GFP_KERNEL);
-       if (!queue) {
-               misc_deregister(&psaux_mouse);
-               return -ENOMEM;
-       }
-               
-       memset(queue, 0, sizeof(*queue));
-       queue->head = queue->tail = 0;
-       init_waitqueue_head(&queue->proc_list);
-
-       return 0;
-}
-module_init(init_qtronix_990P_kbd);
-#endif
index abee7a3..66a7385 100644 (file)
  *     1.09a   Pete Zaitcev: Sun SPARC
  *     1.09b   Jeff Garzik: Modularize, init cleanup
  *     1.09c   Jeff Garzik: SMP cleanup
- *     1.10    Paul Barton-Davis: add support for async I/O
+ *     1.10    Paul Barton-Davis: add support for async I/O
  *     1.10a   Andrea Arcangeli: Alpha updates
  *     1.10b   Andrew Morton: SMP lock fix
  *     1.10c   Cesar Barros: SMP locking fixes and cleanup
  *     1.10d   Paul Gortmaker: delete paranoia check in rtc_exit
  *     1.10e   Maciej W. Rozycki: Handle DECstation's year weirdness.
- *      1.11    Takashi Iwai: Kernel access functions
+ *     1.11    Takashi Iwai: Kernel access functions
  *                           rtc_register/rtc_unregister/rtc_control
  *      1.11a   Daniele Bellucci: Audit create_proc_read_entry in rtc_init
  *     1.12    Venkatesh Pallipadi: Hooks for emulating rtc on HPET base-timer
index 58c561a..efef843 100644 (file)
@@ -134,9 +134,11 @@ static inline void restore_fp(struct task_struct *tsk)
 
 static inline fpureg_t *get_fpu_regs(struct task_struct *tsk)
 {
-       if (cpu_has_fpu) {
-               if ((tsk == current) && __is_fpu_owner())
+       if (tsk == current) {
+               preempt_disable();
+               if (is_fpu_owner())
                        _save_fp(current);
+               preempt_enable();
        }
 
        return tsk->thread.fpu.fpr;
diff --git a/include/asm-mips/mach-au1x00/au1000_usbdev.h b/include/asm-mips/mach-au1x00/au1000_usbdev.h
deleted file mode 100644 (file)
index 05bc74b..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * BRIEF MODULE DESCRIPTION
- *     Au1000 USB Device-Side Driver
- *
- * Copyright 2001 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *             stevel@mvista.com or source@mvista.com
- *
- *  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  SOFTWARE  IS PROVIDED          ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,          INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED          TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA, OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN         CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#define USBDEV_REV 0x0110 // BCD
-#define USBDEV_EP0_MAX_PACKET_SIZE 64
-
-typedef enum {
-       ATTACHED = 0,
-       POWERED,
-       DEFAULT,
-       ADDRESS,
-       CONFIGURED
-} usbdev_state_t;
-
-typedef enum {
-       CB_NEW_STATE = 0,
-       CB_PKT_COMPLETE
-} usbdev_cb_type_t;
-
-
-typedef struct usbdev_pkt {
-       int                ep_addr;    // ep addr this packet routed to
-       int                size;       // size of payload in bytes
-       unsigned           status;     // packet status
-       struct usbdev_pkt* next;       // function layer can't touch this
-       u8                 payload[0]; // the payload
-} usbdev_pkt_t;
-
-#define PKT_STATUS_ACK  (1<<0)
-#define PKT_STATUS_NAK  (1<<1)
-#define PKT_STATUS_SU   (1<<2)
-
-extern int usbdev_init(struct usb_device_descriptor* dev_desc,
-                      struct usb_config_descriptor* config_desc,
-                      struct usb_interface_descriptor* if_desc,
-                      struct usb_endpoint_descriptor* ep_desc,
-                      struct usb_string_descriptor* str_desc[],
-                      void (*cb)(usbdev_cb_type_t, unsigned long, void *),
-                      void* cb_data);
-
-extern void usbdev_exit(void);
-
-extern int usbdev_alloc_packet  (int ep_addr, int data_size,
-                                usbdev_pkt_t** pkt);
-extern int usbdev_send_packet   (int ep_addr, usbdev_pkt_t* pkt);
-extern int usbdev_receive_packet(int ep_addr, usbdev_pkt_t** pkt);
-extern int usbdev_get_byte_count(int ep_addr);
diff --git a/include/linux/config.h b/include/linux/config.h
deleted file mode 100644 (file)
index 479ffb0..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LINUX_CONFIG_H
-#define _LINUX_CONFIG_H
-/* This file is no longer in use and kept only for backward compatibility.
- * autoconf.h is now included via -imacros on the commandline
- */
-#warning Including config.h is deprecated.
-#include <linux/autoconf.h>
-
-#endif