Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7283353 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

cris: Fixup compile problems 



It now compiles with the tty changes but isn't tested (which has to be
better than not compiling..

Closes bug #11218

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b1cbefe5

drivers/serial/crisv10.c

+40 −39
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ unsigned long r_alt_ser_baudrate_shadow = 0; 


static struct e100_serial rs_table[] = {

	{ .baud        = DEF_BAUD,

	  .port        = (unsigned char *)R_SERIAL0_CTRL,

	  .ioport        = (unsigned char *)R_SERIAL0_CTRL,

	  .irq         = 1U << 12, /* uses DMA 6 and 7 */

	  .oclrintradr = R_DMA_CH6_CLR_INTR,

	  .ofirstadr   = R_DMA_CH6_FIRST,
@@ -288,7 +288,7 @@ static struct e100_serial rs_table[] = { 
},  /* ttyS0 */

#ifndef CONFIG_SVINTO_SIM

	{ .baud        = DEF_BAUD,

	  .port        = (unsigned char *)R_SERIAL1_CTRL,

	  .ioport        = (unsigned char *)R_SERIAL1_CTRL,

	  .irq         = 1U << 16, /* uses DMA 8 and 9 */

	  .oclrintradr = R_DMA_CH8_CLR_INTR,

	  .ofirstadr   = R_DMA_CH8_FIRST,
@@ -344,7 +344,7 @@ static struct e100_serial rs_table[] = { 
},  /* ttyS1 */



	{ .baud        = DEF_BAUD,

	  .port        = (unsigned char *)R_SERIAL2_CTRL,

	  .ioport        = (unsigned char *)R_SERIAL2_CTRL,

	  .irq         = 1U << 4,  /* uses DMA 2 and 3 */

	  .oclrintradr = R_DMA_CH2_CLR_INTR,

	  .ofirstadr   = R_DMA_CH2_FIRST,
@@ -398,7 +398,7 @@ static struct e100_serial rs_table[] = { 
 },  /* ttyS2 */



	{ .baud        = DEF_BAUD,

	  .port        = (unsigned char *)R_SERIAL3_CTRL,

	  .ioport        = (unsigned char *)R_SERIAL3_CTRL,

	  .irq         = 1U << 8,  /* uses DMA 4 and 5 */

	  .oclrintradr = R_DMA_CH4_CLR_INTR,

	  .ofirstadr   = R_DMA_CH4_FIRST,
@@ -939,7 +939,7 @@ static const struct control_pins e100_modem_pins[NR_PORTS] = 
/* Output */

#define E100_RTS_GET(info) ((info)->rx_ctrl & E100_RTS_MASK)

/* Input */

#define E100_CTS_GET(info) ((info)->port[REG_STATUS] & E100_CTS_MASK)

#define E100_CTS_GET(info) ((info)->ioport[REG_STATUS] & E100_CTS_MASK)



/* These are typically PA or PB and 0 means 0V, 1 means 3.3V */

/* Is an output */
@@ -1092,7 +1092,7 @@ e100_rts(struct e100_serial *info, int set) 
	local_irq_save(flags);

	info->rx_ctrl &= ~E100_RTS_MASK;

	info->rx_ctrl |= (set ? 0 : E100_RTS_MASK);  /* RTS is active low */

	info->port[REG_REC_CTRL] = info->rx_ctrl;

	info->ioport[REG_REC_CTRL] = info->rx_ctrl;

	local_irq_restore(flags);

#ifdef SERIAL_DEBUG_IO

	printk("ser%i rts %i\n", info->line, set);
@@ -1142,7 +1142,7 @@ e100_disable_rx(struct e100_serial *info) 
{

#ifndef CONFIG_SVINTO_SIM

	/* disable the receiver */

	info->port[REG_REC_CTRL] =

	info->ioport[REG_REC_CTRL] =

		(info->rx_ctrl &= ~IO_MASK(R_SERIAL0_REC_CTRL, rec_enable));

#endif

}
@@ -1152,7 +1152,7 @@ e100_enable_rx(struct e100_serial *info) 
{

#ifndef CONFIG_SVINTO_SIM

	/* enable the receiver */

	info->port[REG_REC_CTRL] =

	info->ioport[REG_REC_CTRL] =

		(info->rx_ctrl |= IO_MASK(R_SERIAL0_REC_CTRL, rec_enable));

#endif

}
@@ -1490,7 +1490,7 @@ rs_stop(struct tty_struct *tty) 
			xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable);

		}



		*((unsigned long *)&info->port[REG_XOFF]) = xoff;

		*((unsigned long *)&info->ioport[REG_XOFF]) = xoff;

		local_irq_restore(flags);

	}

}
@@ -1513,7 +1513,7 @@ rs_start(struct tty_struct *tty) 
			xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable);

		}



		*((unsigned long *)&info->port[REG_XOFF]) = xoff;

		*((unsigned long *)&info->ioport[REG_XOFF]) = xoff;

		if (!info->uses_dma_out &&

		    info->xmit.head != info->xmit.tail && info->xmit.buf)

			e100_enable_serial_tx_ready_irq(info);
