minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 05:55:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

microblaze: Clean uartlite driver

Browse Source 
Redesign uartlite driver to in_be32 and out_be32 macros
Fix missing header in io.h

Signed-off-by: Michal Simek <monstr@monstr.eu>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Michal Simek 2008-07-11 10:10:31 +02:00 committed by Wolfgang Denk
parent dbf3dfb386
commit 53ea981c31
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/serial/serial_xuartlite.c
View File

@ -1,6 +1,8 @@
/* /*
* (C) Copyright 2004 Atmark Techno, Inc. * (C) Copyright 2008 Michal Simek <monstr@monstr.eu>
* Clean driver and add xilinx constant from header file
* *
* (C) Copyright 2004 Atmark Techno, Inc.
* Yasushi SHOJI <yashi@atmark-techno.com> * Yasushi SHOJI <yashi@atmark-techno.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -23,19 +25,21 @@
*/ */
#include <config.h> #include <config.h>
#include <asm/io.h>
#ifdef CONFIG_XILINX_UARTLITE #ifdef CONFIG_XILINX_UARTLITE
#include <asm/serial_xuartlite.h> #define RX_FIFO_OFFSET 0 /* receive FIFO, read only */
#define TX_FIFO_OFFSET 4 /* transmit FIFO, write only */
#define STATUS_REG_OFFSET 8 /* status register, read only */
/* FIXME: we should convert these to in32 and out32 */ #define SR_TX_FIFO_FULL 0x08 /* transmit FIFO full */
#define IO_WORD(offset) (*(volatile unsigned long *)(offset)) #define SR_RX_FIFO_VALID_DATA 0x01 /* data in receive FIFO */
#define IO_SERIAL(offset) IO_WORD(CONFIG_SERIAL_BASE + (offset)) #define SR_RX_FIFO_FULL 0x02 /* receive FIFO full */
#define IO_SERIAL_RX_FIFO IO_SERIAL(XUL_RX_FIFO_OFFSET) #define UARTLITE_STATUS (CONFIG_SERIAL_BASE + STATUS_REG_OFFSET)
#define IO_SERIAL_TX_FIFO IO_SERIAL(XUL_TX_FIFO_OFFSET) #define UARTLITE_TX_FIFO (CONFIG_SERIAL_BASE + TX_FIFO_OFFSET)
#define IO_SERIAL_STATUS IO_SERIAL(XUL_STATUS_REG_OFFSET) #define UARTLITE_RX_FIFO (CONFIG_SERIAL_BASE + RX_FIFO_OFFSET)
#define IO_SERIAL_CONTROL IO_SERIAL(XUL_CONTROL_REG_OFFSET)
int serial_init(void) int serial_init(void)
{ {
@ -50,9 +54,10 @@ void serial_setbrg(void)
void serial_putc(const char c) void serial_putc(const char c)
{ {
if (c == '\n') serial_putc('\r'); if (c == '\n')
while (IO_SERIAL_STATUS & XUL_SR_TX_FIFO_FULL); serial_putc('\r');
IO_SERIAL_TX_FIFO = (unsigned char) (c & 0xff); while (in_be32(UARTLITE_STATUS) & SR_TX_FIFO_FULL);
out_be32(UARTLITE_TX_FIFO, (unsigned char) (c & 0xff));
} }
void serial_puts(const char * s) void serial_puts(const char * s)
@ -64,13 +69,13 @@ void serial_puts(const char * s)
int serial_getc(void) int serial_getc(void)
{ {
while (!(IO_SERIAL_STATUS & XUL_SR_RX_FIFO_VALID_DATA)); while (!(in_be32(UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA));
return IO_SERIAL_RX_FIFO & 0xff; return in_be32(UARTLITE_RX_FIFO) & 0xff;
} }
int serial_tstc(void) int serial_tstc(void)
{ {
return (IO_SERIAL_STATUS & XUL_SR_RX_FIFO_VALID_DATA); return (in_be32(UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA);
} }
#endif /* CONFIG_MICROBLZE */ #endif /* CONFIG_MICROBLZE */

2
include/asm-microblaze/io.h
View File

@ -16,6 +16,8 @@
#ifndef __MICROBLAZE_IO_H__ #ifndef __MICROBLAZE_IO_H__
#define __MICROBLAZE_IO_H__ #define __MICROBLAZE_IO_H__
#include <asm/types.h>
#define IO_SPACE_LIMIT 0xFFFFFFFF #define IO_SPACE_LIMIT 0xFFFFFFFF
#define readb(addr) \ #define readb(addr) \