[Linux-mips-commits]CVS: linux/arch/mips/au1000/common dma.c,1.2,1.3 usbdev.c,1.2,1.3

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/common
In directory usw-pr-cvs1:/tmp/cvs-serv25854

Modified Files:
	dma.c usbdev.c 
Log Message:
Indented to Linux kernel style.


Index: dma.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/dma.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dma.c	2001/08/23 17:10:44	1.2
--- dma.c	2001/08/30 21:50:49	1.3
***************
*** 62,96 ****
  
  struct dma_chan au1000_dma_table[NUM_AU1000_DMA_CHANNELS] = {
!     {dev_id: -1,},
!     {dev_id: -1,},
!     {dev_id: -1,},
!     {dev_id: -1,},
!     {dev_id: -1,},
!     {dev_id: -1,},
!     {dev_id: -1,},
!     {dev_id: -1,}
  };
  
  // Device FIFO addresses and default DMA modes
  static const struct {
!     unsigned int fifo_addr;
!     unsigned int dma_mode;
  } dma_dev_table[DMA_NUM_DEV] = {
!     { UART0_ADDR + UART_TX, 0 },
!     { UART0_ADDR + UART_RX, 0 },
!     { 0, 0 },
!     { 0, 0 },
!     { AC97C_DATA, DMA_DW16 | DMA_NC },
!     { AC97C_DATA, DMA_DR | DMA_DW16 | DMA_NC },
!     { UART3_ADDR + UART_TX, DMA_DW8 | DMA_NC },
!     { UART3_ADDR + UART_RX, DMA_DR | DMA_DW8 | DMA_NC },
!     { USB_DEV_EP0_READ_FIFO, DMA_DR | DMA_DW8 | DMA_NC },
!     { USB_DEV_EP0_WRITE_FIFO, DMA_DW8 | DMA_NC },
!     { USB_DEV_EP2_WRITE_FIFO, DMA_DW8 | DMA_NC },
!     { USB_DEV_EP3_WRITE_FIFO, DMA_DW8 | DMA_NC },
!     { USB_DEV_EP4_READ_FIFO,  DMA_DR | DMA_DW8 | DMA_NC },
!     { USB_DEV_EP5_READ_FIFO, DMA_DR | DMA_DW8 | DMA_NC },
!     { I2S_DATA, DMA_DW32 | DMA_NC },
!     { I2S_DATA, DMA_DR | DMA_DW32 | DMA_NC }
  };
  
--- 62,96 ----
  
  struct dma_chan au1000_dma_table[NUM_AU1000_DMA_CHANNELS] = {
! 	{dev_id: -1,},
! 	{dev_id: -1,},
! 	{dev_id: -1,},
! 	{dev_id: -1,},
! 	{dev_id: -1,},
! 	{dev_id: -1,},
! 	{dev_id: -1,},
! 	{dev_id: -1,}
  };
  
  // Device FIFO addresses and default DMA modes
  static const struct {
! 	unsigned int fifo_addr;
! 	unsigned int dma_mode;
  } dma_dev_table[DMA_NUM_DEV] = {
! 	{ UART0_ADDR + UART_TX, 0 },
! 	{ UART0_ADDR + UART_RX, 0 },
! 	{ 0, 0 },
! 	{ 0, 0 },
! 	{ AC97C_DATA, DMA_DW16 | DMA_NC },
! 	{ AC97C_DATA, DMA_DR | DMA_DW16 | DMA_NC },
! 	{ UART3_ADDR + UART_TX, DMA_DW8 | DMA_NC },
! 	{ UART3_ADDR + UART_RX, DMA_DR | DMA_DW8 | DMA_NC },
! 	{ USB_DEV_EP0_READ_FIFO, DMA_DR | DMA_DW8 | DMA_NC },
! 	{ USB_DEV_EP0_WRITE_FIFO, DMA_DW8 | DMA_NC },
! 	{ USB_DEV_EP2_WRITE_FIFO, DMA_DW8 | DMA_NC },
! 	{ USB_DEV_EP3_WRITE_FIFO, DMA_DW8 | DMA_NC },
! 	{ USB_DEV_EP4_READ_FIFO,  DMA_DR | DMA_DW8 | DMA_NC },
! 	{ USB_DEV_EP5_READ_FIFO, DMA_DR | DMA_DW8 | DMA_NC },
! 	{ I2S_DATA, DMA_DW32 | DMA_NC },
! 	{ I2S_DATA, DMA_DR | DMA_DW32 | DMA_NC }
  };
  
