RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2007-11-30 Daniel Hellstrom <daniel@gaisler.com>

Browse Source 
* rasta/rasta.c: LEON2 PCI RASTA driver. Changes RASTA PCI interrupt to
	5 from 4. This is to avoid conflict with the LAN9C111 network MAC
	driver using interrupt 4.
This commit is contained in:
Joel Sherrill
2007-11-30 16:51:10 +00:00
parent d805da0ef1
commit 0cec037ece
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/sparc/leon2/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-11-30 Daniel Hellstrom <daniel@gaisler.com>
* rasta/rasta.c: LEON2 PCI RASTA driver. Changes RASTA PCI interrupt to
5 from 4. This is to avoid conflict with the LAN9C111 network MAC
driver using interrupt 4.
2007-09-12 Daniel Hellstrom <daniel@gaisler.com> 2007-09-12 Daniel Hellstrom <daniel@gaisler.com>
* leon_smc91111/leon_smc91111.c: LEON2 SMC91111 initialization: PIO * leon_smc91111/leon_smc91111.c: LEON2 SMC91111 initialization: PIO

8
c/src/lib/libbsp/sparc/leon2/rasta/rasta.c
View File

@@ -1,3 +1,7 @@
/*
* $Id$
*/
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
#include <pci.h> #include <pci.h>
#include <rasta.h> #include <rasta.h>
@@ -12,7 +16,7 @@
/* If RASTA_SRAM is defined SRAM will be used, else SDRAM */ /* If RASTA_SRAM is defined SRAM will be used, else SDRAM */
/*#define RASTA_SRAM 1*/ /*#define RASTA_SRAM 1*/
#define RASTA_IRQ 4 #define RASTA_IRQ 5
/* Offset from 0x80000000 (dual bus version) */ /* Offset from 0x80000000 (dual bus version) */
#define AHB1_IOAREA_BASE_ADDR 0x80100000 #define AHB1_IOAREA_BASE_ADDR 0x80100000
@@ -288,7 +292,7 @@ int rasta_register(void)
/* Configure AT697 ioport bit 7 to input pci irq */ /* Configure AT697 ioport bit 7 to input pci irq */
regs->PIO_Direction &= ~(1<<7); regs->PIO_Direction &= ~(1<<7);
regs->PIO_Interrupt = 0x87; /* level sensitive */ regs->PIO_Interrupt |= (0x87<<8); /* level sensitive */
apb_base[0x100] |= 0x40000000; /* Set GRPCI mmap 0x4 */ apb_base[0x100] |= 0x40000000; /* Set GRPCI mmap 0x4 */
apb_base[0x104] = 0x40000000; /* 0xA0000000; Point PAGE1 to RAM */ apb_base[0x104] = 0x40000000; /* 0xA0000000; Point PAGE1 to RAM */