diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/mcuconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/mcuconf.h index 48f1053c8..92e9cd51d 100644 --- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/mcuconf.h +++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f407_olimex/mcuconf.h @@ -32,6 +32,10 @@ */ #define STM32F4xx_MCUCONF +#define STM32F405_MCUCONF +#define STM32F415_MCUCONF +#define STM32F407_MCUCONF +#define STM32F417_MCUCONF /* * HAL driver system settings. diff --git a/os/hal/include/hal_mmcsd.h b/os/hal/include/hal_mmcsd.h index b1b75536e..ac2701f8b 100644 --- a/os/hal/include/hal_mmcsd.h +++ b/os/hal/include/hal_mmcsd.h @@ -102,65 +102,65 @@ * @brief Slice position of values in CSD register. */ /* CSD for MMC */ -#define MMCSD_CSD_MMC_CSD_STRUCTURE_SLICE 127U,126U -#define MMCSD_CSD_MMC_SPEC_VERS_SLICE 125U,122U -#define MMCSD_CSD_MMC_TAAC_SLICE 119U,112U -#define MMCSD_CSD_MMC_NSAC_SLICE 111U,104U -#define MMCSD_CSD_MMC_TRAN_SPEED_SLICE 103U,96U -#define MMCSD_CSD_MMC_CCC_SLICE 95U,84U -#define MMCSD_CSD_MMC_READ_BL_LEN_SLICE 83U,80U -#define MMCSD_CSD_MMC_READ_BL_PARTIAL_SLICE 79U,79U -#define MMCSD_CSD_MMC_WRITE_BLK_MISALIGN_SLICE 78U,78U -#define MMCSD_CSD_MMC_READ_BLK_MISALIGN_SLICE 77U,77U -#define MMCSD_CSD_MMC_DSR_IMP_SLICE 76U,76U -#define MMCSD_CSD_MMC_C_SIZE_SLICE 73U,62U -#define MMCSD_CSD_MMC_VDD_R_CURR_MIN_SLICE 61U,59U -#define MMCSD_CSD_MMC_VDD_R_CURR_MAX_SLICE 58U,56U -#define MMCSD_CSD_MMC_VDD_W_CURR_MIN_SLICE 55U,53U -#define MMCSD_CSD_MMC_VDD_W_CURR_MAX_SLICE 52U,50U -#define MMCSD_CSD_MMC_C_SIZE_MULT_SLICE 49U,47U -#define MMCSD_CSD_MMC_ERASE_GRP_SIZE_SLICE 46U,42U -#define MMCSD_CSD_MMC_ERASE_GRP_MULT_SLICE 41U,37U -#define MMCSD_CSD_MMC_WP_GRP_SIZE_SLICE 36U,32U -#define MMCSD_CSD_MMC_WP_GRP_ENABLE_SLICE 31U,31U -#define MMCSD_CSD_MMC_DEFAULT_ECC_SLICE 30U,29U -#define MMCSD_CSD_MMC_R2W_FACTOR_SLICE 28U,26U -#define MMCSD_CSD_MMC_WRITE_BL_LEN_SLICE 25U,22U -#define MMCSD_CSD_MMC_WRITE_BL_PARTIAL_SLICE 21U,21U -#define MMCSD_CSD_MMC_CONTENT_PROT_APP_SLICE 16U,16U -#define MMCSD_CSD_MMC_FILE_FORMAT_GRP_SLICE 15U,15U -#define MMCSD_CSD_MMC_COPY_SLICE 14U,14U -#define MMCSD_CSD_MMC_PERM_WRITE_PROTECT_SLICE 13U,13U -#define MMCSD_CSD_MMC_TMP_WRITE_PROTECT_SLICE 12U,12U -#define MMCSD_CSD_MMC_FILE_FORMAT_SLICE 11U,10U -#define MMCSD_CSD_MMC_ECC_SLICE 9U,8U -#define MMCSD_CSD_MMC_CRC_SLICE 7U,1U +#define MMCSD_CSD_MMC_CSD_STRUCTURE_SLICE 127U, 126U +#define MMCSD_CSD_MMC_SPEC_VERS_SLICE 125U, 122U +#define MMCSD_CSD_MMC_TAAC_SLICE 119U, 112U +#define MMCSD_CSD_MMC_NSAC_SLICE 111U, 104U +#define MMCSD_CSD_MMC_TRAN_SPEED_SLICE 103U, 96U +#define MMCSD_CSD_MMC_CCC_SLICE 95U, 84U +#define MMCSD_CSD_MMC_READ_BL_LEN_SLICE 83U, 80U +#define MMCSD_CSD_MMC_READ_BL_PARTIAL_SLICE 79U, 79U +#define MMCSD_CSD_MMC_WRITE_BLK_MISALIGN_SLICE 78U, 78U +#define MMCSD_CSD_MMC_READ_BLK_MISALIGN_SLICE 77U, 77U +#define MMCSD_CSD_MMC_DSR_IMP_SLICE 76U, 76U +#define MMCSD_CSD_MMC_C_SIZE_SLICE 73U, 62U +#define MMCSD_CSD_MMC_VDD_R_CURR_MIN_SLICE 61U, 59U +#define MMCSD_CSD_MMC_VDD_R_CURR_MAX_SLICE 58U, 56U +#define MMCSD_CSD_MMC_VDD_W_CURR_MIN_SLICE 55U, 53U +#define MMCSD_CSD_MMC_VDD_W_CURR_MAX_SLICE 52U, 50U +#define MMCSD_CSD_MMC_C_SIZE_MULT_SLICE 49U, 47U +#define MMCSD_CSD_MMC_ERASE_GRP_SIZE_SLICE 46U, 42U +#define MMCSD_CSD_MMC_ERASE_GRP_MULT_SLICE 41U, 37U +#define MMCSD_CSD_MMC_WP_GRP_SIZE_SLICE 36U, 32U +#define MMCSD_CSD_MMC_WP_GRP_ENABLE_SLICE 31U, 31U +#define MMCSD_CSD_MMC_DEFAULT_ECC_SLICE 30U, 29U +#define MMCSD_CSD_MMC_R2W_FACTOR_SLICE 28U, 26U +#define MMCSD_CSD_MMC_WRITE_BL_LEN_SLICE 25U, 22U +#define MMCSD_CSD_MMC_WRITE_BL_PARTIAL_SLICE 21U, 21U +#define MMCSD_CSD_MMC_CONTENT_PROT_APP_SLICE 16U, 16U +#define MMCSD_CSD_MMC_FILE_FORMAT_GRP_SLICE 15U, 15U +#define MMCSD_CSD_MMC_COPY_SLICE 14U, 14U +#define MMCSD_CSD_MMC_PERM_WRITE_PROTECT_SLICE 13U, 13U +#define MMCSD_CSD_MMC_TMP_WRITE_PROTECT_SLICE 12U, 12U +#define MMCSD_CSD_MMC_FILE_FORMAT_SLICE 11U, 10U +#define MMCSD_CSD_MMC_ECC_SLICE 9U, 8U +#define MMCSD_CSD_MMC_CRC_SLICE 7U, 1U /* CSD version 2.0 */ -#define MMCSD_CSD_20_CRC_SLICE 7U,1U -#define MMCSD_CSD_20_FILE_FORMAT_SLICE 11U,10U -#define MMCSD_CSD_20_TMP_WRITE_PROTECT_SLICE 12U,12U -#define MMCSD_CSD_20_PERM_WRITE_PROTECT_SLICE 13U,13U -#define MMCSD_CSD_20_COPY_SLICE 14U,14U -#define MMCSD_CSD_20_FILE_FORMAT_GRP_SLICE 15U,15U -#define MMCSD_CSD_20_WRITE_BL_PARTIAL_SLICE 21U,21U -#define MMCSD_CSD_20_WRITE_BL_LEN_SLICE 25U,12U -#define MMCSD_CSD_20_R2W_FACTOR_SLICE 28U,26U -#define MMCSD_CSD_20_WP_GRP_ENABLE_SLICE 31U,31U -#define MMCSD_CSD_20_WP_GRP_SIZE_SLICE 38U,32U -#define MMCSD_CSD_20_ERASE_SECTOR_SIZE_SLICE 45U,39U -#define MMCSD_CSD_20_ERASE_BLK_EN_SLICE 46U,46U -#define MMCSD_CSD_20_C_SIZE_SLICE 69U,48U -#define MMCSD_CSD_20_DSR_IMP_SLICE 76U,76U -#define MMCSD_CSD_20_READ_BLK_MISALIGN_SLICE 77U,77U -#define MMCSD_CSD_20_WRITE_BLK_MISALIGN_SLICE 78U,78U -#define MMCSD_CSD_20_READ_BL_PARTIAL_SLICE 79U,79U -#define MMCSD_CSD_20_READ_BL_LEN_SLICE 83U,80U -#define MMCSD_CSD_20_CCC_SLICE 95U,84U -#define MMCSD_CSD_20_TRANS_SPEED_SLICE 103U,96U -#define MMCSD_CSD_20_NSAC_SLICE 111U,104U -#define MMCSD_CSD_20_TAAC_SLICE 119U,112U -#define MMCSD_CSD_20_CSD_STRUCTURE_SLICE 127U,126U +#define MMCSD_CSD_20_CRC_SLICE 7U, 1U +#define MMCSD_CSD_20_FILE_FORMAT_SLICE 11U, 10U +#define MMCSD_CSD_20_TMP_WRITE_PROTECT_SLICE 12U, 12U +#define MMCSD_CSD_20_PERM_WRITE_PROTECT_SLICE 13U, 13U +#define MMCSD_CSD_20_COPY_SLICE 14U, 14U +#define MMCSD_CSD_20_FILE_FORMAT_GRP_SLICE 15U, 15U +#define MMCSD_CSD_20_WRITE_BL_PARTIAL_SLICE 21U, 21U +#define MMCSD_CSD_20_WRITE_BL_LEN_SLICE 25U, 12U +#define MMCSD_CSD_20_R2W_FACTOR_SLICE 28U, 26U +#define MMCSD_CSD_20_WP_GRP_ENABLE_SLICE 31U, 31U +#define MMCSD_CSD_20_WP_GRP_SIZE_SLICE 38U, 32U +#define MMCSD_CSD_20_ERASE_SECTOR_SIZE_SLICE 45U, 39U +#define MMCSD_CSD_20_ERASE_BLK_EN_SLICE 46U, 46U +#define MMCSD_CSD_20_C_SIZE_SLICE 69U, 48U +#define MMCSD_CSD_20_DSR_IMP_SLICE 76U, 76U +#define MMCSD_CSD_20_READ_BLK_MISALIGN_SLICE 77U, 77U +#define MMCSD_CSD_20_WRITE_BLK_MISALIGN_SLICE 78U, 78U +#define MMCSD_CSD_20_READ_BL_PARTIAL_SLICE 79U, 79U +#define MMCSD_CSD_20_READ_BL_LEN_SLICE 83U, 80U +#define MMCSD_CSD_20_CCC_SLICE 95U, 84U +#define MMCSD_CSD_20_TRANS_SPEED_SLICE 103U, 96U +#define MMCSD_CSD_20_NSAC_SLICE 111U, 104U +#define MMCSD_CSD_20_TAAC_SLICE 119U, 112U +#define MMCSD_CSD_20_CSD_STRUCTURE_SLICE 127U, 126U /* CSD version 1.0 */ #define MMCSD_CSD_10_CRC_SLICE MMCSD_CSD_20_CRC_SLICE @@ -176,17 +176,17 @@ #define MMCSD_CSD_10_WP_GRP_SIZE_SLICE MMCSD_CSD_20_WP_GRP_SIZE_SLICE #define MMCSD_CSD_10_ERASE_SECTOR_SIZE_SLICE MMCSD_CSD_20_ERASE_SECTOR_SIZE_SLICE #define MMCSD_CSD_10_ERASE_BLK_EN_SLICE MMCSD_CSD_20_ERASE_BLK_EN_SLICE -#define MMCSD_CSD_10_C_SIZE_MULT_SLICE 49U,47U -#define MMCSD_CSD_10_VDD_W_CURR_MAX_SLICE 52U,50U -#define MMCSD_CSD_10_VDD_W_CURR_MIN_SLICE 55U,53U -#define MMCSD_CSD_10_VDD_R_CURR_MAX_SLICE 58U,56U -#define MMCSD_CSD_10_VDD_R_CURR_MIX_SLICE 61U,59U -#define MMCSD_CSD_10_C_SIZE_SLICE 73U,62U +#define MMCSD_CSD_10_C_SIZE_MULT_SLICE 49U, 47U +#define MMCSD_CSD_10_VDD_W_CURR_MAX_SLICE 52U, 50U +#define MMCSD_CSD_10_VDD_W_CURR_MIN_SLICE 55U, 53U +#define MMCSD_CSD_10_VDD_R_CURR_MAX_SLICE 58U, 56U +#define MMCSD_CSD_10_VDD_R_CURR_MIX_SLICE 61U, 59U +#define MMCSD_CSD_10_C_SIZE_SLICE 73U, 62U #define MMCSD_CSD_10_DSR_IMP_SLICE MMCSD_CSD_20_DSR_IMP_SLICE #define MMCSD_CSD_10_READ_BLK_MISALIGN_SLICE MMCSD_CSD_20_READ_BLK_MISALIGN_SLICE #define MMCSD_CSD_10_WRITE_BLK_MISALIGN_SLICE MMCSD_CSD_20_WRITE_BLK_MISALIGN_SLICE #define MMCSD_CSD_10_READ_BL_PARTIAL_SLICE MMCSD_CSD_20_READ_BL_PARTIAL_SLICE -#define MMCSD_CSD_10_READ_BL_LEN_SLICE 83U,80U +#define MMCSD_CSD_10_READ_BL_LEN_SLICE 83U, 80U #define MMCSD_CSD_10_CCC_SLICE MMCSD_CSD_20_CCC_SLICE #define MMCSD_CSD_10_TRANS_SPEED_SLICE MMCSD_CSD_20_TRANS_SPEED_SLICE #define MMCSD_CSD_10_NSAC_SLICE MMCSD_CSD_20_NSAC_SLICE @@ -201,35 +201,35 @@ * @brief Slice position of values in CID register. */ /* CID for SDC */ -#define MMCSD_CID_SDC_CRC_SLICE 7U,1U -#define MMCSD_CID_SDC_MDT_M_SLICE 11U,8U -#define MMCSD_CID_SDC_MDT_Y_SLICE 19U,12U -#define MMCSD_CID_SDC_PSN_SLICE 55U,24U -#define MMCSD_CID_SDC_PRV_M_SLICE 59U,56U -#define MMCSD_CID_SDC_PRV_N_SLICE 63U,60U -#define MMCSD_CID_SDC_PNM0_SLICE 71U,64U -#define MMCSD_CID_SDC_PNM1_SLICE 79U,72U -#define MMCSD_CID_SDC_PNM2_SLICE 87U,80U -#define MMCSD_CID_SDC_PNM3_SLICE 95U,88U -#define MMCSD_CID_SDC_PNM4_SLICE 103U,96U -#define MMCSD_CID_SDC_OID_SLICE 119U,104U -#define MMCSD_CID_SDC_MID_SLICE 127U,120U +#define MMCSD_CID_SDC_CRC_SLICE 7U, 1U +#define MMCSD_CID_SDC_MDT_M_SLICE 11U, 8U +#define MMCSD_CID_SDC_MDT_Y_SLICE 19U, 12U +#define MMCSD_CID_SDC_PSN_SLICE 55U, 24U +#define MMCSD_CID_SDC_PRV_M_SLICE 59U, 56U +#define MMCSD_CID_SDC_PRV_N_SLICE 63U, 60U +#define MMCSD_CID_SDC_PNM0_SLICE 71U, 64U +#define MMCSD_CID_SDC_PNM1_SLICE 79U, 72U +#define MMCSD_CID_SDC_PNM2_SLICE 87U, 80U +#define MMCSD_CID_SDC_PNM3_SLICE 95U, 88U +#define MMCSD_CID_SDC_PNM4_SLICE 103U, 96U +#define MMCSD_CID_SDC_OID_SLICE 119U, 104U +#define MMCSD_CID_SDC_MID_SLICE 127U, 120U /* CID for MMC */ -#define MMCSD_CID_MMC_CRC_SLICE 7U,1U -#define MMCSD_CID_MMC_MDT_Y_SLICE 11U,8U -#define MMCSD_CID_MMC_MDT_M_SLICE 15U,12U -#define MMCSD_CID_MMC_PSN_SLICE 47U,16U -#define MMCSD_CID_MMC_PRV_M_SLICE 51U,48U -#define MMCSD_CID_MMC_PRV_N_SLICE 55U,52U -#define MMCSD_CID_MMC_PNM0_SLICE 63U,56U -#define MMCSD_CID_MMC_PNM1_SLICE 71U,64U -#define MMCSD_CID_MMC_PNM2_SLICE 79U,72U -#define MMCSD_CID_MMC_PNM3_SLICE 87U,80U -#define MMCSD_CID_MMC_PNM4_SLICE 95U,88U -#define MMCSD_CID_MMC_PNM5_SLICE 103U,96U -#define MMCSD_CID_MMC_OID_SLICE 119U,104U -#define MMCSD_CID_MMC_MID_SLICE 127U,120U +#define MMCSD_CID_MMC_CRC_SLICE 7U, 1U +#define MMCSD_CID_MMC_MDT_Y_SLICE 11U, 8U +#define MMCSD_CID_MMC_MDT_M_SLICE 15U, 12U +#define MMCSD_CID_MMC_PSN_SLICE 47U, 16U +#define MMCSD_CID_MMC_PRV_M_SLICE 51U, 48U +#define MMCSD_CID_MMC_PRV_N_SLICE 55U, 52U +#define MMCSD_CID_MMC_PNM0_SLICE 63U, 56U +#define MMCSD_CID_MMC_PNM1_SLICE 71U, 64U +#define MMCSD_CID_MMC_PNM2_SLICE 79U, 72U +#define MMCSD_CID_MMC_PNM3_SLICE 87U, 80U +#define MMCSD_CID_MMC_PNM4_SLICE 95U, 88U +#define MMCSD_CID_MMC_PNM5_SLICE 103U, 96U +#define MMCSD_CID_MMC_OID_SLICE 119U, 104U +#define MMCSD_CID_MMC_MID_SLICE 127U, 120U /** @} */ /*===========================================================================*/ diff --git a/tools/style/stylecheck.pl b/tools/style/stylecheck.pl index 3ecf657f3..98a1d2de2 100644 --- a/tools/style/stylecheck.pl +++ b/tools/style/stylecheck.pl @@ -113,6 +113,12 @@ foreach my $line (@c_source) { style "detected // comment"; } + #**************************************************************************** + # Check on commas. + if ($line =~ /,\S/) { + style "detected comma not followed by space"; + } + #**************************************************************************** # Check on loose semicolons. if ($line =~ /\S\s;/) {