projects
/
bootcensus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sound blaster code doesn't work yet
[bootcensus]
/
src
/
kmain.c
diff --git
a/src/kmain.c
b/src/kmain.c
index
339d3e0
..
8af7cc3
100644
(file)
--- a/
src/kmain.c
+++ b/
src/kmain.c
@@
-22,9
+22,12
@@
along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "intr.h"
#include "mem.h"
#include "keyb.h"
#include "intr.h"
#include "mem.h"
#include "keyb.h"
+#include "psaux.h"
#include "timer.h"
#include "contty.h"
#include "video.h"
#include "timer.h"
#include "contty.h"
#include "video.h"
+#include "audio.h"
+#include "pci.h"
#include "vbetest.h"
#include "vbetest.h"
@@
-37,12
+40,17
@@
void pcboot_main(void)
con_init();
kb_init();
con_init();
kb_init();
+ init_psaux();
init_mem();
init_mem();
+ init_pci();
+
/* initialize the timer */
init_timer();
/* initialize the timer */
init_timer();
+ audio_init();
+
enable_intr();
printf("PCBoot kernel initialized\n");
enable_intr();
printf("PCBoot kernel initialized\n");
@@
-64,13
+72,13
@@
void pcboot_main(void)
break;
}
if(isprint(c)) {
break;
}
if(isprint(c)) {
- printf("key: %d '%c' \n", c, (char)c);
+ printf("key: %d '%c'\n", c, (char)c);
} else {
} else {
- printf("key: %d \n", c);
+ printf("key: %d\n", c);
}
}
if((nticks % 250) == 0) {
}
}
if((nticks % 250) == 0) {
- printf("ticks: %ld\r", nticks);
+ con_printf(71, 0, "[%ld]", nticks);
}
}
}
}
}
}