Refreshed patches and removed patches applied upstream

[mirror_smartmontools-debian.git] / debian / patches / 52_remove-pragma.diff

diff --git a/debian/patches/52_remove-pragma.diff b/debian/patches/52_remove-pragma.diff
index c8f9cf5be5a1cb6081eacdf026bc0b7b56fa01e7..1b81bc1a3a651291c39396b6f3d87807beca153b 100644 (file)
--- a/debian/patches/52_remove-pragma.diff
+++ b/debian/patches/52_remove-pragma.diff
@@ -1,6 +1,6 @@
 --- a/atacmds.h
 +++ b/atacmds.h
-@@ -134,7 +134,6 @@ enum {
+@@ -125,7 +125,6 @@ typedef enum {
  
  // Needed parts of the ATA DRIVE IDENTIFY Structure. Those labeled
  // word* are NOT used.
@@ -8,7 +8,7 @@
  struct ata_identify_device {
    unsigned short words000_009[10];
    unsigned char  serial_no[20];
-@@ -156,7 +155,6 @@ struct ata_identify_device {
+@@ -147,7 +146,6 @@ struct ata_identify_device {
  ASSERT_SIZEOF_STRUCT(ata_identify_device, 512);
  
  /* ata_smart_attribute is the vendor specific in SFF-8035 spec */ 
@@ -16,7 +16,7 @@
  struct ata_smart_attribute {
    unsigned char id;
    // meaning of flag bits: see MACROS just below
-@@ -217,7 +215,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_attribute
+@@ -208,7 +206,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_attribute
  
  // Format of data returned by SMART READ DATA
  // Table 62 of T13/1699-D (ATA8-ACS) Revision 6a, September 2008
@@ -24,7 +24,7 @@
  struct ata_smart_values {
    unsigned short int revnumber;
    struct ata_smart_attribute vendor_attributes [NUMBER_ATA_SMART_ATTRIBUTES];
-@@ -250,7 +247,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_values, 5
+@@ -241,7 +238,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_values, 5
  */
  
  /* Vendor attribute of SMART Threshold (compare to ata_smart_attribute above) */
@@ -32,7 +32,7 @@
  struct ata_smart_threshold_entry {
    unsigned char id;
    unsigned char threshold;
-@@ -261,7 +257,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
+@@ -252,7 +248,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
  
  /* Format of Read SMART THreshold Command */
  /* Compare to ata_smart_values above */
@@ -40,7 +40,7 @@
  struct ata_smart_thresholds_pvt {
    unsigned short int revnumber;
    struct ata_smart_threshold_entry thres_entries[NUMBER_ATA_SMART_ATTRIBUTES];
-@@ -273,7 +268,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
+@@ -264,7 +259,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold
  
  
  // Table 42 of T13/1321D Rev 1 spec (Error Data Structure)
@@ -48,7 +48,7 @@
  struct ata_smart_errorlog_error_struct {
    unsigned char reserved;
    unsigned char error_register;
-@@ -292,7 +286,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_
+@@ -283,7 +277,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_
  
  
  // Table 41 of T13/1321D Rev 1 spec (Command Data Structure)
@@ -56,7 +56,7 @@
  struct ata_smart_errorlog_command_struct {
    unsigned char devicecontrolreg;
    unsigned char featuresreg;
-@@ -308,7 +301,6 @@ struct ata_smart_errorlog_command_struct
+@@ -299,7 +292,6 @@ struct ata_smart_errorlog_command_struct
  ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_command_struct, 12);
  
  // Table 40 of T13/1321D Rev 1 spec (Error log data structure)
@@ -64,7 +64,7 @@
  struct ata_smart_errorlog_struct {
    struct ata_smart_errorlog_command_struct commands[5];
    struct ata_smart_errorlog_error_struct error_struct;
-@@ -317,7 +309,6 @@ struct ata_smart_errorlog_struct {
+@@ -308,7 +300,6 @@ struct ata_smart_errorlog_struct {
  ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_struct, 90);
  
  // Table 39 of T13/1321D Rev 1 spec (SMART error log sector)
@@ -72,7 +72,7 @@
  struct ata_smart_errorlog {
    unsigned char revnumber;
    unsigned char error_log_pointer;
-@@ -414,7 +405,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_exterrlog
+@@ -405,7 +396,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_exterrlog
  
  
  // Table 45 of T13/1321D Rev 1 spec (Self-test log descriptor entry)
@@ -80,7 +80,7 @@
  struct ata_smart_selftestlog_struct {
    unsigned char selftestnumber; // Sector number register
    unsigned char selfteststatus;
-@@ -427,7 +417,6 @@ struct ata_smart_selftestlog_struct {
+@@ -418,7 +408,6 @@ struct ata_smart_selftestlog_struct {
  ASSERT_SIZEOF_STRUCT(ata_smart_selftestlog_struct, 24);
  
  // Table 44 of T13/1321D Rev 1 spec (Self-test log data structure)
@@ -88,7 +88,7 @@
  struct ata_smart_selftestlog {
    unsigned short int revnumber;
    struct ata_smart_selftestlog_struct selftest_struct[21];
-@@ -476,7 +465,6 @@ struct ata_smart_extselftestlog
+@@ -467,7 +456,6 @@ struct ata_smart_extselftestlog
  ASSERT_SIZEOF_STRUCT(ata_smart_extselftestlog, 512);
  
  // SMART LOG DIRECTORY Table 52 of T13/1532D Vol 1 Rev 1a
@@ -96,7 +96,7 @@
  struct ata_smart_log_entry {
    unsigned char numsectors;
    unsigned char reserved;
-@@ -484,7 +472,6 @@ struct ata_smart_log_entry {
+@@ -475,7 +463,6 @@ struct ata_smart_log_entry {
  #pragma pack()
  ASSERT_SIZEOF_STRUCT(ata_smart_log_entry, 2);
  
@@ -104,7 +104,7 @@
  struct ata_smart_log_directory {
    unsigned short int logversion;
    struct ata_smart_log_entry entry[255];
-@@ -494,7 +481,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_log_direc
+@@ -485,7 +472,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_log_direc
  
  // SMART SELECTIVE SELF-TEST LOG Table 61 of T13/1532D Volume 1
  // Revision 3
@@ -112,7 +112,7 @@
  struct test_span {
    uint64_t start;
    uint64_t end;
-@@ -502,7 +488,6 @@ struct test_span {
+@@ -493,7 +479,6 @@ struct test_span {
  #pragma pack()
  ASSERT_SIZEOF_STRUCT(test_span, 16);