This commit is contained in:
@@ -20,7 +20,6 @@
|
||||
#include "lpt.h"
|
||||
#include "utilities.h"
|
||||
#include "dos2linux.h"
|
||||
#include "ioselect.h"
|
||||
|
||||
/* status bits, Centronics */
|
||||
#define CTS_STAT_NOIOERR LPT_STAT_NOIOERR
|
||||
@@ -69,7 +68,7 @@ static int get_printer(ioport_t port)
|
||||
return -1;
|
||||
}
|
||||
|
||||
static Bit8u printer_io_read(ioport_t port, void *arg)
|
||||
static Bit8u printer_io_read(ioport_t port)
|
||||
{
|
||||
int i = get_printer(port);
|
||||
Bit8u val;
|
||||
@@ -104,7 +103,7 @@ static Bit8u printer_io_read(ioport_t port, void *arg)
|
||||
return val;
|
||||
}
|
||||
|
||||
static void printer_io_write(ioport_t port, Bit8u value, void *arg)
|
||||
static void printer_io_write(ioport_t port, Bit8u value)
|
||||
{
|
||||
int i = get_printer(port);
|
||||
if (i == -1)
|
||||
@@ -138,7 +137,9 @@ static void printer_io_write(ioport_t port, Bit8u value, void *arg)
|
||||
|
||||
static int dev_printer_open(int prnum)
|
||||
{
|
||||
int um = umask(026);
|
||||
lpt[prnum].dev_fd = open(lpt[prnum].dev, O_WRONLY);
|
||||
umask(um);
|
||||
if (lpt[prnum].dev_fd == -1) {
|
||||
error("LPT%i: error opening %s: %s\n", prnum+1, lpt[prnum].dev,
|
||||
strerror(errno));
|
||||
@@ -148,7 +149,7 @@ static int dev_printer_open(int prnum)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void pipe_callback(int fd, void *arg)
|
||||
static void pipe_callback(void *arg)
|
||||
{
|
||||
char buf[1024];
|
||||
int num = (long)arg;
|
||||
@@ -157,7 +158,6 @@ static void pipe_callback(int fd, void *arg)
|
||||
buf[n] = 0;
|
||||
error("LPT%i: %s\n", num+1, buf);
|
||||
}
|
||||
ioselect_complete(fd);
|
||||
}
|
||||
|
||||
static int pipe_printer_open(int prnum)
|
||||
@@ -270,6 +270,8 @@ printer_init(void)
|
||||
io_device.read_portd = NULL;
|
||||
io_device.write_portd = NULL;
|
||||
io_device.handler_name = "Parallel printer";
|
||||
io_device.irq = EMU_NO_IRQ;
|
||||
io_device.fd = -1;
|
||||
|
||||
for (i = 0; i < NUM_PRINTERS; i++) {
|
||||
lpt[i].initialized = 0;
|
||||
|
||||
Reference in New Issue
Block a user