From 2c3111f9c9df99d75db58b39d63a492dec8c7338 Mon Sep 17 00:00:00 2001 From: hexkyz Date: Fri, 10 May 2019 17:15:25 +0100 Subject: [PATCH] fusee: Add more verbose error messages boot: Fix license text --- fusee/fusee-primary/src/sdmmc/sdmmc_core.c | 12 +++++++++--- fusee/fusee-secondary/src/sdmmc/sdmmc_core.c | 12 +++++++++--- sept/sept-secondary/src/sdmmc/sdmmc_core.c | 12 +++++++++--- stratosphere/boot/source/i2c_driver/i2c_api.cpp | 8 ++------ .../boot/source/i2c_driver/i2c_command_list.cpp | 8 ++------ .../boot/source/i2c_driver/i2c_driver_session.cpp | 8 ++------ .../boot/source/i2c_driver/i2c_resource_manager.cpp | 8 ++------ stratosphere/boot/source/updater/updater_api.cpp | 8 ++------ .../boot/source/updater/updater_bis_management.cpp | 8 ++------ .../boot/source/updater/updater_bis_save.cpp | 8 ++------ stratosphere/boot/source/updater/updater_files.cpp | 8 ++------ stratosphere/boot/source/updater/updater_paths.cpp | 8 ++------ 12 files changed, 45 insertions(+), 63 deletions(-) diff --git a/fusee/fusee-primary/src/sdmmc/sdmmc_core.c b/fusee/fusee-primary/src/sdmmc/sdmmc_core.c index 6e2093916..aa79fc5ff 100644 --- a/fusee/fusee-primary/src/sdmmc/sdmmc_core.c +++ b/fusee/fusee-primary/src/sdmmc/sdmmc_core.c @@ -668,7 +668,7 @@ static int sdmmc_int_clk_enable(sdmmc_t *sdmmc) /* Clock failed to stabilize. */ if (is_timeout) { - sdmmc_error(sdmmc, "clock never stabilized!"); + sdmmc_error(sdmmc, "Clock never stabilized!"); return 0; } @@ -1353,8 +1353,11 @@ static int sdmmc_dma_init(sdmmc_t *sdmmc, sdmmc_request_t *req) { /* Invalid block count or size. */ if (!req->blksz || !req->num_blocks) + { + sdmmc_error(sdmmc, "Empty DMA request!"); return 0; - + } + uint32_t blkcnt = req->num_blocks; /* Truncate block count. Length can't be over 65536 bytes. */ @@ -1366,8 +1369,11 @@ static int sdmmc_dma_init(sdmmc_t *sdmmc, sdmmc_request_t *req) /* DMA buffer address must be aligned to 4 bytes. */ if ((4 - (dma_base_addr & 0x03)) & 0x03) + { + sdmmc_error(sdmmc, "Invalid DMA request data buffer: 0x%08X", dma_base_addr); return 0; - + } + /* Write our address to the registers. */ if (sdmmc->use_adma) { diff --git a/fusee/fusee-secondary/src/sdmmc/sdmmc_core.c b/fusee/fusee-secondary/src/sdmmc/sdmmc_core.c index 6e2093916..aa79fc5ff 100644 --- a/fusee/fusee-secondary/src/sdmmc/sdmmc_core.c +++ b/fusee/fusee-secondary/src/sdmmc/sdmmc_core.c @@ -668,7 +668,7 @@ static int sdmmc_int_clk_enable(sdmmc_t *sdmmc) /* Clock failed to stabilize. */ if (is_timeout) { - sdmmc_error(sdmmc, "clock never stabilized!"); + sdmmc_error(sdmmc, "Clock never stabilized!"); return 0; } @@ -1353,8 +1353,11 @@ static int sdmmc_dma_init(sdmmc_t *sdmmc, sdmmc_request_t *req) { /* Invalid block count or size. */ if (!req->blksz || !req->num_blocks) + { + sdmmc_error(sdmmc, "Empty DMA request!"); return 0; - + } + uint32_t blkcnt = req->num_blocks; /* Truncate block count. Length can't be over 65536 bytes. */ @@ -1366,8 +1369,11 @@ static int sdmmc_dma_init(sdmmc_t *sdmmc, sdmmc_request_t *req) /* DMA buffer address must be aligned to 4 bytes. */ if ((4 - (dma_base_addr & 0x03)) & 0x03) + { + sdmmc_error(sdmmc, "Invalid DMA request data buffer: 0x%08X", dma_base_addr); return 0; - + } + /* Write our address to the registers. */ if (sdmmc->use_adma) { diff --git a/sept/sept-secondary/src/sdmmc/sdmmc_core.c b/sept/sept-secondary/src/sdmmc/sdmmc_core.c index 6e2093916..aa79fc5ff 100644 --- a/sept/sept-secondary/src/sdmmc/sdmmc_core.c +++ b/sept/sept-secondary/src/sdmmc/sdmmc_core.c @@ -668,7 +668,7 @@ static int sdmmc_int_clk_enable(sdmmc_t *sdmmc) /* Clock failed to stabilize. */ if (is_timeout) { - sdmmc_error(sdmmc, "clock never stabilized!"); + sdmmc_error(sdmmc, "Clock never stabilized!"); return 0; } @@ -1353,8 +1353,11 @@ static int sdmmc_dma_init(sdmmc_t *sdmmc, sdmmc_request_t *req) { /* Invalid block count or size. */ if (!req->blksz || !req->num_blocks) + { + sdmmc_error(sdmmc, "Empty DMA request!"); return 0; - + } + uint32_t blkcnt = req->num_blocks; /* Truncate block count. Length can't be over 65536 bytes. */ @@ -1366,8 +1369,11 @@ static int sdmmc_dma_init(sdmmc_t *sdmmc, sdmmc_request_t *req) /* DMA buffer address must be aligned to 4 bytes. */ if ((4 - (dma_base_addr & 0x03)) & 0x03) + { + sdmmc_error(sdmmc, "Invalid DMA request data buffer: 0x%08X", dma_base_addr); return 0; - + } + /* Write our address to the registers. */ if (sdmmc->use_adma) { diff --git a/stratosphere/boot/source/i2c_driver/i2c_api.cpp b/stratosphere/boot/source/i2c_driver/i2c_api.cpp index c923be298..89226f033 100644 --- a/stratosphere/boot/source/i2c_driver/i2c_api.cpp +++ b/stratosphere/boot/source/i2c_driver/i2c_api.cpp @@ -1,16 +1,12 @@ /* * Copyright (c) 2018-2019 Atmosphère-NX * - * This program is free software{ - -} you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. * * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY{ - -} without even the implied warranty of MERCHANTABILITY or + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * diff --git a/stratosphere/boot/source/i2c_driver/i2c_command_list.cpp b/stratosphere/boot/source/i2c_driver/i2c_command_list.cpp index 0e11f4e4f..44915029b 100644 --- a/stratosphere/boot/source/i2c_driver/i2c_command_list.cpp +++ b/stratosphere/boot/source/i2c_driver/i2c_command_list.cpp @@ -1,16 +1,12 @@ /* * Copyright (c) 2018-2019 Atmosphère-NX * - * This program is free software{ - -} you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. * * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY{ - -} without even the implied warranty of MERCHANTABILITY or + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * diff --git a/stratosphere/boot/source/i2c_driver/i2c_driver_session.cpp b/stratosphere/boot/source/i2c_driver/i2c_driver_session.cpp index 7f909b8fc..47e430554 100644 --- a/stratosphere/boot/source/i2c_driver/i2c_driver_session.cpp +++ b/stratosphere/boot/source/i2c_driver/i2c_driver_session.cpp @@ -1,16 +1,12 @@ /* * Copyright (c) 2018-2019 Atmosphère-NX * - * This program is free software{ - -} you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. * * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY{ - -} without even the implied warranty of MERCHANTABILITY or + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * diff --git a/stratosphere/boot/source/i2c_driver/i2c_resource_manager.cpp b/stratosphere/boot/source/i2c_driver/i2c_resource_manager.cpp index 2ae9b22f6..ad3f412e1 100644 --- a/stratosphere/boot/source/i2c_driver/i2c_resource_manager.cpp +++ b/stratosphere/boot/source/i2c_driver/i2c_resource_manager.cpp @@ -1,16 +1,12 @@ /* * Copyright (c) 2018-2019 Atmosphère-NX * - * This program is free software{ - -} you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. * * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY{ - -} without even the implied warranty of MERCHANTABILITY or + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * diff --git a/stratosphere/boot/source/updater/updater_api.cpp b/stratosphere/boot/source/updater/updater_api.cpp index 8c464947d..ec31d342d 100644 --- a/stratosphere/boot/source/updater/updater_api.cpp +++ b/stratosphere/boot/source/updater/updater_api.cpp @@ -1,16 +1,12 @@ /* * Copyright (c) 2018-2019 Atmosphère-NX * - * This program is free software{ - -} you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. * * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY{ - -} without even the implied warranty of MERCHANTABILITY or + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * diff --git a/stratosphere/boot/source/updater/updater_bis_management.cpp b/stratosphere/boot/source/updater/updater_bis_management.cpp index b65528119..388ef779e 100644 --- a/stratosphere/boot/source/updater/updater_bis_management.cpp +++ b/stratosphere/boot/source/updater/updater_bis_management.cpp @@ -1,16 +1,12 @@ /* * Copyright (c) 2018-2019 Atmosphère-NX * - * This program is free software{ - -} you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. * * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY{ - -} without even the implied warranty of MERCHANTABILITY or + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * diff --git a/stratosphere/boot/source/updater/updater_bis_save.cpp b/stratosphere/boot/source/updater/updater_bis_save.cpp index 6910e6fe3..2258b170a 100644 --- a/stratosphere/boot/source/updater/updater_bis_save.cpp +++ b/stratosphere/boot/source/updater/updater_bis_save.cpp @@ -1,16 +1,12 @@ /* * Copyright (c) 2018-2019 Atmosphère-NX * - * This program is free software{ - -} you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. * * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY{ - -} without even the implied warranty of MERCHANTABILITY or + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * diff --git a/stratosphere/boot/source/updater/updater_files.cpp b/stratosphere/boot/source/updater/updater_files.cpp index 234f4e419..7c05a0089 100644 --- a/stratosphere/boot/source/updater/updater_files.cpp +++ b/stratosphere/boot/source/updater/updater_files.cpp @@ -1,16 +1,12 @@ /* * Copyright (c) 2018-2019 Atmosphère-NX * - * This program is free software{ - -} you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. * * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY{ - -} without even the implied warranty of MERCHANTABILITY or + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * diff --git a/stratosphere/boot/source/updater/updater_paths.cpp b/stratosphere/boot/source/updater/updater_paths.cpp index 215b81025..7a83cd2fa 100644 --- a/stratosphere/boot/source/updater/updater_paths.cpp +++ b/stratosphere/boot/source/updater/updater_paths.cpp @@ -1,16 +1,12 @@ /* * Copyright (c) 2018-2019 Atmosphère-NX * - * This program is free software{ - -} you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. * * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY{ - -} without even the implied warranty of MERCHANTABILITY or + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. *