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
0ffc152
..
8af7cc3
100644
(file)
--- a/
src/kmain.c
+++ b/
src/kmain.c
@@
-20,10
+20,15
@@
along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <ctype.h>
#include "segm.h"
#include "intr.h"
#include <ctype.h>
#include "segm.h"
#include "intr.h"
+#include "mem.h"
#include "keyb.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"
void logohack(void);
void logohack(void);
@@
-32,12
+37,20
@@
void pcboot_main(void)
{
init_segm();
init_intr();
{
init_segm();
init_intr();
- kb_init();
+
con_init();
con_init();
+ kb_init();
+ init_psaux();
+
+ 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");
@@
-47,19
+60,25
@@
void pcboot_main(void)
halt_cpu();
while((c = kb_getkey()) >= 0) {
halt_cpu();
while((c = kb_getkey()) >= 0) {
- if(c >= KB_F1 && c <= KB_F12) {
+ switch(c) {
+ case KB_F1:
set_vga_mode(0x13);
logohack();
set_vga_mode(3);
set_vga_mode(0x13);
logohack();
set_vga_mode(3);
+ break;
+
+ case KB_F2:
+ vbetest();
+ break;
}
if(isprint(c)) {
}
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);
}
}
}
}
}
}