summaryrefslogtreecommitdiffstats
path: root/src/device_link_service.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/device_link_service.c')
-rw-r--r--src/device_link_service.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/device_link_service.c b/src/device_link_service.c
index b1106fe..e1155a5 100644
--- a/src/device_link_service.c
+++ b/src/device_link_service.c
@@ -149,13 +149,13 @@ device_link_service_error_t device_link_service_version_exchange(device_link_ser
149 149
150 /* receive DLMessageVersionExchange from device */ 150 /* receive DLMessageVersionExchange from device */
151 if (property_list_service_receive_plist(client->parent, &array) != PROPERTY_LIST_SERVICE_E_SUCCESS) { 151 if (property_list_service_receive_plist(client->parent, &array) != PROPERTY_LIST_SERVICE_E_SUCCESS) {
152 log_debug_msg("%s: Did not receive initial message from device!\n", __func__); 152 debug_info("Did not receive initial message from device!");
153 err = DEVICE_LINK_SERVICE_E_MUX_ERROR; 153 err = DEVICE_LINK_SERVICE_E_MUX_ERROR;
154 goto leave; 154 goto leave;
155 } 155 }
156 msg = device_link_service_get_message(array); 156 msg = device_link_service_get_message(array);
157 if (!msg || strcmp(msg, "DLMessageVersionExchange")) { 157 if (!msg || strcmp(msg, "DLMessageVersionExchange")) {
158 log_debug_msg("%s: Did not receive DLMessageVersionExchange from device!\n", __func__); 158 debug_info("Did not receive DLMessageVersionExchange from device!");
159 err = DEVICE_LINK_SERVICE_E_PLIST_ERROR; 159 err = DEVICE_LINK_SERVICE_E_PLIST_ERROR;
160 goto leave; 160 goto leave;
161 } 161 }
@@ -164,7 +164,7 @@ device_link_service_error_t device_link_service_version_exchange(device_link_ser
164 164
165 /* get major and minor version number */ 165 /* get major and minor version number */
166 if (plist_array_get_size(array) < 3) { 166 if (plist_array_get_size(array) < 3) {
167 log_debug_msg("%s: DLMessageVersionExchange has unexpected format!\n", __func__); 167 debug_info("DLMessageVersionExchange has unexpected format!");
168 err = DEVICE_LINK_SERVICE_E_PLIST_ERROR; 168 err = DEVICE_LINK_SERVICE_E_PLIST_ERROR;
169 goto leave; 169 goto leave;
170 } 170 }
@@ -179,11 +179,11 @@ device_link_service_error_t device_link_service_version_exchange(device_link_ser
179 plist_get_uint_val(min, &vminor); 179 plist_get_uint_val(min, &vminor);
180 } 180 }
181 if (vmajor > version_major) { 181 if (vmajor > version_major) {
182 log_debug_msg("%s: Version mismatch: device=(%lld,%lld) > expected=(%lld,%lld)\n", __func__, vmajor, vminor, version_major, version_minor); 182 debug_info("Version mismatch: device=(%lld,%lld) > expected=(%lld,%lld)", vmajor, vminor, version_major, version_minor);
183 err = DEVICE_LINK_SERVICE_E_BAD_VERSION; 183 err = DEVICE_LINK_SERVICE_E_BAD_VERSION;
184 goto leave; 184 goto leave;
185 } else if ((vmajor == version_major) && (vminor > version_minor)) { 185 } else if ((vmajor == version_major) && (vminor > version_minor)) {
186 log_debug_msg("%s: WARNING: Version mismatch: device=(%lld,%lld) > expected=(%lld,%lld)\n", __func__, vmajor, vminor, version_major, version_minor); 186 debug_info("WARNING: Version mismatch: device=(%lld,%lld) > expected=(%lld,%lld)", vmajor, vminor, version_major, version_minor);
187 err = DEVICE_LINK_SERVICE_E_BAD_VERSION; 187 err = DEVICE_LINK_SERVICE_E_BAD_VERSION;
188 goto leave; 188 goto leave;
189 } 189 }
@@ -194,7 +194,7 @@ device_link_service_error_t device_link_service_version_exchange(device_link_ser
194 plist_array_append_item(array, plist_new_string("DLMessageVersionExchange")); 194 plist_array_append_item(array, plist_new_string("DLMessageVersionExchange"));
195 plist_array_append_item(array, plist_new_string("DLVersionsOk")); 195 plist_array_append_item(array, plist_new_string("DLVersionsOk"));
196 if (property_list_service_send_binary_plist(client->parent, array) != PROPERTY_LIST_SERVICE_E_SUCCESS) { 196 if (property_list_service_send_binary_plist(client->parent, array) != PROPERTY_LIST_SERVICE_E_SUCCESS) {
197 log_debug_msg("%s: Error when sending DLVersionsOk", __func__); 197 debug_info("Error when sending DLVersionsOk");
198 err = DEVICE_LINK_SERVICE_E_MUX_ERROR; 198 err = DEVICE_LINK_SERVICE_E_MUX_ERROR;
199 goto leave; 199 goto leave;
200 } 200 }
@@ -203,13 +203,13 @@ device_link_service_error_t device_link_service_version_exchange(device_link_ser
203 /* receive DeviceReady message */ 203 /* receive DeviceReady message */
204 array = NULL; 204 array = NULL;
205 if (property_list_service_receive_plist(client->parent, &array) != PROPERTY_LIST_SERVICE_E_SUCCESS) { 205 if (property_list_service_receive_plist(client->parent, &array) != PROPERTY_LIST_SERVICE_E_SUCCESS) {
206 log_debug_msg("%s: Error when receiving DLMessageDeviceReady!\n", __func__); 206 debug_info("Error when receiving DLMessageDeviceReady!");
207 err = DEVICE_LINK_SERVICE_E_MUX_ERROR; 207 err = DEVICE_LINK_SERVICE_E_MUX_ERROR;
208 goto leave; 208 goto leave;
209 } 209 }
210 msg = device_link_service_get_message(array); 210 msg = device_link_service_get_message(array);
211 if (!msg || strcmp(msg, "DLMessageDeviceReady")) { 211 if (!msg || strcmp(msg, "DLMessageDeviceReady")) {
212 log_debug_msg("%s: Did not get DLMessageDeviceReady!\n", __func__); 212 debug_info("Did not get DLMessageDeviceReady!");
213 err = DEVICE_LINK_SERVICE_E_PLIST_ERROR; 213 err = DEVICE_LINK_SERVICE_E_PLIST_ERROR;
214 goto leave; 214 goto leave;
215 } 215 }