Changeset 3734192 in rtems


Ignore:
Timestamp:
Sep 7, 2007, 2:34:13 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
309cb3b5
Parents:
f6e2e97
Message:

2007-09-07 Daniel Hellstrom <daniel@…>

  • leon_smc91111/leon_smc91111.c, rasta/rasta.c: Remove warnings.
Location:
c/src/lib/libbsp/sparc/leon2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/leon2/ChangeLog

    rf6e2e97 r3734192  
     12007-09-07      Daniel Hellstrom <daniel@gaisler.com>
     2
     3        * leon_smc91111/leon_smc91111.c, rasta/rasta.c: Remove warnings.
     4
    152007-09-06      Daniel Hellstrom <daniel@gaisler.com>
    26
  • c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c

    rf6e2e97 r3734192  
    66
    77#include <bsp.h>
    8 #include <stdio.h>
     8#include <rtems/bspIo.h>
    99
    1010#include <stdlib.h>
  • c/src/lib/libbsp/sparc/leon2/rasta/rasta.c

    rf6e2e97 r3734192  
    5959
    6060LEON3_IrqCtrl_Regs_Map *irq = NULL;
    61 LEON_Register_Map      *regs = 0x80000000;
     61LEON_Register_Map      *regs = (LEON_Register_Map *)0x80000000;
    6262
    6363struct gpio_reg *gpio0, *gpio1;
     
    206206
    207207
    208 int rasta_get_gpio(amba_confarea_type *abus, int index, unsigned int *address, int *irq)
     208int rasta_get_gpio(amba_confarea_type *abus, int index, struct gpio_reg **regs, int *irq)
    209209{
    210210  amba_apb_device dev;
     
    219219    return -1;
    220220 
    221   if ( address )
    222     *address = dev.start;
     221  if ( regs )
     222    *regs = (struct gpio_reg *)dev.start;
    223223 
    224224  if ( irq )
     
    262262    pci_read_config_dword(bus, dev, fun, 0x14, &bar1);
    263263
    264     page0 = bar0 + 0x400000;
     264    page0 = (unsigned int *)(bar0 + 0x400000);
    265265    *page0 = 0x80000000;                  /* Point PAGE0 to start of APB       */
    266266
    267     apb_base = bar0+APB2_OFFSET;
     267    apb_base = (unsigned int *)(bar0+APB2_OFFSET);
    268268
    269269/*  apb_base[0] = 0x000002ff;
     
    369369
    370370    /* Find GPIO0 address */
    371     if ( rasta_get_gpio(&abus,0,(unsigned int *)&gpio0,NULL) ){
     371    if ( rasta_get_gpio(&abus,0,&gpio0,NULL) ){
    372372      printk("Failed to get address for RASTA GPIO0\n\r");
    373373      return -1;
     
    375375       
    376376    /* Find GPIO1 address */
    377     if ( rasta_get_gpio(&abus,1,(unsigned int *)&gpio1,NULL) ){
     377    if ( rasta_get_gpio(&abus,1,&gpio1,NULL) ){
    378378      printk("Failed to get address for RASTA GPIO1\n\r");
    379379      return -1;
Note: See TracChangeset for help on using the changeset viewer.