diff --git a/BaS_gcc/sources/xhdi_sd.c b/BaS_gcc/sources/xhdi_sd.c index f4a6d6b..f80fc3c 100644 --- a/BaS_gcc/sources/xhdi_sd.c +++ b/BaS_gcc/sources/xhdi_sd.c @@ -33,11 +33,8 @@ #define MY_MAJOR 65 #define MY_MINOR 0 -static BPB sd_bpb[4]; /* space for four partitions on SD card */ - uint16_t xhdi_version(void) { - xprintf("xhdi_version() called\r\n"); return DRIVER_VERSION; } @@ -49,31 +46,27 @@ uint32_t xhdi_inquire_target(uint16_t major, uint16_t minor, uint32_t *block_siz uint32_t xhdi_reserve(uint16_t major, uint16_t minor, uint16_t do_reserve, uint16_t key) { - xprintf("xhdi_reserve() called\r\n"); return ERROR; /* device cannot be reserved */ } uint32_t xhdi_lock(uint16_t major, uint16_t minor, uint16_t do_lock, uint16_t key) { - xprintf("xhdi_lock() called\r\n"); return ERROR; /* device cannot be locked */ } uint32_t xhdi_stop(uint16_t major, uint16_t minor, uint16_t do_stop, uint16_t key) { - xprintf("xhdi_stop() called\r\n"); return ERROR; /* device cannot be locked */ } uint32_t xhdi_eject(uint16_t major, uint16_t minor, uint16_t do_eject, uint16_t key) { - xprintf("xhdi_eject() called\r\n"); return ERROR; /* device cannot be ejected */ } uint32_t xhdi_drivemap(void) { - xprintf("xhdi_drivemap() called\r\n"); + debug_printf("xhdi_drivemap() called\r\n"); long map = (1 << ('S' - 'A')); return map; @@ -85,7 +78,6 @@ uint32_t xhdi_drivemap(void) uint32_t xhdi_inquire_device(uint16_t bios_device, uint16_t *major, uint16_t *minor, uint32_t *start_sector, /* BPB */ void *bpb) { - xprintf("xhdi_inquire_device() called\r\n"); if (major != NULL) *major = MY_MAJOR; if (minor != NULL) *minor = MY_MINOR; if (start_sector != NULL) *start_sector = 0; @@ -96,9 +88,6 @@ uint32_t xhdi_inquire_device(uint16_t bios_device, uint16_t *major, uint16_t *mi uint32_t xhdi_inquire_driver(uint16_t bios_device, char *name, char *version, char *company, uint16_t *ahdi_version, uint16_t *maxIPL) { - xprintf("xhdi_inquire_driver() called. bios_device = %d, name = %p, version = %p,\r\n" - "company = %p, ahdi_version = %p, max_IPL = %p\r\n", - bios_device, name, version, company, ahdi_version, maxIPL); if (bios_device == 'S' - 'A') { if (name != NULL) strcpy(name, "BaS SD-card driver"); @@ -114,7 +103,6 @@ uint32_t xhdi_inquire_driver(uint16_t bios_device, char *name, char *version, uint32_t xhdi_new_cookie(uint32_t newcookie) { - xprintf("xhdi_new_cookie() called\r\n"); return ERROR; } @@ -126,20 +114,18 @@ uint32_t xhdi_read_write(uint16_t major, uint16_t minor, uint16_t rwflag, int16_t s_count = count; uint16_t retries; const uint16_t max_retries = 5; - xprintf("xhdi_read_write() called: major = %d, minor = %d, rwflag = %d, \r\nrecno = %lx, count = %lx, buf = %p\r\n", - major, minor, rwflag, recno, count, buf); if (major == MY_MAJOR) { do { - num_sectors = ((s_count > 1) ? 1 : s_count); + num_sectors = ((s_count > 127) ? 127 : s_count); retries = 0; do { ret = ((rwflag & 1) ? disk_write(0, buf, recno, num_sectors) : disk_read(0, buf, recno, num_sectors)); if (ret != RES_OK && retries > max_retries) { - xprintf("error: %d\r\n", ret); + debug_printf("error: %d\r\n", ret); return ERROR; } else if (ret != RES_OK) @@ -153,7 +139,7 @@ uint32_t xhdi_read_write(uint16_t major, uint16_t minor, uint16_t rwflag, recno += num_sectors; s_count -= num_sectors; } while (s_count > 0); - xprintf("call ok. %d sector(s) %s\r\n", count, ((rwflag & 1) ? "written" : "read")); + return E_OK; } return EUNDEV; @@ -162,7 +148,7 @@ uint32_t xhdi_read_write(uint16_t major, uint16_t minor, uint16_t rwflag, uint32_t xhdi_inquire_target2(uint16_t major, uint16_t minor, uint32_t *block_size, uint32_t *device_flags, char *product_name, uint16_t stringlen) { - xprintf("xhdi_inquire_target2(major=%d, minor=%d) called\r\n", major, minor); + debug_printf("xhdi_inquire_target2(major=%d, minor=%d) called\r\n", major, minor); if (major == MY_MAJOR) { @@ -170,7 +156,6 @@ uint32_t xhdi_inquire_target2(uint16_t major, uint16_t minor, uint32_t *block_si if (device_flags != NULL) *device_flags = XH_TARGET_REMOVABLE; if (product_name != NULL) strncpy(product_name, "BaS SD driver", stringlen); - xprintf("returning block_size %d, device_flags %d, product_name %s \r\n", *block_size, *device_flags, *product_name); return E_OK; } @@ -180,7 +165,6 @@ uint32_t xhdi_inquire_target2(uint16_t major, uint16_t minor, uint32_t *block_si uint32_t xhdi_inquire_device2(uint16_t bios_device, uint16_t *major, uint16_t *minor, uint32_t *start_sector, BPB *bpb, uint32_t *blocks, char *partid) { - xprintf("xhdi_inquire_device2() called\r\n"); if (bios_device == 'S' - 'A') { @@ -191,14 +175,11 @@ uint32_t xhdi_inquire_device2(uint16_t bios_device, uint16_t *major, uint16_t *m uint32_t xhdi_driver_special(uint32_t key1, uint32_t key2, uint16_t subopcode, void *data) { - xprintf("xhdi_driver_special() called\r\n"); return ERROR; } uint32_t xhdi_get_capacity(uint16_t major, uint16_t minor, uint32_t *blocks, uint32_t *bs) { - xprintf("xhdi_get_capacity(major=%d, minor=%d) called\r\n", major, minor); - if (major == MY_MAJOR) { if (disk_ioctl(0, GET_SECTOR_COUNT, blocks) != RES_OK) @@ -206,7 +187,6 @@ uint32_t xhdi_get_capacity(uint16_t major, uint16_t minor, uint32_t *blocks, uin if (disk_ioctl(0, GET_SECTOR_SIZE, bs) != RES_OK) return ERROR; *bs = 512; - xprintf("returning %d blocks with %d blocksize (%d GB)\r\n", *blocks, *bs, *blocks / 2 / 1000 / 1000); return E_OK; } return EUNDEV; @@ -214,30 +194,25 @@ uint32_t xhdi_get_capacity(uint16_t major, uint16_t minor, uint32_t *blocks, uin uint32_t xhdi_medium_changed(uint16_t major, uint16_t minor) { - xprintf("xhdi_medium_changed() called\r\n"); return ERROR; } uint32_t xhdi_mint_info(uint16_t opcode, void *data) { - xprintf("xhdi_mint_info() called\r\n"); return ERROR; } uint32_t xhdi_dos_limits(uint16_t which, uint32_t limit) { - xprintf("xhdi_dos_limits() called\r\n"); return ERROR; } uint32_t xhdi_last_access(uint16_t major, uint16_t minor, uint32_t *ms) { - xprintf("xhdi_last_access() called\r\n"); return ERROR; } uint32_t xhdi_reaccess(uint16_t major, uint16_t minor) { - xprintf("xhdi_reaccess() called\r\n"); return ERROR; }