diff options
Diffstat (limited to 'src/osd')
| -rw-r--r-- | src/osd/modules/render/d3d/d3dhlsl.c | 6 | ||||
| -rw-r--r-- | src/osd/osdmini/minifile.c | 2 | ||||
| -rw-r--r-- | src/osd/osdnet.c | 2 | ||||
| -rw-r--r-- | src/osd/sdl/sdlfile.c | 18 | ||||
| -rw-r--r-- | src/osd/sdl/sdlptty_os2.c | 2 | ||||
| -rw-r--r-- | src/osd/sdl/sdlptty_unix.c | 126 | ||||
| -rw-r--r-- | src/osd/windows/winfile.c | 2 |
7 files changed, 79 insertions, 79 deletions
diff --git a/src/osd/modules/render/d3d/d3dhlsl.c b/src/osd/modules/render/d3d/d3dhlsl.c index f3dad935d3e..00603e45e82 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.c +++ b/src/osd/modules/render/d3d/d3dhlsl.c @@ -2266,9 +2266,9 @@ static void get_vector(const char *data, int count, float *out, int report_error /*------------------------------------------------- - slider_alloc - allocate a new slider entry - currently duplicated from ui.c, this could - be done in a more ideal way. + slider_alloc - allocate a new slider entry + currently duplicated from ui.c, this could + be done in a more ideal way. -------------------------------------------------*/ static slider_state *slider_alloc(running_machine &machine, const char *title, INT32 minval, INT32 defval, INT32 maxval, INT32 incval, slider_update update, void *arg) diff --git a/src/osd/osdmini/minifile.c b/src/osd/osdmini/minifile.c index 2883b81c731..b55a3ad77e9 100644 --- a/src/osd/osdmini/minifile.c +++ b/src/osd/osdmini/minifile.c @@ -107,7 +107,7 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l file_error osd_openpty(osd_file **file, char *name, size_t name_len) { - return FILERR_FAILURE; + return FILERR_FAILURE; } //============================================================ diff --git a/src/osd/osdnet.c b/src/osd/osdnet.c index 9fd92311ea7..4c167251cea 100644 --- a/src/osd/osdnet.c +++ b/src/osd/osdnet.c @@ -50,7 +50,7 @@ osd_netdev::~osd_netdev() { m_stop = true; // nasty hack to prevent Segmentation fault on emulation stop -// m_timer->reset(); +// m_timer->reset(); } int osd_netdev::send(UINT8 *buf, int len) diff --git a/src/osd/sdl/sdlfile.c b/src/osd/sdl/sdlfile.c index a93d5623412..7e3226d497a 100644 --- a/src/osd/sdl/sdlfile.c +++ b/src/osd/sdl/sdlfile.c @@ -365,18 +365,18 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 c file_error osd_openpty(osd_file **file, char *name, size_t name_len) { - file_error res; - UINT64 filesize; + file_error res; + UINT64 filesize; - if ((res = osd_open(sdlfile_ptty_identifier , 0 , file , &filesize)) != FILERR_NONE) { - return res; - } + if ((res = osd_open(sdlfile_ptty_identifier , 0 , file , &filesize)) != FILERR_NONE) { + return res; + } - if ((res = sdl_slave_name_ptty(*file , name , name_len)) != FILERR_NONE) { - osd_close(*file); - } + if ((res = sdl_slave_name_ptty(*file , name , name_len)) != FILERR_NONE) { + osd_close(*file); + } - return res; + return res; } //============================================================ diff --git a/src/osd/sdl/sdlptty_os2.c b/src/osd/sdl/sdlptty_os2.c index e7d76965238..6c31caf897f 100644 --- a/src/osd/sdl/sdlptty_os2.c +++ b/src/osd/sdl/sdlptty_os2.c @@ -35,5 +35,5 @@ file_error sdl_close_ptty(osd_file *file) file_error sdl_slave_name_ptty(osd_file *file) { - return FILERR_ACCESS_DENIED; + return FILERR_ACCESS_DENIED; } diff --git a/src/osd/sdl/sdlptty_unix.c b/src/osd/sdl/sdlptty_unix.c index 6b618314d72..abe4ba8db0b 100644 --- a/src/osd/sdl/sdlptty_unix.c +++ b/src/osd/sdl/sdlptty_unix.c @@ -40,91 +40,91 @@ const char *sdlfile_ptty_identifier = "/dev/pts"; file_error sdl_open_ptty(const char *path, UINT32 openflags, osd_file **file, UINT64 *filesize) { - int master; - int aslave; - struct termios tios; - int oldflags; - - memset(&tios , 0 , sizeof(tios)); - cfmakeraw(&tios); - - if (openpty(&master, &aslave, NULL, &tios, NULL) >= 0) - { - oldflags = fcntl(master, F_GETFL, 0); - if (oldflags == -1) { - close(master); - return FILERR_FAILURE; - } - - fcntl(master, F_SETFL, oldflags | O_NONBLOCK); - close(aslave); - (*file)->handle = master; - *filesize = 0; - } - else - { - return FILERR_ACCESS_DENIED; - } - - return FILERR_NONE; + int master; + int aslave; + struct termios tios; + int oldflags; + + memset(&tios , 0 , sizeof(tios)); + cfmakeraw(&tios); + + if (openpty(&master, &aslave, NULL, &tios, NULL) >= 0) + { + oldflags = fcntl(master, F_GETFL, 0); + if (oldflags == -1) { + close(master); + return FILERR_FAILURE; + } + + fcntl(master, F_SETFL, oldflags | O_NONBLOCK); + close(aslave); + (*file)->handle = master; + *filesize = 0; + } + else + { + return FILERR_ACCESS_DENIED; + } + + return FILERR_NONE; } file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 count, UINT32 *actual) { - ssize_t result; + ssize_t result; - result = read(file->handle, buffer, count); + result = read(file->handle, buffer, count); - if (result < 0) - { - return error_to_file_error(errno); - } + if (result < 0) + { + return error_to_file_error(errno); + } - if (actual != NULL ) - { - *actual = result; - } + if (actual != NULL ) + { + *actual = result; + } - return FILERR_NONE; + return FILERR_NONE; } file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual) { - ssize_t result; - result = write(file->handle, buffer, count); + ssize_t result; + result = write(file->handle, buffer, count); - if (result < 0) - { - return error_to_file_error(errno); - } + if (result < 0) + { + return error_to_file_error(errno); + } - if (actual != NULL ) - { - *actual = result; - } + if (actual != NULL ) + { + *actual = result; + } - return FILERR_NONE; + return FILERR_NONE; } file_error sdl_close_ptty(osd_file *file) { - close(file->handle); - osd_free(file); + close(file->handle); + osd_free(file); - return FILERR_NONE; + return FILERR_NONE; } file_error sdl_slave_name_ptty(osd_file *file , char *name , size_t name_len) { - const char *slave_name = ptsname(file->handle); + const char *slave_name = ptsname(file->handle); - if (slave_name == NULL || strlen(slave_name) >= name_len) { - return FILERR_INVALID_ACCESS; - } + if (slave_name == NULL || strlen(slave_name) >= name_len) { + return FILERR_INVALID_ACCESS; + } - strcpy(name , slave_name); + strcpy(name , slave_name); - return FILERR_NONE; + return FILERR_NONE; } #else @@ -134,27 +134,27 @@ const char *sdlfile_ptty_identifier = ""; file_error sdl_open_ptty(const char *path, UINT32 openflags, osd_file **file, UINT64 *filesize) { - return FILERR_ACCESS_DENIED; + return FILERR_ACCESS_DENIED; } file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 count, UINT32 *actual) { - return FILERR_ACCESS_DENIED; + return FILERR_ACCESS_DENIED; } file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual) { - return FILERR_ACCESS_DENIED; + return FILERR_ACCESS_DENIED; } file_error sdl_close_ptty(osd_file *file) { - return FILERR_ACCESS_DENIED; + return FILERR_ACCESS_DENIED; } file_error sdl_slave_name_ptty(osd_file *file) { - return FILERR_ACCESS_DENIED; + return FILERR_ACCESS_DENIED; } #endif diff --git a/src/osd/windows/winfile.c b/src/osd/windows/winfile.c index 2ac5cddaee3..86ce65a0ef7 100644 --- a/src/osd/windows/winfile.c +++ b/src/osd/windows/winfile.c @@ -241,7 +241,7 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 l file_error osd_openpty(osd_file **file, char *name, size_t name_len) { - return FILERR_FAILURE; + return FILERR_FAILURE; } //============================================================ |