@@ -1888,7 +1888,7 @@ static void receive_chars_dma(struct e100_serial *info) 
	handle_all_descr_data(info);



	/* Read the status register to detect errors */

	rstat = info->port[REG_STATUS];

	rstat = info->ioport[REG_STATUS];

	if (rstat & IO_MASK(R_SERIAL0_STATUS, xoff_detect) ) {

		DFLOW(DEBUG_LOG(info->line, "XOFF detect stat %x\n", rstat));

	}
@@ -1897,7 +1897,7 @@ static void receive_chars_dma(struct e100_serial *info) 
		/* If we got an error, we must reset it by reading the

		 * data_in field

		 */

		unsigned char data = info->port[REG_DATA];

		unsigned char data = info->ioport[REG_DATA];



		PROCSTAT(ser_stat[info->line].errors_cnt++);

		DEBUG_LOG(info->line, "#dERR: s d 0x%04X\n",
@@ -2077,7 +2077,7 @@ static int force_eop_if_needed(struct e100_serial *info) 
	/* We check data_avail bit to determine if data has

	 * arrived since last time

	 */

	unsigned char rstat = info->port[REG_STATUS];

	unsigned char rstat = info->ioport[REG_STATUS];



	/* error or datavail? */

	if (rstat & SER_ERROR_MASK) {
@@ -2096,7 +2096,7 @@ static int force_eop_if_needed(struct e100_serial *info) 
		TIMERD(DEBUG_LOG(info->line, "timeout: rstat 0x%03X\n",

		          rstat | (info->line << 8)));

		/* Read data to clear status flags */

		(void)info->port[REG_DATA];

		(void)info->ioport[REG_DATA];



		info->forced_eop = 0;

		START_FLUSH_FAST_TIMER(info, "magic");
@@ -2296,7 +2296,7 @@ struct e100_serial * handle_ser_rx_interrupt_no_dma(struct e100_serial *info) 
	}



	/* Read data and status at the same time */

	data_read = *((unsigned long *)&info->port[REG_DATA_STATUS32]);

	data_read = *((unsigned long *)&info->ioport[REG_DATA_STATUS32]);

more_data:

	if (data_read & IO_MASK(R_SERIAL0_READ, xoff_detect) ) {

		DFLOW(DEBUG_LOG(info->line, "XOFF detect\n", 0));
@@ -2391,7 +2391,7 @@ more_data: 




	info->icount.rx++;

	data_read = *((unsigned long *)&info->port[REG_DATA_STATUS32]);

	data_read = *((unsigned long *)&info->ioport[REG_DATA_STATUS32]);

	if (data_read & IO_MASK(R_SERIAL0_READ, data_avail)) {

		DEBUG_LOG(info->line, "ser_rx   %c in loop\n", IO_EXTRACT(R_SERIAL0_READ, data_in, data_read));

		goto more_data;
@@ -2413,7 +2413,7 @@ static struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info) 
		return handle_ser_rx_interrupt_no_dma(info);

	}

	/* DMA is used */

	rstat = info->port[REG_STATUS];

	rstat = info->ioport[REG_STATUS];

	if (rstat & IO_MASK(R_SERIAL0_STATUS, xoff_detect) ) {

		DFLOW(DEBUG_LOG(info->line, "XOFF detect\n", 0));

	}
@@ -2426,7 +2426,7 @@ static struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info) 
		/* If we got an error, we must reset it by reading the

		 * data_in field

		 */

		data = info->port[REG_DATA];

		data = info->ioport[REG_DATA];

		DINTR1(DEBUG_LOG(info->line, "ser_rx!  %c\n", data));

		DINTR1(DEBUG_LOG(info->line, "ser_rx err stat %02X\n", rstat));

		if (!data && (rstat & SER_FRAMING_ERR_MASK)) {
@@ -2528,10 +2528,10 @@ static void handle_ser_tx_interrupt(struct e100_serial *info) 
		unsigned char rstat;

		DFLOW(DEBUG_LOG(info->line, "tx_int: xchar 0x%02X\n", info->x_char));

		local_irq_save(flags);

		rstat = info->port[REG_STATUS];

		rstat = info->ioport[REG_STATUS];

		DFLOW(DEBUG_LOG(info->line, "stat %x\n", rstat));



		info->port[REG_TR_DATA] = info->x_char;

		info->ioport[REG_TR_DATA] = info->x_char;

		info->icount.tx++;

		info->x_char = 0;

		/* We must enable since it is disabled in ser_interrupt */
@@ -2545,7 +2545,7 @@ static void handle_ser_tx_interrupt(struct e100_serial *info) 
		/* We only use normal tx interrupt when sending x_char */

		DFLOW(DEBUG_LOG(info->line, "tx_int: xchar sent\n", 0));

		local_irq_save(flags);

		rstat = info->port[REG_STATUS];

		rstat = info->ioport[REG_STATUS];

		DFLOW(DEBUG_LOG(info->line, "stat %x\n", rstat));

		e100_disable_serial_tx_ready_irq(info);

		if (info->port.tty->stopped)
@@ -2573,7 +2573,7 @@ static void handle_ser_tx_interrupt(struct e100_serial *info) 
	DINTR2(DEBUG_LOG(info->line, "tx_int %c\n", info->xmit.buf[info->xmit.tail]));

	/* Send a byte, rs485 timing is critical so turn of ints */

	local_irq_save(flags);

	info->port[REG_TR_DATA] = info->xmit.buf[info->xmit.tail];

	info->ioport[REG_TR_DATA] = info->xmit.buf[info->xmit.tail];

	info->xmit.tail = (info->xmit.tail + 1) & (SERIAL_XMIT_SIZE-1);

	info->icount.tx++;

	if (info->xmit.head == info->xmit.tail) {
@@ -2848,7 +2848,7 @@ startup(struct e100_serial * info) 


	/* dummy read to reset any serial errors */



	(void)info->port[REG_DATA];

	(void)info->ioport[REG_DATA];



	/* enable the interrupts */

	if (info->uses_dma_out)
@@ -2897,7 +2897,7 @@ shutdown(struct e100_serial * info) 
	/* shut down the transmitter and receiver */

	DFLOW(DEBUG_LOG(info->line, "shutdown %i\n", info->line));

	e100_disable_rx(info);

	info->port[REG_TR_CTRL] = (info->tx_ctrl &= ~0x40);

	info->ioport[REG_TR_CTRL] = (info->tx_ctrl &= ~0x40);



	/* disable interrupts, reset dma channels */

	if (info->uses_dma_in) {
@@ -2968,7 +2968,7 @@ change_speed(struct e100_serial *info) 


	if (!info->port.tty || !info->port.tty->termios)

		return;

	if (!info->port)

	if (!info->ioport)

		return;



	cflag = info->port.tty->termios->c_cflag;
@@ -3037,7 +3037,7 @@ change_speed(struct e100_serial *info) 


		info->baud = cflag_to_baud(cflag);

#ifndef CONFIG_SVINTO_SIM

		info->port[REG_BAUD] = cflag_to_etrax_baud(cflag);

		info->ioport[REG_BAUD] = cflag_to_etrax_baud(cflag);

#endif /* CONFIG_SVINTO_SIM */

	}
@@ -3097,8 +3097,8 @@ change_speed(struct e100_serial *info) 


	/* actually write the control regs to the hardware */



	info->port[REG_TR_CTRL] = info->tx_ctrl;

	info->port[REG_REC_CTRL] = info->rx_ctrl;

	info->ioport[REG_TR_CTRL] = info->tx_ctrl;

	info->ioport[REG_REC_CTRL] = info->rx_ctrl;

	xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char, STOP_CHAR(info->port.tty));

	xoff |= IO_STATE(R_SERIAL0_XOFF, tx_stop, enable);

	if (info->port.tty->termios->c_iflag & IXON ) {
@@ -3107,7 +3107,7 @@ change_speed(struct e100_serial *info) 
		xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable);

	}



	*((unsigned long *)&info->port[REG_XOFF]) = xoff;

	*((unsigned long *)&info->ioport[REG_XOFF]) = xoff;

	local_irq_restore(flags);

