forked from Miroirs/x49gp
tweaks
This commit is contained in:
parent
97a3df3e18
commit
8a47fd4ff8
2 changed files with 8 additions and 13 deletions
13
Makefile
13
Makefile
|
@ -168,6 +168,9 @@ $(QEMU_DIR)/config-host.h:
|
||||||
$(QEMU_OBJS): dummy
|
$(QEMU_OBJS): dummy
|
||||||
+$(MAKE) -C $(QEMU_DIR) -f Makefile-small
|
+$(MAKE) -C $(QEMU_DIR) -f Makefile-small
|
||||||
|
|
||||||
|
clean-qemu:
|
||||||
|
$(MAKE) -C $(QEMU_DIR) -f Makefile-small clean
|
||||||
|
|
||||||
# Depend
|
# Depend
|
||||||
MAKEDEPEND = $(CC) -MM
|
MAKEDEPEND = $(CC) -MM
|
||||||
|
|
||||||
|
@ -180,17 +183,13 @@ depend: depend-libs
|
||||||
$(MAKEDEPEND) $(X49GP_CFLAGS) $(SRCS) >.depend
|
$(MAKEDEPEND) $(X49GP_CFLAGS) $(SRCS) >.depend
|
||||||
|
|
||||||
# Cleaning
|
# Cleaning
|
||||||
clean-qemu:
|
clean:
|
||||||
$(MAKE) -C $(QEMU_DIR) -f Makefile-small clean
|
|
||||||
|
|
||||||
clean: clean-qemu
|
|
||||||
rm -f ./src/x49gpng/*.o core *~ .depend
|
rm -f ./src/x49gpng/*.o core *~ .depend
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean clean-qemu
|
||||||
$(MAKE) -C $(QEMU_DIR) -f Makefile-small distclean
|
|
||||||
rm -f dist/$(TARGET) dist/$(TARGET).desktop dist/$(TARGET).man
|
rm -f dist/$(TARGET) dist/$(TARGET).desktop dist/$(TARGET).man
|
||||||
|
|
||||||
mrproper: clean-qemu distclean
|
mrproper: distclean
|
||||||
make -C dist/firmware/ mrproper
|
make -C dist/firmware/ mrproper
|
||||||
|
|
||||||
# auto-format code
|
# auto-format code
|
||||||
|
|
|
@ -2358,8 +2358,8 @@ static gboolean x49gp_ui_button_press( GtkWidget* widget, GdkEventButton* event,
|
||||||
static void x49gp_release_single_button( x49gp_ui_button_t* button, x49gp_ui_button_t* cause )
|
static void x49gp_release_single_button( x49gp_ui_button_t* button, x49gp_ui_button_t* cause )
|
||||||
{
|
{
|
||||||
x49gp_t* x49gp = button->x49gp;
|
x49gp_t* x49gp = button->x49gp;
|
||||||
const x49gp_ui_key_t* key;
|
const x49gp_ui_key_t* key = button->key;
|
||||||
GtkButton* gtkbutton;
|
GtkButton* gtkbutton = GTK_BUTTON( button->button );
|
||||||
|
|
||||||
/* #ifdef DEBUG_X49GP_UI */
|
/* #ifdef DEBUG_X49GP_UI */
|
||||||
/* printf( "%s: button %u: col %u, row %u, eint %u\n", __FUNCTION__, event->button, button->key->column, button->key->row, */
|
/* printf( "%s: button %u: col %u, row %u, eint %u\n", __FUNCTION__, event->button, button->key->column, button->key->row, */
|
||||||
|
@ -2369,14 +2369,10 @@ static void x49gp_release_single_button( x49gp_ui_button_t* button, x49gp_ui_but
|
||||||
button->down = false;
|
button->down = false;
|
||||||
button->hold = false;
|
button->hold = false;
|
||||||
|
|
||||||
gtkbutton = GTK_BUTTON( button->button );
|
|
||||||
|
|
||||||
/* if ( button != cause ) */
|
/* if ( button != cause ) */
|
||||||
/* gtkbutton->in_button = false; */
|
/* gtkbutton->in_button = false; */
|
||||||
gtk_button_released( gtkbutton );
|
gtk_button_released( gtkbutton );
|
||||||
|
|
||||||
key = button->key;
|
|
||||||
|
|
||||||
if ( key->rowbit )
|
if ( key->rowbit )
|
||||||
s3c2410_io_port_g_update( x49gp, key->column, key->row, key->columnbit, key->rowbit, 0 );
|
s3c2410_io_port_g_update( x49gp, key->column, key->row, key->columnbit, key->rowbit, 0 );
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue