diff -r 2d65c2f76d7b -r 4a8fed1c0ef6 kernel/eka/include/drivers/sdcard.h --- a/kernel/eka/include/drivers/sdcard.h Tue Feb 02 01:24:03 2010 +0200 +++ b/kernel/eka/include/drivers/sdcard.h Sat Feb 20 00:10:51 2010 +0200 @@ -151,7 +151,7 @@ IMPORT_C virtual TMMCErr AcquireStackSM(); IMPORT_C virtual TMMCErr CIMReadWriteBlocksSM(); IMPORT_C virtual DMMCSession* AllocSession(const TMMCCallBack& aCallBack) const; - + virtual void AddressCard(TInt aCardNumber) = 0; inline TSDCardArray& CardArray() const; @@ -175,8 +175,10 @@ private: TInt iSpare; +protected: enum TSDCardType {ESDCardTypeUnknown, ESDCardTypeIsMMC, ESDCardTypeIsSD}; TSDCardType iCxCardType; // Used when detecting whether an SD Memory card is present. +private: TUint8 iACMD22[KSDACMD22BlockLen]; private: @@ -185,7 +187,11 @@ IMPORT_C virtual void Dummy1(); IMPORT_C virtual void Dummy2(); IMPORT_C virtual void Dummy3(); - IMPORT_C virtual void Dummy4(); + +public: + IMPORT_C virtual DSDStack::TSDCardType CardType(TInt aSocket, TInt aCardNumber); + +private: // // Reserved members to maintain binary compatibility TInt iReserved[68];