ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-29 15:44:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

os: deprecate platform API for x86, rpi, imx53

Browse Source 
* Move platform APIs to "legacy/" subdirectory
* Rename old pc, imx53, and rpi platform_drv
  to "legacy_*_platform_drv"

Fix #4359
This commit is contained in:
Stefan Kalkowski 2021-12-22 12:04:09 +01:00 committed by Christian Helmuth
parent 622ddb5b49
commit 7db602faec
98 changed files with 178 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
repos/base/run/platform_drv.inc
View File

@ -64,10 +64,10 @@ proc append_platform_drv_build_components {} {
}
proc platform_drv_binary {} {
if {[have_board imx53_qsb]} { return imx53_platform_drv }
if {[have_board imx53_qsb_tz]} { return imx53_platform_drv }
if {[have_board rpi]} { return rpi_platform_drv }
if {[have_board pc]} { return platform_drv }
if {[have_board imx53_qsb]} { return legacy_imx53_platform_drv }
if {[have_board imx53_qsb_tz]} { return legacy_imx53_platform_drv }
if {[have_board rpi]} { return rpi_platform_drv }
if {[have_board pc]} { return legacy_pc_platform_drv }
return no_platform_drv_available
}

4
repos/dde_bsd/src/lib/audio/pci.cc
View File

@ -18,8 +18,8 @@
#include <dataspace/client.h>
#include <io_port_session/connection.h>
#include <io_mem_session/connection.h>
#include <platform_session/connection.h>
#include <platform_device/client.h>
#include <legacy/x86/platform_session/connection.h>
#include <legacy/x86/platform_device/client.h>
#include <util/retry.h>
/* local includes */

4
repos/dde_ipxe/src/lib/dde_ipxe/dde_support.cc
View File

@ -28,8 +28,8 @@
#include <io_mem_session/connection.h>
#include <io_port_session/connection.h>
#include <irq_session/connection.h>
#include <platform_device/client.h>
#include <platform_session/connection.h>
#include <legacy/x86/platform_device/client.h>
#include <legacy/x86/platform_session/connection.h>
#include <rm_session/connection.h>
#include <region_map/client.h>
#include <timer_session/connection.h>

1
repos/dde_linux/recipes/pkg/drivers_interactive-rpi/archives
View File

@ -1,5 +1,6 @@
_/raw/drivers_interactive-rpi
_/src/event_filter
_/src/report_rom
_/src/rpi_fb_drv
_/src/platform_drv
_/src/usb_hid_drv

34
repos/dde_linux/recipes/raw/drivers_interactive-rpi/drivers.config
View File

@ -26,8 +26,34 @@
</route>
</start>
<start name="platform_drv" caps="200">
<binary name="rpi_platform_drv"/>
<start name="rpi_platform_drv" caps="200">
<resource name="RAM" quantum="2M"/>
<provides> <service name="Platform"/> </provides>
<config>
<device name="dwc_otg" type="brcm,bcm2835-usb">
<io_mem address="0x20980000" size="0x10000"/>
<irq number="9"/>
<power-domain name="usb"/>
</device>
<policy label_prefix="usb_drv" info="yes">
<device name="dwc_otg"/>
</policy>
</config>
<route>
<service name="IRQ"> <parent/> </service>
<service name="IO_MEM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="RM"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="Timer"> <parent/> </service>
</route>
</start>
<start name="legacy_rpi_platform_drv" caps="200">
<resource name="RAM" quantum="3M"/>
<provides>
<service name="Platform"/>
@ -69,7 +95,7 @@
<service name="CPU"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="Timer"> <parent/> </service>
<service name="Platform"> <child name="platform_drv"/> </service>
<service name="Platform"> <child name="rpi_platform_drv"/> </service>
</route>
</start>
@ -95,7 +121,7 @@
<resource name="RAM" quantum="4M"/>
<route>
<service name="ROM" label="config"> <parent label="fb_drv.config"/> </service>
<service name="Platform"> <child name="platform_drv"/> </service>
<service name="Platform"> <child name="legacy_rpi_platform_drv"/> </service>
<service name="IO_MEM"> <parent/> </service>
<service name="ROM"> <parent/> </service>
<service name="PD"> <parent/> </service>

2
repos/dde_linux/run/usb_hid_raw.run
View File

