Skip to content

Upstream VHLD cleanup: indentation, case, tabs #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raszpl wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Upstream VHLD cleanup: indentation, case, tabs #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
99c5852
cleanup: indentation, case, tabs
raszpl Mar 29, 2026
a6b25b8
cleanup: indentation, case, tabs
raszpl Mar 29, 2026
3242b3a
cleanup: indentation, case, tabs. comment correction: data port 0x60
raszpl Mar 29, 2026
34da3f9
cleanup: indentation, case, tabs
raszpl Mar 29, 2026
e881149
cleanup: indentation, case, tabs
raszpl Mar 29, 2026
28c56d5
cleanup: indentation, case, tabs. missing: ISA_CLK_LOW_CYCLES, ISA_IO…
raszpl Mar 29, 2026
3c6ce86
cleanup: indentation, case, tabs
raszpl Mar 29, 2026
09c68ab
cleanup: indentation, case, tabs
raszpl Mar 29, 2026
0e28688
cleanup: indentation, case, tabs
raszpl Mar 29, 2026
048e7a3
cleanup: indentation, case, tabs
raszpl Mar 29, 2026
afa6376
cleanup: indentation, case, tabs
raszpl Mar 29, 2026
ad4b36f
more tabs
raszpl Mar 30, 2026
09b0714
cleanup: tabs
raszpl Mar 30, 2026
b1d2d76
cleanup: tabs
raszpl Mar 30, 2026
a4535de
cleanup: indentation, tabs
raszpl Mar 30, 2026
f3ad5c8
cleanup: indentation, tabs, nice reset macro
raszpl Mar 30, 2026
9955e41
cleanup: case
raszpl Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
700 changes: 346 additions & 354 deletions avr/main.c
View file
Open in desktop

Large diffs are not rendered by default.

175 changes: 83 additions & 92 deletions bios/c_src/cmos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,115 +5,106 @@ static uint8_t cmos_data[32];
#define CMOS_BASE 0x40

uint8_t cmos_read() {
uint8_t cmos_checksum = 0;
for(int i=0; i<31; i++) {
outb(0x70, CMOS_BASE + i);
cmos_data[i] = inb(0x71);
cmos_checksum += cmos_data[i]; // cmos_checksum skips 0x1F
}
outb(0x70, CMOS_BASE + 0x1F);
cmos_data[31] = inb(0x71);

if(cmos_checksum != cmos_data[31]) {
memset(cmos_data, 0, 32);
cmos_save();
return 0;
}
return 1;
uint8_t cmos_checksum = 0;
for(int i=0; i<31; i++) {
outb(0x70, CMOS_BASE + i);
cmos_data[i] = inb(0x71);
cmos_checksum += cmos_data[i]; // cmos_checksum skips 0x1F
}
outb(0x70, CMOS_BASE + 0x1F);
cmos_data[31] = inb(0x71);

if(cmos_checksum != cmos_data[31]) {
memset(cmos_data, 0, 32);
cmos_save();
return 0;
}

return 1;
}

void cmos_save() {
uint8_t cmos_checksum = 0;

for(int i=0; i<31; i++) {
outb(0x70, CMOS_BASE + i);
outb(0x71, cmos_data[i]);
cmos_checksum += cmos_data[i];
}
outb(0x70, CMOS_BASE + 0x1F);
outb(0x71, cmos_checksum);
uint8_t cmos_checksum = 0;

for(int i=0; i<31; i++) {
outb(0x70, CMOS_BASE + i);
outb(0x71, cmos_data[i]);
cmos_checksum += cmos_data[i];
}
outb(0x70, CMOS_BASE + 0x1F);
outb(0x71, cmos_checksum);
}


uint8_t cmos_get(enum CMOS_SETTINGS setting) {
switch(setting) {

case CMOS_QUICK_MEMTEST:
if((cmos_data[0] & 0b00000001) > 0) return 1;
return 0;

case CMOS_LBA_ENABLED:
if((cmos_data[0] & 0b00000010) > 0) return 1;
return 0;

case CMOS_LOCK_CMOS:
if((cmos_data[0] & 0b00000100) > 0) return 1;
return 0;


default:
return 0;
}
switch(setting) {
case CMOS_QUICK_MEMTEST:
if((cmos_data[0] & 0b00000001) > 0) return 1;
return 0;
case CMOS_LBA_ENABLED:
if((cmos_data[0] & 0b00000010) > 0) return 1;
return 0;
case CMOS_LOCK_CMOS:
if((cmos_data[0] & 0b00000100) > 0) return 1;
return 0;

default:
return 0;
}
}

void cmos_set(enum CMOS_SETTINGS setting, uint8_t value) {
switch(setting) {

case CMOS_QUICK_MEMTEST:
if(value > 0) {
cmos_data[0] |= 0b00000001;
} else {
cmos_data[0] &= ~0b00000001;
}
break;

case CMOS_LBA_ENABLED:
if(value > 0) {
cmos_data[0] |= 0b00000010;
} else {
cmos_data[0] &= ~0b00000010;
}
break;

case CMOS_LOCK_CMOS:
if(value > 0) {
cmos_data[0] |= 0b00000100;
} else {
cmos_data[0] &= ~0b00000100;
}
break;

default:
break;
}
switch(setting) {
case CMOS_QUICK_MEMTEST:
if(value > 0) {
cmos_data[0] |= 0b00000001;
} else {
cmos_data[0] &= ~0b00000001;
}
break;
case CMOS_LBA_ENABLED:
if(value > 0) {
cmos_data[0] |= 0b00000010;
} else {
cmos_data[0] &= ~0b00000010;
}
break;
case CMOS_LOCK_CMOS:
if(value > 0) {
cmos_data[0] |= 0b00000100;
} else {
cmos_data[0] &= ~0b00000100;
}
break;

default:
break;
}
}

void cmos_lock() {
outb(0x70, 0xFF);
outb(0x71, 0x17);
outb(0x70, 0xFF);
outb(0x71, 0x17);
}


uint8_t cmos_is_m8sbc() {
uint8_t b1, b2;
outb(0x70, 0xFC);
b1 = inb(0x71);
outb(0x70, 0xFD);
b2 = inb(0x71);

if(b1 == 0x48 && b2 == 0x86) return 1;
return 0;
uint8_t b1, b2;

outb(0x70, 0xFC);
b1 = inb(0x71);
outb(0x70, 0xFD);
b2 = inb(0x71);

if(b1 == 0x48 && b2 == 0x86) return 1;
return 0;
}

uint16_t cmos_chp_version() {
uint8_t b1, b2;
uint8_t b1, b2;

outb(0x70, 0xFE);
b1 = inb(0x71);
outb(0x70, 0xFF);
b2 = inb(0x71);
outb(0x70, 0xFE);
b1 = inb(0x71);
outb(0x70, 0xFF);
b2 = inb(0x71);

return (uint16_t)((b1<<8) | (b2 & 0xFF));
}
return (uint16_t)((b1<<8) | (b2 & 0xFF));
}
8 changes: 4 additions & 4 deletions bios/c_src/cmos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#include "utils.h"

enum CMOS_SETTINGS {
CMOS_QUICK_MEMTEST,
CMOS_LBA_ENABLED,
CMOS_LOCK_CMOS
CMOS_QUICK_MEMTEST,
CMOS_LBA_ENABLED,
CMOS_LOCK_CMOS
};

uint8_t cmos_read(); // returns 0 if checksum was invalid
Expand All @@ -23,4 +23,4 @@ uint8_t cmos_is_m8sbc();
uint16_t cmos_chp_version();


#endif
#endif
Loading