projects
/
bootcensus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
foo
[bootcensus]
/
src
/
kmain.c
diff --git
a/src/kmain.c
b/src/kmain.c
index
af7bc65
..
645c87e
100644
(file)
--- a/
src/kmain.c
+++ b/
src/kmain.c
@@
-16,22
+16,29
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <stdio.h>
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <stdio.h>
+#include <string.h>
#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 "timer.h"
#include "contty.h"
#include "keyb.h"
#include "timer.h"
#include "contty.h"
+#include "video.h"
+#include "vbetest.h"
+
-void set_mode13h(void);
void logohack(void);
void pcboot_main(void)
{
init_segm();
init_intr();
void logohack(void);
void pcboot_main(void)
{
init_segm();
init_intr();
- kb_init();
+
con_init();
con_init();
+ kb_init();
+
+ init_mem();
/* initialize the timer */
init_timer();
/* initialize the timer */
init_timer();
@@
-45,9
+52,18
@@
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) {
- set_mode13h();
+ switch(c) {
+ case KB_F1:
+ set_vga_mode(0x13);
logohack();
logohack();
+ set_vga_mode(3);
+ break;
+
+ case KB_F2:
+ set_video_mode(640, 480, 16);
+ vbetest();
+ set_vga_mode(3);
+ break;
}
if(isprint(c)) {
printf("key: %d '%c' \n", c, (char)c);
}
if(isprint(c)) {
printf("key: %d '%c' \n", c, (char)c);