fix includes, clean
This commit is contained in:
Gwenhael Le Moine
parent
f226af5fd0
commit
807292bc9f
10 changed files with 19 additions and 71 deletions
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#define CHF_MODULE_ID 255
|
||||
#define CHF_EXTENDED_INFO
|
||||
#include "Chf.h"
|
||||
#include "../src/Chf.h"
|
||||
|
||||
int main( int argc, char* argv[] )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#define CHF_MODULE_ID 255
|
||||
#define CHF_EXTENDED_INFO
|
||||
#include "Chf.h"
|
||||
#include "../src/Chf.h"
|
||||
|
||||
void* task( void* arg )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#define CHF_MODULE_ID 255
|
||||
#define CHF_EXTENDED_INFO
|
||||
#include "Chf.h"
|
||||
#include "../src/Chf.h"
|
||||
|
||||
void* task( void* arg )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#define CHF_MODULE_ID 255
|
||||
#define CHF_EXTENDED_INFO
|
||||
#include "Chf.h"
|
||||
#include "../src/Chf.h"
|
||||
|
||||
struct tdata_s {
|
||||
const ChfDescriptor *d, *e;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#define CHF_MODULE_ID 255
|
||||
#define CHF_EXTENDED_INFO
|
||||
#include "Chf.h"
|
||||
#include "../src/Chf.h"
|
||||
|
||||
#define H_STACK_SIZE 10
|
||||
#define C_STACK_SIZE 30
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#define CHF_MODULE_ID 255
|
||||
#define CHF_EXTENDED_INFO
|
||||
#include "Chf.h"
|
||||
#include "../src/Chf.h"
|
||||
|
||||
#define H_STACK_SIZE 10
|
||||
#define C_STACK_SIZE 30
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#define CHF_MODULE_ID 255
|
||||
#define CHF_EXTENDED_INFO
|
||||
#include "Chf.h"
|
||||
#include "../src/Chf.h"
|
||||
|
||||
extern ChfTable message_table[];
|
||||
extern size_t message_table_size;
|
||||
|
|
|
|||
57
src/config.h
57
src/config.h
|
|
@ -155,13 +155,6 @@
|
|||
*/
|
||||
#define DEBUG_LEVEL DEBUG_C_REVISION
|
||||
|
||||
/* 2.1: FORCE_NONMODAL
|
||||
If this symbol is defined, nonmodal navigation is forced in the
|
||||
OSF/Motif GUI, by setting navigationType to XmNONE and traversalOn
|
||||
to False at the source code level.
|
||||
*/
|
||||
/* #define FORCE_NONMODAL */
|
||||
|
||||
/* 2.4: N_PORT_2_BANK
|
||||
This symbol is used to dimension the HP48GX Port_2: it denotes the
|
||||
number of 128 Kbyte banks the port must have and must be a power of 2
|
||||
|
|
@ -202,14 +195,6 @@
|
|||
*/
|
||||
#define CPU_SLOW_IN 16
|
||||
|
||||
/* 4.1.1.1: LCD_MAG
|
||||
This symbol represents the magnification ratio of the emulated LCD pixels
|
||||
when drawn on the emulated display; supported values are 1 and 2; 2 is the
|
||||
default. Currently, the value cannot be set at runtime for performance
|
||||
reasons.
|
||||
*/
|
||||
#define LCD_MAG 2
|
||||
|
||||
/* 4.1.1.1: When defined, this symbol represents the threshold of the long
|
||||
key pression. When the mouse button is kept pressed on a calculator's key
|
||||
for more than LONG_PRESS_THR milliseconds, the key stays pressed after
|
||||
|
|
@ -232,48 +217,6 @@
|
|||
#define X_FUNC_CHF_MODULE_ID 18 /* 3.13 */
|
||||
#define DEBUG_CHF_MODULE_ID 30
|
||||
|
||||
/* .+
|
||||
|
||||
.identifier : $Id: args.h,v 4.1 2000/12/11 09:54:19 cibrario Rel $
|
||||
.context : SATURN, Saturn CPU / HP48 emulator
|
||||
.title : $RCSfile: args.h,v $
|
||||
.kind : C header
|
||||
.author : Ivan Cibrario B.
|
||||
.site : CSTV-CNR
|
||||
.creation : 19-Jan-1998
|
||||
.keywords : *
|
||||
.description :
|
||||
This header declares a global data structure containing the emulator
|
||||
invocation arguments; this data structure is initialized before startup,
|
||||
either by means of argc/argv or in other ways.
|
||||
|
||||
.include : config.h
|
||||
|
||||
.notes :
|
||||
$Log: args.h,v $
|
||||
Revision 4.1 2000/12/11 09:54:19 cibrario
|
||||
Public release.
|
||||
|
||||
Revision 3.15 2000/11/15 14:03:06 cibrario
|
||||
GUI enhancements and assorted bug fixes:
|
||||
- added .batchXfer boolean (corresponding to command-line option
|
||||
-batchXfer) to struct Args
|
||||
|
||||
Revision 3.10 2000/10/24 16:14:25 cibrario
|
||||
Added/Replaced GPL header
|
||||
|
||||
Revision 2.1 2000/09/08 14:45:06 cibrario
|
||||
Added the following fields to 'struct Args': reset, monitor, hw.
|
||||
The latter mimes the setting of the -hw command line option and
|
||||
of the *hw top-level application resource; the former two have
|
||||
been added to export them cleanly from the GUI modules.
|
||||
|
||||
* Revision 1.1 1998/02/17 11:58:37 cibrario
|
||||
* Initial revision
|
||||
*
|
||||
|
||||
.- */
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
Global variables
|
||||
---------------------------------------------------------------------------*/
|
||||
|
|
|
|||
|
|
@ -129,7 +129,6 @@ config_t* config_init( int argc, char* argv[] )
|
|||
char* clopt_ram_file_name = "ram";
|
||||
char* clopt_port_1_file_name = "port1";
|
||||
char* clopt_port_2_file_name = "port2";
|
||||
/* char* clopt_hw = "hp48"; */
|
||||
|
||||
const char* optstring = "h";
|
||||
struct option long_options[] = {
|
||||
|
|
@ -162,7 +161,6 @@ config_t* config_init( int argc, char* argv[] )
|
|||
/* {"ram", required_argument, NULL, 8040 }, */
|
||||
/* {"port1", required_argument, NULL, 8050 }, */
|
||||
/* {"port2", required_argument, NULL, 8060 }, */
|
||||
/* {"hw", required_argument, NULL, 8070 }, */
|
||||
|
||||
{0, 0, 0, 0 }
|
||||
};
|
||||
|
|
@ -236,9 +234,6 @@ config_t* config_init( int argc, char* argv[] )
|
|||
/* case 8060: */
|
||||
/* clopt_port_2_file_name = optarg; */
|
||||
/* break; */
|
||||
/* case 8070: */
|
||||
/* clopt_hw = optarg; */
|
||||
/* break; */
|
||||
|
||||
default:
|
||||
break;
|
||||
|
|
@ -300,8 +295,6 @@ config_t* config_init( int argc, char* argv[] )
|
|||
/* config.port_1_file_name = strdup( clopt_port_1_file_name ); */
|
||||
/* if ( clopt_port_2_file_name != NULL ) */
|
||||
/* config.port_2_file_name = strdup( clopt_port_2_file_name ); */
|
||||
/* if ( clopt_hw != NULL ) */
|
||||
/* config.hw = strdup( clopt_hw ); */
|
||||
|
||||
config.mod_file_name = normalize_filename( config.state_dir_path, clopt_mod_file_name );
|
||||
config.cpu_file_name = normalize_filename( config.state_dir_path, clopt_cpu_file_name );
|
||||
|
|
|
|||
|
|
@ -111,6 +111,18 @@ int main( int argc, char** argv )
|
|||
else
|
||||
break;
|
||||
|
||||
/* if ( ( st = ChfStaticInit( argv[ 0 ], /\* Application's name *\/ */
|
||||
/* CHF_DEFAULT, /\* Options *\/ */
|
||||
/* [], /\* Name of the message catalog *\/ */
|
||||
/* CONDITION_STACK_SIZE, /\* Size of the condition stack *\/ */
|
||||
/* HANDLER_STACK_SIZE, /\* Size of the handler stack *\/ */
|
||||
/* EXIT_FAILURE /\* Abnormal exit code *\/ */
|
||||
/* ) ) != CHF_S_OK || */
|
||||
/* ChfGetMessage( CHF_MODULE_ID, MAIN_M_COPYRIGHT, NULL ) == NULL ) */
|
||||
/* fprintf( stderr, "saturn-E-Primary Chf initialization failed (%d)\n", st ); */
|
||||
/* else */
|
||||
/* break; */
|
||||
|
||||
/* Bring down Chf before initializing it again */
|
||||
if ( st == CHF_S_OK )
|
||||
ChfExit();
|
||||
|
|
|
|||
Loading…
Reference in a new issue