Remove legacy boot monitor vars

diff --git a/common/include/minix/type.h b/common/include/minix/type.h
index cb2b8e861a5f69d4b2eea3bc1ff7ff6c1702d74b..2237a5416c51ccee0baa31e1e067c92c2841604f 100644 (file)
--- a/common/include/minix/type.h
+++ b/common/include/minix/type.h
@@ -130,14 +130,9 @@ struct cpu_info {
 };
 
 struct machine {
-  int pc_at;
-  int ps_mca;
-  int processor;
   unsigned processors_count;   /* how many cpus are available */
   unsigned bsp_id;             /* id of the bootstrap cpu */
   int padding;                 /* used to be protected */
-  int vdu_ega;
-  int vdu_vga;
   int apic_enabled; /* does the kernel use APIC or not? */
   phys_bytes   acpi_rsdp; /* where is the acpi RSDP */
 };

diff --git a/drivers/bios_wini/bios_wini.c b/drivers/bios_wini/bios_wini.c
index 570b79deaf5422558f7ee30246cca69b7e9bb13a..ca4249e27e2f89006c625e60e1c1d0bdc168744c 100644 (file)
--- a/drivers/bios_wini/bios_wini.c
+++ b/drivers/bios_wini/bios_wini.c
@@ -37,8 +37,6 @@
 #define SUB_PER_DRIVE  (NR_PARTITIONS * NR_PARTITIONS)
 #define NR_SUBDEVS     (MAX_DRIVES * SUB_PER_DRIVE)
 
