extra: change file name starts with capital

change file name as well as its related module
remove unused comment

Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml
index 850465dfa1fe38ba584291cb2f965b11a4c69093..f74021db50dda6b740cd52b2e8a9cf76b18eb47d 100644 (file)
--- a/tizen/src/skin/client/build.xml
+++ b/tizen/src/skin/client/build.xml
@@ -87,7 +87,7 @@
                <exec dir="native_src" executable="gcc" failifexecutionfails="false">
                        <arg line="-shared" />
                        <arg line="-c" />
-                       <arg line="Share.c" />
+                       <arg line="share.c" />
                        <arg line="-o" />
                        <arg line="libshared.so" />
                        <arg line="-I${env.JAVA_JNI_H_INCLUDE_PATH}" />
@@ -107,14 +107,14 @@
                <exec dir="native_src" executable="gcc" failifexecutionfails="false">
                        <arg line="-mmacosx-version-min=10.4" />
                        <arg line="-c" />
-                       <arg line="Share.c" />
+                       <arg line="share.c" />
                        <arg line="-o" />
-                       <arg line="Share.o" />
+                       <arg line="share.o" />
                        <arg line="-I${env.JAVA_JNI_H_INCLUDE_PATH}" />
                </exec>
                <exec dir="native_src" executable="gcc" failifexecutionfails="false">
                        <arg line="-dynamiclib" />
-                       <arg line="Share.o" />
+                       <arg line="share.o" />
                        <arg line="-o" />
                        <arg line="libshared.dylib" />
                </exec>

diff --git a/tizen/src/skin/client/native_src/Share.c b/tizen/src/skin/client/native_src/Share.c
deleted file mode 100644 (file)
index 1e05050..0000000
--- a/tizen/src/skin/client/native_src/Share.c
+++ /dev/null
@@ -1,82 +0,0 @@
-#include <jni.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include "org_tizen_emulator_skin_EmulatorShmSkin.h"
-
-#define MAXLEN 512
-#define SHMKEY 26099
-
-void *shared_memory = (void *)0;
-int shmid;
-
-
-JNIEXPORT jint JNICALL Java_org_tizen_emulator_skin_EmulatorShmSkin_shmget
-  (JNIEnv *env, jobject obj, jint vga_ram_size)
-{
-    void *temp;
-    int keyval;
-    shmid = shmget((key_t)SHMKEY, (size_t)MAXLEN, 0666 | IPC_CREAT);
-    if (shmid == -1) {
-       fprintf(stderr, "Share.c: shmget failed\n");
-        exit(1);
-    }
-    
-    temp = shmat(shmid, (char*)0x0, 0);
-    if (temp == (void *)-1) {
-        fprintf(stderr, "Share.c: shmat failed\n");
-        exit(1);
-    }
-    keyval = atoi(temp);
-    shmdt(temp);
-
-    shmid = shmget((key_t)keyval, (size_t)vga_ram_size, 0666 | IPC_CREAT);
-    if (shmid == -1) {
-        return 1;
-    }
-
-    /* We now make the shared memory accessible to the program. */
-    shared_memory = shmat(shmid, (void *)0, 0);
-    if (shared_memory == (void *)-1) {
-        return 2;
-    }
-
-    //printf("Memory attached at %X\n", (int)shared_memory);
-
-    return 0;
-}
-
-JNIEXPORT jint JNICALL Java_org_tizen_emulator_skin_EmulatorShmSkin_shmdt
-  (JNIEnv *env, jobject obj)
-{
-    /* Lastly, the shared memory is detached */
-    if (shmdt(shared_memory) == -1) {
-        return 1;
-    }
-
-    return 0;
-}
-
-JNIEXPORT jint JNICALL Java_org_tizen_emulator_skin_EmulatorShmSkin_getPixels
-  (JNIEnv *env, jobject obj, jintArray array)
-{
-    int i = 0;
-    int len = (*env)->GetArrayLength(env, array);
-    if (len <= 0) {
-        return -1;
-    }
-
-    int *framebuffer = (int *)shared_memory;
-
-    jint value = 0xFFFFFFFF;
-    for(i = 0; i < len; i++) {
-        value = framebuffer[i];
-        (*env)->SetIntArrayRegion(env, array, i, 1, &value); 
-    }
-
-    return len;
-}
-

