Changeset 9700578 in rtems for c/src/lib/libbsp/m68k/gen68302

Timestamp:

10/30/95 21:54:45 (28 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

c4808ca

Parents:

ea74482

Message:

SPARC port passes all tests

Location:

c/src/lib/libbsp/m68k/gen68302

Files:

• clock/ckinit.c (modified) (4 diffs)
• start/start302.s (modified) (2 diffs)
• start302/start302.s (modified) (2 diffs)
• startup/bspstart.c (modified) (1 diff)

c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c

@@ -90 +90 @@
 
   if ( BSP_Configuration.ticks_per_timeslice ) {
-/*  set_vector( clock_isr, CLOCK_VECTOR, 1 );*/
+   set_vector( clock_isr, CLOCK_VECTOR, 1 );
 
     m302.reg.trr1 = TRR1_VAL;           /* set timer reference register */
@@ -101 +101 @@
     atexit( Clock_exit );
   }
-}
-
-void ReInstall_clock(
-  rtems_isr_entry clock_isr
-)
-{
-  rtems_unsigned32 isrlevel;
- 
-  rtems_interrupt_disable( isrlevel );
-   /* (void) set_vector( clock_isr, CLOCK_VECTOR, 1 ); */
-  rtems_interrupt_enable( isrlevel );
 }
 
@@ -146 +135 @@
 )
 {
+    rtems_unsigned32 isrlevel;
     rtems_libio_ioctl_args_t *args = pargp;
  
@@ -162 +152 @@
     else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
     {
-        ReInstall_clock(args->buffer);
+      rtems_interrupt_disable( isrlevel );
+       (void) set_vector( args->buffer, CLOCK_VECTOR, 1 );
+      rtems_interrupt_enable( isrlevel );
     }
  

c/src/lib/libbsp/m68k/gen68302/start/start302.s

@@ -194 +194 @@
 |               move.l  #_cnsl_isr,vbase+0x028  | SCC2
                 move.l  #timerisr,vbase+0x018   | Timer ISR
-                move.l  #RTC_ISR,vbase+0x024    | Real Time Clock ISR
 
         |
@@ -237 +236 @@
 
         nop
-RTC_ISR:
-        movem.l  d0-d1/a0-a1,a7@-    | save d0-d1,a0-a1
-        addql   #1,_ISR_Nest_level       | one nest level deeper
-        addql   #1,_Thread_Dispatch_disable_level
-                                         | disable multitasking
-
-        jbsr    Clock_isr               | invoke the user ISR
-        jmp     _ISR_Exit
 END_CODE
 

c/src/lib/libbsp/m68k/gen68302/start302/start302.s

@@ -194 +194 @@
 |               move.l  #_cnsl_isr,vbase+0x028  | SCC2
                 move.l  #timerisr,vbase+0x018   | Timer ISR
-                move.l  #RTC_ISR,vbase+0x024    | Real Time Clock ISR
 
         |
@@ -237 +236 @@
 
         nop
-RTC_ISR:
-        movem.l  d0-d1/a0-a1,a7@-    | save d0-d1,a0-a1
-        addql   #1,_ISR_Nest_level       | one nest level deeper
-        addql   #1,_Thread_Dispatch_disable_level
-                                         | disable multitasking
-
-        jbsr    Clock_isr               | invoke the user ISR
-        jmp     _ISR_Exit
 END_CODE
 

c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c

@@ -131 +131 @@
 {
   int stdin_fd, stdout_fd, stderr_fd;
+  int error_code;
+ 
+  error_code = 'S' << 24 | 'T' << 16;
  
   if ((stdin_fd = __open("/dev/console", O_RDONLY, 0)) == -1)
-    rtems_fatal_error_occurred('STD0');
+    rtems_fatal_error_occurred( error_code | 'D' << 8 | '0' );
  
   if ((stdout_fd = __open("/dev/console", O_WRONLY, 0)) == -1)
-    rtems_fatal_error_occurred('STD1');
+    rtems_fatal_error_occurred( error_code | 'D' << 8 | '1' );
  
   if ((stderr_fd = __open("/dev/console", O_WRONLY, 0)) == -1)
-    rtems_fatal_error_occurred('STD2');
+    rtems_fatal_error_occurred( error_code | 'D' << 8 | '2' );
  
   if ((stdin_fd != 0) || (stdout_fd != 1) || (stderr_fd != 2))
-    rtems_fatal_error_occurred('STIO');
+    rtems_fatal_error_occurred( error_code | 'I' << 8 | 'O' );
 }