***************
*** 99,121 ****
  			  int length, int *eof, void *data)
  {
!     int i, len=0;
!     struct dma_chan * chan;
!     
!     for (i = 0 ; i < NUM_AU1000_DMA_CHANNELS ; i++) {
! 	if ((chan = get_dma_chan(i)) != NULL) {
! 	    len += sprintf(buf+len, "%2d: %s\n", i, chan->dev_str);
  	}
!     }
! 
!     if (fpos >= len) {
!         *start = buf;
!         *eof = 1;
!         return 0;
!     }
!     *start = buf + fpos;
!     if ((len -= fpos) > length)
!         return length;
!     *eof = 1;
!     return len;
  }
  
--- 99,122 ----
  			  int length, int *eof, void *data)
  {
! 	int i, len=0;
! 	struct dma_chan * chan;
! 	
! 	for (i = 0 ; i < NUM_AU1000_DMA_CHANNELS ; i++) {
! 		if ((chan = get_dma_chan(i)) != NULL) {
! 			len += sprintf(buf+len, "%2d: %s\n",
! 				       i, chan->dev_str);
! 		}
  	}
! 	
! 	if (fpos >= len) {
! 		*start = buf;
! 		*eof = 1;
! 		return 0;
! 	}
! 	*start = buf + fpos;
! 	if ((len -= fpos) > length)
! 		return length;
! 	*eof = 1;
! 	return len;
  }
  
***************
*** 123,139 ****
  void dump_au1000_dma_channel(unsigned int dmanr)
  {
!     struct dma_chan * chan;
  
!     if (dmanr > NUM_AU1000_DMA_CHANNELS)
! 	return;
!     chan = &au1000_dma_table[dmanr];
  
!     printk(KERN_INFO "Au1000 DMA%d Register Dump:\n", dmanr);
!     printk(KERN_INFO "  mode = 0x%08x\n", inl(chan->io+DMA_MODE_SET));
!     printk(KERN_INFO "  addr = 0x%08x\n", inl(chan->io+DMA_PERIPHERAL_ADDR));
!     printk(KERN_INFO "  start0 = 0x%08x\n", inl(chan->io+DMA_BUFFER0_START));
!     printk(KERN_INFO "  start1 = 0x%08x\n", inl(chan->io+DMA_BUFFER1_START));
!     printk(KERN_INFO "  count0 = 0x%08x\n", inl(chan->io+DMA_BUFFER0_COUNT));
!     printk(KERN_INFO "  count1 = 0x%08x\n", inl(chan->io+DMA_BUFFER1_COUNT));
  }
  
--- 124,146 ----
  void dump_au1000_dma_channel(unsigned int dmanr)
  {
! 	struct dma_chan * chan;
  
! 	if (dmanr > NUM_AU1000_DMA_CHANNELS)
! 		return;
! 	chan = &au1000_dma_table[dmanr];
  
! 	printk(KERN_INFO "Au1000 DMA%d Register Dump:\n", dmanr);
! 	printk(KERN_INFO "  mode = 0x%08x\n",
! 	       inl(chan->io+DMA_MODE_SET));
! 	printk(KERN_INFO "  addr = 0x%08x\n",
! 	       inl(chan->io+DMA_PERIPHERAL_ADDR));
! 	printk(KERN_INFO "  start0 = 0x%08x\n",
! 	       inl(chan->io+DMA_BUFFER0_START));
! 	printk(KERN_INFO "  start1 = 0x%08x\n",
! 	       inl(chan->io+DMA_BUFFER1_START));
! 	printk(KERN_INFO "  count0 = 0x%08x\n",
! 	       inl(chan->io+DMA_BUFFER0_COUNT));
! 	printk(KERN_INFO "  count1 = 0x%08x\n",
! 	       inl(chan->io+DMA_BUFFER1_COUNT));
  }
  
