OpenCores
URL https://opencores.org/ocsvn/or1k/or1k/trunk

Subversion Repositories or1k

Compare Revisions

  • This comparison shows the changes necessary to convert path
    /
    from Rev 1145 to Rev 1146
    Reverse comparison

Rev 1145 → Rev 1146

/trunk/or1ksim/peripheral/channels/xterm.c
36,10 → 36,14
#include <unistd.h> /* close() */
#include <fcntl.h> /* O_RDWR */
#include <string.h> /* strchr() */
 
#ifndef __CYGWIN__
#include <sys/stropts.h> /* grantpt(), unlockpt() */
#include <libgen.h> /* basename() */
#endif /* __CYGWIN__ */
 
#include <termios.h> /* struct termios and al. */
#include <signal.h> /* signal() and al. */
#include <libgen.h> /* basename() */
#include <errno.h> /* errno and al. */
 
#include "channel.h"
46,8 → 50,6
#include "generic.h"
#include "fd.h"
 
 
 
struct xterm_channel
{
struct fd_channel fds;
55,6 → 57,14
char** argv;
};
 
#ifdef __CYGWIN__
char *basename(const char *filename)
{
char *p = strrchr (filename, '/');
return p ? p + 1 : (char *) filename;
}
#endif /* __CYGWIN__ */
 
static void xterm_close(void * data)
{
156,7 → 166,7
xt->fds.fdout = xt->fds.fdin = open(slavename, O_RDWR);
if(xt->fds.fdout < 0) goto closemastererror;
 
#ifndef linux
#if !defined(linux) && !defined(__CYGWIN__)
/* Linux does not support STREAMS-style line discipline, even with LiS. */
retval = ioctl(xt->fds.fdin, I_PUSH, "ptem");
if(retval < 0) goto closeslaveerror;
/trunk/or1ksim/peripheral/ethernet_i.h
40,6 → 40,16
 
#include <sys/types.h>
 
#ifdef __CYGWIN__
/* define some missing cygwin defines.
*
* NOTE! there is no nonblocking socket option implemented in cygwin.dll
* so defining MSG_DONTWAIT is just (temporary) workaround !!!
*/
#define MSG_DONTWAIT 0x40
#define ETH_HLEN 14
#endif /* __CYGWIN__ */
 
#define ETH_ALEN 6
 
struct ether_addr

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.