commit before working on ls_*.c

Author: NishiOwO

include/186.h

@@ -35,8 +35,6 @@
 /*#ifndef  R186_REG_DEFS */
 /*#define  R186_REG_DEFS   1  */
 
-#ifndef DTEX /* express doesn't have a 186.. */
-
 extern   unsigned int r186_io_base;
 
 /*
@@ -138,5 +136,4 @@ extern   unsigned int r186_io_base;
 #define  R186_INT_2       (r186_io_base + 0x3C)
 #define  R186_INT_3       (r186_io_base + 0x3E)
 
-#endif /*DTEX*/
 #endif

include/c_us_cde.h

@@ -169,7 +169,6 @@ const unsigned char *skip_options[] = {
  *  Option parameters for volume command.
  */
 
-#ifndef MSDOS
 /*
  *  change the volume 
  */
@@ -189,20 +188,6 @@ const unsigned char *volume_options[] = {
 	0
 };
 
-#else
-
-const unsigned char *volume_options[] = {
-	"set",
-	"up",
-	"down",
-#ifdef SW_VOLUME /* eab 10/9 99 added the "tone" option */
-	"tone",
-#endif /* SW_VOLUME */
-
-	0
-};
-#endif // MSDOS
-
 /*  
  *  Used in cm_cmd_language()
  *  change to an alternately loaded language ...
@@ -225,22 +210,6 @@ const unsigned char *lang_options[] = {
 	0
 };
 
-#ifdef DTEX
-/*  
- * Used in cm_cmd_power()
- * things related to the battery and external power..
- */
-const unsigned char *power_options[] = {
-	"speak",	// say the power status.
-	"interval",	// interval to repeat batt-low beeps (0=don't beep)
-	"status",	// send back the power status.
-	"sleep",	// time to wait before sleeping.. 
-	"check",	// beep if batt low.
-	"lspeak",	// say the power status in loader.c .
-	0
-	};
-#endif /* DTEX */
-
 /* 
  * Used in cm_cmd_version()
  * version stuff
@@ -250,18 +219,6 @@ const unsigned char *version_options[] = {
 	"status",
 	0
 	};
-                                 
-#ifdef DTEX
-/*  
- * Used in cm_cmd_tsr()
- * [:tsr  stuff
- */
-const unsigned char *tsr_options[] = {
-	"on",
-	"off",
-	0
-	};
-#endif /* DTEX */
 
 /* Used in cm_cmd_mode() */
 const unsigned char *mode_options[] = {
@@ -297,7 +254,6 @@ const unsigned char *pronounce_options[] = {
  *  Used in cm_cmd_name()
  *  set the speaking voice ...
  */
-#ifndef EPSON_ARM7
 const unsigned char *voice_names[] = {
 	"paul",
 	"betty",
@@ -314,7 +270,6 @@ const unsigned char *voice_names[] = {
 	"val",
 	0
 }; 
-#endif
 
 /*  
  *  Used in cm_cmd_mark()
@@ -442,13 +397,5 @@ const struct dtpc_command command_table[] = {
 
 #define TOTAL_COMMANDS  (sizeof(command_table)/sizeof(struct dtpc_command))
 
-const int total_commands = TOTAL_COMMANDS;                         
-
-#ifdef MSDOS
-short cm[TOTAL_COMMANDS+1];                             /* command match parse array */
-#endif
-
-#ifdef ARM7
-//short cm[TOTAL_COMMANDS+1];                             /* command match parse array */
-#endif
+const int total_commands = TOTAL_COMMANDS;      
 #endif // CUSCDEH

include/cmd.h

@@ -193,15 +193,8 @@
 #define SPD_CHINK	35
 #define SPD_OQ  	36
 
-/* GL 04/21/1997  change this for OSF build */
-#if defined (WIN32_OLD) || defined (__osf__) || defined (__unix__) || defined VXWORKS || defined _SPARC_SOLARIS_ || defined ARM7 || defined __EMSCRIPTEN__ || defined (__APPLE__)
 #define SPD_OS		37
 #define SPD_NM		38
 #define SPDEF		39
-#endif
-
-#ifdef MSDOS
-#define	SPDEF		32
-#endif
 
 #endif /* CMDH */

include/config.h

@@ -1,26 +1,26 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if iconv exists */
-#define HAVE_ICONV 1
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://github.com/dectalk/dectalk/issues"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "DECtalk"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "DECtalk 374caf73"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "dectalk"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL "https://github.com/dectalk/dectalk"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "374caf73"
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if iconv exists */
+#define HAVE_ICONV 1
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "https://github.com/dectalk/dectalk/issues"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "DECtalk"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "DECtalk 374caf73"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "dectalk"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "https://github.com/dectalk/dectalk"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "374caf73"

include/dectalkf.h

@@ -1,14 +1,14 @@
-//#include "dectalkf_hlsyn.h"
-#include "dectalkf_klsyn.h"
-
-/* Horrible Windows fix */
-#ifdef _WIN32
-#ifndef __unix__
-#define __unix__
-#endif
-#endif
-
-// On UNIX/Linux based machines, this is the location where DECtalk will assume it was built.
-#ifndef DECTALK_INSTALL_PREFIX
-#define DECTALK_INSTALL_PREFIX "/opt/dectalk"
-#endif
+//#include "dectalkf_hlsyn.h"
+#include "dectalkf_klsyn.h"
+
+/* Horrible Windows fix */
+#ifdef _WIN32
+#ifndef __unix__
+#define __unix__
+#endif
+#endif
+
+// On UNIX/Linux based machines, this is the location where DECtalk will assume it was built.
+#ifndef DECTALK_INSTALL_PREFIX
+#define DECTALK_INSTALL_PREFIX "/opt/dectalk"
+#endif

include/dectalkf_klsyn.h

@@ -99,24 +99,14 @@
 #define NEW_BINARY_PARSER
 #define GERMAN_COMPOUND_NOUNS
 
-#ifndef ARM7
 #ifdef _DEBUG_OLD
 #define PH_DEBUG_OLD
 #endif
-#endif
-
-#ifdef EPSON_ARM7
-#include "ltsnames.h"
-#endif
 
 //#define FAKE_HLSYN
 //#define HLSYN
 //#ifndef SAPI5DECTALK
 
-#ifdef EPSON_ARM7
-#define HLSYN
-#endif
-
 #ifdef ACCESS_SOLUTIONS
 #undef HLSYN
 #endif
@@ -137,31 +127,9 @@
 
 //#define UPGRADES1999
 
-#ifndef SAPI5DECTALK
-// Turn on ACCESS32, TYPING_MODE, and SLOWTALK
-#ifndef ARM7
-#ifndef ACCESS32
-#define ACCESS32
-#endif
-
-#ifndef TYPING_MODE
-#define TYPING_MODE
-#endif
-#endif
-
-#ifndef SLOWTALK
-#define SLOWTALK
-#endif
-
-#endif	// SAPI5DECTALK
-
 
 #define NEW_PHONES
 
-#if defined ALPHA || defined __osf__ 
-#define FP_VTM
-#endif
-
 //#define TONGUE_BODY_AREA
 
 // Bypass license validation checks in licenseu only.
@@ -191,9 +159,7 @@ LANGUAGE	VDEF_FILE	TUNING UP	VDEF_FILE	TUNING UP
    so the default if nothing defined is the base level _vdef.c version
 */
 
-#ifndef MSDOS
 #define AD_BASE //Turns on advanced development build
-#endif
 
 #ifdef AD_BASE
 //#define NEW_VOCAL_TRACT
@@ -219,13 +185,6 @@ LANGUAGE	VDEF_FILE	TUNING UP	VDEF_FILE	TUNING UP
 //#define TOMBUCHLER
 //#define TESTING
 
-#if defined UNDER_CE
-/* THIS MUST BE LEFT DEFINED FOR ARM7 AND CE !!!!!!!!!!!!!!!!!!! */
-
-#define LOWCOMPUTE_MITSU //MFG 05/06/02 needed for windoe ce to lower computes
-			//Note EAB May 9,2000 Now everything should have LowCompute
-#endif
-
 
 /* TK 12/30/98, new switch for voice compression */ 
 //#define COMPRESSION

include/defs.h

@@ -34,15 +34,13 @@
 #ifndef	DEFSH
 #define	DEFSH	1
 
-#ifndef MSDOS
 #define far
 #define _far
 #define _huge
 #define _halloc malloc
 //#define FAR
 #define volatile
 #define register	/* this should really be cased on a per machine basis - tfm */
-#endif
 
 #define	HUNGARY	1
 #define	true	1

include/disable_audio.h

@@ -1,5 +1,5 @@
-#include "linux_audio.h"
-
-#ifdef __EMSCRIPTEN__
-#include <string.h>
-#endif
+#include "linux_audio.h"
+
+#ifdef __EMSCRIPTEN__
+#include <string.h>
+#endif

include/dt_abort.h

@@ -35,26 +35,12 @@
  *	006	CAB		06/17/2002		Removed assert.h for UNDER_CE
 */
 
-#ifdef WIN32_OLD
-#ifndef UNDER_CE
-#include <assert.h>
-#define dt_abort \
-	{ \
-	assert(1); \
-	}\
-
-#endif
-#endif //WIN32_OLD
-
-#if defined (__osf__) || defined (__unix__) || defined VXWORKS || defined _SPARC_SOLARIS_ || defined (__APPLE__)
 #include <assert.h>
 #define dt_abort \
 { \
     assert(0); \
 }
 
-#endif  //__osf__ || (__unix__) || defined VXWORKS || defined _SPARC_SOLARIS_
-
 #ifdef DTPC1
 #include "pcport.h"
 #include "libp.h"
@@ -78,17 +64,3 @@
 	}\
 
 #endif //DTPC2
-
-#ifdef DTEX
-#include "pcport.h"
-#include "libp.h"
-#define dt_abort \
-	{ \
-	status_clear(0xFFFF); \
-	status_set_update(MODE_error); \
-	printf(__FILE__); \
-	printf("dt_abort!\n"); \
-	error_hang(); \
-	}\
-
-#endif //DTEX