Skip to content

Commit 2ab9ab4

Browse files
committed
Revert "style: format code with clang-format [skip ci]"
This reverts commit 00bdc9e.
1 parent 00bdc9e commit 2ab9ab4

1 file changed

Lines changed: 27 additions & 26 deletions

File tree

components/drivers/ipc/pipe.c

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#define RT_UNAMED_PIPE_NUMBER 64
3232
#endif
3333

34-
#define BITS(x) _BITS(x)
34+
#define BITS(x) _BITS(x)
3535
#define _BITS(x) (sizeof(#x) - 1)
3636

3737
struct check_rt_unamed_pipe_number
@@ -142,7 +142,7 @@ static int pipe_fops_close(struct dfs_file *fd)
142142
pipe->writer -= 1;
143143
while (!rt_list_isempty(&pipe->reader_queue.waiting_list))
144144
{
145-
rt_wqueue_wakeup(&pipe->reader_queue, (void *)POLLIN);
145+
rt_wqueue_wakeup(&pipe->reader_queue, (void*)POLLIN);
146146
}
147147
}
148148

@@ -198,15 +198,15 @@ static int pipe_fops_ioctl(struct dfs_file *fd, int cmd, void *args)
198198
ret = -EINVAL;
199199
break;
200200
}
201-
*((int *)args) = rt_ringbuffer_data_len(pipe->fifo);
201+
*((int*)args) = rt_ringbuffer_data_len(pipe->fifo);
202202
break;
203203
case FIONWRITE:
204204
if (args == RT_NULL)
205205
{
206206
ret = -EINVAL;
207207
break;
208208
}
209-
*((int *)args) = rt_ringbuffer_space_len(pipe->fifo);
209+
*((int*)args) = rt_ringbuffer_space_len(pipe->fifo);
210210
break;
211211
default:
212212
ret = -EINVAL;
@@ -260,15 +260,15 @@ static ssize_t pipe_fops_read(struct dfs_file *fd, void *buf, size_t count)
260260
}
261261

262262
rt_mutex_release(&pipe->lock);
263-
rt_wqueue_wakeup(&pipe->writer_queue, (void *)POLLOUT);
263+
rt_wqueue_wakeup(&pipe->writer_queue, (void*)POLLOUT);
264264
if (rt_wqueue_wait_interruptible(&pipe->reader_queue, 0, -1) == -RT_EINTR)
265265
return -EINTR;
266266
rt_mutex_take(&pipe->lock, RT_WAITING_FOREVER);
267267
}
268268
}
269269

270270
/* wakeup writer */
271-
rt_wqueue_wakeup(&pipe->writer_queue, (void *)POLLOUT);
271+
rt_wqueue_wakeup(&pipe->writer_queue, (void*)POLLOUT);
272272

273273
out:
274274
rt_mutex_release(&pipe->lock);
@@ -307,13 +307,13 @@ static ssize_t pipe_fops_write(struct dfs_file *fd, const void *buf, size_t coun
307307
return 0;
308308
}
309309

310-
pbuf = (uint8_t *)buf;
310+
pbuf = (uint8_t*)buf;
311311
rt_mutex_take(&pipe->lock, -1);
312312

