- HALT inserted if JVM could not be created

- ConnecteDevice in ReopenDevice

git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@120 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
schlaepfer
2006-03-28 05:42:56 +00:00
parent 94def9a6a3
commit aea0fc61e7

View File

@@ -267,6 +267,7 @@ MODULE UsbBDI;
IF bool = FALSE_ THEN IF bool = FALSE_ THEN
Done := FALSE; Done := FALSE;
Log.String("creating JVM failed"); Log.Ln; Log.String("creating JVM failed"); Log.Ln;
HALT(77);
ELSE ELSE
Done := TRUE; Done := TRUE;
Log.String("JVM successfully created"); Log.Ln; Log.String("JVM successfully created"); Log.Ln;
@@ -387,8 +388,8 @@ MODULE UsbBDI;
PROCEDURE CheckIfFileExists (filePath: ARRAY OF CHAR; fileName: ARRAY OF CHAR): BOOLEAN; PROCEDURE CheckIfFileExists (filePath: ARRAY OF CHAR; fileName: ARRAY OF CHAR): BOOLEAN;
VAR VAR
i: INTEGER; done: BOOLEAN; i: INTEGER; done: BOOLEAN;
loc: Files.Locator; file: Files.File; name: Files.Name; loc: Files.Locator; file: Files.File; name: Files.Name;
BEGIN BEGIN
loc := Files.dir.This(filePath); loc := Files.dir.This(filePath);
IF loc.res # 0 THEN (*RETURN FALSE*) END; IF loc.res # 0 THEN (*RETURN FALSE*) END;
@@ -418,11 +419,11 @@ MODULE UsbBDI;
(* (*
CreateJVM("D:\work\USB\eclipse\mcdp\bin\"); CreateJVM("D:\work\USB\eclipse\mcdp\bin\");
*) *)
IF ~Done THEN HALT(77) END; IF ~Done THEN HALT(78) END;
jvmCreated := TRUE; jvmCreated := TRUE;
END; END;
BDI.USB_Device_open; BDI.USB_Device_open;
IF ~Done THEN HALT(78) END; IF ~Done THEN HALT(79) END;
deviceOpen := TRUE; deviceOpen := TRUE;
END END
END ConnectDevice; END ConnectDevice;
@@ -435,6 +436,7 @@ MODULE UsbBDI;
(* Close and reopen the device *) (* Close and reopen the device *)
PROCEDURE ReopenDevice * ; PROCEDURE ReopenDevice * ;
BEGIN BEGIN
ConnectDevice;
USB_Device_close; USB_Device_close;
USB_Device_open; USB_Device_open;
IF Done THEN IF Done THEN