# HG changeset patch # User Matti Hamalainen # Date 1578402259 -7200 # Node ID 1e6e018b6487e62a75e665886c08ff1955d9ffb0 # Parent 3596e2d757a66097c11315ae29a6ab52b2f4cc4a Rename some functions to be more consistent with their intent. diff -r 3596e2d757a6 -r 1e6e018b6487 tools/lib64fmts.c --- a/tools/lib64fmts.c Mon Jan 06 12:39:02 2020 +0200 +++ b/tools/lib64fmts.c Tue Jan 07 15:04:19 2020 +0200 @@ -103,7 +103,7 @@ } -static int fmtGetMarqPETSCIIData(const DMC64EncDecOp *op, DMC64Image *img, +static int fmtDecodeMarqPETSCIIData(const DMC64EncDecOp *op, DMC64Image *img, const DMGrowBuf *buf, const DMC64ImageCommonFormat *fmt) { (void) op; @@ -125,7 +125,7 @@ } -static int fmtSetMarqPETSCIIData(const DMC64EncDecOp *op, DMGrowBuf *buf, +static int fmtEncodeMarqPETSCIIData(const DMC64EncDecOp *op, DMGrowBuf *buf, const DMC64Image *img, const DMC64ImageCommonFormat *fmt) { (void) op; @@ -181,7 +181,7 @@ } -static int fmtSetPetsciiKrisszHuData(const DMC64EncDecOp *op, DMC64Image *img, +static int fmtDecodePetsciiKrisszHuData(const DMC64EncDecOp *op, DMC64Image *img, const DMGrowBuf *buf, const DMC64ImageCommonFormat *fmt) { (void) op; @@ -229,7 +229,7 @@ } -static int fmtSetSPETSCIIData(const DMC64EncDecOp *op, DMC64Image *img, +static int fmtDecodeUPETSCIIData(const DMC64EncDecOp *op, DMC64Image *img, const DMGrowBuf *buf, const DMC64ImageCommonFormat *fmt) { (void) op; @@ -2715,13 +2715,13 @@ NULL, { // For offset values see petscii/m_c64.pde :: save_prg() - { DO_FUNC , 0 , 0 , 0, 0, 0, NULL, fmtSetMarqPETSCIIData, DF_NORMAL }, + { DO_FUNC , 0 , 0 , 0, 0, 0, NULL, fmtEncodeMarqPETSCIIData, DF_NORMAL }, { DO_COPY , DS_SCREEN_RAM , 0x60 , 0, 0, 0, NULL, NULL, DF_NORMAL }, { DO_COPY , DS_COLOR_RAM , 0x60 + 1000,0,0, 0, NULL, NULL, DF_NORMAL }, { DO_SET_MEM_LO , DS_D020 , 25 - 2, 0, 0, 0, NULL, NULL, DF_NORMAL }, { DO_SET_MEM_LO , DS_BGCOL , 30 - 2, 0, 0, 0, NULL, NULL, DF_NORMAL }, { DO_COPY , DS_EXTRA_DATA , 20 - 2, 0, 1, 0, NULL, NULL, DF_NORMAL }, - { DO_FUNC , 0 , 0 , 0, 0, 0, fmtGetMarqPETSCIIData, NULL, DF_NORMAL }, + { DO_FUNC , 0 , 0 , 0, 0, 0, fmtDecodeMarqPETSCIIData, NULL, DF_NORMAL }, { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL }, } @@ -2746,7 +2746,7 @@ { DO_SET_MEM_LO , DS_D020 , 0x01a9, 0, 0, 0, NULL, NULL, DF_NORMAL }, { DO_SET_MEM_LO , DS_BGCOL , 0x01aa, 0, 0, 0, NULL, NULL, DF_NORMAL }, - { DO_FUNC , 0 , 0 , 0, 0, 0, fmtSetSPETSCIIData, NULL, DF_NORMAL }, + { DO_FUNC , 0 , 0 , 0, 0, 0, fmtDecodeUPETSCIIData, NULL, DF_NORMAL }, { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL }, } @@ -2771,7 +2771,7 @@ { DO_COPY , DS_EXTRA_DATA , 0x0000 , 0, 0x0100, 0, NULL, NULL, DF_NORMAL }, { DO_COPY , DS_CHAR_DATA , 0x1801 - 2, 0, 0x0800, 0, NULL, NULL, DF_NORMAL }, - { DO_FUNC , 0 , 0 , 0, 0 , 0, fmtSetPetsciiKrisszHuData, NULL, DF_NORMAL }, + { DO_FUNC , 0 , 0 , 0, 0 , 0, fmtDecodePetsciiKrisszHuData, NULL, DF_NORMAL }, { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL }, } @@ -2791,7 +2791,7 @@ NULL, NULL, NULL, { - { DO_FUNC , 0 , 0 , 0, 0, 0, NULL, fmtSetMarqPETSCIIData, DF_NORMAL }, + { DO_FUNC , 0 , 0 , 0, 0, 0, NULL, fmtEncodeMarqPETSCIIData, DF_NORMAL }, { DO_COPY , DS_SCREEN_RAM , 0x085a - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL }, { DO_COPY , DS_COLOR_RAM , 0x0c5a - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL }, { DO_SET_MEM_LO , DS_D020 , 0x0c42 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },