diff options
Diffstat (limited to 'firmware/target/hosted/xduoo')
-rw-r--r-- | firmware/target/hosted/xduoo/button-xduoo.c | 9 | ||||
-rw-r--r-- | firmware/target/hosted/xduoo/xduoo.make | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/firmware/target/hosted/xduoo/button-xduoo.c b/firmware/target/hosted/xduoo/button-xduoo.c index 99b0908378..503e49e001 100644 --- a/firmware/target/hosted/xduoo/button-xduoo.c +++ b/firmware/target/hosted/xduoo/button-xduoo.c @@ -138,15 +138,22 @@ int button_read_device(void) bool headphones_inserted(void) { +#ifdef BOOTLOADER + int ps = 0; +#else int ps = xduoo_get_outputs(); +#endif return (ps == 2 || ps == 3); } bool lineout_inserted(void) { +#ifdef BOOTLOADER + int ps = 0; +#else int ps = xduoo_get_outputs(); - +#endif return (ps == 1); } diff --git a/firmware/target/hosted/xduoo/xduoo.make b/firmware/target/hosted/xduoo/xduoo.make index 5c37d27412..d159db77f3 100644 --- a/firmware/target/hosted/xduoo/xduoo.make +++ b/firmware/target/hosted/xduoo/xduoo.make @@ -43,10 +43,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \ $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map -$(BUILDDIR)/rockbox.x3ii : $(BUILDDIR)/rockbox.elf - $(call PRINTS,OC $(@F))$(call objcopy,$^,$@) - -$(BUILDDIR)/rockbox.x20 : $(BUILDDIR)/rockbox.elf +$(BUILDDIR)/$(BINARY): $(BUILDDIR)/rockbox.elf $(call PRINTS,OC $(@F))$(call objcopy,$^,$@) endif |