mirror
/
cariboulabs-cariboulite
kopia lustrzana https://github.com/cariboulabs/cariboulite
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Revert "moved buffers initialization" 

This reverts commit baccfb4805.
pull/192/head
matteo serva 2024-03-13 21:41:38 +01:00
rodzic 26fe48f53d
commit 4577e41b61
1 zmienionych plików z 22 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

56
driver/smi_stream_dev.c
Wyświetl plik

@ -762,8 +762,17 @@ void transfer_thread_stop(struct bcm2835_smi_dev_instance *inst)
*
***************************************************************************/
static int smi_stream_init_buffers(struct bcm2835_smi_dev_instance *inst)
static int smi_stream_open(struct inode *inode, struct file *file)
{
int dev = iminor(inode);
dev_dbg(inst->dev, "SMI device opened.");
if (dev != DEVICE_MINOR)
{
dev_err(inst->dev, "smi_stream_open: Unknown minor device: %d", dev); // error here
return -ENXIO;
}
// preinit the thread handlers to NULL
inst->reader_thread = NULL;
@ -790,36 +799,6 @@ static int smi_stream_init_buffers(struct bcm2835_smi_dev_instance *inst)
kfifo_init(&inst->rx_fifo, inst->rx_fifo_buffer, fifo_mtu_multiplier * DMA_BOUNCE_BUFFER_SIZE);
kfifo_init(&inst->tx_fifo, inst->tx_fifo_buffer, fifo_mtu_multiplier * DMA_BOUNCE_BUFFER_SIZE);
return 0;
}
static void smi_stream_clear_buffers(struct bcm2835_smi_dev_instance *inst)
{
if (inst->reader_thread != NULL) kthread_stop(inst->reader_thread);
if (inst->writer_thread != NULL) kthread_stop(inst->writer_thread);
if (inst->rx_fifo_buffer) vfree(inst->rx_fifo_buffer);
if (inst->tx_fifo_buffer) vfree(inst->tx_fifo_buffer);
inst->rx_fifo_buffer = NULL;
inst->tx_fifo_buffer = NULL;
inst->reader_thread = NULL;
inst->writer_thread = NULL;
}
static int smi_stream_open(struct inode *inode, struct file *file)
{
int dev = iminor(inode);
dev_dbg(inst->dev, "SMI device opened.");
if (dev != DEVICE_MINOR)
{
dev_err(inst->dev, "smi_stream_open: Unknown minor device: %d", dev); // error here
return -ENXIO;
}
smi_stream_init_buffers(inst);
// when file is being openned, stream state is still idle
set_state(smi_stream_idle);
@ -844,9 +823,18 @@ static int smi_stream_release(struct inode *inode, struct file *file)
// make sure stream is idle
set_state(smi_stream_idle);
smi_stream_clear_buffers(inst);
inst->address_changed = 0;
if (inst->reader_thread != NULL) kthread_stop(inst->reader_thread);
if (inst->writer_thread != NULL) kthread_stop(inst->writer_thread);
if (inst->rx_fifo_buffer) vfree(inst->rx_fifo_buffer);
if (inst->tx_fifo_buffer) vfree(inst->tx_fifo_buffer);
inst->rx_fifo_buffer = NULL;
inst->tx_fifo_buffer = NULL;
inst->reader_thread = NULL;
inst->writer_thread = NULL;
inst->address_changed = 0;
return 0;
}