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

XHInqTarget() finished, but crashes...

Browse Source
This commit is contained in:
Markus Fröschle
2013-05-04 20:38:29 +00:00
parent 49af203806
commit 375f1235af
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sd-emutos/xhdi.h
View File

@@ -80,33 +80,33 @@ __extension__ \
#define e_xhdi_version xhdi_version(xhdi_entrypoint) #define e_xhdi_version xhdi_version(xhdi_entrypoint)
/* XHDI #1 */ /* XHDI #1 */
#define xhdi_inquire_target(xhdi_entry, major, minor, block_size, flags, product_name) \ #define XHInqTarget(xhdi_entry, major, minor, block_size, flags, product_name) \
__extension__ \ __extension__ \
({ \ ({ \
register long retvalue __asm__("d0"); \ register long retvalue __asm__("d0"); \
\ \
__asm__ volatile( \ __asm__ volatile( \
"move.w #XHDI_INQUIRE_TARGET,-(sp)\n\t" \ "move.l %[a_product_name],-(sp)\n\t" \
"move.w [major],-(sp)\n\t" \ "move.l %[a_flags],-(sp)\n\t" \
"move.w [minor],-(sp)\n\t" \ "move.l %[a_block_size],-(sp)\n\t" \
"lea [block_size],-(sp)\n\t" \ "move.w %[a_minor],-(sp)\n\t" \
"move.l [flags],-(sp)\n\t" \ "move.w %[a_major],-(sp)\n\t" \
"lea [product_name],-(sp)\n\t" \ "move.w #1,-(sp)\n\t" \
"lea %[entry],a0\n\t" \ "lea %[entry],a0\n\t" \
"jsr (a0)\n\t" \ "jsr (a0)\n\t" \
"lea 18(sp),sp\n\t" \ "lea 18(sp),sp\n\t" \
: "=r"(retvalue) /* outputs */ \ : "=r"(retvalue) /* outputs */ \
: [xhdi_entry]"a"(xhdi_entry), \ : [entry]"g"(xhdi_entry), \
[major]"g"(major), \ [a_major]"g"(major), \
[minor]"g"(minor), \ [a_minor]"g"(minor), \
[block_size]"g"(block_size), \ [a_block_size]"g"(block_size), \
[flags]"g"(flags), \ [a_flags]"g"(flags), \
[product_name]"g"(product_name) \ [a_product_name]"g"(product_name) \
: CLOBBER_REGISTERS /* clobbered regs */ \ : CLOBBER_REGISTERS /* clobbered regs */ \
AND_MEMORY \ AND_MEMORY \
); \ ); \
retvalue; \ retvalue; \
}); })
/* XHDI #2 */ /* XHDI #2 */
#define xhdi_reserve(xhdi_entry, major, minor, do_reserve, key) \ #define xhdi_reserve(xhdi_entry, major, minor, do_reserve, key) \

19
sd-emutos/xhdi_test.c
View File

@@ -75,13 +75,24 @@ void xhdi_test(void)
ret = XHInqDev(xhdi, i, &major, &minor, &start_sector, &bpb); ret = XHInqDev(xhdi, i, &major, &minor, &start_sector, &bpb);
if (ret == E_OK || ret == EDRVNR) if (ret == E_OK || ret == EDRVNR)
{ {
long block_size;
long flags;
char *product_name;
printf("drive %d returned %d:\r\n", i, ret); printf("drive %d returned %d:\r\n", i, ret);
printf("\tmajor = %x, minor = %x, start_sector = %lx, bpb = %p\r\n", major, minor, start_sector, bpb); printf("\tmajor = %x, minor = %x, start_sector = %lx, bpb = %p\r\n", major, minor, start_sector, bpb);
/* if (bpb != NULL) if (bpb != NULL)
print_bpb(bpb); */ print_bpb(bpb);
printf("trying to eject device major = %u, minor = %u. result = %ld\r\n",
major, minor, XHEject(xhdi, major, minor, 1, 1));
printf("trying to lock device major = %u, minor = %u. result = %ld\r\n",
major, minor, XHLock(xhdi, major, minor, 1, 1));
printf("inquire target major = %u, minor = %u. result = %ld\r\n", major, minor,
XHInqTarget(xhdi, major, minor, &block_size, &flags, &product_name));
printf("block_size = %ld, flags = %ld, product_name = \"%s\"", block_size, flags, product_name);
printf("trying to eject device major = %u, minor = %u. result = %ld\r\n", major, minor, XHEject(xhdi, major, minor, 1, 1));
printf("trying to lock device major = %u, minor = %u. result = %ld\r\n", major, minor, XHLock(xhdi, major, minor, 1, 1));
} }
} }
bpb = NULL; bpb = NULL;