Apple-2-Tools/gsport
1
0
Fork 0
mirror of https://github.com/david-schmidt/gsport.git synced 2024-09-27 08:54:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix some errors in Imagewriter code.

Browse Source
This commit is contained in:
Christopher Mason 2014-04-06 02:09:46 +00:00
parent ce9d39b004
commit 5df55a3269
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.c
View File

@ -308,7 +308,7 @@ Cfg_menu g_cfg_imagewriter_menu[] = {
{ "", 0, 0, 0, 0 }, { "", 0, 0, 0, 0 },
{ "Fixed Width Font", KNMP(g_imagewriter_fixed_font), CFGTYPE_FILE }, { "Fixed Width Font", KNMP(g_imagewriter_fixed_font), CFGTYPE_FILE },
{ "", 0, 0, 0, 0 }, { "", 0, 0, 0, 0 },
{ "Proporational Font", KNMP(g_imagewriter_prop_font), CFGTYPE_FILE }, { "Proportional Font", KNMP(g_imagewriter_prop_font), CFGTYPE_FILE },
{ "", 0, 0, 0, 0 }, { "", 0, 0, 0, 0 },
{ "Back to Main Config", g_cfg_main_menu, 0, 0, CFGTYPE_MENU }, { "Back to Main Config", g_cfg_main_menu, 0, 0, CFGTYPE_MENU },
{ 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0 },

2
src/imagewriter.cpp
View File

@ -2168,7 +2168,7 @@ extern "C" void imagewriter_close()
delete defaultImagewriter; delete defaultImagewriter;
defaultImagewriter = NULL; defaultImagewriter = NULL;
} }
extern "C" void imagewriter_feed(int port) extern "C" void imagewriter_feed()
{ {
if(defaultImagewriter == NULL) return; if(defaultImagewriter == NULL) return;
defaultImagewriter->formFeed(); defaultImagewriter->formFeed();

2
src/imagewriter.h
View File

@ -303,7 +303,7 @@ extern "C"
void imagewriter_init(int pdpi, int pwidth, int pheight, char* poutput, bool mpage, int port); void imagewriter_init(int pdpi, int pwidth, int pheight, char* poutput, bool mpage, int port);
void imagewriter_loop(Bit8u pchar,int port); void imagewriter_loop(Bit8u pchar,int port);
void imagewriter_close(); void imagewriter_close();
void imagewriter_feed(int port); void imagewriter_feed();
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

6
src/scc_imagewriter.c
View File

@ -24,7 +24,7 @@
#include "scc.h" #include "scc.h"
#include "imagewriter.h" #include "imagewriter.h"
extern Scc scc_stat[2]; extern Scc scc_stat[2];
extern int g_vbl_count; word32 g_vbl_count;
extern int g_imagewriter; extern int g_imagewriter;
extern int g_imagewriter_dpi; extern int g_imagewriter_dpi;
@ -32,7 +32,7 @@ extern char* g_imagewriter_output;
extern int g_imagewriter_multipage; extern int g_imagewriter_multipage;
extern int g_imagewriter_timeout; extern int g_imagewriter_timeout;
int imagewriter_vbl_count = 0; word32 imagewriter_vbl_count = 0;
int imagewriter_port_block = 0; int imagewriter_port_block = 0;
int iw_scc_write = 0; int iw_scc_write = 0;
@ -40,7 +40,7 @@ int scc_imagewriter_init(int port)
{ {
Scc *scc_ptr; Scc *scc_ptr;
scc_ptr = &(scc_stat[port]); scc_ptr = &(scc_stat[port]);
imagewriter_init(g_imagewriter_dpi,85,110,g_imagewriter_output,g_imagewriter_multipage, port); imagewriter_init(g_imagewriter_dpi,85,110,g_imagewriter_output,g_imagewriter_multipage != 0, port);
scc_ptr->state = 4; scc_ptr->state = 4;
return 4; return 4;
} }