-PRIVATE int pc_at = 1; /* What about PC XTs? */
-
 /* Variables. */
 PRIVATE struct wini {          /* main drive struct, one entry per drive */
   unsigned cylinders;          /* number of cylinders */
@@ -466,11 +464,9 @@ PRIVATE void w_init()
        reg86.u.w.bx = 0x55AA;
        reg86.u.b.dl = drive_id;
 
-       if (pc_at) {
-               r= sys_int86(&reg86);
-               if (r != OK)
-                       panic("BIOS call failed: %d", r);
-       }
+       r= sys_int86(&reg86);
+       if (r != OK)
+           panic("BIOS call failed: %d", r);
 
        if (!(reg86.u.w.f & 0x0001) && reg86.u.w.bx == 0xAA55
                                && (reg86.u.w.cx & 0x0001)) {

diff --git a/drivers/tty/console.c b/drivers/tty/console.c
index 58d062d39b5b7b9607d2c445092313175c2b900d..5f77dcb9c525c7009b13e21348299faf9b1c7969 100644 (file)
--- a/drivers/tty/console.c
+++ b/drivers/tty/console.c
@@ -950,7 +950,7 @@ tty_t *tp;
        vid_port = bios_crtbase;
        scr_width = bios_columns;
        font_lines = bios_fontlines;
-       scr_lines = machine.vdu_ega ? bios_rows+1 : 25;
+       scr_lines = bios_rows+1;
 
        if (color) {
                vid_base = COLOR_BASE;
@@ -959,8 +959,8 @@ tty_t *tp;
                vid_base = MONO_BASE;
                vid_size = MONO_SIZE;
        }
-       if (machine.vdu_ega) vid_size = EGA_SIZE;
-       wrap = ! machine.vdu_ega;
+       vid_size = EGA_SIZE;
+       wrap = 0;
 
        console_memory = vm_map_phys(SELF, (void *) vid_base, vid_size);
 
@@ -1202,7 +1202,6 @@ message *m;
 
   seq2[6].value= color ? 0x0E : 0x0A;
 
-  if (!machine.vdu_ega) return(ENOTTY);
   result = ga_program(seq1);   /* bring font memory into view */
 
   if(sys_safecopyfrom(m->m_source, (cp_grant_id_t) m->IO_GRANT, 0,

diff --git a/drivers/tty/keyboard.c b/drivers/tty/keyboard.c
index e6dbbc7c158d85641343e3410a753dcf15dfbbc6..d21b80e17af04e1a4fe6e8e2d8a1af6c919bddcf 100644 (file)
--- a/drivers/tty/keyboard.c
+++ b/drivers/tty/keyboard.c
@@ -838,7 +838,6 @@ PRIVATE void set_leds()
 {
 /* Set the LEDs on the caps, num, and scroll lock keys */
   int s;
-  if (! machine.pc_at) return; /* PC/XT doesn't have LEDs */
 
   kb_wait();                   /* wait for buffer empty  */
   if ((s=sys_outb(KEYBD, LED_CODE)) != OK)

diff --git a/kernel/arch/i386/exception.c b/kernel/arch/i386/exception.c
index b5e99caaf7e5158d88ed35e97d27444babe72f8a..fd0748f7785043cc1a5eebd863085c1c5c51e8e6 100644 (file)
--- a/kernel/arch/i386/exception.c
+++ b/kernel/arch/i386/exception.c
@@ -138,7 +138,7 @@ PRIVATE void inkernel_disaster(struct proc *saved_proc,
 {
 #if USE_SYSDEBUG
   if(ep) {
-       if (ep->msg == NULL || machine.processor < ep->minprocessor)
+       if (ep->msg == NULL)
                printf("\nIntel-reserved exception %d\n", frame->vector);
          else
                printf("\n%s\n", ep->msg);

diff --git a/kernel/arch/i386/i8259.c b/kernel/arch/i386/i8259.c
index 53711b661c0757198ba06fee810235121abb33b1..a4bf29e25adb0be289f1384bf378493bccd6a296 100644 (file)
--- a/kernel/arch/i386/i8259.c
+++ b/kernel/arch/i386/i8259.c
@@ -39,7 +39,7 @@ PUBLIC int intr_init(const int mine, const int auto_eoi)
        * one slaved at IRQ 2.  (We don't have to deal with the PC that
        * has just one controller, because it must run in real mode.)
        */
-      outb( INT_CTL, machine.ps_mca ? ICW1_PS : ICW1_AT);
+      outb( INT_CTL, ICW1_AT);
       outb( INT_CTLMASK, mine == INTS_MINIX ? IRQ0_VECTOR : BIOS_IRQ0_VEC);
                                        /* ICW2 for master */
       outb( INT_CTLMASK, (1 << CASCADE_IRQ));
@@ -49,7 +49,7 @@ PUBLIC int intr_init(const int mine, const int auto_eoi)
       else
           outb( INT_CTLMASK, ICW4_AT_MASTER);
       outb( INT_CTLMASK, ~(1 << CASCADE_IRQ)); /* IRQ 0-7 mask */
-      outb( INT2_CTL, machine.ps_mca ? ICW1_PS : ICW1_AT);
+      outb( INT2_CTL, ICW1_AT);
       outb( INT2_CTLMASK, mine == INTS_MINIX ? IRQ8_VECTOR : BIOS_IRQ8_VEC);
                                                /* ICW2 for slave */
       outb( INT2_CTLMASK, CASCADE_IRQ);        /* ICW3 is slave nr */

diff --git a/kernel/start.c b/kernel/start.c
index 6f122cdaef3ca5f10c3b162fc9c60460be0f962a..7579954fb405c8a7a104cd56287ae48f27f2f77a 100644 (file)
--- a/kernel/start.c
+++ b/kernel/start.c
@@ -41,10 +41,21 @@ PUBLIC void cstart(
   /* Copy the boot parameters to the local buffer. */
   arch_get_params(params_buffer, sizeof(params_buffer));
 
+#if USE_BOOTPARAM
   /* determine verbosity */
   if ((value = env_get(VERBOSEBOOTVARNAME)))
          verboseboot = atoi(value);
 
+  /* Get clock tick frequency. */
+  value = env_get("hz");
+  if(value)
+       system_hz = atoi(value);
+  if(!value || system_hz < 2 || system_hz > 50000)     /* sanity check */
+       system_hz = DEFAULT_HZ;
+#else /* !USE_BOOTPARAM */
+  system_hz = DEFAULT_HZ;
+#endif
+
   DEBUGEXTRA(("cstart\n"));
 
   /* Record miscellaneous information for user-space servers. */
@@ -61,29 +72,6 @@ PUBLIC void cstart(
   for(h = 0; h < _LOAD_HISTORY; h++)
        kloadinfo.proc_load_history[h] = 0;
 
-  /* Processor? Decide if mode is protected for older machines. */
-  machine.processor=atoi(env_get("processor")); 
-
-  /* XT, AT or MCA bus? */
-  value = env_get("bus");
-  if (value == NULL || strcmp(value, "at") == 0) {
-      machine.pc_at = TRUE;                    /* PC-AT compatible hardware */
-  } else if (strcmp(value, "mca") == 0) {
-      machine.pc_at = machine.ps_mca = TRUE;   /* PS/2 with micro channel */
-  }
-
-  /* Type of VDU: */
-  value = env_get("video");    /* EGA or VGA video unit */
-  if (strcmp(value, "ega") == 0) machine.vdu_ega = TRUE;
-  if (strcmp(value, "vga") == 0) machine.vdu_vga = machine.vdu_ega = TRUE;
-
-  /* Get clock tick frequency. */
-  value = env_get("hz");
-  if(value)
-       system_hz = atoi(value);
-  if(!value || system_hz < 2 || system_hz > 50000)     /* sanity check */
-       system_hz = DEFAULT_HZ;
-
 #ifdef DEBUG_SERIAL
   /* Intitialize serial debugging */
   value = env_get(SERVARNAME);

diff --git a/servers/is/dmp_kernel.c b/servers/is/dmp_kernel.c
index 28b8e1efd296bc873b1596a0c3002881e5e45cfb..07fdb00a048c127ab78cff270bf21901cc41f745 100644 (file)
--- a/servers/is/dmp_kernel.c
+++ b/servers/is/dmp_kernel.c
@@ -213,13 +213,7 @@ PUBLIC void kenv_dmp()
        return;
     }
 
-    printf("Dump of kinfo and machine structures.\n\n");
-    printf("Machine structure:\n");
-    printf("- pc_at:      %3d\n", machine.pc_at); 
-    printf("- ps_mca:     %3d\n", machine.ps_mca); 
-    printf("- processor:  %3d\n", machine.processor); 
-    printf("- vdu_ega:    %3d\n", machine.vdu_ega); 
-    printf("- vdu_vga:    %3d\n\n", machine.vdu_vga); 
+    printf("Dump of kinfo structure.\n\n");
     printf("Kernel info structure:\n");
     printf("- code_base:  %5lu\n", kinfo.code_base); 
     printf("- code_size:  %5lu\n", kinfo.code_size);