From 81ea917ea6cc4b71a3f4021dbf5a1bc95b71682f Mon Sep 17 00:00:00 2001 From: rorothetroll Date: Sun, 24 Oct 2010 05:55:36 +0000 Subject: [PATCH] added some files to xcode project --- OSCam.xcodeproj/project.pbxproj | 8 ++++---- csctapi/ifd_pcsc.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OSCam.xcodeproj/project.pbxproj b/OSCam.xcodeproj/project.pbxproj index 5e2361f8..5227e60b 100644 --- a/OSCam.xcodeproj/project.pbxproj +++ b/OSCam.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXFileReference section */ - 9348D819126BE60B0090C25C /* oscam-datastruct-llist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "oscam-datastruct-llist.c"; sourceTree = ""; }; - 9348D81A126BE60B0090C25C /* oscam-datastruct-llist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "oscam-datastruct-llist.h"; sourceTree = ""; }; + 9348D96B12732B380090C25C /* module-datastruct-llist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "module-datastruct-llist.c"; sourceTree = ""; }; + 9348D96C12732B380090C25C /* module-datastruct-llist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "module-datastruct-llist.h"; sourceTree = ""; }; 93B819DB124D484C00E9DF68 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = aes.h; path = /usr/src/Dev/oscam/trunk/cscrypt/aes/aes.h; sourceTree = ""; }; 93B819DC124D484C00E9DF68 /* aes_core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aes_core.c; path = /usr/src/Dev/oscam/trunk/cscrypt/aes/aes_core.c; sourceTree = ""; }; 93B819DD124D484C00E9DF68 /* bn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bn.h; path = /usr/src/Dev/oscam/trunk/cscrypt/bn.h; sourceTree = ""; }; @@ -198,6 +198,8 @@ 93B81A55124D484C00E9DF68 /* module-cccam.c */, 93B81A56124D484C00E9DF68 /* module-cccam.h */, 93B81A57124D484C00E9DF68 /* module-constcw.c */, + 9348D96B12732B380090C25C /* module-datastruct-llist.c */, + 9348D96C12732B380090C25C /* module-datastruct-llist.h */, 93B81A58124D484C00E9DF68 /* module-dvbapi.c */, 93B81A59124D484C00E9DF68 /* module-dvbapi.h */, 93B81A5A124D484C00E9DF68 /* module-monitor.c */, @@ -213,8 +215,6 @@ 93B81A69124D484C00E9DF68 /* oscam-chk.c */, 93B81A6A124D484C00E9DF68 /* oscam-config.c */, 93B81A6B124D484C00E9DF68 /* oscam-config.h */, - 9348D819126BE60B0090C25C /* oscam-datastruct-llist.c */, - 9348D81A126BE60B0090C25C /* oscam-datastruct-llist.h */, 93B81A6C124D484C00E9DF68 /* oscam-http-helpers.c */, 93B81A6D124D484C00E9DF68 /* oscam-http.c */, 93B81A6E124D484C00E9DF68 /* oscam-http.h */, diff --git a/csctapi/ifd_pcsc.c b/csctapi/ifd_pcsc.c index 676f94f1..de97b2b9 100644 --- a/csctapi/ifd_pcsc.c +++ b/csctapi/ifd_pcsc.c @@ -110,12 +110,12 @@ int pcsc_reader_do_api(struct s_reader *pcsc_reader, const uchar *buf, uchar *ct else dwSendLength = l-1; cs_debug("sending %d bytes to PCSC", dwSendLength); - rv = SCardTransmit(pcsc_reader->hCard, SCARD_PCI_T0, buf, dwSendLength, &pioRecvPci, (LPBYTE) cta_res, &dwRecvLength); + rv = SCardTransmit(pcsc_reader->hCard, SCARD_PCI_T0, (LPCBYTE) buf, dwSendLength, &pioRecvPci, (LPBYTE) cta_res, (LPDWORD) &dwRecvLength); } else if(pcsc_reader->dwActiveProtocol == SCARD_PROTOCOL_T1) { dwSendLength = l; cs_debug("sending %d bytes to PCSC", dwSendLength); - rv = SCardTransmit(pcsc_reader->hCard, SCARD_PCI_T1, buf, dwSendLength, &pioRecvPci, (LPBYTE) cta_res, &dwRecvLength); + rv = SCardTransmit(pcsc_reader->hCard, SCARD_PCI_T1, (LPCBYTE) buf, dwSendLength, &pioRecvPci, (LPBYTE) cta_res, (LPDWORD) &dwRecvLength); } else { cs_debug("PCSC invalid protocol (T=%d)", pcsc_reader->dwActiveProtocol);