Changeset c610a1f3 in rtems

Timestamp:

09/21/98 00:24:51 (25 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

3f929757

Parents:

04bc5d9

Message:

Update from Eric Valette <valette@…>:

Here are patches that bring 980911 back to what I think is a correct
version of raw IDT management as well as a correct initialisation
of video console and rtems managed interrupts.

Location:

c/src/lib/libbsp/i386

Files:

• pc386/start/start16.s (modified) (1 diff)
• pc386/startup/bspstart.c (modified) (5 diffs)
• shared/io/bspIo.h (modified) (1 diff)
• shared/irq/irq_init.c (modified) (6 diffs)

c/src/lib/libbsp/i386/pc386/start/start16.s

@@ -93 +93 @@
         ljmp    $PROT_CODE_SEG, $1f     # flush prefetch queue, and reload %cs
 #endif  
+.code32
 1:
-
-.code32
-
         /*---------------------------------------------------------------------+
         | load the other segment registers

c/src/lib/libbsp/i386/pc386/startup/bspstart.c

@@ -1 +1 @@
 /*-------------------------------------------------------------------------+
-| bspstart.c v1.1 - PC386 BSP - 1997/08/07
-+--------------------------------------------------------------------------+
 | This file contains the PC386 BSP startup package. It includes application,
 | board, and monitor specific initialization and configuration. The generic CPU
@@ -39 +37 @@
 #include <rtems/libio.h>
 #include <libcpu/cpuModel.h>
+#include <pc386uart.h>
 
 /*-------------------------------------------------------------------------+
@@ -44 +43 @@
 +--------------------------------------------------------------------------*/
 extern rtems_unsigned32 _end;         /* End of BSS. Defined in 'linkcmds'. */
-
 /* 
  * Size of heap if it is 0 it will be dynamically defined by memory size, 
@@ -76 +74 @@
 void bsp_postdriver_hook(void);
 extern void rtems_irq_mngt_init();
+extern void _IBMPC_initVideo(void);
 
 /*-------------------------------------------------------------------------+
@@ -152 +151 @@
    */
   Calibrate_loop_1ms();
+  /*
+   * Initialize printk channel
+   */
+  _IBMPC_initVideo();
 
   rtemsFreeMemStart = (rtems_unsigned32)&_end + _stack_size;

c/src/lib/libbsp/i386/shared/io/bspIo.h

@@ -27 +27 @@
 extern  BSP_output_char_function_type           BSP_output_char;
 extern  BSP_polling_getchar_function_type       BSP_poll_char;
-extern  void BSP_emergency_output_init(void);
 /*
  * All the function declared as extern after this comment

c/src/lib/libbsp/i386/shared/irq/irq_init.c

@@ -120 +120 @@
     unsigned int                level;
 
-    
     i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
-    
+    /* Convert limit into number of entries */
+    limit = (limit + 1) / sizeof(interrupt_gate_descriptor);    
+
     _CPU_ISR_Disable(level);
 
@@ -128 +129 @@
      * Init the complete IDT vector table with defaultRawIrq value
      */
-    for (i = 0; i < IDT_SIZE; i++) {
-      idtHdl[i] = defaultRawIrq;
+    for (i = 0; i < limit; i++) {
+      idtHdl[i]          = defaultRawIrq;
+      idtHdl[i].idtIndex = i;
     }
     raw_initial_config.idtSize = IDT_SIZE;
@@ -139 +141 @@
        * put something here that will show the failure...
        */
-      BSP_emergency_output_init();
       printk("Unable to initialize IDT!!! System locked\n");
       while (1);
@@ -160 +161 @@
      */
     for (i = 0; i < PC_386_IRQ_LINES_NUMBER; i++) {
-      rtemsIrq[i] = defaultIrq;
+      rtemsIrq[i]      = defaultIrq;
+      rtemsIrq[i].name = i;
     }
     /*
@@ -170 +172 @@
     initial_config.irqBase      = PC386_ASM_IRQ_VECTOR_BASE;
     initial_config.irqPrioTbl   = irqPrioTable;
+
     if (!pc386_rtems_irq_mngt_set(&initial_config)) {
       /*
        * put something here that will show the failure...
        */
-      BSP_emergency_output_init();
       printk("Unable to initialize RTEMS interrupt Management!!! System locked\n");
       while (1);
@@ -189 +191 @@
       unsigned tmp;
 
-      BSP_emergency_output_init();
-      
       printk("idt_entry_tbl =  %x Interrupt_descriptor_table addr = %x\n",
              idt_entry_tbl, &Interrupt_descriptor_table);