ApacheThunder/nrio-usb-disk
1
Fork 0
mirror of https://github.com/ApacheThunder/nrio-usb-disk.git synced 2025-06-18 18:55:34 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync changes from host repo.

Browse Source 
The following commits have been manually merged:

4fb4de61dc

473e2088b5

ad66025067
This commit is contained in:
ApacheThunder 2024-11-06 04:08:08 -06:00
parent 27bbcf0cbe
commit cd433556c5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -216,7 +216,7 @@ $(ROM): $(ELF)
$(V)$(BLOCKSDS)/tools/ndstool/ndstool -c $@ \
-7 $(BLOCKSDS)/sys/default_arm7/arm7.elf -9 $(ELF) \
-b $(GAME_ICON) "$(GAME_FULL_TITLE)" \
$(NDSTOOL_ARGS)
-h 0x200 $(NDSTOOL_ARGS)
$(ELF): $(OBJS)
@echo " LD $@"

7
tinyusb/src/portable/nrio/dcd_nrio.c
View File

@ -320,10 +320,11 @@ bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
| EXMEMCNT_ROM_TIME2_6_CYCLES | EXMEMCNT_SRAM_TIME_18_CYCLES;
// Check if the chip is an PDIUSBD12 (do other compatible chips exist?)
uint16_t chip_id = nrio_d12_read_chip_id();
if (chip_id != 0x0000 && chip_id != 0xFFFF) {
uint16_t d12_chip_id = nrio_d12_read_chip_id();
uint8_t d12_open_bus = NRIO_D12_DATA;
if (!((d12_chip_id >> 8) == d12_open_bus && (d12_chip_id & 0xFF) == d12_open_bus)) {
_dcd.type = NRIO_TYPE_D12;
_dcd.chip_id = chip_id;
_dcd.chip_id = d12_chip_id;
TU_LOG(3, "Detected D12 chip (%04X)\n", chip_id);
} else {