Channel and Block Device Code back

This commit is contained in:
Peter Weingartner 2024-06-24 21:43:44 -04:00
parent ece112a850
commit b8fcaa5123
2 changed files with 54 additions and 42 deletions

View file

@ -12,6 +12,9 @@
// Actually, for the X this depends on the submodel. E.g. Pizza Box doesn't have floppy. // Actually, for the X this depends on the submodel. E.g. Pizza Box doesn't have floppy.
#define HAS_FLOPPY 1 #define HAS_FLOPPY 1
// Does the model have a PATA / IDE interface
#define HAS_PATA 1
// Actually, for the X this depends on the submodel. E.g. Pizza Box doesn't have floppy. // Actually, for the X this depends on the submodel. E.g. Pizza Box doesn't have floppy.
#define HAS_PARALLEL_PORT 1 #define HAS_PARALLEL_PORT 1
@ -27,14 +30,17 @@
#define HAS_OPL3 1 #define HAS_OPL3 1
#elif MODEL == MODEL_FOENIX_A2560U #elif MODEL == MODEL_FOENIX_A2560U
#define HAS_OPL3 1 #define HAS_OPL3 1
#define HAS_PATA 1
#elif MODEL == MODEL_FOENIX_C256U_PLUS || MODEL == MODEL_FOENIX_C256U #elif MODEL == MODEL_FOENIX_C256U_PLUS || MODEL == MODEL_FOENIX_C256U
#define HAS_OPL3 1 #define HAS_OPL3 1
#define HAS_PATA 1
#elif MODEL == MODEL_FOENIX_C256U_FMX #elif MODEL == MODEL_FOENIX_C256U_FMX
#define HAS_SUPERIO 1 #define HAS_SUPERIO 1
#define HAS_PARALLEL_PORT 1 #define HAS_PARALLEL_PORT 1
#define HAS_MIDI_PORTS 1 #define HAS_MIDI_PORTS 1
#define HAS_EXTERNAL_SIDS 1 #define HAS_EXTERNAL_SIDS 1
#define HAS_OPL3 1 #define HAS_OPL3 1
#define HAS_PATA 1
#elif MODEL == MODEL_FOENIX_F256KE #elif MODEL == MODEL_FOENIX_F256KE
#define HAS_EXTERNAL_SIDS 1 #define HAS_EXTERNAL_SIDS 1
#define HAS_OPL3 1 #define HAS_OPL3 1
@ -51,6 +57,10 @@
#define HAS_FLOPPY 0 #define HAS_FLOPPY 0
#endif #endif
#ifndef HAS_PATA // PATA hard drive presence
#define HAS_PATA 0
#endif
#ifndef HAS_PARALLEL_PORT // Parallel/Centronics port presence #ifndef HAS_PARALLEL_PORT // Parallel/Centronics port presence
#define HAS_PARALLEL_PORT 0 #define HAS_PARALLEL_PORT 0
#endif #endif

View file

@ -162,17 +162,17 @@ void initialize() {
init_codec(); init_codec();
INFO("CODEC initialized."); INFO("CODEC initialized.");
// cdev_init_system(); // Initialize the channel device system cdev_init_system(); // Initialize the channel device system
// INFO("Channel device system ready."); INFO("Channel device system ready.");
// bdev_init_system(); // Initialize the channel device system bdev_init_system(); // Initialize the channel device system
// INFO("Block device system ready."); INFO("Block device system ready.");
// if ((res = con_install())) { // if ((res = con_install())) {
// log_num(LOG_ERROR, "FAILED: Console installation", res); // log_num(LOG_ERROR, "FAILED: Console installation", res);
// } else { // } else {
// INFO("Console installed."); // INFO("Console installed.");
// } // }
// /* Initialize the timers the MCP uses */ // /* Initialize the timers the MCP uses */
// timers_init(); // timers_init();
@ -192,11 +192,13 @@ void initialize() {
// // /* Play the SID test bong on the Gideon SID implementation */ // // /* Play the SID test bong on the Gideon SID implementation */
// // sid_test_internal(); // // sid_test_internal();
// // if ((res = pata_install())) { #if HAS_PATA
// // log_num(LOG_ERROR, "FAILED: PATA driver installation", res); if ((res = pata_install())) {
// // } else { log_num(LOG_ERROR, "FAILED: PATA driver installation", res);
// // INFO("PATA driver installed."); } else {
// // } INFO("PATA driver installed.");
}
#endif
// if ((res = sdc_install())) { // if ((res = sdc_install())) {
// ERROR1("FAILED: SDC driver installation %d", res); // ERROR1("FAILED: SDC driver installation %d", res);
@ -204,13 +206,13 @@ void initialize() {
// INFO("SDC driver installed."); // INFO("SDC driver installed.");
// } // }
// #if HAS_FLOPPY #if HAS_FLOPPY
// if ((res = fdc_install())) { if ((res = fdc_install())) {
// ERROR1("FAILED: Floppy drive initialization %d", res); ERROR1("FAILED: Floppy drive initialization %d", res);
// } else { } else {
// INFO("Floppy drive initialized."); INFO("Floppy drive initialized.");
// } }
// #endif #endif
// // At this point, we should be able to call into to console to print to the screens // // At this point, we should be able to call into to console to print to the screens
@ -220,29 +222,29 @@ void initialize() {
// log(LOG_INFO, "PS/2 keyboard initialized."); // log(LOG_INFO, "PS/2 keyboard initialized.");
// } // }
// #if MODEL == MODEL_FOENIX_A2560K #if MODEL == MODEL_FOENIX_A2560K
// if ((res = kbdmo_init())) { if ((res = kbdmo_init())) {
// log_num(LOG_ERROR, "FAILED: A2560K built-in keyboard initialization", res); log_num(LOG_ERROR, "FAILED: A2560K built-in keyboard initialization", res);
// } else { } else {
// log(LOG_INFO, "A2560K built-in keyboard initialized."); log(LOG_INFO, "A2560K built-in keyboard initialized.");
// } }
// #endif #endif
// #if HAS_PARALLEL_PORT #if HAS_PARALLEL_PORT
// if ((res = lpt_install())) { if ((res = lpt_install())) {
// log_num(LOG_ERROR, "FAILED: LPT installation", res); log_num(LOG_ERROR, "FAILED: LPT installation", res);
// } else { } else {
// log(LOG_INFO, "LPT installed."); log(LOG_INFO, "LPT installed.");
// } }
// #endif #endif
// #if HAS_MIDI_PORTS #if HAS_MIDI_PORTS
// if ((res = midi_install())) { if ((res = midi_install())) {
// log_num(LOG_ERROR, "FAILED: MIDI installation", res); log_num(LOG_ERROR, "FAILED: MIDI installation", res);
// } else { } else {
// log(LOG_INFO, "MIDI installed."); log(LOG_INFO, "MIDI installed.");
// } }
// #endif #endif
// // if (res = uart_install()) { // // if (res = uart_install()) {
// // log_num(LOG_ERROR, "FAILED: serial port initialization", res); // // log_num(LOG_ERROR, "FAILED: serial port initialization", res);