diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-02-26 13:05:55 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-02-26 13:05:55 +0000 |
| commit | e8dda5f8eea2d59fa92e124327e4b2f7885d75ad (patch) | |
| tree | 32a6d1f9b5c31abe3d27482b64b6d37bcbeba764 /os | |
| parent | f89581412a224d6475467c719ae385b1f700f413 (diff) | |
| download | ChibiOS-e8dda5f8eea2d59fa92e124327e4b2f7885d75ad.tar.gz ChibiOS-e8dda5f8eea2d59fa92e124327e4b2f7885d75ad.tar.bz2 ChibiOS-e8dda5f8eea2d59fa92e124327e4b2f7885d75ad.zip | |
BaseBlockDevice now extends BaseObject.
git-svn-id: https://svn.code.sf.net/p/chibios/svn2/trunk@11549 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/include/hal_ioblock.h | 4 | ||||
| -rw-r--r-- | os/hal/src/hal_mmc_spi.c | 1 | ||||
| -rw-r--r-- | os/hal/src/hal_sdc.c | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/os/hal/include/hal_ioblock.h b/os/hal/include/hal_ioblock.h index 74c41034f..c720a4a8c 100644 --- a/os/hal/include/hal_ioblock.h +++ b/os/hal/include/hal_ioblock.h @@ -61,6 +61,7 @@ typedef struct { * @brief @p BaseBlockDevice specific methods.
*/
#define _base_block_device_methods \
+ _base_object_methods \
/* Removable media detection.*/ \
bool (*is_inserted)(void *instance); \
/* Removable write protection detection.*/ \
@@ -84,6 +85,7 @@ typedef struct { * @brief @p BaseBlockDevice specific data.
*/
#define _base_block_device_data \
+ _base_object_data \
/* Driver state.*/ \
blkstate_t state;
@@ -95,6 +97,8 @@ struct BaseBlockDeviceVMT { };
/**
+ * @extends BaseObject
+ *
* @brief Base block device class.
* @details This class represents a generic, block-accessible, device.
*/
diff --git a/os/hal/src/hal_mmc_spi.c b/os/hal/src/hal_mmc_spi.c index 73c047086..1daea1fb6 100644 --- a/os/hal/src/hal_mmc_spi.c +++ b/os/hal/src/hal_mmc_spi.c @@ -53,6 +53,7 @@ static bool mmc_write(void *instance, uint32_t startblk, * @brief Virtual methods table.
*/
static const struct MMCDriverVMT mmc_vmt = {
+ (size_t)0,
(bool (*)(void *))mmc_lld_is_card_inserted,
(bool (*)(void *))mmc_lld_is_write_protected,
(bool (*)(void *))mmcConnect,
diff --git a/os/hal/src/hal_sdc.c b/os/hal/src/hal_sdc.c index 25add1417..ae64c95b5 100644 --- a/os/hal/src/hal_sdc.c +++ b/os/hal/src/hal_sdc.c @@ -72,6 +72,7 @@ typedef enum { * @brief Virtual methods table.
*/
static const struct SDCDriverVMT sdc_vmt = {
+ (size_t)0,
(bool (*)(void *))sdc_lld_is_card_inserted,
(bool (*)(void *))sdc_lld_is_write_protected,
(bool (*)(void *))sdcConnect,
|