mirror of
https://git.stationery.faith/corn/corn.git
synced 2024-11-10 03:22:08 +00:00
Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
cfdc91ad07
6 changed files with 98 additions and 0 deletions
5
include/fb.h
Normal file
5
include/fb.h
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
int fb_init(uint16_t res_x, uint16_t res_y);
|
|
@ -31,6 +31,18 @@ extern void *memset(void *restrict dest, int c, unsigned long n);
|
||||||
*/
|
*/
|
||||||
extern int strncmp(const char *restrict s1, const char *restrict s2, unsigned long n);
|
extern int strncmp(const char *restrict s1, const char *restrict s2, unsigned long n);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copys the string pointed to by src , into a string at the buffer pointer to by dest.
|
||||||
|
* The dest buffer must be long enough to hold src.
|
||||||
|
*/
|
||||||
|
extern char *strcpy(char *restrict dest, const char *restrict src);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copys the string pointed to by src , into a string at the buffer pointer to by dest.
|
||||||
|
* The dest buffer must be long enough to hold src or size n.
|
||||||
|
*/
|
||||||
|
extern char *strncpy(char *restrict dest, const char *restrict src, unsigned long n);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @returns 1 if c is a space
|
* @returns 1 if c is a space
|
||||||
*/
|
*/
|
||||||
|
|
68
src/arch/amd64/fb.c
Normal file
68
src/arch/amd64/fb.c
Normal file
|
@ -0,0 +1,68 @@
|
||||||
|
#include "bindings.h"
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#define PREFERRED_VY 4096
|
||||||
|
#define PREFERRED_B 32
|
||||||
|
|
||||||
|
uint16_t fb_res_x = 0;
|
||||||
|
uint16_t fb_res_y = 0;
|
||||||
|
uint16_t fb_res_b = 0;
|
||||||
|
|
||||||
|
uint8_t *fb_buffer = NULL;
|
||||||
|
|
||||||
|
int fb_init(uint16_t res_x, uint16_t res_y) {
|
||||||
|
|
||||||
|
outw(0x1CE, 0x00);
|
||||||
|
uint16_t i = inw(0x1CF);
|
||||||
|
if (i < 0xB0C0 || i > 0xB0C6) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
outw(0x1CF, 0xB0C4);
|
||||||
|
i = inw(0x1CF);
|
||||||
|
/* Disable VBE */
|
||||||
|
outw(0x1CE, 0x04);
|
||||||
|
outw(0x1CF, 0x00);
|
||||||
|
/* Set X resolution to 1024 */
|
||||||
|
outw(0x1CE, 0x01);
|
||||||
|
outw(0x1CF, res_x);
|
||||||
|
/* Set Y resolution to 768 */
|
||||||
|
outw(0x1CE, 0x02);
|
||||||
|
outw(0x1CF, res_y);
|
||||||
|
/* Set bpp to 32 */
|
||||||
|
outw(0x1CE, 0x03);
|
||||||
|
outw(0x1CF, PREFERRED_B);
|
||||||
|
/* Set Virtual Height to stuff */
|
||||||
|
outw(0x1CE, 0x07);
|
||||||
|
outw(0x1CF, PREFERRED_VY);
|
||||||
|
/* Re-enable VBE */
|
||||||
|
outw(0x1CE, 0x04);
|
||||||
|
outw(0x1CF, 0x41);
|
||||||
|
|
||||||
|
uint32_t * text_vid_mem = (uint32_t *)0xA0000;
|
||||||
|
text_vid_mem[0] = 0xA5ADFACE;
|
||||||
|
|
||||||
|
for (uintptr_t fb_offset = 0xE0000000; fb_offset < 0xFF000000; fb_offset += 0x01000000) {
|
||||||
|
/* Enable the higher memory */
|
||||||
|
for (uintptr_t i = fb_offset; i < fb_offset; i += 0x1000) {
|
||||||
|
// todo ident map fb
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Go find it */
|
||||||
|
for (uintptr_t x = fb_offset; x < fb_offset + 0xFF0000; x += 0x1000) {
|
||||||
|
if (((uintptr_t *)x)[0] == 0xA5ADFACE) {
|
||||||
|
fb_buffer = (uint8_t *) x;
|
||||||
|
goto mem_found;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mem_found:
|
||||||
|
|
||||||
|
fb_res_x = res_x;
|
||||||
|
fb_res_y = res_y;
|
||||||
|
fb_res_b = PREFERRED_B;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
0
src/arch/amd64/fb.h
Normal file
0
src/arch/amd64/fb.h
Normal file
|
@ -1,10 +1,12 @@
|
||||||
#include <lib.h>
|
#include <lib.h>
|
||||||
#include <serial.h>
|
#include <serial.h>
|
||||||
|
#include <fb.h>
|
||||||
|
|
||||||
void kmain(void *info) {
|
void kmain(void *info) {
|
||||||
char buf[20];
|
char buf[20];
|
||||||
*(char*)0xB8000 = 'c';
|
*(char*)0xB8000 = 'c';
|
||||||
//*(char*)(0xB8002 + 0x20'0000) = 'd';
|
//*(char*)(0xB8002 + 0x20'0000) = 'd';
|
||||||
itoa((long)info, buf, 16);
|
itoa((long)info, buf, 16);
|
||||||
|
fb_init(1024, 768);
|
||||||
serial_out_str(buf);
|
serial_out_str(buf);
|
||||||
}
|
}
|
||||||
|
|
11
src/lib.c
11
src/lib.c
|
@ -43,6 +43,17 @@ int strncmp(const char *restrict lhs, const char *restrict rhs, unsigned long n)
|
||||||
return *l - *r;
|
return *l - *r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char *strcpy(char *restrict dest, const char *restrict src) {
|
||||||
|
for(; (*dest = *src); dest++, src++);
|
||||||
|
return dest;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *strncpy(char *restrict dest, const char *restrict src, unsigned long n) {
|
||||||
|
for(; (*dest = *src) && n; dest++, src++, n--);
|
||||||
|
memset(dest, 0, n);
|
||||||
|
return dest;
|
||||||
|
}
|
||||||
|
|
||||||
int isspace(int c) {
|
int isspace(int c) {
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case ' ':
|
case ' ':
|
||||||
|
|
Loading…
Reference in a new issue