Rule for ejudge.sh; fix declaration of video_memory.
This commit is contained in:
parent
6e5222e2e3
commit
57704ff8dd
4
Makefile
4
Makefile
@ -17,6 +17,10 @@ run: image.bin
|
|||||||
run-nox: image.bin
|
run-nox: image.bin
|
||||||
qemu-system-i386 -nographic -drive format=raw,file=$< -serial mon:stdio
|
qemu-system-i386 -nographic -drive format=raw,file=$< -serial mon:stdio
|
||||||
|
|
||||||
|
ejudge.sh: image.bin
|
||||||
|
echo >$@ "#!/bin/sh\nexec qemu-system-i386 -nographic -drive format=raw,file=$< -serial mon:stdio"
|
||||||
|
chmod +x $@
|
||||||
|
|
||||||
debug-boot-nox: image.bin mbr.elf
|
debug-boot-nox: image.bin mbr.elf
|
||||||
qemu-system-i386 -nographic -drive format=raw,file=$< -s -S &
|
qemu-system-i386 -nographic -drive format=raw,file=$< -s -S &
|
||||||
$(GDB) mbr.elf \
|
$(GDB) mbr.elf \
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
#include "port.h"
|
#include "port.h"
|
||||||
#include "vga.h"
|
#include "vga.h"
|
||||||
|
|
||||||
|
char* const video_memory = (char*) 0xb8000;
|
||||||
|
|
||||||
static unsigned char get_color(unsigned char fg, unsigned char bg) {
|
static unsigned char get_color(unsigned char fg, unsigned char bg) {
|
||||||
return (bg << 4) + fg;
|
return (bg << 4) + fg;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
static char* const video_memory = (char*) 0xb8000;
|
extern char* const video_memory;
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
ROWS = 25,
|
ROWS = 25,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user