Print this page
7127  remove -Wno-missing-braces from Makefile.uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/ppm/ppm_subr.c
          +++ new/usr/src/uts/common/io/ppm/ppm_subr.c
↓ open down ↓ 197 lines elided ↑ open up ↑
 198  198  }
 199  199  
 200  200  
 201  201  #define PPM_DOMAIN_PROP                 "ppm-domains"
 202  202  #define PPM_DEV_PROP_SUFFIX             "-devices"
 203  203  #define PPM_MODEL_PROP_SUFFIX           "-model"
 204  204  #define PPM_PROPNAME_PROP_SUFFIX        "-propname"
 205  205  #define PPM_CTRL_PROP_SUFFIX            "-control"
 206  206  
 207  207  struct ppm_domit ppm_domit_data[] = {
 208      -        "SX",  PPMD_SX, 0, PPMD_ON,
 209      -        "CPU", PPMD_CPU, PPMD_LOCK_ALL, PPMD_ON,
 210      -        "FET", PPMD_FET, PPMD_LOCK_ONE, PPMD_ON,
 211      -        "PCI", PPMD_PCI, PPMD_LOCK_ONE, PPMD_ON,
 212      -        "PCI_PROP", PPMD_PCI_PROP, PPMD_LOCK_ONE, PPMD_ON,
 213      -        "LED", PPMD_LED, 0, PPMD_ON,
 214      -        "PCIE", PPMD_PCIE, PPMD_LOCK_ONE, PPMD_ON,
 215      -        NULL
      208 +        { "SX",  PPMD_SX, 0, PPMD_ON },
      209 +        { "CPU", PPMD_CPU, PPMD_LOCK_ALL, PPMD_ON },
      210 +        { "FET", PPMD_FET, PPMD_LOCK_ONE, PPMD_ON },
      211 +        { "PCI", PPMD_PCI, PPMD_LOCK_ONE, PPMD_ON },
      212 +        { "PCI_PROP", PPMD_PCI_PROP, PPMD_LOCK_ONE, PPMD_ON },
      213 +        { "LED", PPMD_LED, 0, PPMD_ON },
      214 +        { "PCIE", PPMD_PCIE, PPMD_LOCK_ONE, PPMD_ON },
      215 +        { NULL }
 216  216  };
 217  217  
 218  218  /*
 219  219   * store up platform dependent information provided by ppm.conf file
 220  220   * into private data base
 221  221   */
 222  222  int
 223  223  ppm_create_db(dev_info_t *dip)
 224  224  {
 225  225  #ifdef  DEBUG
↓ open down ↓ 792 lines elided ↑ open up ↑
1018 1018  
1019 1019  /*
1020 1020   * ppm_convert - convert a #define symbol to its integer value,
1021 1021   * only the #defines for ppm_dc.cmd and ppm_dc.method fields in
1022 1022   * ppmvar.h file are recognized.
1023 1023   */
1024 1024  struct ppm_confdefs {
1025 1025          char    *sym;
1026 1026          int     val;
1027 1027  } ppm_confdefs_table[] = {
1028      -        "ENTER_S3", PPMDC_ENTER_S3,
1029      -        "EXIT_S3", PPMDC_EXIT_S3,
1030      -        "CPU_NEXT", PPMDC_CPU_NEXT,
1031      -        "PRE_CHNG", PPMDC_PRE_CHNG,
1032      -        "CPU_GO", PPMDC_CPU_GO,
1033      -        "POST_CHNG", PPMDC_POST_CHNG,
1034      -        "FET_ON", PPMDC_FET_ON,
1035      -        "FET_OFF", PPMDC_FET_OFF,
1036      -        "CLK_OFF", PPMDC_CLK_OFF,
1037      -        "CLK_ON", PPMDC_CLK_ON,
1038      -        "LED_ON", PPMDC_LED_ON,
1039      -        "LED_OFF", PPMDC_LED_OFF,
1040      -        "KIO", PPMDC_KIO,
1041      -        "VCORE", PPMDC_VCORE,
     1028 +        { "ENTER_S3", PPMDC_ENTER_S3 },
     1029 +        { "EXIT_S3", PPMDC_EXIT_S3 },
     1030 +        { "CPU_NEXT", PPMDC_CPU_NEXT },
     1031 +        { "PRE_CHNG", PPMDC_PRE_CHNG },
     1032 +        { "CPU_GO", PPMDC_CPU_GO },
     1033 +        { "POST_CHNG", PPMDC_POST_CHNG },
     1034 +        { "FET_ON", PPMDC_FET_ON },
     1035 +        { "FET_OFF", PPMDC_FET_OFF },
     1036 +        { "CLK_OFF", PPMDC_CLK_OFF },
     1037 +        { "CLK_ON", PPMDC_CLK_ON },
     1038 +        { "LED_ON", PPMDC_LED_ON },
     1039 +        { "LED_OFF", PPMDC_LED_OFF },
     1040 +        { "KIO", PPMDC_KIO },
     1041 +        { "VCORE", PPMDC_VCORE },
1042 1042  #ifdef sun4u
1043      -        "I2CKIO", PPMDC_I2CKIO,
     1043 +        { "I2CKIO", PPMDC_I2CKIO },
1044 1044  #endif
1045      -        "CPUSPEEDKIO", PPMDC_CPUSPEEDKIO,
1046      -        "PRE_PWR_OFF", PPMDC_PRE_PWR_OFF,
1047      -        "PRE_PWR_ON", PPMDC_PRE_PWR_ON,
1048      -        "POST_PWR_ON", PPMDC_POST_PWR_ON,
1049      -        "PWR_OFF", PPMDC_PWR_OFF,
1050      -        "PWR_ON", PPMDC_PWR_ON,
1051      -        "RESET_OFF", PPMDC_RESET_OFF,
1052      -        "RESET_ON", PPMDC_RESET_ON,
1053      -        NULL
     1045 +        { "CPUSPEEDKIO", PPMDC_CPUSPEEDKIO },
     1046 +        { "PRE_PWR_OFF", PPMDC_PRE_PWR_OFF },
     1047 +        { "PRE_PWR_ON", PPMDC_PRE_PWR_ON },
     1048 +        { "POST_PWR_ON", PPMDC_POST_PWR_ON },
     1049 +        { "PWR_OFF", PPMDC_PWR_OFF },
     1050 +        { "PWR_ON", PPMDC_PWR_ON },
     1051 +        { "RESET_OFF", PPMDC_RESET_OFF },
     1052 +        { "RESET_ON", PPMDC_RESET_ON },
     1053 +        { NULL }
1054 1054  };
1055 1055  
1056 1056  
1057 1057  /*
1058 1058   * convert a #define'd symbol to its integer value where
1059 1059   * input "symbol" is expected to be in form of "SYMBOL=value"
1060 1060   */
1061 1061  int
1062 1062  ppm_convert(char *symbol, uint_t *val)
1063 1063  {
↓ open down ↓ 364 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX