[mk][platform] Migrate to C++ comp/linkage

Author: bherrera

mk/arch/x86/faults.cc

@@ -23,7 +23,7 @@
 #define INT_MF 0x10
 #define INT_XM 0x13
 
-extern "C" enum handler_return platform_irq(x86_iframe_t *frame);
+extern enum handler_return platform_irq(x86_iframe_t *frame);
 
 static void dump_fault_frame(x86_iframe_t *frame) {
 #if ARCH_X86_32

mk/dev/include/dev/driver.h

@@ -69,22 +69,23 @@ struct driver {
 #define concat(a, b) __ex_concat(a, b)
 #define __ex_concat(a, b) a##b
 
-#define DRIVER_EXPORT(type_, ops_)                                                                \
-  const struct driver concat(__driver_, type_) __ALIGNED(sizeof(void *)) __SECTION("drivers") = { \
-      .type = #type_,                                                                             \
-      .ops = ops_,                                                                                \
-  }
-
-#define DEVICE_INSTANCE(type_, name_, config_, flags_)                                       \
-  extern const struct driver concat(__driver_, type_);                                       \
-  struct device concat(__device_, concat(type_, concat(_, name_))) __ALIGNED(sizeof(void *)) \
-      __SECTION("devices") = {                                                               \
-          .name = #name_,                                                                    \
-          .driver = &concat(__driver_, type_),                                               \
-          .flags = flags_,                                                                   \
-          .config = config_,                                                                 \
-          .state = NULL,                                                                     \
-          .device_state = DEVICE_UNINITIALIZED,                                              \
+#define DRIVER_EXPORT(type_, ops_)                                             \
+  __ALIGNED(sizeof(void *))                                                    \
+  __USED __SECTION("drivers") const struct driver concat(__driver_, type_) = { \
+      .type = #type_,                                                          \
+      .ops = ops_,                                                             \
+  };
+
+#define DEVICE_INSTANCE(type_, name_, config_, flags_)                                             \
+  extern const struct driver concat(__driver_, type_);                                             \
+  __ALIGNED(sizeof(void *))                                                                        \
+  __USED __SECTION("devices") struct device concat(__device_, concat(type_, concat(_, name_))) = { \
+      .name = #name_,                                                                              \
+      .driver = &concat(__driver_, type_),                                                         \
+      .flags = flags_,                                                                             \
+      .config = config_,                                                                           \
+      .state = NULL,                                                                               \
+      .device_state = DEVICE_UNINITIALIZED,                                                        \
   }
 
 /*

mk/platform/pc/cmos.c renamed to mk/platform/pc/cmos.cc

@@ -1,11 +1,13 @@
-/*
- * Copyright (c) 2009 Corey Tabaka
- * Copyright (c) 2016 Travis Geiselbrecht
- *
- * Use of this source code is governed by a MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT
- */
+// Copyright 2016 The Fuchsia Authors
+// Copyright (c) 2009 Corey Tabaka
+// Copyright (c) 2016 Travis Geiselbrecht
+//
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT
+
+#if WITH_LEGACY_PC_CONSOLE
+
 #include <lib/io.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -275,3 +277,5 @@ int printf_xy(int x, int y, char attr, char *fmt, ...) {
 
   return result;
 }
+
+#endif

mk/platform/pc/console.c renamed to mk/platform/pc/console.cc

@@ -129,7 +129,8 @@ static status_t platform_parse_multiboot_info(size_t *found_mem_arenas) {
 
   /* bump the multiboot pointer up to the kernel mapping */
   /* TODO: test that it's within range of the kernel mapping */
-  const multiboot_info_t *multiboot_info = (void *)((uintptr_t)_multiboot_info + KERNEL_BASE);
+  const multiboot_info_t *multiboot_info =
+      reinterpret_cast<const multiboot_info_t *>((uintptr_t)_multiboot_info + KERNEL_BASE);
 
   dprintf(SPEW, "\tflags %#x\n", multiboot_info->flags);
 
@@ -154,7 +155,7 @@ static status_t platform_parse_multiboot_info(size_t *found_mem_arenas) {
   // more modern multiboot mmap array
   if (multiboot_info->flags & MB_INFO_MMAP) {
     const memory_map_t *mmap = (const memory_map_t *)(uintptr_t)multiboot_info->mmap_addr;
-    mmap = (void *)((uintptr_t)mmap + KERNEL_BASE);
+    mmap = (const memory_map_t *)((uintptr_t)mmap + KERNEL_BASE);
 
     dprintf(SPEW, "PC: multiboot memory map, length %u:\n", multiboot_info->mmap_length);
     parse_multiboot_mmap(mmap, multiboot_info->mmap_length, found_mem_arenas);
@@ -185,8 +186,10 @@ void platform_early_init(void) {
   /* get the debug output working */
   platform_init_debug_early();
 
+#if WITH_LEGACY_PC_CONSOLE
   /* get the text console working */
   platform_init_console();
+#endif
 
   /* initialize the interrupt controller */
   platform_init_interrupts();
@@ -220,21 +223,24 @@ void platform_early_init(void) {
 }
 
 void local_apic_callback(const void *_entry, size_t entry_len) {
-  const struct acpi_madt_local_apic_entry *entry = _entry;
+  const struct acpi_madt_local_apic_entry *entry =
+      reinterpret_cast<const struct acpi_madt_local_apic_entry *>(_entry);
 
   printf("\tLOCAL APIC id %d, processor id %d, flags %#x\n", entry->apic_id, entry->processor_id,
          entry->flags);
 }
 
 void io_apic_callback(const void *_entry, size_t entry_len) {
-  const struct acpi_madt_io_apic_entry *entry = _entry;
+  const struct acpi_madt_io_apic_entry *entry =
+      reinterpret_cast<const struct acpi_madt_io_apic_entry *>(_entry);
 
   printf("\tIO APIC id %d, address %#x gsi base %u\n", entry->io_apic_id, entry->io_apic_address,
          entry->global_system_interrupt_base);
 }
 
 void int_source_override_callback(const void *_entry, size_t entry_len) {
-  const struct acpi_madt_int_source_override_entry *entry = _entry;
+  const struct acpi_madt_int_source_override_entry *entry =
+      reinterpret_cast<const struct acpi_madt_int_source_override_entry *>(_entry);
 
   printf("\tINT OVERRIDE bus %u, source %u, gsi %u, flags %#x\n", entry->bus, entry->source,
          entry->global_sys_interrupt, entry->flags);
@@ -264,7 +270,8 @@ void platform_init(void) {
         (const struct acpi_mcfg_table *)acpi_get_table_by_sig(ACPI_MCFG_SIG);
     if (table) {
       if (table->header.length >= sizeof(*table) + sizeof(struct acpi_mcfg_entry)) {
-        const struct acpi_mcfg_entry *entry = (const void *)(table + 1);
+        const struct acpi_mcfg_entry *entry =
+            reinterpret_cast<const struct acpi_mcfg_entry *>(table + 1);
         printf("PCI MCFG: segment %#hx bus [%hhu...%hhu] address %#llx\n", entry->segment,
                entry->start_bus, entry->end_bus, entry->base_address);
 
@@ -292,8 +299,9 @@ void platform_init(void) {
 }
 
 #if WITH_LIB_MINIP
+extern "C" status_t e1000_register_with_minip(void);
+
 void _start_minip(uint level) {
-  extern status_t e1000_register_with_minip(void);
   status_t err = e1000_register_with_minip();
   if (err == NO_ERROR) {
     minip_start_dhcp();