no need to define CHF_MODULE_ID
This commit is contained in:
parent
3b9ea042d8
commit
1cd784b35a
16 changed files with 32 additions and 52 deletions
|
@ -101,6 +101,8 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
|
@ -109,9 +111,6 @@
|
|||
#include "disk_io.h" /* 3.1: ReadStructFromFile/WriteStructToFile */
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID CPU_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#define GetNibble FetchNibble
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
|
|
|
@ -84,15 +84,14 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h> /* 3.1: strcpy(), strcat(), strlen() */
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
#include "modules.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID CPU_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
Private functions/macros/variables
|
||||
---------------------------------------------------------------------------*/
|
||||
|
|
|
@ -64,15 +64,14 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
#include "disk_io.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID DISK_IO_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/* .+
|
||||
|
||||
.title : ReadNibblesFromFile
|
||||
|
|
|
@ -62,6 +62,8 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
|
@ -69,9 +71,6 @@
|
|||
#include "disk_io.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID DISK_IO_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/* .+
|
||||
|
||||
.title : ReadObjectFromFile
|
||||
|
|
|
@ -114,6 +114,8 @@
|
|||
#include <unistd.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
|
@ -121,9 +123,6 @@
|
|||
#include "serial.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID CPU_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
Private macros / variables / functions
|
||||
---------------------------------------------------------------------------*/
|
||||
|
@ -264,7 +263,7 @@ static ChfAction do_SHUTDN( void )
|
|||
has just executed a shutdown instruction.
|
||||
Let's do something a little tricky here:
|
||||
|
||||
1- redraw the LCD
|
||||
//1- redraw the LCD
|
||||
|
||||
2- handle serial port activities
|
||||
|
||||
|
|
|
@ -69,6 +69,8 @@
|
|||
|
||||
.- */
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
|
@ -76,9 +78,6 @@
|
|||
#include "flash49.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID FLASH_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
Private Macro/Data type definitions
|
||||
---------------------------------------------------------------------------*/
|
||||
|
|
|
@ -101,6 +101,8 @@
|
|||
|
||||
#include <string.h> /* 3.1: memset() */
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
|
@ -110,9 +112,6 @@
|
|||
#include "x_func.h" /* 3.13: Extended emulator functions */
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID MOD_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
static const int addr_mask[] = { 0x0000F, 0x000F0, 0x00F00, 0x0F000, 0xF0000 };
|
||||
|
||||
static const int32 int32_mask[] = { 0x0000000F, 0x000000F0, 0x00000F00, 0x0000F000, 0x000F0000, 0x00F00000, 0x0F000000, 0xF0000000 };
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
|
||||
.- */
|
||||
|
||||
#include <stdio.h>
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
|
@ -80,9 +80,6 @@
|
|||
#include "modules.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID MOD_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
Module description tables
|
||||
---------------------------------------------------------------------------*/
|
||||
|
|
|
@ -84,15 +84,13 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
#include "modules.h"
|
||||
#include "keyb.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID MOD_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#define OUT_BITS 12
|
||||
|
||||
|
|
|
@ -114,6 +114,8 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
|
@ -121,9 +123,6 @@
|
|||
#include "disk_io.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID MOD_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
Static/Global variables
|
||||
---------------------------------------------------------------------------*/
|
||||
|
|
|
@ -70,14 +70,12 @@
|
|||
#include <string.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
#include "modules.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID CPU_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
Macro & Data type definitions
|
||||
|
|
|
@ -72,6 +72,8 @@
|
|||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
|
@ -89,9 +91,6 @@
|
|||
#define UTIL_F_PACK_READ 7
|
||||
#define UTIL_F_PACK_WRITE_NIBBLES 8
|
||||
|
||||
#define CHF_MODULE_ID UTIL_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/* Maximum size of source ROM (bytes) handled by this utility; set to
|
||||
a reasonable value
|
||||
*/
|
||||
|
|
|
@ -83,6 +83,8 @@
|
|||
#include <string.h>
|
||||
#include <unistd.h> /* access() */
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
|
@ -90,9 +92,6 @@
|
|||
#include "disk_io.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID MOD_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/* 3.2: The rom/ram storage areas are now dynamically allocated in
|
||||
a private struct ModStatus_48. The dynamic allocation is performed during
|
||||
Rom initialization, and the following macro allows us to reuse the
|
||||
|
|
|
@ -95,6 +95,8 @@
|
|||
#include <string.h>
|
||||
#include <unistd.h> /* access() */
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
|
@ -103,9 +105,6 @@
|
|||
#include "disk_io.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID MOD_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#define FLASH_VIEW_SELECTOR 0x40000
|
||||
#define FLASH_BANK_MASK 0x3FFFF
|
||||
|
||||
|
|
|
@ -104,15 +104,14 @@
|
|||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
#include "serial.h" /* 2.5: Serial port emulation module */
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID SERIAL_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
Determine pty implementation
|
||||
|
||||
|
|
|
@ -88,6 +88,8 @@
|
|||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "machdep.h"
|
||||
#include "cpu.h"
|
||||
|
@ -96,9 +98,6 @@
|
|||
#include "x_func.h"
|
||||
#include "debug.h"
|
||||
|
||||
#define CHF_MODULE_ID X_FUNC_CHF_MODULE_ID
|
||||
#include "libChf/src/Chf.h"
|
||||
|
||||
/*---------------------------------------------------------------------------
|
||||
Private functions: CPU access
|
||||
---------------------------------------------------------------------------*/
|
||||
|
|
Loading…
Add table
Reference in a new issue