debian/patches/52_remove-pragma.diff

   1 --- a/atacmds.h
   2 +++ b/atacmds.h
   3 @@ -134,7 +134,6 @@ enum {
   4
   5  // Needed parts of the ATA DRIVE IDENTIFY Structure. Those labeled
   6  // word* are NOT used.
   7 -#pragma pack(1)
   8  struct ata_identify_device {
   9    unsigned short words000_009[10];
  10    unsigned char  serial_no[20];
  11 @@ -156,7 +155,6 @@ struct ata_identify_device {
  12  ASSERT_SIZEOF_STRUCT(ata_identify_device, 512);
  13
  14  /* ata_smart_attribute is the vendor specific in SFF-8035 spec */
  15 -#pragma pack(1)
  16  struct ata_smart_attribute {
  17    unsigned char id;
  18    // meaning of flag bits: see MACROS just below
  19 @@ -217,7 +215,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_attribute
  20
  21  // Format of data returned by SMART READ DATA
  22  // Table 62 of T13/1699-D (ATA8-ACS) Revision 6a, September 2008
  23 -#pragma pack(1)
  24  struct ata_smart_values {
  25    unsigned short int revnumber;
  26    struct ata_smart_attribute vendor_attributes [NUMBER_ATA_SMART_ATTRIBUTES];
  27 @@ -250,7 +247,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_values, 5
  28  */
  29
  30  /* Vendor attribute of SMART Threshold (compare to ata_smart_attribute above) */
  31 -#pragma pack(1)
  32  struct ata_smart_threshold_entry {
  33    unsigned char id;
  34    unsigned char threshold;
  35 @@ -261,7 +257,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
  36
  37  /* Format of Read SMART THreshold Command */
  38  /* Compare to ata_smart_values above */
  39 -#pragma pack(1)
  40  struct ata_smart_thresholds_pvt {
  41    unsigned short int revnumber;
  42    struct ata_smart_threshold_entry thres_entries[NUMBER_ATA_SMART_ATTRIBUTES];
  43 @@ -273,7 +268,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
  44
  45
  46  // Table 42 of T13/1321D Rev 1 spec (Error Data Structure)
  47 -#pragma pack(1)
  48  struct ata_smart_errorlog_error_struct {
  49    unsigned char reserved;
  50    unsigned char error_register;
  51 @@ -292,7 +286,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_
  52
  53
  54  // Table 41 of T13/1321D Rev 1 spec (Command Data Structure)
  55 -#pragma pack(1)
  56  struct ata_smart_errorlog_command_struct {
  57    unsigned char devicecontrolreg;
  58    unsigned char featuresreg;
  59 @@ -308,7 +301,6 @@ struct ata_smart_errorlog_command_struct
  60  ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_command_struct, 12);
  61
  62  // Table 40 of T13/1321D Rev 1 spec (Error log data structure)
  63 -#pragma pack(1)
  64  struct ata_smart_errorlog_struct {
  65    struct ata_smart_errorlog_command_struct commands[5];
  66    struct ata_smart_errorlog_error_struct error_struct;
  67 @@ -317,7 +309,6 @@ struct ata_smart_errorlog_struct {
  68  ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_struct, 90);
  69
  70  // Table 39 of T13/1321D Rev 1 spec (SMART error log sector)
  71 -#pragma pack(1)
  72  struct ata_smart_errorlog {
  73    unsigned char revnumber;
  74    unsigned char error_log_pointer;
  75 @@ -414,7 +405,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_exterrlog
  76
  77
  78  // Table 45 of T13/1321D Rev 1 spec (Self-test log descriptor entry)
  79 -#pragma pack(1)
  80  struct ata_smart_selftestlog_struct {
  81    unsigned char selftestnumber; // Sector number register
  82    unsigned char selfteststatus;
  83 @@ -427,7 +417,6 @@ struct ata_smart_selftestlog_struct {
  84  ASSERT_SIZEOF_STRUCT(ata_smart_selftestlog_struct, 24);
  85
  86  // Table 44 of T13/1321D Rev 1 spec (Self-test log data structure)
  87 -#pragma pack(1)
  88  struct ata_smart_selftestlog {
  89    unsigned short int revnumber;
  90    struct ata_smart_selftestlog_struct selftest_struct[21];
  91 @@ -476,7 +465,6 @@ struct ata_smart_extselftestlog
  92  ASSERT_SIZEOF_STRUCT(ata_smart_extselftestlog, 512);
  93
  94  // SMART LOG DIRECTORY Table 52 of T13/1532D Vol 1 Rev 1a
  95 -#pragma pack(1)
  96  struct ata_smart_log_entry {
  97    unsigned char numsectors;
  98    unsigned char reserved;
  99 @@ -484,7 +472,6 @@ struct ata_smart_log_entry {
 100  #pragma pack()
 101  ASSERT_SIZEOF_STRUCT(ata_smart_log_entry, 2);
 102
 103 -#pragma pack(1)
 104  struct ata_smart_log_directory {
 105    unsigned short int logversion;
 106    struct ata_smart_log_entry entry[255];
 107 @@ -494,7 +481,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_log_direc
 108
 109  // SMART SELECTIVE SELF-TEST LOG Table 61 of T13/1532D Volume 1
 110  // Revision 3
 111 -#pragma pack(1)
 112  struct test_span {
 113    uint64_t start;
 114    uint64_t end;
 115 @@ -502,7 +488,6 @@ struct test_span {
 116  #pragma pack()
 117  ASSERT_SIZEOF_STRUCT(test_span, 16);
 118
 119 -#pragma pack(1)
 120  struct ata_selective_self_test_log {
 121    unsigned short     logversion;
 122    struct test_span   span[5];