mirror
/
RGBtoHDMI
kopia lustrzana https://github.com/hoglet67/RGBtoHDMI
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Remove SD volume naming & add four recovery modes

pull/141/head
IanSB 2020-02-07 20:55:08 +00:00
rodzic 70411aa625
commit 807b6670e9
6 zmienionych plików z 89 dodań i 89 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

31
src/cpld_null.c
Wyświetl plik

@ -103,10 +103,10 @@ cpld_t cpld_null_atom = {
.show_cal_summary = cpld_show_cal_summary,
.show_cal_details = cpld_show_cal_details,
.show_cal_raw = cpld_show_cal_raw
};
};
cpld_t cpld_null_3bit = {
.name = "BBC",
.name = "3 BIT",
.default_profile = "BBC_Micro",
.init = cpld_init,
.get_version = cpld_get_version,
@ -129,7 +129,30 @@ cpld_t cpld_null_3bit = {
};
cpld_t cpld_null_6bit = {
.name = "RGB(TTL)",
.name = "6 BIT",
.default_profile = "BBC_Micro",
.init = cpld_init,
.get_version = cpld_get_version,
.calibrate = cpld_calibrate,
.set_mode = cpld_set_mode,
.analyse = cpld_analyse,
.old_firmware_support = cpld_old_firmware_support,
.frontend_info = cpld_frontend_info,
.set_frontend = cpld_set_frontend,
.get_divider = cpld_get_divider,
.get_delay = cpld_get_delay,
.update_capture_info = cpld_update_capture_info,
.get_params = cpld_get_params,
.get_value = cpld_get_value,
.get_value_string = cpld_get_value_string,
.set_value = cpld_set_value,
.show_cal_summary = cpld_show_cal_summary,
.show_cal_details = cpld_show_cal_details,
.show_cal_raw = cpld_show_cal_raw
};
cpld_t cpld_null = {
.name = "Unknown",
.default_profile = "BBC_Micro",
.init = cpld_init,
.get_version = cpld_get_version,

1
src/cpld_null.h
Wyświetl plik

@ -2,6 +2,7 @@
#define CPLD_NULL_H
#include "cpld.h"
extern cpld_t cpld_null;
extern cpld_t cpld_null_atom;
extern cpld_t cpld_null_3bit;
extern cpld_t cpld_null_6bit;

36
src/filesystem.c
Wyświetl plik

@ -965,39 +965,3 @@ int create_and_scan_palettes(char names[MAX_NAMES][MAX_NAMES_WIDTH], uint32_t pa
return count;
}
void write_board_marker(int type) {
char label[256];
init_filesystem();
f_getlabel("", label, 0);
if (type == BOARD_ATOM) {
if (strcmp(label, "ATOM") != 0) {
f_setlabel("ATOM");
}
} else {
if (type == BOARD_3BIT) {
if (strcmp(label, "3BIT") != 0) {
f_setlabel("3BIT");
}
} else {
if (strcmp(label, "6BIT") != 0) {
f_setlabel("6BIT");
}
}
}
close_filesystem();
}
int read_board_marker() {
char label[256];
init_filesystem();
f_getlabel("", label, 0);
close_filesystem();
if (strcmp(label, "ATOM") == 0) {
return BOARD_ATOM;
}
if (strcmp(label, "3BIT") == 0) {
return BOARD_3BIT;
}
return BOARD_6BIT;
}

8
src/filesystem.h
Wyświetl plik

@ -20,13 +20,5 @@ int file_load(char *path, char *buffer, unsigned int buffer_size);
int file_save(char *dirpath, char *name, char *buffer, unsigned int buffer_size);
int file_restore(char *dirpath, char *name);
int create_and_scan_palettes(char names[MAX_NAMES][MAX_NAMES_WIDTH], uint32_t palette_array[MAX_NAMES][MAX_PALETTE_ENTRIES]);
int read_board_marker();
void write_board_marker(int type);
enum {
BOARD_ATOM,
BOARD_3BIT,
BOARD_6BIT
};
#endif

2
src/osd.c
Wyświetl plik

@ -33,7 +33,7 @@
#define MAX_MENU_DEPTH 4
#define DEFAULT_CPLD_FIRMWARE_DIR "/cpld_firmware/6bit"
#define DEFAULT_CPLD_FIRMWARE_DIR "/cpld_firmware/recovery"
// =============================================================
// Definitions for the key press interface

100
src/rgb_to_hdmi.c
Wyświetl plik

@ -144,6 +144,13 @@ typedef void (*func_ptr)();
#define MAX_PLL_FREQ 3000000000
#endif
enum {
CPLD_NORMAL,
CPLD_BLANK,
CPLD_UNKNOWN,
CPLD_WRONG,
CPLD_MANUAL
};
// =============================================================
// Forward declarations
@ -220,6 +227,7 @@ static int current_display_buffer = 0;
static int h_overscan = 0;
static int v_overscan = 0;
static int cpuspeed = 1000;
static int cpld_fail_state = CPLD_NORMAL;
#ifdef MULTI_BUFFER
static int nbuffers = 0;
#endif
@ -1233,23 +1241,10 @@ static void cpld_init() {
delay_in_arm_cycles(1000);
// The CPLD now outputs an identifier and version number on the 12-bit pixel quad bus
cpld_version_id = read_cpld_version();
RPI_SetGpioValue(STROBE_PIN, 1);
delay_in_arm_cycles(1000);
if (cpld_version_id != read_cpld_version()) { // if STROBE_PIN (GPIO22) has an effect on the version ID (P19) it means the RGB cpld has been programmed into the BBC board
RPI_SetGpioPinFunction(STROBE_PIN, FS_INPUT); // set STROBE PIN back to an input as P19 will be an ouput when VERSION_PIN set back to 1
delay_in_arm_cycles(1000);
cpld_version_id = 0xfff; // fake a blank cpld
write_board_marker(BOARD_3BIT); // set 3 bit board marker to ensure correct cpld programmed next time.
}
// Release the active low version pin. This will damage the cpld if YUV is programmed into a BBC board but not RGB due to above safety test
RPI_SetGpioValue(VERSION_PIN, 1);
int board_marker = read_board_marker();
// Set the appropriate cpld "driver" based on the version
if ((cpld_version_id >> VERSION_DESIGN_BIT) == DESIGN_BBC) {
write_board_marker(BOARD_3BIT);
RPI_SetGpioPinFunction(STROBE_PIN, FS_INPUT);
if ((cpld_version_id & 0xff) <= 0x20) {
cpld = &cpld_bbcv10v20;
} else if ((cpld_version_id & 0xff) <= 0x23) {
@ -1262,44 +1257,58 @@ static void cpld_init() {
cpld = &cpld_bbc;
}
} else if ((cpld_version_id >> VERSION_DESIGN_BIT) == DESIGN_ATOM) {
write_board_marker(BOARD_ATOM);
RPI_SetGpioPinFunction(STROBE_PIN, FS_INPUT);
cpld = &cpld_atom;
} else if ((cpld_version_id >> VERSION_DESIGN_BIT) == DESIGN_YUV) {
write_board_marker(BOARD_6BIT);
cpld = &cpld_yuv;
} else if ((cpld_version_id >> VERSION_DESIGN_BIT) == DESIGN_RGB_TTL) {
write_board_marker(BOARD_6BIT);
cpld = &cpld_rgb_ttl;
RPI_SetGpioValue(STROBE_PIN, 1);
delay_in_arm_cycles(1000);
if ((read_cpld_version() >> VERSION_DESIGN_BIT) == DESIGN_RGB_ANALOG) { // if STROBE_PIN (GPIO22) has an effect on the version ID (P19) it means the RGB cpld has been programmed into the BBC board
cpld = &cpld_null_6bit;
cpld_fail_state = CPLD_WRONG;
} else {
cpld = &cpld_rgb_ttl;
}
RPI_SetGpioPinFunction(STROBE_PIN, FS_INPUT); // set STROBE PIN back to an input as P19 will be an ouput when VERSION_PIN set back to 1
} else if ((cpld_version_id >> VERSION_DESIGN_BIT) == DESIGN_RGB_ANALOG) {
write_board_marker(BOARD_6BIT);
cpld = &cpld_rgb_analog;
} else {
log_info("Unknown CPLD: identifier = %03x", cpld_version_id);
if (board_marker == BOARD_ATOM) {
cpld = &cpld_null_atom;
if (cpld_version_id == 0xfff) {
cpld_fail_state = CPLD_BLANK;
} else {
if (board_marker == BOARD_3BIT) {
cpld = &cpld_null_3bit;
} else {
cpld = &cpld_null_6bit;
}
cpld_fail_state = CPLD_UNKNOWN;
}
cpld = &cpld_null;
RPI_SetGpioPinFunction(STROBE_PIN, FS_INPUT);
}
int keycount = key_press_reset();
log_info("Keycount = %d", keycount);
if (keycount == 7) {
if (board_marker == BOARD_ATOM) {
cpld = &cpld_null_atom;
} else {
if (board_marker == BOARD_3BIT) {
cpld = &cpld_null_3bit;
} else {
cpld = &cpld_null_6bit;
}
}
cpld_version_id = 0xfff;
switch(cpld_version_id >> VERSION_DESIGN_BIT) {
case DESIGN_BBC:
cpld = &cpld_null_3bit;
break;
case DESIGN_RGB_TTL:
case DESIGN_RGB_ANALOG:
case DESIGN_YUV:
cpld = &cpld_null_6bit;
break;
case DESIGN_ATOM:
cpld = &cpld_null_atom;
break;
default:
cpld = &cpld_null;
break;
}
cpld_fail_state = CPLD_MANUAL;
RPI_SetGpioPinFunction(STROBE_PIN, FS_INPUT);
}
// Release the active low version pin. This will damage the cpld if YUV is programmed into a BBC board but not RGB due to above safety test
delay_in_arm_cycles(1000);
RPI_SetGpioValue(VERSION_PIN, 1);
log_info("CPLD Design: %s", cpld->name);
log_info("CPLD Version: %x.%x", (cpld_version_id >> VERSION_MAJOR_BIT) & 0x0f, (cpld_version_id >> VERSION_MINOR_BIT) & 0x0f);
@ -2193,7 +2202,6 @@ void rgb_to_hdmi_main() {
int ncapture;
int last_profile = -1;
int last_subprofile = -1;
int forcereprogram = 0;
char osdline[80];
capture_info_t last_capinfo;
clk_info_t last_clkinfo;
@ -2221,7 +2229,6 @@ void rgb_to_hdmi_main() {
case 7 :
{
log_info("Entering CPLD reprogram mode");
forcereprogram = 1;
do {} while (key_press_reset() != 0);
}
break;
@ -2280,12 +2287,25 @@ void rgb_to_hdmi_main() {
osd_refresh();
// If the CPLD is unprogrammed, operate in a degraded mode that allows the menus to work
if ((((cpld->get_version() >> VERSION_DESIGN_BIT) & 15) == DESIGN_NULL) || forcereprogram != 0) {
if (cpld_fail_state != CPLD_NORMAL) {
while (1) {
if (status[0] != 0) {
osd_set(1, 0, status);
} else {
osd_set(1, 0, "CPLD is unprogrammed");
switch (cpld_fail_state) {
case CPLD_BLANK:
osd_set(1, 0, "CPLD is unprogrammed: Select correct CPLD");
break;
case CPLD_UNKNOWN:
osd_set(1, 0, "CPLD is unknown: Select correct CPLD");
break;
case CPLD_WRONG:
osd_set(1, 0, "Wrong CPLD (6bit CPLD on 3bit board)");
break;
case CPLD_MANUAL:
osd_set(1, 0, "Manual CPLD recovery: Select correct CPLD");
break;
}
}
int flags = 0;
capinfo->ncapture = ncapture;