From 224db6a4c87fab164e7aae9f6d42ca26f94f2cdf Mon Sep 17 00:00:00 2001 From: Themaister Date: Fri, 16 Mar 2012 23:46:56 +0100 Subject: [PATCH] Merge ups.h/bps.h into patch.h. --- file.c | 3 +-- patch.c | 3 +-- bps.h => patch.h | 26 ++++++++++++++++++++++---- ups.h | 44 -------------------------------------------- 4 files changed, 24 insertions(+), 52 deletions(-) rename bps.h => patch.h (71%) delete mode 100644 ups.h diff --git a/file.c b/file.c index 4747dcfcfe..297e26661c 100644 --- a/file.c +++ b/file.c @@ -24,8 +24,7 @@ #include #include "dynamic.h" #include "movie.h" -#include "ups.h" -#include "bps.h" +#include "patch.h" #include "compat/strl.h" #ifdef HAVE_XML diff --git a/patch.c b/patch.c index 4b8bc2ae2c..af70d40304 100644 --- a/patch.c +++ b/patch.c @@ -15,8 +15,7 @@ * If not, see . */ -#include "bps.h" -#include "ups.h" +#include "patch.h" #include "movie.h" #include "boolean.h" #include "msvc/msvc_compat.h" diff --git a/bps.h b/patch.h similarity index 71% rename from bps.h rename to patch.h index d2a0215642..5113a95eb9 100644 --- a/bps.h +++ b/patch.h @@ -15,13 +15,13 @@ * If not, see . */ -#ifndef __BPS_H -#define __BPS_H +#ifndef __PATCH_H +#define __PATCH_H #include #include -// BPS implementation from bSNES (nall::). +// BPS/UPS implementation from bSNES (nall::). typedef enum bps_error { @@ -41,5 +41,23 @@ bps_error_t bps_apply_patch( const uint8_t *source_data, size_t source_length, uint8_t *target_data, size_t *target_length); -#endif +typedef enum ups_error +{ + UPS_UNKNOWN, + UPS_SUCCESS, + UPS_PATCH_INVALID, + UPS_SOURCE_INVALID, + UPS_TARGET_INVALID, + UPS_TARGET_TOO_SMALL, + UPS_PATCH_CHECKSUM_INVALID, + UPS_SOURCE_CHECKSUM_INVALID, + UPS_TARGET_CHECKSUM_INVALID +} ups_error_t; + +ups_error_t ups_apply_patch( + const uint8_t *patch_data, size_t patch_length, + const uint8_t *source_data, size_t source_length, + uint8_t *target_data, size_t *target_length); + +#endif diff --git a/ups.h b/ups.h deleted file mode 100644 index 631b3de4fc..0000000000 --- a/ups.h +++ /dev/null @@ -1,44 +0,0 @@ -/* SSNES - A Super Nintendo Entertainment System (SNES) Emulator frontend for libsnes. - * Copyright (C) 2010-2012 - Hans-Kristian Arntzen - * - * Some code herein may be based on code found in BSNES. - * - * SSNES is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * SSNES is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with SSNES. - * If not, see . - */ - -#ifndef __UPS_H -#define __UPS_H - -#include -#include - -// UPS implementation from bSNES. - -typedef enum ups_error -{ - UPS_UNKNOWN, - UPS_SUCCESS, - UPS_PATCH_INVALID, - UPS_SOURCE_INVALID, - UPS_TARGET_INVALID, - UPS_TARGET_TOO_SMALL, - UPS_PATCH_CHECKSUM_INVALID, - UPS_SOURCE_CHECKSUM_INVALID, - UPS_TARGET_CHECKSUM_INVALID -} ups_error_t; - -ups_error_t ups_apply_patch( - const uint8_t *patch_data, size_t patch_length, - const uint8_t *source_data, size_t source_length, - uint8_t *target_data, size_t *target_length); - -#endif