diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-12-31 10:56:05 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-01-27 06:54:22 +0100 |
| commit | cf36b70e8dd8755e7dac6eb516169f586e78566d (patch) | |
| tree | 97200818ec5dfeaa4e137a572fcbb4db746842b1 /cpukit/dev/i2c | |
| parent | user/conf.t: Fix typo (diff) | |
| download | rtems-cf36b70e8dd8755e7dac6eb516169f586e78566d.tar.bz2 | |
IMFS: Replace node union with individual struct
This reduces the average node size.
Add and use IMFS_GENERIC_INITIALIZER().
Diffstat (limited to 'cpukit/dev/i2c')
| -rw-r--r-- | cpukit/dev/i2c/i2c-bus.c | 16 | ||||
| -rw-r--r-- | cpukit/dev/i2c/i2c-dev.c | 16 |
2 files changed, 14 insertions, 18 deletions
diff --git a/cpukit/dev/i2c/i2c-bus.c b/cpukit/dev/i2c/i2c-bus.c index dafd758e05..0f27d06873 100644 --- a/cpukit/dev/i2c/i2c-bus.c +++ b/cpukit/dev/i2c/i2c-bus.c @@ -223,23 +223,21 @@ static const rtems_filesystem_file_handlers_r i2c_bus_handler = { .writev_h = rtems_filesystem_default_writev }; -static IMFS_jnode_t *i2c_bus_node_destroy(IMFS_jnode_t *node) +static void i2c_bus_node_destroy(IMFS_jnode_t *node) { i2c_bus *bus; bus = IMFS_generic_get_context_by_node(node); (*bus->destroy)(bus); - return node; + IMFS_node_destroy_default(node); } -static const IMFS_node_control i2c_bus_node_control = { - .imfs_type = IMFS_GENERIC, - .handlers = &i2c_bus_handler, - .node_initialize = IMFS_node_initialize_generic, - .node_remove = IMFS_node_remove_default, - .node_destroy = i2c_bus_node_destroy -}; +static const IMFS_node_control i2c_bus_node_control = IMFS_GENERIC_INITIALIZER( + &i2c_bus_handler, + IMFS_node_initialize_generic, + i2c_bus_node_destroy +); int i2c_bus_register( i2c_bus *bus, diff --git a/cpukit/dev/i2c/i2c-dev.c b/cpukit/dev/i2c/i2c-dev.c index 76ae757eb0..6710632e87 100644 --- a/cpukit/dev/i2c/i2c-dev.c +++ b/cpukit/dev/i2c/i2c-dev.c @@ -116,23 +116,21 @@ static const rtems_filesystem_file_handlers_r i2c_dev_handler = { .writev_h = rtems_filesystem_default_writev }; -static IMFS_jnode_t *i2c_dev_node_destroy(IMFS_jnode_t *node) +static void i2c_dev_node_destroy(IMFS_jnode_t *node) { i2c_dev *dev; dev = IMFS_generic_get_context_by_node(node); (*dev->destroy)(dev); - return node; + IMFS_node_destroy_default(node); } -static const IMFS_node_control i2c_dev_node_control = { - .imfs_type = IMFS_GENERIC, - .handlers = &i2c_dev_handler, - .node_initialize = IMFS_node_initialize_generic, - .node_remove = IMFS_node_remove_default, - .node_destroy = i2c_dev_node_destroy -}; +static const IMFS_node_control i2c_dev_node_control = IMFS_GENERIC_INITIALIZER( + &i2c_dev_handler, + IMFS_node_initialize_generic, + i2c_dev_node_destroy +); int i2c_dev_register( i2c_dev *dev, |