diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-21 10:43:04 +0000 |
commit | 6128a4aa5e791ed4e0a655bfd346a52d92da7883 (patch) | |
tree | af53ca3f67ce405b6fbc6c98399c8e0c87e01a9e /c/src/lib/libbsp/m68k/mvme162 | |
parent | 2004-04-20 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
download | rtems-6128a4aa5e791ed4e0a655bfd346a52d92da7883.tar.bz2 |
Remove stray white spaces.
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c | 24 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/console/console.c | 32 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/include/bsp.h | 42 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/include/page_table.h | 21 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/startup/page_table.c | 22 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/timer/timer.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/tod/tod.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/tools/sload.c | 54 |
9 files changed, 105 insertions, 102 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c index 8a775ff3f7..9f8ddabb0d 100644 --- a/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c @@ -37,15 +37,15 @@ volatile uint32_t Clock_driver_ticks; /* ticks since initialization */ rtems_isr_entry Old_ticker; void Clock_exit( void ); - + #define CLOCK_VECTOR (VBR0 * 0x10 + 0x9) /* * These are set by clock driver during its init */ - + rtems_device_major_number rtems_clock_major = ~0; rtems_device_minor_number rtems_clock_minor; - + /* * ISR Handler @@ -61,7 +61,7 @@ rtems_isr Clock_isr(rtems_vector_number vector) rtems_clock_tick(); Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; } - else + else Clock_isrs -= 1; } @@ -97,17 +97,17 @@ rtems_device_driver Clock_initialize( ) { Install_clock( Clock_isr ); - + /* * make major/minor avail to others such as shared memory driver */ - + rtems_clock_major = major; rtems_clock_minor = minor; - + return RTEMS_SUCCESSFUL; } - + rtems_device_driver Clock_control( rtems_device_major_number major, rtems_device_minor_number minor, @@ -116,15 +116,15 @@ rtems_device_driver Clock_control( { uint32_t isrlevel; rtems_libio_ioctl_args_t *args = pargp; - + if (args == 0) goto done; - + /* * This is hokey, but until we get a defined interface * to do this, it will just be this simple... */ - + if (args->command == rtems_build_name('I', 'S', 'R', ' ')) { Clock_isr(CLOCK_VECTOR); @@ -135,7 +135,7 @@ rtems_device_driver Clock_control( (void) set_vector( args->buffer, CLOCK_VECTOR, 1 ); rtems_interrupt_enable( isrlevel ); } - + done: return RTEMS_SUCCESSFUL; } diff --git a/c/src/lib/libbsp/m68k/mvme162/console/console.c b/c/src/lib/libbsp/m68k/mvme162/console/console.c index 6ee69d8c64..71c3d2f71e 100644 --- a/c/src/lib/libbsp/m68k/mvme162/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme162/console/console.c @@ -41,9 +41,9 @@ rtems_isr C_Receive_ISR(rtems_vector_number vector) if (ipend == 0x04) port = 0; /* channel B intr pending */ else if (ipend == 0x20) port = 1; /* channel A intr pending */ else return; - + Ring_buffer_Add_character(&Console_Buffer[port], ZREADD(port)); - + if (ZREAD(port, 1) & 0x70) { /* check error stat */ ZWRITE0(port, 0x30); /* reset error */ } @@ -57,7 +57,7 @@ rtems_device_driver console_initialize( { int i; rtems_status_code status; - + /* * Initialise receiver interrupts on both ports */ @@ -69,7 +69,7 @@ rtems_device_driver console_initialize( ZWRITE(i, 1, 0x10); /* int on all Rx chars or special condition */ ZWRITE(i, 9, 8); /* master interrupt enable */ } - + set_vector(C_Receive_ISR, SCC_VECTOR, 1); /* install ISR for ports A and B */ mcchip->vector_base = 0; @@ -81,28 +81,28 @@ rtems_device_driver console_initialize( major, (rtems_device_minor_number) 1 ); - + if (status != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred(status); - + status = rtems_io_register_name( "/dev/tty00", major, (rtems_device_minor_number) 0 ); - + if (status != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred(status); - + status = rtems_io_register_name( "/dev/tty01", major, (rtems_device_minor_number) 1 ); - + if (status != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred(status); - + return RTEMS_SUCCESSFUL; } @@ -116,7 +116,7 @@ rtems_boolean char_ready(int port, char *ch) return FALSE; Ring_buffer_Remove_character( &Console_Buffer[port], *ch ); - + return TRUE; } @@ -127,12 +127,12 @@ rtems_boolean char_ready(int port, char *ch) char inbyte(int port) { unsigned char tmp_char; - + while ( !char_ready(port, &tmp_char) ); return tmp_char; } -/* +/* * This routine transmits a character out the SCC. It no longer supports * XON/XOFF flow control. */ @@ -157,7 +157,7 @@ rtems_device_driver console_open( { return RTEMS_SUCCESSFUL; } - + /* * Close entry point */ @@ -185,7 +185,7 @@ rtems_device_driver console_read( char *buffer; int maximum; int count = 0; - + rw_args = (rtems_libio_rw_args_t *) arg; buffer = rw_args->buffer; @@ -207,7 +207,7 @@ rtems_device_driver console_read( } /* - * write bytes to the serial port. Stdout and stderr are the same. + * write bytes to the serial port. Stdout and stderr are the same. */ rtems_device_driver console_write( diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h index 8ebe643950..1b9f06454c 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h @@ -53,30 +53,30 @@ typedef volatile struct { unsigned char chipREV; unsigned char gen_control; unsigned char vector_base; - + unsigned long timer_cmp_1; unsigned long timer_cnt_1; unsigned long timer_cmp_2; unsigned long timer_cnt_2; - + unsigned char LSB_prescaler_count; unsigned char prescaler_clock_adjust; unsigned char time_ctl_2; unsigned char time_ctl_1; - + unsigned char time_int_ctl_4; unsigned char time_int_ctl_3; unsigned char time_int_ctl_2; unsigned char time_int_ctl_1; - + unsigned char dram_err_int_ctl; unsigned char SCC_int_ctl; unsigned char time_ctl_4; unsigned char time_ctl_3; - + unsigned short DRAM_space_base; unsigned short SRAM_space_base; - + unsigned char DRAM_size; unsigned char DRAM_SRAM_opt; unsigned char SRAM_size; @@ -96,43 +96,43 @@ typedef volatile struct { unsigned long timer_cnt_3; unsigned long timer_cmp_4; unsigned long timer_cnt_4; - + unsigned char bus_clk; unsigned char PROM_acc_time_ctl; unsigned char FLASH_acc_time_ctl; unsigned char ABORT_int_ctl; - + unsigned char RESET_ctl; unsigned char watchdog_timer_ctl; unsigned char acc_watchdog_time_base_sel; unsigned char reserved2; - + unsigned char DRAM_ctl; unsigned char reserved4; unsigned char MPU_status; unsigned char reserved3; - + unsigned long prescaler_count; - + } mcchip_regs; - + #define mcchip ((mcchip_regs * const) 0xFFF42000) /*----------------------------------------------------------------*/ -/* - * SCC Z8523(0) defines and macros - * ------------------------------- +/* + * SCC Z8523(0) defines and macros + * ------------------------------- * Prototypes for the low-level serial io are also included here, * because such stuff is bsp-specific (yet). The function bodies * are in console.c * * NOTE from Eric Vaitl <evaitl@viasat.com>: * - * I dropped RTEMS into a 162FX today (the MVME162-513). The 162FX has a - * bug in the MC2 chip (revision 1) such that the SCC data register is - * not accessible, it has to be accessed indirectly through the SCC - * control register. + * I dropped RTEMS into a 162FX today (the MVME162-513). The 162FX has a + * bug in the MC2 chip (revision 1) such that the SCC data register is + * not accessible, it has to be accessed indirectly through the SCC + * control register. */ enum {portB, portA}; @@ -177,7 +177,7 @@ typedef volatile struct { #define MAX_SHORT_TEST_DURATION 3 /* 3 seconds */ /* - * Define the interrupt mechanism for Time Test 27 + * Define the interrupt mechanism for Time Test 27 * * NOTE: We use software interrupt 0 */ @@ -210,7 +210,7 @@ typedef volatile struct { /* * NOTE: Use the standard Console driver entry */ - + /* * NOTE: Use the standard Clock driver entry */ diff --git a/c/src/lib/libbsp/m68k/mvme162/include/page_table.h b/c/src/lib/libbsp/m68k/mvme162/include/page_table.h index a5685245f2..f434291de3 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/page_table.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/page_table.h @@ -1,10 +1,13 @@ /* * $Id$ * - * This file was submitted by Eric Vaitl <vaitl@viasat.com> and + * This file was submitted by Eric Vaitl <vaitl@viasat.com> and * supports page table initialization. * * $Log$ + * Revision 1.2 1995/12/19 20:10:12 joel + * changes remerged after disk crash -- history lost + * * Revision 1.1 1995/12/19 19:22:36 joel * file lost in crash and re-added * @@ -28,16 +31,16 @@ extern void page_table_teardown(void); extern void page_table_init(void); extern int page_table_map(void *addr, unsigned long size, int cache_type); -enum { - CACHE_WRITE_THROUGH, - CACHE_COPYBACK, +enum { + CACHE_WRITE_THROUGH, + CACHE_COPYBACK, CACHE_NONE_SERIALIZED, - CACHE_NONE + CACHE_NONE }; -enum { - PTM_SUCCESS, - PTM_BAD_ADDR, - PTM_BAD_SIZE, +enum { + PTM_SUCCESS, + PTM_BAD_ADDR, + PTM_BAD_SIZE, PTM_BAD_CACHE, PTM_NO_TABLE_SPACE }; diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c index cc581d62cf..ec26fdf77e 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c @@ -27,7 +27,7 @@ #include <rtems/libio.h> #include <rtems/libcsupport.h> #include <page_table.h> - + /* * The original table from the application and our copy of it with * some changes. @@ -43,7 +43,7 @@ char *rtems_progname; /* * Use the shared implementations of the following routines */ - + void bsp_postdriver_hook(void); void bsp_libc_init( void *, uint32_t, int ); void bsp_pretasking_hook(void); /* m68k version */ diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c b/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c index 35fd0dd6b2..2629aa053c 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c @@ -1,4 +1,4 @@ -/* +/* * $Id$ * * This file was submitted by Eric Vaitl <vaitl@viasat.com>. @@ -85,15 +85,15 @@ static unsigned long *table_alloc(int size){ illegal. */ void page_table_init(){ - + /* put everything in a known state */ page_table_teardown(); root_table=table_alloc(ROOT_TABLE_SIZE); - /* First set up TTR. + /* First set up TTR. base address = 0x80000000 - address mask = 0x7f + address mask = 0x7f Ignore FC2 for match. Noncachable. Not write protected.*/ @@ -117,7 +117,7 @@ void page_table_init(){ asm volatile ("movec %0,%%cacr" :: "d" (0x80008000)); } - + void page_table_teardown(){ next_avail=(unsigned long *)BASE_TABLE_ADDR; /* Turn off paging. Turn off the cache. Flush the cache. Tear down @@ -156,7 +156,7 @@ int page_table_map(void *addr, unsigned long size, int cache_type){ root_index &= 0x7f; if(root_table[root_index]){ - pointer_table = + pointer_table = (unsigned long *) (root_table[root_index] & 0xfffffe00); }else{ if(!(pointer_table=table_alloc(POINTER_TABLE_SIZE))){ @@ -164,21 +164,21 @@ int page_table_map(void *addr, unsigned long size, int cache_type){ } root_table[root_index]=((unsigned long)pointer_table) + 0x03; } - + pointer_index=(unsigned long)addr; pointer_index >>=18; pointer_index &= 0x7f; - + if(pointer_table[pointer_index]){ - page_table = - (unsigned long *) (pointer_table[pointer_index] & + page_table = + (unsigned long *) (pointer_table[pointer_index] & 0xffffff00); }else{ if(!(page_table=table_alloc(PAGE_TABLE_SIZE))){ return PTM_NO_TABLE_SPACE; } pointer_table[pointer_index]= - ((unsigned long)page_table) + 0x03; + ((unsigned long)page_table) + 0x03; } page_index=(unsigned long)addr; diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c index 0b08bd63a3..9072e3ce54 100644 --- a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c @@ -45,7 +45,7 @@ rtems_isr timerisr(); void Timer_initialize() { (void) set_vector( timerisr, VBR0 * 0x10 + 0x8, 0 ); - + Ttimer_val = 0; /* clear timer ISR count */ lcsr->vector_base |= MASK_INT; /* unmask VMEchip2 interrupts */ lcsr->intr_clear |= 0x01000000; /* clear pending interrupt */ @@ -63,7 +63,7 @@ void Timer_initialize() /* (3 countdowns) to start/stop the timer. */ #define LEAST_VALID 10U /* Don't trust a value lower than this */ -int Read_timer() +int Read_timer() { uint32_t total; diff --git a/c/src/lib/libbsp/m68k/mvme162/tod/tod.c b/c/src/lib/libbsp/m68k/mvme162/tod/tod.c index 7eaeac487c..4fe802ffd4 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tod/tod.c +++ b/c/src/lib/libbsp/m68k/mvme162/tod/tod.c @@ -4,7 +4,7 @@ * Author: * COPYRIGHT (C) 1997 * by Katsutoshi Shibuya - BU Denken Co.,Ltd. - Sapporo - JAPAN - * ALL RIGHTS RESERVED + * ALL RIGHTS RESERVED * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -15,7 +15,7 @@ * RTEMS above. * * $Id$ - */ + */ #include <rtems.h> #include <tod.h> diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/sload.c b/c/src/lib/libbsp/m68k/mvme162/tools/sload.c index 1fe0ecd421..4cb1e659de 100644 --- a/c/src/lib/libbsp/m68k/mvme162/tools/sload.c +++ b/c/src/lib/libbsp/m68k/mvme162/tools/sload.c @@ -54,7 +54,7 @@ int MVMEControl(u_long entry, int reset, int go); unsigned int ahdtoi(unsigned char digit) /* converts a hexadecimal char to an integer - * + * * entry : digit = character to convert * : 0..15 = result * : -1 = char is not a digit @@ -77,7 +77,7 @@ unsigned int ahdtoi(unsigned char digit) int issrec(char *str) /* attempts to identify the type of Srecord string passed - * + * * entry : str = pointer to null terminated string * returns : 0,1,2,3,5,7,8,9 for S0..S9 except S6 & S4 * : -1 = invalid header or header not found @@ -106,7 +106,7 @@ int issrec(char *str) int validrec(char *str) /* Tests for a valid srecord. tests checksum & for nondigit characters * doesn't rely on any other srecord routines. - * + * * entry : str = pointer to null terminated string * returns : -1 = srecord contains invalid characters * : -2 = srecord checksum is invalid @@ -141,7 +141,7 @@ int validrec(char *str) void hdr2str(char *sstr, char *pstr) /* converts header record (S0) string into a plain string - * + * * entry : sstr = pointer to S0 string record * exit : pstr = pointer to string long enough to hold string * (caller must allocate enough space for string) @@ -157,7 +157,7 @@ void hdr2str(char *sstr, char *pstr) unsigned long getaddr(char *str) /* returns the address of the srecord in str. assumes record is valid. - * + * * entry : str = pointer to srecord string * exit : address of data, word or long. */ @@ -165,23 +165,23 @@ unsigned long getaddr(char *str) unsigned long addr=0; switch (issrec(str)) { - case 0 : - case 1 : - case 5 : + case 0 : + case 1 : + case 5 : case 9 : addr = ahdtoi(str[4])*0x1000 + ahdtoi(str[5])*0x100 + ahdtoi(str[6])*0x10 + ahdtoi(str[7]); return(addr); - case 2 : + case 2 : case 8 : addr = ahdtoi(str[4])*0x100000 + ahdtoi(str[5])*0x10000 + ahdtoi(str[6])*0x1000 + ahdtoi(str[7])*0x100 + ahdtoi(str[8])*0x10 + ahdtoi(str[9]); return(addr); - case 3 : + case 3 : case 7 : addr = ahdtoi(str[4])*0x10000000 + ahdtoi(str[5])*0x1000000 + ahdtoi(str[6])*0x100000 + ahdtoi(str[7])*0x10000 + ahdtoi(str[8])*0x1000 + ahdtoi(str[9])*0x100 + ahdtoi(str[10])*0x10 + ahdtoi(str[11]); - return(addr); + return(addr); default : return(-1); } } @@ -189,7 +189,7 @@ unsigned long getaddr(char *str) unsigned int datasize(char *str) /* * returns the number of data bytes in the srecord. assumes record is valid. - * + * * entry : str = pointer to srecord string * exit : number of bytes of data in the data field. */ @@ -227,8 +227,8 @@ void usage (void) int MVMEControl(u_long entry, int reset, int go) /* Controls MVME-162 from other VME master: * if entry != 0, loads it as start address - * if go != 0, starts program execution from entry - * if reset != 0, resets mvme162's local bus + * if go != 0, starts program execution from entry + * if reset != 0, resets mvme162's local bus * Depends upon #define'ed GROUP_BASE_ADDRESS and BOARD_BASE_ADDRESS * which in turn are set by the 162-BUG's ENV command. */ @@ -239,7 +239,7 @@ int MVMEControl(u_long entry, int reset, int go) struct gcsr *gcsr_map; pagesize = sysconf(_SC_PAGESIZE); /* mmap likes to be page-aligned */ - + if ((vme = open(vmedev, O_RDWR)) == -1) { perror("open"); fprintf(stderr, "Cannot open vme as %s to access GCSR\n", vmedev); @@ -258,7 +258,7 @@ int MVMEControl(u_long entry, int reset, int go) /* * use GCSR to start execution in MVME162 - * adjust pointer to compensate for page alignement + * adjust pointer to compensate for page alignement */ gcsr_map = (struct gcsr *)((u_long)gcsr_map + (u_long)gcsr_vme % pagesize); @@ -283,10 +283,10 @@ main(int argc, char *argv[]) int i, j, k, result, size, line=0, lastrec=0; long addr, tsize=0, naddr=0, blksize=0, blknum=1; FILE *in; - char infile[256] = ""; + char infile[256] = ""; char vmedev[32] = "/dev/vme32d32"; /* Assume "/dev/vme32d32" */ int vme, verbose = 0, go = 0, reset = 0, havefile = 0; - + /* Parse the command line */ --argc; @@ -325,11 +325,11 @@ main(int argc, char *argv[]) } exit(0); } - + if ((in = fopen(infile, "r")) == NULL) { perror("open"); fprintf(stderr, "Cannot open input file %s\n", infile); - exit(1); + exit(1); } if ((vme = open(vmedev, O_RDWR)) == -1) { @@ -340,12 +340,12 @@ main(int argc, char *argv[]) line++; if (validrec(inpstr) == 0) { switch (issrec(inpstr)) { - case 0 : + case 0 : hdr2str(inpstr, hdrstr); if (verbose) printf("HEADER string = `%s'\n", hdrstr); lastrec=HEADER; break; - case 1 : + case 1 : addr = getaddr(inpstr); size = datasize(inpstr); if (blksize == 0) { @@ -381,7 +381,7 @@ main(int argc, char *argv[]) } } break; - case 2 : + case 2 : addr = getaddr(inpstr); size = datasize(inpstr); if (blksize == 0) { @@ -417,7 +417,7 @@ main(int argc, char *argv[]) } } break; - case 3 : + case 3 : addr = getaddr(inpstr); size = datasize(inpstr); if (blksize == 0) { @@ -453,7 +453,7 @@ main(int argc, char *argv[]) } } break; - case 7 : + case 7 : if (lastrec==DATA19){if (verbose) printf("\t$%04lX\t%lu",naddr-1,blksize);} if (lastrec==DATA28){if (verbose) printf("\t$%06lX\t%lu",naddr-1,blksize);} if (lastrec==DATA37){if (verbose) printf("\t$%08lX\t%lu",naddr-1,blksize);} @@ -463,7 +463,7 @@ main(int argc, char *argv[]) printf("\nExecution address = $%08lX\n", addr); lastrec=TERMINATOR; break; - case 8 : + case 8 : if (lastrec==DATA19){if (verbose) printf("\t$%04lX\t%lu",naddr-1,blksize);} if (lastrec==DATA28){if (verbose) printf("\t$%06lX\t%lu",naddr-1,blksize);} if (lastrec==DATA37){if (verbose) printf("\t$%08lX\t%lu",naddr-1,blksize);} @@ -473,7 +473,7 @@ main(int argc, char *argv[]) printf("\nExecution address = $%06lX\n", addr); lastrec=TERMINATOR; break; - case 9 : + case 9 : if (lastrec==DATA19){if (verbose) printf("\t$%04lX\t%lu",naddr-1,blksize);} if (lastrec==DATA28){if (verbose) printf("\t$%06lX\t%lu",naddr-1,blksize);} if (lastrec==DATA37){if (verbose) printf("\t$%08lX\t%lu",naddr-1,blksize);} |