Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bochs] Proper bitmap reading, smaller boot logo.

Browse Source
This commit is contained in:
Kevin Lange 2011-03-27 18:08:41 -05:00
parent ee167bd889
commit 9a46092e4c
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -66,7 +66,7 @@ kernel/start.o: kernel/start.s
################
# Ram disk #
################
toaruos-initrd: initrd/boot/kernel initrd/boot/stage2
toaruos-initrd: initrd/boot/kernel initrd/boot/stage2 initrd/bs.bmp
@${ECHO} -n "\033[32m initrd Generating initial RAM disk\033[0m"
@# Get rid of the old one
@-rm -f toaruos-initrd

BIN
initrd/bs.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 23 KiB

6
kernel/core/vga.c
View File

@ -154,6 +154,9 @@ writech(
) {
unsigned short *where;
unsigned att = attrib << 8;
if (use_serial) {
serial_send(c);
}
if (c == 0x08) {
/* Backspace */
if (csr_x != 0) csr_x--;
@ -172,9 +175,6 @@ writech(
*where = c | att;
csr_x++;
}
if (use_serial) {
serial_send(c);
}
if (csr_x >= 80) {
csr_x = 0;

25
kernel/core/video/bochs.c
View File

@ -103,27 +103,24 @@ bochs_draw_logo(char * filename) {
char *bufferb = malloc(file->length);
/* Read the boot logo */
size_t bytes_read = read_fs(file, 0, file->length, (uint8_t *)bufferb);
size_t i;
uint16_t x = 0; /* -> 212 */
uint16_t y = 0; /* -> 68 */
/* Get the width / height of the image */
signed int *bufferi = (signed int *)((uintptr_t)bufferb + 2);
uint32_t width = bufferi[4];
uint32_t height = bufferi[5];
uint32_t row_width = (24 * width + 31) / 32 * 4;
/* Skip right to the important part */
for (i = bufferi[2]; i < bytes_read; i += 3) {
/* Extract the color */
uint32_t color = bufferb[i] +
bufferb[i+1] * 0x100 +
bufferb[i+2] * 0x10000;
/* Set our point */
bochs_set_coord((bochs_resolution_x - width) / 2 + x, (bochs_resolution_y - height) / 2 + (height - y), color);
++x;
/* If we hit the end of the line, move on */
if (x == width) {
x = 0;
++y;
size_t i = bufferi[2];
for (y = 0; y < height; ++y) {
for (x = 0; x < width; ++x) {
/* Extract the color */
uint32_t color = bufferb[i + 3 * x] +
bufferb[i+1 + 3 * x] * 0x100 +
bufferb[i+2 + 3 * x] * 0x10000;
/* Set our point */
bochs_set_coord((bochs_resolution_x - width) / 2 + x, (bochs_resolution_y - height) / 2 + (height - y), color);
}
i += row_width;
}
free(bufferb);
}