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

add DONGLEMAN module #533

Closed
wants to merge 7 commits into from
Closed

add DONGLEMAN module #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6eaeb83
initial incomplete implementation
israpps Feb 26, 2024
80c9763
ups
israpps Feb 26, 2024
137701a
add dongle probe on all card probe calls
israpps Feb 29, 2024
7f62de1
fix typo
israpps Feb 29, 2024
112827a
add missing calls to command 9 transfer
israpps Feb 29, 2024
f083a77
update `mcman_getcnum()` to match DONGLEMAN
israpps Feb 29, 2024
8d00279
revert f083a77a7
israpps Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion iop/kernel/include/secrman.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ extern void SecrSetMcCommandHandler(McCommandHandler_t handler);
extern void SecrSetMcDevIDHandler(McDevIDHandler_t handler);

extern int SecrAuthCard(int port, int slot, int cnum);
extern int SecrAuthDongle(int port, int slot, int cnum);
extern void SecrResetAuthCard(int port, int slot, int cnum);

#define secrman_IMPORTS_start DECLARE_IMPORT_TABLE(secrman, 1, 3)
#define secrman_IMPORTS_end END_IMPORT_TABLE

Expand Down
18 changes: 18 additions & 0 deletions iop/memorycard/dongleman/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# _____ ___ ____ ___ ____
# ____| | ____| | | |____|
# | ___| |____ ___| ____| | \ PS2DEV Open Source Project.
#-----------------------------------------------------------------------
# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
# Licenced under Academic Free License version 2.0
# Review ps2sdk README & LICENSE files for further details.

IOP_PARENT_DIR = $(PS2SDKSRC)/iop/memorycard/mcman
IOP_SRC_DIR = $(IOP_PARENT_DIR)/src/
IOP_INC_DIR = $(IOP_PARENT_DIR)/include/

IOP_BIN ?= dongleman.irx

MCMAN_BUILDING_DONGLEMAN ?= 1
MCMAN_BUILDING_XMCMAN ?= 1

include $(IOP_PARENT_DIR)/Makefile
8 changes: 8 additions & 0 deletions iop/memorycard/mcman/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,17 @@ MCMAN_BUILDING_XFROMMAN ?= 0
# Read from a file on the filesystem insead of the memory card?
MCMAN_BUILDING_VMCMAN ?= 0

# support for COH-H10020
MCMAN_BUILDING_DONGLEMAN ?= 0

ifneq (x$(MCMAN_BUILDING_XMCMAN),x0)
IOP_CFLAGS += -DBUILDING_XMCMAN

ifneq (x$(MCMAN_BUILDING_DONGLEMAN),x0)#because DONGLEMAN is based on XMCMAN
IOP_CFLAGS += -DBUILDING_DONGLEMAN
endif
endif


