# HG changeset patch # User Matti Hamalainen # Date 1578760251 -7200 # Node ID 71139ed7e43f4e82925d45e951424815127038d1 # Parent b3d46806787d693eddd32f400c4b0f3f6c3d6b1a Rename #define HEX_ADDR to more informative SET_FMT_HEX_ADDR. diff -r b3d46806787d -r 71139ed7e43f sidinfo.c --- a/sidinfo.c Sat Jan 11 18:30:10 2020 +0200 +++ b/sidinfo.c Sat Jan 11 18:30:51 2020 +0200 @@ -57,7 +57,7 @@ } PSFOption; -#define HEX_ADDR "%d ($%04x)" +#define SET_FMT_HEX_ADDR "%d ($%04x)" static const PSFOption optPSOptions[] = { @@ -69,18 +69,18 @@ { "VideoClock" , "Video clock speed" , OTYPE_STR , NULL }, { "SIDModel" , "SID model" , OTYPE_STR , NULL }, - { "DataOffs" , "Data offset" , OTYPE_INT , HEX_ADDR }, - { "DataSize" , "Data size" , OTYPE_INT , HEX_ADDR }, - { "LoadAddr" , "Load address" , OTYPE_INT , HEX_ADDR }, - { "InitAddr" , "Init address" , OTYPE_INT , HEX_ADDR }, - { "PlayAddr" , "Play address" , OTYPE_INT , HEX_ADDR }, + { "DataOffs" , "Data offset" , OTYPE_INT , SET_FMT_HEX_ADDR }, + { "DataSize" , "Data size" , OTYPE_INT , SET_FMT_HEX_ADDR }, + { "LoadAddr" , "Load address" , OTYPE_INT , SET_FMT_HEX_ADDR }, + { "InitAddr" , "Init address" , OTYPE_INT , SET_FMT_HEX_ADDR }, + { "PlayAddr" , "Play address" , OTYPE_INT , SET_FMT_HEX_ADDR }, { "Songs" , "Songs" , OTYPE_INT , "%d" }, { "StartSong" , "Start song" , OTYPE_INT , "%d" }, { "SID2Model" , "2nd SID model" , OTYPE_STR , NULL }, { "SID3Model" , "3rd SID model" , OTYPE_STR , NULL }, - { "SID2Addr" , "2nd SID address" , OTYPE_INT , HEX_ADDR }, - { "SID3Addr" , "3rd SID address" , OTYPE_INT , HEX_ADDR }, + { "SID2Addr" , "2nd SID address" , OTYPE_INT , SET_FMT_HEX_ADDR }, + { "SID3Addr" , "3rd SID address" , OTYPE_INT , SET_FMT_HEX_ADDR }, { "Name" , NULL , OTYPE_STR , NULL }, { "Author" , NULL , OTYPE_STR , NULL },