@ -95,7 +95,7 @@ proc platform_drv_config_non_x86 {} {
proc platform_drv_binary_non_x86 {} {
if {[have_board imx6q_sabrelite]} { return platform_drv }
if {[have_board rpi]} { return rpi_new_platform_drv }
if {[have_board rpi]} { return rpi_platform_drv }
return no_platform_drv_available
}

4
repos/dde_linux/src/include/legacy/lx_kit/internal/pci_dev.h
View File

@ -18,8 +18,8 @@
/* Genode includes */
#include <base/object_pool.h>
#include <platform_session/connection.h>
#include <platform_device/client.h>
#include <legacy/x86/platform_session/connection.h>
#include <legacy/x86/platform_device/client.h>
#include <io_mem_session/connection.h>
#include <base/attached_dataspace.h>
#include <util/retry.h>

1
repos/gems/recipes/raw/drivers_nic-pc/drivers.config
View File

@ -49,6 +49,7 @@
</start>
<start name="platform_drv" caps="210" managing_system="yes">
<binary name="legacy_pc_platform_drv"/>
<resource name="RAM" quantum="3M"/>
<provides>
<service name="Platform"/>

4
repos/gems/recipes/raw/drivers_nic-rpi/drivers.config
View File

@ -13,7 +13,7 @@
<service name="Uplink"/>
</parent-provides>
<start name="rpi_new_platform_drv" caps="200">
<start name="rpi_platform_drv" caps="200">
<resource name="RAM" quantum="2M"/>
<provides> <service name="Platform"/> </provides>
<config>
@ -53,7 +53,7 @@
<service name="CPU"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="Timer"> <parent/> </service>
<service name="Platform"> <child name="rpi_new_platform_drv"/> </service>
<service name="Platform"> <child name="rpi_platform_drv"/> </service>
</route>
</start>

1
repos/gems/sculpt/drivers/pc
View File

@ -94,6 +94,7 @@
</start>
<start name="platform_drv" caps="400" managing_system="yes">
<binary name="legacy_pc_platform_drv"/>
<resource name="RAM" quantum="4M"/>
<provides>
<service name="Platform"/>

2
repos/libports/src/drivers/framebuffer/vesa/framebuffer.cc
View File

@ -16,7 +16,7 @@
#include <base/log.h>
#include <base/allocator.h>
#include <io_mem_session/connection.h>
#include <platform_session/connection.h>
#include <legacy/x86/platform_session/connection.h>
/* local includes */
#include "framebuffer.h"

4
repos/libports/src/drivers/framebuffer/vesa/hw_emul.cc
View File

@ -33,8 +33,8 @@ static const bool verbose = false;
** PCI virtualization **
************************/
#include <platform_session/connection.h>
#include <platform_device/client.h>
#include <legacy/x86/platform_session/connection.h>
#include <legacy/x86/platform_device/client.h>
enum {
PCI_ADDR_REG = 0xcf8,

2
repos/libports/src/lib/acpica/env.cc
View File

@ -14,7 +14,7 @@
/* Genode includes */
#include <util/reconstructible.h>
#include <acpica/acpica.h>
#include <platform_session/client.h>
#include <legacy/x86/platform_session/client.h>
#include "env.h"

2
repos/libports/src/lib/acpica/env.h
View File

@ -16,7 +16,7 @@
#include <base/env.h>
#include <base/allocator.h>
#include <platform_session/client.h>
#include <legacy/x86/platform_session/client.h>
namespace Acpica {
Genode::Env & env();

8
repos/os/include/spec/imx53/platform_session/client.h → repos/os/include/legacy/imx53/platform_session/client.h
View File

@ -11,12 +11,12 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__PLATFORM_SESSION__CLIENT_H_
#define _INCLUDE__PLATFORM_SESSION__CLIENT_H_
#ifndef _INCLUDE__LEGACY__IMX53__PLATFORM_SESSION__CLIENT_H_
#define _INCLUDE__LEGACY__IMX53__PLATFORM_SESSION__CLIENT_H_
#include <base/capability.h>
#include <base/rpc_client.h>
#include <platform_session/platform_session.h>
#include <legacy/imx53/platform_session/platform_session.h>
namespace Platform { struct Client; }
@ -33,4 +33,4 @@ struct Platform::Client : Genode::Rpc_client<Session>
Board_revision revision() override { return call<Rpc_revision>(); }
};
#endif /* _INCLUDE__PLATFORM_SESSION__CLIENT_H_ */
#endif /* _INCLUDE__LEGACY__IMX53__PLATFORM_SESSION__CLIENT_H_ */

8
repos/os/include/spec/rpi/platform_session/connection.h → repos/os/include/legacy/imx53/platform_session/connection.h
View File

@ -11,10 +11,10 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__RPI__PLATFORM_SESSION__CONNECTION_H_
#define _INCLUDE__SPEC__RPI__PLATFORM_SESSION__CONNECTION_H_
#ifndef _INCLUDE__LEGACY__IMX53__PLATFORM_SESSION__CONNECTION_H_
#define _INCLUDE__LEGACY__IMX53__PLATFORM_SESSION__CONNECTION_H_
#include <platform_session/client.h>
#include <legacy/imx53/platform_session/client.h>
#include <util/arg_string.h>
#include <base/connection.h>
@ -32,4 +32,4 @@ struct Platform::Connection : Genode::Connection<Session>, Client
Client(cap()) { }
};
#endif /* _INCLUDE__SPEC__RPI__PLATFORM_SESSION__CONNECTION_H_ */
#endif /* _INCLUDE__LEGACY__IMX53__PLATFORM_SESSION__CONNECTION_H_ */

6
repos/os/include/spec/imx53/platform_session/platform_session.h → repos/os/include/legacy/imx53/platform_session/platform_session.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__PLATFORM_SESSION__PLATFORM_SESSION_H_
#define _INCLUDE__PLATFORM_SESSION__PLATFORM_SESSION_H_
#ifndef _INCLUDE__LEGACY__IMX53__PLATFORM_SESSION__PLATFORM_SESSION_H_
#define _INCLUDE__LEGACY__IMX53__PLATFORM_SESSION__PLATFORM_SESSION_H_
#include <base/capability.h>
#include <base/rpc.h>
@ -64,4 +64,4 @@ struct Platform::Session : Genode::Session
Rpc_revision);
};
#endif /* _INCLUDE__PLATFORM_SESSION__PLATFORM_SESSION_H_ */
#endif /* _INCLUDE__LEGACY__IMX53__PLATFORM_SESSION__PLATFORM_SESSION_H_ */

6
repos/os/include/spec/rpi/platform/framebuffer_info.h → repos/os/include/legacy/rpi/platform/framebuffer_info.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _PLATFORM__FRAMEBUFFER_INFO_H_
#define _PLATFORM__FRAMEBUFFER_INFO_H_
#ifndef _INCLUDE__LEGACY__RPI__PLATFORM__FRAMEBUFFER_INFO_H_
#define _INCLUDE__LEGACY__RPI__PLATFORM__FRAMEBUFFER_INFO_H_
#include <base/stdint.h>
@ -56,4 +56,4 @@ struct Platform::Framebuffer_info
{ }
};
#endif /* _PLATFORM__FRAMEBUFFER_INFO_H_ */
#endif /* _INCLUDE__LEGACY__RPI__PLATFORM__FRAMEBUFFER_INFO_H_ */

