Changeset 1cf0a17 in mainline

Timestamp:

2012-08-17T22:53:20Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4a9704ad

Parents:

cf56332

Message:

isa: Use element name during initialization, add comments.

Makes code more readable and easier to check against specs.

File:

• uspace/drv/bus/isa/i8237.c (modified) (1 diff)

uspace/drv/bus/isa/i8237.c

@@ -199 +199 @@
         .channels = {
                 /* The first chip 8-bit */
-                {
-                        (uint8_t *) 0x00,
-                        (uint8_t *) 0x01,
-                        (uint8_t *) 0x87,
-                        (uint8_t *) 0x0a,
-                        (uint8_t *) 0x0b,
-                        (uint8_t *) 0x0c,
-                },
-                {
-                        (uint8_t *) 0x02,
-                        (uint8_t *) 0x03,
-                        (uint8_t *) 0x83,
-                        (uint8_t *) 0x0a,
-                        (uint8_t *) 0x0b,
-                        (uint8_t *) 0x0c,
-                },
-                {
-                        (uint8_t *) 0x04,
-                        (uint8_t *) 0x05,
-                        (uint8_t *) 0x81,
-                        (uint8_t *) 0x0a,
-                        (uint8_t *) 0x0b,
-                        (uint8_t *) 0x0c,
-                },
-                {
-                        (uint8_t *) 0x06,
-                        (uint8_t *) 0x07,
-                        (uint8_t *) 0x82,
-                        (uint8_t *) 0x0a,
-                        (uint8_t *) 0x0b,
-                        (uint8_t *) 0x0c,
+                { /* Channel 0 - Unusable*/
+                        .offset_reg_address = (uint8_t *) 0x00,
+                        .size_reg_address = (uint8_t *) 0x01,
+                        .page_reg_address = (uint8_t *) 0x87,
+                        .single_mask_address = (uint8_t *) 0x0a,
+                        .mode_address = (uint8_t *) 0x0b,
+                        .flip_flop_address = (uint8_t *) 0x0c,
+                },
+                { /* Channel 1 */
+                        .offset_reg_address = (uint8_t *) 0x02,
+                        .size_reg_address = (uint8_t *) 0x03,
+                        .page_reg_address = (uint8_t *) 0x83,
+                        .single_mask_address = (uint8_t *) 0x0a,
+                        .mode_address = (uint8_t *) 0x0b,
+                        .flip_flop_address = (uint8_t *) 0x0c,
+                },
+                { /* Channel 2 */
+                        .offset_reg_address = (uint8_t *) 0x04,
+                        .size_reg_address = (uint8_t *) 0x05,
+                        .page_reg_address = (uint8_t *) 0x81,
+                        .single_mask_address = (uint8_t *) 0x0a,
+                        .mode_address = (uint8_t *) 0x0b,
+                        .flip_flop_address = (uint8_t *) 0x0c,
+                },
+                { /* Channel 3 */
+                        .offset_reg_address = (uint8_t *) 0x06,
+                        .size_reg_address = (uint8_t *) 0x07,
+                        .page_reg_address = (uint8_t *) 0x82,
+                        .single_mask_address = (uint8_t *) 0x0a,
+                        .mode_address = (uint8_t *) 0x0b,
+                        .flip_flop_address = (uint8_t *) 0x0c,
                 },
                 
                 /* The second chip 16-bit */
-                {
-                        (uint8_t *) 0xc0,
-                        (uint8_t *) 0xc2,
-                        (uint8_t *) 0x8f,
-                        (uint8_t *) 0xd4,
-                        (uint8_t *) 0xd6,
-                        (uint8_t *) 0xd8,
-                },
-                {
-                        (uint8_t *) 0xc4,
-                        (uint8_t *) 0xc6,
-                        (uint8_t *) 0x8b,
-                        (uint8_t *) 0xd4,
-                        (uint8_t *) 0xd6,
-                        (uint8_t *) 0xd8,
-                },
-                {
-                        (uint8_t *) 0xc8,
-                        (uint8_t *) 0xca,
-                        (uint8_t *) 0x89,
-                        (uint8_t *) 0xd4,
-                        (uint8_t *) 0xd6,
-                        (uint8_t *) 0xd8,
-                },
-                {
-                        (uint8_t *) 0xcc,
-                        (uint8_t *) 0xce,
-                        (uint8_t *) 0x8a,
-                        (uint8_t *) 0xd4,
-                        (uint8_t *) 0xd6,
-                        (uint8_t *) 0xd8,
+                { /* Channel 4 - Unusable */
+                        .offset_reg_address = (uint8_t *) 0xc0,
+                        .size_reg_address = (uint8_t *) 0xc2,
+                        .page_reg_address = (uint8_t *) 0x8f,
+                        .single_mask_address = (uint8_t *) 0xd4,
+                        .mode_address = (uint8_t *) 0xd6,
+                        .flip_flop_address = (uint8_t *) 0xd8,
+                },
+                { /* Channel 5 */
+                        .offset_reg_address = (uint8_t *) 0xc4,
+                        .size_reg_address = (uint8_t *) 0xc6,
+                        .page_reg_address = (uint8_t *) 0x8b,
+                        .single_mask_address = (uint8_t *) 0xd4,
+                        .mode_address = (uint8_t *) 0xd6,
+                        .flip_flop_address = (uint8_t *) 0xd8,
+                },
+                { /* Channel 6 */
+                        .offset_reg_address = (uint8_t *) 0xc8,
+                        .size_reg_address = (uint8_t *) 0xca,
+                        .page_reg_address = (uint8_t *) 0x89,
+                        .single_mask_address = (uint8_t *) 0xd4,
+                        .mode_address = (uint8_t *) 0xd6,
+                        .flip_flop_address = (uint8_t *) 0xd8,
+                },
+                { /* Channel 7 */
+                        .offset_reg_address = (uint8_t *) 0xcc,
+                        .size_reg_address = (uint8_t *) 0xce,
+                        .page_reg_address = (uint8_t *) 0x8a,
+                        .single_mask_address = (uint8_t *) 0xd4,
+                        .mode_address = (uint8_t *) 0xd6,
+                        .flip_flop_address = (uint8_t *) 0xd8,
                 },
         },