stkn/node-pcsclite
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: add disposition parameter to disconnect

Browse Source
This commit is contained in:
Santiago Gimeno
2014-08-06 12:06:17 +02:00
parent 8e8db638d7
commit 3c8b2c9f4b
4 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@@ -35,7 +35,7 @@ pcsc.on('reader', function(reader) {
if (changes) {
if ((changes & this.SCARD_STATE_EMPTY) && (status.state & this.SCARD_STATE_EMPTY)) {
console.log("card removed");/* card removed */
reader.disconnect(function(err) {
reader.disconnect(reader.SCARD_LEAVE_CARD, function(err) {
if (err) {
console.log(err);
} else {
@@ -124,8 +124,9 @@ Emitted whenever the status of the reader changes.
Wrapper around [`SCardConnect`](http://pcsclite.alioth.debian.org/pcsc-lite/node12.html). Establishes a connection to the reader.
#### reader.disconnect(callback)
#### reader.disconnect(disposition, callback)
* *disposition* `Number`. Reader function to execute. Defaults to `SCARD_UNPOWER_CARD`
* *callback* `Function` called when disconnection operation ends
* *error* `Error`

2
examples/example.js
View File

@@ -16,7 +16,7 @@ pcsc.on('reader', function(reader) {
if (changes) {
if ((changes & this.SCARD_STATE_EMPTY) && (status.state & this.SCARD_STATE_EMPTY)) {
console.log("card removed");/* card removed */
reader.disconnect(function(err) {
reader.disconnect(reader.SCARD_LEAVE_CARD, function(err) {
if (err) {
console.log(err);
} else {

12
lib/pcsclite.js
View File

@@ -84,10 +84,18 @@ CardReader.prototype.connect = function(options, cb) {
}
};
CardReader.prototype.disconnect = function(cb) {
CardReader.prototype.disconnect = function(disposition, cb) {
if (typeof disposition === 'function') {
cb = disposition;
disposition = undefined;
}
if (typeof disposition !== 'number') {
disposition = this.SCARD_UNPOWER_CARD;
}
if (this.connected) {
this._disconnect(cb);
this._disconnect(disposition, cb);
} else {
cb();
}

21
src/cardreader.cpp
View File

@@ -48,6 +48,12 @@ void CardReader::init(Handle<Object> target) {
NanSetPrototypeTemplate(tpl, "SCARD_STATE_INUSE", NanNew(SCARD_STATE_INUSE));
NanSetPrototypeTemplate(tpl, "SCARD_STATE_MUTE", NanNew(SCARD_STATE_MUTE));
// Disconnect disposition
NanSetPrototypeTemplate(tpl, "SCARD_LEAVE_CARD", NanNew(SCARD_LEAVE_CARD));
NanSetPrototypeTemplate(tpl, "SCARD_RESET_CARD", NanNew(SCARD_RESET_CARD));
NanSetPrototypeTemplate(tpl, "SCARD_STATE_CHANGED", NanNew(SCARD_STATE_CHANGED));
NanSetPrototypeTemplate(tpl, "SCARD_UNPOWER_CARD", NanNew(SCARD_UNPOWER_CARD));
NanAssignPersistent<Function>(constructor, tpl->GetFunction());
target->Set(NanNew("CardReader"), tpl->GetFunction());
}
@@ -148,14 +154,20 @@ NAN_METHOD(CardReader::Disconnect) {
NanScope();
if (!args[0]->IsFunction()) {
NanThrowError("First argument must be a callback function");
if (!args[0]->IsUint32()) {
NanThrowError("First argument must be an integer");
}
Local<Function> cb = Local<Function>::Cast(args[0]);
if (!args[1]->IsFunction()) {
NanThrowError("Second argument must be a callback function");
}
DWORD disposition = args[0]->Uint32Value();
Local<Function> cb = Local<Function>::Cast(args[1]);
// This creates our work request, including the libuv struct.
Baton* baton = new Baton();
baton->input = reinterpret_cast<void*>(disposition);
baton->request.data = baton;
NanAssignPersistent(baton->callback, cb);
baton->reader = ObjectWrap::Unwrap<CardReader>(args.This());
@@ -437,6 +449,7 @@ void CardReader::AfterConnect(uv_work_t* req, int status) {
void CardReader::DoDisconnect(uv_work_t* req) {
Baton* baton = static_cast<Baton*>(req->data);
DWORD disposition = reinterpret_cast<DWORD>(baton->input);
LONG result = SCARD_S_SUCCESS;
CardReader* obj = baton->reader;
@@ -445,7 +458,7 @@ void CardReader::DoDisconnect(uv_work_t* req) {
pthread_mutex_lock(&obj->m_mutex);
/* Connect */
if (obj->m_card_handle) {
result = SCardDisconnect(obj->m_card_handle, SCARD_UNPOWER_CARD);
result = SCardDisconnect(obj->m_card_handle, disposition);
if (result == SCARD_S_SUCCESS) {
obj->m_card_handle = 0;
}