nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-11-09 22:56:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

alignas preferred to __attribute__((aligned))

Browse source
This commit is contained in:
Michael Scire 2019-01-24 09:13:24 -08:00
parent f15fc6645e
commit f99dea798a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
stratosphere/fatal/source/fatal_payload_manager.cpp
View file

@ -21,8 +21,8 @@
#include "fatal_payload_manager.hpp" #include "fatal_payload_manager.hpp"
/* TODO: Find a way to pre-populate this with the contents of fusee-primary. */ /* TODO: Find a way to pre-populate this with the contents of fusee-primary. */
static u8 g_reboot_payload[IRAM_PAYLOAD_MAX_SIZE] __attribute__ ((aligned (0x1000))); static alignas(0x1000) u8 g_reboot_payload[IRAM_PAYLOAD_MAX_SIZE];
static u8 g_work_page[0x1000] __attribute__ ((aligned (0x1000))); static alignas(0x1000) u8 g_work_page[0x1000];
static bool g_payload_loaded = false; static bool g_payload_loaded = false;
void FatalPayloadManager::LoadPayloadFromSdCard() { void FatalPayloadManager::LoadPayloadFromSdCard() {

6
troposphere/reboot_to_payload/source/main.c
View file

@ -7,9 +7,9 @@
#define IRAM_PAYLOAD_MAX_SIZE 0x2F000 #define IRAM_PAYLOAD_MAX_SIZE 0x2F000
#define IRAM_PAYLOAD_BASE 0x40010000 #define IRAM_PAYLOAD_BASE 0x40010000
static u8 g_reboot_payload[IRAM_PAYLOAD_MAX_SIZE] __attribute__ ((aligned (0x1000))); static alignas(0x1000) u8 g_reboot_payload[IRAM_PAYLOAD_MAX_SIZE];
static u8 g_ff_page[0x1000] __attribute__ ((aligned (0x1000))); static alignas(0x1000) u8 g_ff_page[0x1000];
static u8 g_work_page[0x1000] __attribute__ ((aligned (0x1000))); static alignas(0x1000) u8 g_work_page[0x1000];
void do_iram_dram_copy(void *buf, uintptr_t iram_addr, size_t size, int option) { void do_iram_dram_copy(void *buf, uintptr_t iram_addr, size_t size, int option) {
memcpy(g_work_page, buf, size); memcpy(g_work_page, buf, size);