Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

basically finished, but EmuTOS does not seem to like it yet...

Browse Source
This commit is contained in:
Markus Fröschle
2013-05-05 17:18:25 +00:00
parent 946a5fc244
commit 158972b31c
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BaS_gcc/Makefile
View File

@@ -139,9 +139,6 @@ $(LIBBAS): $(OBJS)
$(AR) rv $@ $(OBJS) $(AR) rv $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
# compile xhdi_interface.c with -mshort to adhere to TOS argument passing conventions
$(OBJDIR)/xhdi_interface.o: CFLAGS += -mshort
# compile init_fpga with -mbitfield for testing purposes # compile init_fpga with -mbitfield for testing purposes
#$(OBJDIR)/init_fpga.o: CFLAGS += -mbitfield #$(OBJDIR)/init_fpga.o: CFLAGS += -mbitfield

18
BaS_gcc/sources/xhdi_sd.c
View File

@@ -28,20 +28,6 @@
#define DRIVER_VERSION 0x130 #define DRIVER_VERSION 0x130
typedef struct
{
uint16_t recsiz; /* bytes per sector */
uint16_t clsiz; /* sectors per cluster */
uint16_t clsizb; /* bytes per cluster */
uint16_t rdlen; /* directory length */
uint16_t fsiz; /* length of FAT */
uint16_t fatrec; /* start of 2nd FAT */
uint16_t datrec; /* 1st free sector */
uint16_t numcl; /* overall number of clusters */
uint16_t bflags; /* flags */
/* Bit 0: 0 (12-Bit-FAT), 1 16-Bit-FAT */
/* Bit 1: 0 (two FATs), 1 (one FAT) */
} __attribute__((__packed__)) BPB;
static BPB sd_bpb[4]; /* space for four partitions on SD card */ static BPB sd_bpb[4]; /* space for four partitions on SD card */
@@ -110,12 +96,8 @@ uint32_t xhdi_eject(uint16_t major, uint16_t minor, uint16_t do_eject, uint16_t
uint32_t xhdi_drivemap(void) uint32_t xhdi_drivemap(void)
{ {
<<<<<<< .mine
xprintf("xhdi_drivemap() called\r\n"); xprintf("xhdi_drivemap() called\r\n");
long map = (1 << ('S' - 'A')); long map = (1 << ('S' - 'A'));
=======
uint32_t map = (1 << ('S' - 'A'));
>>>>>>> .r549
return map; return map;
} }