gered/FoenixToolbox
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Boot refinements and correcting machine IDs.

Browse source
This commit is contained in:
Peter Weingartner 2024-08-26 19:54:12 -04:00
parent 6e2256d0a7
commit 5f28453c11
4 changed files with 140 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
misc/Memory Map.ods Normal file
View file

Binary file not shown.

120
src/boot.c
View file

@ -15,6 +15,7 @@
#include "cartridge.h"
#include "dev/fsys.h"
#include "dev/channel.h"
#include "dev/console.h"
#include "dev/kbd_f256k.h"
#include "dev/txt_screen.h"
#include "dev/sprites.h"
@ -31,11 +32,16 @@ const uint32_t boot_record_alignment = 8192; // Number of bytes for boot record
const uint32_t boot_rom_location = 0xf80000; // Location to check for a boot record in ROM
const uint32_t boot_cart_location = 0xf40000; // Location to check for a boot record in ROM
const unsigned short kbd_mod_shift = 0x0800;
const unsigned short kbd_sc_space = 0x0039;
const unsigned short kbd_sc_f1 = 0x003b;
const unsigned short kbd_sc_f2 = 0x003c;
const unsigned short kbd_sc_f3 = 0x003d;
const unsigned short kbd_sc_f4 = 0x003e;
const unsigned short kbd_sc_f5 = 0x003f;
const unsigned short kbd_sc_f6 = 0x0040;
const unsigned short kbd_sc_f7 = 0x0041;
const unsigned short kbd_sc_f8 = 0x0042;
enum boot_src_e {
BOOT_SRC_NONE = 0, // Nothing more to check
@ -284,12 +290,12 @@ void boot_from(enum boot_src_e device, boot_record_p boot_record) {
switch(device) {
case BOOT_SRC_SD0:
if (fsys_stat("/sd0/fnxboot.pgz", &file_info) >= 0) {
txt_print(0, "Booting: /sd0/fnxboot.pgz\n");
printf("Booting: /sd0/fnxboot.pgz\n");
boot_reset_screen();
proc_run("/sd0/fnxboot.pgz", 0, boot_args);
} else if (fsys_stat("/sd0/fnxboot.pgx", &file_info) >= 0) {
txt_print(0, "Booting: /sd0/fnxboot.pgx\n");
printf("Booting: /sd0/fnxboot.pgx\n");
boot_reset_screen();
result = proc_run("/sd0/fnxboot.pgx", 0, boot_args);
if (result != 0) {
@ -301,9 +307,7 @@ void boot_from(enum boot_src_e device, boot_record_p boot_record) {
case BOOT_SRC_CARTRIDGE:
case BOOT_SRC_ROM:
case BOOT_SRC_RAM:
txt_print(0, "Booting from ");
txt_print(0, boot_source_name(device));
txt_print(0, "\n");
printf("Booting from %s\n", boot_source_name(device));
// Double-check that the boot record is valid before we attempt to boot
if (boot_record != 0) {
@ -313,35 +317,82 @@ void boot_from(enum boot_src_e device, boot_record_p boot_record) {
proc_exec(boot_record->start_address, 0, 0, boot_args);
}
} else {
txt_print(0, "A valid boot record was not found.\n");
printf("A valid boot record was not found.\n");
}
break;
default:
txt_print(0, "No bootable device is present.\n");
printf("No bootable device is present.\n");
break;
}
}
/**
* @brief Convert a scan code to a menu selection
*
* Convert: function keys F1 - F8 to 1 - 8
* SPACE to 0x20
*
* @param scancode
* @return short
*/
static short sc_to_function(unsigned short scancode) {
switch(scancode) {
case kbd_sc_space:
return 0x20;
case kbd_sc_f1:
return 1;
case kbd_sc_f1 | kbd_mod_shift:
case kbd_sc_f2:
return 2;
case kbd_sc_f3:
return 3;
case kbd_sc_f3 | kbd_mod_shift:
case kbd_sc_f4:
return 4;
case kbd_sc_f5:
return 5;
case kbd_sc_f5 | kbd_mod_shift:
case kbd_sc_f6:
return 6;
default:
return 0;
}
}
/**
* @brief Setup the boot screen
*
*/
void boot_screen() {
enum boot_src_e boot_source = BOOT_SRC_NONE;
short i = 0;
long jiffies_target = 0;
boot_record_p boot_record[10];
short boot_position = 0;
short bootable_count = 0;
short i = 0;
long jiffies_target = 0;
char message[80];
// txt_set_mode(0, TXT_MODE_TEXT | TXT_MODE_SPRITE);
// Make sure that ANSI escape codes will be honored
chan_ioctrl(0, CON_IOCTRL_ANSI_ON, 0, 0);
// TODO: debug this
// txt_set_mode(0, TXT_MODE_TEXT | TXT_MODE_SPRITE | VKY_MCR_TILE);
*tvky_mstr_ctrl = (uint16_t)(VKY_MCR_TILE | VKY_MCR_SPRITE | VKY_MCR_GRAPHICS | VKY_MCR_TEXT_OVERLAY | VKY_MCR_TEXT);
tvky_bg_color->blue = 0;
tvky_bg_color->green = 0;
tvky_bg_color->red = 0;
// Set up the highlighted (#0) and dimmed (#1) graphics CLUTs
for (i = 0; i < 4 * 256; i++) {
VKY_GR_CLUT_0[i] = boot_clut[i];
VKY_GR_CLUT_1[i] = boot_clut[i] >> 2;
@ -372,7 +423,7 @@ void boot_screen() {
boot_text_window.size.height = 12;
txt_set_region(0, &boot_text_window);
txt_print(0, "Scanning for bootable devices...\n");
printf("Scanning for bootable devices...\n");
for (short position = 0; position < sizeof(boot_chain) / sizeof(enum boot_src_e); position++) {
bootable[position] = false;
@ -380,12 +431,11 @@ void boot_screen() {
if (is_bootable(boot_chain[position], &boot_record[position])) {
boot_icon_highlight(position);
bootable[position] = true;
bootable_count++;
// Assign the boot source to this, if it hasn't already been bound
if (boot_source == BOOT_SRC_NONE) {
txt_print(0, "Default boot source: ");
txt_print(0, boot_source_name(boot_chain[position]));
txt_put(0, '\n');
printf("Default boot source: %s\n", boot_source_name(boot_chain[position]));
boot_source = boot_chain[position];
boot_position = position;
}
@ -408,16 +458,46 @@ void boot_screen() {
}
}
txt_print(0, "\nPress SPACE to use default.\n");
// List out all the selectable boot sources
if (bootable_count > 1) {
printf("\nSelect a boot source:\n\n");
jiffies_target = timers_jiffies() + 60 * 10;
while (jiffies_target > timers_jiffies()) {
unsigned short scancode = kbd_get_scancode();
if (scancode == kbd_sc_space) {
break;
for (i = 0; i < sizeof(boot_chain) / sizeof(enum boot_src_e); i++) {
if (bootable[i]) {
sprintf(message, "\e[93mF%d\e[37m-%s\n", i+1, boot_source_name(boot_chain[i]));
chan_write(0, (uint8_t *)message, strlen(message));
}
}
}
sprintf(message, "\nPress \e[93mSPACE\e[37m for default.\n");
chan_write(0, (uint8_t *)message, strlen(message));
// Give the user time to press a key to select a boot source
// If the time expires, boot the default source (earliest in the boot chain)
jiffies_target = timers_jiffies() + 60 * 15;
while (jiffies_target > timers_jiffies()) {
unsigned short scancode = kbd_get_scancode();
if (scancode > 0) {
short selected = sc_to_function(scancode);
if (selected == 0x20) {
// SPACE was pressed... just boot the default
break;
} else if (selected > 0) {
if (bootable[selected - 1]) {
boot_position = selected - 1;
boot_source = boot_chain[boot_position];
break;
}
}
}
}
// And launch the system
boot_from(boot_source, boot_record[boot_position]);
}

74
src/sys_general.c
View file

@ -2,6 +2,34 @@
#include "gabe_reg.h"
#include "exp_reg.h"
/**
* @brief Names of the various models, indexed by their model IDs
*
*/
const char * sys_model_name[] = {
"C256 FMX", // 0
"C256 U",
"F256 JR",
"F256 JRe",
"GenX",
"C256 U+", // 5
"Reserved",
"Reserved",
"A2560 X",
"A2560 U+",
"A2560 M", // 10
"A2560 K",
"A2560 K40",
"A2560 K60",
"Reserved",
"Reserved", // 15
"F256 P",
"F256 K2c",
"F256 K2",
"F256 Ke",
"F256 K2e" // 20
};
/*
* Fill out a s_MODEL_info structure with the information about the current system
*
@ -132,10 +160,6 @@ void sys_get_information(p_sys_info info) {
#elif MODEL == MODEL_FOENIX_F256 || MODEL == MODEL_FOENIX_F256K || MODEL == MODEL_FOENIX_F256K2
machine_id = GABE_SYS_STAT->machine_id;
// TODO: be able to remove this line
if (machine_id == 0x13) {
machine_id = MODEL_FOENIX_F256K;
}
cpu = CPU_WDC65816;
clock_speed = SYSCLK_6MHZ;
@ -269,26 +293,6 @@ void sys_get_information(p_sys_info info) {
}
switch (info->model) {
case MODEL_FOENIX_F256:
info->model_name = "F256jr";
break;
case MODEL_FOENIX_F256K:
info->model_name = "F256K";
break;
case MODEL_FOENIX_F256K2:
info->model_name = "F256K2";
break;
case MODEL_FOENIX_FMX:
info->model_name = "C256 FMX";
break;
case MODEL_FOENIX_C256U:
info->model_name = "C256 U";
break;
case MODEL_FOENIX_GENX:
switch (genx_model_id) {
case 0: info->model_name = "GenX32 - PB"; break;
@ -298,14 +302,6 @@ void sys_get_information(p_sys_info info) {
}
break;
case MODEL_FOENIX_C256U_PLUS:
info->model_name = "C256 U+";
break;
case MODEL_FOENIX_A2560U_PLUS:
info->model_name = "A2560 U+";
break;
case MODEL_FOENIX_A2560X:
switch (genx_model_id) {
case 0: info->model_name = "A2560X - PB"; break;
@ -315,16 +311,12 @@ void sys_get_information(p_sys_info info) {
}
break;
case MODEL_FOENIX_A2560U:
info->model_name = "A2560 U";
break;
case MODEL_FOENIX_A2560K:
info->model_name = "A2560 K";
break;
default:
info->model_name = "UNKNOWN";
if (info->model < sizeof(sys_model_name) / sizeof(char *)) {
info->model_name = sys_model_name[info->model];
} else {
info->model_name = "UNKNOWN";
}
break;
}
}

8
src/sys_general.h
View file

@ -15,6 +15,7 @@
#define MODEL_FOENIX_FMX 0
#define MODEL_FOENIX_C256U 1
#define MODEL_FOENIX_F256 2
#define MODEL_FOENIX_F256JRE 3
#define MODEL_FOENIX_GENX 4
#define MODEL_FOENIX_C256U_PLUS 5
#define MODEL_FOENIX_A2560U_PLUS 6
@ -22,8 +23,13 @@
#define MODEL_FOENIX_A2560U 9
#define MODEL_FOENIX_A2560M 10
#define MODEL_FOENIX_A2560K 11
#define MODEL_FOENIX_F256K 18
#define MODEL_FOENIX_A2560K40 12
#define MODEL_FOENIX_A2560K60 13
#define MODEL_FOENIX_F256P 16
#define MODEL_FOENIX_F256K2 17
#define MODEL_FOENIX_F256K 18
#define MODEL_FOENIX_F256KE 19
#define MDOEL_FOENIX_F256K2E 20
/* IDs for the CPUs supported */