UIname added
[mardrone] / mardrone / ARDrone_SDK_1_5_Version_20101004.diff
1 diff -rc ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Build/config.makefile~ ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Build/config.makefile~
2 *** ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Build/config.makefile~    2010-10-26 14:41:56.000000000 +0300
3 --- ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Build/config.makefile~   2010-10-25 14:44:12.000000000 +0300
4 ***************
5 *** 107,113 ****
6        SDK_FLAGS+="USE_LINUX=no"
7     endif
8     
9 !   SDK_FLAGS+="USE_ELINUX=yes"
10     
11     ifneq ($(findstring iphone,$(ARDRONE_TARGET_OS)),)
12         SDK_FLAGS+="USE_IPHONE=yes"
13 --- 107,113 ----
14        SDK_FLAGS+="USE_LINUX=no"
15     endif
16     
17 !   SDK_FLAGS+="USE_ELINUX=no"
18     
19     ifneq ($(findstring iphone,$(ARDRONE_TARGET_OS)),)
20         SDK_FLAGS+="USE_IPHONE=yes"
21 diff -rc ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Common/generated_custom.h ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Common/generated_custom.h
22 *** ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Common/generated_custom.h 2010-10-25 15:33:57.000000000 +0300
23 --- ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/Soft/Common/generated_custom.h        2010-10-25 14:44:16.000000000 +0300
24 ***************
25 *** 7,13 ****
26   #  define STA
27   #endif
28   #define CURRENT_NUM_VERSION_SOFT "0.0.0"
29 ! #define CURRENT_BUILD_DATE "2010-10-25 15:33"
30   
31   #define USE_VIDEO_YUV
32   
33 --- 7,13 ----
34   #  define STA
35   #endif
36   #define CURRENT_NUM_VERSION_SOFT "0.0.0"
37 ! #define CURRENT_BUILD_DATE "2010-10-25 14:44"
38   
39   #define USE_VIDEO_YUV
40   
41 diff -rc ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/Build/sysvar.makefile ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/Build/sysvar.makefile
42 *** ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/Build/sysvar.makefile   2010-10-26 14:43:27.000000000 +0300
43 --- ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/Build/sysvar.makefile  2010-09-10 16:35:13.000000000 +0300
44 ***************
45 *** 305,312 ****
46               TARGET_CPU_X86=1
47               endif
48         else
49 !            TARGET_CPU_ARM=1
50 !         TARGET_CPU_X86=0
51         endif
52       endif
53      endif
54 --- 305,312 ----
55               TARGET_CPU_X86=1
56               endif
57         else
58 !            TARGET_CPU_ARM=0
59 !         TARGET_CPU_X86=1
60         endif
61       endif
62      endif
63 diff -rc ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Com/vp_com.h ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Com/vp_com.h
64 *** ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Com/vp_com.h 2010-08-03 11:39:45.000000000 +0300
65 --- ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Com/vp_com.h        2010-10-25 14:36:13.000000000 +0300
66 ***************
67 *** 143,149 ****
68     char        passkey[VP_COM_MAX_PINCODE_SIZE];             /// passkey to use for futur connection
69   } vp_com_bluetooth_config_t;
70   
71 ! #if defined(__LINUX__) || defined(__ELINUX__)
72   typedef struct _vp_com_serial_config_t
73   {
74     char              itfName[VP_COM_NAME_MAXSIZE];           /// /dev/ser0, /dev/ttyS0, /dev/ttyUSB0, etc.
75 --- 143,149 ----
76     char        passkey[VP_COM_MAX_PINCODE_SIZE];             /// passkey to use for futur connection
77   } vp_com_bluetooth_config_t;
78   
79 ! #if defined(__LINUX__) || defined(__ELINUX__) || defined(__linux__)
80   typedef struct _vp_com_serial_config_t
81   {
82     char              itfName[VP_COM_NAME_MAXSIZE];           /// /dev/ser0, /dev/ttyS0, /dev/ttyUSB0, etc.
83 diff -rc ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Stages/vp_stages_yuv2rgb.c ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Stages/vp_stages_yuv2rgb.c
84 *** ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Stages/vp_stages_yuv2rgb.c   2010-12-03 18:19:05.000000000 +0200
85 --- ar-drone/ARDrone_SDK_1_5_Version_20101004//ARDroneLib/VP_SDK/VP_Stages/vp_stages_yuv2rgb.c  2010-07-21 19:39:19.000000000 +0300
86 ***************
87 *** 107,115 ****
88   #ifndef QCIF_TO_QVGA
89   /** YUV to RGB conversion functions
90    */
91 !   void vp_stages_YUV420P_to_RGB565(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes);
92 !   void vp_stages_YUV420P_to_RGB24(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes);
93 !   void vp_stages_YUV420P_to_ARGB32(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes);
94   #else // ! QCIF_TO_QVGA
95   /** YUV to RGB conversion + resizing
96    */
97 --- 107,115 ----
98   #ifndef QCIF_TO_QVGA
99   /** YUV to RGB conversion functions
100    */
101 !   static void vp_stages_YUV420P_to_RGB565(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes);
102 !   static void vp_stages_YUV420P_to_RGB24(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes);
103 !   static void vp_stages_YUV420P_to_ARGB32(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes);
104   #else // ! QCIF_TO_QVGA
105   /** YUV to RGB conversion + resizing
106    */
107 ***************
108 *** 124,131 ****
109   
110   
111   #ifndef QCIF_TO_QVGA
112
113 ! void vp_stages_YUV420P_to_RGB565(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes)
114   {
115     uint32_t  w, width;
116     uint32_t  h, height;
117 --- 124,130 ----
118   
119   
120   #ifndef QCIF_TO_QVGA
121 ! static void vp_stages_YUV420P_to_RGB565(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes)
122   {
123     uint32_t  w, width;
124     uint32_t  h, height;
125 ***************
126 *** 193,199 ****
127   
128   
129   #ifndef QCIF_TO_QVGA
130 ! void vp_stages_YUV420P_to_RGB24(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes)
131   {
132     uint32_t width, height;
133     int32_t line, col, linewidth;
134 --- 192,198 ----
135   
136   
137   #ifndef QCIF_TO_QVGA
138 ! static void vp_stages_YUV420P_to_RGB24(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes)
139   {
140     uint32_t width, height;
141     int32_t line, col, linewidth;
142 ***************
143 *** 311,317 ****
144   
145   
146   #ifndef QCIF_TO_QVGA
147 ! void vp_stages_YUV420P_to_ARGB32(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes)
148   {
149     uint32_t width, height;
150     int32_t line, col, linewidth;
151 --- 310,316 ----
152   
153   
154   #ifndef QCIF_TO_QVGA
155 ! static void vp_stages_YUV420P_to_ARGB32(vp_stages_yuv2rgb_config_t *cfg, vp_api_picture_t *picture, uint8_t *dst, uint32_t dst_rbytes)
156   {
157     uint32_t width, height;
158     int32_t line, col, linewidth;