#endif /* !CONFIG_SVINTO_SIM */
@@ -3156,7 +3156,7 @@ static int rs_raw_write(struct tty_struct *tty, 
#ifdef SERIAL_DEBUG_DATA

	if (info->line == SERIAL_DEBUG_LINE)

		printk("rs_raw_write (%d), status %d\n",

		       count, info->port[REG_STATUS]);

		       count, info->ioport[REG_STATUS]);

#endif



#ifdef CONFIG_SVINTO_SIM
@@ -3427,7 +3427,7 @@ get_serial_info(struct e100_serial * info, 
	memset(&tmp, 0, sizeof(tmp));

	tmp.type = info->type;

	tmp.line = info->line;

	tmp.port = (int)info->port;

	tmp.port = (int)info->ioport;

	tmp.irq = info->irq;

	tmp.flags = info->flags;

	tmp.baud_base = info->baud_base;
@@ -3557,14 +3557,14 @@ char *get_control_state_str(int MLines, char *s) 
}

#endif



static void

static int

rs_break(struct tty_struct *tty, int break_state)

{

	struct e100_serial *info = (struct e100_serial *)tty->driver_data;

	unsigned long flags;



	if (!info->port)

		return;

	if (!info->ioport)

		return -EIO;



	local_irq_save(flags);

	if (break_state == -1) {
@@ -3575,8 +3575,9 @@ rs_break(struct tty_struct *tty, int break_state) 
		/* Set bit 7 (txd) and 6 (tr_enable) */

		info->tx_ctrl |= (0x80 | 0x40);

	}

	info->port[REG_TR_CTRL] = info->tx_ctrl;

	info->ioport[REG_TR_CTRL] = info->tx_ctrl;

	local_irq_restore(flags);

	return 0;

}



