Gentoo Attachment #116995 for bug #166715

View | Details | Raw Unified
Collapse All | Expand All

(-) xtrs-4.9c/ChangeLog (+13 lines)

Lines 1-3	Link Here

4.9c-Gentoo -- Sat Apr 21 14:37:00 MDT 2007  Joe Peterson <joe@skyrush.com>

* Patched for Gentoo ebuild

  - Changed default romtype to Model 4P OSS Freeware ROM Image

    to avoid potential copyright infringement (same patch from

    previous ebuild xtrs-4.9-r1)

  - Change "int i" in the z80 delay loop to "volatile int"

    (allows near-actual speed emulation with optimization)

  - Added option to Makefile.local (SIGIO) to be used when compiled

    on Cygwin to avoid hang after F10 (reset)

  - Fixed keyboard wait issue that caused CPU spinning (i.e. max

    CPU usage) after using F10 (reset), F7, F8, or F9.

4.9c -- Sun May 14 17:54:25 PDT 2006 -- Tim Mann

4.9c -- Sun May 14 17:54:25 PDT 2006 -- Tim Mann

* Fixed the new -e flag on import/cmd and export/cmd to actually

* Fixed the new -e flag on import/cmd and export/cmd to actually

(-) xtrs-4.9c/main.c (-1 / +1 lines)

Lines 26-32	Link Here

#include "trs_disk.h"

#include "trs_disk.h"

#include "load_cmd.h"

#include "load_cmd.h"

int trs_model = 1;

int trs_model = 5;

int trs_paused = 1;

int trs_paused = 1;

int trs_autodelay = 0;

int trs_autodelay = 0;

char *program_name;

char *program_name;

(-) xtrs-4.9c/Makefile (-2 / +2 lines)

Lines 142-149	Link Here

# Local customizations for make variables are done in Makefile.local:

# Local customizations for make variables are done in Makefile.local:

include Makefile.local

include Makefile.local

CFLAGS = $(DEBUG) $(ENDIAN) $(DEFAULT_ROM) $(READLINE) $(DISKDIR) $(IFLAGS) \

CFLAGS += $(DEBUG) $(ENDIAN) $(DEFAULT_ROM) $(READLINE) $(DISKDIR) $(IFLAGS) \

       $(APPDEFAULTS) -DKBWAIT -DHAVE_SIGIO

       $(APPDEFAULTS) -DKBWAIT $(SIGIO)

LIBS = $(XLIB) $(READLINELIBS) $(EXTRALIBS)

LIBS = $(XLIB) $(READLINELIBS) $(EXTRALIBS)

ZMACFLAGS = -h

ZMACFLAGS = -h

(-) xtrs-4.9c/Makefile.local (-17 / +23 lines)

Lines 25-49	Link Here

# is included in this package.  This ROM cannot boot a Model III mode

# is included in this package.  This ROM cannot boot a Model III mode

# operating system.

# operating system.

# for -model I

## for -model I

BUILT_IN_ROM = fakerom.hex

#BUILT_IN_ROM = fakerom.hex

# for -model III and -model 4

## for -model III and -model 4

BUILT_IN_ROM3 = fakerom.hex

#BUILT_IN_ROM3 = fakerom.hex

# for -model 4P

## for -model 4P

BUILT_IN_ROM4P = xtrsrom4p.hex

#BUILT_IN_ROM4P = xtrsrom4p.hex

# If you would like the application to load a default ROM file at startup

# If you would like the application to load a default ROM file at startup

# time, use these lines (with the appropriate file names).  The default file

# time, use these lines (with the appropriate file names).  The default file

# name is ignored and can be omitted if the ROM for that model is built in.

# name is ignored and can be omitted if the ROM for that model is built in.

DEFAULT_ROM = -DDEFAULT_ROM='"/usr/local/lib/xtrs/level2rom.hex"' \

DEFAULT_ROM = -DDEFAULT_ROM='"/usr/share/xtrs/fakerom.hex"' \

              -DDEFAULT_ROM3='"/usr/local/lib/xtrs/romimage.m3"' \

              -DDEFAULT_ROM3='"/usr/share/xtrs/fakerom.hex"' \

              -DDEFAULT_ROM4P='"/usr/local/lib/xtrs/romimage.m4p"'

              -DDEFAULT_ROM4P='"/usr/share/xtrs/xtrsrom4p.hex"'

