a5fd0d184a
The init infrastructure, found in `init.h`, is currently used by:
- `SYS_INIT`: to call functions before `main`
- `DEVICE_*`: to initialize devices
They are all sorted according to an initialization level + a priority.
`SYS_INIT` calls are really orthogonal to devices, however, the required
function signature requires a `const struct device *dev` as a first
argument. The only reason for that is because the same init machinery is
used by devices, so we have something like:
```c
struct init_entry {
int (*init)(const struct device *dev);
/* only set by DEVICE_*, otherwise NULL */
const struct device *dev;
}
```
As a result, we end up with such weird/ugly pattern:
```c
static int my_init(const struct device *dev)
{
/* always NULL! add ARG_UNUSED to avoid compiler warning */
ARG_UNUSED(dev);
...
}
```
This is really a result of poor internals isolation. This patch proposes
a to make init entries more flexible so that they can accept sytem
initialization calls like this:
```c
static int my_init(void)
{
...
}
```
This is achieved using a union:
```c
union init_function {
/* for SYS_INIT, used when init_entry.dev == NULL */
int (*sys)(void);
/* for DEVICE*, used when init_entry.dev != NULL */
int (*dev)(const struct device *dev);
};
struct init_entry {
/* stores init function (either for SYS_INIT or DEVICE*)
union init_function init_fn;
/* stores device pointer for DEVICE*, NULL for SYS_INIT. Allows
* to know which union entry to call.
*/
const struct device *dev;
}
```
This solution **does not increase ROM usage**, and allows to offer clean
public APIs for both SYS_INIT and DEVICE*. Note that however, init
machinery keeps a coupling with devices.
**NOTE**: This is a breaking change! All `SYS_INIT` functions will need
to be converted to the new signature. See the script offered in the
following commit.
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
init: convert SYS_INIT functions to the new signature
Conversion scripted using scripts/utils/migrate_sys_init.py.
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
manifest: update projects for SYS_INIT changes
Update modules with updated SYS_INIT calls:
- hal_ti
- lvgl
- sof
- TraceRecorderSource
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
tests: devicetree: devices: adjust test
Adjust test according to the recently introduced SYS_INIT
infrastructure.
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
tests: kernel: threads: adjust SYS_INIT call
Adjust to the new signature: int (*init_fn)(void);
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
112 lines
2.5 KiB
C
112 lines
2.5 KiB
C
/*
|
|
* Copyright (c) 2016 Intel Corporation.
|
|
* Copyright (c) 2021, Nordic Semiconductor ASA
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <zephyr/types.h>
|
|
#include <zephyr/drivers/disk.h>
|
|
#include <errno.h>
|
|
#include <zephyr/init.h>
|
|
#include <zephyr/device.h>
|
|
#include <zephyr/logging/log.h>
|
|
|
|
LOG_MODULE_REGISTER(ramdisk, CONFIG_RAMDISK_LOG_LEVEL);
|
|
|
|
#define RAMDISK_SECTOR_SIZE 512
|
|
#define RAMDISK_VOLUME_SIZE (CONFIG_DISK_RAM_VOLUME_SIZE * 1024)
|
|
#define RAMDISK_SECTOR_COUNT (RAMDISK_VOLUME_SIZE / RAMDISK_SECTOR_SIZE)
|
|
|
|
static uint8_t ramdisk_buf[RAMDISK_VOLUME_SIZE];
|
|
|
|
static void *lba_to_address(uint32_t lba)
|
|
{
|
|
return &ramdisk_buf[lba * RAMDISK_SECTOR_SIZE];
|
|
}
|
|
|
|
static int disk_ram_access_status(struct disk_info *disk)
|
|
{
|
|
return DISK_STATUS_OK;
|
|
}
|
|
|
|
static int disk_ram_access_init(struct disk_info *disk)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static int disk_ram_access_read(struct disk_info *disk, uint8_t *buff,
|
|
uint32_t sector, uint32_t count)
|
|
{
|
|
uint32_t last_sector = sector + count;
|
|
|
|
if (last_sector < sector || last_sector > RAMDISK_SECTOR_COUNT) {
|
|
LOG_ERR("Sector %" PRIu32 " is outside the range %u",
|
|
last_sector, RAMDISK_SECTOR_COUNT);
|
|
return -EIO;
|
|
}
|
|
|
|
memcpy(buff, lba_to_address(sector), count * RAMDISK_SECTOR_SIZE);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int disk_ram_access_write(struct disk_info *disk, const uint8_t *buff,
|
|
uint32_t sector, uint32_t count)
|
|
{
|
|
uint32_t last_sector = sector + count;
|
|
|
|
if (last_sector < sector || last_sector > RAMDISK_SECTOR_COUNT) {
|
|
LOG_ERR("Sector %" PRIu32 " is outside the range %u",
|
|
last_sector, RAMDISK_SECTOR_COUNT);
|
|
return -EIO;
|
|
}
|
|
|
|
memcpy(lba_to_address(sector), buff, count * RAMDISK_SECTOR_SIZE);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int disk_ram_access_ioctl(struct disk_info *disk, uint8_t cmd, void *buff)
|
|
{
|
|
switch (cmd) {
|
|
case DISK_IOCTL_CTRL_SYNC:
|
|
break;
|
|
case DISK_IOCTL_GET_SECTOR_COUNT:
|
|
*(uint32_t *)buff = RAMDISK_SECTOR_COUNT;
|
|
break;
|
|
case DISK_IOCTL_GET_SECTOR_SIZE:
|
|
*(uint32_t *)buff = RAMDISK_SECTOR_SIZE;
|
|
break;
|
|
case DISK_IOCTL_GET_ERASE_BLOCK_SZ:
|
|
*(uint32_t *)buff = 1U;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct disk_operations ram_disk_ops = {
|
|
.init = disk_ram_access_init,
|
|
.status = disk_ram_access_status,
|
|
.read = disk_ram_access_read,
|
|
.write = disk_ram_access_write,
|
|
.ioctl = disk_ram_access_ioctl,
|
|
};
|
|
|
|
static struct disk_info ram_disk = {
|
|
.name = CONFIG_DISK_RAM_VOLUME_NAME,
|
|
.ops = &ram_disk_ops,
|
|
};
|
|
|
|
static int disk_ram_init(void)
|
|
{
|
|
|
|
return disk_access_register(&ram_disk);
|
|
}
|
|
|
|
SYS_INIT(disk_ram_init, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
|