catfood/BigOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ifdef

Browse Source
This commit is contained in:
Catfood 2023-01-14 15:31:45 +08:00
parent e1ea460e3a
commit 1da653d417
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/global.h
View File

@ -12,7 +12,7 @@
#include "protect.h"
#include "proc.h"
#include "const.h"
#define USE_FBCON
//#define USE_FBCON
extern int kernel_initial;
extern int ticks;
@ -55,4 +55,4 @@ struct memfree{
#include "fs_const.h"
#include "hd.h"
extern struct hd_info hd_info[1]; //added by mingxuan 2020-10-27
extern struct hd_info hd_info[1]; //added by mingxuan 2020-10-27

2
kernel/fbcon.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "proto.h"
#ifdef USE_FBCON
@ -9,7 +10,6 @@
#include "memman.h"
#include "proc.h"
#include "protect.h"
#include "proto.h"
#include "serialport.h"
#include "spinlock.h"
#include "stdio.h"

8
kernel/ktest.c
View File

@ -130,6 +130,7 @@ void initial()
printf("untar:%s\n", full_name);
strcat(full_name, INSTALL_FILENAME);
untar(full_name);
#ifdef USE_FBCON
kprintf("loading font(%dKB) to %p...", HZK16_SIZE / num_1K, hzk16h_buf);
printf("Loading Font HZK16H...\n");
@ -145,12 +146,15 @@ void initial()
kprintf("[\x1b[32mOK\x1b[0m]\n");
printf("Font loaded.\n");
printf("Loaing Simple Shell...\n");
#endif
do_vclose(stdin);
do_vclose(stdout);
do_vclose(stderr);
// while(untared) yield();
#ifdef USE_FBCON
exec("orange/shell_0.bin");
#else
exec("orange/shell_1.bin");
#endif
while (1)
;
}

4
lib/kprintf.c
View File

@ -9,8 +9,8 @@
static void kprintfputch(int ch, int *cnt)
{
write_serial(ch);
// char _ch = ch;
// tty_write(cur_ntty, &_ch, 1);
char _ch = ch;
tty_write(cur_ntty, &_ch, 1);
(*cnt)++;
}