]> git.proxmox.com Git - mirror_smartmontools-debian.git/blame - debian/patches/52_remove-pragma.diff
Refresh original patches with new upstream release
[mirror_smartmontools-debian.git] / debian / patches / 52_remove-pragma.diff
CommitLineData
4c436a28
SL
1From: Giuseppe Iuculano <iuculano@debian.org>
2Date: Thu, 27 Sep 2018 19:03:07 +0800
3Subject: _remove-pragma
4
5---
6 atacmds.h | 15 ---------------
7 1 file changed, 15 deletions(-)
8
9diff --git a/atacmds.h b/atacmds.h
10index cbb20b6..15e54d4 100644
901fe9c1
GI
11--- a/atacmds.h
12+++ b/atacmds.h
4c436a28 13@@ -130,7 +130,6 @@ typedef enum {
e020d8f8
GG
14
15 // Needed parts of the ATA DRIVE IDENTIFY Structure. Those labeled
16 // word* are NOT used.
17-#pragma pack(1)
18 struct ata_identify_device {
19 unsigned short words000_009[10];
20 unsigned char serial_no[20];
4c436a28 21@@ -152,7 +151,6 @@ struct ata_identify_device {
e020d8f8
GG
22 ASSERT_SIZEOF_STRUCT(ata_identify_device, 512);
23
24 /* ata_smart_attribute is the vendor specific in SFF-8035 spec */
25-#pragma pack(1)
26 struct ata_smart_attribute {
27 unsigned char id;
28 // meaning of flag bits: see MACROS just below
4c436a28 29@@ -213,7 +211,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_attribute, 12);
e020d8f8 30
9fcd4498
GI
31 // Format of data returned by SMART READ DATA
32 // Table 62 of T13/1699-D (ATA8-ACS) Revision 6a, September 2008
e020d8f8
GG
33-#pragma pack(1)
34 struct ata_smart_values {
35 unsigned short int revnumber;
36 struct ata_smart_attribute vendor_attributes [NUMBER_ATA_SMART_ATTRIBUTES];
4c436a28 37@@ -246,7 +243,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_values, 512);
e020d8f8
GG
38 */
39
40 /* Vendor attribute of SMART Threshold (compare to ata_smart_attribute above) */
41-#pragma pack(1)
42 struct ata_smart_threshold_entry {
43 unsigned char id;
44 unsigned char threshold;
4c436a28 45@@ -257,7 +253,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_threshold_entry, 12);
e020d8f8
GG
46
47 /* Format of Read SMART THreshold Command */
48 /* Compare to ata_smart_values above */
49-#pragma pack(1)
50 struct ata_smart_thresholds_pvt {
51 unsigned short int revnumber;
52 struct ata_smart_threshold_entry thres_entries[NUMBER_ATA_SMART_ATTRIBUTES];
4c436a28 53@@ -269,7 +264,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_thresholds_pvt, 512);
e020d8f8
GG
54
55
56 // Table 42 of T13/1321D Rev 1 spec (Error Data Structure)
57-#pragma pack(1)
58 struct ata_smart_errorlog_error_struct {
59 unsigned char reserved;
60 unsigned char error_register;
4c436a28 61@@ -288,7 +282,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_error_struct, 30);
e020d8f8
GG
62
63
64 // Table 41 of T13/1321D Rev 1 spec (Command Data Structure)
65-#pragma pack(1)
66 struct ata_smart_errorlog_command_struct {
67 unsigned char devicecontrolreg;
68 unsigned char featuresreg;
4c436a28 69@@ -304,7 +297,6 @@ struct ata_smart_errorlog_command_struct {
e020d8f8
GG
70 ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_command_struct, 12);
71
72 // Table 40 of T13/1321D Rev 1 spec (Error log data structure)
73-#pragma pack(1)
74 struct ata_smart_errorlog_struct {
75 struct ata_smart_errorlog_command_struct commands[5];
76 struct ata_smart_errorlog_error_struct error_struct;
4c436a28 77@@ -313,7 +305,6 @@ struct ata_smart_errorlog_struct {
e020d8f8
GG
78 ASSERT_SIZEOF_STRUCT(ata_smart_errorlog_struct, 90);
79
80 // Table 39 of T13/1321D Rev 1 spec (SMART error log sector)
81-#pragma pack(1)
82 struct ata_smart_errorlog {
83 unsigned char revnumber;
84 unsigned char error_log_pointer;
4c436a28 85@@ -410,7 +401,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_exterrlog, 512);
6052436d 86
e020d8f8
GG
87
88 // Table 45 of T13/1321D Rev 1 spec (Self-test log descriptor entry)
89-#pragma pack(1)
90 struct ata_smart_selftestlog_struct {
91 unsigned char selftestnumber; // Sector number register
92 unsigned char selfteststatus;
4c436a28 93@@ -423,7 +413,6 @@ struct ata_smart_selftestlog_struct {
e020d8f8
GG
94 ASSERT_SIZEOF_STRUCT(ata_smart_selftestlog_struct, 24);
95
96 // Table 44 of T13/1321D Rev 1 spec (Self-test log data structure)
97-#pragma pack(1)
98 struct ata_smart_selftestlog {
99 unsigned short int revnumber;
100 struct ata_smart_selftestlog_struct selftest_struct[21];
4c436a28 101@@ -472,7 +461,6 @@ struct ata_smart_extselftestlog
6052436d 102 ASSERT_SIZEOF_STRUCT(ata_smart_extselftestlog, 512);
e020d8f8
GG
103
104 // SMART LOG DIRECTORY Table 52 of T13/1532D Vol 1 Rev 1a
105-#pragma pack(1)
106 struct ata_smart_log_entry {
107 unsigned char numsectors;
108 unsigned char reserved;
4c436a28 109@@ -480,7 +468,6 @@ struct ata_smart_log_entry {
e020d8f8
GG
110 #pragma pack()
111 ASSERT_SIZEOF_STRUCT(ata_smart_log_entry, 2);
112
113-#pragma pack(1)
114 struct ata_smart_log_directory {
115 unsigned short int logversion;
116 struct ata_smart_log_entry entry[255];
4c436a28 117@@ -490,7 +477,6 @@ ASSERT_SIZEOF_STRUCT(ata_smart_log_directory, 512);
e020d8f8
GG
118
119 // SMART SELECTIVE SELF-TEST LOG Table 61 of T13/1532D Volume 1
120 // Revision 3
121-#pragma pack(1)
122 struct test_span {
123 uint64_t start;
124 uint64_t end;
4c436a28 125@@ -498,7 +484,6 @@ struct test_span {
e020d8f8
GG
126 #pragma pack()
127 ASSERT_SIZEOF_STRUCT(test_span, 16);
128
129-#pragma pack(1)
130 struct ata_selective_self_test_log {
131 unsigned short logversion;
132 struct test_span span[5];