6
repos/os/include/spec/rpi/platform/property_message.h → repos/os/include/legacy/rpi/platform/property_message.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _PLATFORM__PROPERTY_MESSAGE_H_
#define _PLATFORM__PROPERTY_MESSAGE_H_
#ifndef _INCLUDE__LEGACY__RPI__PLATFORM__PROPERTY_MESSAGE_H_
#define _INCLUDE__LEGACY__RPI__PLATFORM__PROPERTY_MESSAGE_H_
/* Genode includes */
#include <util/misc_math.h>
@ -206,4 +206,4 @@ struct Platform::Property_message
}
};
#endif /* _PLATFORM__PROPERTY_MESSAGE_H_ */
#endif /* _INCLUDE__LEGACY__RPI__PLATFORM__PROPERTY_MESSAGE_H_ */

8
repos/os/include/spec/rpi/platform_session/client.h → repos/os/include/legacy/rpi/platform_session/client.h
View File

@ -11,12 +11,12 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__PLATFORM_SESSION__CLIENT_H_
#define _INCLUDE__PLATFORM_SESSION__CLIENT_H_
#ifndef _INCLUDE__LEGACY__RPI__PLATFORM_SESSION__CLIENT_H_
#define _INCLUDE__LEGACY__RPI__PLATFORM_SESSION__CLIENT_H_
#include <base/capability.h>
#include <base/rpc_client.h>
#include <platform_session/platform_session.h>
#include <legacy/rpi/platform_session/platform_session.h>
namespace Platform { struct Client; }
@ -38,4 +38,4 @@ struct Platform::Client : Genode::Rpc_client<Platform::Session>
return call<Rpc_get_clock_rate>(clock); }
};
#endif /* _INCLUDE__PLATFORM_SESSION__CLIENT_H_ */
#endif /* _INCLUDE__LEGACY__RPI__PLATFORM_SESSION__CLIENT_H_ */

8
repos/os/include/spec/imx53/platform_session/connection.h → repos/os/include/legacy/rpi/platform_session/connection.h
View File

@ -11,10 +11,10 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__IMX53__PLATFORM_SESSION__CONNECTION_H_
#define _INCLUDE__SPEC__IMX53__PLATFORM_SESSION__CONNECTION_H_
#ifndef _INCLUDE__LEGACY__RPI__PLATFORM_SESSION__CONNECTION_H_
#define _INCLUDE__LEGACY__RPI__PLATFORM_SESSION__CONNECTION_H_
#include <platform_session/client.h>
#include <legacy/rpi/platform_session/client.h>
#include <util/arg_string.h>
#include <base/connection.h>
@ -32,4 +32,4 @@ struct Platform::Connection : Genode::Connection<Session>, Client
Client(cap()) { }
};
#endif /* _INCLUDE__SPEC__IMX53__PLATFORM_SESSION__CONNECTION_H_ */
#endif /* _INCLUDE__LEGACY__RPI__PLATFORM_SESSION__CONNECTION_H_ */

8
repos/os/include/spec/rpi/platform_session/platform_session.h → repos/os/include/legacy/rpi/platform_session/platform_session.h
View File

@ -11,13 +11,13 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__PLATFORM_SESSION__PLATFORM_SESSION_H_
#define _INCLUDE__PLATFORM_SESSION__PLATFORM_SESSION_H_
#ifndef _INCLUDE__LEGACY__RPI__PLATFORM_SESSION__PLATFORM_SESSION_H_
#define _INCLUDE__LEGACY__RPI__PLATFORM_SESSION__PLATFORM_SESSION_H_
#include <base/capability.h>
#include <base/rpc.h>
#include <dataspace/capability.h>
#include <spec/rpi/platform/framebuffer_info.h>
#include <legacy/rpi/platform/framebuffer_info.h>
namespace Platform {
using namespace Genode;
@ -86,4 +86,4 @@ struct Platform::Session : Genode::Session
Rpc_get_power_state, Rpc_get_clock_rate);
};
#endif /* _INCLUDE__PLATFORM_SESSION__PLATFORM_SESSION_H_ */
#endif /* _INCLUDE__LEGACY__RPI__PLATFORM_SESSION__PLATFORM_SESSION_H_ */

2
repos/os/include/platform_device/capability.h → repos/os/include/legacy/x86/platform_device/capability.h
View File

@ -14,6 +14,6 @@
#pragma once
#include <base/capability.h>
#include <platform_device/platform_device.h>
#include <legacy/x86/platform_device/platform_device.h>
namespace Platform { typedef Genode::Capability<Device> Device_capability; }

10
repos/os/include/spec/x86/platform_device/client.h → repos/os/include/legacy/x86/platform_device/client.h
View File

@ -11,11 +11,11 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__X86__PLATFORM_DEVICE__CLIENT_H_
#define _INCLUDE__SPEC__X86__PLATFORM_DEVICE__CLIENT_H_
#ifndef _INCLUDE__LEGACY__X86__PLATFORM_DEVICE__CLIENT_H_
#define _INCLUDE__LEGACY__X86__PLATFORM_DEVICE__CLIENT_H_
#include <platform_session/platform_session.h>
#include <platform_device/platform_device.h>
#include <legacy/x86/platform_session/platform_session.h>
#include <legacy/x86/platform_device/platform_device.h>
#include <base/rpc_client.h>
#include <io_mem_session/io_mem_session.h>
@ -61,4 +61,4 @@ struct Platform::Device_client : public Rpc_client<Device>
return call<Rpc_io_mem>(id, cache, offset, size); }
};
#endif /* _INCLUDE__SPEC__X86__PLATFORM_DEVICE__CLIENT_H_ */
#endif /* _INCLUDE__LEGACY__X86__PLATFORM_DEVICE__CLIENT_H_ */

