Changeset 2a7e204 in rtems
- Timestamp:
- 03/31/04 04:38:00 (20 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- 0f458a3
- Parents:
- f74d9f1f
- Location:
- c/src/lib/libbsp/m68k/mvme167
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
c/src/lib/libbsp/m68k/mvme167/ChangeLog
rf74d9f1f r2a7e204 1 2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org> 2 3 * clock/ckinit.c, console/console-recording.h, console/console.c, 4 fatal/bspfatal.c, include/fatal.h, network/network.c, 5 network/uti596.h, startup/bspstart.c, timer/timer.c: Convert to 6 using c99 fixed size types. 7 1 8 2004-03-05 Joel Sherrill <joel@OARcorp.com> 2 9 -
c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
rf74d9f1f r2a7e204 57 57 * VMEchip2 timer #2 ticks since the driver was initialized. 58 58 */ 59 volatile rtems_unsigned32Clock_driver_ticks;59 volatile uint32_t Clock_driver_ticks; 60 60 61 61 … … 69 69 * ticks cannot occur more frequently than every 1 millisecond. 70 70 */ 71 rtems_unsigned32Clock_isrs;71 uint32_t Clock_isrs; 72 72 73 73 … … 127 127 } 128 128 /* Reset the counter */ 129 Clock_isrs = ( rtems_unsigned32)-i;129 Clock_isrs = (uint32_t)-i; 130 130 } 131 131 else … … 250 250 void *pargp) 251 251 { 252 rtems_unsigned32isrlevel;252 uint32_t isrlevel; 253 253 rtems_libio_ioctl_args_t *args = pargp; 254 254 -
c/src/lib/libbsp/m68k/mvme167/console/console-recording.h
rf74d9f1f r2a7e204 140 140 unsigned char initial_ier; 141 141 unsigned char final_ier; 142 rtems_unsigned8txEmpty;142 uint8_t txEmpty; 143 143 } tx_isr_info; 144 144 struct cd2401_tx_isr_spurious_info { … … 181 181 struct cd2401_first_open_info { 182 182 unsigned char channel; 183 rtems_unsigned8init_count;183 uint8_t init_count; 184 184 } first_open_info; 185 185 struct cd2401_last_close_info { 186 186 unsigned char channel; 187 rtems_unsigned8init_count;187 uint8_t init_count; 188 188 } last_close_info; 189 189 struct cd2401_start_remote_tx_info { … … 195 195 struct cd2401_set_attribute_info { 196 196 int minor; 197 rtems_unsigned8need_reinit;198 rtems_unsigned8txEmpty;199 rtems_unsigned8csize;200 rtems_unsigned8cstopb;201 rtems_unsigned8parodd;202 rtems_unsigned8parenb;203 rtems_unsigned8ignpar;204 rtems_unsigned8inpck;205 rtems_unsigned8hw_flow_ctl;206 rtems_unsigned8sw_flow_ctl;207 rtems_unsigned8extra_flow_ctl;208 rtems_unsigned8icrnl;209 rtems_unsigned8igncr;210 rtems_unsigned8inlcr;211 rtems_unsigned8brkint;212 rtems_unsigned8ignbrk;213 rtems_unsigned8parmrk;214 rtems_unsigned8istrip;215 rtems_unsigned16tx_period;216 rtems_unsigned16rx_period;217 rtems_unsigned32out_baud;218 rtems_unsigned32in_baud;197 uint8_t need_reinit; 198 uint8_t txEmpty; 199 uint8_t csize; 200 uint8_t cstopb; 201 uint8_t parodd; 202 uint8_t parenb; 203 uint8_t ignpar; 204 uint8_t inpck; 205 uint8_t hw_flow_ctl; 206 uint8_t sw_flow_ctl; 207 uint8_t extra_flow_ctl; 208 uint8_t icrnl; 209 uint8_t igncr; 210 uint8_t inlcr; 211 uint8_t brkint; 212 uint8_t ignbrk; 213 uint8_t parmrk; 214 uint8_t istrip; 215 uint16_t tx_period; 216 uint16_t rx_period; 217 uint32_t out_baud; 218 uint32_t in_baud; 219 219 } set_attribute_info; 220 220 struct cd2401_drain_output_info { 221 rtems_unsigned8txEmpty;222 rtems_unsigned8own_buf_A;223 rtems_unsigned8own_buf_B;221 uint8_t txEmpty; 222 uint8_t own_buf_A; 223 uint8_t own_buf_B; 224 224 } drain_output_info; 225 225 struct cd2401_delay_info { … … 273 273 unsigned char initial_ier, 274 274 unsigned char final_ier, 275 rtems_unsigned8txEmpty275 uint8_t txEmpty 276 276 ) 277 277 { … … 362 362 unsigned char ch, 363 363 unsigned char status, 364 rtems_unsigned32spur_dev,365 rtems_unsigned32spur_cnt364 uint32_t spur_dev, 365 uint32_t spur_cnt 366 366 ) 367 367 { … … 381 381 void cd2401_record_re_isr_spurious_info( 382 382 unsigned char ch, 383 rtems_unsigned32spur_dev,384 rtems_unsigned32spur_cnt383 uint32_t spur_dev, 384 uint32_t spur_cnt 385 385 ) 386 386 { … … 399 399 void cd2401_record_modem_isr_spurious_info( 400 400 unsigned char ch, 401 rtems_unsigned32spur_dev,402 rtems_unsigned32spur_cnt401 uint32_t spur_dev, 402 uint32_t spur_cnt 403 403 ) 404 404 { … … 417 417 void cd2401_record_first_open_info( 418 418 unsigned char ch, 419 rtems_unsigned8init_count419 uint8_t init_count 420 420 ) 421 421 { … … 433 433 void cd2401_record_last_close_info( 434 434 unsigned char ch, 435 rtems_unsigned8init_count435 uint8_t init_count 436 436 ) 437 437 { … … 477 477 void cd2401_record_set_attributes_info( 478 478 int minor, 479 rtems_unsigned8need_reinit,480 rtems_unsigned8csize,481 rtems_unsigned8cstopb,482 rtems_unsigned8parodd,483 rtems_unsigned8parenb,484 rtems_unsigned8ignpar,485 rtems_unsigned8inpck,486 rtems_unsigned8hw_flow_ctl,487 rtems_unsigned8sw_flow_ctl,488 rtems_unsigned8extra_flow_ctl,489 rtems_unsigned8icrnl,490 rtems_unsigned8igncr,491 rtems_unsigned8inlcr,492 rtems_unsigned8brkint,493 rtems_unsigned8ignbrk,494 rtems_unsigned8parmrk,495 rtems_unsigned8istrip,496 rtems_unsigned16tx_period,497 rtems_unsigned16rx_period,498 rtems_unsigned32out_baud,499 rtems_unsigned32in_baud479 uint8_t need_reinit, 480 uint8_t csize, 481 uint8_t cstopb, 482 uint8_t parodd, 483 uint8_t parenb, 484 uint8_t ignpar, 485 uint8_t inpck, 486 uint8_t hw_flow_ctl, 487 uint8_t sw_flow_ctl, 488 uint8_t extra_flow_ctl, 489 uint8_t icrnl, 490 uint8_t igncr, 491 uint8_t inlcr, 492 uint8_t brkint, 493 uint8_t ignbrk, 494 uint8_t parmrk, 495 uint8_t istrip, 496 uint16_t tx_period, 497 uint16_t rx_period, 498 uint32_t out_baud, 499 uint32_t in_baud 500 500 ) 501 501 { … … 533 533 534 534 void cd2401_record_drain_output_info( 535 rtems_unsigned8txEmpty,536 rtems_unsigned8own_buf_A,537 rtems_unsigned8own_buf_B535 uint8_t txEmpty, 536 uint8_t own_buf_A, 537 uint8_t own_buf_B 538 538 ) 539 539 { -
c/src/lib/libbsp/m68k/mvme167/console/console.c
rf74d9f1f r2a7e204 136 136 /* Utility functions */ 137 137 void cd2401_udelay( unsigned long delay ); 138 void cd2401_chan_cmd( rtems_unsigned8 channel, rtems_unsigned8 cmd, rtems_unsigned8wait );139 rtems_unsigned16 cd2401_bitrate_divisor( rtems_unsigned32 clkrate, rtems_unsigned32* bitrate );138 void cd2401_chan_cmd( uint8_t channel, uint8_t cmd, uint8_t wait ); 139 uint16_t cd2401_bitrate_divisor( uint32_t clkrate, uint32_t * bitrate ); 140 140 void cd2401_initialize( void ); 141 141 void cd2401_interrupts_initialize( rtems_boolean enable ); … … 169 169 int len; /* Record nb of chars being TX'ed */ 170 170 const char *buf; /* Record where DMA is coming from */ 171 rtems_unsigned32spur_cnt; /* Nb of spurious ints so far */172 rtems_unsigned32spur_dev; /* Indo on last spurious int */173 rtems_unsigned32buserr_addr; /* Faulting address */174 rtems_unsigned32buserr_type; /* Reason of bus error during DMA */175 rtems_unsigned8own_buf_A; /* If true, buffer A belongs to the driver */176 rtems_unsigned8own_buf_B; /* If true, buffer B belongs to the driver */177 rtems_unsigned8txEmpty; /* If true, the output FIFO should be empty */171 uint32_t spur_cnt; /* Nb of spurious ints so far */ 172 uint32_t spur_dev; /* Indo on last spurious int */ 173 uint32_t buserr_addr; /* Faulting address */ 174 uint32_t buserr_type; /* Reason of bus error during DMA */ 175 uint8_t own_buf_A; /* If true, buffer A belongs to the driver */ 176 uint8_t own_buf_B; /* If true, buffer B belongs to the driver */ 177 uint8_t txEmpty; /* If true, the output FIFO should be empty */ 178 178 } CD2401_Channel_Info[4]; 179 179 … … 187 187 * section on every startup. 188 188 */ 189 rtems_unsigned8Init_count;189 uint8_t Init_count; 190 190 191 191 … … 256 256 */ 257 257 void cd2401_chan_cmd( 258 rtems_unsigned8channel,259 rtems_unsigned8cmd,260 rtems_unsigned8wait258 uint8_t channel, 259 uint8_t cmd, 260 uint8_t wait 261 261 ) 262 262 { … … 292 292 * specified bitrate. 293 293 */ 294 rtems_unsigned16cd2401_bitrate_divisor(295 rtems_unsigned32clkrate,296 rtems_unsigned32* bitrate297 ) 298 { 299 rtems_unsigned32divisor;300 rtems_unsigned16clksource;294 uint16_t cd2401_bitrate_divisor( 295 uint32_t clkrate, 296 uint32_t * bitrate 297 ) 298 { 299 uint32_t divisor; 300 uint16_t clksource; 301 301 302 302 divisor = *bitrate << 3; /* temporary; multiply by 8 for CLK/8 */ … … 466 466 ) 467 467 { 468 rtems_unsigned8ch;468 uint8_t ch; 469 469 470 470 /* Get interrupting channel ID */ … … 502 502 ) 503 503 { 504 rtems_unsigned8ch;504 uint8_t ch; 505 505 506 506 /* Get interrupting channel ID */ … … 538 538 { 539 539 char c; 540 rtems_unsigned8ch, status, nchars, i, total;540 uint8_t ch, status, nchars, i, total; 541 541 char buffer[256]; 542 542 … … 585 585 ) 586 586 { 587 rtems_unsigned8ch, status, buserr, initial_ier, final_ier;587 uint8_t ch, status, buserr, initial_ier, final_ier; 588 588 589 589 status = cd2401->tisr; … … 616 616 (vector << 24) | (buserr << 16) | (cd2401->tir << 8) | cd2401->tisr; 617 617 CD2401_Channel_Info[ch].buserr_addr = 618 ((( rtems_unsigned32)cd2401->tcbadru) << 16) | cd2401->tcbadrl;618 (((uint32_t)cd2401->tcbadru) << 16) | cd2401->tcbadrl; 619 619 620 620 cd2401->teoir = 0x80; /* EOI - terminate bad buffer */ … … 821 821 ) 822 822 { 823 rtems_unsigned8csize, cstopb, parodd, parenb, ignpar, inpck;824 rtems_unsigned8hw_flow_ctl, sw_flow_ctl, extra_flow_ctl;825 rtems_unsigned8icrnl, igncr, inlcr, brkint, ignbrk, parmrk, istrip;826 rtems_unsigned8need_reinitialization = FALSE;827 rtems_unsigned8read_enabled;828 rtems_unsigned16tx_period, rx_period;829 rtems_unsigned32out_baud, in_baud;823 uint8_t csize, cstopb, parodd, parenb, ignpar, inpck; 824 uint8_t hw_flow_ctl, sw_flow_ctl, extra_flow_ctl; 825 uint8_t icrnl, igncr, inlcr, brkint, ignbrk, parmrk, istrip; 826 uint8_t need_reinitialization = FALSE; 827 uint8_t read_enabled; 828 uint16_t tx_period, rx_period; 829 uint32_t out_baud, in_baud; 830 830 rtems_interrupt_level level; 831 831 … … 1203 1203 CD2401_Channel_Info[minor].len = len; 1204 1204 CD2401_Channel_Info[minor].buf = buf; 1205 cd2401->atbadru = ( rtems_unsigned16)( ( (rtems_unsigned32) buf ) >> 16 );1206 cd2401->atbadrl = ( rtems_unsigned16)( (rtems_unsigned32) buf );1205 cd2401->atbadru = (uint16_t)( ( (uint32_t) buf ) >> 16 ); 1206 cd2401->atbadrl = (uint16_t)( (uint32_t) buf ); 1207 1207 cd2401->atbcnt = len; 1208 1208 CD2401_RECORD_WRITE_INFO(( len, buf, 'A' )); … … 1216 1216 CD2401_Channel_Info[minor].len = len; 1217 1217 CD2401_Channel_Info[minor].buf = buf; 1218 cd2401->btbadru = ( rtems_unsigned16)( ( (rtems_unsigned32) buf ) >> 16 );1219 cd2401->btbadrl = ( rtems_unsigned16)( (rtems_unsigned32) buf );1218 cd2401->btbadru = (uint16_t)( ( (uint32_t) buf ) >> 16 ); 1219 cd2401->btbadrl = (uint16_t)( (uint32_t) buf ); 1220 1220 cd2401->btbcnt = len; 1221 1221 CD2401_RECORD_WRITE_INFO(( len, buf, 'B' )); … … 1397 1397 1398 1398 while( (c = _167Bug_pollRead (minor)) == -1 ); 1399 rw_args->buffer[0] = (u nsigned8)c;1399 rw_args->buffer[0] = (uint8_t)c; 1400 1400 if( rw_args->buffer[0] == '\r' ) 1401 1401 rw_args->buffer[0] = '\n'; … … 1432 1432 { 1433 1433 rtems_libio_rw_args_t *rw_args = arg; 1434 u nsigned32i;1434 uint32_t i; 1435 1435 char cr ='\r'; 1436 1436 -
c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c
rf74d9f1f r2a7e204 66 66 Internal_errors_Source the_source, 67 67 rtems_boolean is_internal, 68 rtems_unsigned32the_error68 uint32_t the_error 69 69 ) 70 70 { -
c/src/lib/libbsp/m68k/mvme167/include/fatal.h
rf74d9f1f r2a7e204 16 16 Internal_errors_Source the_source, 17 17 rtems_boolean is_internal, 18 rtems_unsigned32the_error18 uint32_t the_error 19 19 ); -
c/src/lib/libbsp/m68k/mvme167/network/network.c
rf74d9f1f r2a7e204 134 134 static void uti596_CU_dump ( i596_dump_result * ); 135 135 #endif 136 static int uti596_wait ( uti596_softc_ *, u nsigned8);137 static int uti596_issueCA ( uti596_softc_ *, u nsigned8);136 static int uti596_wait ( uti596_softc_ *, uint8_t); 137 static int uti596_issueCA ( uti596_softc_ *, uint8_t); 138 138 static void uti596_addCmd ( i596_cmd * ); 139 139 static void uti596_addPolledCmd ( i596_cmd * ); … … 445 445 static int uti596_wait( 446 446 uti596_softc_ *sc, 447 u nsigned8waitType447 uint8_t waitType 448 448 ) 449 449 { … … 542 542 static int uti596_issueCA( 543 543 uti596_softc_ *sc, 544 u nsigned8waitType544 uint8_t waitType 545 545 ) 546 546 { -
c/src/lib/libbsp/m68k/mvme167/network/uti596.h
rf74d9f1f r2a7e204 305 305 */ 306 306 typedef volatile struct i596_iscp { 307 u nsigned8null1; /* Always zero */308 u nsigned8busy; /* Busy byte */307 uint8_t null1; /* Always zero */ 308 uint8_t busy; /* Busy byte */ 309 309 unsigned short scb_offset; /* Not used in linear mode */ 310 310 unsigned long scb_pointer; /* Swapped pointer to scb */ -
c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
rf74d9f1f r2a7e204 46 46 */ 47 47 void bsp_postdriver_hook( void ); 48 void bsp_libc_init( void *, u nsigned32, int );48 void bsp_libc_init( void *, uint32_t, int ); 49 49 void bsp_pretasking_hook(void); /* m68k version */ 50 50 -
c/src/lib/libbsp/m68k/mvme167/timer/timer.c
rf74d9f1f r2a7e204 40 40 41 41 /* Number of interrupts since timer was re-initialized */ 42 rtems_unsigned32Ttimer_val;42 uint32_t Ttimer_val; 43 43 44 44 /* … … 109 109 int Read_timer() 110 110 { 111 rtems_unsigned32total;111 uint32_t total; 112 112 113 113 total = (Ttimer_val * TICK_INTERVAL) + lcsr->timer_cnt_1;
Note: See TracChangeset
for help on using the changeset viewer.