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

Compile fix #6

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Compile fix #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b2e574
compile fix
NarcolepticK Jul 24, 2019
208e010
update deprecated function calls
NarcolepticK Jul 24, 2019
75eea13
boxId's should be handled consistantly as 16 bytes. Otherwise breaks …
NarcolepticK Aug 3, 2019
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
6 changes: 3 additions & 3 deletions source/3ds/services/cecdu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Result CECDU_Open(u32 programID, CecDataPathType path, u32 flag, u32* size)
cmdbuf[1] = programID;
cmdbuf[2] = path;
cmdbuf[3] = flag;
cmdbuf[4] = IPC_Desc_CurProcessHandle(); // do placeholder
cmdbuf[4] = IPC_Desc_CurProcessId(); // do placeholder
cmdbuf[5] = 0; // placeholder

if (R_FAILED(res = svcSendSyncRequest(cecduHandle))) return res;
Expand Down Expand Up @@ -313,7 +313,7 @@ Result CECDU_OpenAndWrite(u32 bufferSize, u32 programID, CecDataPathType path, u
cmdbuf[2] = programID;
cmdbuf[3] = path;
cmdbuf[4] = flag;
cmdbuf[5] = IPC_Desc_CurProcessHandle(); // do placeholder
cmdbuf[5] = IPC_Desc_CurProcessId(); // do placeholder
cmdbuf[6] = 0; // placeholder
cmdbuf[7] = IPC_Desc_Buffer(bufferSize, IPC_BUFFER_R);
cmdbuf[8] = (u32)buffer;
Expand All @@ -332,7 +332,7 @@ Result CECDU_OpenAndRead(u32 bufferSize, u32 programID, CecDataPathType path, u3
cmdbuf[2] = programID;
cmdbuf[3] = path;
cmdbuf[4] = flag;
cmdbuf[5] = IPC_Desc_CurProcessHandle();
cmdbuf[5] = IPC_Desc_CurProcessId();
cmdbuf[6] = 0;
cmdbuf[7] = IPC_Desc_Buffer(bufferSize, IPC_BUFFER_W);
cmdbuf[8] = (u32)buffer;
Expand Down
2 changes: 1 addition & 1 deletion source/open.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void openMenu(Streetpass::StreetpassManager& sm) {

void openBox(Streetpass::StreetpassManager& sm, u8 slotNum) {
const std::string boxName = sm.BoxList().BoxNames()[slotNum];
std::unique_ptr<Streetpass::MBox> mbox = sm.OpenBox(slotNum);
std::shared_ptr<Streetpass::MBox> mbox = sm.OpenBox(slotNum);

const std::string rootCecPath = "/CEC/";
const std::string mboxPath = rootCecPath + boxName + "/";
Expand Down
2 changes: 1 addition & 1 deletion source/streetpass/MBoxList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Result MBoxList::DeleteAllBoxes() {

std::vector<u32> MBoxList::BoxIds() const {
std::vector<u32> ret{};
std::vector<char> boxId(8);
std::vector<char> boxId(16);
for (u32 slotNum = 0; slotNum < MaxSlots; slotNum++) {
std::memcpy(boxId.data(), mboxListHeader.boxNames[slotNum], boxId.size());
std::string boxName(boxId.data());
Expand Down