sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Progress with DM320

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@117 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2007-03-21 23:06:29 +00:00
parent fb91e7397a
commit de942791be
8 changed files with 9 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/c5471/src/up_doirq.c
View File

@ -97,7 +97,6 @@ void up_doirq(int irq, uint32* regs)
* disabled.
*/
current_regs = NULL;
up_enable_irq(irq);
}
up_ledoff(LED_INIRQ);

5
arch/dm320/defconfig
View File

@ -38,13 +38,12 @@
# CONFIG_ARCH - identifies the arch subdirectory
# CONFIG_ARCH_name - for use in C code
# CONFIG_ROM_VECTORS - unique to dm320
# CONFIG_DRAM_START/SIZE - Describes the installed DRAM.
# CONFIG_DRAM_SIZE - Describes the installed DRAM.
# CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
#
CONFIG_ARCH=dm320
CONFIG_ARCH_DM320=y
CONFIG_ROM_VECTORS=n
CONFIG_DRAM_START=0x01000000
CONFIG_DRAM_SIZE=0x01000000
CONFIG_DRAM_NUTTXENTRY=0x01008000
CONFIG_ARCH_STACKDUMP=y
@ -117,7 +116,7 @@ CONFIG_START_YEAR=2007
CONFIG_START_MONTH=2
CONFIG_START_DAY=13
CONFIG_JULIAN_TIME=n
CONFIG_DEV_CONSOLE=n
CONFIG_DEV_CONSOLE=y
#
# The following can be used to disable categories of

2
arch/dm320/ld.script
View File

@ -39,7 +39,7 @@ SECTIONS
{
/* The OS entry point is here */
. = 0x01008000;
. = 0x00008000;
.text : {
_stext = ABSOLUTE(.);
*(.text)

3
arch/dm320/src/up_allocateheap.c
View File

@ -41,6 +41,7 @@
#include <sys/types.h>
#include <debug.h>
#include <nuttx/arch.h>
#include "dm320.h"
#include "up_internal.h"
/************************************************************
@ -73,5 +74,5 @@
void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
{
*heap_start = (FAR void*)g_heapbase;
*heap_size = (CONFIG_DRAM_START + CONFIG_DRAM_SIZE) - g_heapbase;
*heap_size = (DM320_SDRAM_VADDR + CONFIG_DRAM_SIZE) - g_heapbase;
}

1
arch/dm320/src/up_doirq.c
View File

@ -96,7 +96,6 @@ void up_doirq(int irq, uint32* regs)
* disabled.
*/
current_regs = NULL;
up_enable_irq(irq);
}
#endif

2
arch/dm320/src/up_internal.h
View File

@ -53,7 +53,7 @@
#undef CONFIG_SUPPRESS_TIMER_INTS /* No timer */
#undef CONFIG_SUPPRESS_SERIAL_INTS /* Console will poll */
#undef CONFIG_SUPPRESS_UART_CONFIG /* Do not reconfig UART */
#undef CONFIG_DUMP_ON_EXIT /* Dump task state on exit */
#define CONFIG_DUMP_ON_EXIT 1 /* Dump task state on exit */
/************************************************************
* Public Types

7
arch/dm320/src/up_serial.c
View File

@ -281,7 +281,7 @@ static inline void up_enablebreaks(struct up_dev_s *priv, boolean enable)
static int up_setup(struct uart_dev_s *dev)
{
#ifdef CONFIG_SUPPRESS_UART_CONFIG
struct up_dev_s *priv = (struct up_dev_s*)CONSOLE_DEV.priv;
struct up_dev_s *priv = (struct up_dev_s*)dev->priv;
uint16 brsr;
/* Clear fifos */
@ -292,7 +292,7 @@ static int up_setup(struct uart_dev_s *dev)
/* Set rx and tx triggers */
up_serialout(priv, UART_DM320_RFCR, UART_RFCR_RTL_1);
up_serialout(priv, UART_DM320_TFCR, UART_TFCR_TTL_1);
up_serialout(priv, UART_DM320_TFCR, UART_TFCR_TTL_16);
/* Set up the MSR */
@ -391,7 +391,7 @@ static int up_setup(struct uart_dev_s *dev)
static void up_shutdown(struct uart_dev_s *dev)
{
struct up_dev_s *priv = (struct up_dev_s*)CONSOLE_DEV.priv;
struct up_dev_s *priv = (struct up_dev_s*)dev->priv;
up_disableuartint(priv, NULL);
}
@ -415,7 +415,6 @@ static int up_interrupt(int irq, void *context)
uint16 status;
int passes;
if (g_uart1port.irq == irq)
{
dev = &g_uart1port;

44
drivers/serial.c
View File

@ -90,24 +90,6 @@ struct file_operations g_serialops =
* Private Functions
************************************************************************************/
/************************************************************************************
* Name: uart_waittxfifonotfull
************************************************************************************/
#if defined(CONFIG_SUPPRESS_INTERRUPTS) || defined(CONFIG_SUPPRESS_SERIAL_INTS)
static inline void uart_waittxfifonotfull(uart_dev_t *dev)
{
int tmp;
for (tmp = 1000 ; tmp > 0 ; tmp--)
{
if (uart_txfifonotfull(dev))
{
break;
}
}
}
#endif
/************************************************************************************
* Name: uart_takesem
************************************************************************************/
@ -155,23 +137,6 @@ static void uart_putxmitchar(uart_dev_t *dev, int ch)
}
else
{
#if defined(CONFIG_SUPPRESS_INTERRUPTS) || defined(CONFIG_SUPPRESS_SERIAL_INTS)
/* Transfer some characters with interrupts disabled */
uart_xmitchars(dev);
/* If we unsuccessful in making room in the buffer.
* then transmit the characters with interrupts
* enabled and wait for result.
*/
if (nexthead == dev->xmit.tail)
{
/* Still no space */
uart_waittxfifonotfull(dev);
}
#else
/* Inform the interrupt level logic that we are waiting */
dev->xmitwaiting = TRUE;
@ -185,7 +150,6 @@ static void uart_putxmitchar(uart_dev_t *dev, int ch)
uart_enabletxint(dev);
uart_takesem(&dev->xmitsem);
uart_disabletxint(dev);
#endif
}
}
}
@ -275,11 +239,7 @@ static ssize_t uart_write(struct file *filep, const char *buffer, size_t buflen)
if (dev->xmit.head != dev->xmit.tail)
{
#if defined(CONFIG_SUPPRESS_INTERRUPTS) || defined(CONFIG_SUPPRESS_SERIAL_INTS)
uart_xmitchars(dev);
#else
uart_enabletxint(dev);
#endif
}
uart_givesem(&dev->xmit.sem);
@ -446,10 +406,8 @@ static int uart_open(struct file *filep)
/* Attache and enabled the IRQ */
#ifndef CONFIG_SUPPRESS_SERIAL_INTS
ret = irq_attach(dev->irq, dev->ops->handler);
if (ret == OK)
#endif
{
/* Mark the io buffers empty */
@ -460,9 +418,7 @@ static int uart_open(struct file *filep)
/* Finally, enable interrupts */
#ifndef CONFIG_SUPPRESS_SERIAL_INTS
up_enable_irq(dev->irq);
#endif
uart_enablerxint(dev);
}
irqrestore(flags);