ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with GCC

This commit is contained in:
Sylvain Gadrat 2023-06-12 01:09:21 +02:00 committed by contact@brokestudio.fr
parent 3f13bd72a4
commit 5ba8ef3a94
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/boards/rainbow2.cpp
View File

@ -309,7 +309,7 @@ static void Rainbow2IRQ(int a) {
} }
static void Sync(void) { static void Sync(void) {
static uint8 *address; //static uint8 *address;
//uint32 start; //uint32 start;
//uint32 offset; //uint32 offset;
uint8 cart_chr_map; uint8 cart_chr_map;
@ -938,6 +938,7 @@ uint8 Rainbow2FlashID(uint8 chip, uint32 A) {
if (chip == CHIP_TYPE_PRG) flash_size = ROM_size * 16; if (chip == CHIP_TYPE_PRG) flash_size = ROM_size * 16;
else if (chip == CHIP_TYPE_CHR) flash_size = VROM_size * 8; else if (chip == CHIP_TYPE_CHR) flash_size = VROM_size * 8;
else flash_size = ROM_size * 16; // Invalid chip number. Behavior to be verified, but don't let flash_size uninitialized.
uint32 aid = A & 0x1FF; uint32 aid = A & 0x1FF;
switch (aid) switch (aid)
@ -1169,6 +1170,9 @@ void Rainbow2Flash(uint8 chip, uint32 flash_addr, uint8 V) {
flash_size = ROM_size * 16; flash_size = ROM_size * 16;
else if (chip == CHIP_TYPE_CHR) else if (chip == CHIP_TYPE_CHR)
flash_size = VROM_size * 8; flash_size = VROM_size * 8;
else
// Invalid chip number. Behavior to be verified, but don't let flash_size uninitialized.
flash_size = ROM_size * 16;
switch (flash_size) switch (flash_size)
{ {

34
src/boards/rainbow_esp.cpp
View File

@ -275,13 +275,13 @@ void BrokeStudioFirmware::processBufferedMessage() {
if (message->at(1) == message_type) { if (message->at(1) == message_type) {
++i; ++i;
if (i > n_keep) { if (i > n_keep) {
UDBG("RAINBOW BrokeStudioFirmware erase message: index=%d\n", message - this->tx_messages.begin()); UDBG("RAINBOW BrokeStudioFirmware erase message: index=%ld\n", message - this->tx_messages.begin());
message = this->tx_messages.erase(message); message = this->tx_messages.erase(message);
}else { }else {
UDBG("RAINBOW BrokeStudioFirmware keep message: index=%d - too recent\n", message - this->tx_messages.begin()); UDBG("RAINBOW BrokeStudioFirmware keep message: index=%ld - too recent\n", message - this->tx_messages.begin());
} }
}else { }else {
UDBG("RAINBOW BrokeStudioFirmware keep message: index=%d - bad type\n", message - this->tx_messages.begin()); UDBG("RAINBOW BrokeStudioFirmware keep message: index=%ld - bad type\n", message - this->tx_messages.begin());
} }
} }
} }
@ -469,7 +469,7 @@ void BrokeStudioFirmware::processBufferedMessage() {
if (message_size == 2) { if (message_size == 2) {
server_protocol_t const requested_protocol = static_cast<server_protocol_t>(this->rx_buffer.at(2)); server_protocol_t const requested_protocol = static_cast<server_protocol_t>(this->rx_buffer.at(2));
if (requested_protocol > server_protocol_t::UDP) { if (requested_protocol > server_protocol_t::UDP) {
UDBG("RAINBOW BrokeStudioFirmware SET_SERVER_PROTOCOL: unknown protocol (%d)\n", requested_protocol); UDBG("RAINBOW BrokeStudioFirmware SET_SERVER_PROTOCOL: unknown protocol (%u)\n", static_cast<unsigned int>(requested_protocol));
}else { }else {
this->active_protocol = requested_protocol; this->active_protocol = requested_protocol;
} }
@ -571,7 +571,7 @@ void BrokeStudioFirmware::processBufferedMessage() {
this->sendUdpDatagramToServer(payload_begin, payload_end); this->sendUdpDatagramToServer(payload_begin, payload_end);
break; break;
default: default:
UDBG("RAINBOW BrokeStudioFirmware active protocol (%d) not implemented\n", this->active_protocol); UDBG("RAINBOW BrokeStudioFirmware active protocol (%u) not implemented\n", static_cast<unsigned int>(this->active_protocol));
}; };
break; break;
} }
@ -1352,8 +1352,7 @@ void BrokeStudioFirmware::_saveFiles(uint8 drive, char const* filename) {
ofs << (char)(0x00); //file format version ofs << (char)(0x00); //file format version
auto file = this->files.begin(); for (auto file = this->files.begin(); file != this->files.end(); ++file)
for (file; file != this->files.end(); ++file)
{ {
if (file->drive != drive) continue; if (file->drive != drive) continue;
ofs << (char)file->filename.length(); //filename length ofs << (char)file->filename.length(); //filename length
@ -1502,7 +1501,7 @@ void BrokeStudioFirmware::sendUdpDatagramToServer(I begin, I end) {
); );
if (n == -1) { if (n == -1) {
UDBG("RAINBOW UDP send failed: %s\n", strerror(errno)); UDBG("RAINBOW UDP send failed: %s\n", strerror(errno));
}else if (n != message_size) { }else if (static_cast<size_t>(n) != message_size) {
UDBG("RAINBOW UDP sent partial message\n"); UDBG("RAINBOW UDP sent partial message\n");
} }
} }
@ -1534,7 +1533,7 @@ void BrokeStudioFirmware::sendTcpDataToServer(I begin, I end) {
); );
if (n == -1) { if (n == -1) {
UDBG("RAINBOW TCP send failed: %s\n", strerror(errno)); UDBG("RAINBOW TCP send failed: %s\n", strerror(errno));
}else if (n != message_size) { }else if (static_cast<size_t>(n) != message_size) {
UDBG("RAINBOW TCP sent partial message\n"); UDBG("RAINBOW TCP sent partial message\n");
} }
} }
@ -1567,7 +1566,7 @@ std::deque<uint8> BrokeStudioFirmware::read_socket(int socket) {
if (msg_len == -1) { if (msg_len == -1) {
UDBG("RAINBOW failed to read socket: %s\n", strerror(errno)); UDBG("RAINBOW failed to read socket: %s\n", strerror(errno));
}else if (msg_len <= MAX_MSG_SIZE) { }else if (msg_len <= static_cast<ssize_t>(MAX_MSG_SIZE)) {
UDBG("RAINBOW %lu received message of size %zd", wall_clock_milli(), msg_len); UDBG("RAINBOW %lu received message of size %zd", wall_clock_milli(), msg_len);
#if RAINBOW_DEBUG >= 2 #if RAINBOW_DEBUG >= 2
UDBG_FLOOD(": "); UDBG_FLOOD(": ");
@ -1598,7 +1597,7 @@ void BrokeStudioFirmware::receiveDataFromServer() {
this->socket->dispatchBinary([this] (std::vector<uint8_t> const& data) { this->socket->dispatchBinary([this] (std::vector<uint8_t> const& data) {
size_t const msg_len = data.end() - data.begin(); size_t const msg_len = data.end() - data.begin();
if (msg_len <= 0xff) { if (msg_len <= 0xff) {
UDBG("RAINBOW %lu WebSocket data received... size %02x", wall_clock_milli(), msg_len); UDBG("RAINBOW %lu WebSocket data received... size %02x", wall_clock_milli(), static_cast<unsigned int>(msg_len));
#if RAINBOW_DEBUG >= 2 #if RAINBOW_DEBUG >= 2
UDBG_FLOOD(": "); UDBG_FLOOD(": ");
for (uint8_t const c: data) { for (uint8_t const c: data) {
@ -1799,6 +1798,7 @@ std::pair<bool, sockaddr_in> BrokeStudioFirmware::resolve_server_address() {
hostent *he = gethostbyname(this->server_settings_address.c_str()); hostent *he = gethostbyname(this->server_settings_address.c_str());
if (he == NULL) { if (he == NULL) {
UDBG("RAINBOW unable to resolve server's hostname\n"); UDBG("RAINBOW unable to resolve server's hostname\n");
::memset(&addr, 0, sizeof(addr));
return std::make_pair(false, addr); return std::make_pair(false, addr);
} }
@ -1824,7 +1824,7 @@ void BrokeStudioFirmware::httpdEvent(mg_connection *nc, int ev, void *ev_data) {
if (ev == MG_EV_HTTP_REQUEST) { if (ev == MG_EV_HTTP_REQUEST) {
UDBG("http request event \n"); UDBG("http request event \n");
struct http_message *hm = (struct http_message *) ev_data; struct http_message *hm = (struct http_message *) ev_data;
UDBG(" uri: %.*s\n", hm->uri.len, hm->uri.p); UDBG(" uri: %.*s\n", static_cast<int>(std::max<size_t>(0, std::min<size_t>(INT_MAX, hm->uri.len))), hm->uri.p);
if (std::string("/api/esp/status") == std::string(hm->uri.p, hm->uri.len)) { if (std::string("/api/esp/status") == std::string(hm->uri.p, hm->uri.len)) {
if (mg_vcasecmp(&hm->method, "GET") == 0) { if (mg_vcasecmp(&hm->method, "GET") == 0) {
mg_send_response_line(nc, 200, "Content-Type: application/json\r\nConnection: close\r\n"); mg_send_response_line(nc, 200, "Content-Type: application/json\r\nConnection: close\r\n");
@ -1908,7 +1908,6 @@ void BrokeStudioFirmware::httpdEvent(mg_connection *nc, int ev, void *ev_data) {
std::string path = "/"; // Dir: /a | File: /a/b std::string path = "/"; // Dir: /a | File: /a/b
std::string filename = ""; // Dir: b | File: esp8266.txt std::string filename = ""; // Dir: b | File: esp8266.txt
std::string fullname = ""; // Dir: /a/b | File: /a/b/esp8266.txt std::string fullname = ""; // Dir: /a/b | File: /a/b/esp8266.txt
uint32 size = 0L;
std::string full_path = ""; std::string full_path = "";
std::string request_path = std::string(_path); std::string request_path = std::string(_path);
@ -1962,7 +1961,7 @@ void BrokeStudioFirmware::httpdEvent(mg_connection *nc, int ev, void *ev_data) {
mg_printf( mg_printf(
nc, nc,
"{\"id\":%d,\"type\":\"file\",\"label\":\"%s\",\"path\":\"%s\",\"filename\":\"%s\",\"fullname\":\"%s\",\"size\":%d}", "{\"id\":%d,\"type\":\"file\",\"label\":\"%s\",\"path\":\"%s\",\"filename\":\"%s\",\"fullname\":\"%s\",\"size\":%lu}",
id, label.c_str(), path.c_str(), filename.c_str(), fullname.c_str(), self->files.at(i).data.size() id, label.c_str(), path.c_str(), filename.c_str(), fullname.c_str(), self->files.at(i).data.size()
); );
id++; id++;
@ -2067,7 +2066,7 @@ void BrokeStudioFirmware::httpdEvent(mg_connection *nc, int ev, void *ev_data) {
int drive = atoi(_drive); int drive = atoi(_drive);
int i = self->findFile(drive, filename); int i = self->findFile(drive, filename);
UDBG("RAINBOW Web(self=%p) deleting file %s\n", self, filename); UDBG("RAINBOW Web(self=%p) deleting file %s\n", self, filename.c_str());
self->files.erase(self->files.begin() + i); self->files.erase(self->files.begin() + i);
self->saveFiles(); self->saveFiles();
send_message(200, "{\"success\":\"true\"}\n", "application/json"); send_message(200, "{\"success\":\"true\"}\n", "application/json");
@ -2236,7 +2235,7 @@ void BrokeStudioFirmware::httpdEvent(mg_connection *nc, int ev, void *ev_data) {
self->files.push_back(FileStruct({ drive, filename->second , std::vector<uint8>(file_data->second.begin(), file_data->second.end()) })); self->files.push_back(FileStruct({ drive, filename->second , std::vector<uint8>(file_data->second.begin(), file_data->second.end()) }));
self->saveFiles(); self->saveFiles();
UDBG("RAINBOW Web(self=%p) sucessfuly uploaded file %s\n", self, filename->second); UDBG("RAINBOW Web(self=%p) sucessfuly uploaded file %s\n", self, filename->second.c_str());
// Return something webbrowser friendly // Return something webbrowser friendly
send_message(200, "{\"success\":\"true\"}\n", "application/json"); send_message(200, "{\"success\":\"true\"}\n", "application/json");
@ -2252,12 +2251,11 @@ void BrokeStudioFirmware::httpdEvent(mg_connection *nc, int ev, void *ev_data) {
return; return;
} }
uint8 drive = atoi(_drive); uint8 drive = atoi(_drive);
int i = 0;
self->clearFiles(drive); self->clearFiles(drive);
std::string str_drive; std::string str_drive;
if (drive == 0) str_drive = "ESP Flash"; if (drive == 0) str_drive = "ESP Flash";
else if (drive == 1) str_drive = "SD Card"; else if (drive == 1) str_drive = "SD Card";
UDBG("RAINBOW Web(self=%p) sucessfuly formatted file system %s\n", self, str_drive); UDBG("RAINBOW Web(self=%p) sucessfuly formatted file system %s\n", self, str_drive.c_str());
// Return something webbrowser friendly // Return something webbrowser friendly
send_message(200, "{\"success\":\"true\"}\n", "application/json"); send_message(200, "{\"success\":\"true\"}\n", "application/json");

2
src/boards/rainbow_esp.h
View File

@ -256,7 +256,7 @@ private:
}; };
void processBufferedMessage(); void processBufferedMessage();
FileConfig BrokeStudioFirmware::parseFileConfig(uint8 config); FileConfig parseFileConfig(uint8 config);
int findFile(uint8 drive, std::string filename); int findFile(uint8 drive, std::string filename);
int findPath(uint8 drive, std::string path); int findPath(uint8 drive, std::string path);
std::string getAutoFilename(uint8 path, uint8 file); std::string getAutoFilename(uint8 path, uint8 file);