mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2025-09-20 08:18:35 +00:00
Replace std::make_tuple with simpler syntax (#77)
* boot2: Simplify g_additional_launch_programs
It appears that Stratosphère is targeting C++17. In C++17,
std::make_tuple is not required for initialisating a tuple anymore.
Same thing, but less typing
* Replace std::make_tuple with {}
More readable and less noise. Also fixes two missing return statements.
This commit is contained in:
Léo Lam
SciresM
parent
cf50bad36c
commit
a097babe18
11 changed files with 155 additions and 155 deletions
|
|
@ -66,83 +66,83 @@ void __appExit(void) {
|
|||
}
|
||||
|
||||
static const std::tuple<u32, bool, bool> g_gpio_map[] = {
|
||||
std::make_tuple(0xFFFFFFFF, false, false), /* Invalid */
|
||||
std::make_tuple(0x000000CC, true, false), /* Port Z, Pin 4 */
|
||||
std::make_tuple(0x00000024, true, false), /* Port E, Pin 4 */
|
||||
std::make_tuple(0x0000003C, true, false), /* Port H, Pin 4 */
|
||||
std::make_tuple(0x000000DA, false, true), /* Port BB, Pin 2 */
|
||||
std::make_tuple(0x000000DB, true, false), /* Port BB, Pin 3 */
|
||||
std::make_tuple(0x000000DC, false, false), /* Port BB, Pin 4 */
|
||||
std::make_tuple(0x00000025, true, false), /* Port E, Pin 5 */
|
||||
std::make_tuple(0x00000090, false, false), /* Port S, Pin 0 */
|
||||
std::make_tuple(0x00000091, false, false), /* Port S, Pin 1 */
|
||||
std::make_tuple(0x00000096, true, false), /* Port S, Pin 6 */
|
||||
std::make_tuple(0x00000097, false, true), /* Port S, Pin 7 */
|
||||
std::make_tuple(0x00000026, false, false), /* Port E, Pin 6 */
|
||||
std::make_tuple(0x00000005, true, false), /* Port A, Pin 5 */
|
||||
std::make_tuple(0x00000078, false, false), /* Port P, Pin 0 */
|
||||
std::make_tuple(0x00000093, false, true), /* Port S, Pin 3 */
|
||||
std::make_tuple(0x0000007D, false, false), /* Port P, Pin 5 */
|
||||
std::make_tuple(0x0000007C, false, false), /* Port P, Pin 4 */
|
||||
std::make_tuple(0x0000007B, false, false), /* Port P, Pin 3 */
|
||||
std::make_tuple(0x0000007A, false, false), /* Port P, Pin 2 */
|
||||
std::make_tuple(0x000000BC, false, true), /* Port X, Pin 4 */
|
||||
std::make_tuple(0x000000AE, false, false), /* Port V, Pin 6 */
|
||||
std::make_tuple(0x000000BA, false, false), /* Port X, Pin 2 */
|
||||
std::make_tuple(0x000000B9, false, true), /* Port X, Pin 1 */
|
||||
std::make_tuple(0x000000BD, false, false), /* Port X, Pin 5 */
|
||||
std::make_tuple(0x000000BE, false, true), /* Port X, Pin 6 */
|
||||
std::make_tuple(0x000000BF, false, true), /* Port X, Pin 7 */
|
||||
std::make_tuple(0x000000C0, false, true), /* Port Y, Pin 0 */
|
||||
std::make_tuple(0x000000C1, false, false), /* Port Y, Pin 1 */
|
||||
std::make_tuple(0x000000A9, true, false), /* Port V, Pin 1 */
|
||||
std::make_tuple(0x000000AA, true, false), /* Port V, Pin 2 */
|
||||
std::make_tuple(0x00000055, true, false), /* Port K, Pin 5 */
|
||||
std::make_tuple(0x000000AD, true, false), /* Port V, Pin 5 */
|
||||
std::make_tuple(0x000000C8, false, true), /* Port Z, Pin 0 */
|
||||
std::make_tuple(0x000000CA, false, false), /* Port Z, Pin 2 */
|
||||
std::make_tuple(0x000000CB, false, true), /* Port Z, Pin 3 */
|
||||
std::make_tuple(0x0000004F, true, false), /* Port J, Pin 7 */
|
||||
std::make_tuple(0x00000050, false, false), /* Port K, Pin 0 */
|
||||
std::make_tuple(0x00000051, false, false), /* Port K, Pin 1 */
|
||||
std::make_tuple(0x00000052, false, false), /* Port K, Pin 2 */
|
||||
std::make_tuple(0x00000054, false, true), /* Port K, Pin 4 */
|
||||
std::make_tuple(0x00000056, false, true), /* Port K, Pin 6 */
|
||||
std::make_tuple(0x00000057, false, true), /* Port K, Pin 7 */
|
||||
std::make_tuple(0x00000053, true, false), /* Port K, Pin 3 */
|
||||
std::make_tuple(0x000000E3, true, false), /* Port CC, Pin 3 */
|
||||
std::make_tuple(0x00000038, true, false), /* Port H, Pin 0 */
|
||||
std::make_tuple(0x00000039, true, false), /* Port H, Pin 1 */
|
||||
std::make_tuple(0x0000003B, true, false), /* Port H, Pin 3 */
|
||||
std::make_tuple(0x0000003D, false, false), /* Port H, Pin 5 */
|
||||
std::make_tuple(0x0000003F, true, false), /* Port H, Pin 7 */
|
||||
std::make_tuple(0x00000040, true, false), /* Port I, Pin 0 */
|
||||
std::make_tuple(0x00000041, true, false), /* Port I, Pin 1 */
|
||||
std::make_tuple(0x0000003E, false, false), /* Port H, Pin 6 */
|
||||
std::make_tuple(0x000000E2, false, true), /* Port CC, Pin 2 */
|
||||
std::make_tuple(0x000000E4, true, false), /* Port CC, Pin 4 */
|
||||
std::make_tuple(0x0000003A, false, false), /* Port H, Pin 2 */
|
||||
std::make_tuple(0x000000C9, false, true), /* Port Z, Pin 1 */
|
||||
std::make_tuple(0x0000004D, true, false), /* Port J, Pin 5 */
|
||||
std::make_tuple(0x00000058, true, false), /* Port L, Pin 0 */
|
||||
std::make_tuple(0x0000003E, false, false), /* Port H, Pin 6 */
|
||||
std::make_tuple(0x00000026, false, false), /* Port E, Pin 6 */
|
||||
std::make_tuple(0xFFFFFFFF, false, false), /* Invalid */
|
||||
std::make_tuple(0x00000033, false, false), /* Port G, Pin 3 */
|
||||
std::make_tuple(0x0000001C, false, false), /* Port D, Pin 4 */
|
||||
std::make_tuple(0x000000D9, false, false), /* Port BB, Pin 1 */
|
||||
std::make_tuple(0x0000000C, false, false), /* Port B, Pin 4 */
|
||||
std::make_tuple(0x0000000D, false, false), /* Port B, Pin 5 */
|
||||
std::make_tuple(0x00000021, false, false), /* Port E, Pin 1 */
|
||||
std::make_tuple(0x00000027, false, false), /* Port E, Pin 7 */
|
||||
std::make_tuple(0x00000092, false, false), /* Port S, Pin 2 */
|
||||
std::make_tuple(0x00000095, false, false), /* Port S, Pin 5 */
|
||||
std::make_tuple(0x00000098, false, false), /* Port T, Pin 0 */
|
||||
std::make_tuple(0x00000010, false, false), /* Port C, Pin 0 */
|
||||
std::make_tuple(0x00000011, false, false), /* Port C, Pin 1 */
|
||||
std::make_tuple(0x00000012, false, false), /* Port C, Pin 2 */
|
||||
std::make_tuple(0x00000042, false, false), /* Port I, Pin 2 */
|
||||
std::make_tuple(0x000000E6, false, false), /* Port CC, Pin 6 */
|
||||
{0xFFFFFFFF, false, false}, /* Invalid */
|
||||
{0x000000CC, true, false}, /* Port Z, Pin 4 */
|
||||
{0x00000024, true, false}, /* Port E, Pin 4 */
|
||||
{0x0000003C, true, false}, /* Port H, Pin 4 */
|
||||
{0x000000DA, false, true}, /* Port BB, Pin 2 */
|
||||
{0x000000DB, true, false}, /* Port BB, Pin 3 */
|
||||
{0x000000DC, false, false}, /* Port BB, Pin 4 */
|
||||
{0x00000025, true, false}, /* Port E, Pin 5 */
|
||||
{0x00000090, false, false}, /* Port S, Pin 0 */
|
||||
{0x00000091, false, false}, /* Port S, Pin 1 */
|
||||
{0x00000096, true, false}, /* Port S, Pin 6 */
|
||||
{0x00000097, false, true}, /* Port S, Pin 7 */
|
||||
{0x00000026, false, false}, /* Port E, Pin 6 */
|
||||
{0x00000005, true, false}, /* Port A, Pin 5 */
|
||||
{0x00000078, false, false}, /* Port P, Pin 0 */
|
||||
{0x00000093, false, true}, /* Port S, Pin 3 */
|
||||
{0x0000007D, false, false}, /* Port P, Pin 5 */
|
||||
{0x0000007C, false, false}, /* Port P, Pin 4 */
|
||||
{0x0000007B, false, false}, /* Port P, Pin 3 */
|
||||
{0x0000007A, false, false}, /* Port P, Pin 2 */
|
||||
{0x000000BC, false, true}, /* Port X, Pin 4 */
|
||||
{0x000000AE, false, false}, /* Port V, Pin 6 */
|
||||
{0x000000BA, false, false}, /* Port X, Pin 2 */
|
||||
{0x000000B9, false, true}, /* Port X, Pin 1 */
|
||||
{0x000000BD, false, false}, /* Port X, Pin 5 */
|
||||
{0x000000BE, false, true}, /* Port X, Pin 6 */
|
||||
{0x000000BF, false, true}, /* Port X, Pin 7 */
|
||||
{0x000000C0, false, true}, /* Port Y, Pin 0 */
|
||||
{0x000000C1, false, false}, /* Port Y, Pin 1 */
|
||||
{0x000000A9, true, false}, /* Port V, Pin 1 */
|
||||
{0x000000AA, true, false}, /* Port V, Pin 2 */
|
||||
{0x00000055, true, false}, /* Port K, Pin 5 */
|
||||
{0x000000AD, true, false}, /* Port V, Pin 5 */
|
||||
{0x000000C8, false, true}, /* Port Z, Pin 0 */
|
||||
{0x000000CA, false, false}, /* Port Z, Pin 2 */
|
||||
{0x000000CB, false, true}, /* Port Z, Pin 3 */
|
||||
{0x0000004F, true, false}, /* Port J, Pin 7 */
|
||||
{0x00000050, false, false}, /* Port K, Pin 0 */
|
||||
{0x00000051, false, false}, /* Port K, Pin 1 */
|
||||
{0x00000052, false, false}, /* Port K, Pin 2 */
|
||||
{0x00000054, false, true}, /* Port K, Pin 4 */
|
||||
{0x00000056, false, true}, /* Port K, Pin 6 */
|
||||
{0x00000057, false, true}, /* Port K, Pin 7 */
|
||||
{0x00000053, true, false}, /* Port K, Pin 3 */
|
||||
{0x000000E3, true, false}, /* Port CC, Pin 3 */
|
||||
{0x00000038, true, false}, /* Port H, Pin 0 */
|
||||
{0x00000039, true, false}, /* Port H, Pin 1 */
|
||||
{0x0000003B, true, false}, /* Port H, Pin 3 */
|
||||
{0x0000003D, false, false}, /* Port H, Pin 5 */
|
||||
{0x0000003F, true, false}, /* Port H, Pin 7 */
|
||||
{0x00000040, true, false}, /* Port I, Pin 0 */
|
||||
{0x00000041, true, false}, /* Port I, Pin 1 */
|
||||
{0x0000003E, false, false}, /* Port H, Pin 6 */
|
||||
{0x000000E2, false, true}, /* Port CC, Pin 2 */
|
||||
{0x000000E4, true, false}, /* Port CC, Pin 4 */
|
||||
{0x0000003A, false, false}, /* Port H, Pin 2 */
|
||||
{0x000000C9, false, true}, /* Port Z, Pin 1 */
|
||||
{0x0000004D, true, false}, /* Port J, Pin 5 */
|
||||
{0x00000058, true, false}, /* Port L, Pin 0 */
|
||||
{0x0000003E, false, false}, /* Port H, Pin 6 */
|
||||
{0x00000026, false, false}, /* Port E, Pin 6 */
|
||||
{0xFFFFFFFF, false, false}, /* Invalid */
|
||||
{0x00000033, false, false}, /* Port G, Pin 3 */
|
||||
{0x0000001C, false, false}, /* Port D, Pin 4 */
|
||||
{0x000000D9, false, false}, /* Port BB, Pin 1 */
|
||||
{0x0000000C, false, false}, /* Port B, Pin 4 */
|
||||
{0x0000000D, false, false}, /* Port B, Pin 5 */
|
||||
{0x00000021, false, false}, /* Port E, Pin 1 */
|
||||
{0x00000027, false, false}, /* Port E, Pin 7 */
|
||||
{0x00000092, false, false}, /* Port S, Pin 2 */
|
||||
{0x00000095, false, false}, /* Port S, Pin 5 */
|
||||
{0x00000098, false, false}, /* Port T, Pin 0 */
|
||||
{0x00000010, false, false}, /* Port C, Pin 0 */
|
||||
{0x00000011, false, false}, /* Port C, Pin 1 */
|
||||
{0x00000012, false, false}, /* Port C, Pin 2 */
|
||||
{0x00000042, false, false}, /* Port I, Pin 2 */
|
||||
{0x000000E6, false, false}, /* Port CC, Pin 6 */
|
||||
};
|
||||
|
||||
int gpio_configure(unsigned int gpio_pad_name) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue