Commit da39d756 authored by ROOL's avatar ROOL 🤖

Invert IRQ restore logic

Detail:
  If IRQs were not off, reenable them on exit. This is an academic fix as the CMHG veneers would reenable them when the CPSR is restored, but now self consistent with the other exits in this file.
Admin:
  Spotted by Colin Granville. Not tested here.

Version 0.20. Tagged as 'SCSISoftUSB-0_20'
parent b51d874f
/* (0.19) /* (0.20)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 0.19 #define Module_MajorVersion_CMHG 0.20
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 12 Aug 2014 #define Module_Date_CMHG 30 Jan 2016
#define Module_MajorVersion "0.19" #define Module_MajorVersion "0.20"
#define Module_Version 19 #define Module_Version 20
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "12 Aug 2014" #define Module_Date "30 Jan 2016"
#define Module_ApplicationDate "12-Aug-14" #define Module_ApplicationDate "30-Jan-16"
#define Module_ComponentName "SCSISoftUSB" #define Module_ComponentName "SCSISoftUSB"
#define Module_ComponentPath "mixed/RiscOS/Sources/HWSupport/SCSI/SCSISoftUSB" #define Module_ComponentPath "mixed/RiscOS/Sources/HWSupport/SCSI/SCSISoftUSB"
#define Module_FullVersion "0.19" #define Module_FullVersion "0.20"
#define Module_HelpVersion "0.19 (12 Aug 2014)" #define Module_HelpVersion "0.20 (30 Jan 2016)"
#define Module_LibraryVersionInfo "0:19" #define Module_LibraryVersionInfo "0:20"
...@@ -284,7 +284,7 @@ void glue_ResetDevice(my_usb_device_t *device, int reason) ...@@ -284,7 +284,7 @@ void glue_ResetDevice(my_usb_device_t *device, int reason)
device->callback_pw, device->callback_pw,
device->callback_wp); device->callback_wp);
} }
if (!irqs_were_off) _kernel_irqs_off(); if (!irqs_were_off) _kernel_irqs_on();
return; return;
} }
...@@ -451,7 +451,7 @@ _kernel_oserror *glue_DoCommand(my_usb_device_t *device, uint32_t lun, uint32_t ...@@ -451,7 +451,7 @@ _kernel_oserror *glue_DoCommand(my_usb_device_t *device, uint32_t lun, uint32_t
ProdRTSupport(); ProdRTSupport();
} }
} }
if (!irqs_were_off) _kernel_irqs_off(); if (!irqs_were_off) _kernel_irqs_on();
return NULL; return NULL;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment