diff --git a/components/plat/pc99/plat/CMakeLists.txt b/components/plat/pc99/plat/CMakeLists.txt index 0f288f95..b7fe99f2 100644 --- a/components/plat/pc99/plat/CMakeLists.txt +++ b/components/plat/pc99/plat/CMakeLists.txt @@ -9,13 +9,18 @@ cmake_minimum_required(VERSION 3.8.2) DeclareCAmkESComponent(PIT) DeclareCAmkESComponent(Serial) -if(LibPlatSupportX86ConsoleDeviceEGA) - message("LibPlatSupportX86ConsoleDeviceEGA is on.") -elseif(LibPlatSupportX86ConsoleDevice) - message("Serial port ${LibPlatSupportX86ConsoleDevice} selected.") - CAmkESAddImportPath( - ${CMAKE_CURRENT_LIST_DIR}/components/serial_${LibPlatSupportX86ConsoleDevice}/ - ) +if(LibPlatSupportX86ConsoleDevice) + message("Output device ${LibPlatSupportX86ConsoleDevice} selected.") + if(LibPlatSupportX86ConsoleDevice STREQUAL "vga") + message("VGA display device selected.") + CAmkESAddImportPath( + ${CMAKE_CURRENT_LIST_DIR}/components/vga + ) + else() + CAmkESAddImportPath( + ${CMAKE_CURRENT_LIST_DIR}/components/serial_${LibPlatSupportX86ConsoleDevice}/ + ) + endif() else() message("Automatically select com1 for serial port.") CAmkESAddImportPath(${CMAKE_CURRENT_LIST_DIR}/components/serial_com1) diff --git a/components/plat/pc99/plat/components/serial_com1/SerialCom.camkes b/components/plat/pc99/plat/components/serial_com1/OutputDevice.camkes similarity index 100% rename from components/plat/pc99/plat/components/serial_com1/SerialCom.camkes rename to components/plat/pc99/plat/components/serial_com1/OutputDevice.camkes diff --git a/components/plat/pc99/plat/components/serial_com2/SerialCom.camkes b/components/plat/pc99/plat/components/serial_com2/OutputDevice.camkes similarity index 100% rename from components/plat/pc99/plat/components/serial_com2/SerialCom.camkes rename to components/plat/pc99/plat/components/serial_com2/OutputDevice.camkes diff --git a/components/plat/pc99/plat/components/serial_com3/SerialCom.camkes b/components/plat/pc99/plat/components/serial_com3/OutputDevice.camkes similarity index 100% rename from components/plat/pc99/plat/components/serial_com3/SerialCom.camkes rename to components/plat/pc99/plat/components/serial_com3/OutputDevice.camkes diff --git a/components/plat/pc99/plat/components/serial_com4/SerialCom.camkes b/components/plat/pc99/plat/components/serial_com4/OutputDevice.camkes similarity index 100% rename from components/plat/pc99/plat/components/serial_com4/SerialCom.camkes rename to components/plat/pc99/plat/components/serial_com4/OutputDevice.camkes diff --git a/components/plat/pc99/plat/components/vga/OutputDevice.camkes b/components/plat/pc99/plat/components/vga/OutputDevice.camkes new file mode 100644 index 00000000..6a885f78 --- /dev/null +++ b/components/plat/pc99/plat/components/vga/OutputDevice.camkes @@ -0,0 +1,10 @@ +/* + * Copyright 2024 Dornerworks + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +component VGADisplay { + hardware; + dataport Buf(4096) txt_buf; +} diff --git a/components/plat/pc99/plat/serial.camkes b/components/plat/pc99/plat/serial.camkes index b1b680a8..dd774af3 100644 --- a/components/plat/pc99/plat/serial.camkes +++ b/components/plat/pc99/plat/serial.camkes @@ -4,4 +4,4 @@ * SPDX-License-Identifier: BSD-2-Clause */ -import ; +import ;