Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move memcpy/memset redefinition to smsutils.h #450

Merged
merged 1 commit into from
Jun 28, 2021
Merged

Move memcpy/memset redefinition to smsutils.h #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions modules/iopcore/cdvdfsv/cdvdfsv-internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
#include "cdvdman_opl.h"

#include "smsutils.h"
#define memcpy mips_memcpy
#define memset mips_memset

extern void cdvdfsv_register_scmd_rpc(SifRpcDataQueue_t *rpc_DQ);
extern void cdvdfsv_register_ncmd_rpc(SifRpcDataQueue_t *rpc_DQ);
Expand Down
2 changes: 0 additions & 2 deletions modules/iopcore/cdvdman/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#include <defs.h>

#include "smsutils.h"
#define memcpy mips_memcpy
#define memset mips_memset

#ifdef __IOPCORE_DEBUG
#define DPRINTF(args...) printf(args)
Expand Down
2 changes: 0 additions & 2 deletions modules/iopcore/cdvdman/ioplib_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
#include "ioplib_util.h"

#include "smsutils.h"
#define memcpy mips_memcpy
#define memset mips_memset

#ifdef __IOPCORE_DEBUG
#define DPRINTF(args...) printf(args)
Expand Down
2 changes: 0 additions & 2 deletions modules/iopcore/cdvdman/smb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
#include "cdvd_config.h"

#include "smsutils.h"
#define memcpy mips_memcpy
#define memset mips_memset

#define USE_CUSTOM_RECV 1

Expand Down
13 changes: 11 additions & 2 deletions modules/iopcore/common/smsutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,21 @@

#define smsutils_IMPORTS_start DECLARE_IMPORT_TABLE(smsutils, 1, 1)

extern void mips_memcpy(void *, const void *, unsigned);
extern void *mips_memcpy(void *, const void *, size_t);
#define I_mips_memcpy DECLARE_IMPORT(4, mips_memcpy)

extern void mips_memset(void *, int, unsigned);
extern void *mips_memset(void *, int, size_t);
#define I_mips_memset DECLARE_IMPORT(5, mips_memset)

#define smsutils_IMPORTS_end END_IMPORT_TABLE

#ifdef memcpy
#undef memcpy
#endif
#define memcpy mips_memcpy
#ifdef memset
#undef memset
#endif
#define memset mips_memset

#endif /* __SMSUTILS_H */