Print this page
cstyle sort of updates
7127  remove -Wno-missing-braces from Makefile.uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/cdio.h
          +++ new/usr/src/uts/common/sys/cdio.h
↓ open down ↓ 19 lines elided ↑ open up ↑
  20   20   * CDDL HEADER END
  21   21   */
  22   22  /*
  23   23   * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  24   24   * Use is subject to license terms.
  25   25   */
  26   26  
  27   27  #ifndef _SYS_CDIO_H
  28   28  #define _SYS_CDIO_H
  29   29  
  30      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  31      -
  32   30  #ifdef  __cplusplus
  33   31  extern "C" {
  34   32  #endif
  35   33  
  36   34  /*
  37   35   * CDROM io controls type definitions
  38   36   */
  39   37  struct cdrom_msf {
  40   38          unsigned char   cdmsf_min0;     /* starting minute */
  41   39          unsigned char   cdmsf_sec0;     /* starting second */
↓ open down ↓ 333 lines elided ↑ open up ↑
 375  373  #define SCMD_READ_CDDA          0xD8    /* Vendor unique SCSI command */
 376  374  #define SCMD_READ_CDXA          0xDB    /* Vendor unique SCSI command */
 377  375  #define SCMD_READ_ALL_SUBCODES  0xDF    /* Vendor unique SCSI command */
 378  376  
 379  377  #define CDROM_MODE2_SIZE        2336
 380  378  
 381  379  /*
 382  380   * scsi_key_strings for CDROM cdio SCMD_ definitions
 383  381   */
 384  382  #define SCSI_CMDS_KEY_STRINGS_CDIO                              \
 385      -/* 0x42 */ SCMD_READ_SUBCHANNEL,        "read_subchannel",              \
 386      -/* 0x43 */ SCMD_READ_TOC,               "read_toc",                     \
 387      -/* 0x44 */ SCMD_REPORT_DENSITIES |                                      \
 388      -                SCMD_READ_HEADER,       "report_densities/read_header", \
 389      -/* 0x45 */ SCMD_PLAYAUDIO10,            "playaudio",                    \
 390      -/* 0x46 */ SCMD_GET_CONFIGURATION,      "get_configuration",            \
 391      -/* 0x47 */ SCMD_PLAYAUDIO_MSF,          "playaudio_msf",                \
 392      -/* 0x48 */ SCMD_PLAYAUDIO_TI,           "playaudio_ti",                 \
 393      -/* 0x49 */ SCMD_PLAYTRACK_REL10,        "playaudio_rel",                \
 394      -/* 0x4b */ SCMD_PAUSE_RESUME,           "pause_resume",                 \
      383 +/* 0x42 */ { SCMD_READ_SUBCHANNEL,      "read_subchannel" },            \
      384 +/* 0x43 */ { SCMD_READ_TOC,             "read_toc" },                   \
      385 +/* 0x44 */ { SCMD_REPORT_DENSITIES |                                    \
      386 +                SCMD_READ_HEADER,       "report_densities/read_header" }, \
      387 +/* 0x45 */ { SCMD_PLAYAUDIO10,          "playaudio" },                  \
      388 +/* 0x46 */ { SCMD_GET_CONFIGURATION,    "get_configuration" },          \
      389 +/* 0x47 */ { SCMD_PLAYAUDIO_MSF,        "playaudio_msf" },              \
      390 +/* 0x48 */ { SCMD_PLAYAUDIO_TI,         "playaudio_ti" },               \
      391 +/* 0x49 */ { SCMD_PLAYTRACK_REL10,      "playaudio_rel" },              \
      392 +/* 0x4b */ { SCMD_PAUSE_RESUME,         "pause_resume" },               \
 395  393                                                                          \
 396      -/* 0xa5 */ SCMD_PLAYAUDIO12,            "playaudio(12)",                \
 397      -/* 0xa9 */ SCMD_PLAYTRACK_REL12,        "playtrack_rel",                \
 398      -/* 0xbb */ SCMD_SET_CDROM_SPEED,        "set_cd_speed",                 \
 399      -/* 0xbe */ SCMD_READ_CD,                "read_cd",                      \
      394 +/* 0xa5 */ { SCMD_PLAYAUDIO12,          "playaudio(12)" },              \
      395 +/* 0xa9 */ { SCMD_PLAYTRACK_REL12,      "playtrack_rel" },              \
      396 +/* 0xbb */ { SCMD_SET_CDROM_SPEED,      "set_cd_speed" },               \
      397 +/* 0xbe */ { SCMD_READ_CD,              "read_cd" },                    \
 400  398                                                                          \
 401      -/* 0xc4 */ SCMD_CD_PLAYBACK_STATUS,     "cd_playback_status",           \
 402      -/* 0xc9 */ SCMD_CD_PLAYBACK_CONTROL,    "cd_playback_control",          \
 403      -/* 0xd8 */ SCMD_READ_CDDA,              "read_cdda",                    \
 404      -/* 0xdb */ SCMD_READ_CDXA,              "read_cdxa",                    \
 405      -/* 0xdf */ SCMD_READ_ALL_SUBCODES,      "read_all_subcodes"
      399 +/* 0xc4 */ { SCMD_CD_PLAYBACK_STATUS,   "cd_playback_status" },         \
      400 +/* 0xc9 */ { SCMD_CD_PLAYBACK_CONTROL,  "cd_playback_control" },        \
      401 +/* 0xd8 */ { SCMD_READ_CDDA,            "read_cdda" },                  \
      402 +/* 0xdb */ { SCMD_READ_CDXA,            "read_cdxa" },                  \
      403 +/* 0xdf */ { SCMD_READ_ALL_SUBCODES,    "read_all_subcodes" }
 406  404  
 407  405  #ifdef  __cplusplus
 408  406  }
 409  407  #endif
 410  408  
 411  409  #endif  /* _SYS_CDIO_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX