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

likely found a way to pass parameters to 32-bit routines from -mshort compiled code

Browse Source
This commit is contained in:
Markus Fröschle
2013-05-06 15:59:07 +00:00
parent dc40bf93a0
commit b18293f7c9
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/xhdi_sd.h
View File

@@ -87,9 +87,9 @@ typedef void* (*xhdi_call_fun)(int xhdi_fun, ...);
struct XHDICALL_args struct XHDICALL_args
{ {
uint16_t opcode; uint16_t opcode;
} __attribute__((packed)); };
extern uint32_t xhdi_call(struct XHDICALL_args *stack); extern unsigned long xhdi_call(struct XHDICALL_args stack);
extern xhdi_call_fun xhdi_sd_install(xhdi_call_fun old_vector) __attribute__((__interrupt__)); extern xhdi_call_fun xhdi_sd_install(xhdi_call_fun old_vector) __attribute__((__interrupt__));

40
sources/xhdi_interface.c
View File

@@ -27,9 +27,9 @@
#include "bas_printf.h" #include "bas_printf.h"
uint32_t xhdi_call(uint16_t *stack) unsigned long xhdi_call(struct XHDICALL_args stack)
{ {
uint16_t opcode = *stack; uint16_t opcode = stack.opcode;
xprintf("xhdi_call(): opcode %d\r\n", opcode); xprintf("xhdi_call(): opcode %d\r\n", opcode);
@@ -49,7 +49,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint32_t *blocksize; uint32_t *blocksize;
uint32_t *deviceflags; uint32_t *deviceflags;
char *productname; char *productname;
}*args = (struct XHINQTARGET_args *) stack; }*args = (struct XHINQTARGET_args *) &stack;
return xhdi_inquire_target(args->major, args->minor, args->blocksize, return xhdi_inquire_target(args->major, args->minor, args->blocksize,
args->deviceflags, args->productname); args->deviceflags, args->productname);
@@ -65,7 +65,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint16_t minor; uint16_t minor;
uint16_t do_reserve; uint16_t do_reserve;
uint16_t key; uint16_t key;
}*args = (struct XHRESERVE_args *) stack; }*args = (struct XHRESERVE_args *) &stack;
return xhdi_reserve(args->major, args->minor, args->do_reserve, args->key); return xhdi_reserve(args->major, args->minor, args->do_reserve, args->key);
} }
@@ -79,7 +79,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint16_t minor; uint16_t minor;
uint16_t do_lock; uint16_t do_lock;
uint16_t key; uint16_t key;
}*args = (struct XHLOCK_args *) stack; }*args = (struct XHLOCK_args *) &stack;
return xhdi_lock(args->major, args->minor, args->do_lock, args->key); return xhdi_lock(args->major, args->minor, args->do_lock, args->key);
} }
@@ -93,7 +93,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint16_t minor; uint16_t minor;
uint16_t do_stop; uint16_t do_stop;
uint16_t key; uint16_t key;
}*args = (struct XHSTOP_args *) stack; }*args = (struct XHSTOP_args *) &stack;
return xhdi_stop(args->major, args->minor, args->do_stop, args->key); return xhdi_stop(args->major, args->minor, args->do_stop, args->key);
} }
@@ -107,7 +107,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint16_t minor; uint16_t minor;
uint16_t do_eject; uint16_t do_eject;
uint16_t key; uint16_t key;
}*args = (struct XHEJECT_args *) stack; }*args = (struct XHEJECT_args *) &stack;
return xhdi_eject(args->major, args->minor, args->do_eject, args->key); return xhdi_eject(args->major, args->minor, args->do_eject, args->key);
} }
@@ -127,7 +127,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint16_t *minor; uint16_t *minor;
uint32_t *start; uint32_t *start;
BPB *bpb; BPB *bpb;
}*args = (struct XHINQDEV_args *) stack; }*args = (struct XHINQDEV_args *) &stack;
return xhdi_inquire_device(args->drv, args->major, args->minor, args->start, return xhdi_inquire_device(args->drv, args->major, args->minor, args->start,
args->bpb); args->bpb);
@@ -144,7 +144,7 @@ uint32_t xhdi_call(uint16_t *stack)
char *company; char *company;
uint16_t *ahdi_version; uint16_t *ahdi_version;
uint16_t *maxIPL; uint16_t *maxIPL;
}*args = (struct XHINQDRIVER_args *) stack; }*args = (struct XHINQDRIVER_args *) &stack;
return xhdi_inquire_driver(args->dev, args->name, args->version, args->company, return xhdi_inquire_driver(args->dev, args->name, args->version, args->company,
args->ahdi_version, args->maxIPL); args->ahdi_version, args->maxIPL);
@@ -156,7 +156,7 @@ uint32_t xhdi_call(uint16_t *stack)
{ {
uint16_t opcode; uint16_t opcode;
uint32_t newcookie; uint32_t newcookie;
}*args = (struct XHNEWCOOKIE_args *) stack; }*args = (struct XHNEWCOOKIE_args *) &stack;
return xhdi_new_cookie(args->newcookie); return xhdi_new_cookie(args->newcookie);
} }
@@ -172,7 +172,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint32_t sector; uint32_t sector;
uint16_t count; uint16_t count;
void *buf; void *buf;
}*args = (struct XHREADWRITE_args *) stack; }*args = (struct XHREADWRITE_args *) &stack;
return xhdi_read_write(args->major, args->minor, args->rw, args->sector, return xhdi_read_write(args->major, args->minor, args->rw, args->sector,
args->count, args->buf); args->count, args->buf);
@@ -189,7 +189,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint32_t *deviceflags; uint32_t *deviceflags;
char *productname; char *productname;
uint16_t stringlen; uint16_t stringlen;
}*args = (struct XHINQTARGET2_args *) stack; }*args = (struct XHINQTARGET2_args *) &stack;
return xhdi_inquire_target2(args->major, args->minor, args->blocksize, return xhdi_inquire_target2(args->major, args->minor, args->blocksize,
args->deviceflags, args->productname, args->stringlen); args->deviceflags, args->productname, args->stringlen);
@@ -207,7 +207,7 @@ uint32_t xhdi_call(uint16_t *stack)
BPB *bpb; BPB *bpb;
uint32_t *blocks; uint32_t *blocks;
char *partid; char *partid;
}*args = (struct XHINQDEV2_args *) stack; }*args = (struct XHINQDEV2_args *) &stack;
return xhdi_inquire_device2(args->drv, args->major, args->minor, args->start, return xhdi_inquire_device2(args->drv, args->major, args->minor, args->start,
args->bpb, args->blocks, args->partid); args->bpb, args->blocks, args->partid);
@@ -222,7 +222,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint32_t key2; uint32_t key2;
uint16_t subopcode; uint16_t subopcode;
void *data; void *data;
}*args = (struct XHDRIVERSPECIAL_args *) stack; }*args = (struct XHDRIVERSPECIAL_args *) &stack;
return xhdi_driver_special(args->key1, args->key2, args->subopcode, return xhdi_driver_special(args->key1, args->key2, args->subopcode,
args->data); args->data);
@@ -237,7 +237,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint16_t minor; uint16_t minor;
uint32_t *blocks; uint32_t *blocks;
uint32_t *blocksize; uint32_t *blocksize;
}*args = (struct XHGETCAPACITY_args *) stack; }*args = (struct XHGETCAPACITY_args *) &stack;
return xhdi_get_capacity(args->major, args->minor, args->blocks, return xhdi_get_capacity(args->major, args->minor, args->blocks,
args->blocksize); args->blocksize);
@@ -250,7 +250,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint16_t opcode; uint16_t opcode;
uint16_t major; uint16_t major;
uint16_t minor; uint16_t minor;
}*args = (struct XHMEDIUMCHANGED_args *) stack; }*args = (struct XHMEDIUMCHANGED_args *) &stack;
return xhdi_medium_changed(args->major, args->minor); return xhdi_medium_changed(args->major, args->minor);
} }
@@ -262,7 +262,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint16_t opcode; uint16_t opcode;
uint16_t subopcode; uint16_t subopcode;
void *data; void *data;
}*args = (struct XHMINTINFO_args *) stack; }*args = (struct XHMINTINFO_args *) &stack;
return xhdi_mint_info(args->subopcode, args->data); return xhdi_mint_info(args->subopcode, args->data);
} }
@@ -274,7 +274,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint16_t opcode; uint16_t opcode;
uint16_t which; uint16_t which;
uint32_t limit; uint32_t limit;
}*args = (struct XHDOSLIMITS_args *) stack; }*args = (struct XHDOSLIMITS_args *) &stack;
return xhdi_dos_limits(args->which, args->limit); return xhdi_dos_limits(args->which, args->limit);
} }
@@ -287,7 +287,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint16_t major; uint16_t major;
uint16_t minor; uint16_t minor;
uint32_t *ms; uint32_t *ms;
}*args = (struct XHLASTACCESS_args *) stack; }*args = (struct XHLASTACCESS_args *) &stack;
return xhdi_last_access(args->major, args->minor, args->ms); return xhdi_last_access(args->major, args->minor, args->ms);
} }
@@ -299,7 +299,7 @@ uint32_t xhdi_call(uint16_t *stack)
uint16_t opcode; uint16_t opcode;
uint16_t major; uint16_t major;
uint16_t minor; uint16_t minor;
}*args = (struct XHREACCESS_args *) stack; }*args = (struct XHREACCESS_args *) &stack;
return xhdi_reaccess(args->major, args->minor); return xhdi_reaccess(args->major, args->minor);
} }