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

[vid] Support setting video resolution from kernel args

Browse Source
This commit is contained in:
Kevin Lange 2011-12-16 13:39:34 -06:00
parent d0be767eb8
commit bf1011e2ba
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/include/system.h
View File

@ -281,7 +281,7 @@ extern int detect_cpu();
/* Video Drivers */
/* BOCHS / QEMU VBE Driver */
extern void graphics_install_bochs();
extern void graphics_install_bochs(uint16_t, uint16_t);
extern void bochs_set_csr(int x, int y);
extern int bochs_get_csr_x();
extern int bochs_get_csr_y();

14
kernel/misc/args.c
View File

@ -45,12 +45,12 @@ parse_args(
char * save_i;
char * argp[1024];
int argc = 0;
pch_i = strtok_r(argv[i],"=",&save_i);
pch_i = strtok_r(argv[i],"=,",&save_i);
if (!pch_i) { continue; }
while (pch_i != NULL) {
argp[argc] = (char *)pch_i;
++argc;
pch_i = strtok_r(NULL,"=",&save_i);
pch_i = strtok_r(NULL,"=,",&save_i);
}
argp[argc] = NULL;
@ -58,7 +58,15 @@ parse_args(
if (argc < 2) { kprintf("vid=?\n"); continue; }
if (!strcmp(argp[1],"qemu")) {
/* Bochs / Qemu Video Device */
graphics_install_bochs();
uint16_t x, y;
if (argc < 4) {
x = 1024;
y = 768;
} else {
x = atoi(argp[2]);
y = atoi(argp[3]);
}
graphics_install_bochs(x,y);
} else {
kprintf("Unrecognized video adapter: %s\n", argp[1]);
}

12
kernel/video/bochs.c
View File

@ -11,8 +11,6 @@
* ie the one on my laptop, but it's 2048 on
* the EWS machines. */
#define BOCHS_BUFFER_SIZE 2048
#define PREFERRED_X 1280 //1024
#define PREFERRED_Y 720 //768
#define PREFERRED_VY 4096
#define PREFERRED_B 32
@ -154,7 +152,7 @@ bochs_install_wallpaper(char * filename) {
}
void
graphics_install_bochs() {
graphics_install_bochs(uint16_t resolution_x, uint16_t resolution_y) {
outports(0x1CE, 0x00);
uint16_t i = inports(0x1CF);
if (i < 0xB0C0 || i > 0xB0C6) {
@ -167,10 +165,10 @@ graphics_install_bochs() {
outports(0x1CF, 0x00);
/* Set X resolution to 1024 */
outports(0x1CE, 0x01);
outports(0x1CF, PREFERRED_X);
outports(0x1CF, resolution_x);
/* Set Y resolution to 768 */
outports(0x1CE, 0x02);
outports(0x1CF, PREFERRED_Y);
outports(0x1CF, resolution_y);
/* Set bpp to 32 */
outports(0x1CE, 0x03);
outports(0x1CF, PREFERRED_B);
@ -208,8 +206,8 @@ graphics_install_bochs() {
}
mem_found:
bochs_resolution_x = PREFERRED_X;
bochs_resolution_y = PREFERRED_Y;
bochs_resolution_x = resolution_x;
bochs_resolution_y = resolution_y;
bochs_resolution_b = PREFERRED_B;
term_width = bochs_resolution_x / 8;