removed cast for btstack_memory_X_get calls

This commit is contained in:
matthias.ringwald@gmail.com 2014-09-04 20:35:14 +00:00
parent 5b04e01774
commit bb69aaaeef
4 changed files with 10 additions and 10 deletions

View File

@ -94,7 +94,7 @@ static uint8_t disable_l2cap_timeouts = 0;
static hci_connection_t * create_connection_for_bd_addr_and_type(bd_addr_t addr, bd_addr_type_t addr_type){
log_info("create_connection_for_addr %s", bd_addr_to_str(addr));
hci_connection_t * conn = (hci_connection_t *) btstack_memory_hci_connection_get();
hci_connection_t * conn = btstack_memory_hci_connection_get();
if (!conn) return NULL;
BD_ADDR_COPY(conn->address, addr);
conn->address_type = addr_type;

View File

@ -730,7 +730,7 @@ void l2cap_create_channel_internal(void * connection, btstack_packet_handler_t p
log_info("L2CAP_CREATE_CHANNEL_MTU addr %s psm 0x%x mtu %u", bd_addr_to_str(address), psm, mtu);
// alloc structure
l2cap_channel_t * chan = (l2cap_channel_t*) btstack_memory_l2cap_channel_get();
l2cap_channel_t * chan = btstack_memory_l2cap_channel_get();
if (!chan) {
// emit error event
l2cap_channel_t dummy_channel;
@ -1027,7 +1027,7 @@ static void l2cap_handle_connection_request(hci_con_handle_t handle, uint8_t sig
// alloc structure
// log_info("l2cap_handle_connection_request register channel");
l2cap_channel_t * channel = (l2cap_channel_t*) btstack_memory_l2cap_channel_get();
l2cap_channel_t * channel = btstack_memory_l2cap_channel_get();
if (!channel){
// 0x0004 No resources available
l2cap_register_signaling_response(handle, CONNECTION_REQUEST, sig_id, 0x0004);
@ -1448,7 +1448,7 @@ void l2cap_register_service_internal(void *connection, btstack_packet_handler_t
// alloc structure
// TODO: emit error event
service = (l2cap_service_t *) btstack_memory_l2cap_service_get();
service = btstack_memory_l2cap_service_get();
if (!service) {
log_error("l2cap_register_service_internal: no memory for l2cap_service_t");
l2cap_emit_service_registered(connection, BTSTACK_MEMORY_ALLOC_FAILED, psm);

View File

@ -114,7 +114,7 @@ static void put_link_key(bd_addr_t *bd_addr, link_key_t *link_key, link_key_type
}
// Record not found, create new one for this device
db_mem_device_link_key_t * newItem = (db_mem_device_link_key_t*) btstack_memory_db_mem_device_link_key_get();
db_mem_device_link_key_t * newItem = btstack_memory_db_mem_device_link_key_get();
if (!newItem){
newItem = (db_mem_device_link_key_t*)linked_list_get_last_item(&db_mem_link_keys);
}
@ -145,7 +145,7 @@ static void put_name(bd_addr_t *bd_addr, device_name_t *device_name){
}
// Record not found, create a new one for this device
db_mem_device_name_t * newItem = (db_mem_device_name_t *) btstack_memory_db_mem_device_name_get();
db_mem_device_name_t * newItem = btstack_memory_db_mem_device_name_get();
if (!newItem) {
newItem = (db_mem_device_name_t*)linked_list_get_last_item(&db_mem_names);
};
@ -177,7 +177,7 @@ static uint8_t persistent_rfcomm_channel(char *serviceName){
}
// Allocate new persistant channel
db_mem_service_t * newItem = (db_mem_service_t *) btstack_memory_db_mem_service_get();
db_mem_service_t * newItem = btstack_memory_db_mem_service_get();
if (!newItem) return 0;

View File

@ -324,7 +324,7 @@ static void rfcomm_multiplexer_initialize(rfcomm_multiplexer_t *multiplexer){
static rfcomm_multiplexer_t * rfcomm_multiplexer_create_for_addr(bd_addr_t *addr){
// alloc structure
rfcomm_multiplexer_t * multiplexer = (rfcomm_multiplexer_t*) btstack_memory_rfcomm_multiplexer_get();
rfcomm_multiplexer_t * multiplexer = btstack_memory_rfcomm_multiplexer_get();
if (!multiplexer) return NULL;
// fill in
@ -439,7 +439,7 @@ static rfcomm_channel_t * rfcomm_channel_create(rfcomm_multiplexer_t * multiplex
rfcomm_dump_channels();
// alloc structure
rfcomm_channel_t * channel = (rfcomm_channel_t *) btstack_memory_rfcomm_channel_get();
rfcomm_channel_t * channel = btstack_memory_rfcomm_channel_get();
if (!channel) return NULL;
// fill in
@ -2161,7 +2161,7 @@ void rfcomm_register_service2(void * connection, uint8_t channel, uint16_t max_f
}
// alloc structure
service = (rfcomm_service_t*) btstack_memory_rfcomm_service_get();
service = btstack_memory_rfcomm_service_get();
if (!service) {
rfcomm_emit_service_registered(connection, BTSTACK_MEMORY_ALLOC_FAILED, channel);
return;