comparison tools/lib64fmts.c @ 1590:22f29c25b349

Add commas after macro blocks in the format array.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 14 May 2018 05:38:58 +0300
parents f741dc2d1479
children 91d1bb571fca
comparison
equal deleted inserted replaced
1589:f741dc2d1479 1590:22f29c25b349
526 DEF_SCREEN_RAM((start), 2, (sindex + 2), (osize)), \ 526 DEF_SCREEN_RAM((start), 2, (sindex + 2), (osize)), \
527 DEF_SCREEN_RAM((start), 3, (sindex + 3), (osize)), \ 527 DEF_SCREEN_RAM((start), 3, (sindex + 3), (osize)), \
528 DEF_SCREEN_RAM((start), 4, (sindex + 4), (osize)), \ 528 DEF_SCREEN_RAM((start), 4, (sindex + 4), (osize)), \
529 DEF_SCREEN_RAM((start), 5, (sindex + 5), (osize)), \ 529 DEF_SCREEN_RAM((start), 5, (sindex + 5), (osize)), \
530 DEF_SCREEN_RAM((start), 6, (sindex + 6), (osize)), \ 530 DEF_SCREEN_RAM((start), 6, (sindex + 6), (osize)), \
531 DEF_SCREEN_RAM((start), 7, (sindex + 7), (osize)), 531 DEF_SCREEN_RAM((start), 7, (sindex + 7), (osize))
532 532
533 533
534 const DMC64ImageFormat dmC64ImageFormats[] = 534 const DMC64ImageFormat dmC64ImageFormats[] =
535 { 535 {
536 { 536 {
816 NULL, NULL, 816 NULL, NULL,
817 NULL, NULL, 817 NULL, NULL,
818 fmtGetPixelBFLI, 818 fmtGetPixelBFLI,
819 { 819 {
820 { DT_COLOR_RAM, 0x0001, 0, 0, NULL, NULL }, 820 { DT_COLOR_RAM, 0x0001, 0, 0, NULL, NULL },
821 DEF_SCREEN_RAMS_8( 0x0401, 0, 0x400) 821 DEF_SCREEN_RAMS_8( 0x0401, 0, 0x400),
822 { DT_BITMAP_RAM, 0x2401, 0, 0, NULL, NULL }, 822 { DT_BITMAP_RAM, 0x2401, 0, 0, NULL, NULL },
823 DEF_SCREEN_RAMS_8( 0x4401, 8, 0x400) 823 DEF_SCREEN_RAMS_8( 0x4401, 8, 0x400),
824 { DT_BITMAP_RAM, 0x6401 - 24*8, 1, 0, NULL, NULL }, 824 { DT_BITMAP_RAM, 0x6401 - 24*8, 1, 0, NULL, NULL },
825 { DT_LAST, 0, 0, 0, NULL, NULL }, 825 { DT_LAST, 0, 0, 0, NULL, NULL },
826 } 826 }
827 }, 827 },
828 828
836 NULL, NULL, 836 NULL, NULL,
837 fmtGetPixelBlackMailFLI, 837 fmtGetPixelBlackMailFLI,
838 { 838 {
839 { DT_EXTRA_DATA, 0x0000, 0, 200, NULL, NULL }, 839 { DT_EXTRA_DATA, 0x0000, 0, 200, NULL, NULL },
840 { DT_COLOR_RAM, 0x0100, 0, 0, NULL, NULL }, 840 { DT_COLOR_RAM, 0x0100, 0, 0, NULL, NULL },
841 DEF_SCREEN_RAMS_8( 0x0500, 0, 0x400) 841 DEF_SCREEN_RAMS_8( 0x0500, 0, 0x400),
842 { DT_BITMAP_RAM, 0x2500, 0, 0, NULL, NULL }, 842 { DT_BITMAP_RAM, 0x2500, 0, 0, NULL, NULL },
843 { DT_LAST, 0, 0, 0, NULL, NULL }, 843 { DT_LAST, 0, 0, 0, NULL, NULL },
844 } 844 }
845 }, 845 },
846 846
852 NULL, NULL, 852 NULL, NULL,
853 NULL, NULL, 853 NULL, NULL,
854 fmtGetPixelFLIDesigner, 854 fmtGetPixelFLIDesigner,
855 { 855 {
856 { DT_COLOR_RAM, 0x0000, 0, 0, NULL, NULL }, 856 { DT_COLOR_RAM, 0x0000, 0, 0, NULL, NULL },
857 DEF_SCREEN_RAMS_8( 0x0400, 0, 0x400) 857 DEF_SCREEN_RAMS_8( 0x0400, 0, 0x400),
858 { DT_BITMAP_RAM, 0x2400, 0, 0, NULL, NULL }, 858 { DT_BITMAP_RAM, 0x2400, 0, 0, NULL, NULL },
859 { DT_LAST, 0, 0, 0, NULL, NULL }, 859 { DT_LAST, 0, 0, 0, NULL, NULL },
860 } 860 }
861 }, 861 },
862 862
907 fmtProbeFunPaint2, 907 fmtProbeFunPaint2,
908 fmtDecodeFunPaint2, fmtEncodeFunPaint2Unpacked, 908 fmtDecodeFunPaint2, fmtEncodeFunPaint2Unpacked,
909 NULL, NULL, 909 NULL, NULL,
910 fmtGetPixelFunPaint2, 910 fmtGetPixelFunPaint2,
911 { 911 {
912 DEF_SCREEN_RAMS_8( 0x0000, 0, 0x400) 912 DEF_SCREEN_RAMS_8( 0x0000, 0, 0x400),
913 { DT_BITMAP_RAM, 0x2000, 0, 0, NULL, NULL }, 913 { DT_BITMAP_RAM, 0x2000, 0, 0, NULL, NULL },
914 { DT_EXTRA_DATA, 0x3f40, 0, 100, NULL, NULL }, 914 { DT_EXTRA_DATA, 0x3f40, 0, 100, NULL, NULL },
915 { DT_COLOR_RAM, 0x4000, 0, 0, NULL, NULL }, 915 { DT_COLOR_RAM, 0x4000, 0, 0, NULL, NULL },
916 DEF_SCREEN_RAMS_8( 0x43e8, 8, 0x400) 916 DEF_SCREEN_RAMS_8( 0x43e8, 8, 0x400),
917 { DT_BITMAP_RAM, 0x63e8, 1, 0, NULL, NULL }, 917 { DT_BITMAP_RAM, 0x63e8, 1, 0, NULL, NULL },
918 { DT_EXTRA_DATA, 0x8328, 1, 100, NULL, NULL }, 918 { DT_EXTRA_DATA, 0x8328, 1, 100, NULL, NULL },
919 { DT_LAST, 0, 0, 0, NULL, NULL }, 919 { DT_LAST, 0, 0, 0, NULL, NULL },
920 } 920 }
921 }, 921 },
928 NULL, 928 NULL,
929 fmtDecodeFunPaint2, fmtEncodeFunPaint2Packed, 929 fmtDecodeFunPaint2, fmtEncodeFunPaint2Packed,
930 NULL, NULL, 930 NULL, NULL,
931 fmtGetPixelFunPaint2, 931 fmtGetPixelFunPaint2,
932 { 932 {
933 DEF_SCREEN_RAMS_8( 0x0000, 0, 0x400) 933 DEF_SCREEN_RAMS_8( 0x0000, 0, 0x400),
934 { DT_BITMAP_RAM, 0x2000, 0, 0, NULL, NULL }, 934 { DT_BITMAP_RAM, 0x2000, 0, 0, NULL, NULL },
935 { DT_EXTRA_DATA, 0x3f40, 0, 100, NULL, NULL }, 935 { DT_EXTRA_DATA, 0x3f40, 0, 100, NULL, NULL },
936 { DT_COLOR_RAM, 0x4000, 0, 0, NULL, NULL }, 936 { DT_COLOR_RAM, 0x4000, 0, 0, NULL, NULL },
937 DEF_SCREEN_RAMS_8( 0x43e8, 8, 0x400) 937 DEF_SCREEN_RAMS_8( 0x43e8, 8, 0x400),
938 { DT_BITMAP_RAM, 0x63e8, 1, 0, NULL, NULL }, 938 { DT_BITMAP_RAM, 0x63e8, 1, 0, NULL, NULL },
939 { DT_EXTRA_DATA, 0x8328, 1, 100, NULL, NULL }, 939 { DT_EXTRA_DATA, 0x8328, 1, 100, NULL, NULL },
940 { DT_LAST, 0, 0, 0, NULL, NULL }, 940 { DT_LAST, 0, 0, 0, NULL, NULL },
941 } 941 }
942 }, 942 },
949 fmtProbeGunPaint, 949 fmtProbeGunPaint,
950 NULL, NULL, 950 NULL, NULL,
951 NULL, NULL, 951 NULL, NULL,
952 fmtGetPixelGunPaint, 952 fmtGetPixelGunPaint,
953 { 953 {
954 DEF_SCREEN_RAMS_8( 0x0000, 0, 0x400) 954 DEF_SCREEN_RAMS_8( 0x0000, 0, 0x400),
955 { DT_BITMAP_RAM, 0x2000, 0, 0, NULL, NULL }, 955 { DT_BITMAP_RAM, 0x2000, 0, 0, NULL, NULL },
956 { DT_EXTRA_DATA, 0x3f4f, 0, 177, NULL, NULL }, 956 { DT_EXTRA_DATA, 0x3f4f, 0, 177, NULL, NULL },
957 { DT_COLOR_RAM, 0x4000, 0, 0, NULL, NULL }, 957 { DT_COLOR_RAM, 0x4000, 0, 0, NULL, NULL },
958 DEF_SCREEN_RAMS_8( 0x4400, 8, 0x400) 958 DEF_SCREEN_RAMS_8( 0x4400, 8, 0x400),
959 { DT_BITMAP_RAM, 0x6400, 1, 0, NULL, NULL }, 959 { DT_BITMAP_RAM, 0x6400, 1, 0, NULL, NULL },
960 { DT_EXTRA_DATA, 0x47e8, 1, 20, NULL, NULL }, 960 { DT_EXTRA_DATA, 0x47e8, 1, 20, NULL, NULL },
961 { DT_LAST, 0, 0, 0, NULL, NULL }, 961 { DT_LAST, 0, 0, 0, NULL, NULL },
962 } 962 }
963 }, 963 },
971 NULL, NULL, 971 NULL, NULL,
972 NULL, NULL, 972 NULL, NULL,
973 fmtGetPixelCHFLI, 973 fmtGetPixelCHFLI,
974 { 974 {
975 { DT_BITMAP_RAM, 0x0000, 0, 0, NULL, NULL }, 975 { DT_BITMAP_RAM, 0x0000, 0, 0, NULL, NULL },
976 DEF_SCREEN_RAMS_8( 0x2000, 0, 0x400) 976 DEF_SCREEN_RAMS_8( 0x2000, 0, 0x400),
977 { DT_LAST, 0, 0, 0, NULL, NULL }, 977 { DT_LAST, 0, 0, 0, NULL, NULL },
978 } 978 }
979 }, 979 },
980 }; 980 };
981 981