# If you would like to change where xtrs looks for disk?-? files, edit

# If you would like to change where xtrs looks for disk?-? files, edit

# this line.  "." of course means the current working directory.

# this line.  "." of course means the current working directory.

DISKDIR = -DDISKDIR='"."'

DISKDIR = -DDISKDIR='"/usr/share/xtrs/"'

# If you have the GNU readline package (the README file tells you where to

# If you have the GNU readline package (the README file tells you where to

# get it) and would like to use it with the built-in Z-80 debugger, use

# get it) and would like to use it with the built-in Z-80 debugger, use

Lines 52-63	Link Here

READLINE = -DREADLINE

READLINE = -DREADLINE

READLINELIBS = -lreadline -lncurses

READLINELIBS = -lreadline -lncurses

# If you have SIGIO and it works for you, use this line.

# If you are using Cygwin (Windows), however, SIGIO does not seem to work,

# so comment this out.

SIGIO = -DHAVE_SIGIO

# If you want to debug the emulator, use the -g flag instead:

# If you want to debug the emulator, use the -g flag instead:

DEBUG = -O2 -g

#DEBUG = -O2 -g

#DEBUG = -g -DKBDEBUG -DXDEBUG

#DEBUG = -g -DKBDEBUG -DXDEBUG

#DEBUG = -g

#DEBUG = -g

#DEBUG = -Wall

#DEBUG = -Wall

# Gentoo ebuild will set these flags

DEBUG =

# If you have gcc, and you want to use it:

# If you have gcc, and you want to use it:

Lines 89-95	Link Here

# prefix directory

# prefix directory

PREFIX=/usr/local

PREFIX=${D}/usr

#If included in distribution: PREFIX=/usr

#If included in distribution: PREFIX=/usr

# Set these to where you want installed stuff to go, if you install them.

# Set these to where you want installed stuff to go, if you install them.

Lines 103-110	Link Here

INSTALL = install

INSTALL = install

# If you are building in a subdirectory:

# If you are building in a subdirectory:

#vpath %.c ..

vpath %.c $(PREFIX)/bin

#vpath %.h ..

vpath %.h $(PREFIX)/bin

#vpath %.man ..

vpath %.man $(PREFIX)/share/man

#old way:

#VPATH = ..

(-) xtrs-4.9c/trs.h (+1 lines)

Lines 67-72	Link Here

extern void queue_key(int key);

extern void queue_key(int key);

extern int dequeue_key(void);

extern int dequeue_key(void);

extern void clear_key_queue(void);

extern void clear_key_queue(void);

extern void trs_start_kbwait(void);

extern void trs_end_kbwait(void);

extern void trs_end_kbwait(void);

extern int stretch_amount;

extern int stretch_amount;

(-) xtrs-4.9c/trs_keyboard.c (-1 / +6 lines)

Lines 983-988	Link Here

void

void

trs_start_kbwait()

  key_immediate = 0;

void

trs_end_kbwait()

trs_end_kbwait()

  key_immediate = 1;

  key_immediate = 1;

Lines 1003-1009	Link Here

      trs_paused = 1;

      trs_paused = 1;

      pause();			/* Wait for SIGALRM or SIGIO */

      pause();			/* Wait for SIGALRM or SIGIO */

      key_immediate = 0;

      trs_get_event(0);

      trs_get_event(0);

    return rval;

    return rval;

(-) xtrs-4.9c/trs_xinterface.c (+1 lines)

Lines 920-925	Link Here

    (void)trs_uart_check_avail();

    (void)trs_uart_check_avail();

  trs_start_kbwait();

  do {

  do {

    if (wait) {

    if (wait) {

      XNextEvent(display, &event);

      XNextEvent(display, &event);

(-) xtrs-4.9c/z80.c (-1 / +1 lines)

Lines 2999-3005	Link Here

    Uchar instruction;

    Uchar instruction;

    Ushort address; /* generic temps */

    Ushort address; /* generic temps */

    int ret = 0;

    int ret = 0;

    int i;

    volatile int i;

    trs_continuous = continuous;

    trs_continuous = continuous;

    /* loop to do a z80 instruction */

    /* loop to do a z80 instruction */

Attachment #116995: files/xtrs-4.9c-gentoo.patch for bug #166715