***************
*** 145,172 ****
  int request_au1000_dma(int dev_id, const char * dev_str)
  {
!     struct dma_chan * chan;
!     int i;
  
!     if (dev_id < 0 || dev_id >= DMA_NUM_DEV)
! 	return -EINVAL;
  
!     for (i = 0 ; i < NUM_AU1000_DMA_CHANNELS ; i++) {
! 	if (au1000_dma_table[i].dev_id < 0)
! 	    break;
!     }
!     if (i == NUM_AU1000_DMA_CHANNELS)
! 	return -ENODEV;
  
!     chan = &au1000_dma_table[i];
  
!     // fill it in
!     chan->io = DMA_CHANNEL_BASE + i*DMA_CHANNEL_LEN;
!     chan->irq = AU1000_DMA_INT_BASE + i;
!     chan->dev_id = dev_id;
!     chan->dev_str = dev_str;
!     chan->fifo_addr = dma_dev_table[dev_id].fifo_addr;
!     chan->mode = dma_dev_table[dev_id].dma_mode;
  
!     return i;
  }
  
--- 152,179 ----
  int request_au1000_dma(int dev_id, const char * dev_str)
  {
! 	struct dma_chan * chan;
! 	int i;
  
! 	if (dev_id < 0 || dev_id >= DMA_NUM_DEV)
! 		return -EINVAL;
  
! 	for (i = 0 ; i < NUM_AU1000_DMA_CHANNELS ; i++) {
! 		if (au1000_dma_table[i].dev_id < 0)
! 			break;
! 	}
! 	if (i == NUM_AU1000_DMA_CHANNELS)
! 		return -ENODEV;
  
! 	chan = &au1000_dma_table[i];
  
! 	// fill it in
! 	chan->io = DMA_CHANNEL_BASE + i*DMA_CHANNEL_LEN;
! 	chan->irq = AU1000_DMA_INT_BASE + i;
! 	chan->dev_id = dev_id;
! 	chan->dev_str = dev_str;
! 	chan->fifo_addr = dma_dev_table[dev_id].fifo_addr;
! 	chan->mode = dma_dev_table[dev_id].dma_mode;
  
! 	return i;
  }
  
***************
*** 174,185 ****
  void free_au1000_dma(unsigned int dmanr)
  {
!     struct dma_chan * chan = get_dma_chan(dmanr);
!     if (!chan) {
! 	printk("Trying to free DMA%d\n", dmanr);
! 	return;
!     }
  
!     disable_dma(dmanr);
      
!     chan->dev_id = -1;
  } /* free_dma */
--- 181,192 ----
  void free_au1000_dma(unsigned int dmanr)
  {
! 	struct dma_chan * chan = get_dma_chan(dmanr);
! 	if (!chan) {
! 		printk("Trying to free DMA%d\n", dmanr);
! 		return;
! 	}
  
! 	disable_dma(dmanr);
      
! 	chan->dev_id = -1;
  } /* free_dma */

Index: usbdev.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/common/usbdev.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** usbdev.c	2001/08/23 17:10:44	1.2
--- usbdev.c	2001/08/30 21:50:49	1.3
***************
*** 83,91 ****
  
  typedef enum {
!     ATTACHED = 0,
!     POWERED,
!     DEFAULT,
!     ADDRESS,
!     CONFIGURED
  } dev_state_t;
  
--- 83,91 ----
[...3288 lines suppressed...]
! 		struct usb_serial_port * port = &usbserial.port[i];
! 		endpoint_flush(&port->ep_bulkin);
! 		endpoint_flush(&port->ep_bulkout);
! 		// start packet reception on bulk OUT endpoint
! 		kickstart_receive_packet(&port->ep_bulkout);
! 	}
      
! 	/*
! 	 * Enable Receive FIFO Complete interrupts only. Transmit
! 	 * complete is being handled by the DMA done interrupts.
! 	 */
! 	outl_sync(0x31, USB_DEV_INT_ENABLE);
  
! 	return 0;
  
   err_out:
! 	usbdev_serial_exit();
! 	return -1;
  }