diff --git a/BasiliskII/src/Unix/serial_unix.cpp b/BasiliskII/src/Unix/serial_unix.cpp index 0d378a73..0c017a9b 100644 --- a/BasiliskII/src/Unix/serial_unix.cpp +++ b/BasiliskII/src/Unix/serial_unix.cpp @@ -53,6 +53,7 @@ static int cfmakeraw(struct termios *termios_p) termios_p->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN); termios_p->c_cflag &= ~(CSIZE|PARENB); termios_p->c_cflag |= CS8; + return 0; } #endif diff --git a/BasiliskII/src/Unix/sys_unix.cpp b/BasiliskII/src/Unix/sys_unix.cpp index cc6a58b4..a6165377 100644 --- a/BasiliskII/src/Unix/sys_unix.cpp +++ b/BasiliskII/src/Unix/sys_unix.cpp @@ -747,6 +747,8 @@ bool SysCDReadTOC(void *arg, uint8 *toc) *toc++ = toc_size >> 8; *toc++ = toc_size & 0xff; return true; +#else + return false; #endif } else return false; @@ -810,6 +812,8 @@ bool SysCDGetPosition(void *arg, uint8 *pos) *pos++ = chan.data->what.position.reladdr.msf.second; *pos++ = chan.data->what.position.reladdr.msf.frame; return true; +#else + return false; #endif } else return false; @@ -845,6 +849,8 @@ bool SysCDPlay(void *arg, uint8 start_m, uint8 start_s, uint8 start_f, uint8 end play.end_s = end_s; play.end_f = end_f; return ioctl(fh->fd, CDIOCPLAYMSF, &play) == 0; +#else + return false; #endif } else return false; @@ -866,6 +872,8 @@ bool SysCDPause(void *arg) return ioctl(fh->fd, CDROMPAUSE) == 0; #elif defined(__FreeBSD__) || defined(__NetBSD__) return ioctl(fh->fd, CDIOCPAUSE) == 0; +#else + return false; #endif } else return false; @@ -887,6 +895,8 @@ bool SysCDResume(void *arg) return ioctl(fh->fd, CDROMRESUME) == 0; #elif defined(__FreeBSD__) || defined(__NetBSD__) return ioctl(fh->fd, CDIOCRESUME) == 0; +#else + return false; #endif } else return false; @@ -908,6 +918,8 @@ bool SysCDStop(void *arg, uint8 lead_out_m, uint8 lead_out_s, uint8 lead_out_f) return ioctl(fh->fd, CDROMSTOP) == 0; #elif defined(__FreeBSD__) || defined(__NetBSD__) return ioctl(fh->fd, CDIOCSTOP) == 0; +#else + return false; #endif } else return false; diff --git a/BasiliskII/src/Unix/video_x.cpp b/BasiliskII/src/Unix/video_x.cpp index 40628dc4..be3d25e0 100644 --- a/BasiliskII/src/Unix/video_x.cpp +++ b/BasiliskII/src/Unix/video_x.cpp @@ -1000,7 +1000,7 @@ driver_fbdev::driver_fbdev(const video_mode &mode) if ((line[0] == '#') || (line[0] == ';') || (line[0] == '\0')) continue; - if ((sscanf(line, "%19s %d %x", &fb_name, &fb_depth, &fb_offset) == 3) + if ((sscanf(line, "%19s %d %x", fb_name, &fb_depth, &fb_offset) == 3) && (strcmp(fb_name, fb_name) == 0) && (fb_depth == max_depth)) { device_found = true; break;