diff --git a/tizen/src/skin/client/native_src/make_so_linux.sh b/tizen/src/skin/client/native_src/make_so_linux.sh
index 7e4bc6bb1e718179fc2d98cb785e382926523e39..a8b69670fc66f0c1b26ec181a5047db52cddef0f 100755 (executable)
--- a/tizen/src/skin/client/native_src/make_so_linux.sh
+++ b/tizen/src/skin/client/native_src/make_so_linux.sh
@@ -3,5 +3,5 @@ javah -classpath ../bin/:../lib/swt.jar -jni org.tizen.emulator.skin.EmulatorSki
 rm ./org_tizen_emulator_skin_EmulatorSkin_PollFBThread.h
 rm ./org_tizen_emulator_skin_EmulatorSkin_SkinReopenPolicy.h
 #TODO: jdk path
-gcc -c Share.c -o Share.o -I /usr/lib/jvm/jdk1.7.0_04/include -I /usr/lib/jvm/jdk1.7.0_04/include/linux
-gcc -shared Share.o -o libshared.so -fPIC
+gcc -c share.c -o share.o -I /usr/lib/jvm/jdk1.7.0_04/include -I /usr/lib/jvm/jdk1.7.0_04/include/linux
+gcc -shared share.o -o libshared.so -fPIC

diff --git a/tizen/src/skin/client/native_src/make_so_mac.sh b/tizen/src/skin/client/native_src/make_so_mac.sh
index edf2910e04ed43e61066581de359c2dddd6c3cfa..22469cb3c7c9f1937b549477e33d9af4207f74f6 100755 (executable)
--- a/tizen/src/skin/client/native_src/make_so_mac.sh
+++ b/tizen/src/skin/client/native_src/make_so_mac.sh
@@ -3,5 +3,5 @@ javah -classpath ../emulator-skin.jar:../lib/swt.jar -jni org.tizen.emulator.ski
 rm ./org_tizen_emulator_skin_EmulatorSkin_PollFBThread.h
 rm ./org_tizen_emulator_skin_EmulatorSkin_SkinReopenPolicy.h
 #TODO: jdk path
-gcc -c Share.c -o Share.o -I/System/Library/Frameworks/JavaVM.framework/Headers
-gcc -dynamiclib Share.o -o libshared.dylib
+gcc -c share.c -o share.o -I/System/Library/Frameworks/JavaVM.framework/Headers
+gcc -dynamiclib share.o -o libshared.dylib

diff --git a/tizen/src/skin/client/native_src/share.c b/tizen/src/skin/client/native_src/share.c
new file mode 100644 (file)
index 0000000..8e4da46
--- /dev/null
+++ b/tizen/src/skin/client/native_src/share.c
@@ -0,0 +1,80 @@
+#include <jni.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include "org_tizen_emulator_skin_EmulatorShmSkin.h"
+
+#define MAXLEN 512
+#define SHMKEY 26099
+
+void *shared_memory = (void *)0;
+int shmid;
+
+
+JNIEXPORT jint JNICALL Java_org_tizen_emulator_skin_EmulatorShmSkin_shmget
+  (JNIEnv *env, jobject obj, jint vga_ram_size)
+{
+    void *temp;
+    int keyval;
+    shmid = shmget((key_t)SHMKEY, (size_t)MAXLEN, 0666 | IPC_CREAT);
+    if (shmid == -1) {
+       fprintf(stderr, "share.c: shmget failed\n");
+        exit(1);
+    }
+    
+    temp = shmat(shmid, (char*)0x0, 0);
+    if (temp == (void *)-1) {
+        fprintf(stderr, "share.c: shmat failed\n");
+        exit(1);
+    }
+    keyval = atoi(temp);
+    shmdt(temp);
+
+    shmid = shmget((key_t)keyval, (size_t)vga_ram_size, 0666 | IPC_CREAT);
+    if (shmid == -1) {
+        return 1;
+    }
+
+    /* We now make the shared memory accessible to the program. */
+    shared_memory = shmat(shmid, (void *)0, 0);
+    if (shared_memory == (void *)-1) {
+        return 2;
+    }
+
+    return 0;
+}
+
+JNIEXPORT jint JNICALL Java_org_tizen_emulator_skin_EmulatorShmSkin_shmdt
+  (JNIEnv *env, jobject obj)
+{
+    /* Lastly, the shared memory is detached */
+    if (shmdt(shared_memory) == -1) {
+        return 1;
+    }
+
+    return 0;
+}
+
+JNIEXPORT jint JNICALL Java_org_tizen_emulator_skin_EmulatorShmSkin_getPixels
+  (JNIEnv *env, jobject obj, jintArray array)
+{
+    int i = 0;
+    int len = (*env)->GetArrayLength(env, array);
+    if (len <= 0) {
+        return -1;
+    }
+
+    int *framebuffer = (int *)shared_memory;
+
+    jint value = 0xFFFFFFFF;
+    for(i = 0; i < len; i++) {
+        value = framebuffer[i];
+        (*env)->SetIntArrayRegion(env, array, i, 1, &value); 
+    }
+
+    return len;
+}
+