diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:14:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:14:26 -0600 |
| commit | 9d9fe02a944fe0719c2475739411727a729251ad (patch) | |
| tree | 5b05f738dd8631ae2c2e2ed46f4a7785fad410f7 /src/common/port | |
| parent | ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 (diff) | |
| download | piklab-9d9fe02a944fe0719c2475739411727a729251ad.tar.gz piklab-9d9fe02a944fe0719c2475739411727a729251ad.zip | |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'src/common/port')
| -rw-r--r-- | src/common/port/parallel.cpp | 10 | ||||
| -rw-r--r-- | src/common/port/parallel.h | 2 | ||||
| -rw-r--r-- | src/common/port/serial.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/common/port/parallel.cpp b/src/common/port/parallel.cpp index daa0c6a..46e395b 100644 --- a/src/common/port/parallel.cpp +++ b/src/common/port/parallel.cpp @@ -100,12 +100,12 @@ const Port::Parallel::PPinData Port::Parallel::PIN_DATA[Nb_Pins] = { { Data, 0x20, Out, "D5" }, // data 5 { Data, 0x40, Out, "D6" }, // data 6 { Data, 0x80, Out, "D7" }, // data 7 - { tqStatus, 0x40, In, "/ACK" }, // !ack - { tqStatus, 0x80, In, "BUSY" }, // busy - { tqStatus, 0x20, In, "PAPER" }, // pout - { tqStatus, 0x10, In, "SELin" }, // select + { Status, 0x40, In, "/ACK" }, // !ack + { Status, 0x80, In, "BUSY" }, // busy + { Status, 0x20, In, "PAPER" }, // pout + { Status, 0x10, In, "SELin" }, // select { Control, 0x02, Out, "LF" }, // !feed - { tqStatus, 0x08, In, "/ERROR" }, // !error + { Status, 0x08, In, "/ERROR" }, // !error { Control, 0x04, Out, "PRIME" }, // !init { Control, 0x08, Out, "SELout" }, // !si { Nb_RequestTypes, 0x00, NoIO, "GND" }, // GND diff --git a/src/common/port/parallel.h b/src/common/port/parallel.h index 08741e1..d25529d 100644 --- a/src/common/port/parallel.h +++ b/src/common/port/parallel.h @@ -33,7 +33,7 @@ public: enum Pin { DS = 0, D0, D1, D2, D3, D4, D5, D6, D7, ACK, BUSY, PAPER, SELin, LF, ERROR, PRIME, SELout, P18, P19, P20, P21, P22, P23, P24, P25, Nb_Pins }; - enum RequestType { Control = 0, tqStatus, Data, Nb_RequestTypes }; + enum RequestType { Control = 0, Status, Data, Nb_RequestTypes }; struct PPinData { RequestType rType; uchar mask; diff --git a/src/common/port/serial.cpp b/src/common/port/serial.cpp index 2db84b9..2aaa7a8 100644 --- a/src/common/port/serial.cpp +++ b/src/common/port/serial.cpp @@ -387,7 +387,7 @@ bool Port::Serial::internalReadPin(Pin pin, LogicType type, bool &value) return true; #elif defined(Q_OS_WIN) DWORD status; - if ( GetCommModemtqStatus(_fd, &status)==0 ) return false; + if ( GetCommModemStatus(_fd, &status)==0 ) return false; switch (pin) { case DCD: value = (status & MS_RLSD_ON); break; case DSR: value = (status & MS_DSR_ON); break; |