6
repos/os/include/platform_device/device.h → repos/os/include/legacy/x86/platform_device/device.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__PLATFORM_DEVICE__DEVICE_H_
#define _INCLUDE__PLATFORM_DEVICE__DEVICE_H_
#ifndef _INCLUDE__LEGACY__X86__PLATFORM_DEVICE__DEVICE_H_
#define _INCLUDE__LEGACY__X86__PLATFORM_DEVICE__DEVICE_H_
#include <util/interface.h>
#include <base/cache.h>
@ -35,4 +35,4 @@ struct Platform::Abstract_device : Genode::Interface
Genode::addr_t, Genode::size_t) = 0;
};
#endif /* _INCLUDE__PLATFORM_DEVICE__DEVICE_H_ */
#endif /* _INCLUDE__LEGACY__X86__PLATFORM_DEVICE__DEVICE_H_ */

8
repos/os/include/spec/x86/platform_device/platform_device.h → repos/os/include/legacy/x86/platform_device/platform_device.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__X86__PLATFORM_DEVICE__PLATFORM_DEVICE_H_
#define _INCLUDE__SPEC__X86__PLATFORM_DEVICE__PLATFORM_DEVICE_H_
#ifndef _INCLUDE__LEGACY__X86__PLATFORM_DEVICE__PLATFORM_DEVICE_H_
#define _INCLUDE__LEGACY__X86__PLATFORM_DEVICE__PLATFORM_DEVICE_H_
/* Genode includes */
#include <base/rpc.h>
@ -24,7 +24,7 @@
#include <irq_session/capability.h>
/* os includes */
#include <platform_device/device.h>
#include <legacy/x86/platform_device/device.h>
namespace Platform {
@ -258,4 +258,4 @@ struct Platform::Device : Platform::Abstract_device
Rpc_config_write, Rpc_irq, Rpc_io_port, Rpc_io_mem);
};
#endif /* _INCLUDE__SPEC__X86__PLATFORM_DEVICE__PLATFORM_DEVICE_H_ */
#endif /* _INCLUDE__LEGACY__X86__PLATFORM_DEVICE__PLATFORM_DEVICE_H_ */

22
repos/os/include/legacy/x86/platform_session/capability.h Normal file
View File

@ -0,0 +1,22 @@
/*
* \brief Platform session capability type
* \author Stefan Kalkowski
* \date 2013-04-29
*/
/*
* Copyright (C) 2013-2017 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__LEGACY__X86__PLATFORM_SESSION__CAPABILITY_H_
#define _INCLUDE__LEGACY__X86__PLATFORM_SESSION__CAPABILITY_H_
#include <base/capability.h>
#include <legacy/x86/platform_session/platform_session.h>
namespace Platform { typedef Genode::Capability<Session> Session_capability; }
#endif /* _INCLUDE__LEGACY__X86__PLATFORM_SESSION__CAPABILITY_H_ */

10
repos/os/include/spec/x86/platform_session/client.h → repos/os/include/legacy/x86/platform_session/client.h
View File

@ -11,12 +11,12 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__X86__PLATFORM_SESSION_H_
#define _INCLUDE__SPEC__X86__PLATFORM_SESSION_H_
#ifndef _INCLUDE__LEGACY__X86__PLATFORM_SESSION_H_
#define _INCLUDE__LEGACY__X86__PLATFORM_SESSION_H_
#include <base/rpc_client.h>
#include <platform_device/client.h>
#include <platform_session/capability.h>
#include <legacy/x86/platform_device/client.h>
#include <legacy/x86/platform_session/capability.h>
namespace Platform { struct Client; }
@ -50,4 +50,4 @@ struct Platform::Client : public Rpc_client<Session>
return call<Rpc_device>(device); }
};
#endif /* _INCLUDE__SPEC__X86__PLATFORM_SESSION_H_ */
#endif /* _INCLUDE__LEGACY__X86__PLATFORM_SESSION_H_ */

8
repos/os/include/spec/x86/platform_session/connection.h → repos/os/include/legacy/x86/platform_session/connection.h
View File

@ -11,12 +11,12 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__X86__PLATFORM_SESSION__CONNECTION_H_
#define _INCLUDE__SPEC__X86__PLATFORM_SESSION__CONNECTION_H_
#ifndef _INCLUDE__LEGACY__X86__PLATFORM_SESSION__CONNECTION_H_
#define _INCLUDE__LEGACY__X86__PLATFORM_SESSION__CONNECTION_H_
#include <util/retry.h>
#include <base/connection.h>
#include <platform_session/client.h>
#include <legacy/x86/platform_session/client.h>
namespace Platform { struct Connection; }
@ -48,4 +48,4 @@ struct Platform::Connection : Genode::Connection<Session>, Client
}
};
#endif /* _INCLUDE__SPEC__X86__PLATFORM_SESSION__CONNECTION_H_ */
#endif /* _INCLUDE__LEGACY__X86__PLATFORM_SESSION__CONNECTION_H_ */