ifneq (x$(MCMAN_BUILDING_XFROMMAN),x0)
IOP_CFLAGS += -DBUILDING_XFROMMAN
Expand Down
110 changes: 55 additions & 55 deletions iop/memorycard/mcman/src/exports.tab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,72 +6,72 @@ DECLARE_EXPORT_TABLE(mcman, 2, 3)
#else
DECLARE_EXPORT_TABLE(mcman, 1, 1)
#endif
DECLARE_EXPORT(_start)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_start)
DECLARE_EXPORT(McDetectCard)
DECLARE_EXPORT(McOpen)
DECLARE_EXPORT(McClose)
DECLARE_EXPORT(McRead)
DECLARE_EXPORT(McWrite)
DECLARE_EXPORT(McSeek)
DECLARE_EXPORT(McFormat)
DECLARE_EXPORT(McGetDir)
DECLARE_EXPORT(McDelete)
DECLARE_EXPORT(McFlush)
DECLARE_EXPORT(McChDir)
DECLARE_EXPORT(McSetFileInfo)
DECLARE_EXPORT(_start) //1
DECLARE_EXPORT(_dummy) //2
DECLARE_EXPORT(_dummy) //3
DECLARE_EXPORT(_dummy) //4
DECLARE_EXPORT(_start) //5
DECLARE_EXPORT(McDetectCard) //6
DECLARE_EXPORT(McOpen) //7
DECLARE_EXPORT(McClose) //8
DECLARE_EXPORT(McRead) //9
DECLARE_EXPORT(McWrite) //10
DECLARE_EXPORT(McSeek) //11
DECLARE_EXPORT(McFormat) //12
DECLARE_EXPORT(McGetDir) //13
DECLARE_EXPORT(McDelete) //14
DECLARE_EXPORT(McFlush) //15
DECLARE_EXPORT(McChDir) //16
DECLARE_EXPORT(McSetFileInfo) //17
#if defined(BUILDING_XMCMAN)
DECLARE_EXPORT(McEraseBlock2)
DECLARE_EXPORT(McEraseBlock2) //18
#else
DECLARE_EXPORT(McEraseBlock)
DECLARE_EXPORT(McEraseBlock) //18
#endif
DECLARE_EXPORT(McReadPage)
DECLARE_EXPORT(McWritePage)
DECLARE_EXPORT(McDataChecksum)
DECLARE_EXPORT(McReadPage) //19
DECLARE_EXPORT(McWritePage) //20
DECLARE_EXPORT(McDataChecksum) //21
#if defined(BUILDING_XMCMAN)
DECLARE_EXPORT(McDetectCard2)
DECLARE_EXPORT(McGetFormat)
DECLARE_EXPORT(McGetEntSpace)
DECLARE_EXPORT(McReplaceBadBlock)
DECLARE_EXPORT(McCloseAll)
DECLARE_EXPORT(McDetectCard2) //22
DECLARE_EXPORT(McGetFormat) //23
DECLARE_EXPORT(McGetEntSpace) //24
DECLARE_EXPORT(McReplaceBadBlock) //25
DECLARE_EXPORT(McCloseAll) //26
#else
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
#endif
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(McReadPS1PDACard)
DECLARE_EXPORT(McWritePS1PDACard)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(McUnformat)
DECLARE_EXPORT(McRetOnly)
DECLARE_EXPORT(McGetFreeClusters)
DECLARE_EXPORT(McGetMcType)
DECLARE_EXPORT(McSetPS1CardFlag)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy) //27
DECLARE_EXPORT(_dummy) //28
DECLARE_EXPORT(_dummy) //29
DECLARE_EXPORT(McReadPS1PDACard) //30
DECLARE_EXPORT(McWritePS1PDACard) //31
DECLARE_EXPORT(_dummy) //32
DECLARE_EXPORT(_dummy) //33
DECLARE_EXPORT(_dummy) //34
DECLARE_EXPORT(_dummy) //35
DECLARE_EXPORT(_dummy) //36
DECLARE_EXPORT(McUnformat) //37
DECLARE_EXPORT(McRetOnly) //38
DECLARE_EXPORT(McGetFreeClusters) //39
DECLARE_EXPORT(McGetMcType) //40
DECLARE_EXPORT(McSetPS1CardFlag) //41
DECLARE_EXPORT(_dummy) //42
#if defined(BUILDING_XMCMAN)
DECLARE_EXPORT(McGetModuleInfo)
DECLARE_EXPORT(McGetCardSpec)
DECLARE_EXPORT(McGetFATentry)
DECLARE_EXPORT(McCheckBlock)
DECLARE_EXPORT(McSetFATentry)
DECLARE_EXPORT(McReadDirEntry)
DECLARE_EXPORT(Mc1stCacheEntSetWrFlagOff)
DECLARE_EXPORT(McCreateDirentry)
DECLARE_EXPORT(McReadCluster)
DECLARE_EXPORT(McFlushCache)
DECLARE_EXPORT(McSetDirEntryState)
DECLARE_EXPORT(McGetModuleInfo) //43
DECLARE_EXPORT(McGetCardSpec) //44
DECLARE_EXPORT(McGetFATentry) //45
DECLARE_EXPORT(McCheckBlock) //46
DECLARE_EXPORT(McSetFATentry) //47
DECLARE_EXPORT(McReadDirEntry) //48
DECLARE_EXPORT(Mc1stCacheEntSetWrFlagOff) //49
DECLARE_EXPORT(McCreateDirentry) //50
DECLARE_EXPORT(McReadCluster) //51
DECLARE_EXPORT(McFlushCache) //52
DECLARE_EXPORT(McSetDirEntryState) //53
#else
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
Expand All @@ -85,7 +85,7 @@ DECLARE_EXPORT_TABLE(mcman, 1, 1)
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy)
#endif
DECLARE_EXPORT(_dummy)
DECLARE_EXPORT(_dummy) //54
END_EXPORT_TABLE

void _dummy() {}
4 changes: 4 additions & 0 deletions iop/memorycard/mcman/src/imports.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ secrman_IMPORTS_start
I_SecrSetMcCommandHandler
I_SecrSetMcDevIDHandler
I_SecrAuthCard
#ifdef BUILDING_DONGLEMAN
DECLARE_IMPORT(20, SecrAuthDongle)
//I_SecrAuthDongle
#endif
secrman_IMPORTS_end
#endif

Expand Down
Loading
Loading