rik/jlibusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- version information added

Browse Source 
- update to official libusb snapshot (libusb-win32-device-bin-20060518)

git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@154 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
schlaepfer
2006-07-12 09:11:21 +00:00
parent c05a920889
commit 9daac51e8b
9 changed files with 101 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libusbdll/.cdtproject
View File

@@ -59,11 +59,25 @@
<buildTargets>
<target name="dll" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildArguments></buildArguments>
<buildTarget>dll</buildTarget>
<stopOnError>false</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
</target>
<target name="clean" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments></buildArguments>
<buildTarget>clean</buildTarget>
<stopOnError>false</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
</target>
<target name="testExe" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments></buildArguments>
<buildTarget>testExe</buildTarget>
<stopOnError>false</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
</target>
</buildTargets>
</item>
</data>

BIN
libusbdll/LibusbTest.exe
View File

Binary file not shown.

BIN
libusbdll/LibusbWin.dll
View File

Binary file not shown.

35
libusbdll/common.rc Normal file
View File

@@ -0,0 +1,35 @@
#include <winver.h>
#define RT_MANIFEST 24
#define ID_MANIFEST 1
VS_VERSION_INFO VERSIONINFO
FILEVERSION RC_VERSION
PRODUCTVERSION RC_VERSION
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x0L
FILEOS VOS_NT_WINDOWS32
FILETYPE RC_FILE_TYPE
FILESUBTYPE RC_FILE_SUB_TYPE
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "http://inf.ntb.ch"
VALUE "FileDescription", RC_PRODUCT_STR
VALUE "FileVersion", RC_VERSION_STR
VALUE "InternalName", RC_FILE_NAME_STR
VALUE "LegalCopyright", "@ 2006 Andreas Schl<68>pfer"
VALUE "OriginalFilename",RC_FILE_NAME_STR
VALUE "ProductName", RC_PRODUCT_STR
VALUE "ProductVersion", RC_VERSION_STR
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END

BIN
libusbdll/libusb.a Normal file
View File

Binary file not shown.

BIN
libusbdll/libusb.lib
View File

Binary file not shown.

26
libusbdll/makefile
View File

@@ -1,20 +1,34 @@
CC = gcc
RM=rm -f
WINDRES = windres
SOURCENAME = LibusbWin
DDLNAME = LibusbWin
EXENAME = LibusbTest
JAVAPATH = "C:/Program Files/Java/jdk1.5.0_04"
TARGETDIR = D:/work/USB/libusb/libusbdllMinGW
## -IDLOUT:$(DDLNAME) -MIDL:$(DDLNAME) -TLBOUT:$(DDLNAME)
## $(CC) -LD $(SOURCENAME).c -Fe$(DDLNAME).dll -link libusb.lib
VERSION_MAJOR = 0
VERSION_MINOR = 0
VERSION_MICRO = 2
VERSION_NANO = 0
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).$(VERSION_NANO)
RC_VERSION = $(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO),$(VERSION_NANO)
RC_VERSION_STR = '\"$(VERSION)\"'
dll: $(DDLNAME).dll
$(DDLNAME).dll: $(SOURCENAME).cpp
$(CC) -Wall -D_JNI_IMPLEMENTATION_ -Wl,--kill-at -I$(JAVAPATH)/include -I$(JAVAPATH)/include/win32 -shared $(SOURCENAME).cpp -o $(DDLNAME).dll libusb.lib
$(WINDRES) -o resource.o resource.rc -DRC_VERSION='$(RC_VERSION)' \
-DRC_VERSION_STR=$(RC_VERSION_STR)
$(CC) -Wall -D_JNI_IMPLEMENTATION_ -Wl,--kill-at -mwindows \
-I$(JAVAPATH)/include -I$(JAVAPATH)/include/win32 -shared \
$(SOURCENAME).cpp -o $(DDLNAME).dll resource.o libusb.a
cleanDll:
rm $(DDLNAME).dll
clean:
$(RM) $(DDLNAME).dll
$(RM) *.o
testExe: $(EXENAME).exe
$(EXENAME).exe: $(EXENAME).cpp
$(CC) $(EXENAME).cpp -o $(EXENAME).exe $(TARGETDIR)/libusb.a
$(CC) $(EXENAME).cpp -o $(EXENAME).exe libusb.a

8
libusbdll/resource.rc Normal file
View File

@@ -0,0 +1,8 @@
#define RC_FILE_TYPE VFT_DLL
#define RC_FILE_SUB_TYPE VFT2_UNKNOWN
#define RC_PRODUCT_STR "Java LibUsb-Win32 wrapper - DLL"
#define RC_FILE_NAME_STR "LibusbWin.dll"
#include "common.rc"

26
libusbdll/usb.h
View File

@@ -2,6 +2,7 @@
#define __USB_H__
#include <stdlib.h>
#include <windows.h>
/*
* 'interface' is defined somewhere in the Windows header files. This macro
@@ -284,7 +285,10 @@ struct usb_dev_handle;
typedef struct usb_dev_handle usb_dev_handle;
/* Variables */
extern struct usb_bus *usb_busses;
#ifndef __USB_C__
#define usb_busses usb_get_busses()
#endif
#include <poppack.h>
@@ -345,13 +349,27 @@ extern "C" {
#define LIBUSB_HAS_INSTALL_SERVICE_NP 1
int usb_install_service_np(void);
void CALLBACK usb_install_service_np_rundll(HWND wnd, HINSTANCE instance,
LPSTR cmd_line, int cmd_show);
#define LIBUSB_HAS_UNINSTALL_SERVICE_NP 1
int usb_uninstall_service_np(void);
void CALLBACK usb_uninstall_service_np_rundll(HWND wnd, HINSTANCE instance,
LPSTR cmd_line, int cmd_show);
#define LIBUSB_HAS_INSTALL_DRIVER_NP 1
int usb_install_driver_np(const char *inf_file);
void CALLBACK usb_install_driver_np_rundll(HWND wnd, HINSTANCE instance,
LPSTR cmd_line, int cmd_show);
#define LIBUSB_HAS_TOUCH_INF_FILE_NP 1
int usb_touch_inf_file_np(const char *inf_file);
void CALLBACK usb_touch_inf_file_np_rundll(HWND wnd, HINSTANCE instance,
LPSTR cmd_line, int cmd_show);
#define LIBUSB_HAS_INSTALL_NEEDS_RESTART_NP 1
int usb_install_needs_restart_np(void);
const struct usb_version *usb_get_version(void);
int usb_isochronous_setup_async(usb_dev_handle *dev, void **context,
@@ -363,6 +381,8 @@ extern "C" {
int usb_submit_async(void *context, char *bytes, int size);
int usb_reap_async(void *context, int timeout);
int usb_reap_async_nocancel(void *context, int timeout);
int usb_cancel_async(void *context);
int usb_free_async(void **context);