Changeset 730dce77 in mainline for uspace/drv/block/ahci/ahci_sata.h

Timestamp:

2012-07-17T16:35:09Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1bebadee, ae3ff9f5

Parents:

a00d555

Message:

get rid of the packed structure attribute (there should be no unwanted padding present)
this fixes compilation for arm32

File:

• uspace/drv/block/ahci/ahci_sata.h (modified) (3 diffs)

uspace/drv/block/ahci/ahci_sata.h

@@ -39 +39 @@
 typedef struct {
         /** FIS type - always 0x27. */
-        uint8_t fis_type;
+        unsigned int fis_type : 8;
         /** Indicate that FIS is a Command - always 0x80. */
-        uint8_t c;
+        unsigned int c : 8;
         /** Command - Identity device - 0xec, Set fetures - 0xef. */
-        uint8_t command;
+        unsigned int command : 8;
         /** Features - subcommand for set features - set tranfer mode - 0x03. */
-        uint8_t features;
+        unsigned int features : 8;
         /** 0:23 bits of LBA. */
-        uint32_t lba_lower : 24;
+        unsigned int lba_lower : 24;
         /** Device. */
-        uint8_t device;
+        unsigned int device : 8;
         /** 24:47 bits of LBA. */
-        uint32_t lba_upper : 24;
+        unsigned int lba_upper : 24;
         /** Features - subcommand for set features - set tranfer mode - 0x03. */
-        uint8_t features_upper;
+        unsigned int features_upper : 8;
         /** Sector count - transfer mode for set transfer mode operation. */
-        uint16_t count;
-        /** Reserved. */
-        uint8_t reserved1;
+        unsigned int count : 16;
+        /** Reserved. */
+        unsigned int reserved1 : 8;
         /** Control. */
-        uint8_t control;
-        /** Reserved. */
-        uint32_t reserved2;
-} __attribute__((packed)) std_command_frame_t;
+        unsigned int control : 8;
+        /** Reserved. */
+        unsigned int reserved2 : 32;
+} std_command_frame_t;
 
 /** Command frame for NCQ data operation. */
@@ -105 +105 @@
         /** Reserved. */
         uint8_t reserved6;
-} __attribute__((packed)) ncq_command_frame_t;
+} ncq_command_frame_t;
 
 /** Data returned from identify device and identify packet device command. */
@@ -187 +187 @@
         uint16_t _vs128[1 + 159 - 128];
         uint16_t reserved160[1 + 255 - 160];
-} __attribute__((packed)) identify_data_t;
+} identify_data_t;
 
 /** Capability bits for register device. */