OpenCores
URL https://opencores.org/ocsvn/or1k/or1k/trunk

Subversion Repositories or1k

Compare Revisions

  • This comparison shows the changes necessary to convert path
    /
    from Rev 1075 to Rev 1076
    Reverse comparison

Rev 1075 → Rev 1076

/trunk/or1ksim/sim-config.h
46,13 → 46,12
int nuarts;
struct {
char rxfile[STR_SIZE]; /* Filename for RX */
char txfile[STR_SIZE]; /* Filename for TX (required) */
int jitter; /* CZ 250801 - in msecs...time to block */
unsigned long baseaddr; /* Naturally aligned base address */
int irq; /* IRQ of this device */
unsigned long vapi_id; /* VAPI id for this instance */
int uart16550; /* Whether this device is uart 16450 or 16550 */
char channel[STR_SIZE]; /* How to communicate with host */
} uarts[MAX_UARTS];
int ndmas;
/trunk/or1ksim/sim.cfg
614,8 → 614,7
device 0
baseaddr = 0x90000000
irq = 2
rxfile = "uart0.rx"
txfile = "uart0.tx"
channel = "file:uart0.rx,uart0.tx"
jitter = -1 /* async behaviour */
16550 = 1
enddevice
/trunk/or1ksim/configure.in
219,7 → 219,7
INCLUDES="-I\${top_srcdir} -I\${top_srcdir}/cpu/common -I\${top_srcdir}/cpu/or1k \
-I\${top_srcdir}/cpu/$CPU_ARCH -I\${top_srcdir}/cache -I\${top_srcdir}/mmu \
-I\${top_srcdir}/bpb -I\${top_srcdir}/peripheral -I\${top_srcdir}/tick \
-I\${top_srcdir}/peripheral\channels \
-I\${top_srcdir}/peripheral/channels \
-I\${top_srcdir}/pm -I\${top_srcdir}/pic -I\${top_srcdir}/debug \
-I\${top_srcdir}/vapi -I\${top_srcdir}/support -I\${top_srcdir}/cuc"
AC_SUBST(INCLUDES)
/trunk/or1ksim/sim-config.c
365,8 → 365,8
void end_device ();
void uart_nuarts ();
void uart_baseaddr ();
void uart_rxfile ();
void uart_txfile ();
void uart_channel ();
void uart_newway ();
void uart_jitter ();
void uart_irq ();
void uart_16550 ();
503,8 → 503,9
{2, "irq", "=%i", uart_irq, (void *)(&tempL), 0},
{2, "16550", "=%i", uart_16550, (void *)(&tempL), 0},
{2, "jitter", "=%i", uart_jitter, (void *)(&tempL), 0},
{2, "rxfile", "=\"%s\"", uart_rxfile, (void *)(&tempS[0]), 0},
{2, "txfile", "=\"%s\"", uart_txfile, (void *)(&tempS[0]), 0},
{2, "channel", "=\"%s\"", uart_channel, (void *)(&tempS[0]), 0},
{2, "txfile", "=\"%s\"", uart_newway, (void *)(&tempS[0]), 0},
{2, "rxfile", "=\"%s\"", uart_newway, (void *)(&tempS[0]), 0},
{2, "vapi_id", "=0x%x", uart_vapi_id, (void *)(&tempUL), 0},
 
{3, "ndmas", "=%i", dma_ndmas, (void *)(&tempL), CPF_GLOBAL},
762,18 → 763,16
ERROR("invalid device number.");
}
 
void uart_rxfile () {
void uart_channel () {
if (current_device >= 0 && current_device < config.nuarts)
strcpy (config.uarts[current_device].rxfile, tempS);
strcpy (config.uarts[current_device].channel, tempS);
else
ERROR("invalid device number.");
}
 
void uart_txfile () {
if (current_device >= 0 && current_device < config.nuarts)
strcpy (config.uarts[current_device].txfile, tempS);
else
ERROR("invalid device number.");
void uart_newway () {
ERROR(" txfile and rxfile and now obsolete.\n\tUse 'channel = \"file:rxfile,txfile\"' instead.");
exit(1);
}
 
void uart_vapi_id () {
1479,8 → 1478,8
fprintf (f, " nuarts:%i, uarts:{", config.nuarts);
comma = 0;
for (i = 0; i < config.nuarts; i++) {
fprintf (f, "%s\n {rxfile:\"%s\", txfile:\"%s\", jitter:%i, baseaddr:0x%08x, irq:%i, vapi_id:0x%08x, uart16550:%i}",
comma ? "," :"", config.uarts[i].rxfile, config.uarts[i].txfile, config.uarts[i].jitter, config.uarts[i].baseaddr, config.uarts[i].irq,
fprintf (f, "%s\n {channel:\"%s\", jitter:%i, baseaddr:0x%08x, irq:%i, vapi_id:0x%08x, uart16550:%i}",
comma ? "," :"", config.uarts[i].channel, config.uarts[i].jitter, config.uarts[i].baseaddr, config.uarts[i].irq,
config.uarts[i].vapi_id, config.uarts[i].uart16550);
comma = 1;
}
/trunk/uclinux/uClinux-2.0.x/sim.cfg
465,8 → 465,7
device 0
baseaddr = 0x90000000
irq = 2
rxfile = "uart0.rx"
txfile = "uart0.tx"
channel = "file:uart0.rx,uart0.tx"
jitter = -1 /* async behaviour */
16550 = 1
enddevice

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.