diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2023-02-12 17:36:29 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2023-02-12 17:36:29 +0100 |
| commit | 882fd010527b8d8823f09e19edbed3746265fa08 (patch) | |
| tree | be5c7cace6697afc753c152d13ad5145d0884a42 /backend/mustek_usb2.c | |
| parent | 527bedac30eb120915718eb7997e6dacd583512e (diff) | |
| parent | e0d94cf4d39395df1e2c6bb4d967200298c13881 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/mustek_usb2.c')
| -rw-r--r-- | backend/mustek_usb2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/backend/mustek_usb2.c b/backend/mustek_usb2.c index 9faeff6..cb511b9 100644 --- a/backend/mustek_usb2.c +++ b/backend/mustek_usb2.c @@ -1165,12 +1165,12 @@ IsTAConnected () DBG (DBG_FUNC, "StopScan: start\n"); - if (Asic_Open (&g_chip, g_pDeviceFile) != STATUS_GOOD) + if (Asic_Open (&g_chip, g_pDeviceFile) != SANE_STATUS_GOOD) { return FALSE; } - if (Asic_IsTAConnected (&g_chip, &hasTA) != STATUS_GOOD) + if (Asic_IsTAConnected (&g_chip, &hasTA) != SANE_STATUS_GOOD) { Asic_Close (&g_chip); return FALSE; @@ -1199,16 +1199,16 @@ static SANE_Bool GetKeyStatus (SANE_Byte * pKey) { SANE_Byte pKeyTemp = 0x00; - STATUS status = Asic_CheckFunctionKey (&g_chip, &pKeyTemp); + SANE_Status status = Asic_CheckFunctionKey (&g_chip, &pKeyTemp); DBG (DBG_FUNC, "GetKeyStatus: start\n"); - if (STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile)) + if (SANE_STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile)) { DBG (DBG_ERR, "GetKeyStatus: Asic_Open is fail\n"); return FALSE; } - if (STATUS_GOOD != status) + if (SANE_STATUS_GOOD != status) { DBG (DBG_ERR, "GetKeyStatus: Asic_CheckFunctionKey is fail\n"); return FALSE; @@ -1236,7 +1236,7 @@ GetKeyStatus (SANE_Byte * pKey) *pKey = 0x05; /*Panel key pressed */ } - if (STATUS_GOOD != Asic_Close (&g_chip)) + if (SANE_STATUS_GOOD != Asic_Close (&g_chip)) { DBG (DBG_ERR, "GetKeyStatus: Asic_Close is fail\n"); return FALSE; |