Second patch in 2157019 by riccardom.

This one fix a bug in POWER_CR_SKIP and remove some
warnings.
This commit is contained in:
yabause 2008-10-13 19:15:16 +00:00
parent dcc710a630
commit c78ba6f6d1
1 changed files with 5 additions and 5 deletions

View File

@ -197,7 +197,7 @@ static const char *powercr7_strings[] =
"Sound speakers",
"Wifi system"
};
#define POWER_CR_SKIP(c) if(i==4||i==5||i==6||i==7||i==8||i==10||i==11|i==12|i==13||i==14)continue;
#define POWER_CR_SKIP(c) if(i==4||i==5||i==6||i==7||i==8||i==10||i==11||i==12||i==13||i==14)continue;
#define POWER_CR_SIZE(c) ((c==0)?16:2)
static GtkWidget *Widgets_POWER_CR[2][16];
@ -357,15 +357,15 @@ static void selected_reg(GtkWidget* widget, gpointer data)
if(current_reg[c]->size == BITS_8)
{
sprintf(regInfosBuffer, "0x%02X", current_reg[c]->value(c));
sprintf(regInfosBuffer, "0x%02lX", current_reg[c]->value(c));
}
else if(current_reg[c]->size == BITS_16)
{
sprintf(regInfosBuffer, "0x%04X", current_reg[c]->value(c));
sprintf(regInfosBuffer, "0x%04lX", current_reg[c]->value(c));
}
else
{
sprintf(regInfosBuffer, "0x%08X", current_reg[c]->value(c));
sprintf(regInfosBuffer, "0x%08lX", current_reg[c]->value(c));
}
// gtk_box_pack_start(GTK_BOX(mVbox0[c]), mRegInfos[c], FALSE, FALSE, 0);
gtk_label_set_label(GTK_LABEL(mRegInfos[c]), regInfosBuffer);
@ -434,7 +434,7 @@ static void open(int ID)
for(i = 0; i < GET_REG_LIST_SIZE(c); i++)
{
char reg_name_buffer[64];
sprintf(reg_name_buffer, "0x%08X : %s (%s)", GET_REG_LIST(c)[i].adress, GET_REG_LIST(c)[i].name, bits_strings[GET_REG_LIST(c)[i].size]);
sprintf(reg_name_buffer, "0x%08lX : %s (%s)", GET_REG_LIST(c)[i].adress, GET_REG_LIST(c)[i].name, bits_strings[GET_REG_LIST(c)[i].size]);
gtk_combo_box_append_text(GTK_COMBO_BOX(mIoRegCombo[c]), reg_name_buffer);
}