From 215b685f7fd7d2f9a04260bb164be31ddc001ea2 Mon Sep 17 00:00:00 2001 From: X512 Date: Sun, 11 Dec 2022 13:39:22 -0600 Subject: [PATCH] kernel: Drop non-standard GNU inline assignment syntax * We needed this previously due to our gcc2 compiled kernel. * Now that our kernel is always latest gcc, we can move to the c++20 syntax for inline assignment. * Improves compatibility with clang, less GNU-specific stuff Change-Id: Ib7272a0a52554a31e9a0e788fd3f031db9049795 Reviewed-on: https://review.haiku-os.org/c/haiku/+/5898 Reviewed-by: Alex von Gluck IV Reviewed-by: Adrien Destugues --- headers/private/drivers/scsi_periph.h | 2 +- .../bus_managers/acpi/EmbeddedController.cpp | 2 +- .../kernel/bus_managers/acpi/Module.cpp | 29 ++++++------ .../kernel/bus_managers/ata/ATAModule.cpp | 8 ++-- .../kernel/bus_managers/fdt/fdt_module.cpp | 16 +++---- .../kernel/bus_managers/i2c/I2CBus.cpp | 14 +++--- .../kernel/bus_managers/i2c/I2CModule.cpp | 6 +-- src/add-ons/kernel/bus_managers/isa/isa.cpp | 4 +- .../kernel/bus_managers/mmc/mmc_bus.cpp | 20 ++++----- .../kernel/bus_managers/mmc/mmc_module.cpp | 4 +- src/add-ons/kernel/bus_managers/pci/pci.cpp | 44 +++++++++---------- .../kernel/bus_managers/pci/pci_root.cpp | 26 +++++------ .../kernel/bus_managers/random/driver.cpp | 4 +- .../kernel/bus_managers/scsi/devices.cpp | 26 +++++------ .../bus_managers/scsi/sim_interface.cpp | 8 ++-- .../kernel/bus_managers/usb/Device.cpp | 8 ++-- .../bus_managers/virtio/VirtioModule.cpp | 4 +- .../bus_managers/virtio/virtio_balloon.cpp | 2 +- .../kernel/busses/ata/ide_isa/ide_isa.c | 18 ++++---- .../busses/ata/promise_tx2/promise_tx2.c | 21 +++++---- .../silicon_image_3112/silicon_image_3112.c | 32 +++++++------- .../kernel/busses/i2c/pch/pch_i2c_acpi.cpp | 6 +-- .../kernel/busses/i2c/pch/pch_i2c_pci.cpp | 10 ++--- src/add-ons/kernel/busses/mmc/sdhci_pci.cpp | 22 +++++----- src/add-ons/kernel/busses/random/ccp/ccp.cpp | 4 +- .../kernel/busses/random/ccp/ccp_acpi.cpp | 6 +-- .../kernel/busses/random/ccp/ccp_pci.cpp | 6 +-- src/add-ons/kernel/busses/scsi/ahci/ahci.c | 28 ++++++------ .../kernel/busses/scsi/virtio/virtio_scsi.cpp | 20 ++++----- src/add-ons/kernel/busses/usb/ehci.cpp | 12 ++--- src/add-ons/kernel/busses/usb/ohci.cpp | 6 +-- src/add-ons/kernel/busses/usb/uhci.cpp | 6 +-- src/add-ons/kernel/busses/usb/xhci.cpp | 6 +-- .../busses/virtio/virtio_mmio/virtio_mmio.cpp | 13 +++--- .../busses/virtio/virtio_pci/virtio_pci.cpp | 10 ++--- .../kernel/drivers/bus/scsi/scsi_raw.c | 8 ++-- .../kernel/drivers/disk/mmc/mmc_disk.cpp | 2 +- .../kernel/drivers/disk/nvme/nvme_disk.cpp | 2 +- .../drivers/disk/scsi/scsi_cd/scsi_cd.cpp | 6 +-- .../drivers/disk/scsi/scsi_disk/scsi_disk.cpp | 6 +-- .../disk/virtual/ram_disk/ram_disk.cpp | 10 ++--- .../virtual/virtio_block/virtio_block.cpp | 2 +- .../drivers/display/display_adapter.cpp | 8 ++-- .../kernel/drivers/input/i2c_hid/Driver.cpp | 4 +- .../input/virtio_input/virtio_input.cpp | 2 +- .../drivers/network/ether/usb_ecm/Driver.cpp | 2 +- .../network/ether/virtio/virtio_net.cpp | 2 +- .../kernel/drivers/power/acpi_ac/acpi_ac.cpp | 2 +- .../power/acpi_battery/acpi_battery.cpp | 2 +- .../drivers/power/acpi_button/acpi_button.cpp | 2 +- .../drivers/power/acpi_lid/acpi_lid.cpp | 2 +- .../drivers/power/acpi_thermal/acpi_thermal.c | 2 +- .../drivers/power/pch_thermal/pch_thermal.cpp | 2 +- .../power/x86_cpuidle/acpi_cpuidle.cpp | 2 +- .../drivers/sensor/acpi_als/acpi_als.cpp | 2 +- src/add-ons/kernel/drivers/wmi/WMIACPI.cpp | 10 ++--- src/add-ons/kernel/drivers/wmi/WMIAsus.cpp | 2 +- .../generic/ata_adapter/ata_adapter.cpp | 32 +++++++------- .../interrupt_controllers/openpic/openpic.cpp | 6 +-- .../kernel/device_manager/device_manager.cpp | 12 ++--- 60 files changed, 291 insertions(+), 294 deletions(-) diff --git a/headers/private/drivers/scsi_periph.h b/headers/private/drivers/scsi_periph.h index e2ad93cbd1..3e08c5abf8 100644 --- a/headers/private/drivers/scsi_periph.h +++ b/headers/private/drivers/scsi_periph.h @@ -44,7 +44,7 @@ typedef struct err_res { } err_res; #define MK_ERROR( aaction, code ) ({ \ - err_res _res = {error_code: (code), action: (aaction) }; \ + err_res _res = {.error_code = (code), .action = (aaction) }; \ _res; \ }) diff --git a/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.cpp b/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.cpp index 3d2ec16d03..acde29456c 100644 --- a/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.cpp +++ b/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.cpp @@ -269,7 +269,7 @@ embedded_controller_register_device(device_node* node) { device_attr attrs[] = { { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: "ACPI embedded controller" }}, + { .string = "ACPI embedded controller" }}, { NULL } }; diff --git a/src/add-ons/kernel/bus_managers/acpi/Module.cpp b/src/add-ons/kernel/bus_managers/acpi/Module.cpp index c22907f0e0..cc5e9ef626 100644 --- a/src/add-ons/kernel/bus_managers/acpi/Module.cpp +++ b/src/add-ons/kernel/bus_managers/acpi/Module.cpp @@ -57,9 +57,8 @@ static status_t acpi_module_register_device(device_node* parent) { device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "ACPI" }}, - - { B_DEVICE_FLAGS, B_UINT32_TYPE, { ui32: B_KEEP_DRIVER_LOADED }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "ACPI" }}, + { B_DEVICE_FLAGS, B_UINT32_TYPE, { .ui32 = B_KEEP_DRIVER_LOADED }}, {} }; @@ -88,15 +87,15 @@ acpi_enumerate_child_devices(device_node* node, const char* root) case ACPI_TYPE_DEVICE: { device_attr attrs[16] = { // info about device - { B_DEVICE_BUS, B_STRING_TYPE, { string: "acpi" }}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "acpi" }}, // location on ACPI bus - { ACPI_DEVICE_PATH_ITEM, B_STRING_TYPE, { string: result }}, + { ACPI_DEVICE_PATH_ITEM, B_STRING_TYPE, { .string = result }}, // info about the device - { ACPI_DEVICE_TYPE_ITEM, B_UINT32_TYPE, { ui32: type }}, + { ACPI_DEVICE_TYPE_ITEM, B_UINT32_TYPE, { .ui32 = type }}, - { B_DEVICE_FLAGS, B_UINT32_TYPE, { ui32: B_FIND_MULTIPLE_CHILDREN }}, + { B_DEVICE_FLAGS, B_UINT32_TYPE, { .ui32 = B_FIND_MULTIPLE_CHILDREN }}, { NULL } }; @@ -175,14 +174,14 @@ acpi_module_register_child_devices(void* cookie) dprintf("registering power button\n"); device_attr attrs[] = { // info about device - { B_DEVICE_BUS, B_STRING_TYPE, { string: "acpi" }}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "acpi" }}, // info about the device - { ACPI_DEVICE_HID_ITEM, B_STRING_TYPE, { string: "ACPI_FPB" }}, - { ACPI_DEVICE_TYPE_ITEM, B_UINT32_TYPE, { ui32: ACPI_TYPE_DEVICE }}, + { ACPI_DEVICE_HID_ITEM, B_STRING_TYPE, { .string = "ACPI_FPB" }}, + { ACPI_DEVICE_TYPE_ITEM, B_UINT32_TYPE, { .ui32 = ACPI_TYPE_DEVICE }}, // consumer specification - { B_DEVICE_FLAGS, B_UINT32_TYPE, { ui32: B_FIND_MULTIPLE_CHILDREN }}, + { B_DEVICE_FLAGS, B_UINT32_TYPE, { .ui32 = B_FIND_MULTIPLE_CHILDREN }}, { NULL } }; device_node* deviceNode; @@ -193,14 +192,14 @@ acpi_module_register_child_devices(void* cookie) dprintf("registering sleep button\n"); device_attr attrs[] = { // info about device - { B_DEVICE_BUS, B_STRING_TYPE, { string: "acpi" }}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "acpi" }}, // info about the device - { ACPI_DEVICE_HID_ITEM, B_STRING_TYPE, { string: "ACPI_FSB" }}, - { ACPI_DEVICE_TYPE_ITEM, B_UINT32_TYPE, { ui32: ACPI_TYPE_DEVICE }}, + { ACPI_DEVICE_HID_ITEM, B_STRING_TYPE, { .string = "ACPI_FSB" }}, + { ACPI_DEVICE_TYPE_ITEM, B_UINT32_TYPE, { .ui32 = ACPI_TYPE_DEVICE }}, // consumer specification - { B_DEVICE_FLAGS, B_UINT32_TYPE, { ui32: B_FIND_MULTIPLE_CHILDREN }}, + { B_DEVICE_FLAGS, B_UINT32_TYPE, { .ui32 = B_FIND_MULTIPLE_CHILDREN }}, { NULL } }; device_node* deviceNode; diff --git a/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp b/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp index 5d5c16f30c..3549330cea 100644 --- a/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp +++ b/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp @@ -182,12 +182,12 @@ ata_channel_added(device_node *parent) device_attr attributes[] = { { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - { string: SCSI_FOR_SIM_MODULE_NAME } + { .string = SCSI_FOR_SIM_MODULE_NAME } }, { SCSI_DESCRIPTION_CONTROLLER_NAME, B_STRING_TYPE, - { string: controllerName } + { .string = controllerName } }, // maximum number of blocks per transmission: @@ -195,8 +195,8 @@ ata_channel_added(device_node *parent) // but I'm not sure about controller restrictions // - ATA allows up to 256 blocks for LBA28 and 65535 for LBA48 // to fix specific drive bugs use ATAChannel::GetRestrictions() - { B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, { ui32: 0xffff } }, - { ATA_CHANNEL_ID_ITEM, B_UINT32_TYPE, { ui32: (uint32)channelID } }, + { B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, { .ui32 = 0xffff } }, + { ATA_CHANNEL_ID_ITEM, B_UINT32_TYPE, { .ui32 = (uint32)channelID } }, { NULL } }; diff --git a/src/add-ons/kernel/bus_managers/fdt/fdt_module.cpp b/src/add-ons/kernel/bus_managers/fdt/fdt_module.cpp index 381cb8dcbf..a249e662c2 100644 --- a/src/add-ons/kernel/bus_managers/fdt/fdt_module.cpp +++ b/src/add-ons/kernel/bus_managers/fdt/fdt_module.cpp @@ -99,15 +99,15 @@ fdt_register_node(fdt_bus* bus, int node, device_node* parentDev, return B_ERROR; } - attrs.Add({ B_DEVICE_BUS, B_STRING_TYPE, {string: "fdt"}}); + attrs.Add({ B_DEVICE_BUS, B_STRING_TYPE, {.string = "fdt"}}); attrs.Add({ B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: (strcmp(name, "") != 0) ? name : "Root" }}); - attrs.Add({ "fdt/node", B_UINT32_TYPE, {ui32: (uint32)node}}); - attrs.Add({ "fdt/name", B_STRING_TYPE, {string: name}}); + { .string = (strcmp(name, "") != 0) ? name : "Root" }}); + attrs.Add({ "fdt/node", B_UINT32_TYPE, {.ui32 = (uint32)node}}); + attrs.Add({ "fdt/name", B_STRING_TYPE, {.string = name}}); prop = fdt_getprop(gFDT, node, "device_type", &propLen); if (prop != NULL) - attrs.Add({ "fdt/device_type", B_STRING_TYPE, { string: (const char*)prop }}); + attrs.Add({ "fdt/device_type", B_STRING_TYPE, { .string = (const char*)prop }}); prop = fdt_getprop(gFDT, node, "compatible", &propLen); @@ -116,7 +116,7 @@ fdt_register_node(fdt_bus* bus, int node, device_node* parentDev, const char* propEnd = propStr + propLen; while (propEnd - propStr > 0) { int curLen = strlen(propStr); - attrs.Add({ "fdt/compatible", B_STRING_TYPE, { string: propStr }}); + attrs.Add({ "fdt/compatible", B_STRING_TYPE, { .string = propStr }}); propStr += curLen + 1; } } @@ -201,8 +201,8 @@ fdt_bus_register_device(device_node* parent) } scopeExit; device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "FDT"}}, - {B_DEVICE_FLAGS, B_UINT32_TYPE, {ui32: B_KEEP_DRIVER_LOADED}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "FDT"}}, + {B_DEVICE_FLAGS, B_UINT32_TYPE, {.ui32 = B_KEEP_DRIVER_LOADED}}, {} }; diff --git a/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp b/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp index 8639c009a0..4892f84022 100644 --- a/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp +++ b/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp @@ -57,21 +57,21 @@ I2CBus::RegisterDevice(i2c_addr slaveAddress, char* hid, char** cid, CALLED(); device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "I2C device" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "I2C device" }}, // connection - { I2C_DEVICE_SLAVE_ADDR_ITEM, B_UINT16_TYPE, { ui16: slaveAddress }}, + { I2C_DEVICE_SLAVE_ADDR_ITEM, B_UINT16_TYPE, { .ui16 = slaveAddress }}, // description of peripheral drivers - { B_DEVICE_BUS, B_STRING_TYPE, { string: "i2c" }}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "i2c" }}, - { B_DEVICE_FLAGS, B_UINT32_TYPE, { ui32: B_FIND_MULTIPLE_CHILDREN }}, + { B_DEVICE_FLAGS, B_UINT32_TYPE, { .ui32 = B_FIND_MULTIPLE_CHILDREN }}, - { ACPI_DEVICE_HID_ITEM, B_STRING_TYPE, { string: hid }}, + { ACPI_DEVICE_HID_ITEM, B_STRING_TYPE, { .string = hid }}, - { ACPI_DEVICE_CID_ITEM, B_STRING_TYPE, { string: cid[0] }}, + { ACPI_DEVICE_CID_ITEM, B_STRING_TYPE, { .string = cid[0] }}, - { ACPI_DEVICE_HANDLE_ITEM, B_UINT64_TYPE, { ui64: (addr_t)acpiHandle }}, + { ACPI_DEVICE_HANDLE_ITEM, B_UINT64_TYPE, { .ui64 = (addr_t)acpiHandle }}, { NULL } }; diff --git a/src/add-ons/kernel/bus_managers/i2c/I2CModule.cpp b/src/add-ons/kernel/bus_managers/i2c/I2CModule.cpp index b0dac5671b..892be4c2cb 100644 --- a/src/add-ons/kernel/bus_managers/i2c/I2CModule.cpp +++ b/src/add-ons/kernel/bus_managers/i2c/I2CModule.cpp @@ -26,9 +26,9 @@ i2c_added_device(device_node *parent) device_attr attributes[] = { // info about device - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "I2C bus" }}, - { B_DEVICE_BUS, B_STRING_TYPE, { string: "i2c" }}, - { I2C_BUS_PATH_ID_ITEM, B_UINT8_TYPE, { ui8: (uint8)pathID }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "I2C bus" }}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "i2c" }}, + { I2C_BUS_PATH_ID_ITEM, B_UINT8_TYPE, { .ui8 = (uint8)pathID }}, { NULL } }; diff --git a/src/add-ons/kernel/bus_managers/isa/isa.cpp b/src/add-ons/kernel/bus_managers/isa/isa.cpp index 7ba86b7052..2ef29aadfc 100644 --- a/src/add-ons/kernel/bus_managers/isa/isa.cpp +++ b/src/add-ons/kernel/bus_managers/isa/isa.cpp @@ -111,9 +111,9 @@ isa_register_device(device_node *parent) { static const device_attr attrs[] = { // tell where to look for child devices - {B_DEVICE_BUS, B_STRING_TYPE, {string: "isa" }}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "isa" }}, {B_DEVICE_FLAGS, B_UINT32_TYPE, - {ui32: B_FIND_CHILD_ON_DEMAND | B_FIND_MULTIPLE_CHILDREN}}, + {.ui32 = B_FIND_CHILD_ON_DEMAND | B_FIND_MULTIPLE_CHILDREN}}, {} }; diff --git a/src/add-ons/kernel/bus_managers/mmc/mmc_bus.cpp b/src/add-ons/kernel/bus_managers/mmc/mmc_bus.cpp index c27999d9e5..560dab9fc5 100644 --- a/src/add-ons/kernel/bus_managers/mmc/mmc_bus.cpp +++ b/src/add-ons/kernel/bus_managers/mmc/mmc_bus.cpp @@ -289,16 +289,16 @@ MMCBus::_WorkerThread(void* cookie) uint16_t rca = response >> 16; device_attr attrs[] = { - { B_DEVICE_BUS, B_STRING_TYPE, {string: "mmc" }}, - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "mmc device" }}, - { B_DEVICE_VENDOR_ID, B_UINT32_TYPE, {ui32: vendor}}, - { B_DEVICE_ID, B_STRING_TYPE, {string: name}}, - { B_DEVICE_UNIQUE_ID, B_UINT32_TYPE, {ui32: serial}}, - { "mmc/revision", B_UINT16_TYPE, {ui16: revision}}, - { "mmc/month", B_UINT8_TYPE, {ui8: month}}, - { "mmc/year", B_UINT16_TYPE, {ui16: year}}, - { kMmcRcaAttribute, B_UINT16_TYPE, {ui16: rca}}, - { kMmcTypeAttribute, B_UINT8_TYPE, {ui8: cardType}}, + { B_DEVICE_BUS, B_STRING_TYPE, {.string = "mmc" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "mmc device" }}, + { B_DEVICE_VENDOR_ID, B_UINT32_TYPE, {.ui32 = vendor}}, + { B_DEVICE_ID, B_STRING_TYPE, {.string = name}}, + { B_DEVICE_UNIQUE_ID, B_UINT32_TYPE, {.ui32 = serial}}, + { "mmc/revision", B_UINT16_TYPE, {.ui16 = revision}}, + { "mmc/month", B_UINT8_TYPE, {.ui8 = month}}, + { "mmc/year", B_UINT16_TYPE, {.ui16 = year}}, + { kMmcRcaAttribute, B_UINT16_TYPE, {.ui16 = rca}}, + { kMmcTypeAttribute, B_UINT8_TYPE, {.ui8 = cardType}}, {} }; diff --git a/src/add-ons/kernel/bus_managers/mmc/mmc_module.cpp b/src/add-ons/kernel/bus_managers/mmc/mmc_module.cpp index c74bafa9b6..cfb87f2972 100644 --- a/src/add-ons/kernel/bus_managers/mmc/mmc_module.cpp +++ b/src/add-ons/kernel/bus_managers/mmc/mmc_module.cpp @@ -67,8 +67,8 @@ mmc_bus_added_device(device_node* parent) CALLED(); device_attr attributes[] = { - { B_DEVICE_BUS, B_STRING_TYPE, { string: "mmc"}}, - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "MMC bus root"}}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "mmc"}}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "MMC bus root"}}, { NULL } }; diff --git a/src/add-ons/kernel/bus_managers/pci/pci.cpp b/src/add-ons/kernel/bus_managers/pci/pci.cpp index da467105cf..a4a7ebc497 100644 --- a/src/add-ons/kernel/bus_managers/pci/pci.cpp +++ b/src/add-ons/kernel/bus_managers/pci/pci.cpp @@ -125,27 +125,27 @@ pci_reserve_device(uchar virtualBus, uchar device, uchar function, device_attr matchThis[] = { // info about device - {B_DEVICE_BUS, B_STRING_TYPE, {string: "pci"}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "pci"}}, // location on PCI bus - {B_PCI_DEVICE_DOMAIN, B_UINT8_TYPE, {ui8: domain}}, - {B_PCI_DEVICE_BUS, B_UINT8_TYPE, {ui8: bus}}, - {B_PCI_DEVICE_DEVICE, B_UINT8_TYPE, {ui8: device}}, - {B_PCI_DEVICE_FUNCTION, B_UINT8_TYPE, {ui8: function}}, + {B_PCI_DEVICE_DOMAIN, B_UINT8_TYPE, {.ui8 = domain}}, + {B_PCI_DEVICE_BUS, B_UINT8_TYPE, {.ui8 = bus}}, + {B_PCI_DEVICE_DEVICE, B_UINT8_TYPE, {.ui8 = device}}, + {B_PCI_DEVICE_FUNCTION, B_UINT8_TYPE, {.ui8 = function}}, {NULL} }; device_attr legacyAttrs[] = { // info about device - {B_DEVICE_BUS, B_STRING_TYPE, {string: "legacy_driver"}}, - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "Legacy Driver Reservation"}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "legacy_driver"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "Legacy Driver Reservation"}}, {NULL} }; device_attr drvAttrs[] = { // info about device - {B_DEVICE_BUS, B_STRING_TYPE, {string: "legacy_driver"}}, - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: driverName}}, - {"legacy_driver", B_STRING_TYPE, {string: driverName}}, - {"legacy_driver_cookie", B_UINT64_TYPE, {ui64: (uint64)nodeCookie}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "legacy_driver"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = driverName}}, + {"legacy_driver", B_STRING_TYPE, {.string = driverName}}, + {"legacy_driver_cookie", B_UINT64_TYPE, {.ui64 = (uint64)nodeCookie}}, {NULL} }; device_node *node, *legacy; @@ -205,31 +205,31 @@ pci_unreserve_device(uchar virtualBus, uchar device, uchar function, // domain, bus, device, function, driverName, nodeCookie)); device_attr matchPCIRoot[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "PCI"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "PCI"}}, {NULL} }; device_attr matchThis[] = { // info about device - {B_DEVICE_BUS, B_STRING_TYPE, {string: "pci"}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "pci"}}, // location on PCI bus - {B_PCI_DEVICE_DOMAIN, B_UINT8_TYPE, {ui8: domain}}, - {B_PCI_DEVICE_BUS, B_UINT8_TYPE, {ui8: bus}}, - {B_PCI_DEVICE_DEVICE, B_UINT8_TYPE, {ui8: device}}, - {B_PCI_DEVICE_FUNCTION, B_UINT8_TYPE, {ui8: function}}, + {B_PCI_DEVICE_DOMAIN, B_UINT8_TYPE, {.ui8 = domain}}, + {B_PCI_DEVICE_BUS, B_UINT8_TYPE, {.ui8 = bus}}, + {B_PCI_DEVICE_DEVICE, B_UINT8_TYPE, {.ui8 = device}}, + {B_PCI_DEVICE_FUNCTION, B_UINT8_TYPE, {.ui8 = function}}, {NULL} }; device_attr legacyAttrs[] = { // info about device - {B_DEVICE_BUS, B_STRING_TYPE, {string: "legacy_driver"}}, - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "Legacy Driver Reservation"}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "legacy_driver"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "Legacy Driver Reservation"}}, {NULL} }; device_attr drvAttrs[] = { // info about device - {B_DEVICE_BUS, B_STRING_TYPE, {string: "legacy_driver"}}, - {"legacy_driver", B_STRING_TYPE, {string: driverName}}, - {"legacy_driver_cookie", B_UINT64_TYPE, {ui64: (uint64)nodeCookie}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "legacy_driver"}}, + {"legacy_driver", B_STRING_TYPE, {.string = driverName}}, + {"legacy_driver_cookie", B_UINT64_TYPE, {.ui64 = (uint64)nodeCookie}}, {NULL} }; device_node *root, *pci, *node, *legacy, *drv; diff --git a/src/add-ons/kernel/bus_managers/pci/pci_root.cpp b/src/add-ons/kernel/bus_managers/pci/pci_root.cpp index 4a7dc4e22f..df8b2f902a 100644 --- a/src/add-ons/kernel/bus_managers/pci/pci_root.cpp +++ b/src/add-ons/kernel/bus_managers/pci/pci_root.cpp @@ -81,8 +81,8 @@ pci_root_register_device(device_node* parent) {} }; device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "PCI"}}, - {B_DEVICE_FLAGS, B_UINT32_TYPE, {ui32: B_KEEP_DRIVER_LOADED}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "PCI"}}, + {B_DEVICE_FLAGS, B_UINT32_TYPE, {.ui32 = B_KEEP_DRIVER_LOADED}}, {} }; @@ -107,23 +107,23 @@ pci_root_register_child_devices(void* cookie) device_attr attrs[] = { // info about device - {B_DEVICE_BUS, B_STRING_TYPE, {string: "pci"}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "pci"}}, // location on PCI bus - {B_PCI_DEVICE_DOMAIN, B_UINT8_TYPE, {ui8: domain}}, - {B_PCI_DEVICE_BUS, B_UINT8_TYPE, {ui8: bus}}, - {B_PCI_DEVICE_DEVICE, B_UINT8_TYPE, {ui8: info.device}}, - {B_PCI_DEVICE_FUNCTION, B_UINT8_TYPE, {ui8: info.function}}, + {B_PCI_DEVICE_DOMAIN, B_UINT8_TYPE, {.ui8 = domain}}, + {B_PCI_DEVICE_BUS, B_UINT8_TYPE, {.ui8 = bus}}, + {B_PCI_DEVICE_DEVICE, B_UINT8_TYPE, {.ui8 = info.device}}, + {B_PCI_DEVICE_FUNCTION, B_UINT8_TYPE, {.ui8 = info.function}}, // info about the device - {B_DEVICE_VENDOR_ID, B_UINT16_TYPE, { ui16: info.vendor_id }}, - {B_DEVICE_ID, B_UINT16_TYPE, { ui16: info.device_id }}, + {B_DEVICE_VENDOR_ID, B_UINT16_TYPE, {.ui16 = info.vendor_id}}, + {B_DEVICE_ID, B_UINT16_TYPE, {.ui16 = info.device_id}}, - {B_DEVICE_TYPE, B_UINT16_TYPE, { ui16: info.class_base }}, - {B_DEVICE_SUB_TYPE, B_UINT16_TYPE, { ui16: info.class_sub }}, - {B_DEVICE_INTERFACE, B_UINT16_TYPE, { ui16: info.class_api }}, + {B_DEVICE_TYPE, B_UINT16_TYPE, {.ui16 = info.class_base}}, + {B_DEVICE_SUB_TYPE, B_UINT16_TYPE, {.ui16 = info.class_sub}}, + {B_DEVICE_INTERFACE, B_UINT16_TYPE, {.ui16 = info.class_api}}, - {B_DEVICE_FLAGS, B_UINT32_TYPE, {ui32: B_FIND_CHILD_ON_DEMAND}}, + {B_DEVICE_FLAGS, B_UINT32_TYPE, {.ui32 = B_FIND_CHILD_ON_DEMAND}}, {} }; diff --git a/src/add-ons/kernel/bus_managers/random/driver.cpp b/src/add-ons/kernel/bus_managers/random/driver.cpp index d5486f5e1f..602cbce585 100644 --- a/src/add-ons/kernel/bus_managers/random/driver.cpp +++ b/src/add-ons/kernel/bus_managers/random/driver.cpp @@ -170,8 +170,8 @@ random_register_device(device_node *node) // ready to register device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "Random" }}, - { B_DEVICE_FLAGS, B_UINT32_TYPE, { ui32: B_KEEP_DRIVER_LOADED }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "Random" }}, + { B_DEVICE_FLAGS, B_UINT32_TYPE, { .ui32 = B_KEEP_DRIVER_LOADED }}, { NULL } }; diff --git a/src/add-ons/kernel/bus_managers/scsi/devices.cpp b/src/add-ons/kernel/bus_managers/scsi/devices.cpp index 95e705ac1e..d01cab6938 100644 --- a/src/add-ons/kernel/bus_managers/scsi/devices.cpp +++ b/src/add-ons/kernel/bus_managers/scsi/devices.cpp @@ -114,29 +114,29 @@ scsi_register_device(scsi_bus_info *bus, uchar target_id, char product_rev[sizeof( inquiry_data->product_rev ) + 1]; device_attr attrs[] = { // connection - { SCSI_DEVICE_TARGET_ID_ITEM, B_UINT8_TYPE, { ui8: target_id }}, - { SCSI_DEVICE_TARGET_LUN_ITEM, B_UINT8_TYPE, { ui8: target_lun }}, + { SCSI_DEVICE_TARGET_ID_ITEM, B_UINT8_TYPE, { .ui8 = target_id }}, + { SCSI_DEVICE_TARGET_LUN_ITEM, B_UINT8_TYPE, { .ui8 = target_lun }}, // inquiry data (used for both identification and information) { SCSI_DEVICE_INQUIRY_ITEM, B_RAW_TYPE, - { raw: { inquiry_data, sizeof( *inquiry_data ) }}}, + { .raw = { inquiry_data, sizeof( *inquiry_data ) }}}, // some more info for driver loading - { SCSI_DEVICE_TYPE_ITEM, B_UINT8_TYPE, { ui8: inquiry_data->device_type }}, - { SCSI_DEVICE_VENDOR_ITEM, B_STRING_TYPE, { string: vendor_ident }}, - { SCSI_DEVICE_PRODUCT_ITEM, B_STRING_TYPE, { string: product_ident }}, - { SCSI_DEVICE_REVISION_ITEM, B_STRING_TYPE, { string: product_rev }}, + { SCSI_DEVICE_TYPE_ITEM, B_UINT8_TYPE, { .ui8 = inquiry_data->device_type }}, + { SCSI_DEVICE_VENDOR_ITEM, B_STRING_TYPE, { .string = vendor_ident }}, + { SCSI_DEVICE_PRODUCT_ITEM, B_STRING_TYPE, { .string = product_ident }}, + { SCSI_DEVICE_REVISION_ITEM, B_STRING_TYPE, { .string = product_rev }}, // description of peripheral drivers - { B_DEVICE_BUS, B_STRING_TYPE, { string: "scsi" }}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "scsi" }}, // extra restriction of maximum number of blocks per transfer - { B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, { ui32: max_blocks }}, + { B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, { .ui32 = max_blocks }}, // atapi emulation - { SCSI_DEVICE_IS_ATAPI_ITEM, B_UINT8_TYPE, { ui8: is_atapi }}, + { SCSI_DEVICE_IS_ATAPI_ITEM, B_UINT8_TYPE, { .ui8 = is_atapi }}, // manual autosense - { SCSI_DEVICE_MANUAL_AUTOSENSE_ITEM, B_UINT8_TYPE, { ui8: manual_autosense }}, + { SCSI_DEVICE_MANUAL_AUTOSENSE_ITEM, B_UINT8_TYPE, { .ui8 = manual_autosense }}, { NULL } }; @@ -382,8 +382,8 @@ scsi_force_get_device(scsi_bus_info *bus, uchar target_id, uchar target_lun, scsi_device_info **res_device) { device_attr attrs[] = { - { SCSI_DEVICE_TARGET_ID_ITEM, B_UINT8_TYPE, { ui8: target_id }}, - { SCSI_DEVICE_TARGET_LUN_ITEM, B_UINT8_TYPE, { ui8: target_lun }}, + { SCSI_DEVICE_TARGET_ID_ITEM, B_UINT8_TYPE, { .ui8 = target_id }}, + { SCSI_DEVICE_TARGET_LUN_ITEM, B_UINT8_TYPE, { .ui8 = target_lun }}, { NULL } }; device_node *node; diff --git a/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp b/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp index af6a519be4..355dbd642a 100644 --- a/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp +++ b/src/add-ons/kernel/bus_managers/scsi/sim_interface.cpp @@ -47,16 +47,16 @@ scsi_controller_added(device_node *parent) { device_attr attrs[] = { { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: "SCSI Controller" }}, + { .string = "SCSI Controller" }}, // remember who we are // (could use the controller name, but probably some software would choke) // TODO create_id() generates a 32 bit ranged integer but we need only 8 bits - { SCSI_BUS_PATH_ID_ITEM, B_UINT8_TYPE, { ui8: (uint8)pathID }}, + { SCSI_BUS_PATH_ID_ITEM, B_UINT8_TYPE, { .ui8 = (uint8)pathID }}, // tell PnP manager to clean up ID -// { PNP_MANAGER_ID_GENERATOR, B_STRING_TYPE, { string: SCSI_PATHID_GENERATOR }}, -// { PNP_MANAGER_AUTO_ID, B_UINT32_TYPE, { ui32: path_id }}, +// { PNP_MANAGER_ID_GENERATOR, B_STRING_TYPE, { .string = SCSI_PATHID_GENERATOR }}, +// { PNP_MANAGER_AUTO_ID, B_UINT32_TYPE, { .ui32 = path_id }}, {} }; diff --git a/src/add-ons/kernel/bus_managers/usb/Device.cpp b/src/add-ons/kernel/bus_managers/usb/Device.cpp index ac1d34e8ed..7e960bc760 100644 --- a/src/add-ons/kernel/bus_managers/usb/Device.cpp +++ b/src/add-ons/kernel/bus_managers/usb/Device.cpp @@ -843,14 +843,14 @@ Device::RegisterNode(device_node *parent) parent = ((Device*)Parent())->Node(); device_attr attrs[128] = { - { B_DEVICE_BUS, B_STRING_TYPE, { string: "usb" }}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "usb" }}, // location - { USB_DEVICE_ID_ITEM, B_UINT32_TYPE, { ui32: id }}, + { USB_DEVICE_ID_ITEM, B_UINT32_TYPE, { .ui32 = id }}, - { B_DEVICE_FLAGS, B_UINT32_TYPE, { ui32: B_FIND_MULTIPLE_CHILDREN }}, + { B_DEVICE_FLAGS, B_UINT32_TYPE, { .ui32 = B_FIND_MULTIPLE_CHILDREN }}, - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "USB device" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "USB device" }}, { NULL } }; diff --git a/src/add-ons/kernel/bus_managers/virtio/VirtioModule.cpp b/src/add-ons/kernel/bus_managers/virtio/VirtioModule.cpp index cb321dcb94..4c65fc81a4 100644 --- a/src/add-ons/kernel/bus_managers/virtio/VirtioModule.cpp +++ b/src/add-ons/kernel/bus_managers/virtio/VirtioModule.cpp @@ -220,9 +220,9 @@ virtio_added_device(device_node *parent) device_attr attributes[] = { // info about device - { B_DEVICE_BUS, B_STRING_TYPE, { string: "virtio" }}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "virtio" }}, { VIRTIO_DEVICE_TYPE_ITEM, B_UINT16_TYPE, - { ui16: deviceType }}, + { .ui16 = deviceType }}, { NULL } }; diff --git a/src/add-ons/kernel/bus_managers/virtio/virtio_balloon.cpp b/src/add-ons/kernel/bus_managers/virtio/virtio_balloon.cpp index 2874ef0f24..519faf210f 100644 --- a/src/add-ons/kernel/bus_managers/virtio/virtio_balloon.cpp +++ b/src/add-ons/kernel/bus_managers/virtio/virtio_balloon.cpp @@ -111,7 +111,7 @@ virtio_balloon_register_child_devices(void *cookie) device_attr attrs[] = { { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: VIRTIO_BALLOON_CONTROLLER_PRETTY_NAME }}, + { .string = VIRTIO_BALLOON_CONTROLLER_PRETTY_NAME }}, { NULL } }; diff --git a/src/add-ons/kernel/busses/ata/ide_isa/ide_isa.c b/src/add-ons/kernel/busses/ata/ide_isa/ide_isa.c index 3eaa40c7ed..8cfbd03a59 100644 --- a/src/add-ons/kernel/busses/ata/ide_isa/ide_isa.c +++ b/src/add-ons/kernel/busses/ata/ide_isa/ide_isa.c @@ -64,23 +64,23 @@ publish_channel(device_node *parent, uint16 command_block_base, uint16 control_block_base, uint8 intnum, const char *name) { device_attr attrs[] = { - { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, { string: ATA_FOR_CONTROLLER_MODULE_NAME }}, + { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, { .string = ATA_FOR_CONTROLLER_MODULE_NAME }}, // properties of this controller for ata bus manager - { ATA_CONTROLLER_MAX_DEVICES_ITEM, B_UINT8_TYPE, { ui8: 2 }}, - { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { ui8: 0 }}, - { ATA_CONTROLLER_CONTROLLER_NAME_ITEM, B_STRING_TYPE, { string: name }}, + { ATA_CONTROLLER_MAX_DEVICES_ITEM, B_UINT8_TYPE, { .ui8 = 2 }}, + { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { .ui8 = 0 }}, + { ATA_CONTROLLER_CONTROLLER_NAME_ITEM, B_STRING_TYPE, { .string = name }}, // DMA properties; the 16 bit alignment is not necessary as // the ata bus manager handles that very efficiently, but why // not use the block device manager for doing that? - { B_DMA_ALIGNMENT, B_UINT32_TYPE, { ui32: 1 }}, - { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { ui64: 0x100000000LL }}, + { B_DMA_ALIGNMENT, B_UINT32_TYPE, { .ui32 = 1 }}, + { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { .ui64 = 0x100000000LL }}, // private data to identify device - { ATA_ISA_COMMAND_BLOCK_BASE, B_UINT16_TYPE, { ui16: command_block_base }}, - { ATA_ISA_CONTROL_BLOCK_BASE, B_UINT16_TYPE, { ui16: control_block_base }}, - { ATA_ISA_INTNUM, B_UINT8_TYPE, { ui8: intnum }}, + { ATA_ISA_COMMAND_BLOCK_BASE, B_UINT16_TYPE, { .ui16 = command_block_base }}, + { ATA_ISA_CONTROL_BLOCK_BASE, B_UINT16_TYPE, { .ui16 = control_block_base }}, + { ATA_ISA_INTNUM, B_UINT8_TYPE, { .ui8 = intnum }}, { NULL } }; io_resource resources[3] = { diff --git a/src/add-ons/kernel/busses/ata/promise_tx2/promise_tx2.c b/src/add-ons/kernel/busses/ata/promise_tx2/promise_tx2.c index c97cb323e3..c6b40fe8c1 100644 --- a/src/add-ons/kernel/busses/ata/promise_tx2/promise_tx2.c +++ b/src/add-ons/kernel/busses/ata/promise_tx2/promise_tx2.c @@ -179,28 +179,27 @@ publish_controller(device_node *parent, uint16 bus_master_base, uint8 intnum, device_attr attrs[] = { // properties of this controller for ide bus manager // there are always max. 2 devices - { ATA_CONTROLLER_MAX_DEVICES_ITEM, B_UINT8_TYPE, { ui8: 2 }}, + { ATA_CONTROLLER_MAX_DEVICES_ITEM, B_UINT8_TYPE, { .ui8 = 2 }}, // of course we can DMA - { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { ui8: 1 }}, + { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { .ui8 = 1 }}, // choose any name here - { ATA_CONTROLLER_CONTROLLER_NAME_ITEM, B_STRING_TYPE, { string: "Promise TX2" }}, + { ATA_CONTROLLER_CONTROLLER_NAME_ITEM, B_STRING_TYPE, { .string = "Promise TX2" }}, // DMA properties // some say it must be dword-aligned, others that it can be byte-aligned; // stay on the safe side - { B_DMA_ALIGNMENT, B_UINT32_TYPE, { ui32: 3 }}, + { B_DMA_ALIGNMENT, B_UINT32_TYPE, { .ui32 = 3 }}, // one S/G block must not cross 64K boundary - { B_DMA_BOUNDARY, B_UINT32_TYPE, { ui32: 0xffff }}, + { B_DMA_BOUNDARY, B_UINT32_TYPE, { .ui32 = 0xffff }}, // size of S/G block is 16 bits with zero being 64K - { B_DMA_MAX_SEGMENT_BLOCKS, B_UINT32_TYPE, { ui32: 0x10000 }}, - { B_DMA_MAX_SEGMENT_COUNT, B_UINT32_TYPE, - { ui32: ATA_ADAPTER_MAX_SG_COUNT }}, - { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { ui64: 0x100000000LL }}, + { B_DMA_MAX_SEGMENT_BLOCKS, B_UINT32_TYPE, { .ui32 = 0x10000 }}, + { B_DMA_MAX_SEGMENT_COUNT, B_UINT32_TYPE, { .ui32 = ATA_ADAPTER_MAX_SG_COUNT }}, + { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { .ui64 = 0x100000000LL }}, // private data to find controller - { ATA_ADAPTER_BUS_MASTER_BASE, B_UINT16_TYPE, { ui16: bus_master_base }}, + { ATA_ADAPTER_BUS_MASTER_BASE, B_UINT16_TYPE, { .ui16 = bus_master_base }}, // store interrupt in controller node - { ATA_ADAPTER_INTNUM, B_UINT8_TYPE, { ui8: intnum }}, + { ATA_ADAPTER_INTNUM, B_UINT8_TYPE, { .ui8 = intnum }}, { NULL } }; diff --git a/src/add-ons/kernel/busses/ata/silicon_image_3112/silicon_image_3112.c b/src/add-ons/kernel/busses/ata/silicon_image_3112/silicon_image_3112.c index 457fc4eff0..b0dd894d76 100644 --- a/src/add-ons/kernel/busses/ata/silicon_image_3112/silicon_image_3112.c +++ b/src/add-ons/kernel/busses/ata/silicon_image_3112/silicon_image_3112.c @@ -205,32 +205,32 @@ controller_probe(device_node *parent) // (unless this is a Compact Flash Card with a built-in ATA // controller, which has exactly 1 device) { ATA_CONTROLLER_MAX_DEVICES_ITEM, B_UINT8_TYPE, - { ui8: kASICData[asicIndex].channel_count }}, + { .ui8 = kASICData[asicIndex].channel_count }}, // of course we can DMA - { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { ui8: true }}, + { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { .ui8 = true }}, // choose any name here { ATA_CONTROLLER_CONTROLLER_NAME_ITEM, B_STRING_TYPE, - { string: CONTROLLER_NAME }}, + { .string = CONTROLLER_NAME }}, // DMA properties // data must be word-aligned; // warning: some controllers are more picky! - { B_DMA_ALIGNMENT, B_UINT32_TYPE, { ui32: 1}}, + { B_DMA_ALIGNMENT, B_UINT32_TYPE, { .ui32 = 1}}, // one S/G block must not cross 64K boundary - { B_DMA_BOUNDARY, B_UINT32_TYPE, { ui32: 0xffff }}, + { B_DMA_BOUNDARY, B_UINT32_TYPE, { .ui32 = 0xffff }}, // max size of S/G block is 16 bits with zero being 64K - { B_DMA_MAX_SEGMENT_BLOCKS, B_UINT32_TYPE, { ui32: 0x10000 }}, + { B_DMA_MAX_SEGMENT_BLOCKS, B_UINT32_TYPE, { .ui32 = 0x10000 }}, { B_DMA_MAX_SEGMENT_COUNT, B_UINT32_TYPE, - { ui32: ATA_ADAPTER_MAX_SG_COUNT }}, - { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { ui64: 0x100000000LL }}, + { .ui32 = ATA_ADAPTER_MAX_SG_COUNT }}, + { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { .ui64 = 0x100000000LL }}, // private data to find controller { "silicon_image_3112/asic_index", B_UINT32_TYPE, - { ui32: asicIndex }}, + { .ui32 = asicIndex }}, { "silicon_image_3112/mmio_base", B_UINT32_TYPE, - { ui32: mmioBase }}, + { .ui32 = mmioBase }}, { "silicon_image_3112/int_num", B_UINT32_TYPE, - { ui32: interruptNumber }}, + { .ui32 = interruptNumber }}, { NULL } }; @@ -373,13 +373,13 @@ controller_register_channels(void *cookie) for (index = 0; index < kASICData[controller->asic_index].channel_count; index++) { device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: DRIVER_PRETTY_NAME }}, -// { PNP_DRIVER_CONNECTION, B_STRING_TYPE, { string: kControllerChannelData[channelIndex].name }}, - { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, { string: ATA_FOR_CONTROLLER_MODULE_NAME }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = DRIVER_PRETTY_NAME }}, +// { PNP_DRIVER_CONNECTION, B_STRING_TYPE, { .string = kControllerChannelData[channelIndex].name }}, + { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, { .string = ATA_FOR_CONTROLLER_MODULE_NAME }}, // private data to identify channel - { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { ui8: true }}, - { "silicon_image_3112/chan_index", B_UINT32_TYPE, { ui32: index }}, + { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { .ui8 = true }}, + { "silicon_image_3112/chan_index", B_UINT32_TYPE, { .ui32 = index }}, { NULL } }; diff --git a/src/add-ons/kernel/busses/i2c/pch/pch_i2c_acpi.cpp b/src/add-ons/kernel/busses/i2c/pch/pch_i2c_acpi.cpp index bfa7d1196d..b8aaa9c432 100644 --- a/src/add-ons/kernel/busses/i2c/pch/pch_i2c_acpi.cpp +++ b/src/add-ons/kernel/busses/i2c/pch/pch_i2c_acpi.cpp @@ -87,9 +87,9 @@ register_child_devices(void* cookie) device_attr attrs[] = { // properties of this controller for i2c bus manager { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: prettyName }}, + { .string = prettyName }}, { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - { string: I2C_FOR_CONTROLLER_MODULE_NAME }}, + { .string = I2C_FOR_CONTROLLER_MODULE_NAME }}, // private data to identify the device { NULL } @@ -163,7 +163,7 @@ static status_t register_device(device_node* parent) { device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "PCH I2C ACPI"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "PCH I2C ACPI"}}, {} }; diff --git a/src/add-ons/kernel/busses/i2c/pch/pch_i2c_pci.cpp b/src/add-ons/kernel/busses/i2c/pch/pch_i2c_pci.cpp index 9d5557854f..0e085d3c45 100644 --- a/src/add-ons/kernel/busses/i2c/pch/pch_i2c_pci.cpp +++ b/src/add-ons/kernel/busses/i2c/pch/pch_i2c_pci.cpp @@ -48,8 +48,8 @@ pci_scan_bus(i2c_bus_cookie cookie) device_node* deviceRoot = gDeviceManager->get_root_node(); uint32 addr = (pciInfo->device << 16) | pciInfo->function; device_attr acpiAttrs[] = { - { B_DEVICE_BUS, B_STRING_TYPE, { string: "acpi" }}, - { ACPI_DEVICE_ADDR_ITEM, B_UINT32_TYPE, {ui32: addr}}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "acpi" }}, + { ACPI_DEVICE_ADDR_ITEM, B_UINT32_TYPE, {.ui32 = addr}}, { NULL } }; if (addr != 0 && gDeviceManager->find_child_node(deviceRoot, acpiAttrs, @@ -89,9 +89,9 @@ register_child_devices(void* cookie) device_attr attrs[] = { // properties of this controller for i2c bus manager { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: prettyName }}, + { .string = prettyName }}, { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - { string: I2C_FOR_CONTROLLER_MODULE_NAME }}, + { .string = I2C_FOR_CONTROLLER_MODULE_NAME }}, // private data to identify the device { NULL } @@ -232,7 +232,7 @@ static status_t register_device(device_node* parent) { device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "PCH I2C PCI"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "PCH I2C PCI"}}, {} }; diff --git a/src/add-ons/kernel/busses/mmc/sdhci_pci.cpp b/src/add-ons/kernel/busses/mmc/sdhci_pci.cpp index 437e4ff216..99bae13c7d 100644 --- a/src/add-ons/kernel/busses/mmc/sdhci_pci.cpp +++ b/src/add-ons/kernel/busses/mmc/sdhci_pci.cpp @@ -781,24 +781,24 @@ register_child_devices(void* cookie) sprintf(prettyName, "SDHC bus %" B_PRIu8, slot); device_attr attrs[] = { // properties of this controller for mmc bus manager - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: prettyName } }, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = prettyName } }, { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - {string: MMC_BUS_MODULE_NAME} }, - { B_DEVICE_BUS, B_STRING_TYPE, {string: "mmc"} }, + {.string = MMC_BUS_MODULE_NAME} }, + { B_DEVICE_BUS, B_STRING_TYPE, {.string = "mmc"} }, // DMA properties // The high alignment is to force access only to complete sectors // These constraints could be removed by using ADMA which allows // use of the full 64bit address space and can do scatter-gather. - { B_DMA_ALIGNMENT, B_UINT32_TYPE, { ui32: 511 }}, - { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { ui64: 0x100000000LL }}, - { B_DMA_BOUNDARY, B_UINT32_TYPE, { ui32: (1 << 19) - 1 }}, - { B_DMA_MAX_SEGMENT_COUNT, B_UINT32_TYPE, { ui32: 1 }}, - { B_DMA_MAX_SEGMENT_BLOCKS, B_UINT32_TYPE, { ui32: (1 << 10) - 1 }}, + { B_DMA_ALIGNMENT, B_UINT32_TYPE, { .ui32 = 511 }}, + { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { .ui64 = 0x100000000LL }}, + { B_DMA_BOUNDARY, B_UINT32_TYPE, { .ui32 = (1 << 19) - 1 }}, + { B_DMA_MAX_SEGMENT_COUNT, B_UINT32_TYPE, { .ui32 = 1 }}, + { B_DMA_MAX_SEGMENT_BLOCKS, B_UINT32_TYPE, { .ui32 = (1 << 10) - 1 }}, // private data to identify device - { SLOT_NUMBER, B_UINT8_TYPE, { ui8: slot} }, - { BAR_INDEX, B_UINT8_TYPE, { ui8: bar} }, + { SLOT_NUMBER, B_UINT8_TYPE, { .ui8 = slot} }, + { BAR_INDEX, B_UINT8_TYPE, { .ui8 = bar} }, { NULL } }; device_node* node; @@ -894,7 +894,7 @@ static status_t register_device(device_node* parent) { device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "SD Host Controller"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "SD Host Controller"}}, {} }; diff --git a/src/add-ons/kernel/busses/random/ccp/ccp.cpp b/src/add-ons/kernel/busses/random/ccp/ccp.cpp index 08b27e6ffc..fa3fff4e4e 100644 --- a/src/add-ons/kernel/busses/random/ccp/ccp.cpp +++ b/src/add-ons/kernel/busses/random/ccp/ccp.cpp @@ -55,8 +55,8 @@ static status_t register_device(device_node* parent) { device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "CCP device"}}, - {B_DEVICE_BUS, B_STRING_TYPE, {string: "CCP"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "CCP device"}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "CCP"}}, {} }; diff --git a/src/add-ons/kernel/busses/random/ccp/ccp_acpi.cpp b/src/add-ons/kernel/busses/random/ccp/ccp_acpi.cpp index 3796aad448..e61eeda924 100644 --- a/src/add-ons/kernel/busses/random/ccp/ccp_acpi.cpp +++ b/src/add-ons/kernel/busses/random/ccp/ccp_acpi.cpp @@ -109,9 +109,9 @@ static status_t register_device(device_node* parent) { device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "CCP ACPI"}}, - {B_DEVICE_BUS, B_STRING_TYPE, {string: "CCP"}}, - {B_DEVICE_FIXED_CHILD, B_STRING_TYPE, {string: CCP_DEVICE_MODULE_NAME}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "CCP ACPI"}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "CCP"}}, + {B_DEVICE_FIXED_CHILD, B_STRING_TYPE, {.string = CCP_DEVICE_MODULE_NAME}}, {} }; diff --git a/src/add-ons/kernel/busses/random/ccp/ccp_pci.cpp b/src/add-ons/kernel/busses/random/ccp/ccp_pci.cpp index 663da0f916..19a630b043 100644 --- a/src/add-ons/kernel/busses/random/ccp/ccp_pci.cpp +++ b/src/add-ons/kernel/busses/random/ccp/ccp_pci.cpp @@ -89,9 +89,9 @@ static status_t register_device(device_node* parent) { device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "CCP PCI"}}, - {B_DEVICE_BUS, B_STRING_TYPE, {string: "CCP"}}, - {B_DEVICE_FIXED_CHILD, B_STRING_TYPE, {string: CCP_DEVICE_MODULE_NAME}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "CCP PCI"}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "CCP"}}, + {B_DEVICE_FIXED_CHILD, B_STRING_TYPE, {.string = CCP_DEVICE_MODULE_NAME}}, {} }; diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci.c b/src/add-ons/kernel/busses/scsi/ahci/ahci.c index 017b719f1f..97e2990d33 100644 --- a/src/add-ons/kernel/busses/scsi/ahci/ahci.c +++ b/src/add-ons/kernel/busses/scsi/ahci/ahci.c @@ -174,17 +174,17 @@ register_sim(device_node *parent) { device_attr attrs[] = { { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - { string: SCSI_FOR_SIM_MODULE_NAME }}, + { .string = SCSI_FOR_SIM_MODULE_NAME }}, { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: AHCI_CONTROLLER_PRETTY_NAME }}, + { .string = AHCI_CONTROLLER_PRETTY_NAME }}, { SCSI_DESCRIPTION_CONTROLLER_NAME, B_STRING_TYPE, - { string: AHCI_DEVICE_MODULE_NAME }}, - { B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, { ui32: 255 }}, - { AHCI_ID_ITEM, B_UINT32_TYPE, { ui32: (uint32)id }}, + { .string = AHCI_DEVICE_MODULE_NAME }}, + { B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, { .ui32 = 255 }}, + { AHCI_ID_ITEM, B_UINT32_TYPE, { .ui32 = (uint32)id }}, // { PNP_MANAGER_ID_GENERATOR, B_STRING_TYPE, -// { string: AHCI_ID_GENERATOR }}, -// { PNP_MANAGER_AUTO_ID, B_UINT32_TYPE, { ui32: id }}, +// { .string = AHCI_ID_GENERATOR }}, +// { PNP_MANAGER_AUTO_ID, B_UINT32_TYPE, { .ui32 = id }}, { NULL } }; @@ -265,20 +265,20 @@ ahci_register_device(device_node *parent) { device_attr attrs[] = { { SCSI_DEVICE_MAX_TARGET_COUNT, B_UINT32_TYPE, - { ui32: 33 }}, + { .ui32 = 33 }}, { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: AHCI_BRIDGE_PRETTY_NAME }}, + { .string = AHCI_BRIDGE_PRETTY_NAME }}, // DMA properties // data must be word-aligned; - { B_DMA_ALIGNMENT, B_UINT32_TYPE, { ui32: 1 }}, + { B_DMA_ALIGNMENT, B_UINT32_TYPE, { .ui32 = 1 }}, // one S/G block must not cross 64K boundary - { B_DMA_BOUNDARY, B_UINT32_TYPE, { ui32: 0xffff }}, + { B_DMA_BOUNDARY, B_UINT32_TYPE, { .ui32 = 0xffff }}, // max size of S/G block is 16 bits with zero being 64K - { B_DMA_MAX_SEGMENT_BLOCKS, B_UINT32_TYPE, { ui32: 0x10000 }}, + { B_DMA_MAX_SEGMENT_BLOCKS, B_UINT32_TYPE, { .ui32 = 0x10000 }}, { B_DMA_MAX_SEGMENT_COUNT, B_UINT32_TYPE, - { ui32: 32 /* whatever... */ }}, - { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { ui64: 0x100000000LL }}, + { .ui32 = 32 /* whatever... */ }}, + { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { .ui64 = 0x100000000LL }}, // TODO: We don't know at this point whether 64 bit addressing is // supported. That's indicated by a capability flag. Play it safe // for now. diff --git a/src/add-ons/kernel/busses/scsi/virtio/virtio_scsi.cpp b/src/add-ons/kernel/busses/scsi/virtio/virtio_scsi.cpp index cd092a9c12..5ff9b7b0f3 100644 --- a/src/add-ons/kernel/busses/scsi/virtio/virtio_scsi.cpp +++ b/src/add-ons/kernel/busses/scsi/virtio/virtio_scsi.cpp @@ -212,16 +212,16 @@ virtio_scsi_register_device(device_node *parent) device_attr attrs[] = { { SCSI_DEVICE_MAX_TARGET_COUNT, B_UINT32_TYPE, - { ui32: max_targets }}, + { .ui32 = max_targets }}, { SCSI_DEVICE_MAX_LUN_COUNT, B_UINT32_TYPE, - { ui32: max_luns }}, + { .ui32 = max_luns }}, { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: VIRTIO_SCSI_BRIDGE_PRETTY_NAME }}, + { .string = VIRTIO_SCSI_BRIDGE_PRETTY_NAME }}, // DMA properties - { B_DMA_MAX_SEGMENT_BLOCKS, B_UINT32_TYPE, { ui32: max_blocks }}, + { B_DMA_MAX_SEGMENT_BLOCKS, B_UINT32_TYPE, { .ui32 = max_blocks }}, { B_DMA_MAX_SEGMENT_COUNT, B_UINT32_TYPE, - { ui32: config.seg_max }}, + { .ui32 = config.seg_max }}, { NULL } }; @@ -251,13 +251,13 @@ virtio_scsi_register_child_devices(void *cookie) device_attr attrs[] = { { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - { string: SCSI_FOR_SIM_MODULE_NAME }}, + { .string = SCSI_FOR_SIM_MODULE_NAME }}, { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: VIRTIO_SCSI_CONTROLLER_PRETTY_NAME }}, + { .string = VIRTIO_SCSI_CONTROLLER_PRETTY_NAME }}, { SCSI_DESCRIPTION_CONTROLLER_NAME, B_STRING_TYPE, - { string: VIRTIO_SCSI_DEVICE_MODULE_NAME }}, - { B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, { ui32: 255 }}, - { VIRTIO_SCSI_ID_ITEM, B_UINT32_TYPE, { ui32: (uint32)id }}, + { .string = VIRTIO_SCSI_DEVICE_MODULE_NAME }}, + { B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, { .ui32 = 255 }}, + { VIRTIO_SCSI_ID_ITEM, B_UINT32_TYPE, { .ui32 = (uint32)id }}, { NULL } }; diff --git a/src/add-ons/kernel/busses/usb/ehci.cpp b/src/add-ons/kernel/busses/usb/ehci.cpp index 9fd64fe3a1..a981e8edc6 100644 --- a/src/add-ons/kernel/busses/usb/ehci.cpp +++ b/src/add-ons/kernel/busses/usb/ehci.cpp @@ -107,9 +107,9 @@ register_child_devices(void* cookie) device_attr attrs[] = { // properties of this controller for the usb bus manager { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: prettyName }}, + { .string = prettyName }}, { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - { string: USB_FOR_CONTROLLER_MODULE_NAME }}, + { .string = USB_FOR_CONTROLLER_MODULE_NAME }}, // private data to identify the device { NULL } @@ -165,7 +165,7 @@ register_device(device_node* parent) { CALLED(); device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "EHCI PCI"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "EHCI PCI"}}, {} }; @@ -401,9 +401,9 @@ EHCI::EHCI(pci_info *info, pci_device_module_info* pci, pci_device* device, Stac device_node *pciNode = NULL; device_node* deviceRoot = gDeviceManager->get_root_node(); device_attr acpiAttrs[] = { - { B_DEVICE_BUS, B_STRING_TYPE, { string: "pci" }}, - { B_DEVICE_VENDOR_ID, B_UINT16_TYPE, {ui16: AMD_SBX00_VENDOR}}, - { B_DEVICE_ID, B_UINT16_TYPE, {ui16: AMD_SBX00_SMBUS_CONTROLLER}}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "pci" }}, + { B_DEVICE_VENDOR_ID, B_UINT16_TYPE, { .ui16 = AMD_SBX00_VENDOR }}, + { B_DEVICE_ID, B_UINT16_TYPE, { .ui16 = AMD_SBX00_SMBUS_CONTROLLER }}, { NULL } }; if (gDeviceManager->find_child_node(deviceRoot, acpiAttrs, diff --git a/src/add-ons/kernel/busses/usb/ohci.cpp b/src/add-ons/kernel/busses/usb/ohci.cpp index af842717fe..80146d0ceb 100644 --- a/src/add-ons/kernel/busses/usb/ohci.cpp +++ b/src/add-ons/kernel/busses/usb/ohci.cpp @@ -109,9 +109,9 @@ register_child_devices(void* cookie) device_attr attrs[] = { // properties of this controller for the usb bus manager { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: prettyName }}, + { .string = prettyName }}, { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - { string: USB_FOR_CONTROLLER_MODULE_NAME }}, + { .string = USB_FOR_CONTROLLER_MODULE_NAME }}, // private data to identify the device { NULL } @@ -166,7 +166,7 @@ register_device(device_node* parent) { CALLED(); device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "OHCI PCI"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "OHCI PCI"}}, {} }; diff --git a/src/add-ons/kernel/busses/usb/uhci.cpp b/src/add-ons/kernel/busses/usb/uhci.cpp index c75311f01f..624a7d6f05 100644 --- a/src/add-ons/kernel/busses/usb/uhci.cpp +++ b/src/add-ons/kernel/busses/usb/uhci.cpp @@ -107,9 +107,9 @@ register_child_devices(void* cookie) device_attr attrs[] = { // properties of this controller for the usb bus manager { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: prettyName }}, + { .string = prettyName }}, { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - { string: USB_FOR_CONTROLLER_MODULE_NAME }}, + { .string = USB_FOR_CONTROLLER_MODULE_NAME }}, // private data to identify the device { NULL } @@ -164,7 +164,7 @@ register_device(device_node* parent) { CALLED(); device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "UHCI PCI"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "UHCI PCI"}}, {} }; diff --git a/src/add-ons/kernel/busses/usb/xhci.cpp b/src/add-ons/kernel/busses/usb/xhci.cpp index 5b812f16a5..5b13ac6f38 100644 --- a/src/add-ons/kernel/busses/usb/xhci.cpp +++ b/src/add-ons/kernel/busses/usb/xhci.cpp @@ -113,9 +113,9 @@ register_child_devices(void* cookie) device_attr attrs[] = { // properties of this controller for the usb bus manager { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: prettyName }}, + { .string = prettyName }}, { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - { string: USB_FOR_CONTROLLER_MODULE_NAME }}, + { .string = USB_FOR_CONTROLLER_MODULE_NAME }}, // private data to identify the device { NULL } @@ -170,7 +170,7 @@ register_device(device_node* parent) { CALLED(); device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "XHCI PCI"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "XHCI PCI"}}, {} }; diff --git a/src/add-ons/kernel/busses/virtio/virtio_mmio/virtio_mmio.cpp b/src/add-ons/kernel/busses/virtio/virtio_mmio/virtio_mmio.cpp index f065851c2f..887a88fc2a 100644 --- a/src/add-ons/kernel/busses/virtio/virtio_mmio/virtio_mmio.cpp +++ b/src/add-ons/kernel/busses/virtio/virtio_mmio/virtio_mmio.cpp @@ -229,13 +229,12 @@ virtio_device_register_device(device_node* parent) TRACE(" vendorId: 0x%08" B_PRIx32 "\n", mappedRegs->vendorId); device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "Virtio MMIO"} }, - { B_DEVICE_BUS, B_STRING_TYPE, {string: "virtio"} }, - { "virtio/version", B_UINT32_TYPE, {ui32: mappedRegs->version} }, - { "virtio/device_id", B_UINT32_TYPE, {ui32: mappedRegs->deviceId} }, - { "virtio/type", B_UINT16_TYPE, - {ui16: (uint16)mappedRegs->deviceId} }, - { "virtio/vendor_id", B_UINT32_TYPE, {ui32: mappedRegs->vendorId} }, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "Virtio MMIO"} }, + { B_DEVICE_BUS, B_STRING_TYPE, {.string = "virtio"} }, + { "virtio/version", B_UINT32_TYPE, {.ui32 = mappedRegs->version} }, + { "virtio/device_id", B_UINT32_TYPE, {.ui32 = mappedRegs->deviceId} }, + { "virtio/type", B_UINT16_TYPE, {.ui16 = (uint16)mappedRegs->deviceId} }, + { "virtio/vendor_id", B_UINT32_TYPE, {.ui32 = mappedRegs->vendorId} }, { NULL } }; diff --git a/src/add-ons/kernel/busses/virtio/virtio_pci/virtio_pci.cpp b/src/add-ons/kernel/busses/virtio/virtio_pci/virtio_pci.cpp index acdd32efce..05e0c57175 100644 --- a/src/add-ons/kernel/busses/virtio/virtio_pci/virtio_pci.cpp +++ b/src/add-ons/kernel/busses/virtio/virtio_pci/virtio_pci.cpp @@ -554,15 +554,15 @@ register_child_devices(void* cookie) device_attr attrs[] = { // properties of this controller for virtio bus manager { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: prettyName }}, + { .string = prettyName }}, { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - { string: VIRTIO_FOR_CONTROLLER_MODULE_NAME }}, + { .string = VIRTIO_FOR_CONTROLLER_MODULE_NAME }}, // private data to identify the device { VIRTIO_DEVICE_TYPE_ITEM, B_UINT16_TYPE, - { ui16: pciSubDeviceId }}, + { .ui16 = pciSubDeviceId }}, { VIRTIO_VRING_ALIGNMENT_ITEM, B_UINT16_TYPE, - { ui16: VIRTIO_PCI_VRING_ALIGN }}, + { .ui16 = VIRTIO_PCI_VRING_ALIGN }}, { NULL } }; @@ -584,7 +584,7 @@ static status_t register_device(device_node* parent) { device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "Virtio PCI"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "Virtio PCI"}}, {} }; diff --git a/src/add-ons/kernel/drivers/bus/scsi/scsi_raw.c b/src/add-ons/kernel/drivers/bus/scsi/scsi_raw.c index e1739d92c0..4f076846b7 100644 --- a/src/add-ons/kernel/drivers/bus/scsi/scsi_raw.c +++ b/src/add-ons/kernel/drivers/bus/scsi/scsi_raw.c @@ -211,18 +211,18 @@ raw_device_added(device_node_handle node) // ready to register { device_attr attrs[] = { - { B_DRIVER_MODULE, B_STRING_TYPE, { string: SCSI_RAW_MODULE_NAME }}, + { B_DRIVER_MODULE, B_STRING_TYPE, { .string = SCSI_RAW_MODULE_NAME }}, // default connection is used by peripheral drivers, and as we don't // want to kick them out, we use concurrent "raw" connection // (btw: this shows nicely that something goes wrong: one device // and two drivers means begging for trouble) - { PNP_DRIVER_CONNECTION, B_STRING_TYPE, { string: "raw" }}, + { PNP_DRIVER_CONNECTION, B_STRING_TYPE, { .string = "raw" }}, // we want devfs on top of us (who wouldn't?) - { B_DRIVER_FIXED_CHILD, B_STRING_TYPE, { string: PNP_DEVFS_MODULE_NAME }}, + { B_DRIVER_FIXED_CHILD, B_STRING_TYPE, { .string = PNP_DEVFS_MODULE_NAME }}, // tell which name we want to have in devfs - { PNP_DEVFS_FILENAME, B_STRING_TYPE, { string: name }}, + { PNP_DEVFS_FILENAME, B_STRING_TYPE, { .string = name }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/disk/mmc/mmc_disk.cpp b/src/add-ons/kernel/drivers/disk/mmc/mmc_disk.cpp index 8a043e7e26..25ed341a91 100644 --- a/src/add-ons/kernel/drivers/disk/mmc/mmc_disk.cpp +++ b/src/add-ons/kernel/drivers/disk/mmc/mmc_disk.cpp @@ -114,7 +114,7 @@ mmc_disk_register_device(device_node* node) CALLED(); device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "SD Card" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "SD Card" }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp index 460b04b8cf..18c4ec3c44 100644 --- a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp +++ b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp @@ -1045,7 +1045,7 @@ nvme_disk_register_device(device_node* parent) CALLED(); device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "NVMe Disk" } }, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "NVMe Disk" } }, { NULL } }; diff --git a/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp b/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp index c1c265d9d1..1070f633f0 100644 --- a/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp +++ b/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp @@ -1098,9 +1098,9 @@ cd_register_device(device_node* node) // ready to register device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "SCSI CD-ROM Drive"}}, - {"removable", B_UINT8_TYPE, {ui8: deviceInquiry->removable_medium}}, - {B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, {ui32: maxBlocks}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "SCSI CD-ROM Drive"}}, + {"removable", B_UINT8_TYPE, {.ui8 = deviceInquiry->removable_medium}}, + {B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, {.ui32 = maxBlocks}}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp b/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp index 0245e6c54a..d79a68e9ec 100644 --- a/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp +++ b/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp @@ -583,11 +583,11 @@ das_register_device(device_node *node) // ready to register device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "SCSI Disk" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "SCSI Disk" }}, // tell block_io whether the device is removable - {"removable", B_UINT8_TYPE, {ui8: deviceInquiry->removable_medium}}, + {"removable", B_UINT8_TYPE, {.ui8 = deviceInquiry->removable_medium}}, // impose own max block restriction - {B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, {ui32: maxBlocks}}, + {B_DMA_MAX_TRANSFER_BLOCKS, B_UINT32_TYPE, {.ui32 = maxBlocks}}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/disk/virtual/ram_disk/ram_disk.cpp b/src/add-ons/kernel/drivers/disk/virtual/ram_disk/ram_disk.cpp index ae9e38383c..4b1b9219dd 100644 --- a/src/add-ons/kernel/drivers/disk/virtual/ram_disk/ram_disk.cpp +++ b/src/add-ons/kernel/drivers/disk/virtual/ram_disk/ram_disk.cpp @@ -196,10 +196,10 @@ struct ControlDevice : Device { device_attr attrs[] = { {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - {string: "RAM Disk Raw Device"}}, - {kDeviceSizeItem, B_UINT64_TYPE, {ui64: deviceSize}}, - {kDeviceIDItem, B_UINT32_TYPE, {ui32: (uint32)id}}, - {kFilePathItem, B_STRING_TYPE, {string: filePath}}, + {.string = "RAM Disk Raw Device"}}, + {kDeviceSizeItem, B_UINT64_TYPE, {.ui64 = deviceSize}}, + {kDeviceIDItem, B_UINT32_TYPE, {.ui32 = (uint32)id}}, + {kFilePathItem, B_STRING_TYPE, {.string = filePath}}, {NULL} }; @@ -1140,7 +1140,7 @@ ram_disk_driver_register_device(device_node* parent) { device_attr attrs[] = { {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - {string: "RAM Disk Control Device"}}, + {.string = "RAM Disk Control Device"}}, {NULL} }; diff --git a/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp b/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp index b8a8d5a2a2..09f17a6911 100644 --- a/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp +++ b/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp @@ -561,7 +561,7 @@ virtio_block_register_device(device_node *node) CALLED(); device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "Virtio Block"} }, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "Virtio Block"} }, { NULL } }; diff --git a/src/add-ons/kernel/drivers/display/display_adapter.cpp b/src/add-ons/kernel/drivers/display/display_adapter.cpp index 841253f295..72aaa8af32 100644 --- a/src/add-ons/kernel/drivers/display/display_adapter.cpp +++ b/src/add-ons/kernel/drivers/display/display_adapter.cpp @@ -226,8 +226,8 @@ register_displays(const char *parentName, device_node *node) if (i == pkgData->package.count) continue; device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: name }}, - { B_DEVICE_FLAGS, B_UINT32_TYPE, { ui32: B_KEEP_DRIVER_LOADED }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = name }}, + { B_DEVICE_FLAGS, B_UINT32_TYPE, { .ui32 = B_KEEP_DRIVER_LOADED }}, { NULL } }; @@ -252,9 +252,9 @@ static status_t displayadapter_register_device(device_node *node) { device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "Display Adapter" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "Display Adapter" }}, { B_DEVICE_FLAGS, B_UINT32_TYPE, { - ui32: B_KEEP_DRIVER_LOADED | B_FIND_MULTIPLE_CHILDREN }}, + .ui32 = B_KEEP_DRIVER_LOADED | B_FIND_MULTIPLE_CHILDREN }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/input/i2c_hid/Driver.cpp b/src/add-ons/kernel/drivers/input/i2c_hid/Driver.cpp index 9c2bf2b1a6..70d59f2bc3 100644 --- a/src/add-ons/kernel/drivers/input/i2c_hid/Driver.cpp +++ b/src/add-ons/kernel/drivers/input/i2c_hid/Driver.cpp @@ -328,8 +328,8 @@ i2c_hid_register_device(device_node *node) uint32 descriptorAddress = object->integer.integer; free(object); device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "I2C HID Device" }}, - { "descriptorAddress", B_UINT32_TYPE, { ui32: descriptorAddress }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "I2C HID Device" }}, + { "descriptorAddress", B_UINT32_TYPE, { .ui32 = descriptorAddress }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/input/virtio_input/virtio_input.cpp b/src/add-ons/kernel/drivers/input/virtio_input/virtio_input.cpp index 53b1b55583..72a323be7f 100644 --- a/src/add-ons/kernel/drivers/input/virtio_input/virtio_input.cpp +++ b/src/add-ons/kernel/drivers/input/virtio_input/virtio_input.cpp @@ -441,7 +441,7 @@ virtio_input_register_device(device_node *node) CALLED(); device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "VirtIO input" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "VirtIO input" }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp b/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp index f3f916daa1..e56ae9d9a7 100644 --- a/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp +++ b/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp @@ -190,7 +190,7 @@ usb_ecm_register_device(device_node *node) CALLED(); device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "USB ECM"} }, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "USB ECM"} }, { NULL } }; diff --git a/src/add-ons/kernel/drivers/network/ether/virtio/virtio_net.cpp b/src/add-ons/kernel/drivers/network/ether/virtio/virtio_net.cpp index 7d6f803343..328fed6a31 100644 --- a/src/add-ons/kernel/drivers/network/ether/virtio/virtio_net.cpp +++ b/src/add-ons/kernel/drivers/network/ether/virtio/virtio_net.cpp @@ -896,7 +896,7 @@ virtio_net_register_device(device_node* node) CALLED(); device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "Virtio Network"} }, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "Virtio Network"} }, { NULL } }; diff --git a/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp b/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp index ad0edaeb72..895d938e76 100644 --- a/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp +++ b/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp @@ -162,7 +162,7 @@ static status_t acpi_ac_register_device(device_node *node) { device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "ACPI AC" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "ACPI AC" }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp b/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp index b552c3ca10..8bbffa6a89 100644 --- a/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp +++ b/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp @@ -523,7 +523,7 @@ static status_t acpi_battery_register_device(device_node *node) { device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "ACPI Battery" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "ACPI Battery" }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/power/acpi_button/acpi_button.cpp b/src/add-ons/kernel/drivers/power/acpi_button/acpi_button.cpp index 6f30e605fc..d18890ae73 100644 --- a/src/add-ons/kernel/drivers/power/acpi_button/acpi_button.cpp +++ b/src/add-ons/kernel/drivers/power/acpi_button/acpi_button.cpp @@ -288,7 +288,7 @@ static status_t acpi_button_register_device(device_node *node) { device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "ACPI Button" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "ACPI Button" }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/power/acpi_lid/acpi_lid.cpp b/src/add-ons/kernel/drivers/power/acpi_lid/acpi_lid.cpp index 39a3750f81..877cf988a2 100644 --- a/src/add-ons/kernel/drivers/power/acpi_lid/acpi_lid.cpp +++ b/src/add-ons/kernel/drivers/power/acpi_lid/acpi_lid.cpp @@ -229,7 +229,7 @@ static status_t acpi_lid_register_device(device_node *node) { device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "ACPI Lid" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "ACPI Lid" }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.c b/src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.c index d92f117296..c89aea423d 100644 --- a/src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.c +++ b/src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.c @@ -213,7 +213,7 @@ static status_t acpi_thermal_register_device(device_node *node) { device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "ACPI Thermal" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "ACPI Thermal" }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp b/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp index c599f1a0d8..7d0af69aa5 100644 --- a/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp +++ b/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp @@ -221,7 +221,7 @@ static status_t pch_thermal_register_device(device_node *node) { device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "PCH Thermal" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "PCH Thermal" }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/power/x86_cpuidle/acpi_cpuidle.cpp b/src/add-ons/kernel/drivers/power/x86_cpuidle/acpi_cpuidle.cpp index 1734312152..efbeef1061 100644 --- a/src/add-ons/kernel/drivers/power/x86_cpuidle/acpi_cpuidle.cpp +++ b/src/add-ons/kernel/drivers/power/x86_cpuidle/acpi_cpuidle.cpp @@ -533,7 +533,7 @@ static status_t acpi_cpuidle_register_device(device_node *node) { device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "ACPI CPU IDLE" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "ACPI CPU IDLE" }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/sensor/acpi_als/acpi_als.cpp b/src/add-ons/kernel/drivers/sensor/acpi_als/acpi_als.cpp index 5ff5367956..f7a2e4f201 100644 --- a/src/add-ons/kernel/drivers/sensor/acpi_als/acpi_als.cpp +++ b/src/add-ons/kernel/drivers/sensor/acpi_als/acpi_als.cpp @@ -221,7 +221,7 @@ static status_t acpi_als_register_device(device_node *node) { device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "ACPI ALS" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "ACPI ALS" }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/wmi/WMIACPI.cpp b/src/add-ons/kernel/drivers/wmi/WMIACPI.cpp index 1838d4d9d8..5acc927808 100644 --- a/src/add-ons/kernel/drivers/wmi/WMIACPI.cpp +++ b/src/add-ons/kernel/drivers/wmi/WMIACPI.cpp @@ -108,15 +108,15 @@ WMIACPI::Scan() _GuidToGuidString(guid, guidString); device_attr attrs[] = { // connection - { WMI_GUID_STRING_ITEM, B_STRING_TYPE, { string: guidString }}, + { WMI_GUID_STRING_ITEM, B_STRING_TYPE, { .string = guidString }}, - { WMI_BUS_COOKIE, B_UINT32_TYPE, { ui32: index }}, + { WMI_BUS_COOKIE, B_UINT32_TYPE, { .ui32 = index }}, // description of peripheral drivers - { B_DEVICE_BUS, B_STRING_TYPE, { string: "wmi" }}, + { B_DEVICE_BUS, B_STRING_TYPE, { .string = "wmi" }}, { B_DEVICE_FLAGS, B_UINT32_TYPE, - { ui32: B_FIND_MULTIPLE_CHILDREN }}, + { .ui32 = B_FIND_MULTIPLE_CHILDREN }}, { NULL } }; @@ -412,7 +412,7 @@ wmi_acpi_register_device(device_node *node) { CALLED(); device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "WMI ACPI" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "WMI ACPI" }}, { NULL } }; diff --git a/src/add-ons/kernel/drivers/wmi/WMIAsus.cpp b/src/add-ons/kernel/drivers/wmi/WMIAsus.cpp index 7574408e26..5b61c0089d 100644 --- a/src/add-ons/kernel/drivers/wmi/WMIAsus.cpp +++ b/src/add-ons/kernel/drivers/wmi/WMIAsus.cpp @@ -261,7 +261,7 @@ wmi_asus_register_device(device_node *node) { CALLED(); device_attr attrs[] = { - { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { string: "WMI ASUS" }}, + { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, { .string = "WMI ASUS" }}, { NULL } }; diff --git a/src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp b/src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp index 69bfa66c8a..92cc2d1639 100644 --- a/src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp +++ b/src/add-ons/kernel/generic/ata_adapter/ata_adapter.cpp @@ -496,18 +496,18 @@ ata_adapter_publish_channel(device_node *controller_node, device_attr attrs[] = { // info about ourself and our consumer { B_DEVICE_PRETTY_NAME, B_STRING_TYPE, - { string: prettyName }}, + { .string = prettyName }}, { B_DEVICE_FIXED_CHILD, B_STRING_TYPE, - { string: ATA_FOR_CONTROLLER_MODULE_NAME }}, + { .string = ATA_FOR_CONTROLLER_MODULE_NAME }}, // private data to identify channel { ATA_ADAPTER_COMMAND_BLOCK_BASE, B_UINT16_TYPE, - { ui16: command_block_base }}, + { .ui16 = command_block_base }}, { ATA_ADAPTER_CONTROL_BLOCK_BASE, B_UINT16_TYPE, - { ui16: control_block_base }}, - { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { ui8: can_dma }}, - { ATA_ADAPTER_INTNUM, B_UINT8_TYPE, { ui8: intnum }}, - { ATA_ADAPTER_CHANNEL_INDEX, B_UINT8_TYPE, { ui8: channel_index }}, + { .ui16 = control_block_base }}, + { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { .ui8 = can_dma }}, + { ATA_ADAPTER_INTNUM, B_UINT8_TYPE, { .ui8 = intnum }}, + { ATA_ADAPTER_CHANNEL_INDEX, B_UINT8_TYPE, { .ui8 = channel_index }}, { NULL } }; @@ -714,28 +714,28 @@ ata_adapter_publish_controller(device_node *parent, uint16 bus_master_base, // there are always max. 2 devices // (unless this is a Compact Flash Card with a built-in IDE controller, // which has exactly 1 device) - { ATA_CONTROLLER_MAX_DEVICES_ITEM, B_UINT8_TYPE, { ui8: 2 }}, + { ATA_CONTROLLER_MAX_DEVICES_ITEM, B_UINT8_TYPE, { .ui8 = 2 }}, // of course we can DMA - { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { ui8: can_dma }}, + { ATA_CONTROLLER_CAN_DMA_ITEM, B_UINT8_TYPE, { .ui8 = can_dma }}, // choose any name here { ATA_CONTROLLER_CONTROLLER_NAME_ITEM, B_STRING_TYPE, - { string: controller_name }}, + { .string = controller_name }}, // DMA properties // data must be word-aligned; // warning: some controllers are more picky! - { B_DMA_ALIGNMENT, B_UINT32_TYPE, { ui32: dma_alignment /*1*/}}, + { B_DMA_ALIGNMENT, B_UINT32_TYPE, { .ui32 = dma_alignment /*1*/}}, // one S/G block must not cross 64K boundary - { B_DMA_BOUNDARY, B_UINT32_TYPE, { ui32: dma_boundary/*0xffff*/ }}, + { B_DMA_BOUNDARY, B_UINT32_TYPE, { .ui32 = dma_boundary/*0xffff*/ }}, // max size of S/G block is 16 bits with zero being 64K { B_DMA_MAX_SEGMENT_BLOCKS, B_UINT32_TYPE, - { ui32: max_sg_block_size/*0x10000*/ }}, + { .ui32 = max_sg_block_size/*0x10000*/ }}, { B_DMA_MAX_SEGMENT_COUNT, B_UINT32_TYPE, - { ui32: ATA_ADAPTER_MAX_SG_COUNT }}, - { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { ui64: 0x100000000LL }}, + { .ui32 = ATA_ADAPTER_MAX_SG_COUNT }}, + { B_DMA_HIGH_ADDRESS, B_UINT64_TYPE, { .ui64 = 0x100000000LL }}, // private data to find controller - { ATA_ADAPTER_BUS_MASTER_BASE, B_UINT16_TYPE, { ui16: bus_master_base }}, + { ATA_ADAPTER_BUS_MASTER_BASE, B_UINT16_TYPE, { .ui16 = bus_master_base }}, { NULL } }; diff --git a/src/add-ons/kernel/interrupt_controllers/openpic/openpic.cpp b/src/add-ons/kernel/interrupt_controllers/openpic/openpic.cpp index 0450732818..1d5acab88b 100644 --- a/src/add-ons/kernel/interrupt_controllers/openpic/openpic.cpp +++ b/src/add-ons/kernel/interrupt_controllers/openpic/openpic.cpp @@ -315,10 +315,10 @@ openpic_register_device(device_node *parent) device_node *newNode; device_attr attrs[] = { // info about ourself - { B_DEVICE_TYPE, B_UINT16_TYPE, { ui16: PCI_base_peripheral }}, - { B_DEVICE_SUB_TYPE, B_UINT16_TYPE, { ui16: PCI_pic }}, + { B_DEVICE_TYPE, B_UINT16_TYPE, { .ui16 = PCI_base_peripheral }}, + { B_DEVICE_SUB_TYPE, B_UINT16_TYPE, { .ui16 = PCI_pic }}, // TODO How do we identify ourselves as OpenPIC? - { B_DEVICE_INTERFACE, B_UINT16_TYPE, { ui16: PCI_pic_8259 }}, + { B_DEVICE_INTERFACE, B_UINT16_TYPE, { .ui16 = PCI_pic_8259 }}, {} }; io_resource resources[] = { diff --git a/src/system/kernel/device_manager/device_manager.cpp b/src/system/kernel/device_manager/device_manager.cpp index b3c23ee117..45840725da 100644 --- a/src/system/kernel/device_manager/device_manager.cpp +++ b/src/system/kernel/device_manager/device_manager.cpp @@ -2381,10 +2381,10 @@ static void init_node_tree(void) { device_attr attrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "Devices Root"}}, - {B_DEVICE_BUS, B_STRING_TYPE, {string: "root"}}, + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "Devices Root"}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "root"}}, {B_DEVICE_FLAGS, B_UINT32_TYPE, - {ui32: B_FIND_MULTIPLE_CHILDREN | B_KEEP_DRIVER_LOADED }}, + {.ui32 = B_FIND_MULTIPLE_CHILDREN | B_KEEP_DRIVER_LOADED }}, {NULL} }; @@ -2395,9 +2395,9 @@ init_node_tree(void) } device_attr genericAttrs[] = { - {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {string: "Generic"}}, - {B_DEVICE_BUS, B_STRING_TYPE, {string: "generic"}}, - {B_DEVICE_FLAGS, B_UINT32_TYPE, {ui32: B_FIND_MULTIPLE_CHILDREN + {B_DEVICE_PRETTY_NAME, B_STRING_TYPE, {.string = "Generic"}}, + {B_DEVICE_BUS, B_STRING_TYPE, {.string = "generic"}}, + {B_DEVICE_FLAGS, B_UINT32_TYPE, {.ui32 = B_FIND_MULTIPLE_CHILDREN | B_KEEP_DRIVER_LOADED | B_FIND_CHILD_ON_DEMAND}}, {NULL} };