hp48_device.c was mostly GUI code
This commit is contained in:
parent
2136cdc775
commit
43ccdf7699
5 changed files with 20 additions and 18 deletions
2
Makefile
2
Makefile
|
@ -29,7 +29,7 @@ ifeq ($(FULL_WARNINGS), yes)
|
|||
endif
|
||||
|
||||
DOTOS = src/main.o \
|
||||
src/hp48_device.o \
|
||||
src/x48_lcd.o \
|
||||
src/hp48_emulate.o \
|
||||
src/hp48_init.o \
|
||||
src/hp48_serial.o \
|
||||
|
|
11
src/hp48.h
11
src/hp48.h
|
@ -303,15 +303,4 @@ extern int read_files( void ); /* hp48_init.c */
|
|||
extern int write_files( void ); /* hp48_init.c */
|
||||
|
||||
extern void load_addr( word_20* dat, long addr, int n ); /* hp48_emulate.c */
|
||||
|
||||
/* #ifndef _DEVICE_H */
|
||||
/* #define _DEVICE_H 1 */
|
||||
extern void init_display( void ); /* hp48_device.c */
|
||||
extern void update_display( void ); /* hp48_device.c */
|
||||
extern void redraw_display( void ); /* hp48_device.c */
|
||||
extern void disp_draw_nibble( word_20 addr, word_4 val ); /* hp48_device.c */
|
||||
extern void menu_draw_nibble( word_20 addr, word_4 val ); /* hp48_device.c */
|
||||
extern void draw_annunc( void ); /* hp48_device.c */
|
||||
extern void redraw_annunc( void ); /* hp48_device.c */
|
||||
/* #endif /\* !_DEVICE_H *\/ */
|
||||
#endif /* !_HP48_H */
|
||||
|
|
|
@ -57,6 +57,12 @@ word_64 run;
|
|||
static word_20 jumpmasks[] = { 0xffffffff, 0xfffffff0, 0xffffff00, 0xfffff000,
|
||||
0xffff0000, 0xfff00000, 0xff000000, 0xf0000000 };
|
||||
|
||||
saturn_t saturn;
|
||||
|
||||
extern int device_check;
|
||||
|
||||
device_t device;
|
||||
|
||||
int decode_group_80( void ) {
|
||||
int t, op3, op4, op5, op6;
|
||||
unsigned char* REG;
|
||||
|
|
13
src/x48.h
13
src/x48.h
|
@ -1,6 +1,8 @@
|
|||
#ifndef _X48_GUI_H
|
||||
#define _X48_GUI_H 1
|
||||
|
||||
#include "hp48.h" /* word_20, word_4 */
|
||||
|
||||
#if defined( GUI_IS_X11 )
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xresource.h>
|
||||
|
@ -1290,6 +1292,17 @@ extern void ShowConnections( char* w, char* i );
|
|||
|
||||
extern void exit_x48( int tell_x11 );
|
||||
|
||||
/* #ifndef _DEVICE_H */
|
||||
/* #define _DEVICE_H 1 */
|
||||
extern void init_display( void ); /* x48_lcd.c */
|
||||
extern void update_display( void ); /* x48_lcd.c */
|
||||
extern void redraw_display( void ); /* x48_lcd.c */
|
||||
extern void disp_draw_nibble( word_20 addr, word_4 val ); /* x48_lcd.c */
|
||||
extern void menu_draw_nibble( word_20 addr, word_4 val ); /* x48_lcd.c */
|
||||
extern void draw_annunc( void ); /* x48_lcd.c */
|
||||
extern void redraw_annunc( void ); /* x48_lcd.c */
|
||||
/* #endif /\* !_DEVICE_H *\/ */
|
||||
|
||||
#if defined( GUI_IS_X11 )
|
||||
|
||||
extern int InitDisplay( int argc, char** argv );
|
||||
|
|
|
@ -13,12 +13,6 @@
|
|||
#include "timer.h"
|
||||
#include "x48.h" /* adjust_contrast(); ann_struct_t; DISP_ROWS; NIBS_PER_BUFFER_ROW */
|
||||
|
||||
saturn_t saturn;
|
||||
|
||||
extern int device_check;
|
||||
|
||||
device_t device;
|
||||
|
||||
/*******/
|
||||
/* LCD */
|
||||
/*******/
|
Loading…
Reference in a new issue