30c30
< * $FreeBSD: head/sys/dev/cy/cy_isa.c 74810 2001-03-26 12:41:29Z phk $
---
> * $FreeBSD: head/sys/dev/cy/cy_isa.c 74903 2001-03-28 03:06:10Z jhb $
353c353
< static void sioinput __P((struct com_s *com));
---
> static void sioinput __P((struct com_s *com, critical_t *savecrit));
675c675
< int intrsave;
---
> critical_t savecrit;
782,783c782
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
792c791
< restore_intr(intrsave);
---
> critical_exit(savecrit);
803,804c802
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
812c810
< restore_intr(intrsave);
---
> critical_exit(savecrit);
895c893
< int intrsave;
---
> critical_t savecrit;
909,910c907
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
915c912
< restore_intr(intrsave);
---
> critical_exit(savecrit);
923,924c920
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
928c924
< restore_intr(intrsave);
---
> critical_exit(savecrit);
1024c1020
< sioinput(com)
---
> sioinput(com, savecrit)
1025a1022
> critical_t *savecrit;
1032d1028
< int intrsave;
1056d1051
< intrsave = save_intr();
1058c1053
< enable_intr();
---
> critical_exit(*savecrit);
1079c1074
< restore_intr(intrsave);
---
> *savecrit = critical_enter();
1089d1083
< intrsave = save_intr();
1091c1085
< enable_intr();
---
> critical_exit(*savecrit);
1106c1100
< restore_intr(intrsave);
---
> *savecrit = critical_enter();
1780c1774
< int intrsave;
---
> critical_t savecrit;
1803,1804c1797
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
1814c1807
< restore_intr(intrsave);
---
> critical_exit(savecrit);
1822,1823c1815
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
1825c1817
< sioinput(com);
---
> sioinput(com, &savecrit);
1827c1819
< restore_intr(intrsave);
---
> critical_exit(savecrit);
1832,1833c1824
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
1835c1826
< sioinput(com);
---
> sioinput(com, &savecrit);
1842c1833
< restore_intr(intrsave);
---
> critical_exit(savecrit);
1848,1849c1839
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
1854c1844
< restore_intr(intrsave);
---
> critical_exit(savecrit);
1866,1867c1856
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
1872c1861
< restore_intr(intrsave);
---
> critical_exit(savecrit);
1901c1890
< int intrsave;
---
> critical_t savecrit;
2049,2050c2038
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2057c2045
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2178,2179c2166
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2247c2234
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2266c2253
< int intrsave;
---
> critical_t savecrit;
2304,2305c2291
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2308c2294
< sioinput(com);
---
> sioinput(com, &savecrit);
2327c2313
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2341c2327
< int intrsave;
---
> critical_t savecrit;
2352,2353c2338
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2391c2376
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2410,2411c2395
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2432c2416
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2443,2444c2427
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2465c2448
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2474,2475c2457
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2480c2462
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2493c2475
< int intrsave;
---
> critical_t savecrit;
2497,2498c2479
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2523c2504
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2539c2520
< int intrsave;
---
> critical_t savecrit;
2577,2578c2558
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2598c2578
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2660c2640
< int intrsave;
---
> critical_t savecrit;
2662,2663c2642
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2667c2646
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2687c2666
< int intrsave;
---
> critical_t savecrit;
2689,2690c2668
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2695c2673
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2847c2825
< int intrsave;
---
> critical_t savecrit;
2860,2861c2838
< intrsave = save_intr();
< disable_intr();
---
> savecrit = critical_enter();
2872c2849
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2881c2858
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2895c2872,2873
< int intrsave;
---
> criticale_t savecrit;
> register_t eflags;
2903,2905c2881,2883
< intrsave = save_intr();
< disable_intr();
< if (intrsave & PSL_I)
---
> eflags = read_eflags();
> savecrit = critical_enter();
> if (eflags & PSL_I)
2910c2888
< if (intrsave & PSL_I)
---
> if (eflags & PSL_I)
2912c2890
< restore_intr(intrsave);
---
> critical_exit(savecrit);
2925c2903,2904
< int intrsave;
---
> critical_t savecrit;
> register_t eflags;
2932,2934c2911,2913
< intrsave = save_intr();
< disable_intr();
< if (intrsave & PSL_I)
---
> eflags = read_eflags();
> savecrit = critical_enter();
> if (eflags & PSL_I)
2939c2918
< if (intrsave & PSL_I)
---
> if (eflags & PSL_I)
2941c2920
< restore_intr(intrsave);
---
> critical_exit(savecrit);