10
repos/os/include/spec/x86/platform_session/platform_session.h → repos/os/include/legacy/x86/platform_session/platform_session.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__X86__PLATFORM_SESSION__PLATFORM_SESSION_H_
#define _INCLUDE__SPEC__X86__PLATFORM_SESSION__PLATFORM_SESSION_H_
#ifndef _INCLUDE__LEGACY__X86__PLATFORM_SESSION__PLATFORM_SESSION_H_
#define _INCLUDE__LEGACY__X86__PLATFORM_SESSION__PLATFORM_SESSION_H_
/* Genode includes */
#include <session/session.h>
@ -20,8 +20,8 @@
#include <base/cache.h>
/* os includes */
#include <platform_device/platform_device.h>
#include <platform_device/capability.h>
#include <legacy/x86/platform_device/platform_device.h>
#include <legacy/x86/platform_device/capability.h>
namespace Platform { struct Session; }
@ -109,4 +109,4 @@ struct Platform::Session : Genode::Session
Rpc_free_dma_buffer, Rpc_dma_addr, Rpc_device);
};
#endif /* _INCLUDE__SPEC__X86__PLATFORM_SESSION__PLATFORM_SESSION_H_ */
#endif /* _INCLUDE__LEGACY__X86__PLATFORM_SESSION__PLATFORM_SESSION_H_ */

6
repos/os/include/spec/arm/platform_session/client.h → repos/os/include/platform_session/client.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__ARM__PLATFORM_SESSION__CLIENT_H_
#define _INCLUDE__SPEC__ARM__PLATFORM_SESSION__CLIENT_H_
#ifndef _INCLUDE__PLATFORM_SESSION__CLIENT_H_
#define _INCLUDE__PLATFORM_SESSION__CLIENT_H_
#include <base/rpc_client.h>
#include <platform_session/capability.h>
@ -47,4 +47,4 @@ struct Platform::Client : Genode::Rpc_client<Session>
return call<Rpc_dma_addr>(cap); }
};
#endif /* _INCLUDE__SPEC__ARM__PLATFORM_SESSION__CLIENT_H_ */
#endif /* _INCLUDE__PLATFORM_SESSION__CLIENT_H_ */

6
repos/os/include/spec/arm/platform_session/connection.h → repos/os/include/platform_session/connection.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__ARM__PLATFORM_SESSION__CONNECTION_H_
#define _INCLUDE__SPEC__ARM__PLATFORM_SESSION__CONNECTION_H_
#ifndef _INCLUDE__PLATFORM_SESSION__CONNECTION_H_
#define _INCLUDE__PLATFORM_SESSION__CONNECTION_H_
#include <base/attached_dataspace.h>
#include <base/connection.h>
@ -129,4 +129,4 @@ class Platform::Connection : public Genode::Connection<Session>,
}
};
#endif /* _INCLUDE__SPEC__ARM__PLATFORM_SESSION__CONNECTION_H_ */
#endif /* _INCLUDE__PLATFORM_SESSION__CONNECTION_H_ */

8
repos/os/include/spec/arm/platform_session/device.h → repos/os/include/platform_session/device.h
View File

@ -1,5 +1,5 @@
/*
* \brief ARM-device interface
* \brief Platform-device interface
* \author Stefan Kalkowski
* \author Norman Feske
* \date 2020-04-15
@ -12,8 +12,8 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__ARM__PLATFORM_SESSION__DEVICE_H_
#define _INCLUDE__SPEC__ARM__PLATFORM_SESSION__DEVICE_H_
#ifndef _INCLUDE__PLATFORM_SESSION__DEVICE_H_
#define _INCLUDE__PLATFORM_SESSION__DEVICE_H_
#include <util/mmio.h>
#include <util/string.h>
@ -167,4 +167,4 @@ class Platform::Device::Irq : Noncopyable
}
};
#endif /* _INCLUDE__SPEC__ARM__PLATFORM_SESSION__DEVICE_H_ */
#endif /* _INCLUDE__PLATFORM_SESSION__DEVICE_H_ */

6
repos/os/include/spec/arm/platform_session/platform_session.h → repos/os/include/platform_session/platform_session.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _INCLUDE__SPEC__ARM__PLATFORM_SESSION__PLATFORM_SESSION_H_
#define _INCLUDE__SPEC__ARM__PLATFORM_SESSION__PLATFORM_SESSION_H_
#ifndef _INCLUDE__PLATFORM_SESSION__PLATFORM_SESSION_H_
#define _INCLUDE__PLATFORM_SESSION__PLATFORM_SESSION_H_
#include <base/quota_guard.h>
#include <base/rpc_args.h>
@ -124,4 +124,4 @@ struct Platform::Session : Genode::Session
Rpc_dma_addr);
};
#endif /* _INCLUDE__SPEC__ARM__PLATFORM_SESSION__PLATFORM_SESSION_H_ */
#endif /* _INCLUDE__PLATFORM_SESSION__PLATFORM_SESSION_H_ */

1
repos/os/include/spec/arm_64/platform_session/client.h
View File

@ -1 +0,0 @@
#include <spec/arm/platform_session/client.h>

1
repos/os/include/spec/arm_64/platform_session/connection.h
View File

@ -1 +0,0 @@
#include <spec/arm/platform_session/connection.h>

1
repos/os/include/spec/arm_64/platform_session/device.h
View File

@ -1 +0,0 @@
#include <spec/arm/platform_session/device.h>

1
repos/os/include/spec/arm_64/platform_session/platform_session.h
View File

@ -1 +0,0 @@
#include <spec/arm/platform_session/platform_session.h>

2
repos/os/include/virtio/pci_device.h
View File

