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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/pci-ide/pci-ide.c
          +++ new/usr/src/uts/common/io/pci-ide/pci-ide.c
↓ open down ↓ 175 lines elided ↑ open up ↑
 176  176   */
 177  177  
 178  178  static struct modldrv modldrv = {
 179  179          &mod_driverops, /* Type of module.  This is PCI-IDE bus driver */
 180  180          "pciide nexus driver for 'PCI-IDE' 1.26",
 181  181          &pciide_ops,    /* driver ops */
 182  182  };
 183  183  
 184  184  static struct modlinkage modlinkage = {
 185  185          MODREV_1,
 186      -        &modldrv,
 187      -        NULL
      186 +        { &modldrv, NULL }
 188  187  };
 189  188  
 190  189  
 191  190  int
 192  191  _init(void)
 193  192  {
 194  193          return (mod_install(&modlinkage));
 195  194  }
 196  195  
 197  196  int
↓ open down ↓ 779 lines elided ↑ open up ↑
 977  976   *      NN      0, 1, 2, 3, 4
 978  977   *
 979  978   *      C = compatible(!native) == 0
 980  979   *      N = native == 1
 981  980   *
 982  981   *      Here's the transformation matrix:
 983  982   */
 984  983  
 985  984  static  int     pciide_transform[2][2][5] = {
 986  985  /*  P  S  */
 987      -/* [C][C] */    +1, +1, +1, +1, -4,
 988      -/* [C][N] */    +3, +3, -2, -2, -2,
 989      -/* [N][C] */    +0, +0, +1, +1, -2,
 990      -/* [N][N] */    +0, +0, +0, +0, +0
      986 +/* [C][C] */    {   { +1, +1, +1, +1, -4 },
      987 +/* [C][N] */        { +3, +3, -2, -2, -2 } },
      988 +/* [N][C] */    {   { +0, +0, +1, +1, -2 },
      989 +/* [N][N] */        { +0, +0, +0, +0, +0 } }
 991  990  };
 992  991  
 993  992  
 994  993  static int
 995  994  pciide_map_rnumber(int rnumber, int pri_native, int sec_native)
 996  995  {
 997  996          /* transform flags into indexes */
 998  997          pri_native = pri_native ? 1 : 0;
 999  998          sec_native = sec_native ? 1 : 0;
1000  999  
1001 1000          rnumber += pciide_transform[pri_native][sec_native][rnumber];
1002 1001          return (rnumber);
1003 1002  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX