Compare commits
No commits in common. "e0be923f35bc0b77c9d5d65e4c14ff0ccb188c29" and "d1e3603fa51db82c02ff7584fd515dd132576272" have entirely different histories.
e0be923f35
...
d1e3603fa5
3 changed files with 9 additions and 5 deletions
|
@ -50,7 +50,7 @@ void putpixel(
|
|||
}
|
||||
|
||||
void putc(
|
||||
const char *character,
|
||||
const unsigned char *character,
|
||||
unsigned short x,
|
||||
unsigned short y,
|
||||
unsigned char r,
|
||||
|
@ -84,7 +84,7 @@ void putc(
|
|||
}
|
||||
|
||||
void puts(
|
||||
const char *text,
|
||||
const unsigned char *text,
|
||||
unsigned short x,
|
||||
unsigned short y,
|
||||
unsigned char r,
|
||||
|
|
|
@ -19,7 +19,7 @@ void putpixel(
|
|||
unsigned char b
|
||||
);
|
||||
void putc(
|
||||
const char *character,
|
||||
const unsigned char *character,
|
||||
unsigned short x,
|
||||
unsigned short y,
|
||||
unsigned char r,
|
||||
|
@ -27,7 +27,7 @@ void putc(
|
|||
unsigned char b
|
||||
);
|
||||
void puts(
|
||||
const char *text,
|
||||
const unsigned char *text,
|
||||
unsigned short x,
|
||||
unsigned short y,
|
||||
unsigned char r,
|
||||
|
|
|
@ -3,7 +3,11 @@
|
|||
.set MULTIBOOT_VIDEO_REQUEST, 1 << 2
|
||||
.set MULTIBOOT_AOUT_KLUDGE, 0 << 16
|
||||
.set MULTIBOOT_HEADER_MAGIC, 0x1BADB002
|
||||
.set MULTIBOOT_HEADER_FLAGS, MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_VIDEO_REQUEST | MULTIBOOT_AOUT_KLUDGE
|
||||
.set MULTIBOOT_HEADER_FLAGS, \
|
||||
MULTIBOOT_PAGE_ALIGN \
|
||||
| MULTIBOOT_MEMORY_INFO \
|
||||
| MULTIBOOT_VIDEO_REQUEST \
|
||||
| MULTIBOOT_AOUT_KLUDGE
|
||||
.set MULTIBOOT_CHECKSUM, -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
|
||||
|
||||
#.section ".multiboottbabeee"
|
||||
|
|
Loading…
Reference in a new issue