Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

2010-04-28 Joel Sherrill <joel.sherrilL@OARcorp.com>

Browse Source 
* shared/bootloader/em86.c, shared/bootloader/mm.c,
	shared/console/polled_io.c, shared/irq/irq_init.c,
	shared/startup/bspstart.c: Remove warnings.
This commit is contained in:
Joel Sherrill
2010-04-28 18:51:58 +00:00
parent 14a78df2be
commit 00b5917fe6
6 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/powerpc/ChangeLog
View File

@@ -1,3 +1,9 @@
2010-04-28 Joel Sherrill <joel.sherrilL@OARcorp.com>
* shared/bootloader/em86.c, shared/bootloader/mm.c,
shared/console/polled_io.c, shared/irq/irq_init.c,
shared/startup/bspstart.c: Remove warnings.
2010-04-14 Ralf Corsépius <ralf.corsepius@rtems.org>
* shared/flash/flash.c: Include <unistd.h>.

7
c/src/lib/libbsp/powerpc/shared/bootloader/em86.c
View File

@@ -177,7 +177,8 @@ int bios86pci(x86 * p) {
AH=pcibios_write_config_word(BH, BL, reg, ld_le16(&CX));
break;
case 13: /* write_config_dword */
AH=pcibios_write_config_dword(BH, BL, reg, ld_le32(&ECX));
AH=pcibios_write_config_dword(
BH, BL, reg, ld_le32((uint32_t *)&ECX));
break;
default:
printf("Unimplemented or illegal PCI service call #%d!\n",
@@ -207,7 +208,7 @@ unsigned pop2(x86 *p) {
int int10h(x86 * p) { /* Process BIOS video interrupt */
unsigned vector;
vector=ld_le32((unsigned *)p->vbase+0x10);
vector=ld_le32((uint32_t *)p->vbase+0x10);
if (((vector&0xffff0000)>>16)==0xc000) {
push2(p, p->eflags);
push2(p, p->cs);
@@ -528,7 +529,7 @@ void em86_main(struct pci_dev *dev){
*(u_int *)(p->ssbase+ld_le16(&SP)) = UINT_MAX;
/* Interrupt for BIOS EGA services is 0xf000:0xf065 (int 0x10) */
st_le32((u_int *)p->vbase + 0x10, 0xf000f065);
st_le32((uint32_t *)p->vbase + 0x10, 0xf000f065);
/* Enable the ROM, read it and disable it immediately */
pci_bootloader_read_config_dword(dev, PCI_ROM_ADDRESS, &saved_rom);

5
c/src/lib/libbsp/powerpc/shared/bootloader/mm.c
View File

@@ -46,6 +46,9 @@
#include <libcpu/page.h>
#include <limits.h>
extern void (tlb_handlers)(void);
extern void (_handler_glue)(void);
/* We use our own kind of simple memory areas for the loader, but
* we want to avoid potential clashes with kernel includes.
* Here a map maps contiguous areas from base to end,
@@ -706,8 +709,6 @@ void mm_init(u_long image_size)
u_long lowpage=ULONG_MAX, highpage;
struct _mm_private *mm = (struct _mm_private *) bd->mm_private;
RESIDUAL * res=bd->residual;
extern void (tlb_handlers)(void);
extern void (_handler_glue)(void);
int i;
map *p;

2
c/src/lib/libbsp/powerpc/shared/console/polled_io.c
View File

@@ -1094,7 +1094,7 @@ int k_vsprintf(char *buf, const char *fmt, va_list args)
n = (short) n;
else
n = (unsigned short) n;
} else if (! flags & LONG) {
} else if (!(flags & LONG)) {
/* Here the compiler correctly removes this
* do nothing code on 32 bit PPC.
*/

32
c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
View File

@@ -39,23 +39,31 @@ pci_isa_bridge_device* via_82c586 = 0;
static pci_isa_bridge_device bridge;
/*
* default on/off function
*/
static void nop_func(void){}
/*
* default isOn function
*/
static int not_connected(void) {return 0;}
/*
* default possible isOn function
static int connected(void) {return 1;}
* default methods
*/
static void nop_hdl(rtems_irq_hdl_param ignored)
{
}
static void nop_irq_enable(const struct __rtems_irq_connect_data__*ignored)
{
}
static int irq_is_connected(const struct __rtems_irq_connect_data__*ignored)
{
return 0;
}
static rtems_irq_connect_data rtemsIrq[BSP_IRQ_NUMBER];
static rtems_irq_global_settings initial_config;
static rtems_irq_connect_data defaultIrq = {
/* vectorIdex, hdl , handle , on , off , isOn */
0, nop_func , NULL , nop_func , nop_func , not_connected
0, /* vector */
nop_hdl, /* hdl */
NULL, /* handle */
nop_irq_enable, /* on */
nop_irq_enable, /* off */
irq_is_connected /* isOn */
#ifdef BSP_SHARED_HANDLER_SUPPORT
, NULL /* next_handler */
#endif

7
c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
View File

@@ -17,8 +17,6 @@
* $Id$
*/
#warning The interrupt disable mask is now stored in SPRG0, please verify that this is compatible to this BSP (see also bootcard.c).
#include <string.h>
#include <bsp.h>
@@ -127,8 +125,8 @@ unsigned int EUMBBAR;
* Processor Address Map B (CHRP).
*/
unsigned int get_eumbbar(void) {
out_le32( (uint32_t*)0xfec00000, 0x80000078 );
return in_le32( (uint32_t*)0xfee00000 );
out_le32( (volatile unsigned *)0xfec00000, 0x80000078 );
return in_le32( (volatile unsigned *)0xfee00000 );
}
#endif
@@ -309,7 +307,6 @@ void bsp_start( void )
#endif
/* See above */
#warning The interrupt disable mask is now stored in SPRG0, please verify that this is compatible to this BSP (see also bootcard.c).
BSP_mem_size = residualCopy.TotalMemory;
BSP_bus_frequency = residualCopy.VitalProductData.ProcessorBusHz;