URL
https://opencores.org/ocsvn/or1k/or1k/trunk
Subversion Repositories or1k
Compare Revisions
- This comparison shows the changes necessary to convert path
/
- from Rev 715 to Rev 716
- ↔ Reverse comparison
Rev 715 → Rev 716
/trunk/mw/src/Arch.rules
56,9 → 56,11
CXX_COMPILER = g++ |
TOOLSPREFIX = $(OR32TOOLSPREFIX) |
DEFINES += -DLINUX=1 -DUNIX=1 |
CFLAGS += -Wall $(OPTFLAGS) |
#CFLAGS += -Wall $(OPTFLAGS) |
CFLAGS += -Wall -Werror-implicit-function-declaration $(OPTFLAGS) |
#LDFLAGS += -L /projects/or32-uclinux/lib |
#LDFLAGS += -static |
LDFLAGS += -r -d |
endif |
|
ifeq ($(ARCH), LINUX-POWERPC) |
/trunk/mw/src/demos/nxroach/nxroach.c
17,6 → 17,8
#include <signal.h> |
#include <stdlib.h> |
#include <time.h> |
/* SIMON: we use strcmp */ |
#include <string.h> |
#define MWINCLUDECOLORS |
#include "nano-X.h" |
|
/trunk/mw/src/demos/nanox/world.c
7,6 → 7,8
*/ |
#include <stdio.h> |
#include <string.h> |
/* SIMON: we use exit */ |
#include <stdlib.h> |
#define MWINCLUDECOLORS |
#include "nano-X.h" |
|
/trunk/mw/src/demos/nanox/move.c
1,4 → 1,6
#include <stdio.h> |
/* SIMON */ |
#include <stdlib.h> |
#define MWINCLUDECOLORS |
#include "nano-X.h" |
/* |
/trunk/mw/src/demos/nanox/demo2.c
1,5 → 1,7
#define MWINCLUDECOLORS |
#include <stdio.h> |
/* SIMON: we use exit */ |
#include <stdlib.h> |
#include "nano-X.h" |
|
#include <signal.h> |
/trunk/mw/src/demos/nanox/ftdemo.c
3,6 → 3,8
* Martin Jolicoeur 2000 martinj@visuaide.com. |
*/ |
#include <stdio.h> |
/* SIMON: we use exit */ |
#include <stdlib.h> |
#define MWINCLUDECOLORS |
#include "nano-X.h" |
|
/trunk/mw/src/demos/nanox/nterm.c
11,6 → 11,8
#include <unistd.h> |
#include <errno.h> |
#include <signal.h> |
/* SIMO: we use strlen */ |
#include <string.h> |
|
#define MWINCLUDECOLORS |
#include "nano-X.h" |
/trunk/mw/src/demos/nanox/landmine.c
6,6 → 6,8
#include <stdio.h> |
#include <stdarg.h> |
#include <stdlib.h> |
/* SIMON: we use strlen */ |
#include <string.h> |
#if UNIX | DOS_DJGPP |
#include <fcntl.h> |
#include <unistd.h> |
/trunk/mw/src/demos/nanox/ntetris.c
79,6 → 79,8
#include <time.h> |
#include <ctype.h> |
#include <errno.h> |
/* SIMON: we use strlen */ |
#include <string.h> |
#include <sys/time.h> |
|
#ifdef __ECOS |
/trunk/mw/src/Makefile
23,11 → 23,12
DEFINES += |
|
# Compilation flags for C files OTHER than include directories |
CFLAGS += |
CFLAGS += |
# CFLAGS += -Werror-implicit-function-declaration |
# Preprocessor flags OTHER than defines |
CPPFLAGS += |
# Linking flags |
LDFLAGS += |
LDFLAGS += -r -d |
|
############################# targets section ################################ |
|
/trunk/mw/src/nanox/srvutil.c
276,8 → 276,9
*/ |
if (wp == clipwp) |
clipwp = NULL; |
if (wp == grabbuttonwp) |
if (wp == grabbuttonwp) { |
grabbuttonwp = NULL; |
} |
if (wp == cachewp) { |
cachewindowid = 0; |
cachewp = NULL; |
/trunk/mw/src/nanox/srvmain.c
176,6 → 176,7
|
while(1) |
GsSelect(0L); |
|
return 0; |
} |
#endif |
/trunk/mw/src/nanox/clientfb.c
79,6 → 79,7
frame_len = finfo.smem_len + frame_offset; |
frame_map = (unsigned char *)mmap(NULL, frame_len, PROT_READ|PROT_WRITE, |
MAP_SHARED, frame_fd, 0); |
|
if (frame_map == (unsigned char *)-1) { |
printf("Unable to memory map the video hardware\n"); |
frame_map = NULL; |
/trunk/mw/src/engine/devopen.c
14,6 → 14,7
*/ |
#include <stdio.h> |
#include <stdlib.h> |
#include <string.h> |
#include "device.h" |
#include "swap.h" |
|
/trunk/mw/src/config
101,7 → 101,7
# or for speed or debugging. This affects the nano-X server only. |
# |
#################################################################### |
LINK_APP_INTO_SERVER = N |
LINK_APP_INTO_SERVER = Y |
|
#################################################################### |
# |
256,8 → 256,8
# PSIONMOUSE for the Psion 5 |
# MTMOUSE for Microtouch touchpanel controller at RS232 port |
#################################################################### |
GPMMOUSE = Y |
SERMOUSE = N |
GPMMOUSE = N |
SERMOUSE = Y |
TPMOUSE = N |
TPHELIO = N |
ADSMOUSE = N |
/trunk/mw/src/drivers/kbd_ttyscan.c
102,6 → 102,7
fd = open(KEYBOARD, O_NONBLOCK); |
else |
fd = open(env, O_NONBLOCK); |
|
if (fd < 0) |
return -1; |
|
/trunk/mw/src/drivers/fblin8.c
14,6 → 14,8
#define __OPTIMIZE__ |
#endif |
#include <string.h> |
/* SIMON: we use malloc */ |
#include <stdlib.h> |
|
#include "device.h" |
#include "fb.h" |
/trunk/mw/src/drivers/scr_fb.c
236,7 → 236,11
/* mmap framebuffer into this address space*/ |
psd->size = (psd->size + getpagesize () - 1) |
/ getpagesize () * getpagesize (); |
psd->addr = mmap(NULL, psd->size, PROT_READ|PROT_WRITE,MAP_SHARED,fb,0); |
/* SIMON */ |
/* psd->addr = mmap(NULL, psd->size, PROT_READ|PROT_WRITE,MAP_SHARED,fb,0); |
*/ |
psd->addr = mmap(NULL, psd->size, PROT_READ|PROT_WRITE,0,fb,0); |
|
if(psd->addr == NULL || psd->addr == (unsigned char *)-1) { |
EPRINTF("Error mmaping %s: %m\n", env); |
goto fail; |
/trunk/mw/src/drivers/mou_ser.c
48,7 → 48,7
#else |
#define MOUSE_PORT "/dev/ttyS1" /* default mouse tty port */ |
#endif |
#define MOUSE_TYPE "pc" /* default mouse type "ms","pc","ps2" */ |
#define MOUSE_TYPE "ms" /* default mouse type "ms","pc","ps2" */ |
#endif |
#define MAX_BYTES 128 /* number of bytes for buffer */ |
|