#include "serial.h"
#include <sys/dos.h>
-/* This is unused for now. We just return a placeholder. */
+#define disable() asm("cli")
+#define enable() asm("sti")
+
+
struct go32_ttystate
{
int bogus;
};
-
typedef struct
{
short jmp_op;
short getp;
short putp;
short iov;
+ short count;
+ short overflow;
+ short buffer_size;
+ short ovflushes;
}
ASYNC_STRUCT;
+#define AOFF_JMP_OP 0
+#define AOFF_SIGNATURE 2
+#define AOFF_VERSION 4
+#define AOFF_BUFFER_START 6
+#define AOFF_BUFFER_END 8
+#define AOFF_GETP 10
+#define AOFF_PUTP 12
+#define AOFF_IOV 14
+#define AOFF_COUNT 16
+#define AOFF_OVERFLOW 18
+#define AOFF_BUFFER_SIZE 20
+#define AOFF_OVFLUSHES 22
+
+
+static ASYNC_STRUCT a; /* Copy in our mem of the struct */
+static long aindex; /* index into dos space of struct */
+
static int go32_open PARAMS ((serial_t scb, const char *name));
static void go32_raw PARAMS ((serial_t scb));
static int go32_readchar PARAMS ((serial_t scb, int timeout));
static void go32_close PARAMS ((serial_t scb));
static serial_ttystate go32_get_tty_state PARAMS ((serial_t scb));
static int go32_set_tty_state PARAMS ((serial_t scb, serial_ttystate state));
-static char *aptr PARAMS ((short p));
-static ASYNC_STRUCT *getivec PARAMS ((int which));
+static unsigned char aptr PARAMS ((short p));
+static unsigned long getivec PARAMS ((int which));
static int dos_async_init PARAMS ((int port));
static void dos_async_tx PARAMS ((const char c));
static int dos_async_rx PARAMS (());
#define VERSION 1
#define OFFSET 0x104
-#define peek(a,b) (*(unsigned short *)(0xe0000000 + (a)*16 + (b)))
+char packet[50];
+int packet_len;
+int packet_idx;
+
+unsigned char bb;
+unsigned short sb;
+unsigned long sl;
+
+#define SET_BYTE(x,y) { char _buf = y;dosmemput(&_buf,1, x);}
+#define SET_WORD(x,y) { short _buf = y;dosmemput(&_buf,2, x);}
+#define GET_BYTE(x) ( dosmemget((x),1,&bb), bb)
-static volatile ASYNC_STRUCT *async;
-static int iov;
-#define com_rb iov
-#define com_tb iov
-#define com_ier iov+1
-#define com_ifr iov+2
-#define com_bfr iov+3
-#define com_mcr iov+4
-#define com_lsr iov+5
-#define com_msr iov+6
-static char *
+#define GET_LONG(x) ( dosmemget((x),4,&sl), sl)
+
+static
+unsigned short
+GET_WORD (x)
+{
+ unsigned short sb;
+ dosmemget ((x), 2, &sb);
+ return sb;
+}
+
+static int iov[2];
+
+#define com_rb(n) iov[n]
+#define com_tb(n) iov[n]
+#define com_ier(n) iov[n]+1
+#define com_ifr(n) iov[n]+2
+#define com_bfr(n) iov[n]+3
+#define com_mcr(n) iov[n]+4
+#define com_lsr(n) iov[n]+5
+#define com_msr(n) iov[n]+6
+
+static unsigned char
aptr (p)
short p;
{
- return (char *) ((unsigned) async - OFFSET + p);
+ return GET_BYTE (aindex - OFFSET + p);
}
-static ASYNC_STRUCT *
+static unsigned long
getivec (int which)
{
- ASYNC_STRUCT *a;
+ long tryaindex;
- if (peek (0, which * 4) != OFFSET)
+ if (GET_WORD (which * 4) != OFFSET)
return 0;
- a = (ASYNC_STRUCT *) (0xe0000000 + peek (0, which * 4 + 2) * 16 + peek (0, which * 4));
+ /* Find out where in memory this lives */
+ tryaindex = GET_WORD (which * 4 + 2) * 16 + GET_WORD (which * 4);
- if (a->signature != SIGNATURE)
+ if (GET_WORD (tryaindex + 2) != SIGNATURE)
return 0;
-
- if (a->version != VERSION)
+ if (GET_WORD (tryaindex + 4) != VERSION)
return 0;
-
- return a;
+ return tryaindex;
}
static int
switch (port)
{
case 1:
- async = getivec (12);
+ aindex = getivec (12);
break;
case 2:
- async = getivec (11);
+ aindex = getivec (11);
break;
default:
return 0;
}
- if (!async)
+ if (!aindex)
{
error ("GDB cannot connect to asynctsr program, check that it is installed\n\
and that serial I/O is not being redirected (perhaps by NFS)\n\n\
C> gdb \n", port, port);
}
- iov = async->iov;
- outportb (com_ier, 0x0f);
- outportb (com_bfr, 0x03);
- outportb (com_mcr, 0x0b);
- async->getp = async->putp = async->buffer_start;
-
+ iov[0] = GET_WORD (aindex + AOFF_IOV);
+ outportb (com_ier (0), 0x0f);
+ outportb (com_bfr (0), 0x03);
+ outportb (com_mcr (0), 0x0b);
return 1;
}
dos_async_tx (c)
const char c;
{
- while (~inportb (com_lsr) & 0x20)
+ while (~inportb (com_lsr (0)) & 0x20)
;
- outportb (com_tb, c);
+ outportb (com_tb (0), c);
}
-#define dos_async_ready() (async->getp != async->putp)
+static int
+dos_async_ready ()
+{
+ int ret;
+
+ if (packet_idx < packet_len)
+ return 1;
+
+ disable ();
+#if RDY_CNT
+ ret = GET_WORD (aindex + AOFF_COUNT);
+#else
+ ret = GET_WORD (aindex + AOFF_GETP) != GET_WORD (aindex + AOFF_PUTP);
+#endif
+ enable ();
+ return ret;
+
+
+}
static int
dos_async_rx ()
{
char rv;
+ short idx;
- while (!dos_async_ready ())
+ while (1)
{
- if (kbhit ())
+ if (packet_idx < packet_len)
{
- printf_unfiltered ("abort!\n");
- return 0;
+ char x = packet[packet_idx++];
+ return x;
}
+ while (!dos_async_ready ())
+ {
+ if (kbhit ())
+ {
+ printf_unfiltered ("abort!\n");
+ return 0;
+ }
+ }
+ disable ();
+ {
+ /* Sometimes we can read more than one char at a time
+ from the buffer, which is good, cause it'll mean
+ less time with interrupts turned off, which means
+ less dropped characters */
+
+ /* We only do the simplest case here - not bothering with
+ wrap around */
+ int len;
+
+ int getp = GET_WORD (aindex + AOFF_GETP);
+ int putp = GET_WORD (aindex + AOFF_PUTP);
+ int endb = GET_WORD (aindex + AOFF_BUFFER_END);
+ int startb = GET_WORD (aindex + AOFF_BUFFER_START);
+
+ /* We'd like to grab to the end of the the input,
+ but it may have wrapped, so max is to the end
+ of the buffer */
+
+ if (putp > endb || putp < getp)
+ putp = endb;
+
+ /* Work out the length of the suck */
+ len = putp - getp;
+
+ /* But only suck as many as we can hold in one go */
+ if (len > sizeof (packet))
+ len = sizeof (packet);
+
+ dosmemget (aindex - OFFSET + getp, len, packet);
+
+ packet_len = len;
+ packet_idx = 0;
+
+ if (getp + len >= endb)
+ {
+ getp = startb;
+ }
+ else
+ {
+ getp = getp + len;
+ }
+
+ SET_WORD (aindex + AOFF_GETP, getp);
+ SET_WORD (aindex + AOFF_COUNT, GET_WORD (aindex + AOFF_COUNT) - len);
+ }
+ enable ();
}
-
- rv = *aptr (async->getp++);
- if (async->getp >= async->buffer_end)
- async->getp = async->buffer_start;
-
- return rv;
}
+
static int
dosasync_read (fd, buf, len, timeout)
int fd;
{
long now, then;
int i;
-
+ int its = 0;
time (&now);
then = now + timeout;
while (!dos_async_ready ())
{
time (&now);
- if (now >= then)
+ if (now >= then && timeout > 0 && its > 1000)
return i;
+ its++;
}
}
*buf++ = dos_async_rx ();
projects / deliverable / binutils-gdb.git / blobdiff