diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2006-01-12 00:00:38 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2006-01-12 00:00:38 +0000 |
| commit | c2fc65bd57ce22b74f94ee33aa296eaad41dfa98 (patch) | |
| tree | a2a915813b28674bdec16926a9d9ea1997c57798 /c | |
| parent | 2006-01-11 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-c2fc65bd57ce22b74f94ee33aa296eaad41dfa98.tar.bz2 | |
* vmeUniverse/vmeTsi148.c, vmeUniverse/vmeTsi148.h:
Eliminate obsolete types.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/shared/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c | 16 | ||||
| -rw-r--r-- | c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h | 4 |
3 files changed, 17 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog index aa180047a4..cd8334ae39 100644 --- a/c/src/lib/libbsp/shared/ChangeLog +++ b/c/src/lib/libbsp/shared/ChangeLog @@ -1,3 +1,8 @@ +2006-01-11 Till Straumann <strauman@slac.stanford.edu> + + * vmeUniverse/vmeTsi148.c, vmeUniverse/vmeTsi148.h: + Eliminate obsolete types. + 2005-11-09 Ralf Corsepius <ralf.corsepius@rtems.org> * vmeUniverse/vmeUniverse.c: Eliminate obsolete types. diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c index f786e9db93..41b466171b 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c +++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c @@ -529,6 +529,8 @@ char *name = (isout ? "Outbound" : "Inbound"); CHECK_BASE(base,0,-1); + mode = 0; /* silence warning */ + if ( port >= (isout ? TSI148_NUM_OPORTS : TSI148_NUM_IPORTS) ) { uprintf(stderr,"Tsi148 %s Port Cfg: invalid port\n", name); return -1; @@ -584,11 +586,11 @@ char *name = (isout ? "Outbound" : "Inbound"); /* Force to 32-bits */ TSI_WR(base, tsau_reg , 0); - TSI_WR(base, tsau_reg + 0x04, (unsigned32)start); + TSI_WR(base, tsau_reg + 0x04, (uint32_t)start); TSI_WR(base, tsau_reg + 0x08, 0); - TSI_WR(base, tsau_reg + 0x0c, (unsigned32)limit); - TSI_WR(base, tsau_reg + 0x10, (unsigned32)(offst>>32)); - TSI_WR(base, tsau_reg + 0x14, (unsigned32)offst); + TSI_WR(base, tsau_reg + 0x0c, (uint32_t)limit); + TSI_WR(base, tsau_reg + 0x10, (uint32_t)(offst>>32)); + TSI_WR(base, tsau_reg + 0x14, (uint32_t)offst); /* (outbound only:) leave 2eSST broadcast register alone for user to program */ @@ -671,6 +673,8 @@ unsigned long tsau_reg, tat_reg, gran, skip; CHECK_BASE(base,0,-1); + mode = 0; /* silence warning */ + if ( VME_MODE_EXACT_MATCH & as ) { mode_msk = ~0; } else { @@ -1166,7 +1170,7 @@ my_isOn(const rtems_irq_connect_data *arg) } static void -connectIsr(int shared, void (*isr)(void), int pic_line, int slot) +connectIsr(int shared, rtems_irq_hdl isr, int pic_line, int slot) { rtems_irq_connect_data xx; xx.on = my_no_op; /* at _least_ they could check for a 0 pointer */ @@ -1461,7 +1465,7 @@ rtems_id q = 0; int installed = 0; int i, err = 0; int doDisable = 0; -unsigned32 size; +uint32_t size; unsigned long msg; char * irqfmt = "VME IRQ @vector %3i %s"; char * iackfmt = "VME IACK %s"; diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h index 700206ae73..0e2bcc2327 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h +++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h @@ -13,7 +13,7 @@ /* These can be ored with the AM */ -#define VME_MODE_PREFETCH_ENABLE (4<<12) +#define VME_MODE_PREFETCH_ENABLE VME_AM_IS_MEMORY #define VME_MODE_PREFETCH_SIZE(x) (((x)&3)<<12) #define VME_MODE_2eSSTM(x) (((x)&7)<<16) @@ -39,7 +39,7 @@ extern "C" { #endif -typedef volatile unsigned32 BERegister; /* emphasize contents are big endian */ +typedef volatile uint32_t BERegister; /* emphasize contents are big endian */ /* * Scan the PCI busses for the Nth (N=='instance') Tsi148 VME bridge. |