From b37ab2f5f696eb6d81535d8632da4af106958061 Mon Sep 17 00:00:00 2001
From: Klaus Reimer <k@ailis.de>
Date: Sun, 23 Jan 2011 00:04:04 +0100
Subject: [PATCH] Removed USB_String_Descriptor JNI wrapper.

---
 usb4java-lib/src/main/c/Makefile.am           |  5 +-
 .../src/main/c/USB_String_Descriptor.c        | 77 -------------------
 2 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 usb4java-lib/src/main/c/USB_String_Descriptor.c

diff --git a/usb4java-lib/src/main/c/Makefile.am b/usb4java-lib/src/main/c/Makefile.am
index 8806972..888675b 100644
--- a/usb4java-lib/src/main/c/Makefile.am
+++ b/usb4java-lib/src/main/c/Makefile.am
@@ -12,6 +12,5 @@ libusb4java_la_SOURCES = \
     USB_Dev_Handle.c \
     USB_Interface.c \
     USB_Interface_Descriptor.c \
-    USB_Endpoint_Descriptor.c \
-    USB_String_Descriptor.c
-	
\ No newline at end of file
+    USB_Endpoint_Descriptor.c
+    
\ No newline at end of file
diff --git a/usb4java-lib/src/main/c/USB_String_Descriptor.c b/usb4java-lib/src/main/c/USB_String_Descriptor.c
deleted file mode 100644
index a05416a..0000000
--- a/usb4java-lib/src/main/c/USB_String_Descriptor.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2011 Klaus Reimer (k@ailis.de)
- * See COPYING file for copying conditions
- */
-
-/**
- * @name USB_String_Descriptor
- *
- * Native methods for the USB_String_Descriptor class.
- *
- * @author Klaus Reimer <k@ailis.de>
- */
-
-#include <jni.h>
-#include <usb.h>
-#include "usb4java.h"
-
-/**
- * Creates and returns a new USB string descriptor wrapper object.
- *
- * @param env
- *            The JNI environment.
- * @param device
- *            The USB string descriptor.
- * @return The USB string descriptor wrapper object.
- */
-
-jobject wrap_usb_string_descriptor(JNIEnv *env,
-    struct usb_string_descriptor *descriptor)
-{
-    if (!descriptor) return NULL;
-    jclass cls = (*env)->FindClass(env,
-        PACKAGE_DIR"/USB_String_Descriptor");
-    if (cls == NULL) return NULL;
-    jmethodID constructor = (*env)->GetMethodID(env, cls, "<init>", "(J)V");
-    if (constructor == NULL) return NULL;
-    return (*env)->NewObject(env, cls, constructor, (long) descriptor);
-}
-
-
-/**
- * Returns the wrapped USB string descriptor object from the specified
- * wrapper object.
- *
- * @param env
- *            The JNI environment.
- * @param obj
- *            The USB string descriptor wrapper object.
- * @return The USB string descriptor object.
- */
-  
-struct usb_string_descriptor *unwrap_usb_string_descriptor(JNIEnv *env,
-    jobject obj)
-{
-     jclass cls = (*env)->GetObjectClass(env, obj);
-     jfieldID field = (*env)->GetFieldID(env, cls, "pointer", "J");
-     return (struct usb_string_descriptor *) ((*env)->GetLongField(env,
-         obj, field));
-}
-
-
-/**
- * char[] wData()
- */
- 
-JNIEXPORT jcharArray JNICALL METHOD_NAME(USB_1String_1Descriptor, wData)
-(
-    JNIEnv *env, jobject this
-)
-{
-    struct usb_string_descriptor *descriptor = unwrap_usb_string_descriptor(env, this);
-    int size = (descriptor->bLength - 2) / 2;
-    jcharArray array = (*env)->NewByteArray(env, size);
-    (*env)->SetCharArrayRegion(env, array, 0, size,
-        (const jchar *) descriptor->wData);
-    return array;
-}