change color and font size

This commit is contained in:
reccetear 2017-04-21 17:58:26 +08:00
parent e453de93ac
commit 41da5ef3ed
7 changed files with 23 additions and 14 deletions

View File

@ -1,6 +1,8 @@
#ifndef __NPC_H__
#define __NPC_H__
void memory_init();
void serial_init();
#define VMEM_ADDR ((void *)0xc0000000)
#define SCR_WIDTH 640
#define SCR_HEIGHT 480
@ -14,6 +16,10 @@ static inline u32 Getcolor(_Pixel p){
return (R(p) << 8 | G(p) << 4 | B(p) << 2);
}
static inline _Pixel Getpixel(int color){
return color;
}
#define KEY_CODE_ADDR ((volatile unsigned int *)0xf0000000)
#define KEY_CODE (*KEY_CODE_ADDR)

View File

@ -2,14 +2,6 @@
#include <npc.h>
// TODO: implement these functions.
static void memory_init(){
//not to do
}
static void serial_init(){
//not to do
}
void _trm_init() {
serial_init();
memory_init();

View File

@ -6,7 +6,7 @@ int curr_col = 0;
extern void draw_character(char ch, int x, int y, int color);
u32 *vmem = VMEM_ADDR;
u8 *vmem = VMEM_ADDR;
void vga_init(){
_screen.width = SCR_WIDTH;
_screen.height = SCR_HEIGHT;
@ -39,7 +39,7 @@ void _draw_f(_Pixel *p) {
}
void _draw_p(int x, int y, _Pixel p) {
vmem[x * SCR_WIDTH + y] = p;
vmem[x * SCR_WIDTH + y] = Getcolor(p);
}
void _draw_sync() {

View File

@ -0,0 +1,11 @@
#include <am.h>
#include <npc.h>
void memory_init(){
//not to do
}
void serial_init(){
//not to do
}

View File

@ -5,7 +5,7 @@ extern char font8x8_basic[128][8];
void draw_character(char ch, int x, int y, int color) {
int i, j;
_Pixel c = color;
_Pixel c = Getpixel(color);
char *p = font8x8_basic[(int)ch];
for (i = 0; i < 8; i ++)
for (j = 0; j < 8; j ++)

View File

@ -16,7 +16,7 @@ extern "C" {
// memcpy, memset, strcpy, strlen, itoa, atoi, ...
// kalloc, kree
size_t strlen(const char *s);
int strlen(const char *s);
#ifdef __cplusplus
}

View File

@ -1,7 +1,7 @@
#include <klib.h>
size_t strlen(const char *s) {
size_t sz = 0;
int strlen(const char *s) {
int sz = 0;
for (; *s; s ++) {
sz ++;
}