313313
while (1)
314314
{
315315
len = rt_ringbuffer_put(pipe->fifo, pbuf, count - ret);
316-
ret += len;
316+
ret += len;
317317
pbuf += len;
318318
wakeup = 1;
319319

@@ -335,7 +335,7 @@ static ssize_t pipe_fops_write(struct dfs_file *fd, const void *buf, size_t coun
335335
}
336336

337337
rt_mutex_release(&pipe->lock);
338-
rt_wqueue_wakeup(&pipe->reader_queue, (void *)POLLIN);
338+
rt_wqueue_wakeup(&pipe->reader_queue, (void*)POLLIN);
339339
/* pipe full, waiting on suspended write list */
340340
if (rt_wqueue_wait_interruptible(&pipe->writer_queue, 0, -1) == -RT_EINTR)
341341
return -EINTR;
@@ -345,7 +345,7 @@ static ssize_t pipe_fops_write(struct dfs_file *fd, const void *buf, size_t coun
345345

346346
if (wakeup)
347347
{
348-
rt_wqueue_wakeup(&pipe->reader_queue, (void *)POLLIN);
348+
rt_wqueue_wakeup(&pipe->reader_queue, (void*)POLLIN);
349349
}
350350

351351
return ret;
@@ -410,13 +410,14 @@ static int pipe_fops_poll(struct dfs_file *fd, rt_pollreq_t *req)
410410
return mask;
411411
}
412412

413-
static const struct dfs_file_ops pipe_fops = {
414-
.open = pipe_fops_open,
413+
static const struct dfs_file_ops pipe_fops =
414+
{
415+
.open = pipe_fops_open,
415416
.close = pipe_fops_close,
416417
.ioctl = pipe_fops_ioctl,
417-
.read = pipe_fops_read,
418+
.read = pipe_fops_read,
418419
.write = pipe_fops_write,
419-
.poll = pipe_fops_poll,
420+
.poll = pipe_fops_poll,
420421
};
421422
#endif /* defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_POSIX_PIPE) */
422423

@@ -517,7 +518,7 @@ rt_ssize_t rt_pipe_read(rt_device_t device, rt_off_t pos, void *buffer, rt_size_
517518
return 0;
518519
}
519520

520-
pbuf = (uint8_t *)buffer;
521+
pbuf = (uint8_t*)buffer;
521522
rt_mutex_take(&pipe->lock, RT_WAITING_FOREVER);
522523

523524
while (read_bytes < count)
@@ -565,7 +566,7 @@ rt_ssize_t rt_pipe_write(rt_device_t device, rt_off_t pos, const void *buffer, r
565566
return 0;
566567
}
567568

568-
pbuf = (uint8_t *)buffer;
569+
pbuf = (uint8_t*)buffer;
569570
rt_mutex_take(&pipe->lock, RT_WAITING_FOREVER);
570571

571572
while (write_bytes < count)
@@ -600,7 +601,8 @@ rt_err_t rt_pipe_control(rt_device_t dev, int cmd, void *args)
600601
}
601602

602603
#ifdef RT_USING_DEVICE_OPS
603-
const static struct rt_device_ops pipe_ops = {
604+
const static struct rt_device_ops pipe_ops =
605+
{
604606
RT_NULL,
605607
rt_pipe_open,
606608
rt_pipe_close,
@@ -636,8 +638,7 @@ rt_pipe_t *rt_pipe_create(const char *name, int bufsz)
636638
return RT_NULL;
637639
}
638640
pipe = (rt_pipe_t *)rt_malloc(sizeof(rt_pipe_t));
639-
if (pipe == RT_NULL)
640-
return RT_NULL;
641+
if (pipe == RT_NULL) return RT_NULL;
641642

642643
rt_memset(pipe, 0, sizeof(rt_pipe_t));
643644
pipe->is_named = RT_TRUE; /* initialize as a named pipe */
@@ -657,14 +658,14 @@ rt_pipe_t *rt_pipe_create(const char *name, int bufsz)
657658
dev = &pipe->parent;
658659
dev->type = RT_Device_Class_Pipe;
659660
#ifdef RT_USING_DEVICE_OPS
660-
dev->ops = &pipe_ops;
661+
dev->ops = &pipe_ops;
661662
#else
662-
dev->init = RT_NULL;
663-
dev->open = rt_pipe_open;
664-
dev->read = rt_pipe_read;
665-
dev->write = rt_pipe_write;
666-
dev->close = rt_pipe_close;
667-
dev->control = rt_pipe_control;
663+
dev->init = RT_NULL;
664+
dev->open = rt_pipe_open;
665+
dev->read = rt_pipe_read;
666+
dev->write = rt_pipe_write;
667+
dev->close = rt_pipe_close;
668+
dev->control = rt_pipe_control;
668669
#endif
669670

670671
dev->rx_indicate = RT_NULL;

0 commit comments

Comments
 (0)