@@ -145,62 +145,57 @@ static int siwx91x_gpdma_desc_config(struct siwx19x_gpdma_data *data,
145145 const RSI_GPDMA_DESC_T * xfer_cfg , uint32_t channel )
146146{
147147 int operation_width = config -> source_data_size * config -> source_burst_length ;
148- const struct dma_block_config * block_addr = config -> head_block ;
149- RSI_GPDMA_DESC_T * cur_desc = NULL ;
150- RSI_GPDMA_DESC_T * prev_desc = NULL ;
148+ const struct dma_block_config * block = config -> head_block ;
149+ RSI_GPDMA_DESC_T * desc , * prev = NULL ;
151150 k_spinlock_key_t key ;
152151 int ret ;
153152
154153 for (int i = 0 ; i < config -> block_count ; i ++ ) {
155- if (!IS_ALIGNED (block_addr -> source_address , config -> source_burst_length ) ||
156- !IS_ALIGNED (block_addr -> dest_address , config -> dest_burst_length ) ||
157- !IS_ALIGNED (block_addr -> block_size , operation_width )) {
154+ if (!IS_ALIGNED (block -> source_address , config -> source_burst_length ) ||
155+ !IS_ALIGNED (block -> dest_address , config -> dest_burst_length ) ||
156+ !IS_ALIGNED (block -> block_size , operation_width )) {
158157 LOG_ERR ("Buffer not aligned" );
159158 goto free_desc ;
160159 }
161- if (block_addr -> block_size >= GPDMA_DESC_MAX_TRANSFER_SIZE ) {
162- LOG_ERR ("Buffer too large (%d bytes)" , block_addr -> block_size );
160+ if (block -> block_size >= GPDMA_DESC_MAX_TRANSFER_SIZE ) {
161+ LOG_ERR ("Buffer too large (%d bytes)" , block -> block_size );
163162 goto free_desc ;
164163 }
165164
166165 key = k_spin_lock (& data -> desc_pool_lock );
167- ret = sys_mem_blocks_alloc (data -> desc_pool , 1 , (void * * )& cur_desc );
166+ ret = sys_mem_blocks_alloc (data -> desc_pool , 1 , (void * * )& desc );
168167 k_spin_unlock (& data -> desc_pool_lock , key );
169168 if (ret ) {
170169 goto free_desc ;
171170 }
172171
173- memset (cur_desc , 0 , 32 );
174-
172+ memset (desc , 0 , 32 );
175173 ret = RSI_GPDMA_BuildDescriptors (& data -> hal_ctx , (RSI_GPDMA_DESC_T * )xfer_cfg ,
176- cur_desc , NULL );
174+ desc , NULL );
177175 if (ret ) {
178176 goto free_desc ;
179177 }
180-
181- cur_desc -> src = (void * )block_addr -> source_address ;
182- cur_desc -> dest = (void * )block_addr -> dest_address ;
183- cur_desc -> chnlCtrlConfig .transSize = block_addr -> block_size ;
184-
185- if (block_addr -> dest_addr_adj == DMA_ADDR_ADJ_NO_CHANGE ) {
186- cur_desc -> chnlCtrlConfig .dstFifoMode = 1 ;
178+ desc -> src = (void * )block -> source_address ;
179+ desc -> dest = (void * )block -> dest_address ;
180+ desc -> chnlCtrlConfig .transSize = block -> block_size ;
181+ if (block -> dest_addr_adj == DMA_ADDR_ADJ_NO_CHANGE ) {
182+ desc -> chnlCtrlConfig .dstFifoMode = 1 ;
187183 }
188-
189- if (block_addr -> source_addr_adj == DMA_ADDR_ADJ_NO_CHANGE ) {
190- cur_desc -> chnlCtrlConfig .srcFifoMode = 1 ;
184+ if (block -> source_addr_adj == DMA_ADDR_ADJ_NO_CHANGE ) {
185+ desc -> chnlCtrlConfig .srcFifoMode = 1 ;
191186 }
192187
193188
194- if (prev_desc ) {
195- prev_desc -> pNextLink = (void * )cur_desc ;
189+ if (prev ) {
190+ prev -> pNextLink = (void * )desc ;
196191 } else {
197- data -> chan_info [channel ].desc = cur_desc ;
192+ data -> chan_info [channel ].desc = desc ;
198193 }
199- prev_desc = cur_desc ;
200- block_addr = block_addr -> next_block ;
194+ prev = desc ;
195+ block = block -> next_block ;
201196 }
202197
203- if (block_addr != NULL ) {
198+ if (block != NULL ) {
204199 /* next_block address for last block must be null */
205200 goto free_desc ;
206201 }
0 commit comments