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

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;
 }