execute all pending write queues, cancel all write queues

This commit is contained in:
matthias.ringwald@gmail.com 2014-01-26 21:52:25 +00:00
parent 6084a48958
commit 323258aebc

View File

@ -289,13 +289,13 @@ static uint16_t att_read_callback(uint16_t handle, uint16_t offset, uint8_t * bu
// write requests // write requests
static int att_write_callback(uint16_t handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size, signature_t * signature){ static int att_write_callback(uint16_t handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size, signature_t * signature){
printf("WRITE Callback, handle %04x\n", handle); printf("WRITE Callback, handle %04x, mode %u, offset %u\n", handle, transaction_mode, offset);
switch(handle){ switch(handle){
case 0x0012: case 0x0013:
case 0x0015: case 0x0018:
case 0x002a: case 0x0037:
case 0x002d: case 0x003c:
client_configuration = buffer[0]; client_configuration = buffer[0];
client_configuration_handle = handle; client_configuration_handle = handle;
printf("Client Configuration set to %u for handle %04x\n", client_configuration, handle); printf("Client Configuration set to %u for handle %04x\n", client_configuration, handle);
@ -317,32 +317,30 @@ static int att_write_callback(uint16_t handle, uint16_t transaction_mode, uint16
} }
att_attributes[attributes_index].len = buffer_size; att_attributes[attributes_index].len = buffer_size;
memcpy(att_attributes[attributes_index].value, buffer, buffer_size); memcpy(att_attributes[attributes_index].value, buffer, buffer_size);
printf("Index %u\n", attributes_index);
break; break;
case ATT_TRANSACTION_MODE_ACTIVE: case ATT_TRANSACTION_MODE_ACTIVE:
writes_index = att_write_queue_for_handle(handle); writes_index = att_write_queue_for_handle(handle);
if (writes_index < 0) return 0; if (writes_index < 0) return 0;
if (buffer_size + offset > ATT_VALUE_MAX_LEN) return 0; if (buffer_size + offset > ATT_VALUE_MAX_LEN) return 0;
att_write_queues[writes_index].len = buffer_size + offset; att_write_queues[writes_index].len = buffer_size + offset;
memcpy(&att_write_queues[writes_index].value[offset], buffer, buffer_size); memcpy(&(att_write_queues[writes_index].value[offset]), buffer, buffer_size);
break; break;
case ATT_TRANSACTION_MODE_EXECUTE: case ATT_TRANSACTION_MODE_EXECUTE:
writes_index = att_write_queue_for_handle(handle); for (writes_index=0;writes_index<ATT_NUM_WRITE_QUEUES;writes_index++){
if (writes_index < 0) return 0; handle = att_write_queues[writes_index].handle;
attributes_index = att_attribute_for_handle(handle); if (handle == 0) continue;
if (attributes_index < 0){ attributes_index = att_attribute_for_handle(handle);
attributes_index = att_attribute_for_handle(0); if (attributes_index < 0){
if (attributes_index < 0) return 0; // fail attributes_index = att_attribute_for_handle(0);
att_attributes[attributes_index].handle = handle; if (attributes_index < 0) return 0; // fail
att_attributes[attributes_index].handle = handle;
}
att_attributes[attributes_index].len = att_write_queues[writes_index].len;
memcpy(att_attributes[attributes_index].value, att_write_queues[writes_index].value, att_write_queues[writes_index].len);
} }
att_attributes[attributes_index].len = att_write_queues[writes_index].len;
memcpy(att_attributes[attributes_index].value, att_write_queues[writes_index].value, att_write_queues[writes_index].len);
printf("Index %u\n", attributes_index);
break; break;
case ATT_TRANSACTION_MODE_CANCEL: case ATT_TRANSACTION_MODE_CANCEL:
writes_index = att_write_queue_for_handle(handle); att_write_queue_init();
if (writes_index < 0) return 0;
att_write_queues[writes_index].handle = 0;
break; break;
} }
return 1; return 1;