@ -16,7 +16,7 @@
#include <os/attached_mmio.h>
#include <irq_session/client.h>
#include <platform_device/client.h>
#include <legacy/x86/platform_device/client.h>
#include <virtio/queue.h>
namespace Virtio {

13
repos/os/recipes/api/platform_session/content.mk
View File

@ -1,12 +1,9 @@
INCLUDE_SUB_DIRS := platform_session \
platform_device \
spec/arm_64/platform_session \
spec/arm/platform_session \
spec/imx53/platform_session \
spec/rpi/platform \
spec/rpi/platform_session \
spec/x86/platform_session \
spec/x86/platform_device
legacy/imx53/platform_session \
legacy/rpi/platform \
legacy/rpi/platform_session \
legacy/x86/platform_session \
legacy/x86/platform_device
INCLUDE_DIRS := $(addprefix include/,$(INCLUDE_SUB_DIRS))

2
repos/os/recipes/raw/drivers_interactive-imx53_qsb/drivers.config
View File

@ -19,7 +19,7 @@
<default-policy> <child name="dummy_input_drv"/> </default-policy> </service>
<start name="platform_drv" caps="200" managing_system="yes">
<binary name="imx53_platform_drv"/>
<binary name="legacy_imx53_platform_drv"/>
<resource name="RAM" quantum="3M"/>
<provides>
<service name="Platform"/>

1
repos/os/recipes/raw/drivers_interactive-pc/drivers.config
View File

@ -48,6 +48,7 @@
</start>
<start name="platform_drv" caps="200" managing_system="yes">
<binary name="legacy_pc_platform_drv"/>
<resource name="RAM" quantum="3M"/>
<provides>
<service name="Platform"/>

4
repos/os/src/drivers/ahci/spec/x86/platform.h
View File

@ -14,8 +14,8 @@
*/
#include <irq_session/connection.h>
#include <platform_session/connection.h>
#include <platform_device/client.h>
#include <legacy/x86/platform_session/connection.h>
#include <legacy/x86/platform_device/client.h>
#include <util/reconstructible.h>
namespace Ahci {

2
repos/os/src/drivers/framebuffer/imx53/driver.h
View File

@ -19,7 +19,7 @@
#include <drivers/defs/imx53.h>
#include <base/attached_io_mem_dataspace.h>
#include <io_mem_session/connection.h>
#include <platform_session/connection.h>
#include <legacy/imx53/platform_session/connection.h>
#include <util/mmio.h>
#include <capture_session/connection.h>

2
repos/os/src/drivers/framebuffer/rpi/main.cc
View File

@ -18,7 +18,7 @@
#include <base/component.h>
#include <util/reconstructible.h>
#include <capture_session/connection.h>
#include <platform_session/connection.h>
#include <legacy/rpi/platform_session/connection.h>
#include <blit/blit.h>
#include <timer_session/connection.h>

4
repos/os/src/drivers/gpu/intel/main.cc
View File

@ -26,8 +26,8 @@
#include <gpu/info_intel.h>
#include <io_mem_session/connection.h>
#include <irq_session/connection.h>
#include <platform_device/client.h>
#include <platform_session/connection.h>
#include <legacy/x86/platform_device/client.h>
#include <legacy/x86/platform_session/connection.h>
#include <root/component.h>
#include <timer_session/connection.h>
#include <util/fifo.h>

2
repos/os/src/drivers/gpu/intel/platform_session.h
View File

@ -11,7 +11,7 @@
* under the terms of the GNU Affero General Public License version 3.
*/
#include <platform_session/platform_session.h>
#include <legacy/x86/platform_session/platform_session.h>
namespace Platform {
class Device_component;

2
repos/os/src/drivers/nic/virtio/pci_device.cc
View File

@ -14,7 +14,7 @@
/* Genode includes */
#include <base/component.h>
#include <base/heap.h>
#include <platform_session/connection.h>
#include <legacy/x86/platform_session/connection.h>
#include <virtio/pci_device.h>
/* NIC driver includes */

4
repos/os/src/drivers/nvme/pci.h
View File

@ -16,8 +16,8 @@
/* Genode includes */
#include <irq_session/connection.h>
#include <platform_device/client.h>
#include <platform_session/connection.h>
#include <legacy/x86/platform_device/client.h>
#include <legacy/x86/platform_session/connection.h>
namespace Nvme {

0
repos/os/src/drivers/platform/spec/arm/clock.h → repos/os/src/drivers/platform/clock.h
View File

0
repos/os/src/drivers/platform/spec/arm/device.cc → repos/os/src/drivers/platform/device.cc
View File

0
repos/os/src/drivers/platform/spec/arm/device.h → repos/os/src/drivers/platform/device.h
View File

0
repos/os/src/drivers/platform/spec/arm/device_component.cc → repos/os/src/drivers/platform/device_component.cc
View File

0
repos/os/src/drivers/platform/spec/arm/device_component.h → repos/os/src/drivers/platform/device_component.h
View File

0
repos/os/src/drivers/platform/spec/arm/device_model_policy.cc → repos/os/src/drivers/platform/device_model_policy.cc
View File

0
repos/os/src/drivers/platform/spec/imx53/ccm.h → repos/os/src/drivers/platform/legacy/imx53/ccm.h
View File

0
repos/os/src/drivers/platform/spec/imx53/iim.h → repos/os/src/drivers/platform/legacy/imx53/iim.h
View File

0
repos/os/src/drivers/platform/spec/imx53/iomux.h → repos/os/src/drivers/platform/legacy/imx53/iomux.h
View File

2
repos/os/src/drivers/platform/spec/imx53/main.cc → repos/os/src/drivers/platform/legacy/imx53/main.cc
View File

@ -15,7 +15,7 @@
#include <base/heap.h>
#include <base/component.h>
#include <root/component.h>
#include <platform_session/platform_session.h>
#include <legacy/imx53/platform_session/platform_session.h>
#include <ccm.h>
#include <iim.h>

0
repos/os/src/drivers/platform/spec/imx53/src.h → repos/os/src/drivers/platform/legacy/imx53/src.h
View File

2
repos/os/src/drivers/platform/spec/imx53/target.mk → repos/os/src/drivers/platform/legacy/imx53/target.mk
View File

@ -1,4 +1,4 @@
TARGET = imx53_platform_drv
TARGET = legacy_imx53_platform_drv
REQUIRES = arm_v7
SRC_CC = main.cc
INC_DIR += ${PRG_DIR} $(call select_from_repositories,include/spec/imx53)

2
repos/os/src/drivers/platform/spec/rpi/framebuffer_message.h → repos/os/src/drivers/platform/legacy/rpi/framebuffer_message.h
View File

@ -20,7 +20,7 @@
/* board-specific includes */
#include <drivers/defs/rpi.h>
#include <platform/framebuffer_info.h>
#include <legacy/rpi/platform/framebuffer_info.h>
namespace Platform { struct Framebuffer_message; }

4
repos/os/src/drivers/platform/spec/rpi/main.cc → repos/os/src/drivers/platform/legacy/rpi/main.cc
View File

@ -18,8 +18,8 @@
#include <root/component.h>
/* platform includes */
#include <platform_session/platform_session.h>
#include <platform/property_message.h>
#include <legacy/rpi/platform_session/platform_session.h>
#include <legacy/rpi/platform/property_message.h>
/* local includes */
#include <mbox.h>

0
repos/os/src/drivers/platform/spec/rpi/mbox.h → repos/os/src/drivers/platform/legacy/rpi/mbox.h
View File

0
repos/os/src/drivers/platform/spec/rpi/property_command.h → repos/os/src/drivers/platform/legacy/rpi/property_command.h
View File

2
repos/os/src/drivers/platform/spec/rpi/target.mk → repos/os/src/drivers/platform/legacy/rpi/target.mk
View File

@ -1,4 +1,4 @@
TARGET = rpi_platform_drv
TARGET = legacy_rpi_platform_drv
REQUIRES = arm_v6
SRC_CC = main.cc
INC_DIR += ${PRG_DIR} $(call select_from_repositories,include/spec/rpi)

0
repos/os/src/drivers/platform/spec/x86/README → repos/os/src/drivers/platform/legacy/x86/README
View File

0
repos/os/src/drivers/platform/spec/x86/device_pd.cc → repos/os/src/drivers/platform/legacy/x86/device_pd.cc
View File

2
repos/os/src/drivers/platform/spec/x86/device_pd.h → repos/os/src/drivers/platform/legacy/x86/device_pd.h
View File

@ -22,7 +22,7 @@
#include <io_mem_session/connection.h>
/* os */
#include <platform_session/platform_session.h>
#include <legacy/x86/platform_session/platform_session.h>
namespace Platform { class Device_pd; }

0
repos/os/src/drivers/platform/spec/x86/irq.cc → repos/os/src/drivers/platform/legacy/x86/irq.cc
View File

0
repos/os/src/drivers/platform/spec/x86/irq.h → repos/os/src/drivers/platform/legacy/x86/irq.h
View File

0
repos/os/src/drivers/platform/spec/x86/irq_proxy.h → repos/os/src/drivers/platform/legacy/x86/irq_proxy.h
View File

0
repos/os/src/drivers/platform/spec/x86/main.cc → repos/os/src/drivers/platform/legacy/x86/main.cc
View File

0
repos/os/src/drivers/platform/spec/x86/nonpci_devices.cc → repos/os/src/drivers/platform/legacy/x86/nonpci_devices.cc
View File

0
repos/os/src/drivers/platform/spec/x86/pci_bridge.h → repos/os/src/drivers/platform/legacy/x86/pci_bridge.h
View File

2
repos/os/src/drivers/platform/spec/x86/pci_config_access.h → repos/os/src/drivers/platform/legacy/x86/pci_config_access.h
View File

@ -16,7 +16,7 @@
#include <base/attached_io_mem_dataspace.h>
#include <base/attached_rom_dataspace.h>
#include <platform_device/platform_device.h>
#include <legacy/x86/platform_device/platform_device.h>
#include <util/bit_array.h>
#include <util/mmio.h>

0
repos/os/src/drivers/platform/spec/x86/pci_device.cc → repos/os/src/drivers/platform/legacy/x86/pci_device.cc
View File

2
repos/os/src/drivers/platform/spec/x86/pci_device_component.h → repos/os/src/drivers/platform/legacy/x86/pci_device_component.h
View File

@ -23,7 +23,7 @@
#include <util/construct_at.h>
/* os */
#include <platform_device/platform_device.h>
#include <legacy/x86/platform_device/platform_device.h>
/* local */
#include "pci_device_config.h"

2
repos/os/src/drivers/platform/spec/x86/pci_device_config.h → repos/os/src/drivers/platform/legacy/x86/pci_device_config.h
View File

@ -15,7 +15,7 @@
#define _X86__PCI_DEVICE_CONFIG_H_
#include <base/output.h>
#include <platform_device/platform_device.h>
#include <legacy/x86/platform_device/platform_device.h>
#include <util/register.h>
#include "pci_config_access.h"

2
repos/os/src/drivers/platform/spec/x86/pci_session_component.h → repos/os/src/drivers/platform/legacy/x86/pci_session_component.h
View File

@ -30,7 +30,7 @@
#include <io_mem_session/connection.h>
#include <os/reporter.h>
#include <os/session_policy.h>
#include <platform_session/platform_session.h>
#include <legacy/x86/platform_session/platform_session.h>
/* local */
#include "device_pd.h"

0
repos/os/src/drivers/platform/spec/x86/session.cc → repos/os/src/drivers/platform/legacy/x86/session.cc
View File

2
repos/os/src/drivers/platform/spec/x86/target.mk → repos/os/src/drivers/platform/legacy/x86/target.mk
View File

@ -1,4 +1,4 @@
TARGET = platform_drv
TARGET = legacy_pc_platform_drv
REQUIRES = x86
SRC_CC = main.cc irq.cc pci_device.cc nonpci_devices.cc session.cc
SRC_CC += device_pd.cc

0
repos/os/src/drivers/platform/spec/arm/main.cc → repos/os/src/drivers/platform/main.cc
View File

0
repos/os/src/drivers/platform/spec/arm/named_registry.h → repos/os/src/drivers/platform/named_registry.h
View File

0
repos/os/src/drivers/platform/spec/arm/policy.h → repos/os/src/drivers/platform/policy.h
View File

0
repos/os/src/drivers/platform/spec/arm/power.h → repos/os/src/drivers/platform/power.h
View File

0
repos/os/src/drivers/platform/spec/arm/reset.h → repos/os/src/drivers/platform/reset.h
View File

0
repos/os/src/drivers/platform/spec/arm/root.cc → repos/os/src/drivers/platform/root.cc
View File

0
repos/os/src/drivers/platform/spec/arm/root.h → repos/os/src/drivers/platform/root.h
View File

61
repos/os/src/drivers/platform/rpi/framebuffer_message.h
View File

@ -1,61 +0,0 @@
/*
* \brief Marshalling of mbox messages for framebuffer channel
* \author Norman Feske
* \date 2013-09-15
*/
/*
* Copyright (C) 2013-2017 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3.
*/
#ifndef _FRAMEBUFFER_MESSAGE_H_
#define _FRAMEBUFFER_MESSAGE_H_
/* Genode includes */
#include <util/misc_math.h>
#include <base/log.h>
/* board-specific includes */
#include <drivers/defs/rpi.h>
#include <platform/framebuffer_info.h>
namespace Platform { struct Framebuffer_message; }
/**
* Mailbox message buffer for the framebuffer channel
*/
struct Platform::Framebuffer_message : Framebuffer_info
{
Framebuffer_message(Framebuffer_info const &info) : Framebuffer_info(info) { }
void finalize() { }
static unsigned channel() { return 1; }
static Rpi::Videocore_cache_policy cache_policy() {
return Rpi::COHERENT;
}
void dump(char const *label)
{
using Genode::log;
log(label, " message:");
log(" phys_width: ", phys_width);
log(" phys_height: ", phys_height);
log(" virt_width: ", virt_width);
log(" virt_height: ", virt_height);
log(" pitch: ", pitch);
log(" depth: ", depth);
log(" x_offset: ", x_offset);
log(" y_offset: ", y_offset);
log(" addr: ", Genode::Hex(addr));
log(" size: ", Genode::Hex(size));
}
};
#endif /* _FRAMEBUFFER_MESSAGE_H_ */

6
repos/os/src/drivers/platform/rpi/target.mk
View File

@ -1,4 +1,4 @@
TARGET = rpi_new_platform_drv
TARGET = rpi_platform_drv
REQUIRES = arm_v6
SRC_CC = device.cc
SRC_CC += device_component.cc
@ -6,8 +6,8 @@ SRC_CC += device_model_policy.cc
SRC_CC += main.cc
SRC_CC += session_component.cc
SRC_CC += root.cc
INC_DIR = $(PRG_DIR) $(REP_DIR)/src/drivers/platform/spec/arm
INC_DIR = $(PRG_DIR) $(REP_DIR)/src/drivers/platform
LIBS = base
vpath main.cc $(PRG_DIR)
vpath %.cc $(REP_DIR)/src/drivers/platform/spec/arm
vpath %.cc $(REP_DIR)/src/drivers/platform

0
repos/os/src/drivers/platform/spec/arm/session_component.cc → repos/os/src/drivers/platform/session_component.cc
View File

0
repos/os/src/drivers/platform/spec/arm/session_component.h → repos/os/src/drivers/platform/session_component.h
View File

7
repos/os/src/drivers/platform/spec/arm_64/target.mk
View File

@ -1,7 +0,0 @@
TARGET = platform_drv
REQUIRES = arm_64
SRC_CC = device.cc device_component.cc device_model_policy.cc main.cc session_component.cc root.cc
INC_DIR = $(PRG_DIR)/../../spec/arm
LIBS = base
vpath %.cc $(PRG_DIR)/../../spec/arm

1
repos/os/src/drivers/platform/spec/arm/target.mk → repos/os/src/drivers/platform/target.mk
View File

@ -1,5 +1,4 @@
TARGET = platform_drv
REQUIRES = arm
SRC_CC = device.cc device_component.cc device_model_policy.cc main.cc session_component.cc root.cc
INC_DIR = $(PRG_DIR)
LIBS = base

0
repos/os/src/drivers/platform/spec/arm/types.h → repos/os/src/drivers/platform/types.h
View File

2
repos/os/src/drivers/ps2/x86/main.cc
View File

@ -18,7 +18,7 @@
/* os includes */
#include <event_session/connection.h>
#include <platform_session/connection.h>
#include <legacy/x86/platform_session/connection.h>
#include <timer_session/connection.h>
/* local includes */

4
repos/os/src/test/pci/test.cc
View File

@ -13,8 +13,8 @@
#include <base/component.h>
#include <base/log.h>
#include <platform_session/connection.h>
#include <platform_device/client.h>
#include <legacy/x86/platform_session/connection.h>
#include <legacy/x86/platform_device/client.h>
#include <util/retry.h>
using namespace Genode;