TOS calls return a negative code on error.
Map those to native errors. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23208 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -6,11 +6,13 @@
|
|||||||
|
|
||||||
#include "serial.h"
|
#include "serial.h"
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
|
#include "toscalls.h"
|
||||||
|
|
||||||
#include <boot/platform.h>
|
#include <boot/platform.h>
|
||||||
#include <boot/stdio.h>
|
#include <boot/stdio.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
#include <Errors.h>
|
||||||
|
|
||||||
/*! This works only after console_init() was called.
|
/*! This works only after console_init() was called.
|
||||||
*/
|
*/
|
||||||
@@ -52,3 +54,91 @@ dprintf(const char *format, ...)
|
|||||||
fprintf(stderr, "%s", buffer);
|
fprintf(stderr, "%s", buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*! Maps TOS error codes to native errors
|
||||||
|
*/
|
||||||
|
status_t toserror(int32 err)
|
||||||
|
{
|
||||||
|
// generated from:
|
||||||
|
// http://www.fortunecity.com/skyscraper/apple/308/html/appendd.htm
|
||||||
|
// with:
|
||||||
|
// while read N; do read V; read L; echo -e "\tcase $V: /* $N - $L */\n\t\treturn EINVAL;"; done >> errs
|
||||||
|
switch (err) {
|
||||||
|
/* BIOS errors */
|
||||||
|
case 0: /* E_OK - No error */
|
||||||
|
return B_OK;
|
||||||
|
case -1: /* ERROR - Generic error */
|
||||||
|
return B_ERROR;
|
||||||
|
case -2: /* EDRVNR - Drive not ready */
|
||||||
|
return B_DEV_NOT_READY;
|
||||||
|
case -3: /* EUNCMD - Unknown command */
|
||||||
|
return EINVAL; //XXX
|
||||||
|
case -4: /* E_CRC - CRC error */
|
||||||
|
return B_DEV_CRC_ERROR;
|
||||||
|
case -5: /* EBADRQ - Bad request */
|
||||||
|
return EINVAL; //XXX
|
||||||
|
case -6: /* E_SEEK - Seek error */
|
||||||
|
return B_DEV_SEEK_ERROR;
|
||||||
|
case -7: /* EMEDIA - Unknown media */
|
||||||
|
return B_DEV_UNREADABLE;
|
||||||
|
case -8: /* ESECNF - Sector not found */
|
||||||
|
return B_DEV_FORMAT_ERROR;
|
||||||
|
case -9: /* EPAPER - Out of paper */
|
||||||
|
return ENODEV;
|
||||||
|
case -10: /* EWRITF - Write fault */
|
||||||
|
return B_DEV_WRITE_ERROR;
|
||||||
|
case -11: /* EREADF - Read fault */
|
||||||
|
return B_DEV_READ_ERROR;
|
||||||
|
case -12: /* EWRPRO - Device is write protected */
|
||||||
|
return B_READ_ONLY_DEVICE;
|
||||||
|
case -14: /* E_CHNG - Media change detected */
|
||||||
|
return B_DEV_MEDIA_CHANGED;
|
||||||
|
case -15: /* EUNDEV - Unknown device */
|
||||||
|
return B_DEV_BAD_DRIVE_NUM;
|
||||||
|
case -16: /* EBADSF - Bad sectors on format */
|
||||||
|
return B_DEV_UNREADABLE;
|
||||||
|
case -17: /* EOTHER - Insert other disk (request) */
|
||||||
|
return B_DEV_MEDIA_CHANGE_REQUESTED;
|
||||||
|
/* GEMDOS errors */
|
||||||
|
case -32: /* EINVFN - Invalid function */
|
||||||
|
return EINVAL;
|
||||||
|
case -33: /* EFILNF - File not found */
|
||||||
|
return B_FILE_NOT_FOUND;
|
||||||
|
case -34: /* EPTHNF - Path not found */
|
||||||
|
return B_ENTRY_NOT_FOUND;
|
||||||
|
case -35: /* ENHNDL - No more handles */
|
||||||
|
return B_NO_MORE_FDS;
|
||||||
|
case -36: /* EACCDN - Access denied */
|
||||||
|
return EACCES;
|
||||||
|
case -37: /* EIHNDL - Invalid handle */
|
||||||
|
return EBADF;
|
||||||
|
case -39: /* ENSMEM - Insufficient memory */
|
||||||
|
return ENOMEM;
|
||||||
|
case -40: /* EIMBA - Invalid memory block address */
|
||||||
|
return EFAULT;
|
||||||
|
case -46: /* EDRIVE - Invalid drive specification */
|
||||||
|
return B_DEV_BAD_DRIVE_NUM;
|
||||||
|
case -48: /* ENSAME - Cross device rename */
|
||||||
|
return EXDEV;
|
||||||
|
case -49: /* ENMFIL - No more files */
|
||||||
|
return EMFILE;
|
||||||
|
case -58: /* ELOCKED - Record is already locked */
|
||||||
|
return EINVAL; //XXX
|
||||||
|
case -59: /* ENSLOCK - Invalid lock removal request */
|
||||||
|
return EINVAL; //XXX
|
||||||
|
case -64: /* ERANGE or ENAMETOOLONG - Range error */
|
||||||
|
return ENAMETOOLONG;
|
||||||
|
case -65: /* EINTRN - Internal error */
|
||||||
|
return B_ERROR;
|
||||||
|
case -66: /* EPLFMT - Invalid program load format */
|
||||||
|
return ENOEXEC;
|
||||||
|
case -67: /* EGSBF - Memory block growth failure */
|
||||||
|
return EINVAL;
|
||||||
|
case -80: /* ELOOP - Too many symbolic links */
|
||||||
|
return ELOOP;
|
||||||
|
case -200: /* EMOUNT - Mount point crossed (indicator) */
|
||||||
|
return EINVAL;
|
||||||
|
default:
|
||||||
|
return B_ERROR;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ extern "C" {
|
|||||||
* Atari BIOS calls
|
* Atari BIOS calls
|
||||||
*/
|
*/
|
||||||
|
|
||||||
extern uint32 bios(uint16 nr, ...);
|
extern int32 bios(uint16 nr, ...);
|
||||||
|
|
||||||
#define Bconin(p0) bios(2, p0)
|
#define Bconin(p0) bios(2, p0)
|
||||||
//XXX nparams ?
|
//XXX nparams ?
|
||||||
@@ -27,14 +27,15 @@ extern uint32 bios(uint16 nr, ...);
|
|||||||
* Atari XBIOS calls
|
* Atari XBIOS calls
|
||||||
*/
|
*/
|
||||||
|
|
||||||
extern uint32 bios(uint16 nr, ...);
|
extern int32 bios(uint16 nr, ...);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Atari GEMDOS calls
|
* Atari GEMDOS calls
|
||||||
*/
|
*/
|
||||||
|
|
||||||
extern uint32 gemdos(uint16 nr, ...);
|
extern int32 gemdos(uint16 nr, ...);
|
||||||
|
|
||||||
// official names
|
// official names
|
||||||
#define Cconin() gemdos(1)
|
#define Cconin() gemdos(1)
|
||||||
@@ -43,6 +44,13 @@ extern uint32 gemdos(uint16 nr, ...);
|
|||||||
// check for names
|
// check for names
|
||||||
#define terminate() GEMDOS(0)
|
#define terminate() GEMDOS(0)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* error mapping
|
||||||
|
* in debug.c
|
||||||
|
*/
|
||||||
|
|
||||||
|
extern status_t toserror(int32 err);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user