From 158972b31c73f7d7b09c82b3d50b9b11b150a26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Sun, 5 May 2013 17:18:25 +0000 Subject: [PATCH] basically finished, but EmuTOS does not seem to like it yet... --- BaS_gcc/Makefile | 3 --- BaS_gcc/sources/xhdi_sd.c | 18 ------------------ 2 files changed, 21 deletions(-) diff --git a/BaS_gcc/Makefile b/BaS_gcc/Makefile index f530045..d418a3e 100644 --- a/BaS_gcc/Makefile +++ b/BaS_gcc/Makefile @@ -139,9 +139,6 @@ $(LIBBAS): $(OBJS) $(AR) rv $@ $(OBJS) $(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 #$(OBJDIR)/init_fpga.o: CFLAGS += -mbitfield diff --git a/BaS_gcc/sources/xhdi_sd.c b/BaS_gcc/sources/xhdi_sd.c index 7aacbae..5888827 100644 --- a/BaS_gcc/sources/xhdi_sd.c +++ b/BaS_gcc/sources/xhdi_sd.c @@ -28,20 +28,6 @@ #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 */ @@ -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) { -<<<<<<< .mine xprintf("xhdi_drivemap() called\r\n"); long map = (1 << ('S' - 'A')); -======= - uint32_t map = (1 << ('S' - 'A')); ->>>>>>> .r549 return map; }