Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+2010-04-19 Mike Frysinger <vapier@gentoo.org>
+
+ * dv-mn103ser.c (sockser_addr, USE_SOCKSER_P): Delete
+ (do_polling_event): Change USE_SOCKSER_P to dv_sockser_status.
+ (read_status_reg): Likewise.
+ (write_txb): Likewise.
+
2010-01-09 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure: Regenerate.
2010-01-09 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure: Regenerate.
-/* Access dv-sockser state */
-extern char* sockser_addr;
-#define USE_SOCKSER_P (sockser_addr != NULL)
-
-
#define NR_SERIAL_DEVS 3
#define SIO_STAT_RRDY 0x0010
#define NR_SERIAL_DEVS 3
#define SIO_STAT_RRDY 0x0010
do_polling_event (struct hw *me,
void *data)
{
do_polling_event (struct hw *me,
void *data)
{
+ SIM_DESC sd = hw_system (me);
struct mn103ser *serial = hw_data(me);
long serial_reg = (long) data;
char c;
struct mn103ser *serial = hw_data(me);
long serial_reg = (long) data;
char c;
+ status = dv_sockser_status (sd);
+ if (!(status & DV_SOCKSER_DISCONNECTED))
- rd = dv_sockser_read (hw_system (me));
+ rd = dv_sockser_read (sd);
if(rd != -1)
{
c = (char) rd;
if(rd != -1)
{
c = (char) rd;
if ( (serial->device[serial_reg].status & SIO_STAT_RRDY) == 0 )
{
if ( (serial->device[serial_reg].status & SIO_STAT_RRDY) == 0 )
{
+ SIM_DESC sd = hw_system (me);
+ int status;
+
/* FIFO is empty */
/* Kill current poll event */
if ( NULL != serial->device[serial_reg].event )
/* FIFO is empty */
/* Kill current poll event */
if ( NULL != serial->device[serial_reg].event )
serial->device[serial_reg].event = NULL;
}
serial->device[serial_reg].event = NULL;
}
+ status = dv_sockser_status (sd);
+ if (!(status & DV_SOCKSER_DISCONNECTED))
- rd = dv_sockser_read (hw_system (me));
+ rd = dv_sockser_read (sd);
if(rd != -1)
{
c = (char) rd;
if(rd != -1)
{
c = (char) rd;
+ SIM_DESC sd = hw_system (me);
+ int status;
+
serial->device[serial_reg].txb = *(unsigned8 *)source;
serial->device[serial_reg].txb = *(unsigned8 *)source;
+ status = dv_sockser_status (sd);
+ if (!(status & DV_SOCKSER_DISCONNECTED))
- dv_sockser_write(hw_system (me), * (char*) source);
+ dv_sockser_write(sd, * (char*) source);
- sim_io_write_stdout(hw_system (me), (char *)source, 1);
- sim_io_flush_stdout(hw_system (me));
+ sim_io_write_stdout(sd, (char *)source, 1);
+ sim_io_flush_stdout(sd);
}
hw_port_event (me, serial_reg+SERIAL0_SEND, 1);
}
hw_port_event (me, serial_reg+SERIAL0_SEND, 1);