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