static int
@@ -4231,9 +4232,9 @@ static int line_info(char *buf, struct e100_serial *info) 
	unsigned long tmp;



	ret = sprintf(buf, "%d: uart:E100 port:%lX irq:%d",

		      info->line, (unsigned long)info->port, info->irq);

		      info->line, (unsigned long)info->ioport, info->irq);



	if (!info->port || (info->type == PORT_UNKNOWN)) {

	if (!info->ioport || (info->type == PORT_UNKNOWN)) {

		ret += sprintf(buf+ret, "\n");

		return ret;

	}
@@ -4281,7 +4282,7 @@ static int line_info(char *buf, struct e100_serial *info) 
	}



	{

		unsigned char rstat = info->port[REG_STATUS];

		unsigned char rstat = info->ioport[REG_STATUS];

		if (rstat & IO_MASK(R_SERIAL0_STATUS, xoff_detect) )

			ret += sprintf(buf+ret, " xoff_detect:1");

	}
@@ -4502,7 +4503,7 @@ rs_init(void) 


		if (info->enabled) {

			printk(KERN_INFO "%s%d at 0x%x is a builtin UART with DMA\n",

			       serial_driver->name, info->line, (unsigned int)info->port);

			       serial_driver->name, info->line, (unsigned int)info->ioport);

		}

	}

#ifdef CONFIG_ETRAX_FAST_TIMER

drivers/serial/crisv10.h

+2 −1
Original line number Diff line number Diff line
@@ -36,8 +36,9 @@ struct etrax_recv_buffer { 
};



struct e100_serial {

	struct tty_port port;

	int baud;

	volatile u8	*port;	/* R_SERIALx_CTRL */

	volatile u8	*ioport;	/* R_SERIALx_CTRL */

	u32		irq;	/* bitnr in R_IRQ_MASK2 for dmaX_descr */



	/* Output registers */