Link text into copy_pixels.

[netwatch.git] / aseg-paging / firstrun.c

diff --git a/aseg-paging/firstrun.c b/aseg-paging/firstrun.c
index ca611fa006e5f2a7e820b639711b6e91ebd82d41..0233a7c6ac334a8ff11a21c0eb54f79e329c6b91 100644 (file)
--- a/aseg-paging/firstrun.c
+++ b/aseg-paging/firstrun.c
@@ -5,6 +5,7 @@
 #include <output.h>
 #include "vga-overlay.h"
 #include <smram.h>
 #include <output.h>
 #include "vga-overlay.h"
 #include <smram.h>

+#include <text.h>

 #include "../net/net.h"
 
 extern int _bss, _bssend;
 #include "../net/net.h"
 
 extern int _bss, _bssend;


@@ -13,8 +14,11 @@ extern void timer_handler(smi_event_t ev);
 extern void kbc_handler(smi_event_t ev);
 extern void gbl_rls_handler(smi_event_t ev);
 
 extern void kbc_handler(smi_event_t ev);
 extern void gbl_rls_handler(smi_event_t ev);
 

+extern pci_driver_t *drivers[];
+

 void smi_init() {
        smram_state_t smram;
 void smi_init() {
        smram_state_t smram;

+       pci_driver_t **driver;

        
        smram = smram_save_state();
        smram_tseg_set_state(SMRAM_TSEG_OPEN);
        
        smram = smram_save_state();
        smram_tseg_set_state(SMRAM_TSEG_OPEN);


@@ -31,6 +35,18 @@ void smi_init() {
        smi_disable();
        
        eth_init();
        smi_disable();
        
        eth_init();

+       
+       /* After everything is initialized, load drivers. */
+       for (driver = drivers; *driver; driver++)
+       {
+               outputf("Probing driver: %s", (*driver)->name);
+               if (pci_probe_driver(*driver))
+                       output("Found a card");
+       }
+       outputf("Driver probe complete");
+       
+       /* Load in fonts. */
+       text_init();

 
        smi_register_handler(SMI_EVENT_FAST_TIMER, timer_handler);
        smi_enable_event(SMI_EVENT_FAST_TIMER);
 
        smi_register_handler(SMI_EVENT_FAST_TIMER, timer_handler);
        smi_enable_event(SMI_EVENT_FAST_TIMER);