set proper cassette image loading error / removed unused CASSETTE_ERROR_INVALIDARG (nw)

This commit is contained in:
Oliver Stöneberg 2013-02-12 18:53:20 +00:00
parent 922c0727db
commit 0817d64c5f
2 changed files with 21 additions and 2 deletions

View File

@ -332,6 +332,26 @@ bool cassette_image_device::call_load()
return IMAGE_INIT_PASS;
error:
image_error_t imgerr = IMAGE_ERROR_UNSPECIFIED;
switch(err)
{
case CASSETTE_ERROR_INTERNAL:
imgerr = IMAGE_ERROR_INTERNAL;
break;
case CASSETTE_ERROR_UNSUPPORTED:
imgerr = IMAGE_ERROR_UNSUPPORTED;
break;
case CASSETTE_ERROR_OUTOFMEMORY:
imgerr = IMAGE_ERROR_OUTOFMEMORY;
break;
case CASSETTE_ERROR_INVALIDIMAGE:
imgerr = IMAGE_ERROR_INVALIDIMAGE;
break;
default:
imgerr = IMAGE_ERROR_UNSPECIFIED;
break;
}
image->seterror(imgerr, "" );
return IMAGE_INIT_FAIL;
}

View File

@ -65,8 +65,7 @@ typedef enum
CASSETTE_ERROR_INTERNAL, /* fatal internal error */
CASSETTE_ERROR_UNSUPPORTED, /* this operation is unsupported */
CASSETTE_ERROR_OUTOFMEMORY, /* ran out of memory */
CASSETTE_ERROR_INVALIDIMAGE, /* invalid image */
CASSETTE_ERROR_INVALIDARG
CASSETTE_ERROR_INVALIDIMAGE /* invalid image */
}
casserr_t;