RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #20078 from benpicco/mtd_dev_get

Browse Source 
drivers/mtd: rename mtd_default_get_dev() -> mtd_dev_get()
This commit is contained in:
benpicco 2023-11-10 21:36:19 +00:00 committed by GitHub
commit 5d54e89a17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/include/mtd.h
View File

@ -73,6 +73,7 @@
#ifndef MTD_H #ifndef MTD_H
#define MTD_H #define MTD_H
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include "xfa.h" #include "xfa.h"
@ -517,6 +518,19 @@ int mtd_erase_sector(mtd_dev_t *mtd, uint32_t sector, uint32_t num);
*/ */
int mtd_power(mtd_dev_t *mtd, enum mtd_power_state power); int mtd_power(mtd_dev_t *mtd, enum mtd_power_state power);
/**
* @brief Get an MTD device by index
*
* @param[in] idx Index of the MTD device
*
* @return MTD_0 for @p idx 0 and so on
* NULL if no MTD device exists for the given index
*/
static inline mtd_dev_t *mtd_dev_get(unsigned idx)
{
return ((MTD_NUMOF != 0) && (idx < MTD_NUMOF)) ? mtd_dev_xfa[idx] : NULL;
}
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
drivers/include/mtd_default.h
View File

@ -69,6 +69,8 @@ extern mtd_emulated_t mtd_emulated_dev0;
/** /**
* @brief Get the default MTD device by index * @brief Get the default MTD device by index
* *
* @deprecated Use @ref mtd_dev_get instead
*
* @param[in] idx Index of the MTD device * @param[in] idx Index of the MTD device
* *
* @return MTD_0 for @p idx 0 and so on * @return MTD_0 for @p idx 0 and so on

2
sys/include/usb/usbus/msc.h
View File

@ -25,7 +25,7 @@
#include <stdint.h> #include <stdint.h>
#include "usb/usbus.h" #include "usb/usbus.h"
#include "usb/usbus/msc/scsi.h" #include "usb/usbus/msc/scsi.h"
#include "mtd_default.h" #include "mtd.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
sys/usb/usbus/msc/msc.c
View File

@ -374,7 +374,7 @@ static void _init(usbus_t *usbus, usbus_handler_t *handler)
/* Auto-configure all MTD devices */ /* Auto-configure all MTD devices */
if (CONFIG_USBUS_MSC_AUTO_MTD) { if (CONFIG_USBUS_MSC_AUTO_MTD) {
for (unsigned i = 0; i < MTD_NUMOF; i++) { for (unsigned i = 0; i < MTD_NUMOF; i++) {
usbus_msc_add_lun(usbus, mtd_default_get_dev(i)); usbus_msc_add_lun(usbus, mtd_dev_get(i));
} }
} }
} }

8
tests/drivers/mtd_raw/main.c
View File

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include "od.h" #include "od.h"
#include "mtd_default.h" #include "mtd.h"
#include "shell.h" #include "shell.h"
#include "board.h" #include "board.h"
#include "macros/units.h" #include "macros/units.h"
@ -45,7 +45,7 @@ static mtd_dev_t *_get_dev(int argc, char **argv)
return NULL; return NULL;
} }
return mtd_default_get_dev(idx); return mtd_dev_get(idx);
} }
static uint64_t _get_size(mtd_dev_t *dev) static uint64_t _get_size(mtd_dev_t *dev)
@ -283,7 +283,7 @@ static int cmd_info(int argc, char **argv)
for (unsigned i = 0; i < MTD_NUMOF; ++i) { for (unsigned i = 0; i < MTD_NUMOF; ++i) {
printf(" -=[ MTD_%d ]=-\n", i); printf(" -=[ MTD_%d ]=-\n", i);
_print_info(mtd_default_get_dev(i)); _print_info(mtd_dev_get(i));
} }
return 0; return 0;
} }
@ -453,7 +453,7 @@ int main(void)
for (unsigned i = 0; i < MTD_NUMOF; ++i) { for (unsigned i = 0; i < MTD_NUMOF; ++i) {
printf("init MTD_%d… ", i); printf("init MTD_%d… ", i);
mtd_dev_t *dev = mtd_default_get_dev(i); mtd_dev_t *dev = mtd_dev_get(i);
int res = mtd_init(dev); int res = mtd_init(dev);
if (res) { if (res) {
printf("error: %d\n", res); printf("error: %d\n", res);

6
tests/sys/usbus_msc/main.c
View File

@ -48,7 +48,7 @@ MTD_EMULATED_DEV(0, SECTOR_COUNT, PAGES_PER_SECTOR, PAGE_SIZE);
#endif /* MODULE_MTD_EMULATED */ #endif /* MODULE_MTD_EMULATED */
#include "mtd_default.h" #include "mtd.h"
#include "shell.h" #include "shell.h"
#include "usb/usbus.h" #include "usb/usbus.h"
#include "usb/usbus/msc.h" #include "usb/usbus/msc.h"
@ -76,7 +76,7 @@ static int _cmd_add_lun(int argc, char **argv)
puts("error: invalid MTD device specified"); puts("error: invalid MTD device specified");
return -2; return -2;
} }
mtd_dev = mtd_default_get_dev(dev); mtd_dev = mtd_dev_get(dev);
ret = usbus_msc_add_lun(usbus, mtd_dev); ret = usbus_msc_add_lun(usbus, mtd_dev);
if (ret != 0) { if (ret != 0) {
printf("Cannot add LUN device (error:%d %s)\n", ret, strerror(-ret)); printf("Cannot add LUN device (error:%d %s)\n", ret, strerror(-ret));
@ -104,7 +104,7 @@ static int _cmd_remove_lun(int argc, char **argv)
puts("error: invalid MTD device specified"); puts("error: invalid MTD device specified");
return -2; return -2;
} }
mtd_dev = mtd_default_get_dev(dev); mtd_dev = mtd_dev_get(dev);
ret = usbus_msc_remove_lun(usbus, mtd_dev); ret = usbus_msc_remove_lun(usbus, mtd_dev);
if (ret == -EAGAIN) { if (ret == -EAGAIN) {
printf("MTD device was not registered\n"); printf("MTD device was not registered\n");