Apple-2-Tools/xHD
1
0
Fork 0
mirror of https://github.com/ProDOS-8/xHD.git synced 2024-06-07 13:46:58 +00:00
Code Issues Projects Releases Wiki Activity

Several minor cleanups.

Browse Source
This commit is contained in:
Oliver Schmidt 2018-02-05 13:28:31 +01:00
parent 65cf9087bf
commit ae320c2ca4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/main.cpp
View File

@ -125,14 +125,14 @@ int main(int argc, char *argv[])
int fd = open(apFilename[iDrive], O_RDWR, S_IWRITE | S_IREAD); int fd = open(apFilename[iDrive], O_RDWR, S_IWRITE | S_IREAD);
if (fd == -1) if (fd == -1)
{ {
printf("Err: %s - %s\n", apFilename[iDrive], strerror(errno)); printf("Err: Open %s - %s\n", apFilename[iDrive], strerror(errno));
return EXIT_FAILURE; return EXIT_FAILURE;
} }
struct stat stats; struct stat stats;
if (fstat(fd, &stats) == -1) if (fstat(fd, &stats) == -1)
{ {
printf("Err: %s - %s\n", apFilename[iDrive], strerror(errno)); printf("Err: Stat %s - %s\n", apFilename[iDrive], strerror(errno));
return EXIT_FAILURE; return EXIT_FAILURE;
} }
unsigned int uFilesize = (unsigned int)stats.st_size; unsigned int uFilesize = (unsigned int)stats.st_size;
@ -140,13 +140,12 @@ int main(int argc, char *argv[])
apFileData[iDrive] = (char*)mmap(0, uFilesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); apFileData[iDrive] = (char*)mmap(0, uFilesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (apFileData[iDrive] == MAP_FAILED) if (apFileData[iDrive] == MAP_FAILED)
{ {
printf("Err: %s - %s\n", apFilename[iDrive], strerror(errno)); printf("Err: Map %s - %s\n", apFilename[iDrive], strerror(errno));
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} }
// Create a configuration for the serial ports // Create a configuration for the serial ports
enum sp_return eResult;
struct sp_port_config *pSerialConfig = 0; struct sp_port_config *pSerialConfig = 0;
assert(sp_new_config(&pSerialConfig) == SP_OK); assert(sp_new_config(&pSerialConfig) == SP_OK);
assert(sp_set_config_baudrate(pSerialConfig, 230400) == SP_OK); assert(sp_set_config_baudrate(pSerialConfig, 230400) == SP_OK);
@ -159,6 +158,7 @@ int main(int argc, char *argv[])
const int MAX_PORTS = 2; const int MAX_PORTS = 2;
int iValidPortCount = 0; int iValidPortCount = 0;
struct sp_port *apValidPorts[MAX_PORTS]; struct sp_port *apValidPorts[MAX_PORTS];
enum sp_return eResult;
{ {
struct sp_port **ports; struct sp_port **ports;
@ -231,11 +231,9 @@ int main(int argc, char *argv[])
} }
} }
} }
else // ! usbserial else // ! valid
{
if (bVerbose) if (bVerbose)
printf("\tskip\t'%s'\n", sp_get_port_name(pPort)); printf("\tskip\t'%s'\n", sp_get_port_name(pPort));
}
} }
sp_free_port_list(ports); sp_free_port_list(ports);
} }