sean-m
/
kendryte-freertos-sdk
mirror of https://github.com/kendryte/kendryte-freertos-sdk.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Delete Debug

pull/60/head
xiangbingj 2019-10-26 14:57:48 +08:00
parent c30f67ee92
commit 61af37d08c
6 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/bsp/device/dmac.cpp Normal file → Executable file
View File

@ -167,12 +167,6 @@ public:
writeq(cfg_u.data, &dma.cfg);
}
virtual void test_async(test_context_t *context) override
{
session_.ctx = context;
session_.ctx->channel = channel_;
}
virtual void transmit_async(const volatile void *src, volatile void *dest, bool src_inc, bool dest_inc, size_t element_size, size_t count, size_t burst_size, SemaphoreHandle_t completion_event) override
{
C_COMMON_ENTRY;
@ -548,8 +542,6 @@ private:
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
driver.session_.ctx->flag ++;
if (driver.session_.is_loop)
{
if (atomic_read(driver.session_.stop_signal))
@ -631,9 +623,7 @@ private:
}
}
#endif
driver.session_.ctx->flag ++;
xSemaphoreGiveFromISR(driver.session_.completion_event, &xHigherPriorityTaskWoken);
driver.session_.ctx->flag ++;
}
if (xHigherPriorityTaskWoken)
@ -687,7 +677,6 @@ private:
int *stop_signal;
};
};
test_context_t *ctx;
} session_;
};

12
lib/bsp/device/spi.cpp
View File

@ -30,7 +30,7 @@
using namespace sys;
#define SPI_TRANSMISSION_THRESHOLD 0x0UL
#define SPI_TRANSMISSION_THRESHOLD 0x800UL
#define SPI_DMA_BLOCK_TIME 1000UL
/* SPI Controller */
@ -512,7 +512,6 @@ private:
SemaphoreHandle_t free_mutex_;
spi_slave_instance_t slave_instance_;
test_context_t context_;
};
/* SPI Device */
@ -702,8 +701,6 @@ int k_spi_driver::read(k_spi_device_driver &device, gsl::span<uint8_t> buffer)
dma_set_request_source(dma_read, dma_req_);
spi_.dmacr = 0x1;
SemaphoreHandle_t event_read = xSemaphoreCreateBinary();
context_.flag = 0;
dma_test_async(dma_read, &context_);
dma_transmit_async(dma_read, &spi_.dr[0], buffer_read, 0, 1, device.buffer_width_, rx_frames, 1, event_read);
const uint8_t *buffer_it = buffer.data();
@ -713,8 +710,6 @@ int k_spi_driver::read(k_spi_device_driver &device, gsl::span<uint8_t> buffer)
configASSERT(pdTRUE == xSemaphoreTake(event_read, SPI_DMA_BLOCK_TIME));
context_.flag = 0;
dma_test_async(dma_read, &context_);
dma_close(dma_read);
vSemaphoreDelete(event_read);
}
@ -781,13 +776,10 @@ int k_spi_driver::write(k_spi_device_driver &device, gsl::span<const uint8_t> bu
write_inst_addr(spi_.dr, &buffer_write, device.addr_width_);
SemaphoreHandle_t event_write = xSemaphoreCreateBinary();
context_.flag = 0;
dma_test_async(dma_write, &context_);
dma_transmit_async(dma_write, buffer_write, &spi_.dr[0], 1, 0, device.buffer_width_, tx_frames, 4, event_write);
spi_.ser = device.chip_select_mask_;
configASSERT(pdTRUE == xSemaphoreTake(event_write, SPI_DMA_BLOCK_TIME));
context_.flag = 0;
dma_test_async(dma_write, &context_);
dma_close(dma_write);
vSemaphoreDelete(event_write);
}

1
lib/freertos/include/hal.h Normal file → Executable file
View File

@ -87,7 +87,6 @@ void dma_set_request_source(handle_t file, uint32_t request);
* @param[in] completion_event Event to signal when this transmition is completed
*/
void dma_transmit_async(handle_t file, const volatile void *src, volatile void *dest, bool src_inc, bool dest_inc, size_t element_size, size_t count, size_t burst_size, SemaphoreHandle_t completion_event);
void dma_test_async(handle_t file, test_context_t *context);
/**
* @brief DMA synchrnonously

1
lib/freertos/include/kernel/driver.hpp Normal file → Executable file
View File

@ -383,7 +383,6 @@ class dma_driver : public driver
public:
virtual void set_select_request(uint32_t request) = 0;
virtual void config(uint32_t priority) = 0;
virtual void test_async(test_context_t *context) = 0;
virtual void transmit_async(const volatile void *src, volatile void *dest, bool src_inc, bool dest_inc, size_t element_size, size_t count, size_t burst_size, SemaphoreHandle_t completion_event) = 0;
virtual void loop_async(const volatile void **srcs, size_t src_num, volatile void **dests, size_t dest_num, bool src_inc, bool dest_inc, size_t element_size, size_t count, size_t burst_size, dma_stage_completion_handler_t stage_completion_handler, void *stage_completion_handler_data, SemaphoreHandle_t completion_event, int *stop_signal) = 0;
};

6
lib/freertos/include/osdefs.h Normal file → Executable file
View File

@ -224,12 +224,6 @@ typedef struct _cbc_context
uint8_t *iv;
} cbc_context_t;
typedef struct _test_context_t
{
uint32_t flag;
uint32_t channel;
} test_context_t;
typedef void(*timer_on_tick_t)(void* userdata);
typedef enum _wdt_response_mode

6
lib/freertos/kernel/devices.cpp Normal file → Executable file
View File

@ -937,12 +937,6 @@ void dma_transmit_async(handle_t file, const volatile void *src, volatile void *
dma->transmit_async(src, dest, src_inc, dest_inc, element_size, count, burst_size, completion_event);
}
void dma_test_async(handle_t file, test_context_t *context)
{
COMMON_ENTRY(dma);
dma->test_async(context);
}
void dma_transmit(handle_t file, const volatile void *src, volatile void *dest, bool src_inc, bool dest_inc, size_t element_size, size_t count, size_t burst_size)
{
SemaphoreHandle_t event = xSemaphoreCreateBinary();