diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-13 16:10:07 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-03-01 10:58:43 +0200 |
| commit | ae5c3fb759f05e5de586c82b204aabe1e336b578 (patch) | |
| tree | 7ace27a882168eb69b6e77c62101d79fbff62007 | |
| parent | 8ad466288742ffe497149f668ec1c028def2c686 (diff) | |
| download | illumos-joyent-ae5c3fb759f05e5de586c82b204aabe1e336b578.tar.gz | |
13589 ccid: implicit conversion from 'atr_protocol_t' 'uccid_prot_t'
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/io/usb/clients/ccid/ccid.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/usb/clients/ccid/uccid.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/common/io/usb/clients/ccid/ccid.c b/usr/src/uts/common/io/usb/clients/ccid/ccid.c index 61003875d4..9631a99283 100644 --- a/usr/src/uts/common/io/usb/clients/ccid/ccid.c +++ b/usr/src/uts/common/io/usb/clients/ccid/ccid.c @@ -3989,7 +3989,7 @@ ccid_ioctl_status(ccid_slot_t *slot, intptr_t arg, int mode) if ((slot->cs_flags & CCID_SLOT_F_ACTIVE) != 0) { ucs.ucs_status |= UCCID_STATUS_F_PARAMS_VALID; - ucs.ucs_prot = slot->cs_icc.icc_cur_protocol; + ucs.ucs_prot = (uccid_prot_t)slot->cs_icc.icc_cur_protocol; ucs.ucs_params = slot->cs_icc.icc_params; } diff --git a/usr/src/uts/common/sys/usb/clients/ccid/uccid.h b/usr/src/uts/common/sys/usb/clients/ccid/uccid.h index f016df3879..032ac73274 100644 --- a/usr/src/uts/common/sys/usb/clients/ccid/uccid.h +++ b/usr/src/uts/common/sys/usb/clients/ccid/uccid.h @@ -83,6 +83,7 @@ typedef struct uccid_cmd_txn_end { * Protocol definitions. This should match common/ccid/atr.h. */ typedef enum { + UCCID_PROT_NONE = 0, UCCID_PROT_T0 = 1 << 0, UCCID_PROT_T1 = 1 << 1 } uccid_prot_t; |