From ef2bbe4eba3f83f224ce77c1d3835b5bb2ea42e5 Mon Sep 17 00:00:00 2001 From: Gedare Bloom Date: Wed, 4 Feb 2026 12:08:12 -0700 Subject: [PATCH] cpukit/libmisc: reformat devnull Fixes #5463. --- cpukit/include/rtems/devnull.h | 8 ++++++-- cpukit/include/rtems/devzero.h | 26 ++++++++++++-------------- cpukit/libmisc/devnull/devnull.c | 28 +++++++++++++--------------- cpukit/libmisc/devnull/devzero.c | 18 +++++++++--------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/cpukit/include/rtems/devnull.h b/cpukit/include/rtems/devnull.h index a6c20b9da3..0233e8fc68 100644 --- a/cpukit/include/rtems/devnull.h +++ b/cpukit/include/rtems/devnull.h @@ -54,8 +54,12 @@ extern "C" { #endif #define DEVNULL_DRIVER_TABLE_ENTRY \ - { null_initialize, null_open, null_close, null_read, \ - null_write, null_control } + { null_initialize, \ + null_open, \ + null_close, \ + null_read, \ + null_write, \ + null_control } #define NULL_SUCCESSFUL RTEMS_SUCCESSFUL diff --git a/cpukit/include/rtems/devzero.h b/cpukit/include/rtems/devzero.h index 734b02ef52..a025e24095 100644 --- a/cpukit/include/rtems/devzero.h +++ b/cpukit/include/rtems/devzero.h @@ -53,49 +53,47 @@ extern "C" { #define DEVZERO_DEVICE_NAME "/dev/zero" #define DEVZERO_DRIVER_TABLE_ENTRY \ - { \ - dev_zero_initialize, \ - dev_zero_open, \ - dev_zero_close, \ - dev_zero_read, \ - dev_zero_write, \ - dev_zero_control \ - } + { dev_zero_initialize, \ + dev_zero_open, \ + dev_zero_close, \ + dev_zero_read, \ + dev_zero_write, \ + dev_zero_control } rtems_device_driver dev_zero_initialize( rtems_device_major_number major, rtems_device_minor_number minor, - void *arg + void *arg ); rtems_device_driver dev_zero_open( rtems_device_major_number major, rtems_device_minor_number minor, - void *arg + void *arg ); rtems_device_driver dev_zero_close( rtems_device_major_number major, rtems_device_minor_number minor, - void *arg + void *arg ); rtems_device_driver dev_zero_read( rtems_device_major_number major, rtems_device_minor_number minor, - void *arg + void *arg ); rtems_device_driver dev_zero_write( rtems_device_major_number major, rtems_device_minor_number minor, - void *arg + void *arg ); rtems_device_driver dev_zero_control( rtems_device_major_number major, rtems_device_minor_number minor, - void *arg + void *arg ); #ifdef __cplusplus diff --git a/cpukit/libmisc/devnull/devnull.c b/cpukit/libmisc/devnull/devnull.c index 4729c8d7b1..f8e3cbb852 100644 --- a/cpukit/libmisc/devnull/devnull.c +++ b/cpukit/libmisc/devnull/devnull.c @@ -42,13 +42,13 @@ * rval - NULL_SUCCESSFUL */ -uint32_t NULL_major; +uint32_t NULL_major; static char initialized; rtems_device_driver null_initialize( - rtems_device_major_number major, + rtems_device_major_number major, rtems_device_minor_number minor RTEMS_UNUSED, - void *pargp RTEMS_UNUSED + void *pargp RTEMS_UNUSED ) { rtems_device_driver status; @@ -62,8 +62,9 @@ rtems_device_driver null_initialize( (rtems_device_minor_number) 0 ); - if (status != RTEMS_SUCCESSFUL) - rtems_fatal_error_occurred(status); + if ( status != RTEMS_SUCCESSFUL ) { + rtems_fatal_error_occurred( status ); + } NULL_major = major; } @@ -87,13 +88,12 @@ rtems_device_driver null_initialize( rtems_device_driver null_open( rtems_device_major_number major RTEMS_UNUSED, rtems_device_minor_number minor RTEMS_UNUSED, - void *pargp RTEMS_UNUSED + void *pargp RTEMS_UNUSED ) { return NULL_SUCCESSFUL; } - /* null_close * * This routine is the null device driver close routine. @@ -110,13 +110,12 @@ rtems_device_driver null_open( rtems_device_driver null_close( rtems_device_major_number major RTEMS_UNUSED, rtems_device_minor_number minor RTEMS_UNUSED, - void *pargp RTEMS_UNUSED + void *pargp RTEMS_UNUSED ) { return NULL_SUCCESSFUL; } - /* null_read * * This routine is the null device driver read routine. @@ -133,13 +132,12 @@ rtems_device_driver null_close( rtems_device_driver null_read( rtems_device_major_number major RTEMS_UNUSED, rtems_device_minor_number minor RTEMS_UNUSED, - void *pargp RTEMS_UNUSED + void *pargp RTEMS_UNUSED ) { return NULL_SUCCESSFUL; } - /* null_write * * This routine is the null device driver write routine. @@ -156,18 +154,18 @@ rtems_device_driver null_read( rtems_device_driver null_write( rtems_device_major_number major RTEMS_UNUSED, rtems_device_minor_number minor RTEMS_UNUSED, - void *pargp + void *pargp ) { rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *) pargp; - if ( rw_args ) + if ( rw_args ) { rw_args->bytes_moved = rw_args->count; + } return NULL_SUCCESSFUL; } - /* null_control * * This routine is the null device driver control routine. @@ -184,7 +182,7 @@ rtems_device_driver null_write( rtems_device_driver null_control( rtems_device_major_number major RTEMS_UNUSED, rtems_device_minor_number minor RTEMS_UNUSED, - void *pargp RTEMS_UNUSED + void *pargp RTEMS_UNUSED ) { return NULL_SUCCESSFUL; diff --git a/cpukit/libmisc/devnull/devzero.c b/cpukit/libmisc/devnull/devzero.c index 5be370b991..7186c13282 100644 --- a/cpukit/libmisc/devnull/devzero.c +++ b/cpukit/libmisc/devnull/devzero.c @@ -44,18 +44,18 @@ #include rtems_device_driver dev_zero_initialize( - rtems_device_major_number major, + rtems_device_major_number major, rtems_device_minor_number minor RTEMS_UNUSED, - void *arg RTEMS_UNUSED + void *arg RTEMS_UNUSED ) { - return rtems_io_register_name(DEVZERO_DEVICE_NAME, major, 0); + return rtems_io_register_name( DEVZERO_DEVICE_NAME, major, 0 ); } rtems_device_driver dev_zero_open( rtems_device_major_number major RTEMS_UNUSED, rtems_device_minor_number minor RTEMS_UNUSED, - void *arg RTEMS_UNUSED + void *arg RTEMS_UNUSED ) { return RTEMS_SUCCESSFUL; @@ -64,7 +64,7 @@ rtems_device_driver dev_zero_open( rtems_device_driver dev_zero_close( rtems_device_major_number major RTEMS_UNUSED, rtems_device_minor_number minor RTEMS_UNUSED, - void *arg RTEMS_UNUSED + void *arg RTEMS_UNUSED ) { return RTEMS_SUCCESSFUL; @@ -73,13 +73,13 @@ rtems_device_driver dev_zero_close( rtems_device_driver dev_zero_read( rtems_device_major_number major RTEMS_UNUSED, rtems_device_minor_number minor RTEMS_UNUSED, - void *arg RTEMS_UNUSED + void *arg RTEMS_UNUSED ) { rtems_libio_rw_args_t *rw = arg; rw->bytes_moved = rw->count; - memset(rw->buffer, 0, rw->count); + memset( rw->buffer, 0, rw->count ); return RTEMS_SUCCESSFUL; } @@ -87,7 +87,7 @@ rtems_device_driver dev_zero_read( rtems_device_driver dev_zero_write( rtems_device_major_number major RTEMS_UNUSED, rtems_device_minor_number minor RTEMS_UNUSED, - void *arg + void *arg ) { rtems_libio_rw_args_t *rw = arg; @@ -100,7 +100,7 @@ rtems_device_driver dev_zero_write( rtems_device_driver dev_zero_control( rtems_device_major_number major RTEMS_UNUSED, rtems_device_minor_number minor RTEMS_UNUSED, - void *arg RTEMS_UNUSED + void *arg RTEMS_UNUSED ) { return RTEMS_IO_ERROR;