From 4196c874b8952c806fa374f14e681fbb58d54381 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 24 Jun 2018 12:54:51 +0100 Subject: [PATCH 1/7] Removed wiki module --- .gitmodules | 3 --- wiki | 1 - 2 files changed, 4 deletions(-) delete mode 160000 wiki diff --git a/.gitmodules b/.gitmodules index d8279dfab..1cf09b6d6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "cuetoolsnet"] path = cuetoolsnet url = https://github.com/claunia/cuetoolsnet.git -[submodule "wiki"] - path = wiki - url = git@github.com:claunia/DiscImageChef.wiki.git diff --git a/wiki b/wiki deleted file mode 160000 index 5f9aed3f1..000000000 --- a/wiki +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f9aed3f1ff99347c97e82b8f139f24856a09c65 From b56aedaa3284a3cbcb8ebf6507c118b426bc3a00 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 24 Jun 2018 20:36:44 +0100 Subject: [PATCH 2/7] Updated USB IDs file. --- DiscImageChef.Server/usb.ids | 220 +++++++++++++++++++++++++++++++---- 1 file changed, 198 insertions(+), 22 deletions(-) diff --git a/DiscImageChef.Server/usb.ids b/DiscImageChef.Server/usb.ids index ec20b2fa2..a1db7c6d5 100644 --- a/DiscImageChef.Server/usb.ids +++ b/DiscImageChef.Server/usb.ids @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2017.11.27 -# Date: 2017-11-27 20:34:05 +# Version: 2018.05.04 +# Date: 2018-05-04 20:34:07 # # Vendors, devices and interfaces. Please keep sorted. @@ -29,9 +29,17 @@ 7788 counterfeit flash drive 0053 Planex 5301 GW-US54ZGL 802.11bg +0078 Microntek + 0006 Joystick 0079 DragonRise Inc. 0006 PC TWIN SHOCK Gamepad 0011 Gamepad + 1800 Mayflash Wii U Pro Game Controller Adapter [DirectInput] + 181b Venom Arcade Joystick + 1843 Mayflash GameCube Controller Adapter + 1844 Mayflash GameCube Controller +0085 Boeye Technology Co., Ltd. + 0600 eBook Reader 0105 Trust International B.V. 145f NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211] 0127 IBP @@ -50,6 +58,7 @@ 0301 MIDI Port 02ad HUMAX Co., Ltd. 138c PVR Mass Storage +0303 Mini Automation Controller 0324 OCZ Technology Inc bc06 OCZ ATV USB 2.0 Flash Drive bc08 OCZ Rally2/ATV USB 2.0 Flash Drive @@ -174,7 +183,7 @@ 6902 Floppy Disk Drive 7500 CD-R/RW ffff Dongle with BlueCore in DFU mode -03f0 Hewlett-Packard +03f0 HP, Inc 0004 DeskJet 895c 0011 OfficeJet G55 0012 DeskJet 1125C Printer Port @@ -423,6 +432,7 @@ 2a1d Integrated Module with Bluetooth 2.1 Wireless technology 2b11 PSC 2170 series 2b17 LaserJet 1020 + 2b4a Business Slim Keyboard 2c12 Officejet J4680 2c17 LaserJet 1022 2c24 Logitech M-UAL-96 Mouse @@ -476,10 +486,12 @@ 3a02 PhotoSmart 7150 3a11 OfficeJet 5500 series 3a17 Printing Support + 3a1d hs2340 HSPA+ mobile broadband 3b02 PhotoSmart 7150~ 3b05 Scanjet N8460 3b11 PSC 1300 series 3b17 LaserJet M1005 MFP + 3b2a Color LaserJet MFP M277dw 3c02 PhotoSmart 7350 3c05 Scanjet Professional 1000 Mobile Scanner 3c11 PSC 1358 @@ -789,8 +801,12 @@ a951 HCP HIT GSM/GPRS modem [Cinterion MC55i] a9a0 FT2232D - Dual UART/FIFO IC - FTDI abb8 Lego Mindstorms NXTCam + b0c0 microSensys RFID device + b0c1 microSensys RFID device b0c2 iID contactless RFID device b0c3 iID contactless RFID device + b0c4 RFID device + b0c5 RFID device b810 US Interface Navigator (CAT and 2nd PTT lines) b811 US Interface Navigator (WKEY and FSK lines) b812 US Interface Navigator (RS232 and CONFIG lines) @@ -1126,7 +1142,7 @@ 0a68 Func MS-3 gaming mouse [WT6573F MCU] 2367 Human Interface Device [HP CalcPad 200 Calculator and Numeric Keypad] 6510 Weltrend Bar Code Reader - 6520 XBOX Xploder + 6520 Xploder Xbox Memory Unit (8MB) 6533 Speed-Link Competition Pro 6543 Manhattan Magnetic Card Strip Reader 040c VTech Computers, Ltd @@ -1590,15 +1606,19 @@ 2602 USB 2.0 Hub 2640 USB 2.0 Hub 2660 Hub + 274d HTC Hub Controller + 3fcc RME MADIface 4041 Hub and media card controller 4060 Ultra Fast Media Reader 4064 Ultra Fast Media Reader 5434 Hub 5534 Hub 7500 LAN7500 Ethernet 10/100/1000 Adapter + 9500 LAN9500/LAN9500i 9512 SMC9512/9514 USB Hub 9514 SMC9514 Hub 9904 LAN9512/LAN9514 Ethernet 10/100 Adapter (SAL10) + 9e00 LAN9500A/LAN9500Ai a700 2 Port Hub ec00 SMSC9512/9514 Fast Ethernet Adapter 0425 Motorola Semiconductors HK, Ltd @@ -1859,6 +1879,11 @@ 0402 HOTAS Warthog Joystick 0404 HOTAS Warthog Throttle 044f GP XID + 0f00 Steering Wheel for Xbox + 0f03 Steering Wheel for Xbox + 0f07 Controller for Xbox + 0f0c Xbox Memory Unit (8MB) + 0f10 Modena GT Wheel a003 Rage 3D Game Pad a01b PK-GP301 Driving Wheel a0a0 Top Gun Joystick @@ -1876,6 +1901,7 @@ b315 Firestorm Dual Analog 3 b323 Dual Trigger 3-in-1 (PC Mode) b324 Dual Trigger 3-in-1 (PS3 Mode) + b326 Gamepad GP XID b603 force feedback Wheel b605 force feedback Racing Wheel b651 Ferrari GT Rumble Force Wheel @@ -1897,6 +1923,8 @@ 3410 TUSB3410 Microcontroller 3f00 OMAP1610 3f02 SMC WSKP100 Wi-Fi Phone + 505f TUSB5052 Serial + 5153 TUSB5052 Hub 5409 Frontier Labs NEX IA+ Digital Audio Player 6000 AU5 ADSL Modem (pre-reenum) 6001 AU5 ADSL Modem @@ -1937,6 +1965,7 @@ 0162 SiS162 usb Wireless LAN Adapter 0163 SiS163U 802.11 Wireless LAN Adapter 0817 SiS-184-ASUS-4352.17 touch panel + 10e1 HID Touch Controller 5401 Wireless Adapter RO80211GS-USB 0458 KYE Systems Corp. (Mouse Systems) 0001 Mouse @@ -2177,15 +2206,17 @@ 02ae Xbox NUI Camera 02b0 Xbox NUI Motor 02b6 Xbox360 Bluetooth Wireless Headset + 02bb Kinect Audio 02be Kinect for Windows NUI Audio 02bf Kinect for Windows NUI Camera 02c2 Kinect for Windows NUI Motor 02d1 Xbox One Controller 02d5 Xbox One Digital TV Tuner - 02dd Xbox One Controller (Covert Forces/Firmware 2015) + 02dd Xbox One Controller (Firmware 2015) 02e3 Xbox One Elite Controller 02e6 Wireless XBox Controller Dongle 02ea Xbox One S Controller + 02fd Xbox One S Controller [Bluetooth] 0400 Windows Powered Pocket PC 2002 0401 Windows Powered Pocket PC 2002 0402 Windows Powered Pocket PC 2002 @@ -2352,9 +2383,20 @@ 0799 Surface Pro embedded keyboard 07a5 Wireless Receiver 1461C 07b9 Wired Keyboard 200 + 07c6 RTL8153 GigE [Surface Dock Ethernet] 07ca Surface Pro 3 Docking Station Audio Device + 07cd Surface Keyboard 07f8 Wired Keyboard 600 (model 1576) 07fd Nano Transceiver 1.1 + 0900 Surface Dock Hub + 0901 Surface Dock Hub + 0902 Surface Dock Hub + 0903 Surface Dock Hub + 0904 Surface Dock Extender + 0905 Surface Dock Audio + 090b Hub + 090c SD Card + 091a Hub 0a00 Lumia 950 Dual SIM (RM-1118) 930a ISOUSB.SYS Intel 82930 Isochronous IO Test Board ffca Catalina @@ -2422,6 +2464,7 @@ 4d62 HP Laser Mobile Mini Mouse 4d75 Rocketfish RF-FLBTAD Bluetooth Adapter 4d81 Dell N889 Optical Mouse + 4de3 HP 5-Button Optical Comfort Mouse 4de7 webcam 4e04 Lenovo Keyboard KB1021 0463 MGE UPS Systems @@ -2439,7 +2482,7 @@ 0010 SmartBoard XX44 0011 G83 (RS 6000) Keyboard 0021 CyMotion Expert Combo - 0023 CyMotion Master Linux Keyboard G230 + 0023 Keyboard 0027 CyMotion Master Solar Keyboard 002a Wireless Mouse & Keyboard 002d SmartTerminal XX44 @@ -2449,6 +2492,7 @@ 0041 G86 6240 Keyboard 0080 eHealth Terminal ST 1503 0081 eHealth Keyboard G87 1504 + 00a1 SmartCard Reader Keyboard KC 1000 SC 0106 R-300 Wireless Mouse Receiver 010d MX-Board 3.0 Keyboard b090 Keyboard @@ -2464,6 +2508,7 @@ 0082 Acer Aspire 5672 Webcam 0200 WingMan Extreme Joystick 0203 M2452 Keyboard + 0242 Chillstream for Xbox 360 0301 M4848 Mouse 0401 HP PageScan 0402 NEC PageScan @@ -2484,6 +2529,7 @@ 081d HD Webcam C510 0820 QuickCam VC 0821 HD Webcam C910 + 0823 HD Webcam B910 0825 Webcam C270 0826 HD Webcam C525 0828 HD Webcam B990 @@ -2709,9 +2755,9 @@ c213 J-UH16 (Freedom 2.4 Cordless Joystick) c214 ATK3 (Attack III Joystick) c215 Extreme 3D Pro - c216 Dual Action Gamepad - c218 Logitech RumblePad 2 USB - c219 Cordless RumblePad 2 + c216 F310 Gamepad [DirectInput Mode] + c218 F510 Gamepad [DirectInput Mode] + c219 F710 Gamepad [DirectInput Mode] c21a Precision Gamepad c21c G13 Advanced Gameboard c21d F310 Gamepad [XInput Mode] @@ -2853,8 +2899,13 @@ c720 Bluetooth wireless hub ca03 MOMO Racing ca04 Formula Vibration Feedback Wheel + ca84 Cordless Controller for Xbox + ca88 Thunderpad for Xbox + ca8a Precision Vibration Feedback Wheel for Xbox + caa3 DriveFX Racing Wheel cab1 Cordless Keyboard for Wii HID Receiver d001 QuickCam Pro + f301 Controller 046e Behavior Tech. Computer Corp. 0100 Keyboard 3001 Mass Storage Device @@ -2972,6 +3023,7 @@ 20e3 GoGear Raga 20e4 GoGear ViBE 8GB 2160 Mio LINK Heart Rate Monitor + 21e0 GoGEAR Raga 262c SPC230NC Webcam 485d Senselock SenseIV v2.x df55 LPCXpresso LPC-Link @@ -3142,6 +3194,7 @@ 0203 AH-K3001V 0204 iBurst Terminal 0408 FS-1320D Printer + 0640 ECOSYS M6026cdn 069b ECOSYS M2635dn 0483 STMicroelectronics 0137 BeWAN ADSL USB ST (blue or green) @@ -3162,13 +3215,18 @@ 5000 ST Micro/Ergenic ERG BT-002 Bluetooth Adapter 5001 ST Micro Bluetooth Device 5710 Joystick in FS Mode - 5720 STM microSD Flash Device + 5720 Mass Storage Device 5721 Hantek DDS-3X25 Arbitrary Waveform Generator - 5730 STM32 Audio Streaming - 5740 STM32F407 + 5722 Bulk Demo + 5730 Audio Speaker + 5731 Microphone + 5740 Virtual COM Port 7270 ST Micro Serial Bridge 7554 56k SoftModem + 8213 ThermaData Logger Cradle + 8259 Probe 91d1 Sensor Hub + a171 ThermaData WiFi df11 STM Device in DFU Mode ff10 Swann ST56 Modem 0484 Specialix @@ -3192,6 +3250,7 @@ e032 Broadcom BCM20702 Bluetooth e042 Broadcom BCM20702 Bluetooth e04d Atheros AR3012 Bluetooth + e055 BCM43142A0 broadcom bluetooth 048a S-MOS Systems, Inc. 048c Alps Electric Ireland, Ltd 048d Integrated Technology Express, Inc. @@ -3460,6 +3519,7 @@ 049b Strobe XP 100 04a0 7400 04ac Xerox Travel Scanner 100 + 04bb strobe 400 scanner 04cd Xerox Travel Scanner 150 04a8 Multivideo Labs, Inc. 0101 Hub @@ -3548,6 +3608,7 @@ 1607 DR-6080 Scanner 1608 DR-2580C Scanner 1609 DR-3080CII + 160a DR-2050C Scanner 1700 PIXMA MP110 Scanner 1701 PIXMA MP130 Scanner 1702 MP410 Composite @@ -3711,11 +3772,14 @@ 2623 FAX-B180C 2629 FAXPHONE L75 262b LaserShot LBP-1120 Printer + 262c imageCLASS D300 262d iR C3200 262f PIXMA MP730 2630 PIXMA MP700 2631 LASER CLASS 700 2632 FAX-L2000 + 2633 LASERCLASS 500 + 2634 PC-D300/FAX-L400/ICD300 2635 MPC190 2637 iR C6800 2638 iR C3100 @@ -3770,6 +3834,7 @@ 2687 iR4530 2688 LBP3460 2689 FAX-L180/L380S/L398S + 268a LC310/L390/L408S 268c iR C6870 268d iR 6870C EUR 268e iR C5870 @@ -3958,6 +4023,7 @@ 3193 PowerShot SD990 IS DIGITAL ELPH / Digital IXUS 980 IS / IXY DIGITAL 3000 IS 3195 PowerShot SX1 IS 3196 PowerShot SD880 IS DIGITAL ELPH / Digital IXUS 870 IS / IXY DIGITAL 920 IS + 3199 EOS 5D Mark II 319a EOS 7D 319b EOS 50D 31aa SELPHY CP770 @@ -4098,6 +4164,7 @@ 32c1 PowerShot ELPH 180 / IXUS 175 32c2 PowerShot SX720 HS 32d5 PowerShot SX430 IS + 32db SELPHY CP1300 04aa DaeWoo Telecom, Ltd 04ab Chromatic Research 04ac Micro Audiometrics Corp. @@ -4240,6 +4307,9 @@ 5500 HID->COM RS232 Adapter 5a9b Dacal CD/DVD Library D-101/DC-300/DC-016RW 6370 ViewMate Desktop Mouse CC2201 + 6502 CY4609 + 6506 CY4603 + 650a CY4613 6560 CY7C65640 USB-2.0 "TetraHub" 6830 CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI 6831 Storage Adapter ISD-300LP (CY) @@ -4257,6 +4327,7 @@ f000 CY30700 Licorice evaluation board f111 CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit f115 PSoC FirstTouch Programmer + f231 DELLY Changer 4in1 universal IR remote f232 Mono embedded computer fd13 Programmable power socket 04b5 ROHM LSI Systems USA, LLC @@ -4581,6 +4652,7 @@ 300d Atheros AR3012 Bluetooth 300f Atheros AR3012 Bluetooth 3014 Qualcomm Atheros Bluetooth + 7022 HP HD Webcam 7025 HP HD Webcam 7046 TOSHIBA Web Camera - HD 9304 Hub @@ -4593,7 +4665,7 @@ 0109 FinePix F601 Zoom (PC CAM) 010a FinePix S602 (Pro) Zoom (DSC) 010b FinePix S602 (Pro) Zoom (PC CAM) - 010d FinePix Digital Camera 020531 + 010d FinePix S2 pro 010e FinePix F402 Zoom (DSC) 010f FinePix F402 Zoom (PC CAM) 0110 FinePix M603 Zoom (DSC) @@ -4735,6 +4807,7 @@ 8108 ChipKit Pro MX7 (PIC32MX) 9004 Microchip REAL ICE 900a PICkit3 + 9012 PICkit4 c001 PicoLCD 20x4 e11c TL866CS EEPROM Programmer [MiniPRO] f2c4 Macareux-labs Hygrometry Temperature Sensor @@ -4775,6 +4848,7 @@ 2834 HT82A834R Audio MCU a01c wireless multimedia keyboard with trackball [Trust ADURA 17911] a050 Chatman V1 + a052 USB-zyTemp a055 Keyboard a096 Keyboard a09f E-Signal LUOM G10 Mechanical Gaming Mouse @@ -5010,6 +5084,7 @@ 3268 ML-1610 Mono Laser Printer 326c ML-2010P Mono Laser Printer 3276 ML-3050/ML-3051 Laser Printer + 327e ML-2510 Series 328e CLP-310 Color Laser Printer 3292 ML-1640 Series Laser Printer 3296 ML-2580N Mono Laser Printer @@ -5119,6 +5194,7 @@ 61b5 M3 Portable Hard Drive 2TB 61b6 M3 Portable Hard Drive 1TB 61f3 Portable SSD T3 (MU-PT250B, MU-PT500B) + 61f5 Portable SSD T5 6601 Mobile Phone 6602 Galaxy 6603 Galaxy @@ -5219,6 +5295,7 @@ 0618 RG-0618U Wireless HID Receiver & KG-0609 Wireless Keyboard with Touchpad 0718 wired mouse 0760 Acer KU-0760 Keyboard + 0833 KU-0833 Keyboard 0841 HP Multimedia Keyboard 0860 2.4G Multimedia Wireless Kit 1061 HP KG-1061 Wireless Keyboard+Mouse @@ -5271,6 +5348,7 @@ b15c Sony Vaio Integrated Camera b175 4-Port Hub b1aa Webcam-101 + b1ac HP Laptop Integrated Webcam [2 MP Fixed] b1b4 Lenovo Integrated Camera b1b9 Asus Integrated Webcam b1cf Lenovo Integrated Camera @@ -5287,7 +5365,9 @@ b2b0 Camera b2b9 Lenovo Integrated Camera UVC b2da thinkpad t430s camera + b2db Thinkpad T430 camera b2ea Integrated Camera [ThinkPad] + b2f4 HP Webcam-50 b330 Asus 720p CMOS webcam b354 UVC 1.00 device HD UVC WebCam b394 Integrated Camera @@ -5296,6 +5376,8 @@ b3fd HD WebCam (Asus N-series) b40e HP Truevision HD camera b444 Lenovo Integrated Webcam + b5ce Integrated Camera + b5cf Integrated IR Camera 04f3 Elan Microelectronics Corp. 000a Touchscreen 0103 ActiveJet K-2024 Multimedia Keyboard @@ -5308,6 +5390,7 @@ 0230 3D Optical Mouse 0232 Mouse 0234 Optical Mouse + 0235 Optical Mouse 02f4 2.4G Cordless Mouse 0381 Touchscreen 04a0 Dream Cheeky Stress/Panic Button @@ -6071,7 +6154,7 @@ a4a2 Linux-USB Ethernet/RNDIS Gadget a4a3 Linux-USB user-mode isochronous source/sink a4a4 Linux-USB user-mode bulk source/sink - a4a5 Pocketbook Pro 903 + a4a5 Pocketbook Pro 903 / Mobius 2 Action Cam a4a6 Linux-USB Serial Gadget a4a7 Linux-USB Serial Gadget (CDC ACM mode) a4a8 Linux-USB Printer Gadget @@ -6217,7 +6300,7 @@ 054c Sony Corp. 0001 HUB 0002 Standard HUB - 0010 DSC-S30/S70/S75/F505V/F505/FD92/W1 Cybershot/Mavica Digital Camera + 0010 Cyber-shot, Mavica (msc) 0014 Nogatech USBVision (SY) 0022 Storage Adapter V2 (TPP) 0023 CD Writer @@ -6394,17 +6477,19 @@ 0485 MHS-PM5 HD camcorder 04cb WALKMAN NWZ-E354 0541 DSC-HX100V [Cybershot Digital Still Camera] - 05c4 DualShock 4 [CUH-ZCT1E] + 05c4 DualShock 4 [CUH-ZCT1x] 0689 Walkman NWZ-B173F 06bb WALKMAN NWZ-F805 06c3 RC-S380 07c4 ILCE-6000 (aka Alpha-6000) in Mass Storage mode + 082f Walkman NWZW Series 0847 WG-C10 Portable Wireless Server 088c Portable Headphone Amplifier 08b7 ILCE-6000 (aka Alpha-6000) in MTP mode 094e ILCE-6000 (aka Alpha-6000) in PC Remote mode 0994 ILCE-6000 (aka Alpha-6000) in charging mode - 09cc DualShock 4 [CUH-ZCT2E] + 09cc DualShock 4 [CUH-ZCT2x] + 0ba0 Dualshock4 Wireless Adaptor 0bb5 Headset MDR-1000X 1000 Wireless Buzz! Receiver 054d Try Corp. @@ -6510,6 +6595,7 @@ 0408 BearPaw 2448 CU Pro 0409 BearPaw 2448 TA Pro 040b ScanExpress A3 USB 1200 PRO + 0501 ScanExpress A3 2400 Pro 0873 ScanExpress 600 USB 1000 BearPaw 4800 TA Pro a350 gSmart 350 Camera @@ -6702,12 +6788,30 @@ 034e DTH-W1620 [MobileStudio Pro 16] tablet 034f DTH-1320 [Cintiq Pro 13] tablet 0350 DTH-1620 [Cintiq Pro 16] tablet + 0351 DTH-2420 [Cintiq Pro 24 PT] tablet + 0352 DTH-3220 [Cintiq Pro 32] tablet 0353 DTH-1320 [Cintiq Pro 13] touchscreen 0354 DTH-1620 [Cintiq Pro 16] touchscreen + 0355 DTH-2420 [Cintiq Pro 24 PT] touchscreen + 0356 DTH-3220 [Cintiq Pro 32] touchscreen 0357 PTH-660 [Intuos Pro (M)] 0358 PTH-860 [Intuos Pro (L)] 035a DTH-1152 tablet 0368 DTH-1152 touchscreen + 0374 CTL-4100 [Intuos (S)] + 0375 CTL-6100 [Intuos (M)] + 0376 CTL-4100WL [Intuos BT (S)] + 0378 CTL-6100WL [Intuos BT (M)] + 037a CTL-472 [One by Wacom (S)] + 037b CTL-672 [One by Wacom (M)] + 037c DTK-2420 [Cintiq Pro 24 P] + 037d DTH-2452 tablet + 037e DTH-2452 touchscreen + 0382 DTK-2451 tablet + 038a DTH-3220 [Cintiq Pro 32] internal hub + 038d DTH-3220 [Cintiq Pro 32] internal hub + 038e DTH-3220 [Cintiq Pro 32] external hub + 038f DTH-3220 [Cintiq Pro 32] internal hub 0400 PenPartner 4x5 4001 TPC4001 4004 TPC4004 @@ -6729,7 +6833,16 @@ 056e Elecom Co., Ltd 0002 29UO Mouse 0057 M-PGDL Mouse - 0072 Mouse + 005c M-PGDL Mouse + 005d M-FGDL Mouse + 005e M-FG2DL Mouse + 0062 M-D18DR Mouse + 0063 M-SODL Mouse + 0069 M-GE1UL Mouse + 0071 M-GE3DL Mouse + 0072 M-LS6UL Mouse + 0073 M-LS7UL Mouse + 0074 M-FW1UL Mouse 200c LD-USB/TX 4002 Laneed 100Mbps Ethernet LD-USB/TX [pegasus] 4005 LD-USBL/TX @@ -16161,6 +16274,35 @@ 0002 HDReye (before firmware loads) 1519 Comneon 0020 HSIC Device +151f Opal Kelly Incorporated + 0020 XEM3001v1 + 0021 XEM3001v2 + 0022 XEM3010 + 0023 XEM3005 + 0028 XEM3050 + 002b XEM5010 + 002c XEM6001 + 002d XEM6010-LX45 + 002e XEM6010-LX150 + 0030 XEM6006-LX16 + 0033 XEM6002-LX9 + 0034 XEM7001-A15 + 0036 XEM7010-A50 + 0037 XEM7010-A200 + 0120 ZEM4310 + 0121 XEM6310-LX45 + 0122 XEM6310-LX150 + 0123 XEM6310MT-LX45T + 0125 XEM7350-K70T + 0126 XEM7350-K160T + 0127 XEM7350-K410T + 0128 XEM6310MT-LX150T + 0129 ZEM5305-A2 + 012b XEM7360-K160T + 012c XEM7360-K410T + 012d ZEM5310-A4 + 0130 XEM7310-A75 + 0131 XEM7310-A200 1520 Bitwire Corp. 1524 ENE Technology Inc 6680 UTS 6680 @@ -18439,10 +18581,11 @@ 20f4 TRENDnet 648b TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS] 20f7 XIMEA - 3001 Camera with CMOS sensor [MQ] - 3021 Camera with CCD sensor [MD] - 30b3 Camera with CMOS sensor in Vision mode [MQ] - a003 Subminiature 5Mpix B/W Camera, MU9PM-MH + 3001 MQ or MD camera + 3002 MU camera + 3021 MJ camera + 30b3 MQ in U3V mode or MC camera + a003 MU camera 2100 RT Systems 9e52 Yaesu VX-7 9e54 CT29B Radio Cable @@ -18657,6 +18800,18 @@ 0044 Mega ADK R3 (CDC ACM) 0045 Serial R3 (CDC ACM) 8036 Leonardo (CDC ACM, HID) +2357 TP-Link + 0100 TL-WN8200ND [Realtek RTL8192CU] + 0101 RTL8812AU Archer T4U 802.11ac + 0103 Archer T4UH wireless Realtek 8812AU + 0105 Archer T1U 802.11a/n/ac Wireless Adapter [MediaTek MT7610U] + 0107 TL-WN821N Version 5 RTL8192EU + 0108 TL-WN822N Version 4 RTL8192EU + 0109 TL WN823N RTL8192EU + 010c TL-WN722N v2 + 010e TL-WN722N v2 + 0200 MA 180 Zero CD + 0201 HSUPA Modem MA180 2373 Pumatronix Ltda 0001 5 MegaPixel Digital Still Camera [DSC5M] 2375 Digit@lway, Inc. @@ -18673,6 +18828,19 @@ 24e1 Paratronic 3001 Adp-usb 3005 Radius +2516 Cooler Master Co., Ltd. + 0003 Storm Xornet + 0004 Storm QuickFire Rapid Mechanical Keyboard + 0006 Storm Recon + 0007 Storm Sentinel Advance II + 0009 Storm Quick Fire PRO + 0011 Storm Quick Fire TK + 0017 CM Storm Quick Fire Stealth + 0020 QuickFire Rapid-i Keyboard + 0027 CM Storm Coolermaster Novatouch TKL + 002d Alcor mouse + 0047 MasterKeys Pro L + 9494 Sirus Headset 2632 TwinMOS 3209 7-in-1 Card Reader 2639 Xsens @@ -18836,6 +19004,14 @@ 14ea GW-US11H WLAN 2c1a Dolphin Peripherals 0000 Wireless Optical Mouse +2c7c Quectel Wireless Solutions Co., Ltd. + 0121 EC21 LTE modem + 0125 EC25 LTE modem + 0191 EG91 LTE modem + 0195 EG95 LTE modem + 0296 BG96 CAT-M1/NB-IoT modem + 0306 EG06/EP06/EM06 LTE-A modem + 0435 AG35 LTE modem 2dcf Dialog Semiconductor c952 Audio Class 2.0 Devices 2fb2 Fujitsu, Ltd From ac1efc4be1b68a2d61e65e4448a515248ca4c8c8 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 24 Jun 2018 21:35:04 +0100 Subject: [PATCH 3/7] Move to development version 4.5.99.1663. --- DiscImageChef.Checksums/DiscImageChef.Checksums.csproj | 2 +- DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj | 2 +- DiscImageChef.Compression/DiscImageChef.Compression.csproj | 2 +- DiscImageChef.Console/DiscImageChef.Console.csproj | 2 +- DiscImageChef.Core/DiscImageChef.Core.csproj | 2 +- DiscImageChef.Decoders/DiscImageChef.Decoders.csproj | 2 +- DiscImageChef.Device.Report/main.h | 2 +- DiscImageChef.Devices/DiscImageChef.Devices.csproj | 2 +- DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj | 2 +- DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj | 2 +- DiscImageChef.Filters/DiscImageChef.Filters.csproj | 2 +- DiscImageChef.Helpers/DiscImageChef.Helpers.csproj | 2 +- DiscImageChef.Interop/DiscImageChef.Interop.csproj | 2 +- DiscImageChef.Metadata/DiscImageChef.Metadata.csproj | 2 +- DiscImageChef.Partitions/DiscImageChef.Partitions.csproj | 2 +- DiscImageChef.Server/DiscImageChef.Server.csproj | 4 ++-- DiscImageChef.Settings/DiscImageChef.Settings.csproj | 2 +- .../DiscImageChef.Tests.Devices.csproj | 2 +- DiscImageChef.Tests/DiscImageChef.Tests.csproj | 2 +- DiscImageChef/DiscImageChef.csproj | 2 +- README.md | 2 +- fstester/setter/main.h | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj b/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj index 4ead9ace5..c5379e503 100644 --- a/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj +++ b/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj index 961804dd2..a13072596 100644 --- a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj +++ b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Compression/DiscImageChef.Compression.csproj b/DiscImageChef.Compression/DiscImageChef.Compression.csproj index 5bba2f460..7042adcae 100644 --- a/DiscImageChef.Compression/DiscImageChef.Compression.csproj +++ b/DiscImageChef.Compression/DiscImageChef.Compression.csproj @@ -13,7 +13,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Console/DiscImageChef.Console.csproj b/DiscImageChef.Console/DiscImageChef.Console.csproj index 57e217cfb..01cda89fd 100644 --- a/DiscImageChef.Console/DiscImageChef.Console.csproj +++ b/DiscImageChef.Console/DiscImageChef.Console.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Core/DiscImageChef.Core.csproj b/DiscImageChef.Core/DiscImageChef.Core.csproj index 99e7852ff..1c37d35ad 100644 --- a/DiscImageChef.Core/DiscImageChef.Core.csproj +++ b/DiscImageChef.Core/DiscImageChef.Core.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj b/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj index 66fb65ab2..beb959827 100644 --- a/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj +++ b/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Device.Report/main.h b/DiscImageChef.Device.Report/main.h index ba4bd109f..4ae4f8cb6 100644 --- a/DiscImageChef.Device.Report/main.h +++ b/DiscImageChef.Device.Report/main.h @@ -33,7 +33,7 @@ Copyright © 2011-2018 Natalia Portillo #ifndef DISCIMAGECHEF_DEVICE_REPORT_MAIN_H #define DISCIMAGECHEF_DEVICE_REPORT_MAIN_H -#define DIC_VERSION "4.0.99.0" +#define DIC_VERSION "4.5.99.1663" #define DIC_COPYRIGHT "Copyright © 2011-2018 Natalia Portillo" #define XML_ENCODING "UTF-8" #define DIC_REPORT_ROOT "DicDeviceReport" diff --git a/DiscImageChef.Devices/DiscImageChef.Devices.csproj b/DiscImageChef.Devices/DiscImageChef.Devices.csproj index 888a755b5..6145169f5 100644 --- a/DiscImageChef.Devices/DiscImageChef.Devices.csproj +++ b/DiscImageChef.Devices/DiscImageChef.Devices.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj b/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj index 62ea93494..395aece48 100644 --- a/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj +++ b/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj b/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj index 1aea34134..2bcf74336 100644 --- a/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj +++ b/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Filters/DiscImageChef.Filters.csproj b/DiscImageChef.Filters/DiscImageChef.Filters.csproj index 173ad439e..7f4d86a03 100644 --- a/DiscImageChef.Filters/DiscImageChef.Filters.csproj +++ b/DiscImageChef.Filters/DiscImageChef.Filters.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj b/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj index ca33b5231..a6eb4c5e1 100644 --- a/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj +++ b/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Interop/DiscImageChef.Interop.csproj b/DiscImageChef.Interop/DiscImageChef.Interop.csproj index f92e12af9..8a7400030 100644 --- a/DiscImageChef.Interop/DiscImageChef.Interop.csproj +++ b/DiscImageChef.Interop/DiscImageChef.Interop.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj b/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj index 3d3ee9e64..85348983d 100644 --- a/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj +++ b/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj b/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj index 15beaefd7..417948345 100644 --- a/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj +++ b/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Server/DiscImageChef.Server.csproj b/DiscImageChef.Server/DiscImageChef.Server.csproj index 2f9e8fd07..61f5f77df 100644 --- a/DiscImageChef.Server/DiscImageChef.Server.csproj +++ b/DiscImageChef.Server/DiscImageChef.Server.csproj @@ -9,7 +9,7 @@ Library DiscImageChef.Server DiscImageChef.Server - 4.5.0.1663 + 4.5.99.1663 false @@ -27,7 +27,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Settings/DiscImageChef.Settings.csproj b/DiscImageChef.Settings/DiscImageChef.Settings.csproj index 6bed6d347..ea141cf63 100644 --- a/DiscImageChef.Settings/DiscImageChef.Settings.csproj +++ b/DiscImageChef.Settings/DiscImageChef.Settings.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj b/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj index a65e889c4..19597ec55 100644 --- a/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj +++ b/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj @@ -11,7 +11,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef.Tests/DiscImageChef.Tests.csproj b/DiscImageChef.Tests/DiscImageChef.Tests.csproj index f243faa27..dc8152d5c 100644 --- a/DiscImageChef.Tests/DiscImageChef.Tests.csproj +++ b/DiscImageChef.Tests/DiscImageChef.Tests.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © 2011-2018 Natalia Portillo The Disc Image Chef diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj index 4d970cfc1..12555aedb 100644 --- a/DiscImageChef/DiscImageChef.csproj +++ b/DiscImageChef/DiscImageChef.csproj @@ -12,7 +12,7 @@ false net461 true - 4.5.0.1663 + 4.5.99.1663 Claunia.com Copyright © {copyright:2011} Natalia Portillo The Disc Image Chef diff --git a/README.md b/README.md index b773b7e66..3e4a97d26 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -DiscImageChef v4.5.0.1663 +DiscImageChef v4.5.99.1663 Disc Image Chef (because "swiss-army-knife" is used too much) diff --git a/fstester/setter/main.h b/fstester/setter/main.h index 8f6cbcfb8..ab2f8524c 100644 --- a/fstester/setter/main.h +++ b/fstester/setter/main.h @@ -32,7 +32,7 @@ Copyright (C) 2011-2018 Natalia Portillo #ifndef DIC_FSTESTER_GETTER_MAIN_H #define DIC_FSTESTER_GETTER_MAIN_H -#define DIC_FSTESTER_VERSION "0.1" +#define DIC_FSTESTER_VERSION "4.5.99.1663" #define DIC_COPYRIGHT "Copyright (C) 2011-2018 Natalia Portillo" #if defined(__alpha__) || defined (_M_ALPHA) From a944498106367314fdd7667847ceb05b58456ee1 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 24 Jun 2018 21:41:15 +0100 Subject: [PATCH 4/7] Removed deprecated Windows XP only code. --- DiscImageChef.Devices/Command.cs | 6 +- DiscImageChef.Devices/Windows/Command.cs | 140 ----------------------- 2 files changed, 2 insertions(+), 144 deletions(-) diff --git a/DiscImageChef.Devices/Command.cs b/DiscImageChef.Devices/Command.cs index 8188d0241..2454651b3 100644 --- a/DiscImageChef.Devices/Command.cs +++ b/DiscImageChef.Devices/Command.cs @@ -230,8 +230,7 @@ namespace DiscImageChef.Devices (Environment.OSVersion.ServicePack == "Service Pack 1" || Environment.OSVersion.ServicePack == "") || Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 0) - return Windows.Command.SendIdeCommand((SafeFileHandle)fd, registers, out errorRegisters, - protocol, ref buffer, timeout, out duration, out sense); + throw new InvalidOperationException("Windows XP or earlier is not supported."); // Windows NT 4 or earlier, requires special ATA pass thru SCSI. But DiscImageChef cannot run there (or can it?) if(Environment.OSVersion.Version.Major <= 4) @@ -316,8 +315,7 @@ namespace DiscImageChef.Devices (Environment.OSVersion.ServicePack == "Service Pack 1" || Environment.OSVersion.ServicePack == "") || Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 0) - return Windows.Command.SendIdeCommand((SafeFileHandle)fd, registers, out errorRegisters, - protocol, ref buffer, timeout, out duration, out sense); + throw new InvalidOperationException("Windows XP or earlier is not supported."); // Windows NT 4 or earlier, requires special ATA pass thru SCSI. But DiscImageChef cannot run there (or can it?) if(Environment.OSVersion.Version.Major <= 4) diff --git a/DiscImageChef.Devices/Windows/Command.cs b/DiscImageChef.Devices/Windows/Command.cs index 3f2abbd25..4eed5ff2b 100644 --- a/DiscImageChef.Devices/Windows/Command.cs +++ b/DiscImageChef.Devices/Windows/Command.cs @@ -441,146 +441,6 @@ namespace DiscImageChef.Devices.Windows return error; } - /// - /// Sends an ATA command in CHS mode using undocumented Windows XP ioctl - /// - /// 0 if no error occurred, otherwise, errno - /// File handle - /// Buffer for SCSI command response - /// Timeout in seconds - /// Time it took to execute the command in milliseconds - /// True if ATA error returned non-OK status - /// Registers to send to drive - /// Registers returned by drive - /// ATA protocol to use - internal static int SendIdeCommand(SafeFileHandle fd, AtaRegistersChs registers, - out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol, - ref byte[] buffer, uint timeout, - out double duration, out bool sense) - { - duration = 0; - sense = false; - errorRegisters = new AtaErrorRegistersChs(); - - if(buffer == null || buffer.Length > 512) return -1; - - IdePassThroughDirect iptd = new IdePassThroughDirect - { - CurrentTaskFile = new AtaTaskFile - { - Command = registers.Command, - CylinderHigh = registers.CylinderHigh, - CylinderLow = registers.CylinderLow, - DeviceHead = registers.DeviceHead, - Features = registers.Feature, - SectorCount = registers.SectorCount, - SectorNumber = registers.Sector - }, - DataBufferSize = 512, - DataBuffer = new byte[512] - }; - - uint k = 0; - int error = 0; - - Array.Copy(buffer, 0, iptd.DataBuffer, 0, buffer.Length); - - DateTime start = DateTime.Now; - sense = !Extern.DeviceIoControlIde(fd, WindowsIoctl.IoctlIdePassThrough, ref iptd, - (uint)Marshal.SizeOf(iptd), ref iptd, (uint)Marshal.SizeOf(iptd), ref k, - IntPtr.Zero); - DateTime end = DateTime.Now; - - if(sense) error = Marshal.GetLastWin32Error(); - - buffer = new byte[k - 12]; - Array.Copy(iptd.DataBuffer, 0, buffer, 0, buffer.Length); - - duration = (end - start).TotalMilliseconds; - - errorRegisters.CylinderHigh = iptd.CurrentTaskFile.CylinderHigh; - errorRegisters.CylinderLow = iptd.CurrentTaskFile.CylinderLow; - errorRegisters.DeviceHead = iptd.CurrentTaskFile.DeviceHead; - errorRegisters.Error = iptd.CurrentTaskFile.Error; - errorRegisters.Sector = iptd.CurrentTaskFile.SectorNumber; - errorRegisters.SectorCount = iptd.CurrentTaskFile.SectorCount; - errorRegisters.Status = iptd.CurrentTaskFile.Status; - - sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0; - - return error; - } - - /// - /// Sends an ATA command in 28-bit LBA mode using undocumented Windows XP ioctl - /// - /// 0 if no error occurred, otherwise, errno - /// File handle - /// Buffer for SCSI command response - /// Timeout in seconds - /// Time it took to execute the command in milliseconds - /// True if ATA error returned non-OK status - /// Registers to send to drive - /// Registers returned by drive - /// ATA protocol to use - internal static int SendIdeCommand(SafeFileHandle fd, AtaRegistersLba28 registers, - out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol, - ref byte[] buffer, uint timeout, - out double duration, out bool sense) - { - duration = 0; - sense = false; - errorRegisters = new AtaErrorRegistersLba28(); - - if(buffer == null) return -1; - - IdePassThroughDirect iptd = new IdePassThroughDirect - { - CurrentTaskFile = new AtaTaskFile - { - Command = registers.Command, - CylinderHigh = registers.LbaHigh, - CylinderLow = registers.LbaMid, - DeviceHead = registers.DeviceHead, - Features = registers.Feature, - SectorCount = registers.SectorCount, - SectorNumber = registers.LbaLow - }, - DataBufferSize = 512, - DataBuffer = new byte[512] - }; - - uint k = 0; - int error = 0; - - Array.Copy(buffer, 0, iptd.DataBuffer, 0, buffer.Length); - - DateTime start = DateTime.Now; - sense = !Extern.DeviceIoControlIde(fd, WindowsIoctl.IoctlIdePassThrough, ref iptd, - (uint)Marshal.SizeOf(iptd), ref iptd, (uint)Marshal.SizeOf(iptd), ref k, - IntPtr.Zero); - DateTime end = DateTime.Now; - - if(sense) error = Marshal.GetLastWin32Error(); - - buffer = new byte[k - 12]; - Array.Copy(iptd.DataBuffer, 0, buffer, 0, buffer.Length); - - duration = (end - start).TotalMilliseconds; - - errorRegisters.LbaHigh = iptd.CurrentTaskFile.CylinderHigh; - errorRegisters.LbaMid = iptd.CurrentTaskFile.CylinderLow; - errorRegisters.DeviceHead = iptd.CurrentTaskFile.DeviceHead; - errorRegisters.Error = iptd.CurrentTaskFile.Error; - errorRegisters.LbaLow = iptd.CurrentTaskFile.SectorNumber; - errorRegisters.SectorCount = iptd.CurrentTaskFile.SectorCount; - errorRegisters.Status = iptd.CurrentTaskFile.Status; - - sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0; - - return error; - } - /// /// Gets the device number for a specified handle /// From 91569c4636a9f6c4fdf4635cbabb00a8af27d3ce Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 25 Jun 2018 19:08:16 +0100 Subject: [PATCH 5/7] Move all interfaces, extents, interop and metadata to DiscImageChef.CommonTypes. --- .../.idea/contentModel.xml | 104 ++++++++--------- CONTRIBUTING.md | 7 +- DiscImageChef.Checksums/Adler32Context.cs | 1 + DiscImageChef.Checksums/CRC16Context.cs | 1 + DiscImageChef.Checksums/CRC32Context.cs | 1 + DiscImageChef.Checksums/CRC64Context.cs | 1 + .../DiscImageChef.Checksums.csproj | 2 +- DiscImageChef.Checksums/FletcherContext.cs | 1 + DiscImageChef.Checksums/MD5Context.cs | 1 + DiscImageChef.Checksums/RIPEMD160Context.cs | 1 + DiscImageChef.Checksums/SHA1Context.cs | 1 + DiscImageChef.Checksums/SHA256Context.cs | 1 + DiscImageChef.Checksums/SHA384Context.cs | 1 + DiscImageChef.Checksums/SHA512Context.cs | 1 + DiscImageChef.Checksums/SpamSumContext.cs | 1 + .../DiscImageChef.CommonTypes.csproj | 44 +++++++ .../Enums/Images.cs | 2 +- .../Exceptions/Images.cs | 2 +- .../Extents/ExtentsByte.cs | 2 +- .../Extents}/ExtentsConverter.cs | 3 +- .../Extents/ExtentsInt.cs | 2 +- .../Extents/ExtentsLong.cs | 2 +- .../Extents/ExtentsSByte.cs | 2 +- .../Extents/ExtentsShort.cs | 2 +- .../Extents/ExtentsUInt.cs | 2 +- .../Extents/ExtentsULong.cs | 2 +- .../Extents/ExtentsUShort.cs | 2 +- .../Filters.cs | 5 +- .../Interfaces}/IChecksum.cs | 2 +- .../Interfaces}/IFilesystem.cs | 4 +- .../Interfaces}/IFilter.cs | 2 +- .../Interfaces}/IFloppyImage.cs | 5 +- .../Interfaces}/IMediaImage.cs | 6 +- .../Interfaces}/IPartition.cs | 2 +- .../Interfaces}/IReadOnlyFilesystem.cs | 5 +- .../Interfaces}/IWritableFloppyImage.cs | 5 +- .../Interfaces}/IWritableImage.cs | 5 +- .../Interop}/DetectOS.cs | 2 +- .../Interop}/PlatformID.cs | 2 +- .../Interop}/Version.cs | 2 +- .../Metadata}/DeviceReport.cs | 2 +- .../Metadata}/Dimensions.cs | 2 +- .../Metadata}/MediaType.cs | 2 +- .../Metadata}/Resume.cs | 2 +- .../Metadata}/Statistics.cs | 2 +- .../Metadata}/Version.cs | 4 +- .../PluginBase.cs | 109 +++++++++--------- .../Structs/Filesystems.cs | 2 +- .../Structs/Images.cs | 6 +- DiscImageChef.Core/Benchmark.cs | 1 + DiscImageChef.Core/Checksum.cs | 1 + DiscImageChef.Core/Devices/Dumping/ATA.cs | 20 ++-- .../Devices/Dumping/CompactDisc.cs | 16 ++- DiscImageChef.Core/Devices/Dumping/MMC.cs | 5 +- DiscImageChef.Core/Devices/Dumping/NVMe.cs | 4 +- .../Devices/Dumping/ResumeSupport.cs | 12 +- DiscImageChef.Core/Devices/Dumping/SBC.cs | 16 ++- DiscImageChef.Core/Devices/Dumping/SCSI.cs | 4 +- DiscImageChef.Core/Devices/Dumping/SSC.cs | 6 +- .../Devices/Dumping/SecureDigital.cs | 14 ++- DiscImageChef.Core/Devices/Dumping/XGD.cs | 14 ++- DiscImageChef.Core/Devices/Report/ATA.cs | 2 +- DiscImageChef.Core/Devices/Report/ATAPI.cs | 2 +- DiscImageChef.Core/Devices/Report/FireWire.cs | 2 +- DiscImageChef.Core/Devices/Report/NVMe.cs | 2 +- DiscImageChef.Core/Devices/Report/PCMCIA.cs | 2 +- .../Devices/Report/SCSI/General.cs | 2 +- DiscImageChef.Core/Devices/Report/SCSI/MMC.cs | 2 +- DiscImageChef.Core/Devices/Report/SCSI/SSC.cs | 2 +- .../Devices/Report/SecureDigital.cs | 2 +- DiscImageChef.Core/Devices/Report/USB.cs | 2 +- DiscImageChef.Core/DiscImageChef.Core.csproj | 9 -- DiscImageChef.Core/Filesystems.cs | 2 +- DiscImageChef.Core/ImageFormat.cs | 4 +- DiscImageChef.Core/ImageInfo.cs | 6 +- DiscImageChef.Core/Logging/DumpLog.cs | 6 +- DiscImageChef.Core/Partitions.cs | 2 +- DiscImageChef.Core/Remote.cs | 4 +- DiscImageChef.Core/Sidecar/AudioMedia.cs | 3 +- DiscImageChef.Core/Sidecar/BlockMedia.cs | 7 +- DiscImageChef.Core/Sidecar/LinearMedia.cs | 3 +- DiscImageChef.Core/Sidecar/OpticalDisc.cs | 23 ++-- DiscImageChef.Core/Sidecar/Sidecar.cs | 4 +- DiscImageChef.Core/Statistics.cs | 6 +- DiscImageChef.Devices/Command.cs | 4 +- DiscImageChef.Devices/Device/Constructor.cs | 4 +- DiscImageChef.Devices/Device/Destructor.cs | 2 +- DiscImageChef.Devices/Device/List.cs | 4 +- .../Device/ScsiCommands/SPC.cs | 2 +- DiscImageChef.Devices/Device/Variables.cs | 2 +- .../DiscImageChef.Devices.csproj | 5 +- DiscImageChef.Devices/Linux/Command.cs | 2 +- DiscImageChef.DiscImages/Alcohol120.cs | 6 + DiscImageChef.DiscImages/Anex86.cs | 5 +- DiscImageChef.DiscImages/Apple2MG.cs | 4 + DiscImageChef.DiscImages/AppleDOS.cs | 5 +- DiscImageChef.DiscImages/AppleNIB.cs | 5 +- DiscImageChef.DiscImages/Apridisk.cs | 5 +- DiscImageChef.DiscImages/BLU.cs | 7 +- DiscImageChef.DiscImages/BlindWrite4.cs | 5 + DiscImageChef.DiscImages/BlindWrite5.cs | 6 + DiscImageChef.DiscImages/CDRDAO.cs | 5 + DiscImageChef.DiscImages/CDRWin.cs | 5 + DiscImageChef.DiscImages/CHD.cs | 6 +- DiscImageChef.DiscImages/CPCDSK.cs | 5 +- DiscImageChef.DiscImages/CisCopy.cs | 5 +- DiscImageChef.DiscImages/CloneCD.cs | 6 + DiscImageChef.DiscImages/CopyQM.cs | 5 +- DiscImageChef.DiscImages/D88.cs | 5 +- DiscImageChef.DiscImages/DART.cs | 5 +- DiscImageChef.DiscImages/DIM.cs | 5 +- DiscImageChef.DiscImages/DiscFerret.cs | 5 +- .../DiscImageChef.DiscImages.csproj | 15 --- DiscImageChef.DiscImages/DiscImageChef.cs | 6 +- DiscImageChef.DiscImages/DiscJuggler.cs | 6 +- DiscImageChef.DiscImages/DiskCopy42.cs | 5 +- DiscImageChef.DiscImages/DriDiskCopy.cs | 5 +- DiscImageChef.DiscImages/GDI.cs | 5 + DiscImageChef.DiscImages/HDCopy.cs | 5 +- DiscImageChef.DiscImages/IMD.cs | 5 +- DiscImageChef.DiscImages/KryoFlux.cs | 4 + DiscImageChef.DiscImages/MaxiDisk.cs | 5 +- DiscImageChef.DiscImages/NDIF.cs | 5 +- DiscImageChef.DiscImages/NHDr0.cs | 5 +- DiscImageChef.DiscImages/Nero.cs | 6 +- DiscImageChef.DiscImages/Parallels.cs | 5 +- DiscImageChef.DiscImages/PartClone.cs | 7 +- DiscImageChef.DiscImages/Partimage.cs | 7 +- DiscImageChef.DiscImages/QCOW.cs | 5 +- DiscImageChef.DiscImages/QCOW2.cs | 5 +- DiscImageChef.DiscImages/QED.cs | 5 +- DiscImageChef.DiscImages/RayDIM.cs | 5 +- DiscImageChef.DiscImages/RsIde.cs | 7 +- DiscImageChef.DiscImages/SaveDskF.cs | 5 +- DiscImageChef.DiscImages/SuperCardPro.cs | 5 +- DiscImageChef.DiscImages/T98.cs | 5 +- DiscImageChef.DiscImages/TeleDisk.cs | 5 +- DiscImageChef.DiscImages/UDIF.cs | 5 +- DiscImageChef.DiscImages/UkvFdi.cs | 5 +- DiscImageChef.DiscImages/VDI.cs | 5 +- DiscImageChef.DiscImages/VHD.cs | 8 +- DiscImageChef.DiscImages/VHDX.cs | 4 + DiscImageChef.DiscImages/VMware.cs | 4 + DiscImageChef.DiscImages/Virtual98.cs | 5 +- DiscImageChef.DiscImages/ZZZRawImage.cs | 6 + DiscImageChef.Filesystems/AODOS.cs | 2 +- DiscImageChef.Filesystems/APFS.cs | 2 +- DiscImageChef.Filesystems/Acorn.cs | 2 +- DiscImageChef.Filesystems/AmigaDOS.cs | 2 +- .../AppleDOS/AppleDOS.cs | 2 +- DiscImageChef.Filesystems/AppleDOS/Dir.cs | 1 + DiscImageChef.Filesystems/AppleDOS/File.cs | 2 + DiscImageChef.Filesystems/AppleDOS/Info.cs | 2 +- DiscImageChef.Filesystems/AppleDOS/Super.cs | 3 +- DiscImageChef.Filesystems/AppleDOS/Xattr.cs | 1 + DiscImageChef.Filesystems/AppleHFS.cs | 2 +- DiscImageChef.Filesystems/AppleHFSPlus.cs | 2 +- .../AppleMFS/AppleMFS.cs | 2 +- DiscImageChef.Filesystems/AppleMFS/Dir.cs | 1 + DiscImageChef.Filesystems/AppleMFS/File.cs | 4 +- DiscImageChef.Filesystems/AppleMFS/Info.cs | 2 +- DiscImageChef.Filesystems/AppleMFS/Super.cs | 4 +- DiscImageChef.Filesystems/AppleMFS/Xattr.cs | 3 +- DiscImageChef.Filesystems/AtheOS.cs | 2 +- DiscImageChef.Filesystems/BFS.cs | 2 +- DiscImageChef.Filesystems/BTRFS.cs | 2 +- DiscImageChef.Filesystems/CBM.cs | 2 +- DiscImageChef.Filesystems/CPM/CPM.cs | 3 +- DiscImageChef.Filesystems/CPM/Dir.cs | 1 + DiscImageChef.Filesystems/CPM/File.cs | 1 + DiscImageChef.Filesystems/CPM/Info.cs | 2 +- DiscImageChef.Filesystems/CPM/Super.cs | 5 +- DiscImageChef.Filesystems/CPM/Xattr.cs | 1 + DiscImageChef.Filesystems/Cram.cs | 2 +- .../DiscImageChef.Filesystems.csproj | 7 -- DiscImageChef.Filesystems/ECMA67.cs | 2 +- DiscImageChef.Filesystems/EFS.cs | 3 +- DiscImageChef.Filesystems/F2FS.cs | 2 +- DiscImageChef.Filesystems/FAT.cs | 3 +- DiscImageChef.Filesystems/FATX.cs | 2 +- DiscImageChef.Filesystems/FFS.cs | 2 +- DiscImageChef.Filesystems/Fossil.cs | 2 +- DiscImageChef.Filesystems/HAMMER.cs | 2 +- DiscImageChef.Filesystems/HPFS.cs | 2 +- DiscImageChef.Filesystems/HPOFS.cs | 2 +- DiscImageChef.Filesystems/ISO9660/ISO9660.cs | 1 + DiscImageChef.Filesystems/ISO9660/Info.cs | 2 +- DiscImageChef.Filesystems/JFS.cs | 2 +- DiscImageChef.Filesystems/LIF.cs | 2 +- DiscImageChef.Filesystems/LisaFS/Dir.cs | 3 +- DiscImageChef.Filesystems/LisaFS/Extent.cs | 3 +- DiscImageChef.Filesystems/LisaFS/File.cs | 3 +- DiscImageChef.Filesystems/LisaFS/Info.cs | 3 +- DiscImageChef.Filesystems/LisaFS/LisaFS.cs | 2 +- DiscImageChef.Filesystems/LisaFS/Super.cs | 4 +- DiscImageChef.Filesystems/LisaFS/Xattr.cs | 1 + DiscImageChef.Filesystems/Locus.cs | 2 +- DiscImageChef.Filesystems/MicroDOS.cs | 2 +- DiscImageChef.Filesystems/MinixFS.cs | 3 +- DiscImageChef.Filesystems/NILFS2.cs | 2 +- DiscImageChef.Filesystems/NTFS.cs | 2 +- DiscImageChef.Filesystems/Nintendo.cs | 2 +- DiscImageChef.Filesystems/ODS.cs | 3 +- DiscImageChef.Filesystems/Opera.cs | 2 +- DiscImageChef.Filesystems/PCEngine.cs | 2 +- DiscImageChef.Filesystems/PCFX.cs | 3 +- DiscImageChef.Filesystems/PFS.cs | 2 +- DiscImageChef.Filesystems/ProDOS.cs | 2 +- DiscImageChef.Filesystems/QNX4.cs | 2 +- DiscImageChef.Filesystems/QNX6.cs | 2 +- DiscImageChef.Filesystems/RBF.cs | 2 +- DiscImageChef.Filesystems/RT11.cs | 2 +- DiscImageChef.Filesystems/ReFS.cs | 2 +- DiscImageChef.Filesystems/Reiser.cs | 2 +- DiscImageChef.Filesystems/Reiser4.cs | 2 +- DiscImageChef.Filesystems/SFS.cs | 2 +- DiscImageChef.Filesystems/SolarFS.cs | 2 +- DiscImageChef.Filesystems/Squash.cs | 2 +- DiscImageChef.Filesystems/SysV.cs | 2 +- DiscImageChef.Filesystems/UCSDPascal/Dir.cs | 1 + DiscImageChef.Filesystems/UCSDPascal/File.cs | 1 + DiscImageChef.Filesystems/UCSDPascal/Info.cs | 2 +- DiscImageChef.Filesystems/UCSDPascal/Super.cs | 3 +- .../UCSDPascal/UCSDPascal.cs | 3 +- DiscImageChef.Filesystems/UDF.cs | 2 +- DiscImageChef.Filesystems/UNICOS.cs | 2 +- DiscImageChef.Filesystems/UNIXBFS.cs | 2 +- DiscImageChef.Filesystems/VMfs.cs | 2 +- DiscImageChef.Filesystems/VxFS.cs | 2 +- DiscImageChef.Filesystems/XFS.cs | 3 +- DiscImageChef.Filesystems/Xia.cs | 2 +- DiscImageChef.Filesystems/ZFS.cs | 2 +- DiscImageChef.Filesystems/dump.cs | 2 +- DiscImageChef.Filesystems/exFAT.cs | 2 +- DiscImageChef.Filesystems/ext2FS.cs | 2 +- DiscImageChef.Filesystems/extFS.cs | 2 +- DiscImageChef.Filters/AppleDouble.cs | 1 + DiscImageChef.Filters/AppleSingle.cs | 1 + DiscImageChef.Filters/BZip2.cs | 1 + .../DiscImageChef.Filters.csproj | 3 +- DiscImageChef.Filters/GZip.cs | 1 + DiscImageChef.Filters/LZip.cs | 1 + DiscImageChef.Filters/MacBinary.cs | 1 + DiscImageChef.Filters/PCExchange.cs | 1 + DiscImageChef.Filters/XZ.cs | 1 + DiscImageChef.Filters/ZZZNoFilter.cs | 1 + .../DiscImageChef.Helpers.csproj | 11 -- DiscImageChef.Partitions/Acorn.cs | 2 +- DiscImageChef.Partitions/AppleMap.cs | 2 +- DiscImageChef.Partitions/Apricot.cs | 2 +- DiscImageChef.Partitions/Atari.cs | 2 +- DiscImageChef.Partitions/BSD.cs | 2 +- DiscImageChef.Partitions/DEC.cs | 2 +- .../DiscImageChef.Partitions.csproj | 1 - DiscImageChef.Partitions/DragonFlyBSD.cs | 2 +- DiscImageChef.Partitions/GPT.cs | 3 +- DiscImageChef.Partitions/Human68k.cs | 2 +- DiscImageChef.Partitions/MBR.cs | 3 +- DiscImageChef.Partitions/NeXT.cs | 2 +- DiscImageChef.Partitions/PC98.cs | 2 +- DiscImageChef.Partitions/Plan9.cs | 2 +- DiscImageChef.Partitions/RDB.cs | 2 +- DiscImageChef.Partitions/RioKarma.cs | 2 +- DiscImageChef.Partitions/SGI.cs | 2 +- DiscImageChef.Partitions/Sun.cs | 2 +- DiscImageChef.Partitions/UNIX.cs | 2 +- DiscImageChef.Partitions/VTOC.cs | 2 +- DiscImageChef.Partitions/XENIX.cs | 2 +- DiscImageChef.Partitions/Xbox.cs | 2 +- DiscImageChef.Server/App_Start/Ata.cs | 2 +- DiscImageChef.Server/App_Start/ScsiEvpd.cs | 2 +- DiscImageChef.Server/App_Start/ScsiInquiry.cs | 2 +- .../App_Start/ScsiMmcFeatures.cs | 2 +- DiscImageChef.Server/App_Start/ScsiMmcMode.cs | 2 +- .../App_Start/ScsiModeSense.cs | 2 +- .../App_Start/SscTestedMedia.cs | 2 +- DiscImageChef.Server/App_Start/TestedMedia.cs | 2 +- .../Controllers/UploadReportController.cs | 2 +- .../Controllers/UploadStatsController.cs | 2 +- .../DiscImageChef.Server.csproj | 8 -- DiscImageChef.Server/Statistics.aspx.cs | 6 +- DiscImageChef.Server/ViewReport.aspx.cs | 2 +- .../DiscImageChef.Settings.csproj | 7 +- DiscImageChef.Settings/Settings.cs | 4 +- .../DiscImageChef.Tests.Devices.csproj | 4 - DiscImageChef.Tests/Checksums/Adler32.cs | 1 + DiscImageChef.Tests/Checksums/CRC16.cs | 1 + DiscImageChef.Tests/Checksums/CRC32.cs | 1 + DiscImageChef.Tests/Checksums/CRC64.cs | 1 + DiscImageChef.Tests/Checksums/MD5.cs | 1 + DiscImageChef.Tests/Checksums/RIPEMD160.cs | 1 + DiscImageChef.Tests/Checksums/SHA1.cs | 1 + DiscImageChef.Tests/Checksums/SHA256.cs | 1 + DiscImageChef.Tests/Checksums/SHA384.cs | 1 + DiscImageChef.Tests/Checksums/SHA512.cs | 1 + DiscImageChef.Tests/Checksums/SpamSum.cs | 1 + DiscImageChef.Tests/Devices/IomegaJaz.cs | 1 + DiscImageChef.Tests/Devices/LS120.cs | 1 + DiscImageChef.Tests/Devices/PocketZip.cs | 1 + .../DiscImageChef.Tests.csproj | 4 - DiscImageChef.Tests/Filesystems/ADFS.cs | 1 + DiscImageChef.Tests/Filesystems/AFFS.cs | 1 + DiscImageChef.Tests/Filesystems/AFFS2.cs | 1 + DiscImageChef.Tests/Filesystems/AFS.cs | 1 + DiscImageChef.Tests/Filesystems/AOFS.cs | 1 + DiscImageChef.Tests/Filesystems/Atheos.cs | 1 + DiscImageChef.Tests/Filesystems/BeFS.cs | 1 + DiscImageChef.Tests/Filesystems/COHERENT.cs | 1 + DiscImageChef.Tests/Filesystems/DTFS.cs | 1 + DiscImageChef.Tests/Filesystems/EAFS.cs | 1 + DiscImageChef.Tests/Filesystems/F2FS.cs | 1 + DiscImageChef.Tests/Filesystems/FAT12.cs | 1 + DiscImageChef.Tests/Filesystems/FAT16.cs | 1 + DiscImageChef.Tests/Filesystems/FAT32.cs | 1 + DiscImageChef.Tests/Filesystems/HAMMER.cs | 1 + DiscImageChef.Tests/Filesystems/HFS.cs | 1 + DiscImageChef.Tests/Filesystems/HFSPlus.cs | 1 + DiscImageChef.Tests/Filesystems/HFSX.cs | 1 + DiscImageChef.Tests/Filesystems/HPFS.cs | 1 + DiscImageChef.Tests/Filesystems/HPOFS.cs | 1 + DiscImageChef.Tests/Filesystems/HTFS.cs | 1 + DiscImageChef.Tests/Filesystems/ISO9660.cs | 2 +- DiscImageChef.Tests/Filesystems/JFS2.cs | 1 + DiscImageChef.Tests/Filesystems/LisaFS.cs | 2 +- DiscImageChef.Tests/Filesystems/Locus.cs | 2 +- DiscImageChef.Tests/Filesystems/MFS.cs | 2 +- DiscImageChef.Tests/Filesystems/MINIX.cs | 1 + DiscImageChef.Tests/Filesystems/NILFS2.cs | 1 + DiscImageChef.Tests/Filesystems/NTFS.cs | 1 + DiscImageChef.Tests/Filesystems/PFS3.cs | 1 + DiscImageChef.Tests/Filesystems/ProDOS.cs | 1 + DiscImageChef.Tests/Filesystems/QNX4.cs | 1 + DiscImageChef.Tests/Filesystems/ReFS.cs | 1 + DiscImageChef.Tests/Filesystems/Reiser3.cs | 1 + DiscImageChef.Tests/Filesystems/Reiser4.cs | 2 +- DiscImageChef.Tests/Filesystems/SFS.cs | 1 + DiscImageChef.Tests/Filesystems/SysV.cs | 1 + DiscImageChef.Tests/Filesystems/UDF.cs | 1 + DiscImageChef.Tests/Filesystems/UFS.cs | 1 + DiscImageChef.Tests/Filesystems/UNIXBFS.cs | 1 + DiscImageChef.Tests/Filesystems/XENIX.cs | 1 + DiscImageChef.Tests/Filesystems/XFS.cs | 1 + DiscImageChef.Tests/Filesystems/Xia.cs | 1 + DiscImageChef.Tests/Filesystems/ZFS.cs | 1 + DiscImageChef.Tests/Filesystems/btrfs.cs | 1 + DiscImageChef.Tests/Filesystems/exFAT.cs | 1 + DiscImageChef.Tests/Filesystems/ext2.cs | 1 + .../Filters/AppleDoubleDave.cs | 1 + DiscImageChef.Tests/Filters/AppleDoubleDos.cs | 1 + .../Filters/AppleDoubleNetatalk.cs | 1 + DiscImageChef.Tests/Filters/AppleDoubleOsX.cs | 1 + .../Filters/AppleDoubleProDos.cs | 1 + .../Filters/AppleDoubleUnAr.cs | 1 + .../Filters/AppleDoubleUnix.cs | 1 + DiscImageChef.Tests/Filters/AppleSingle.cs | 2 +- DiscImageChef.Tests/Filters/BZip2.cs | 2 +- DiscImageChef.Tests/Filters/GZip.cs | 2 +- DiscImageChef.Tests/Filters/LZip.cs | 2 +- DiscImageChef.Tests/Filters/MacBinary1.cs | 2 +- DiscImageChef.Tests/Filters/MacBinary2.cs | 1 + DiscImageChef.Tests/Filters/MacBinary3.cs | 1 + DiscImageChef.Tests/Filters/PCExchange.cs | 1 + DiscImageChef.Tests/Filters/XZ.cs | 1 + DiscImageChef.Tests/Images/2MG.cs | 2 +- DiscImageChef.Tests/Images/Anex86.cs | 2 +- DiscImageChef.Tests/Images/CisCopy.cs | 2 +- DiscImageChef.Tests/Images/CopyQM.cs | 2 +- DiscImageChef.Tests/Images/D88.cs | 2 +- DiscImageChef.Tests/Images/DART.cs | 2 +- DiscImageChef.Tests/Images/DiskCopy42.cs | 2 +- DiscImageChef.Tests/Partitions/Acorn.cs | 1 + DiscImageChef.Tests/Partitions/AppleMap.cs | 1 + DiscImageChef.Tests/Partitions/Atari.cs | 1 + DiscImageChef.Tests/Partitions/BSD.cs | 1 + DiscImageChef.Tests/Partitions/GPT.cs | 1 + DiscImageChef.Tests/Partitions/MBR.cs | 1 + DiscImageChef.Tests/Partitions/MINIX.cs | 1 + DiscImageChef.Tests/Partitions/PC98.cs | 1 + DiscImageChef.Tests/Partitions/RDB.cs | 1 + DiscImageChef.Tests/Partitions/SGI.cs | 1 + DiscImageChef.Tests/Partitions/Sun.cs | 1 + DiscImageChef.Tests/Partitions/VTOC.cs | 1 + DiscImageChef.sln | 12 -- DiscImageChef/Commands/Analyze.cs | 3 +- DiscImageChef/Commands/Checksum.cs | 4 +- DiscImageChef/Commands/Compare.cs | 9 +- DiscImageChef/Commands/ConvertImage.cs | 11 +- DiscImageChef/Commands/CreateSidecar.cs | 3 +- DiscImageChef/Commands/Decode.cs | 5 +- DiscImageChef/Commands/DeviceReport.cs | 8 +- DiscImageChef/Commands/DumpMedia.cs | 5 +- DiscImageChef/Commands/Entropy.cs | 4 +- DiscImageChef/Commands/ExtractFiles.cs | 4 +- DiscImageChef/Commands/Formats.cs | 4 +- DiscImageChef/Commands/ImageInfo.cs | 3 +- DiscImageChef/Commands/ListOptions.cs | 4 +- DiscImageChef/Commands/Ls.cs | 4 +- DiscImageChef/Commands/PrintHex.cs | 3 +- DiscImageChef/Commands/Statistics.cs | 2 +- DiscImageChef/Commands/Verify.cs | 4 +- DiscImageChef/DiscImageChef.csproj | 8 -- 401 files changed, 874 insertions(+), 560 deletions(-) rename DiscImageChef.DiscImages/Enums.cs => DiscImageChef.CommonTypes/Enums/Images.cs (99%) rename DiscImageChef.DiscImages/Exceptions.cs => DiscImageChef.CommonTypes/Exceptions/Images.cs (99%) rename {DiscImageChef.Helpers => DiscImageChef.CommonTypes}/Extents/ExtentsByte.cs (99%) rename {DiscImageChef.Metadata => DiscImageChef.CommonTypes/Extents}/ExtentsConverter.cs (98%) rename {DiscImageChef.Helpers => DiscImageChef.CommonTypes}/Extents/ExtentsInt.cs (99%) rename {DiscImageChef.Helpers => DiscImageChef.CommonTypes}/Extents/ExtentsLong.cs (99%) rename {DiscImageChef.Helpers => DiscImageChef.CommonTypes}/Extents/ExtentsSByte.cs (99%) rename {DiscImageChef.Helpers => DiscImageChef.CommonTypes}/Extents/ExtentsShort.cs (99%) rename {DiscImageChef.Helpers => DiscImageChef.CommonTypes}/Extents/ExtentsUInt.cs (99%) rename {DiscImageChef.Helpers => DiscImageChef.CommonTypes}/Extents/ExtentsULong.cs (99%) rename {DiscImageChef.Helpers => DiscImageChef.CommonTypes}/Extents/ExtentsUShort.cs (99%) rename {DiscImageChef.Filters => DiscImageChef.CommonTypes}/Filters.cs (96%) rename {DiscImageChef.Checksums => DiscImageChef.CommonTypes/Interfaces}/IChecksum.cs (97%) rename {DiscImageChef.Filesystems => DiscImageChef.CommonTypes/Interfaces}/IFilesystem.cs (96%) rename {DiscImageChef.Filters => DiscImageChef.CommonTypes/Interfaces}/IFilter.cs (99%) rename {DiscImageChef.DiscImages => DiscImageChef.CommonTypes/Interfaces}/IFloppyImage.cs (98%) rename {DiscImageChef.DiscImages => DiscImageChef.CommonTypes/Interfaces}/IMediaImage.cs (98%) rename {DiscImageChef.Partitions => DiscImageChef.CommonTypes/Interfaces}/IPartition.cs (98%) rename {DiscImageChef.Filesystems => DiscImageChef.CommonTypes/Interfaces}/IReadOnlyFilesystem.cs (98%) rename {DiscImageChef.DiscImages => DiscImageChef.CommonTypes/Interfaces}/IWritableFloppyImage.cs (97%) rename {DiscImageChef.DiscImages => DiscImageChef.CommonTypes/Interfaces}/IWritableImage.cs (98%) rename {DiscImageChef.Interop => DiscImageChef.CommonTypes/Interop}/DetectOS.cs (99%) rename {DiscImageChef.Interop => DiscImageChef.CommonTypes/Interop}/PlatformID.cs (99%) rename {DiscImageChef.Interop => DiscImageChef.CommonTypes/Interop}/Version.cs (98%) rename {DiscImageChef.Metadata => DiscImageChef.CommonTypes/Metadata}/DeviceReport.cs (99%) rename {DiscImageChef.Metadata => DiscImageChef.CommonTypes/Metadata}/Dimensions.cs (99%) rename {DiscImageChef.Metadata => DiscImageChef.CommonTypes/Metadata}/MediaType.cs (99%) rename {DiscImageChef.Metadata => DiscImageChef.CommonTypes/Metadata}/Resume.cs (97%) rename {DiscImageChef.Metadata => DiscImageChef.CommonTypes/Metadata}/Statistics.cs (99%) rename {DiscImageChef.Metadata => DiscImageChef.CommonTypes/Metadata}/Version.cs (95%) rename {DiscImageChef.Core => DiscImageChef.CommonTypes}/PluginBase.cs (55%) rename DiscImageChef.Filesystems/Structs.cs => DiscImageChef.CommonTypes/Structs/Filesystems.cs (99%) rename DiscImageChef.DiscImages/Structs.cs => DiscImageChef.CommonTypes/Structs/Images.cs (98%) diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml index e155017c7..8ca42633b 100644 --- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml +++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml @@ -64,7 +64,6 @@ - @@ -84,10 +83,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -182,7 +228,6 @@ - @@ -462,15 +507,9 @@ - - - - - - @@ -485,7 +524,6 @@ - @@ -560,8 +598,6 @@ - - @@ -628,7 +664,6 @@ - @@ -666,10 +701,8 @@ - - @@ -695,16 +728,6 @@ - - - - - - - - - - @@ -717,38 +740,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -760,7 +751,6 @@ - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 86a798b8f..b1dd88eec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -66,7 +66,7 @@ This module contains the command line interface. In the future a GUI will be add * [DiscImageChef.Checksums](https://github.com/claunia/DiscImageChef/tree/master/DiscImageChef.Checksums) - This module contains the checksum, hashing and error correction algorithms. * [DiscImageChef.CommonTypes](https://github.com/claunia/DiscImageChef/tree/master/DiscImageChef.CommonTypes) - -This module contains structs and enumerations needed by more than one of the other modules. +This module contains interfaces, structures and enumerations needed by more than one of the other modules. * [DiscImageChef.Console](https://github.com/claunia/DiscImageChef/tree/master/DiscImageChef.Console) - This module abstracts consoles used by other modules to output information, so they can be redirected to a CLI or to a GUI output. @@ -96,11 +96,6 @@ decompressing or decoding it on-the-fly. * [DiscImageChef.Helpers](https://github.com/claunia/DiscImageChef/tree/master/DiscImageChef.Helpers) - This module contains a collection of helpers for array manipulation, big-endian marshalling, datetime conversion, hexadecimal printing, string manipulation and byte swapping. -* [DiscImageChef.Interop](https://github.com/claunia/DiscImageChef/tree/master/DiscImageChef.Interop) - -This module contains calls to the underlying operating system. Currently only OS detection is -needed. -* [DiscImageChef.Metadata](https://github.com/claunia/DiscImageChef/tree/master/DiscImageChef.Metadata) - -This module contains handling of CICM XML metadata, media types and dimensions. * [DiscImageChef.Partitions](https://github.com/claunia/DiscImageChef/tree/master/DiscImageChef.Partitions) - This module contains code for reading partition schemes. * [DiscImageChef.Server](https://github.com/claunia/DiscImageChef/tree/master/DiscImageChef.Server) - diff --git a/DiscImageChef.Checksums/Adler32Context.cs b/DiscImageChef.Checksums/Adler32Context.cs index 0e58f602c..e46a491a1 100644 --- a/DiscImageChef.Checksums/Adler32Context.cs +++ b/DiscImageChef.Checksums/Adler32Context.cs @@ -33,6 +33,7 @@ using System; using System.IO; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.Checksums/CRC16Context.cs b/DiscImageChef.Checksums/CRC16Context.cs index 858e03eb9..7eacbe941 100644 --- a/DiscImageChef.Checksums/CRC16Context.cs +++ b/DiscImageChef.Checksums/CRC16Context.cs @@ -33,6 +33,7 @@ using System; using System.IO; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.Checksums/CRC32Context.cs b/DiscImageChef.Checksums/CRC32Context.cs index 8bf6157f3..6caab3f64 100644 --- a/DiscImageChef.Checksums/CRC32Context.cs +++ b/DiscImageChef.Checksums/CRC32Context.cs @@ -33,6 +33,7 @@ using System; using System.IO; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.Checksums/CRC64Context.cs b/DiscImageChef.Checksums/CRC64Context.cs index 15b73a5f5..3dcd379b8 100644 --- a/DiscImageChef.Checksums/CRC64Context.cs +++ b/DiscImageChef.Checksums/CRC64Context.cs @@ -33,6 +33,7 @@ using System; using System.IO; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj b/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj index c5379e503..ee02b45eb 100644 --- a/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj +++ b/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj @@ -46,7 +46,6 @@ - @@ -63,6 +62,7 @@ + {F8BDF57B-1571-4CD0-84B3-B422088D359A} DiscImageChef.Helpers diff --git a/DiscImageChef.Checksums/FletcherContext.cs b/DiscImageChef.Checksums/FletcherContext.cs index d89477829..1366a1e23 100644 --- a/DiscImageChef.Checksums/FletcherContext.cs +++ b/DiscImageChef.Checksums/FletcherContext.cs @@ -35,6 +35,7 @@ using System; using System.IO; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.Checksums/MD5Context.cs b/DiscImageChef.Checksums/MD5Context.cs index ca48fa3d7..2f1b3ac60 100644 --- a/DiscImageChef.Checksums/MD5Context.cs +++ b/DiscImageChef.Checksums/MD5Context.cs @@ -33,6 +33,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.Checksums/RIPEMD160Context.cs b/DiscImageChef.Checksums/RIPEMD160Context.cs index 55d668228..a77300dab 100644 --- a/DiscImageChef.Checksums/RIPEMD160Context.cs +++ b/DiscImageChef.Checksums/RIPEMD160Context.cs @@ -33,6 +33,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.Checksums/SHA1Context.cs b/DiscImageChef.Checksums/SHA1Context.cs index f56d0d7cc..d9c363469 100644 --- a/DiscImageChef.Checksums/SHA1Context.cs +++ b/DiscImageChef.Checksums/SHA1Context.cs @@ -33,6 +33,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.Checksums/SHA256Context.cs b/DiscImageChef.Checksums/SHA256Context.cs index dc2d3e0ae..001784432 100644 --- a/DiscImageChef.Checksums/SHA256Context.cs +++ b/DiscImageChef.Checksums/SHA256Context.cs @@ -33,6 +33,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.Checksums/SHA384Context.cs b/DiscImageChef.Checksums/SHA384Context.cs index b3b75c6a3..36b1e5b8a 100644 --- a/DiscImageChef.Checksums/SHA384Context.cs +++ b/DiscImageChef.Checksums/SHA384Context.cs @@ -33,6 +33,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.Checksums/SHA512Context.cs b/DiscImageChef.Checksums/SHA512Context.cs index 3769a7977..1dafecdd4 100644 --- a/DiscImageChef.Checksums/SHA512Context.cs +++ b/DiscImageChef.Checksums/SHA512Context.cs @@ -33,6 +33,7 @@ using System.IO; using System.Security.Cryptography; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.Checksums/SpamSumContext.cs b/DiscImageChef.Checksums/SpamSumContext.cs index c38cc2318..6fea5add2 100644 --- a/DiscImageChef.Checksums/SpamSumContext.cs +++ b/DiscImageChef.Checksums/SpamSumContext.cs @@ -41,6 +41,7 @@ using System; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Checksums { diff --git a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj index a13072596..f396d6964 100644 --- a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj +++ b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj @@ -46,10 +46,46 @@ + + Metadata/cicm.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -60,6 +96,14 @@ + + + LICENSE.MIT + + + + + diff --git a/DiscImageChef.DiscImages/Enums.cs b/DiscImageChef.CommonTypes/Enums/Images.cs similarity index 99% rename from DiscImageChef.DiscImages/Enums.cs rename to DiscImageChef.CommonTypes/Enums/Images.cs index d89226002..372ca5942 100644 --- a/DiscImageChef.DiscImages/Enums.cs +++ b/DiscImageChef.CommonTypes/Enums/Images.cs @@ -32,7 +32,7 @@ using System; -namespace DiscImageChef.DiscImages +namespace DiscImageChef.CommonTypes.Enums { /// /// Track (as partitioning element) types. diff --git a/DiscImageChef.DiscImages/Exceptions.cs b/DiscImageChef.CommonTypes/Exceptions/Images.cs similarity index 99% rename from DiscImageChef.DiscImages/Exceptions.cs rename to DiscImageChef.CommonTypes/Exceptions/Images.cs index 536f7fa1c..e724f90b4 100644 --- a/DiscImageChef.DiscImages/Exceptions.cs +++ b/DiscImageChef.CommonTypes/Exceptions/Images.cs @@ -33,7 +33,7 @@ using System; using System.Runtime.Serialization; -namespace DiscImageChef.DiscImages +namespace DiscImageChef.CommonTypes.Exceptions { /// /// Feature is supported by image but not implemented yet. diff --git a/DiscImageChef.Helpers/Extents/ExtentsByte.cs b/DiscImageChef.CommonTypes/Extents/ExtentsByte.cs similarity index 99% rename from DiscImageChef.Helpers/Extents/ExtentsByte.cs rename to DiscImageChef.CommonTypes/Extents/ExtentsByte.cs index ba2b3c678..e51e21546 100644 --- a/DiscImageChef.Helpers/Extents/ExtentsByte.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsByte.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Extents +namespace DiscImageChef.CommonTypes.Extents { /// /// Implements extents for diff --git a/DiscImageChef.Metadata/ExtentsConverter.cs b/DiscImageChef.CommonTypes/Extents/ExtentsConverter.cs similarity index 98% rename from DiscImageChef.Metadata/ExtentsConverter.cs rename to DiscImageChef.CommonTypes/Extents/ExtentsConverter.cs index b17abe289..1739b4497 100644 --- a/DiscImageChef.Metadata/ExtentsConverter.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsConverter.cs @@ -33,10 +33,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Extents; using Schemas; -namespace DiscImageChef.Metadata +namespace DiscImageChef.CommonTypes.Extents { public static class ExtentsConverter { diff --git a/DiscImageChef.Helpers/Extents/ExtentsInt.cs b/DiscImageChef.CommonTypes/Extents/ExtentsInt.cs similarity index 99% rename from DiscImageChef.Helpers/Extents/ExtentsInt.cs rename to DiscImageChef.CommonTypes/Extents/ExtentsInt.cs index 39b8dbae6..7f7e7d310 100644 --- a/DiscImageChef.Helpers/Extents/ExtentsInt.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsInt.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Extents +namespace DiscImageChef.CommonTypes.Extents { /// /// Implements extents for diff --git a/DiscImageChef.Helpers/Extents/ExtentsLong.cs b/DiscImageChef.CommonTypes/Extents/ExtentsLong.cs similarity index 99% rename from DiscImageChef.Helpers/Extents/ExtentsLong.cs rename to DiscImageChef.CommonTypes/Extents/ExtentsLong.cs index 5ccef4389..fa401deaa 100644 --- a/DiscImageChef.Helpers/Extents/ExtentsLong.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsLong.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Extents +namespace DiscImageChef.CommonTypes.Extents { /// /// Implements extents for diff --git a/DiscImageChef.Helpers/Extents/ExtentsSByte.cs b/DiscImageChef.CommonTypes/Extents/ExtentsSByte.cs similarity index 99% rename from DiscImageChef.Helpers/Extents/ExtentsSByte.cs rename to DiscImageChef.CommonTypes/Extents/ExtentsSByte.cs index f77c2848e..e740dbe01 100644 --- a/DiscImageChef.Helpers/Extents/ExtentsSByte.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsSByte.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Extents +namespace DiscImageChef.CommonTypes.Extents { /// /// Implements extents for diff --git a/DiscImageChef.Helpers/Extents/ExtentsShort.cs b/DiscImageChef.CommonTypes/Extents/ExtentsShort.cs similarity index 99% rename from DiscImageChef.Helpers/Extents/ExtentsShort.cs rename to DiscImageChef.CommonTypes/Extents/ExtentsShort.cs index ae92ee891..bc677e27d 100644 --- a/DiscImageChef.Helpers/Extents/ExtentsShort.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsShort.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Extents +namespace DiscImageChef.CommonTypes.Extents { /// /// Implements extents for diff --git a/DiscImageChef.Helpers/Extents/ExtentsUInt.cs b/DiscImageChef.CommonTypes/Extents/ExtentsUInt.cs similarity index 99% rename from DiscImageChef.Helpers/Extents/ExtentsUInt.cs rename to DiscImageChef.CommonTypes/Extents/ExtentsUInt.cs index 6a917d69d..7f092cb58 100644 --- a/DiscImageChef.Helpers/Extents/ExtentsUInt.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsUInt.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Extents +namespace DiscImageChef.CommonTypes.Extents { /// /// Implements extents for diff --git a/DiscImageChef.Helpers/Extents/ExtentsULong.cs b/DiscImageChef.CommonTypes/Extents/ExtentsULong.cs similarity index 99% rename from DiscImageChef.Helpers/Extents/ExtentsULong.cs rename to DiscImageChef.CommonTypes/Extents/ExtentsULong.cs index 09c76e8c8..c999dbae9 100644 --- a/DiscImageChef.Helpers/Extents/ExtentsULong.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsULong.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Extents +namespace DiscImageChef.CommonTypes.Extents { /// /// Implements extents for diff --git a/DiscImageChef.Helpers/Extents/ExtentsUShort.cs b/DiscImageChef.CommonTypes/Extents/ExtentsUShort.cs similarity index 99% rename from DiscImageChef.Helpers/Extents/ExtentsUShort.cs rename to DiscImageChef.CommonTypes/Extents/ExtentsUShort.cs index 6a8689cf0..6ee689418 100644 --- a/DiscImageChef.Helpers/Extents/ExtentsUShort.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsUShort.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace Extents +namespace DiscImageChef.CommonTypes.Extents { /// /// Implements extents for diff --git a/DiscImageChef.Filters/Filters.cs b/DiscImageChef.CommonTypes/Filters.cs similarity index 96% rename from DiscImageChef.Filters/Filters.cs rename to DiscImageChef.CommonTypes/Filters.cs index c80ab37af..67a530ddd 100644 --- a/DiscImageChef.Filters/Filters.cs +++ b/DiscImageChef.CommonTypes/Filters.cs @@ -35,9 +35,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -namespace DiscImageChef.Filters +namespace DiscImageChef.CommonTypes { public class FiltersList { @@ -48,7 +49,7 @@ namespace DiscImageChef.Filters /// public FiltersList() { - Assembly assembly = Assembly.GetAssembly(typeof(IFilter)); + Assembly assembly = Assembly.Load("DiscImageChef.Filters"); Filters = new SortedDictionary(); foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IFilter)))) diff --git a/DiscImageChef.Checksums/IChecksum.cs b/DiscImageChef.CommonTypes/Interfaces/IChecksum.cs similarity index 97% rename from DiscImageChef.Checksums/IChecksum.cs rename to DiscImageChef.CommonTypes/Interfaces/IChecksum.cs index 862bbd89f..ac5650612 100644 --- a/DiscImageChef.Checksums/IChecksum.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IChecksum.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Checksums +namespace DiscImageChef.CommonTypes.Interfaces { public interface IChecksum { diff --git a/DiscImageChef.Filesystems/IFilesystem.cs b/DiscImageChef.CommonTypes/Interfaces/IFilesystem.cs similarity index 96% rename from DiscImageChef.Filesystems/IFilesystem.cs rename to DiscImageChef.CommonTypes/Interfaces/IFilesystem.cs index fe074e974..132d3358c 100644 --- a/DiscImageChef.Filesystems/IFilesystem.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IFilesystem.cs @@ -32,11 +32,9 @@ using System; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; using Schemas; -namespace DiscImageChef.Filesystems +namespace DiscImageChef.CommonTypes.Interfaces { /// /// Interface to implement filesystem plugins. diff --git a/DiscImageChef.Filters/IFilter.cs b/DiscImageChef.CommonTypes/Interfaces/IFilter.cs similarity index 99% rename from DiscImageChef.Filters/IFilter.cs rename to DiscImageChef.CommonTypes/Interfaces/IFilter.cs index 66ab18225..9af7c2ae5 100644 --- a/DiscImageChef.Filters/IFilter.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IFilter.cs @@ -33,7 +33,7 @@ using System; using System.IO; -namespace DiscImageChef.Filters +namespace DiscImageChef.CommonTypes.Interfaces { public interface IFilter { diff --git a/DiscImageChef.DiscImages/IFloppyImage.cs b/DiscImageChef.CommonTypes/Interfaces/IFloppyImage.cs similarity index 98% rename from DiscImageChef.DiscImages/IFloppyImage.cs rename to DiscImageChef.CommonTypes/Interfaces/IFloppyImage.cs index 97fd97453..b392df398 100644 --- a/DiscImageChef.DiscImages/IFloppyImage.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IFloppyImage.cs @@ -30,7 +30,10 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Structs; + +namespace DiscImageChef.CommonTypes.Interfaces { /// /// Abstract class to implement disk image reading plugins that can contain floppy images. diff --git a/DiscImageChef.DiscImages/IMediaImage.cs b/DiscImageChef.CommonTypes/Interfaces/IMediaImage.cs similarity index 98% rename from DiscImageChef.DiscImages/IMediaImage.cs rename to DiscImageChef.CommonTypes/Interfaces/IMediaImage.cs index c2e768fd2..20ffa4e20 100644 --- a/DiscImageChef.DiscImages/IMediaImage.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IMediaImage.cs @@ -32,11 +32,11 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.Filters; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace DiscImageChef.CommonTypes.Interfaces { /// /// Abstract class to implement disk image reading plugins. diff --git a/DiscImageChef.Partitions/IPartition.cs b/DiscImageChef.CommonTypes/Interfaces/IPartition.cs similarity index 98% rename from DiscImageChef.Partitions/IPartition.cs rename to DiscImageChef.CommonTypes/Interfaces/IPartition.cs index 52c9639d8..a19216bed 100644 --- a/DiscImageChef.Partitions/IPartition.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IPartition.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Filesystems/IReadOnlyFilesystem.cs b/DiscImageChef.CommonTypes/Interfaces/IReadOnlyFilesystem.cs similarity index 98% rename from DiscImageChef.Filesystems/IReadOnlyFilesystem.cs rename to DiscImageChef.CommonTypes/Interfaces/IReadOnlyFilesystem.cs index 530fcb949..deeb4c138 100644 --- a/DiscImageChef.Filesystems/IReadOnlyFilesystem.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IReadOnlyFilesystem.cs @@ -34,10 +34,9 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Structs; -namespace DiscImageChef.Filesystems +namespace DiscImageChef.CommonTypes.Interfaces { /// /// Interface to implement filesystem plugins. diff --git a/DiscImageChef.DiscImages/IWritableFloppyImage.cs b/DiscImageChef.CommonTypes/Interfaces/IWritableFloppyImage.cs similarity index 97% rename from DiscImageChef.DiscImages/IWritableFloppyImage.cs rename to DiscImageChef.CommonTypes/Interfaces/IWritableFloppyImage.cs index 1eb367869..1dec8d552 100644 --- a/DiscImageChef.DiscImages/IWritableFloppyImage.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IWritableFloppyImage.cs @@ -30,7 +30,10 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.DiscImages +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Structs; + +namespace DiscImageChef.CommonTypes.Interfaces { /// /// Abstract class to implement disk image reading plugins that can contain floppy images. diff --git a/DiscImageChef.DiscImages/IWritableImage.cs b/DiscImageChef.CommonTypes/Interfaces/IWritableImage.cs similarity index 98% rename from DiscImageChef.DiscImages/IWritableImage.cs rename to DiscImageChef.CommonTypes/Interfaces/IWritableImage.cs index 4dea6553f..8dadc92b8 100644 --- a/DiscImageChef.DiscImages/IWritableImage.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IWritableImage.cs @@ -32,10 +32,11 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Structs; using Schemas; -namespace DiscImageChef.DiscImages +namespace DiscImageChef.CommonTypes.Interfaces { /// /// Abstract class to implement disk image writing plugins. diff --git a/DiscImageChef.Interop/DetectOS.cs b/DiscImageChef.CommonTypes/Interop/DetectOS.cs similarity index 99% rename from DiscImageChef.Interop/DetectOS.cs rename to DiscImageChef.CommonTypes/Interop/DetectOS.cs index 43a8cecf0..af2b86cb3 100644 --- a/DiscImageChef.Interop/DetectOS.cs +++ b/DiscImageChef.CommonTypes/Interop/DetectOS.cs @@ -41,7 +41,7 @@ using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; -namespace DiscImageChef.Interop +namespace DiscImageChef.CommonTypes.Interop { public static class DetectOS { diff --git a/DiscImageChef.Interop/PlatformID.cs b/DiscImageChef.CommonTypes/Interop/PlatformID.cs similarity index 99% rename from DiscImageChef.Interop/PlatformID.cs rename to DiscImageChef.CommonTypes/Interop/PlatformID.cs index 5d1650de5..d3bcb88f6 100644 --- a/DiscImageChef.Interop/PlatformID.cs +++ b/DiscImageChef.CommonTypes/Interop/PlatformID.cs @@ -36,7 +36,7 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Interop +namespace DiscImageChef.CommonTypes.Interop { /// /// Contains an arbitrary list of OSes, even if .NET does not run on them diff --git a/DiscImageChef.Interop/Version.cs b/DiscImageChef.CommonTypes/Interop/Version.cs similarity index 98% rename from DiscImageChef.Interop/Version.cs rename to DiscImageChef.CommonTypes/Interop/Version.cs index 1a8c7480b..58d6b2053 100644 --- a/DiscImageChef.Interop/Version.cs +++ b/DiscImageChef.CommonTypes/Interop/Version.cs @@ -40,7 +40,7 @@ using System; using System.Reflection; using System.Runtime; -namespace DiscImageChef.Interop +namespace DiscImageChef.CommonTypes.Interop { public static class Version { diff --git a/DiscImageChef.Metadata/DeviceReport.cs b/DiscImageChef.CommonTypes/Metadata/DeviceReport.cs similarity index 99% rename from DiscImageChef.Metadata/DeviceReport.cs rename to DiscImageChef.CommonTypes/Metadata/DeviceReport.cs index bb98eece2..a10410688 100644 --- a/DiscImageChef.Metadata/DeviceReport.cs +++ b/DiscImageChef.CommonTypes/Metadata/DeviceReport.cs @@ -39,7 +39,7 @@ using DiscImageChef.Decoders.SCSI.MMC; // ReSharper disable InconsistentNaming // ReSharper disable UnusedAutoPropertyAccessor.Global -namespace DiscImageChef.Metadata +namespace DiscImageChef.CommonTypes.Metadata { [Serializable] [XmlRoot("DicDeviceReport", Namespace = "", IsNullable = false)] diff --git a/DiscImageChef.Metadata/Dimensions.cs b/DiscImageChef.CommonTypes/Metadata/Dimensions.cs similarity index 99% rename from DiscImageChef.Metadata/Dimensions.cs rename to DiscImageChef.CommonTypes/Metadata/Dimensions.cs index f832a1cf8..2598876a5 100644 --- a/DiscImageChef.Metadata/Dimensions.cs +++ b/DiscImageChef.CommonTypes/Metadata/Dimensions.cs @@ -32,7 +32,7 @@ using Schemas; -namespace DiscImageChef.Metadata +namespace DiscImageChef.CommonTypes.Metadata { public static class Dimensions { diff --git a/DiscImageChef.Metadata/MediaType.cs b/DiscImageChef.CommonTypes/Metadata/MediaType.cs similarity index 99% rename from DiscImageChef.Metadata/MediaType.cs rename to DiscImageChef.CommonTypes/Metadata/MediaType.cs index ba9d31047..2cf3051b2 100644 --- a/DiscImageChef.Metadata/MediaType.cs +++ b/DiscImageChef.CommonTypes/Metadata/MediaType.cs @@ -30,7 +30,7 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ -namespace DiscImageChef.Metadata +namespace DiscImageChef.CommonTypes.Metadata { public static class MediaType { diff --git a/DiscImageChef.Metadata/Resume.cs b/DiscImageChef.CommonTypes/Metadata/Resume.cs similarity index 97% rename from DiscImageChef.Metadata/Resume.cs rename to DiscImageChef.CommonTypes/Metadata/Resume.cs index 0325e78c5..5338358a2 100644 --- a/DiscImageChef.Metadata/Resume.cs +++ b/DiscImageChef.CommonTypes/Metadata/Resume.cs @@ -35,7 +35,7 @@ using System.Collections.Generic; using System.Xml.Serialization; using Schemas; -namespace DiscImageChef.Metadata +namespace DiscImageChef.CommonTypes.Metadata { [Serializable] [XmlRoot("DicResume", Namespace = "", IsNullable = false)] diff --git a/DiscImageChef.Metadata/Statistics.cs b/DiscImageChef.CommonTypes/Metadata/Statistics.cs similarity index 99% rename from DiscImageChef.Metadata/Statistics.cs rename to DiscImageChef.CommonTypes/Metadata/Statistics.cs index b9e2438bf..593a3b2f7 100644 --- a/DiscImageChef.Metadata/Statistics.cs +++ b/DiscImageChef.CommonTypes/Metadata/Statistics.cs @@ -33,7 +33,7 @@ using System.Collections.Generic; using System.Xml.Serialization; -namespace DiscImageChef.Metadata +namespace DiscImageChef.CommonTypes.Metadata { [XmlRoot("DicStats", Namespace = "", IsNullable = false)] public class Stats diff --git a/DiscImageChef.Metadata/Version.cs b/DiscImageChef.CommonTypes/Metadata/Version.cs similarity index 95% rename from DiscImageChef.Metadata/Version.cs rename to DiscImageChef.CommonTypes/Metadata/Version.cs index 52f159a64..82c487e35 100644 --- a/DiscImageChef.Metadata/Version.cs +++ b/DiscImageChef.CommonTypes/Metadata/Version.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ -using DiscImageChef.Interop; +using DiscImageChef.CommonTypes.Interop; using Schemas; -namespace DiscImageChef.Metadata +namespace DiscImageChef.CommonTypes.Metadata { public static class Version { diff --git a/DiscImageChef.Core/PluginBase.cs b/DiscImageChef.CommonTypes/PluginBase.cs similarity index 55% rename from DiscImageChef.Core/PluginBase.cs rename to DiscImageChef.CommonTypes/PluginBase.cs index 8eb694e0d..499d71ad1 100644 --- a/DiscImageChef.Core/PluginBase.cs +++ b/DiscImageChef.CommonTypes/PluginBase.cs @@ -34,12 +34,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; using DiscImageChef.Partitions; -namespace DiscImageChef.Core +namespace DiscImageChef.CommonTypes { /// /// Contain all plugins (filesystem, partition and image) @@ -78,62 +77,64 @@ namespace DiscImageChef.Core ImagePluginsList = new SortedDictionary(); WritableImages = new SortedDictionary(); - Assembly assembly = Assembly.GetAssembly(typeof(IMediaImage)); + // We need to manually load assemblies :( + AppDomain.CurrentDomain.Load("DiscImageChef.DiscImages"); + AppDomain.CurrentDomain.Load("DiscImageChef.Filesystems"); + AppDomain.CurrentDomain.Load("DiscImageChef.Partitions"); - foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IMediaImage))) - .Where(t => t.IsClass)) - try - { - IMediaImage plugin = (IMediaImage)type.GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { }); - RegisterImagePlugin(plugin); - } - catch(Exception exception) { DicConsole.ErrorWriteLine("Exception {0}", exception); } + Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); + foreach(Assembly assembly in assemblies) + { + foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IMediaImage))) + .Where(t => t.IsClass)) + try + { + IMediaImage plugin = + (IMediaImage)type.GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { }); + RegisterImagePlugin(plugin); + } + catch(Exception exception) { DicConsole.ErrorWriteLine("Exception {0}", exception); } - assembly = Assembly.GetAssembly(typeof(IPartition)); + foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IPartition))) + .Where(t => t.IsClass)) + try + { + IPartition plugin = (IPartition)type.GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { }); + RegisterPartPlugin(plugin); + } + catch(Exception exception) { DicConsole.ErrorWriteLine("Exception {0}", exception); } - foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IPartition))) - .Where(t => t.IsClass)) - try - { - IPartition plugin = (IPartition)type.GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { }); - RegisterPartPlugin(plugin); - } - catch(Exception exception) { DicConsole.ErrorWriteLine("Exception {0}", exception); } + foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IFilesystem))) + .Where(t => t.IsClass)) + try + { + IFilesystem plugin = + (IFilesystem)type.GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { }); + RegisterPlugin(plugin); + } + catch(Exception exception) { DicConsole.ErrorWriteLine("Exception {0}", exception); } - assembly = Assembly.GetAssembly(typeof(IFilesystem)); + foreach(Type type in assembly + .GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IReadOnlyFilesystem))) + .Where(t => t.IsClass)) + try + { + IReadOnlyFilesystem plugin = + (IReadOnlyFilesystem)type.GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { }); + RegisterReadOnlyFilesystem(plugin); + } + catch(Exception exception) { DicConsole.ErrorWriteLine("Exception {0}", exception); } - foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IFilesystem))) - .Where(t => t.IsClass)) - try - { - IFilesystem plugin = (IFilesystem)type.GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { }); - RegisterPlugin(plugin); - } - catch(Exception exception) { DicConsole.ErrorWriteLine("Exception {0}", exception); } - - assembly = Assembly.GetAssembly(typeof(IReadOnlyFilesystem)); - - foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IReadOnlyFilesystem))) - .Where(t => t.IsClass)) - try - { - IReadOnlyFilesystem plugin = - (IReadOnlyFilesystem)type.GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { }); - RegisterReadOnlyFilesystem(plugin); - } - catch(Exception exception) { DicConsole.ErrorWriteLine("Exception {0}", exception); } - - assembly = Assembly.GetAssembly(typeof(IWritableImage)); - - foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IWritableImage))) - .Where(t => t.IsClass)) - try - { - IWritableImage plugin = - (IWritableImage)type.GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { }); - RegisterWritableMedia(plugin); - } - catch(Exception exception) { DicConsole.ErrorWriteLine("Exception {0}", exception); } + foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IWritableImage))) + .Where(t => t.IsClass)) + try + { + IWritableImage plugin = + (IWritableImage)type.GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { }); + RegisterWritableMedia(plugin); + } + catch(Exception exception) { DicConsole.ErrorWriteLine("Exception {0}", exception); } + } } void RegisterImagePlugin(IMediaImage plugin) diff --git a/DiscImageChef.Filesystems/Structs.cs b/DiscImageChef.CommonTypes/Structs/Filesystems.cs similarity index 99% rename from DiscImageChef.Filesystems/Structs.cs rename to DiscImageChef.CommonTypes/Structs/Filesystems.cs index 4567ec31c..060430a79 100644 --- a/DiscImageChef.Filesystems/Structs.cs +++ b/DiscImageChef.CommonTypes/Structs/Filesystems.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; -namespace DiscImageChef.Filesystems +namespace DiscImageChef.CommonTypes.Structs { /// /// File attributes. diff --git a/DiscImageChef.DiscImages/Structs.cs b/DiscImageChef.CommonTypes/Structs/Images.cs similarity index 98% rename from DiscImageChef.DiscImages/Structs.cs rename to DiscImageChef.CommonTypes/Structs/Images.cs index 3234852fd..8a22ffd43 100644 --- a/DiscImageChef.DiscImages/Structs.cs +++ b/DiscImageChef.CommonTypes/Structs/Images.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; -using DiscImageChef.CommonTypes; -using DiscImageChef.Filters; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; -namespace DiscImageChef.DiscImages +namespace DiscImageChef.CommonTypes.Structs { /// /// Contains information about a dump image and its contents diff --git a/DiscImageChef.Core/Benchmark.cs b/DiscImageChef.Core/Benchmark.cs index babf0ff5c..d7b3d74bc 100644 --- a/DiscImageChef.Core/Benchmark.cs +++ b/DiscImageChef.Core/Benchmark.cs @@ -34,6 +34,7 @@ using System; using System.Collections.Generic; using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Core { diff --git a/DiscImageChef.Core/Checksum.cs b/DiscImageChef.Core/Checksum.cs index e46cd92f2..cc46841ff 100644 --- a/DiscImageChef.Core/Checksum.cs +++ b/DiscImageChef.Core/Checksum.cs @@ -34,6 +34,7 @@ using System; using System.Collections.Generic; using System.Threading; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Core diff --git a/DiscImageChef.Core/Devices/Dumping/ATA.cs b/DiscImageChef.Core/Devices/Dumping/ATA.cs index a786fb8fe..bf7f14abe 100644 --- a/DiscImageChef.Core/Devices/Dumping/ATA.cs +++ b/DiscImageChef.Core/Devices/Dumping/ATA.cs @@ -36,15 +36,17 @@ using System.IO; using System.Linq; using System.Text; using System.Xml.Serialization; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Extents; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Core.Logging; using DiscImageChef.Decoders.ATA; using DiscImageChef.Decoders.PCMCIA; using DiscImageChef.Devices; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; -using DiscImageChef.Metadata; -using Extents; using Schemas; using MediaType = DiscImageChef.CommonTypes.MediaType; using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple; @@ -610,14 +612,14 @@ namespace DiscImageChef.Core.Devices.Dumping DicConsole.WriteLine(); string xmlDskTyp, xmlDskSubTyp; if(dev.IsCompactFlash) - Metadata.MediaType.MediaTypeToString(MediaType.CompactFlash, out xmlDskTyp, - out xmlDskSubTyp); + CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.CompactFlash, out xmlDskTyp, + out xmlDskSubTyp); else if(dev.IsPcmcia) - Metadata.MediaType.MediaTypeToString(MediaType.PCCardTypeI, out xmlDskTyp, - out xmlDskSubTyp); + CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.PCCardTypeI, out xmlDskTyp, + out xmlDskSubTyp); else - Metadata.MediaType.MediaTypeToString(MediaType.GENERIC_HDD, out xmlDskTyp, - out xmlDskSubTyp); + CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.GENERIC_HDD, out xmlDskTyp, + out xmlDskSubTyp); sidecar.BlockMedia[0].DiskType = xmlDskTyp; sidecar.BlockMedia[0].DiskSubType = xmlDskSubTyp; sidecar.BlockMedia[0].Interface = "ATA"; diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs index dcc5af7a5..4b82481ad 100644 --- a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs +++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs @@ -36,21 +36,24 @@ using System.IO; using System.Linq; using System.Text; using System.Xml.Serialization; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Extents; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Core.Logging; using DiscImageChef.Decoders.CD; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Decoders.SCSI.MMC; using DiscImageChef.Devices; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; -using DiscImageChef.Metadata; -using Extents; using Schemas; using MediaType = DiscImageChef.CommonTypes.MediaType; -using PlatformID = DiscImageChef.Interop.PlatformID; +using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; using Session = DiscImageChef.Decoders.CD.Session; -using TrackType = DiscImageChef.DiscImages.TrackType; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.Core.Devices.Dumping { @@ -1637,7 +1640,8 @@ namespace DiscImageChef.Core.Devices.Dumping dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start); sidecar.OpticalDisc[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType); - Metadata.MediaType.MediaTypeToString(dskType, out string xmlDskTyp, out string xmlDskSubTyp); + CommonTypes.Metadata.MediaType.MediaTypeToString(dskType, out string xmlDskTyp, + out string xmlDskSubTyp); sidecar.OpticalDisc[0].DiscType = xmlDskTyp; sidecar.OpticalDisc[0].DiscSubType = xmlDskSubTyp; sidecar.OpticalDisc[0].DumpHardwareArray = resume.Tries.ToArray(); diff --git a/DiscImageChef.Core/Devices/Dumping/MMC.cs b/DiscImageChef.Core/Devices/Dumping/MMC.cs index ee28b274d..d1f2d6643 100644 --- a/DiscImageChef.Core/Devices/Dumping/MMC.cs +++ b/DiscImageChef.Core/Devices/Dumping/MMC.cs @@ -33,6 +33,9 @@ using System; using System.Collections.Generic; using System.Text; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Core.Logging; using DiscImageChef.Decoders.Bluray; @@ -40,8 +43,6 @@ using DiscImageChef.Decoders.DVD; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Decoders.SCSI.MMC; using DiscImageChef.Devices; -using DiscImageChef.DiscImages; -using DiscImageChef.Metadata; using Schemas; using DDS = DiscImageChef.Decoders.DVD.DDS; using DMI = DiscImageChef.Decoders.Xbox.DMI; diff --git a/DiscImageChef.Core/Devices/Dumping/NVMe.cs b/DiscImageChef.Core/Devices/Dumping/NVMe.cs index eeb945ece..9a0fa12a2 100644 --- a/DiscImageChef.Core/Devices/Dumping/NVMe.cs +++ b/DiscImageChef.Core/Devices/Dumping/NVMe.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Core.Logging; using DiscImageChef.Devices; -using DiscImageChef.DiscImages; -using DiscImageChef.Metadata; using Schemas; namespace DiscImageChef.Core.Devices.Dumping diff --git a/DiscImageChef.Core/Devices/Dumping/ResumeSupport.cs b/DiscImageChef.Core/Devices/Dumping/ResumeSupport.cs index 2dc60926f..d6749e289 100644 --- a/DiscImageChef.Core/Devices/Dumping/ResumeSupport.cs +++ b/DiscImageChef.Core/Devices/Dumping/ResumeSupport.cs @@ -32,11 +32,11 @@ using System; using System.Collections.Generic; -using DiscImageChef.Metadata; -using Extents; +using DiscImageChef.CommonTypes.Extents; +using DiscImageChef.CommonTypes.Metadata; using Schemas; -using PlatformID = DiscImageChef.Interop.PlatformID; -using Version = DiscImageChef.Interop.Version; +using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; +using Version = DiscImageChef.CommonTypes.Interop.Version; namespace DiscImageChef.Core.Devices.Dumping { @@ -116,7 +116,7 @@ namespace DiscImageChef.Core.Devices.Dumping currentTry = new DumpHardwareType { - Software = Metadata.Version.GetSoftwareType(), + Software = CommonTypes.Metadata.Version.GetSoftwareType(), Manufacturer = manufacturer, Model = model, Serial = serial @@ -135,7 +135,7 @@ namespace DiscImageChef.Core.Devices.Dumping }; currentTry = new DumpHardwareType { - Software = Metadata.Version.GetSoftwareType(), + Software = CommonTypes.Metadata.Version.GetSoftwareType(), Manufacturer = manufacturer, Model = model, Serial = serial diff --git a/DiscImageChef.Core/Devices/Dumping/SBC.cs b/DiscImageChef.Core/Devices/Dumping/SBC.cs index 2ef552b42..140f9626c 100644 --- a/DiscImageChef.Core/Devices/Dumping/SBC.cs +++ b/DiscImageChef.Core/Devices/Dumping/SBC.cs @@ -37,17 +37,19 @@ using System.Linq; using System.Text; using System.Xml.Serialization; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Extents; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Core.Logging; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Devices; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; -using DiscImageChef.Metadata; -using Extents; using Schemas; using MediaType = DiscImageChef.CommonTypes.MediaType; -using TrackType = DiscImageChef.DiscImages.TrackType; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.Core.Devices.Dumping { @@ -809,7 +811,8 @@ namespace DiscImageChef.Core.Devices.Dumping dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start); // TODO: Implement layers sidecar.OpticalDisc[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType); - Metadata.MediaType.MediaTypeToString(dskType, out string xmlDskTyp, out string xmlDskSubTyp); + CommonTypes.Metadata.MediaType.MediaTypeToString(dskType, out string xmlDskTyp, + out string xmlDskSubTyp); sidecar.OpticalDisc[0].DiscType = xmlDskTyp; sidecar.OpticalDisc[0].DiscSubType = xmlDskSubTyp; sidecar.OpticalDisc[0].DumpHardwareArray = resume.Tries.ToArray(); @@ -957,7 +960,8 @@ namespace DiscImageChef.Core.Devices.Dumping foreach(var filesystem in filesystems.Select(o => new {o.start, o.type}).Distinct()) dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start); sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType); - Metadata.MediaType.MediaTypeToString(dskType, out string xmlDskTyp, out string xmlDskSubTyp); + CommonTypes.Metadata.MediaType.MediaTypeToString(dskType, out string xmlDskTyp, + out string xmlDskSubTyp); sidecar.BlockMedia[0].DiskType = xmlDskTyp; sidecar.BlockMedia[0].DiskSubType = xmlDskSubTyp; // TODO: Implement device firmware revision diff --git a/DiscImageChef.Core/Devices/Dumping/SCSI.cs b/DiscImageChef.Core/Devices/Dumping/SCSI.cs index d364f24ff..55b002208 100644 --- a/DiscImageChef.Core/Devices/Dumping/SCSI.cs +++ b/DiscImageChef.Core/Devices/Dumping/SCSI.cs @@ -34,12 +34,12 @@ using System; using System.Collections.Generic; using System.Text; using System.Threading; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Core.Logging; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Devices; -using DiscImageChef.DiscImages; -using DiscImageChef.Metadata; using Schemas; using MediaType = DiscImageChef.CommonTypes.MediaType; diff --git a/DiscImageChef.Core/Devices/Dumping/SSC.cs b/DiscImageChef.Core/Devices/Dumping/SSC.cs index eb4e704a2..d9667b36d 100644 --- a/DiscImageChef.Core/Devices/Dumping/SSC.cs +++ b/DiscImageChef.Core/Devices/Dumping/SSC.cs @@ -36,14 +36,14 @@ using System.IO; using System.Threading; using System.Xml.Serialization; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Core.Logging; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Devices; -using DiscImageChef.Metadata; using Schemas; using MediaType = DiscImageChef.CommonTypes.MediaType; -using Version = DiscImageChef.Metadata.Version; +using Version = DiscImageChef.CommonTypes.Metadata.Version; namespace DiscImageChef.Core.Devices.Dumping { @@ -646,7 +646,7 @@ namespace DiscImageChef.Core.Devices.Dumping sidecar.BlockMedia[0].Checksums = dataChk.End().ToArray(); sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType); - Metadata.MediaType.MediaTypeToString(dskType, out string xmlDskTyp, out string xmlDskSubTyp); + CommonTypes.Metadata.MediaType.MediaTypeToString(dskType, out string xmlDskTyp, out string xmlDskSubTyp); sidecar.BlockMedia[0].DiskType = xmlDskTyp; sidecar.BlockMedia[0].DiskSubType = xmlDskSubTyp; // TODO: Implement device firmware revision diff --git a/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs b/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs index 79c16a6b6..3854e6a43 100644 --- a/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs +++ b/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs @@ -36,14 +36,16 @@ using System.IO; using System.Linq; using System.Text; using System.Xml.Serialization; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Extents; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Core.Logging; using DiscImageChef.Decoders.MMC; using DiscImageChef.Devices; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; -using DiscImageChef.Metadata; -using Extents; using Schemas; using MediaType = DiscImageChef.CommonTypes.MediaType; @@ -614,11 +616,13 @@ namespace DiscImageChef.Core.Devices.Dumping switch(dev.Type) { case DeviceType.MMC: - Metadata.MediaType.MediaTypeToString(MediaType.MMC, out xmlDskTyp, out xmlDskSubTyp); + CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.MMC, out xmlDskTyp, + out xmlDskSubTyp); sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(MediaType.MMC); break; case DeviceType.SecureDigital: - Metadata.MediaType.MediaTypeToString(MediaType.SecureDigital, out xmlDskTyp, out xmlDskSubTyp); + CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.SecureDigital, out xmlDskTyp, + out xmlDskSubTyp); sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(MediaType.SecureDigital); break; } diff --git a/DiscImageChef.Core/Devices/Dumping/XGD.cs b/DiscImageChef.Core/Devices/Dumping/XGD.cs index b84ed11f6..f6fcb8d30 100644 --- a/DiscImageChef.Core/Devices/Dumping/XGD.cs +++ b/DiscImageChef.Core/Devices/Dumping/XGD.cs @@ -36,19 +36,22 @@ using System.IO; using System.Linq; using System.Text; using System.Xml.Serialization; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Extents; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Core.Logging; using DiscImageChef.Decoders.DVD; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Decoders.Xbox; using DiscImageChef.Devices; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; -using DiscImageChef.Metadata; -using Extents; using Schemas; using MediaType = DiscImageChef.CommonTypes.MediaType; -using TrackType = DiscImageChef.DiscImages.TrackType; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.Core.Devices.Dumping { @@ -918,7 +921,8 @@ namespace DiscImageChef.Core.Devices.Dumping sidecar.OpticalDisc[0].Layers.Sectors[0] = new SectorsType {Value = (long)layerBreak}; sidecar.OpticalDisc[0].Sessions = 1; sidecar.OpticalDisc[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType); - Metadata.MediaType.MediaTypeToString(dskType, out string xmlDskTyp, out string xmlDskSubTyp); + CommonTypes.Metadata.MediaType.MediaTypeToString(dskType, out string xmlDskTyp, + out string xmlDskSubTyp); sidecar.OpticalDisc[0].DiscType = xmlDskTyp; sidecar.OpticalDisc[0].DiscSubType = xmlDskSubTyp; diff --git a/DiscImageChef.Core/Devices/Report/ATA.cs b/DiscImageChef.Core/Devices/Report/ATA.cs index 7ad2270f7..e662b861b 100644 --- a/DiscImageChef.Core/Devices/Report/ATA.cs +++ b/DiscImageChef.Core/Devices/Report/ATA.cs @@ -32,10 +32,10 @@ using System; using System.Collections.Generic; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Decoders.ATA; using DiscImageChef.Devices; -using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report { diff --git a/DiscImageChef.Core/Devices/Report/ATAPI.cs b/DiscImageChef.Core/Devices/Report/ATAPI.cs index a408af1e0..788fbde14 100644 --- a/DiscImageChef.Core/Devices/Report/ATAPI.cs +++ b/DiscImageChef.Core/Devices/Report/ATAPI.cs @@ -30,10 +30,10 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Decoders.ATA; using DiscImageChef.Devices; -using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report { diff --git a/DiscImageChef.Core/Devices/Report/FireWire.cs b/DiscImageChef.Core/Devices/Report/FireWire.cs index a1ac9f8dd..95995a9f5 100644 --- a/DiscImageChef.Core/Devices/Report/FireWire.cs +++ b/DiscImageChef.Core/Devices/Report/FireWire.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Devices; -using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report { diff --git a/DiscImageChef.Core/Devices/Report/NVMe.cs b/DiscImageChef.Core/Devices/Report/NVMe.cs index 1fc6f326f..64513a501 100644 --- a/DiscImageChef.Core/Devices/Report/NVMe.cs +++ b/DiscImageChef.Core/Devices/Report/NVMe.cs @@ -31,8 +31,8 @@ // ****************************************************************************/ using System; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Devices; -using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report { diff --git a/DiscImageChef.Core/Devices/Report/PCMCIA.cs b/DiscImageChef.Core/Devices/Report/PCMCIA.cs index e2539627b..e8f220898 100644 --- a/DiscImageChef.Core/Devices/Report/PCMCIA.cs +++ b/DiscImageChef.Core/Devices/Report/PCMCIA.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Decoders.PCMCIA; using DiscImageChef.Devices; -using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report { diff --git a/DiscImageChef.Core/Devices/Report/SCSI/General.cs b/DiscImageChef.Core/Devices/Report/SCSI/General.cs index 6aaae2777..50adf9b22 100644 --- a/DiscImageChef.Core/Devices/Report/SCSI/General.cs +++ b/DiscImageChef.Core/Devices/Report/SCSI/General.cs @@ -35,10 +35,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Devices; -using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report.SCSI { diff --git a/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs b/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs index af40bf1bc..c09d303ce 100644 --- a/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs +++ b/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs @@ -35,11 +35,11 @@ using System.Collections.Generic; using System.IO; using System.Text; using System.Threading; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Decoders.SCSI.MMC; using DiscImageChef.Devices; -using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report.SCSI { diff --git a/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs b/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs index ba8dc6aff..4655a6fa1 100644 --- a/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs +++ b/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs @@ -33,11 +33,11 @@ using System; using System.Collections.Generic; using System.Threading; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Decoders.SCSI.SSC; using DiscImageChef.Devices; -using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report.SCSI { diff --git a/DiscImageChef.Core/Devices/Report/SecureDigital.cs b/DiscImageChef.Core/Devices/Report/SecureDigital.cs index 0cf09f6b8..3096ded2b 100644 --- a/DiscImageChef.Core/Devices/Report/SecureDigital.cs +++ b/DiscImageChef.Core/Devices/Report/SecureDigital.cs @@ -30,9 +30,9 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Devices; -using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report { diff --git a/DiscImageChef.Core/Devices/Report/USB.cs b/DiscImageChef.Core/Devices/Report/USB.cs index 0816c1b55..8e9957c72 100644 --- a/DiscImageChef.Core/Devices/Report/USB.cs +++ b/DiscImageChef.Core/Devices/Report/USB.cs @@ -31,9 +31,9 @@ // ****************************************************************************/ using System; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Devices; -using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report { diff --git a/DiscImageChef.Core/DiscImageChef.Core.csproj b/DiscImageChef.Core/DiscImageChef.Core.csproj index 1c37d35ad..fa8379f97 100644 --- a/DiscImageChef.Core/DiscImageChef.Core.csproj +++ b/DiscImageChef.Core/DiscImageChef.Core.csproj @@ -48,7 +48,6 @@ - @@ -136,18 +135,10 @@ {CC48B324-A532-4A45-87A6-6F91F7141E8D} DiscImageChef.Checksums - - {9F213318-5CB8-4066-A757-074489C9F818} - DiscImageChef.Metadata - {0BEB3088-B634-4289-AE17-CDF2D25D00D5} DiscImageChef.Decoders - - {9183F2E0-A879-4F23-9EE3-C6908F1332B2} - DiscImageChef.Interop - {F8BDF57B-1571-4CD0-84B3-B422088D359A} DiscImageChef.Helpers diff --git a/DiscImageChef.Core/Filesystems.cs b/DiscImageChef.Core/Filesystems.cs index 0effcf57d..e094f9499 100644 --- a/DiscImageChef.Core/Filesystems.cs +++ b/DiscImageChef.Core/Filesystems.cs @@ -33,7 +33,7 @@ using System.Collections.Generic; using System.Linq; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Core { diff --git a/DiscImageChef.Core/ImageFormat.cs b/DiscImageChef.Core/ImageFormat.cs index 74f9e1024..25514f182 100644 --- a/DiscImageChef.Core/ImageFormat.cs +++ b/DiscImageChef.Core/ImageFormat.cs @@ -32,9 +32,9 @@ using System; using System.Linq; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; -using DiscImageChef.Filters; namespace DiscImageChef.Core { diff --git a/DiscImageChef.Core/ImageInfo.cs b/DiscImageChef.Core/ImageInfo.cs index 4e904ced7..cf6686f5b 100644 --- a/DiscImageChef.Core/ImageInfo.cs +++ b/DiscImageChef.Core/ImageInfo.cs @@ -33,6 +33,9 @@ using System; using System.Linq; using System.Text; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders.ATA; using DiscImageChef.Decoders.Bluray; @@ -41,11 +44,10 @@ using DiscImageChef.Decoders.DVD; using DiscImageChef.Decoders.PCMCIA; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Decoders.Xbox; -using DiscImageChef.DiscImages; using Schemas; using DDS = DiscImageChef.Decoders.DVD.DDS; using DMI = DiscImageChef.Decoders.Xbox.DMI; -using Session = DiscImageChef.DiscImages.Session; +using Session = DiscImageChef.CommonTypes.Structs.Session; using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple; namespace DiscImageChef.Core diff --git a/DiscImageChef.Core/Logging/DumpLog.cs b/DiscImageChef.Core/Logging/DumpLog.cs index d82869971..b14ad58d9 100644 --- a/DiscImageChef.Core/Logging/DumpLog.cs +++ b/DiscImageChef.Core/Logging/DumpLog.cs @@ -33,10 +33,10 @@ using System; using System.IO; using System.Reflection; +using DiscImageChef.CommonTypes.Interop; using DiscImageChef.Devices; -using DiscImageChef.Interop; -using PlatformID = DiscImageChef.Interop.PlatformID; -using Version = DiscImageChef.Interop.Version; +using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; +using Version = DiscImageChef.CommonTypes.Interop.Version; namespace DiscImageChef.Core.Logging { diff --git a/DiscImageChef.Core/Partitions.cs b/DiscImageChef.Core/Partitions.cs index dff44e801..d5815ddc4 100644 --- a/DiscImageChef.Core/Partitions.cs +++ b/DiscImageChef.Core/Partitions.cs @@ -33,8 +33,8 @@ using System.Collections.Generic; using System.Linq; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using DiscImageChef.Partitions; namespace DiscImageChef.Core diff --git a/DiscImageChef.Core/Remote.cs b/DiscImageChef.Core/Remote.cs index 50456bb95..23fd27da4 100644 --- a/DiscImageChef.Core/Remote.cs +++ b/DiscImageChef.Core/Remote.cs @@ -35,8 +35,8 @@ using System.IO; using System.Net; using System.Threading; using System.Xml.Serialization; -using DiscImageChef.Metadata; -using Version = DiscImageChef.Interop.Version; +using DiscImageChef.CommonTypes.Metadata; +using Version = DiscImageChef.CommonTypes.Metadata.Version; namespace DiscImageChef.Core { diff --git a/DiscImageChef.Core/Sidecar/AudioMedia.cs b/DiscImageChef.Core/Sidecar/AudioMedia.cs index e0764c8b6..64b492da2 100644 --- a/DiscImageChef.Core/Sidecar/AudioMedia.cs +++ b/DiscImageChef.Core/Sidecar/AudioMedia.cs @@ -34,7 +34,8 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Core diff --git a/DiscImageChef.Core/Sidecar/BlockMedia.cs b/DiscImageChef.Core/Sidecar/BlockMedia.cs index 5c5475ca2..0ea0b797a 100644 --- a/DiscImageChef.Core/Sidecar/BlockMedia.cs +++ b/DiscImageChef.Core/Sidecar/BlockMedia.cs @@ -36,15 +36,16 @@ using System.IO; using System.Linq; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Decoders.ATA; using DiscImageChef.Decoders.PCMCIA; using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; using DiscImageChef.Filters; -using DiscImageChef.Metadata; using Schemas; -using MediaType = DiscImageChef.Metadata.MediaType; +using MediaType = DiscImageChef.CommonTypes.Metadata.MediaType; using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple; namespace DiscImageChef.Core diff --git a/DiscImageChef.Core/Sidecar/LinearMedia.cs b/DiscImageChef.Core/Sidecar/LinearMedia.cs index 73e264e74..5a9c9ca74 100644 --- a/DiscImageChef.Core/Sidecar/LinearMedia.cs +++ b/DiscImageChef.Core/Sidecar/LinearMedia.cs @@ -34,7 +34,8 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Core diff --git a/DiscImageChef.Core/Sidecar/OpticalDisc.cs b/DiscImageChef.Core/Sidecar/OpticalDisc.cs index 2aa196b38..5d1fc09e4 100644 --- a/DiscImageChef.Core/Sidecar/OpticalDisc.cs +++ b/DiscImageChef.Core/Sidecar/OpticalDisc.cs @@ -36,15 +36,16 @@ using System.IO; using System.Linq; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Decoders.CD; using DiscImageChef.Decoders.DVD; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; -using DiscImageChef.Metadata; using Schemas; using DMI = DiscImageChef.Decoders.Xbox.DMI; using MediaType = DiscImageChef.CommonTypes.MediaType; -using Session = DiscImageChef.DiscImages.Session; +using Session = DiscImageChef.CommonTypes.Structs.Session; using TrackType = Schemas.TrackType; namespace DiscImageChef.Core @@ -360,22 +361,22 @@ namespace DiscImageChef.Core TrackType xmlTrk = new TrackType(); switch(trk.TrackType) { - case DiscImages.TrackType.Audio: + case CommonTypes.Enums.TrackType.Audio: xmlTrk.TrackType1 = TrackTypeTrackType.audio; break; - case DiscImages.TrackType.CdMode2Form2: + case CommonTypes.Enums.TrackType.CdMode2Form2: xmlTrk.TrackType1 = TrackTypeTrackType.m2f2; break; - case DiscImages.TrackType.CdMode2Formless: + case CommonTypes.Enums.TrackType.CdMode2Formless: xmlTrk.TrackType1 = TrackTypeTrackType.mode2; break; - case DiscImages.TrackType.CdMode2Form1: + case CommonTypes.Enums.TrackType.CdMode2Form1: xmlTrk.TrackType1 = TrackTypeTrackType.m2f1; break; - case DiscImages.TrackType.CdMode1: + case CommonTypes.Enums.TrackType.CdMode1: xmlTrk.TrackType1 = TrackTypeTrackType.mode1; break; - case DiscImages.TrackType.Data: + case CommonTypes.Enums.TrackType.Data: switch(sidecar.OpticalDisc[0].DiscType) { case "BD": @@ -681,7 +682,7 @@ namespace DiscImageChef.Core dskType = MediaType.XGD3; } - Metadata.MediaType.MediaTypeToString(dskType, out string dscType, out string dscSubType); + CommonTypes.Metadata.MediaType.MediaTypeToString(dskType, out string dscType, out string dscSubType); sidecar.OpticalDisc[0].DiscType = dscType; sidecar.OpticalDisc[0].DiscSubType = dscSubType; Statistics.AddMedia(dskType, false); diff --git a/DiscImageChef.Core/Sidecar/Sidecar.cs b/DiscImageChef.Core/Sidecar/Sidecar.cs index f7a95ad09..f5a1352e9 100644 --- a/DiscImageChef.Core/Sidecar/Sidecar.cs +++ b/DiscImageChef.Core/Sidecar/Sidecar.cs @@ -34,7 +34,9 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Core diff --git a/DiscImageChef.Core/Statistics.cs b/DiscImageChef.Core/Statistics.cs index d99dc94ec..482cf29b3 100644 --- a/DiscImageChef.Core/Statistics.cs +++ b/DiscImageChef.Core/Statistics.cs @@ -37,11 +37,11 @@ using System.Linq; using System.Net; using System.Threading; using System.Xml.Serialization; +using DiscImageChef.CommonTypes.Interop; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Devices; -using DiscImageChef.Interop; -using DiscImageChef.Metadata; using MediaType = DiscImageChef.CommonTypes.MediaType; -using Version = DiscImageChef.Interop.Version; +using Version = DiscImageChef.CommonTypes.Interop.Version; namespace DiscImageChef.Core { diff --git a/DiscImageChef.Devices/Command.cs b/DiscImageChef.Devices/Command.cs index 2454651b3..20e268513 100644 --- a/DiscImageChef.Devices/Command.cs +++ b/DiscImageChef.Devices/Command.cs @@ -31,12 +31,12 @@ // ****************************************************************************/ using System; +using DiscImageChef.CommonTypes.Interop; using DiscImageChef.Decoders.ATA; using DiscImageChef.Devices.FreeBSD; using DiscImageChef.Devices.Windows; -using DiscImageChef.Interop; using Microsoft.Win32.SafeHandles; -using PlatformID = DiscImageChef.Interop.PlatformID; +using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; namespace DiscImageChef.Devices { diff --git a/DiscImageChef.Devices/Device/Constructor.cs b/DiscImageChef.Devices/Device/Constructor.cs index a9d074505..6d2f8fa39 100644 --- a/DiscImageChef.Devices/Device/Constructor.cs +++ b/DiscImageChef.Devices/Device/Constructor.cs @@ -35,13 +35,13 @@ using System.Globalization; using System.IO; using System.Linq; using System.Runtime.InteropServices; +using DiscImageChef.CommonTypes.Interop; using DiscImageChef.Console; using DiscImageChef.Decoders.ATA; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Decoders.SecureDigital; using DiscImageChef.Devices.FreeBSD; using DiscImageChef.Devices.Windows; -using DiscImageChef.Interop; using Microsoft.Win32.SafeHandles; using Extern = DiscImageChef.Devices.Windows.Extern; using FileAccess = DiscImageChef.Devices.Windows.FileAccess; @@ -49,7 +49,7 @@ using FileAttributes = DiscImageChef.Devices.Windows.FileAttributes; using FileFlags = DiscImageChef.Devices.Linux.FileFlags; using FileMode = DiscImageChef.Devices.Windows.FileMode; using FileShare = DiscImageChef.Devices.Windows.FileShare; -using PlatformID = DiscImageChef.Interop.PlatformID; +using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; using VendorString = DiscImageChef.Decoders.SecureDigital.VendorString; namespace DiscImageChef.Devices diff --git a/DiscImageChef.Devices/Device/Destructor.cs b/DiscImageChef.Devices/Device/Destructor.cs index 07b8b9828..64f5ae149 100644 --- a/DiscImageChef.Devices/Device/Destructor.cs +++ b/DiscImageChef.Devices/Device/Destructor.cs @@ -33,7 +33,7 @@ using System; using DiscImageChef.Devices.Windows; using Microsoft.Win32.SafeHandles; -using PlatformID = DiscImageChef.Interop.PlatformID; +using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; namespace DiscImageChef.Devices { diff --git a/DiscImageChef.Devices/Device/List.cs b/DiscImageChef.Devices/Device/List.cs index 736361d48..55ed3ca79 100644 --- a/DiscImageChef.Devices/Device/List.cs +++ b/DiscImageChef.Devices/Device/List.cs @@ -31,8 +31,8 @@ // ****************************************************************************/ using System; -using DiscImageChef.Interop; -using PlatformID = DiscImageChef.Interop.PlatformID; +using DiscImageChef.CommonTypes.Interop; +using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; namespace DiscImageChef.Devices { diff --git a/DiscImageChef.Devices/Device/ScsiCommands/SPC.cs b/DiscImageChef.Devices/Device/ScsiCommands/SPC.cs index 1824847d1..af0a04870 100644 --- a/DiscImageChef.Devices/Device/ScsiCommands/SPC.cs +++ b/DiscImageChef.Devices/Device/ScsiCommands/SPC.cs @@ -33,7 +33,7 @@ using System; using System.Diagnostics.CodeAnalysis; using DiscImageChef.Console; -using PlatformID = DiscImageChef.Interop.PlatformID; +using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; namespace DiscImageChef.Devices { diff --git a/DiscImageChef.Devices/Device/Variables.cs b/DiscImageChef.Devices/Device/Variables.cs index 97d91abb6..519ab2ae6 100644 --- a/DiscImageChef.Devices/Device/Variables.cs +++ b/DiscImageChef.Devices/Device/Variables.cs @@ -30,8 +30,8 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ +using DiscImageChef.CommonTypes.Interop; using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Interop; namespace DiscImageChef.Devices { diff --git a/DiscImageChef.Devices/DiscImageChef.Devices.csproj b/DiscImageChef.Devices/DiscImageChef.Devices.csproj index 6145169f5..e6dcfc7c2 100644 --- a/DiscImageChef.Devices/DiscImageChef.Devices.csproj +++ b/DiscImageChef.Devices/DiscImageChef.Devices.csproj @@ -115,10 +115,7 @@ - - {9183F2E0-A879-4F23-9EE3-C6908F1332B2} - DiscImageChef.Interop - + {CCAA7AFE-C094-4D82-A66D-630DE8A3F545} DiscImageChef.Console diff --git a/DiscImageChef.Devices/Linux/Command.cs b/DiscImageChef.Devices/Linux/Command.cs index f54f08167..416020d19 100644 --- a/DiscImageChef.Devices/Linux/Command.cs +++ b/DiscImageChef.Devices/Linux/Command.cs @@ -34,8 +34,8 @@ using System; using System.Runtime.InteropServices; using System.Text; +using DiscImageChef.CommonTypes.Interop; using DiscImageChef.Decoders.ATA; -using DiscImageChef.Interop; namespace DiscImageChef.Devices.Linux { diff --git a/DiscImageChef.DiscImages/Alcohol120.cs b/DiscImageChef.DiscImages/Alcohol120.cs index e4db7d087..69794f1ff 100644 --- a/DiscImageChef.DiscImages/Alcohol120.cs +++ b/DiscImageChef.DiscImages/Alcohol120.cs @@ -39,12 +39,18 @@ using System.Runtime.InteropServices; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders.CD; using DiscImageChef.Decoders.DVD; using DiscImageChef.Filters; using Schemas; using DMI = DiscImageChef.Decoders.Xbox.DMI; +using Session = DiscImageChef.CommonTypes.Structs.Session; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.DiscImages/Anex86.cs b/DiscImageChef.DiscImages/Anex86.cs index e8e4facac..78a85a7b6 100644 --- a/DiscImageChef.DiscImages/Anex86.cs +++ b/DiscImageChef.DiscImages/Anex86.cs @@ -36,8 +36,11 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/Apple2MG.cs b/DiscImageChef.DiscImages/Apple2MG.cs index 7bc4d6a06..1c00ce193 100644 --- a/DiscImageChef.DiscImages/Apple2MG.cs +++ b/DiscImageChef.DiscImages/Apple2MG.cs @@ -38,6 +38,10 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Filters; using Schemas; diff --git a/DiscImageChef.DiscImages/AppleDOS.cs b/DiscImageChef.DiscImages/AppleDOS.cs index b2107d3c4..5b12f4afc 100644 --- a/DiscImageChef.DiscImages/AppleDOS.cs +++ b/DiscImageChef.DiscImages/AppleDOS.cs @@ -34,7 +34,10 @@ using System; using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; -using DiscImageChef.Filters; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/AppleNIB.cs b/DiscImageChef.DiscImages/AppleNIB.cs index 68fb167c6..2380a0b07 100644 --- a/DiscImageChef.DiscImages/AppleNIB.cs +++ b/DiscImageChef.DiscImages/AppleNIB.cs @@ -35,9 +35,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders.Floppy; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/Apridisk.cs b/DiscImageChef.DiscImages/Apridisk.cs index 6e56163db..bebf6c2b4 100644 --- a/DiscImageChef.DiscImages/Apridisk.cs +++ b/DiscImageChef.DiscImages/Apridisk.cs @@ -37,8 +37,11 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/BLU.cs b/DiscImageChef.DiscImages/BLU.cs index 055479c59..02a7b9714 100644 --- a/DiscImageChef.DiscImages/BLU.cs +++ b/DiscImageChef.DiscImages/BLU.cs @@ -36,11 +36,14 @@ using System.IO; using System.Linq; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders; -using DiscImageChef.Filters; using Schemas; -using Version = DiscImageChef.Interop.Version; +using Version = DiscImageChef.CommonTypes.Interop.Version; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.DiscImages/BlindWrite4.cs b/DiscImageChef.DiscImages/BlindWrite4.cs index fb0d05ac5..4aa0452c4 100644 --- a/DiscImageChef.DiscImages/BlindWrite4.cs +++ b/DiscImageChef.DiscImages/BlindWrite4.cs @@ -39,9 +39,14 @@ using System.Runtime.InteropServices; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Filters; using Schemas; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.DiscImages/BlindWrite5.cs b/DiscImageChef.DiscImages/BlindWrite5.cs index 12af20baf..937e10095 100644 --- a/DiscImageChef.DiscImages/BlindWrite5.cs +++ b/DiscImageChef.DiscImages/BlindWrite5.cs @@ -39,6 +39,10 @@ using System.Runtime.InteropServices; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders.CD; using DiscImageChef.Decoders.DVD; @@ -47,6 +51,8 @@ using DiscImageChef.Decoders.SCSI.MMC; using DiscImageChef.Filters; using Schemas; using DMI = DiscImageChef.Decoders.Xbox.DMI; +using Session = DiscImageChef.CommonTypes.Structs.Session; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.DiscImages/CDRDAO.cs b/DiscImageChef.DiscImages/CDRDAO.cs index 597340d72..7ac6cb3ca 100644 --- a/DiscImageChef.DiscImages/CDRDAO.cs +++ b/DiscImageChef.DiscImages/CDRDAO.cs @@ -39,9 +39,14 @@ using System.Text; using System.Text.RegularExpressions; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Filters; using Schemas; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.DiscImages/CDRWin.cs b/DiscImageChef.DiscImages/CDRWin.cs index bb32c7862..a48faac48 100644 --- a/DiscImageChef.DiscImages/CDRWin.cs +++ b/DiscImageChef.DiscImages/CDRWin.cs @@ -38,9 +38,14 @@ using System.Text; using System.Text.RegularExpressions; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Filters; using Schemas; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.DiscImages/CHD.cs b/DiscImageChef.DiscImages/CHD.cs index 904dbebfc..b1087b59c 100644 --- a/DiscImageChef.DiscImages/CHD.cs +++ b/DiscImageChef.DiscImages/CHD.cs @@ -39,12 +39,16 @@ using System.Text; using System.Text.RegularExpressions; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders.ATA; -using DiscImageChef.Filters; using Schemas; using SharpCompress.Compressors; using SharpCompress.Compressors.Deflate; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.DiscImages/CPCDSK.cs b/DiscImageChef.DiscImages/CPCDSK.cs index a0648368e..01d2c38bc 100644 --- a/DiscImageChef.DiscImages/CPCDSK.cs +++ b/DiscImageChef.DiscImages/CPCDSK.cs @@ -37,9 +37,12 @@ using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders.Floppy; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/CisCopy.cs b/DiscImageChef.DiscImages/CisCopy.cs index 111f3e5d2..2e55799fc 100644 --- a/DiscImageChef.DiscImages/CisCopy.cs +++ b/DiscImageChef.DiscImages/CisCopy.cs @@ -36,8 +36,11 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/CloneCD.cs b/DiscImageChef.DiscImages/CloneCD.cs index 13c074429..f693929fa 100644 --- a/DiscImageChef.DiscImages/CloneCD.cs +++ b/DiscImageChef.DiscImages/CloneCD.cs @@ -38,10 +38,16 @@ using System.Text; using System.Text.RegularExpressions; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders.CD; using DiscImageChef.Filters; using Schemas; +using Session = DiscImageChef.CommonTypes.Structs.Session; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.DiscImages/CopyQM.cs b/DiscImageChef.DiscImages/CopyQM.cs index c1d40cb04..1a8b14fb6 100644 --- a/DiscImageChef.DiscImages/CopyQM.cs +++ b/DiscImageChef.DiscImages/CopyQM.cs @@ -35,8 +35,11 @@ using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/D88.cs b/DiscImageChef.DiscImages/D88.cs index 106a03eff..90d352b7f 100644 --- a/DiscImageChef.DiscImages/D88.cs +++ b/DiscImageChef.DiscImages/D88.cs @@ -37,9 +37,12 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders.Floppy; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/DART.cs b/DiscImageChef.DiscImages/DART.cs index 408e80c2a..acba2c5be 100644 --- a/DiscImageChef.DiscImages/DART.cs +++ b/DiscImageChef.DiscImages/DART.cs @@ -38,9 +38,12 @@ using System.Text; using System.Text.RegularExpressions; using Claunia.RsrcFork; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Compression; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; using Version = Resources.Version; diff --git a/DiscImageChef.DiscImages/DIM.cs b/DiscImageChef.DiscImages/DIM.cs index 63f4ea370..ae8fe3248 100644 --- a/DiscImageChef.DiscImages/DIM.cs +++ b/DiscImageChef.DiscImages/DIM.cs @@ -36,8 +36,11 @@ using System.IO; using System.Linq; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/DiscFerret.cs b/DiscImageChef.DiscImages/DiscFerret.cs index 6ba46abb6..67faefc24 100644 --- a/DiscImageChef.DiscImages/DiscFerret.cs +++ b/DiscImageChef.DiscImages/DiscFerret.cs @@ -35,8 +35,11 @@ using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj b/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj index 395aece48..4261ff48e 100644 --- a/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj +++ b/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj @@ -59,19 +59,12 @@ - - - - - - - @@ -146,14 +139,6 @@ {D571B8EF-903D-4353-BDD5-B834F9F029EF} DiscImageChef.Filters - - {9183f2e0-a879-4f23-9ee3-c6908f1332b2} - DiscImageChef.Interop - - - {9F213318-5CB8-4066-A757-074489C9F818} - DiscImageChef.Metadata - diff --git a/DiscImageChef.DiscImages/DiscImageChef.cs b/DiscImageChef.DiscImages/DiscImageChef.cs index e1e9237e5..134c1fc69 100644 --- a/DiscImageChef.DiscImages/DiscImageChef.cs +++ b/DiscImageChef.DiscImages/DiscImageChef.cs @@ -81,14 +81,18 @@ using CUETools.Codecs; using CUETools.Codecs.FLAKE; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders; using DiscImageChef.Decoders.ATA; using DiscImageChef.Decoders.SCSI; using DiscImageChef.Decoders.SecureDigital; -using DiscImageChef.Filters; using Schemas; using SharpCompress.Compressors.LZMA; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; using VendorString = DiscImageChef.Decoders.SecureDigital.VendorString; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/DiscJuggler.cs b/DiscImageChef.DiscImages/DiscJuggler.cs index 871a71f0e..68d50189f 100644 --- a/DiscImageChef.DiscImages/DiscJuggler.cs +++ b/DiscImageChef.DiscImages/DiscJuggler.cs @@ -37,9 +37,13 @@ using System.Linq; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.DiscImages/DiskCopy42.cs b/DiscImageChef.DiscImages/DiskCopy42.cs index 39cb5e159..4ca74c448 100644 --- a/DiscImageChef.DiscImages/DiskCopy42.cs +++ b/DiscImageChef.DiscImages/DiskCopy42.cs @@ -38,8 +38,11 @@ using System.Text.RegularExpressions; using Claunia.Encoding; using Claunia.RsrcFork; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; using Encoding = System.Text.Encoding; using Version = Resources.Version; diff --git a/DiscImageChef.DiscImages/DriDiskCopy.cs b/DiscImageChef.DiscImages/DriDiskCopy.cs index fc2c75fae..87c709641 100644 --- a/DiscImageChef.DiscImages/DriDiskCopy.cs +++ b/DiscImageChef.DiscImages/DriDiskCopy.cs @@ -39,8 +39,11 @@ using System.Runtime.InteropServices; using System.Text; using System.Text.RegularExpressions; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/GDI.cs b/DiscImageChef.DiscImages/GDI.cs index 20fcac6fb..b0987baab 100644 --- a/DiscImageChef.DiscImages/GDI.cs +++ b/DiscImageChef.DiscImages/GDI.cs @@ -37,9 +37,14 @@ using System.Linq; using System.Text.RegularExpressions; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Filters; using Schemas; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.DiscImages/HDCopy.cs b/DiscImageChef.DiscImages/HDCopy.cs index dfa411abc..c56e0dcb0 100644 --- a/DiscImageChef.DiscImages/HDCopy.cs +++ b/DiscImageChef.DiscImages/HDCopy.cs @@ -68,8 +68,11 @@ using System.Collections.Generic; using System.IO; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/IMD.cs b/DiscImageChef.DiscImages/IMD.cs index b261fa79a..a9278864d 100644 --- a/DiscImageChef.DiscImages/IMD.cs +++ b/DiscImageChef.DiscImages/IMD.cs @@ -36,8 +36,11 @@ using System.IO; using System.Text; using System.Text.RegularExpressions; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/KryoFlux.cs b/DiscImageChef.DiscImages/KryoFlux.cs index c6a8e163d..0001eb1d8 100644 --- a/DiscImageChef.DiscImages/KryoFlux.cs +++ b/DiscImageChef.DiscImages/KryoFlux.cs @@ -38,6 +38,10 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Filters; using Schemas; diff --git a/DiscImageChef.DiscImages/MaxiDisk.cs b/DiscImageChef.DiscImages/MaxiDisk.cs index 724a0b555..739bcf606 100644 --- a/DiscImageChef.DiscImages/MaxiDisk.cs +++ b/DiscImageChef.DiscImages/MaxiDisk.cs @@ -36,8 +36,11 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using DiscImageChef.Helpers; using Schemas; diff --git a/DiscImageChef.DiscImages/NDIF.cs b/DiscImageChef.DiscImages/NDIF.cs index e935a0cba..ac0e00a0f 100644 --- a/DiscImageChef.DiscImages/NDIF.cs +++ b/DiscImageChef.DiscImages/NDIF.cs @@ -38,9 +38,12 @@ using System.Runtime.InteropServices; using System.Text; using Claunia.RsrcFork; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Compression; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; using SharpCompress.Compressors.ADC; using Version = Resources.Version; diff --git a/DiscImageChef.DiscImages/NHDr0.cs b/DiscImageChef.DiscImages/NHDr0.cs index 0127eb111..5cfc75528 100644 --- a/DiscImageChef.DiscImages/NHDr0.cs +++ b/DiscImageChef.DiscImages/NHDr0.cs @@ -37,8 +37,11 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/Nero.cs b/DiscImageChef.DiscImages/Nero.cs index 59e318e00..741a86507 100644 --- a/DiscImageChef.DiscImages/Nero.cs +++ b/DiscImageChef.DiscImages/Nero.cs @@ -38,9 +38,13 @@ using System.Linq; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; #pragma warning disable 414 #pragma warning disable 169 diff --git a/DiscImageChef.DiscImages/Parallels.cs b/DiscImageChef.DiscImages/Parallels.cs index 18b6979a7..e15cc46cd 100644 --- a/DiscImageChef.DiscImages/Parallels.cs +++ b/DiscImageChef.DiscImages/Parallels.cs @@ -36,8 +36,11 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/PartClone.cs b/DiscImageChef.DiscImages/PartClone.cs index 22e0d8827..98e4f3497 100644 --- a/DiscImageChef.DiscImages/PartClone.cs +++ b/DiscImageChef.DiscImages/PartClone.cs @@ -36,9 +36,12 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Extents; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; -using Extents; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/Partimage.cs b/DiscImageChef.DiscImages/Partimage.cs index fcf2ef344..8dc9fb988 100644 --- a/DiscImageChef.DiscImages/Partimage.cs +++ b/DiscImageChef.DiscImages/Partimage.cs @@ -36,9 +36,12 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Extents; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; -using Extents; using Schemas; #pragma warning disable 649 diff --git a/DiscImageChef.DiscImages/QCOW.cs b/DiscImageChef.DiscImages/QCOW.cs index e78dec2c7..195eb3d59 100644 --- a/DiscImageChef.DiscImages/QCOW.cs +++ b/DiscImageChef.DiscImages/QCOW.cs @@ -36,8 +36,11 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; using SharpCompress.Compressors; using SharpCompress.Compressors.Deflate; diff --git a/DiscImageChef.DiscImages/QCOW2.cs b/DiscImageChef.DiscImages/QCOW2.cs index 33214841f..b0993c715 100644 --- a/DiscImageChef.DiscImages/QCOW2.cs +++ b/DiscImageChef.DiscImages/QCOW2.cs @@ -36,8 +36,11 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; using SharpCompress.Compressors; using SharpCompress.Compressors.Deflate; diff --git a/DiscImageChef.DiscImages/QED.cs b/DiscImageChef.DiscImages/QED.cs index 2a6d3882b..886808053 100644 --- a/DiscImageChef.DiscImages/QED.cs +++ b/DiscImageChef.DiscImages/QED.cs @@ -36,8 +36,11 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/RayDIM.cs b/DiscImageChef.DiscImages/RayDIM.cs index e2cbd2146..ec2d0ad56 100644 --- a/DiscImageChef.DiscImages/RayDIM.cs +++ b/DiscImageChef.DiscImages/RayDIM.cs @@ -39,8 +39,11 @@ using System.Runtime.InteropServices; using System.Text; using System.Text.RegularExpressions; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/RsIde.cs b/DiscImageChef.DiscImages/RsIde.cs index 644f8630c..a4491c1e4 100644 --- a/DiscImageChef.DiscImages/RsIde.cs +++ b/DiscImageChef.DiscImages/RsIde.cs @@ -37,10 +37,13 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.Filters; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using Schemas; using static DiscImageChef.Decoders.ATA.Identify; -using Version = DiscImageChef.Interop.Version; +using Version = DiscImageChef.CommonTypes.Interop.Version; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.DiscImages/SaveDskF.cs b/DiscImageChef.DiscImages/SaveDskF.cs index b52a3547f..21544d43f 100644 --- a/DiscImageChef.DiscImages/SaveDskF.cs +++ b/DiscImageChef.DiscImages/SaveDskF.cs @@ -37,8 +37,11 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/SuperCardPro.cs b/DiscImageChef.DiscImages/SuperCardPro.cs index e2baa0fad..944d9a2c2 100644 --- a/DiscImageChef.DiscImages/SuperCardPro.cs +++ b/DiscImageChef.DiscImages/SuperCardPro.cs @@ -37,8 +37,11 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/T98.cs b/DiscImageChef.DiscImages/T98.cs index 7073eaae3..9263d31e4 100644 --- a/DiscImageChef.DiscImages/T98.cs +++ b/DiscImageChef.DiscImages/T98.cs @@ -35,8 +35,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/TeleDisk.cs b/DiscImageChef.DiscImages/TeleDisk.cs index 6b2eaea8f..e8da73657 100644 --- a/DiscImageChef.DiscImages/TeleDisk.cs +++ b/DiscImageChef.DiscImages/TeleDisk.cs @@ -35,9 +35,12 @@ using System.Collections.Generic; using System.IO; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Compression; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/UDIF.cs b/DiscImageChef.DiscImages/UDIF.cs index 40af6c9e7..d77567b88 100644 --- a/DiscImageChef.DiscImages/UDIF.cs +++ b/DiscImageChef.DiscImages/UDIF.cs @@ -40,9 +40,12 @@ using Claunia.PropertyList; using Claunia.RsrcFork; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Compression; using DiscImageChef.Console; -using DiscImageChef.Filters; using Ionic.Zlib; using Schemas; using SharpCompress.Compressors.ADC; diff --git a/DiscImageChef.DiscImages/UkvFdi.cs b/DiscImageChef.DiscImages/UkvFdi.cs index 5fd063f5b..53a84ee2d 100644 --- a/DiscImageChef.DiscImages/UkvFdi.cs +++ b/DiscImageChef.DiscImages/UkvFdi.cs @@ -36,8 +36,11 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/VDI.cs b/DiscImageChef.DiscImages/VDI.cs index b38100e9d..c22662219 100644 --- a/DiscImageChef.DiscImages/VDI.cs +++ b/DiscImageChef.DiscImages/VDI.cs @@ -36,8 +36,11 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/VHD.cs b/DiscImageChef.DiscImages/VHD.cs index e409c2c2a..da84f26bc 100644 --- a/DiscImageChef.DiscImages/VHD.cs +++ b/DiscImageChef.DiscImages/VHD.cs @@ -38,11 +38,15 @@ using System.Runtime.InteropServices; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Interop; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Filters; -using DiscImageChef.Interop; using Schemas; -using PlatformID = DiscImageChef.Interop.PlatformID; +using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; using Version = System.Version; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/VHDX.cs b/DiscImageChef.DiscImages/VHDX.cs index 1b557c6fa..b5cd5d22d 100644 --- a/DiscImageChef.DiscImages/VHDX.cs +++ b/DiscImageChef.DiscImages/VHDX.cs @@ -37,6 +37,10 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Filters; using Schemas; diff --git a/DiscImageChef.DiscImages/VMware.cs b/DiscImageChef.DiscImages/VMware.cs index 180f1ed19..fed2ee5be 100644 --- a/DiscImageChef.DiscImages/VMware.cs +++ b/DiscImageChef.DiscImages/VMware.cs @@ -38,6 +38,10 @@ using System.Runtime.InteropServices; using System.Text; using System.Text.RegularExpressions; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Filters; using Schemas; diff --git a/DiscImageChef.DiscImages/Virtual98.cs b/DiscImageChef.DiscImages/Virtual98.cs index 0d2a83f08..d1be8de92 100644 --- a/DiscImageChef.DiscImages/Virtual98.cs +++ b/DiscImageChef.DiscImages/Virtual98.cs @@ -37,8 +37,11 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.Filters; using Schemas; namespace DiscImageChef.DiscImages diff --git a/DiscImageChef.DiscImages/ZZZRawImage.cs b/DiscImageChef.DiscImages/ZZZRawImage.cs index 715c7a06d..e1d8c5906 100644 --- a/DiscImageChef.DiscImages/ZZZRawImage.cs +++ b/DiscImageChef.DiscImages/ZZZRawImage.cs @@ -37,6 +37,10 @@ using System.Linq; using System.Xml.Serialization; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Exceptions; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders.ATA; using DiscImageChef.Decoders.CD; @@ -45,6 +49,8 @@ using DiscImageChef.Decoders.SCSI; using DiscImageChef.Filters; using Schemas; using DMI = DiscImageChef.Decoders.Xbox.DMI; +using Session = DiscImageChef.CommonTypes.Structs.Session; +using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.DiscImages { diff --git a/DiscImageChef.Filesystems/AODOS.cs b/DiscImageChef.Filesystems/AODOS.cs index 936e87fb7..8b8a122be 100644 --- a/DiscImageChef.Filesystems/AODOS.cs +++ b/DiscImageChef.Filesystems/AODOS.cs @@ -35,7 +35,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/APFS.cs b/DiscImageChef.Filesystems/APFS.cs index b786dd336..7dfd706d6 100644 --- a/DiscImageChef.Filesystems/APFS.cs +++ b/DiscImageChef.Filesystems/APFS.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/Acorn.cs b/DiscImageChef.Filesystems/Acorn.cs index 7a571356c..50f2c5b95 100644 --- a/DiscImageChef.Filesystems/Acorn.cs +++ b/DiscImageChef.Filesystems/Acorn.cs @@ -35,8 +35,8 @@ using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/AmigaDOS.cs b/DiscImageChef.Filesystems/AmigaDOS.cs index 5d81276f7..ab6773b9e 100644 --- a/DiscImageChef.Filesystems/AmigaDOS.cs +++ b/DiscImageChef.Filesystems/AmigaDOS.cs @@ -36,8 +36,8 @@ using System.Runtime.InteropServices; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs b/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs index 398302074..adfdf820d 100644 --- a/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs +++ b/DiscImageChef.Filesystems/AppleDOS/AppleDOS.cs @@ -33,7 +33,7 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems.AppleDOS diff --git a/DiscImageChef.Filesystems/AppleDOS/Dir.cs b/DiscImageChef.Filesystems/AppleDOS/Dir.cs index af9b641f0..858004f93 100644 --- a/DiscImageChef.Filesystems/AppleDOS/Dir.cs +++ b/DiscImageChef.Filesystems/AppleDOS/Dir.cs @@ -35,6 +35,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; +using DiscImageChef.CommonTypes.Structs; namespace DiscImageChef.Filesystems.AppleDOS { diff --git a/DiscImageChef.Filesystems/AppleDOS/File.cs b/DiscImageChef.Filesystems/AppleDOS/File.cs index cb7b15bf5..3564e9214 100644 --- a/DiscImageChef.Filesystems/AppleDOS/File.cs +++ b/DiscImageChef.Filesystems/AppleDOS/File.cs @@ -35,6 +35,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; +using DiscImageChef.CommonTypes.Structs; +using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; namespace DiscImageChef.Filesystems.AppleDOS { diff --git a/DiscImageChef.Filesystems/AppleDOS/Info.cs b/DiscImageChef.Filesystems/AppleDOS/Info.cs index 072a09c4b..448f1813f 100644 --- a/DiscImageChef.Filesystems/AppleDOS/Info.cs +++ b/DiscImageChef.Filesystems/AppleDOS/Info.cs @@ -35,7 +35,7 @@ using System.Runtime.InteropServices; using System.Text; using Claunia.Encoding; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; using Encoding = System.Text.Encoding; diff --git a/DiscImageChef.Filesystems/AppleDOS/Super.cs b/DiscImageChef.Filesystems/AppleDOS/Super.cs index 514d2e1f8..3b7c02c6e 100644 --- a/DiscImageChef.Filesystems/AppleDOS/Super.cs +++ b/DiscImageChef.Filesystems/AppleDOS/Super.cs @@ -35,8 +35,9 @@ using System.Collections.Generic; using System.Runtime.InteropServices; using Claunia.Encoding; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; using Encoding = System.Text.Encoding; diff --git a/DiscImageChef.Filesystems/AppleDOS/Xattr.cs b/DiscImageChef.Filesystems/AppleDOS/Xattr.cs index 524dfdd26..9c988a1da 100644 --- a/DiscImageChef.Filesystems/AppleDOS/Xattr.cs +++ b/DiscImageChef.Filesystems/AppleDOS/Xattr.cs @@ -32,6 +32,7 @@ using System; using System.Collections.Generic; +using DiscImageChef.CommonTypes.Structs; namespace DiscImageChef.Filesystems.AppleDOS { diff --git a/DiscImageChef.Filesystems/AppleHFS.cs b/DiscImageChef.Filesystems/AppleHFS.cs index 93c7f6e5c..64a25ea5f 100644 --- a/DiscImageChef.Filesystems/AppleHFS.cs +++ b/DiscImageChef.Filesystems/AppleHFS.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/AppleHFSPlus.cs b/DiscImageChef.Filesystems/AppleHFSPlus.cs index a73a4a005..348dc5ac5 100644 --- a/DiscImageChef.Filesystems/AppleHFSPlus.cs +++ b/DiscImageChef.Filesystems/AppleHFSPlus.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs b/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs index c484ab7e0..bb221d4f2 100644 --- a/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs +++ b/DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs @@ -33,7 +33,7 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems.AppleMFS diff --git a/DiscImageChef.Filesystems/AppleMFS/Dir.cs b/DiscImageChef.Filesystems/AppleMFS/Dir.cs index f1def39db..f8802bfa9 100644 --- a/DiscImageChef.Filesystems/AppleMFS/Dir.cs +++ b/DiscImageChef.Filesystems/AppleMFS/Dir.cs @@ -33,6 +33,7 @@ using System; using System.Collections.Generic; using System.Linq; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; namespace DiscImageChef.Filesystems.AppleMFS diff --git a/DiscImageChef.Filesystems/AppleMFS/File.cs b/DiscImageChef.Filesystems/AppleMFS/File.cs index cc82b6d2a..a88240140 100644 --- a/DiscImageChef.Filesystems/AppleMFS/File.cs +++ b/DiscImageChef.Filesystems/AppleMFS/File.cs @@ -32,8 +32,10 @@ using System; using System.IO; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.DiscImages; +using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; namespace DiscImageChef.Filesystems.AppleMFS { diff --git a/DiscImageChef.Filesystems/AppleMFS/Info.cs b/DiscImageChef.Filesystems/AppleMFS/Info.cs index dcb2c9e09..9c24a7b01 100644 --- a/DiscImageChef.Filesystems/AppleMFS/Info.cs +++ b/DiscImageChef.Filesystems/AppleMFS/Info.cs @@ -34,7 +34,7 @@ using System; using System.Text; using Claunia.Encoding; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; using Encoding = System.Text.Encoding; diff --git a/DiscImageChef.Filesystems/AppleMFS/Super.cs b/DiscImageChef.Filesystems/AppleMFS/Super.cs index 4a334a3d8..e67c65aa1 100644 --- a/DiscImageChef.Filesystems/AppleMFS/Super.cs +++ b/DiscImageChef.Filesystems/AppleMFS/Super.cs @@ -34,7 +34,9 @@ using System; using System.Collections.Generic; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using Schemas; namespace DiscImageChef.Filesystems.AppleMFS diff --git a/DiscImageChef.Filesystems/AppleMFS/Xattr.cs b/DiscImageChef.Filesystems/AppleMFS/Xattr.cs index 8c9ba917f..121b30221 100644 --- a/DiscImageChef.Filesystems/AppleMFS/Xattr.cs +++ b/DiscImageChef.Filesystems/AppleMFS/Xattr.cs @@ -33,7 +33,8 @@ using System; using System.Collections.Generic; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Structs; namespace DiscImageChef.Filesystems.AppleMFS { diff --git a/DiscImageChef.Filesystems/AtheOS.cs b/DiscImageChef.Filesystems/AtheOS.cs index d217c871f..b2111f665 100644 --- a/DiscImageChef.Filesystems/AtheOS.cs +++ b/DiscImageChef.Filesystems/AtheOS.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/BFS.cs b/DiscImageChef.Filesystems/BFS.cs index 9fb928572..959918cd8 100644 --- a/DiscImageChef.Filesystems/BFS.cs +++ b/DiscImageChef.Filesystems/BFS.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/BTRFS.cs b/DiscImageChef.Filesystems/BTRFS.cs index 871ee452f..8b0ae710d 100644 --- a/DiscImageChef.Filesystems/BTRFS.cs +++ b/DiscImageChef.Filesystems/BTRFS.cs @@ -34,8 +34,8 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/CBM.cs b/DiscImageChef.Filesystems/CBM.cs index 338d20fb6..1dfb58d33 100644 --- a/DiscImageChef.Filesystems/CBM.cs +++ b/DiscImageChef.Filesystems/CBM.cs @@ -35,7 +35,7 @@ using System.Runtime.InteropServices; using System.Text; using Claunia.Encoding; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; using Encoding = System.Text.Encoding; diff --git a/DiscImageChef.Filesystems/CPM/CPM.cs b/DiscImageChef.Filesystems/CPM/CPM.cs index 1e1f64536..ef6b73b42 100644 --- a/DiscImageChef.Filesystems/CPM/CPM.cs +++ b/DiscImageChef.Filesystems/CPM/CPM.cs @@ -34,7 +34,8 @@ using System; using System.Collections.Generic; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using Schemas; namespace DiscImageChef.Filesystems.CPM diff --git a/DiscImageChef.Filesystems/CPM/Dir.cs b/DiscImageChef.Filesystems/CPM/Dir.cs index 006a7777b..6c524a251 100644 --- a/DiscImageChef.Filesystems/CPM/Dir.cs +++ b/DiscImageChef.Filesystems/CPM/Dir.cs @@ -34,6 +34,7 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; +using DiscImageChef.CommonTypes.Structs; namespace DiscImageChef.Filesystems.CPM { diff --git a/DiscImageChef.Filesystems/CPM/File.cs b/DiscImageChef.Filesystems/CPM/File.cs index 5de578d43..1b33f23f5 100644 --- a/DiscImageChef.Filesystems/CPM/File.cs +++ b/DiscImageChef.Filesystems/CPM/File.cs @@ -31,6 +31,7 @@ // ****************************************************************************/ using System; +using DiscImageChef.CommonTypes.Structs; namespace DiscImageChef.Filesystems.CPM { diff --git a/DiscImageChef.Filesystems/CPM/Info.cs b/DiscImageChef.Filesystems/CPM/Info.cs index 66e377720..82d1ce8f5 100644 --- a/DiscImageChef.Filesystems/CPM/Info.cs +++ b/DiscImageChef.Filesystems/CPM/Info.cs @@ -36,8 +36,8 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems.CPM diff --git a/DiscImageChef.Filesystems/CPM/Super.cs b/DiscImageChef.Filesystems/CPM/Super.cs index 301073759..391346152 100644 --- a/DiscImageChef.Filesystems/CPM/Super.cs +++ b/DiscImageChef.Filesystems/CPM/Super.cs @@ -39,9 +39,12 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; +using FileAttributes = DiscImageChef.CommonTypes.Structs.FileAttributes; +using FileSystemInfo = DiscImageChef.CommonTypes.Structs.FileSystemInfo; namespace DiscImageChef.Filesystems.CPM { diff --git a/DiscImageChef.Filesystems/CPM/Xattr.cs b/DiscImageChef.Filesystems/CPM/Xattr.cs index 95bce2868..68a614543 100644 --- a/DiscImageChef.Filesystems/CPM/Xattr.cs +++ b/DiscImageChef.Filesystems/CPM/Xattr.cs @@ -32,6 +32,7 @@ using System; using System.Collections.Generic; +using DiscImageChef.CommonTypes.Structs; namespace DiscImageChef.Filesystems.CPM { diff --git a/DiscImageChef.Filesystems/Cram.cs b/DiscImageChef.Filesystems/Cram.cs index e073018cb..20d695c5c 100644 --- a/DiscImageChef.Filesystems/Cram.cs +++ b/DiscImageChef.Filesystems/Cram.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj b/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj index 2bcf74336..ec41b2358 100644 --- a/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj +++ b/DiscImageChef.Filesystems/DiscImageChef.Filesystems.csproj @@ -53,7 +53,6 @@ - @@ -69,7 +68,6 @@ - @@ -80,7 +78,6 @@ - @@ -205,10 +202,6 @@ {CCAA7AFE-C094-4D82-A66D-630DE8A3F545} DiscImageChef.Console - - {9F213318-5CB8-4066-A757-074489C9F818} - DiscImageChef.Metadata - {0BEB3088-B634-4289-AE17-CDF2D25D00D5} DiscImageChef.Decoders diff --git a/DiscImageChef.Filesystems/ECMA67.cs b/DiscImageChef.Filesystems/ECMA67.cs index c131e91cb..9711b57b7 100644 --- a/DiscImageChef.Filesystems/ECMA67.cs +++ b/DiscImageChef.Filesystems/ECMA67.cs @@ -35,7 +35,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/EFS.cs b/DiscImageChef.Filesystems/EFS.cs index ad59467aa..333f18e60 100644 --- a/DiscImageChef.Filesystems/EFS.cs +++ b/DiscImageChef.Filesystems/EFS.cs @@ -35,8 +35,9 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/F2FS.cs b/DiscImageChef.Filesystems/F2FS.cs index 7516ab5fb..d88aae00f 100644 --- a/DiscImageChef.Filesystems/F2FS.cs +++ b/DiscImageChef.Filesystems/F2FS.cs @@ -35,7 +35,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/FAT.cs b/DiscImageChef.Filesystems/FAT.cs index 58e902a45..b20ce16cd 100644 --- a/DiscImageChef.Filesystems/FAT.cs +++ b/DiscImageChef.Filesystems/FAT.cs @@ -37,8 +37,9 @@ using System.Runtime.InteropServices; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using DiscImageChef.Helpers; using Schemas; diff --git a/DiscImageChef.Filesystems/FATX.cs b/DiscImageChef.Filesystems/FATX.cs index daa14b9f0..454f0f969 100644 --- a/DiscImageChef.Filesystems/FATX.cs +++ b/DiscImageChef.Filesystems/FATX.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/FFS.cs b/DiscImageChef.Filesystems/FFS.cs index 1d74a4e6d..8f859d56a 100644 --- a/DiscImageChef.Filesystems/FFS.cs +++ b/DiscImageChef.Filesystems/FFS.cs @@ -36,8 +36,8 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; using time_t = System.Int32; using ufs_daddr_t = System.Int32; diff --git a/DiscImageChef.Filesystems/Fossil.cs b/DiscImageChef.Filesystems/Fossil.cs index dae9cb63a..c0a32fc21 100644 --- a/DiscImageChef.Filesystems/Fossil.cs +++ b/DiscImageChef.Filesystems/Fossil.cs @@ -34,8 +34,8 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/HAMMER.cs b/DiscImageChef.Filesystems/HAMMER.cs index 16f63f2b7..6e54c39af 100644 --- a/DiscImageChef.Filesystems/HAMMER.cs +++ b/DiscImageChef.Filesystems/HAMMER.cs @@ -35,7 +35,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; using hammer_crc_t = System.UInt32; using hammer_off_t = System.UInt64; diff --git a/DiscImageChef.Filesystems/HPFS.cs b/DiscImageChef.Filesystems/HPFS.cs index 20d7e0bf6..9070561c8 100644 --- a/DiscImageChef.Filesystems/HPFS.cs +++ b/DiscImageChef.Filesystems/HPFS.cs @@ -35,7 +35,7 @@ using System.Runtime.InteropServices; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/HPOFS.cs b/DiscImageChef.Filesystems/HPOFS.cs index 24c13b0b1..31516aff2 100644 --- a/DiscImageChef.Filesystems/HPOFS.cs +++ b/DiscImageChef.Filesystems/HPOFS.cs @@ -36,8 +36,8 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/ISO9660/ISO9660.cs b/DiscImageChef.Filesystems/ISO9660/ISO9660.cs index 1c00d7847..eb39284de 100644 --- a/DiscImageChef.Filesystems/ISO9660/ISO9660.cs +++ b/DiscImageChef.Filesystems/ISO9660/ISO9660.cs @@ -32,6 +32,7 @@ using System; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems.ISO9660 diff --git a/DiscImageChef.Filesystems/ISO9660/Info.cs b/DiscImageChef.Filesystems/ISO9660/Info.cs index 0f360a3ae..c4b7ab88a 100644 --- a/DiscImageChef.Filesystems/ISO9660/Info.cs +++ b/DiscImageChef.Filesystems/ISO9660/Info.cs @@ -36,9 +36,9 @@ using System.Runtime.InteropServices; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; using DiscImageChef.Decoders.Sega; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems.ISO9660 diff --git a/DiscImageChef.Filesystems/JFS.cs b/DiscImageChef.Filesystems/JFS.cs index ab3ba55ea..e88b6cb74 100644 --- a/DiscImageChef.Filesystems/JFS.cs +++ b/DiscImageChef.Filesystems/JFS.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/LIF.cs b/DiscImageChef.Filesystems/LIF.cs index 57804b83b..94add877c 100644 --- a/DiscImageChef.Filesystems/LIF.cs +++ b/DiscImageChef.Filesystems/LIF.cs @@ -34,8 +34,8 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/LisaFS/Dir.cs b/DiscImageChef.Filesystems/LisaFS/Dir.cs index d437706e8..02d5fbbb4 100644 --- a/DiscImageChef.Filesystems/LisaFS/Dir.cs +++ b/DiscImageChef.Filesystems/LisaFS/Dir.cs @@ -33,8 +33,9 @@ using System; using System.Collections.Generic; using System.Linq; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Decoders; -using DiscImageChef.DiscImages; namespace DiscImageChef.Filesystems.LisaFS { diff --git a/DiscImageChef.Filesystems/LisaFS/Extent.cs b/DiscImageChef.Filesystems/LisaFS/Extent.cs index d23ff7b52..9f5bb1933 100644 --- a/DiscImageChef.Filesystems/LisaFS/Extent.cs +++ b/DiscImageChef.Filesystems/LisaFS/Extent.cs @@ -31,9 +31,10 @@ // ****************************************************************************/ using System; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders; -using DiscImageChef.DiscImages; namespace DiscImageChef.Filesystems.LisaFS { diff --git a/DiscImageChef.Filesystems/LisaFS/File.cs b/DiscImageChef.Filesystems/LisaFS/File.cs index 5c2dd2805..84e4d9951 100644 --- a/DiscImageChef.Filesystems/LisaFS/File.cs +++ b/DiscImageChef.Filesystems/LisaFS/File.cs @@ -31,9 +31,10 @@ // ****************************************************************************/ using System; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders; -using DiscImageChef.DiscImages; namespace DiscImageChef.Filesystems.LisaFS { diff --git a/DiscImageChef.Filesystems/LisaFS/Info.cs b/DiscImageChef.Filesystems/LisaFS/Info.cs index ddfa3920a..cbc683514 100644 --- a/DiscImageChef.Filesystems/LisaFS/Info.cs +++ b/DiscImageChef.Filesystems/LisaFS/Info.cs @@ -34,9 +34,10 @@ using System; using System.Text; using Claunia.Encoding; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; using DiscImageChef.Decoders; -using DiscImageChef.DiscImages; using Schemas; using Encoding = System.Text.Encoding; diff --git a/DiscImageChef.Filesystems/LisaFS/LisaFS.cs b/DiscImageChef.Filesystems/LisaFS/LisaFS.cs index 0514a2db5..bc0ca4792 100644 --- a/DiscImageChef.Filesystems/LisaFS/LisaFS.cs +++ b/DiscImageChef.Filesystems/LisaFS/LisaFS.cs @@ -33,7 +33,7 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems.LisaFS diff --git a/DiscImageChef.Filesystems/LisaFS/Super.cs b/DiscImageChef.Filesystems/LisaFS/Super.cs index 0aaace37c..2efed0ba5 100644 --- a/DiscImageChef.Filesystems/LisaFS/Super.cs +++ b/DiscImageChef.Filesystems/LisaFS/Super.cs @@ -34,9 +34,11 @@ using System; using System.Collections.Generic; using Claunia.Encoding; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Decoders; -using DiscImageChef.DiscImages; using Schemas; using Encoding = System.Text.Encoding; diff --git a/DiscImageChef.Filesystems/LisaFS/Xattr.cs b/DiscImageChef.Filesystems/LisaFS/Xattr.cs index aa51c8f4c..ac2de6b7b 100644 --- a/DiscImageChef.Filesystems/LisaFS/Xattr.cs +++ b/DiscImageChef.Filesystems/LisaFS/Xattr.cs @@ -34,6 +34,7 @@ using System; using System.Collections.Generic; using System.Text; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Decoders; namespace DiscImageChef.Filesystems.LisaFS diff --git a/DiscImageChef.Filesystems/Locus.cs b/DiscImageChef.Filesystems/Locus.cs index 3c647e86c..e6e3d214e 100644 --- a/DiscImageChef.Filesystems/Locus.cs +++ b/DiscImageChef.Filesystems/Locus.cs @@ -35,8 +35,8 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; // Commit count using commitcnt_t = System.Int32; diff --git a/DiscImageChef.Filesystems/MicroDOS.cs b/DiscImageChef.Filesystems/MicroDOS.cs index f9fc951cd..ecd85456f 100644 --- a/DiscImageChef.Filesystems/MicroDOS.cs +++ b/DiscImageChef.Filesystems/MicroDOS.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/MinixFS.cs b/DiscImageChef.Filesystems/MinixFS.cs index 31be4f3b3..aa945de39 100644 --- a/DiscImageChef.Filesystems/MinixFS.cs +++ b/DiscImageChef.Filesystems/MinixFS.cs @@ -34,7 +34,8 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/NILFS2.cs b/DiscImageChef.Filesystems/NILFS2.cs index 5566b174f..f7b13ab97 100644 --- a/DiscImageChef.Filesystems/NILFS2.cs +++ b/DiscImageChef.Filesystems/NILFS2.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/NTFS.cs b/DiscImageChef.Filesystems/NTFS.cs index 185908ae7..b47b67627 100644 --- a/DiscImageChef.Filesystems/NTFS.cs +++ b/DiscImageChef.Filesystems/NTFS.cs @@ -35,7 +35,7 @@ using System.Runtime.InteropServices; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/Nintendo.cs b/DiscImageChef.Filesystems/Nintendo.cs index 5801897d7..228949a08 100644 --- a/DiscImageChef.Filesystems/Nintendo.cs +++ b/DiscImageChef.Filesystems/Nintendo.cs @@ -33,8 +33,8 @@ using System; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/ODS.cs b/DiscImageChef.Filesystems/ODS.cs index 254f1dff2..6e4628ec9 100644 --- a/DiscImageChef.Filesystems/ODS.cs +++ b/DiscImageChef.Filesystems/ODS.cs @@ -34,8 +34,9 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/Opera.cs b/DiscImageChef.Filesystems/Opera.cs index 6407969ca..12ced392a 100644 --- a/DiscImageChef.Filesystems/Opera.cs +++ b/DiscImageChef.Filesystems/Opera.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/PCEngine.cs b/DiscImageChef.Filesystems/PCEngine.cs index 6d4dbc8f7..1a7f8e77b 100644 --- a/DiscImageChef.Filesystems/PCEngine.cs +++ b/DiscImageChef.Filesystems/PCEngine.cs @@ -33,7 +33,7 @@ using System; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/PCFX.cs b/DiscImageChef.Filesystems/PCFX.cs index 11c1205b1..6cbebd7b0 100644 --- a/DiscImageChef.Filesystems/PCFX.cs +++ b/DiscImageChef.Filesystems/PCFX.cs @@ -34,7 +34,8 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/PFS.cs b/DiscImageChef.Filesystems/PFS.cs index 487475bdb..02a421459 100644 --- a/DiscImageChef.Filesystems/PFS.cs +++ b/DiscImageChef.Filesystems/PFS.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/ProDOS.cs b/DiscImageChef.Filesystems/ProDOS.cs index ac172c6b1..ffbf1d6cb 100644 --- a/DiscImageChef.Filesystems/ProDOS.cs +++ b/DiscImageChef.Filesystems/ProDOS.cs @@ -35,8 +35,8 @@ using System.Linq; using System.Text; using Claunia.Encoding; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; using Encoding = System.Text.Encoding; diff --git a/DiscImageChef.Filesystems/QNX4.cs b/DiscImageChef.Filesystems/QNX4.cs index 35d6ed626..bab5a998d 100644 --- a/DiscImageChef.Filesystems/QNX4.cs +++ b/DiscImageChef.Filesystems/QNX4.cs @@ -35,7 +35,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/QNX6.cs b/DiscImageChef.Filesystems/QNX6.cs index 84e22beec..cb85a51e1 100644 --- a/DiscImageChef.Filesystems/QNX6.cs +++ b/DiscImageChef.Filesystems/QNX6.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/RBF.cs b/DiscImageChef.Filesystems/RBF.cs index d65adb7aa..5106579a5 100644 --- a/DiscImageChef.Filesystems/RBF.cs +++ b/DiscImageChef.Filesystems/RBF.cs @@ -34,8 +34,8 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/RT11.cs b/DiscImageChef.Filesystems/RT11.cs index 9cd5ea639..967cc509a 100644 --- a/DiscImageChef.Filesystems/RT11.cs +++ b/DiscImageChef.Filesystems/RT11.cs @@ -35,7 +35,7 @@ using System.Runtime.InteropServices; using System.Text; using Claunia.Encoding; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; using Encoding = System.Text.Encoding; diff --git a/DiscImageChef.Filesystems/ReFS.cs b/DiscImageChef.Filesystems/ReFS.cs index 1c8180532..b09b6c7f6 100644 --- a/DiscImageChef.Filesystems/ReFS.cs +++ b/DiscImageChef.Filesystems/ReFS.cs @@ -35,8 +35,8 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/Reiser.cs b/DiscImageChef.Filesystems/Reiser.cs index 86b5897d9..1754967c4 100644 --- a/DiscImageChef.Filesystems/Reiser.cs +++ b/DiscImageChef.Filesystems/Reiser.cs @@ -35,7 +35,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/Reiser4.cs b/DiscImageChef.Filesystems/Reiser4.cs index 35df7ffa4..05aeffa92 100644 --- a/DiscImageChef.Filesystems/Reiser4.cs +++ b/DiscImageChef.Filesystems/Reiser4.cs @@ -35,7 +35,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/SFS.cs b/DiscImageChef.Filesystems/SFS.cs index aac5108ec..8ef762309 100644 --- a/DiscImageChef.Filesystems/SFS.cs +++ b/DiscImageChef.Filesystems/SFS.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/SolarFS.cs b/DiscImageChef.Filesystems/SolarFS.cs index e76b0e18d..9fa8747cc 100644 --- a/DiscImageChef.Filesystems/SolarFS.cs +++ b/DiscImageChef.Filesystems/SolarFS.cs @@ -33,8 +33,8 @@ using System; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/Squash.cs b/DiscImageChef.Filesystems/Squash.cs index 78bd9d3c7..f367cf4a6 100644 --- a/DiscImageChef.Filesystems/Squash.cs +++ b/DiscImageChef.Filesystems/Squash.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/SysV.cs b/DiscImageChef.Filesystems/SysV.cs index efca6d7de..a1ac98ece 100644 --- a/DiscImageChef.Filesystems/SysV.cs +++ b/DiscImageChef.Filesystems/SysV.cs @@ -35,7 +35,7 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/UCSDPascal/Dir.cs b/DiscImageChef.Filesystems/UCSDPascal/Dir.cs index 8ae57670f..2199b07a4 100644 --- a/DiscImageChef.Filesystems/UCSDPascal/Dir.cs +++ b/DiscImageChef.Filesystems/UCSDPascal/Dir.cs @@ -33,6 +33,7 @@ using System; using System.Collections.Generic; using System.Linq; +using DiscImageChef.CommonTypes.Structs; namespace DiscImageChef.Filesystems.UCSDPascal { diff --git a/DiscImageChef.Filesystems/UCSDPascal/File.cs b/DiscImageChef.Filesystems/UCSDPascal/File.cs index 9b28d74ed..d19f6d4f6 100644 --- a/DiscImageChef.Filesystems/UCSDPascal/File.cs +++ b/DiscImageChef.Filesystems/UCSDPascal/File.cs @@ -32,6 +32,7 @@ using System; using System.Linq; +using DiscImageChef.CommonTypes.Structs; namespace DiscImageChef.Filesystems.UCSDPascal { diff --git a/DiscImageChef.Filesystems/UCSDPascal/Info.cs b/DiscImageChef.Filesystems/UCSDPascal/Info.cs index deab10c28..6ce6699b7 100644 --- a/DiscImageChef.Filesystems/UCSDPascal/Info.cs +++ b/DiscImageChef.Filesystems/UCSDPascal/Info.cs @@ -34,8 +34,8 @@ using System; using System.Text; using Claunia.Encoding; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; using Encoding = System.Text.Encoding; diff --git a/DiscImageChef.Filesystems/UCSDPascal/Super.cs b/DiscImageChef.Filesystems/UCSDPascal/Super.cs index bcf23115a..beea43cb2 100644 --- a/DiscImageChef.Filesystems/UCSDPascal/Super.cs +++ b/DiscImageChef.Filesystems/UCSDPascal/Super.cs @@ -34,7 +34,8 @@ using System; using System.Collections.Generic; using Claunia.Encoding; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using Schemas; using Encoding = System.Text.Encoding; diff --git a/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs b/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs index df0b51ec3..a34d879eb 100644 --- a/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs +++ b/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs @@ -33,7 +33,8 @@ using System; using System.Collections.Generic; using System.Text; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using Schemas; namespace DiscImageChef.Filesystems.UCSDPascal diff --git a/DiscImageChef.Filesystems/UDF.cs b/DiscImageChef.Filesystems/UDF.cs index 0e8c0000d..e2f233919 100644 --- a/DiscImageChef.Filesystems/UDF.cs +++ b/DiscImageChef.Filesystems/UDF.cs @@ -35,8 +35,8 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/UNICOS.cs b/DiscImageChef.Filesystems/UNICOS.cs index f41658903..58e75d8a2 100644 --- a/DiscImageChef.Filesystems/UNICOS.cs +++ b/DiscImageChef.Filesystems/UNICOS.cs @@ -35,8 +35,8 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; // UNICOS is ILP64 so let's think everything is 64-bit using blkno_t = System.Int64; diff --git a/DiscImageChef.Filesystems/UNIXBFS.cs b/DiscImageChef.Filesystems/UNIXBFS.cs index 8b7d954e4..638808345 100644 --- a/DiscImageChef.Filesystems/UNIXBFS.cs +++ b/DiscImageChef.Filesystems/UNIXBFS.cs @@ -33,8 +33,8 @@ using System; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/VMfs.cs b/DiscImageChef.Filesystems/VMfs.cs index 2fb8f2e41..e9dc5d9d4 100644 --- a/DiscImageChef.Filesystems/VMfs.cs +++ b/DiscImageChef.Filesystems/VMfs.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/VxFS.cs b/DiscImageChef.Filesystems/VxFS.cs index 41e38e6ca..6e7695e38 100644 --- a/DiscImageChef.Filesystems/VxFS.cs +++ b/DiscImageChef.Filesystems/VxFS.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/XFS.cs b/DiscImageChef.Filesystems/XFS.cs index fc6d5e09d..f412b7075 100644 --- a/DiscImageChef.Filesystems/XFS.cs +++ b/DiscImageChef.Filesystems/XFS.cs @@ -34,8 +34,9 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/Xia.cs b/DiscImageChef.Filesystems/Xia.cs index fca5838c5..13fe7884e 100644 --- a/DiscImageChef.Filesystems/Xia.cs +++ b/DiscImageChef.Filesystems/Xia.cs @@ -34,7 +34,7 @@ using System; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/ZFS.cs b/DiscImageChef.Filesystems/ZFS.cs index 0459dab8f..e889dbbbc 100644 --- a/DiscImageChef.Filesystems/ZFS.cs +++ b/DiscImageChef.Filesystems/ZFS.cs @@ -36,7 +36,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/dump.cs b/DiscImageChef.Filesystems/dump.cs index 520c968d3..43fd6156f 100644 --- a/DiscImageChef.Filesystems/dump.cs +++ b/DiscImageChef.Filesystems/dump.cs @@ -35,8 +35,8 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using Schemas; using ufs_daddr_t = System.Int32; diff --git a/DiscImageChef.Filesystems/exFAT.cs b/DiscImageChef.Filesystems/exFAT.cs index 22db70e88..e9ac5bf7d 100644 --- a/DiscImageChef.Filesystems/exFAT.cs +++ b/DiscImageChef.Filesystems/exFAT.cs @@ -35,7 +35,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/ext2FS.cs b/DiscImageChef.Filesystems/ext2FS.cs index c8b66d7a8..86fd4d592 100644 --- a/DiscImageChef.Filesystems/ext2FS.cs +++ b/DiscImageChef.Filesystems/ext2FS.cs @@ -35,7 +35,7 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filesystems/extFS.cs b/DiscImageChef.Filesystems/extFS.cs index 45e110911..625b6217d 100644 --- a/DiscImageChef.Filesystems/extFS.cs +++ b/DiscImageChef.Filesystems/extFS.cs @@ -34,7 +34,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using Schemas; namespace DiscImageChef.Filesystems diff --git a/DiscImageChef.Filters/AppleDouble.cs b/DiscImageChef.Filters/AppleDouble.cs index 839c840f5..344c70b50 100644 --- a/DiscImageChef.Filters/AppleDouble.cs +++ b/DiscImageChef.Filters/AppleDouble.cs @@ -34,6 +34,7 @@ using System; using System.IO; using System.Linq; using System.Runtime.InteropServices; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Filters { diff --git a/DiscImageChef.Filters/AppleSingle.cs b/DiscImageChef.Filters/AppleSingle.cs index 0eea055d2..5e7b512a7 100644 --- a/DiscImageChef.Filters/AppleSingle.cs +++ b/DiscImageChef.Filters/AppleSingle.cs @@ -34,6 +34,7 @@ using System; using System.IO; using System.Linq; using System.Runtime.InteropServices; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Filters { diff --git a/DiscImageChef.Filters/BZip2.cs b/DiscImageChef.Filters/BZip2.cs index 022e392d4..9f1c6016a 100644 --- a/DiscImageChef.Filters/BZip2.cs +++ b/DiscImageChef.Filters/BZip2.cs @@ -32,6 +32,7 @@ using System; using System.IO; +using DiscImageChef.CommonTypes.Interfaces; using SharpCompress.Compressors; using SharpCompress.Compressors.BZip2; diff --git a/DiscImageChef.Filters/DiscImageChef.Filters.csproj b/DiscImageChef.Filters/DiscImageChef.Filters.csproj index 7f4d86a03..37adfcd8c 100644 --- a/DiscImageChef.Filters/DiscImageChef.Filters.csproj +++ b/DiscImageChef.Filters/DiscImageChef.Filters.csproj @@ -46,8 +46,6 @@ - - @@ -65,6 +63,7 @@ + {CCAA7AFE-C094-4D82-A66D-630DE8A3F545} DiscImageChef.Console diff --git a/DiscImageChef.Filters/GZip.cs b/DiscImageChef.Filters/GZip.cs index 789b5951c..5cc845258 100644 --- a/DiscImageChef.Filters/GZip.cs +++ b/DiscImageChef.Filters/GZip.cs @@ -33,6 +33,7 @@ using System; using System.IO; using System.IO.Compression; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Filters { diff --git a/DiscImageChef.Filters/LZip.cs b/DiscImageChef.Filters/LZip.cs index 60c321104..4fb6eee83 100644 --- a/DiscImageChef.Filters/LZip.cs +++ b/DiscImageChef.Filters/LZip.cs @@ -32,6 +32,7 @@ using System; using System.IO; +using DiscImageChef.CommonTypes.Interfaces; using SharpCompress.Compressors; using SharpCompress.Compressors.LZMA; diff --git a/DiscImageChef.Filters/MacBinary.cs b/DiscImageChef.Filters/MacBinary.cs index d68c281cd..fdd50562b 100644 --- a/DiscImageChef.Filters/MacBinary.cs +++ b/DiscImageChef.Filters/MacBinary.cs @@ -34,6 +34,7 @@ using System; using System.IO; using System.Runtime.InteropServices; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Filters { diff --git a/DiscImageChef.Filters/PCExchange.cs b/DiscImageChef.Filters/PCExchange.cs index 9767d84c7..e0cf8ac5f 100644 --- a/DiscImageChef.Filters/PCExchange.cs +++ b/DiscImageChef.Filters/PCExchange.cs @@ -36,6 +36,7 @@ using System.Globalization; using System.IO; using System.Runtime.InteropServices; using System.Text; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Filters { diff --git a/DiscImageChef.Filters/XZ.cs b/DiscImageChef.Filters/XZ.cs index 2adefbf58..63de86a45 100644 --- a/DiscImageChef.Filters/XZ.cs +++ b/DiscImageChef.Filters/XZ.cs @@ -32,6 +32,7 @@ using System; using System.IO; +using DiscImageChef.CommonTypes.Interfaces; using SharpCompress.Compressors.Xz; namespace DiscImageChef.Filters diff --git a/DiscImageChef.Filters/ZZZNoFilter.cs b/DiscImageChef.Filters/ZZZNoFilter.cs index f453aba1b..42661cdcb 100644 --- a/DiscImageChef.Filters/ZZZNoFilter.cs +++ b/DiscImageChef.Filters/ZZZNoFilter.cs @@ -32,6 +32,7 @@ using System; using System.IO; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Filters { diff --git a/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj b/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj index a6eb4c5e1..35eed0b02 100644 --- a/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj +++ b/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj @@ -55,14 +55,6 @@ - - - - - - - - @@ -77,9 +69,6 @@ LICENSE.LGPL - - - diff --git a/DiscImageChef.Partitions/Acorn.cs b/DiscImageChef.Partitions/Acorn.cs index ee11a76d3..dc0bdf63b 100644 --- a/DiscImageChef.Partitions/Acorn.cs +++ b/DiscImageChef.Partitions/Acorn.cs @@ -35,7 +35,7 @@ using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/AppleMap.cs b/DiscImageChef.Partitions/AppleMap.cs index e4a6fea52..72eeeb72a 100644 --- a/DiscImageChef.Partitions/AppleMap.cs +++ b/DiscImageChef.Partitions/AppleMap.cs @@ -35,8 +35,8 @@ using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/Apricot.cs b/DiscImageChef.Partitions/Apricot.cs index 72b5666cf..213e397b5 100644 --- a/DiscImageChef.Partitions/Apricot.cs +++ b/DiscImageChef.Partitions/Apricot.cs @@ -34,8 +34,8 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/Atari.cs b/DiscImageChef.Partitions/Atari.cs index 59ba0df2a..a5e98c84d 100644 --- a/DiscImageChef.Partitions/Atari.cs +++ b/DiscImageChef.Partitions/Atari.cs @@ -35,8 +35,8 @@ using System.Collections.Generic; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/BSD.cs b/DiscImageChef.Partitions/BSD.cs index 35ba0c68e..0773b509c 100644 --- a/DiscImageChef.Partitions/BSD.cs +++ b/DiscImageChef.Partitions/BSD.cs @@ -35,8 +35,8 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/DEC.cs b/DiscImageChef.Partitions/DEC.cs index 117c9f3f6..c84efaf3c 100644 --- a/DiscImageChef.Partitions/DEC.cs +++ b/DiscImageChef.Partitions/DEC.cs @@ -35,7 +35,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj b/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj index 417948345..4bab0861d 100644 --- a/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj +++ b/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj @@ -50,7 +50,6 @@ - diff --git a/DiscImageChef.Partitions/DragonFlyBSD.cs b/DiscImageChef.Partitions/DragonFlyBSD.cs index 01802648f..0e617de18 100644 --- a/DiscImageChef.Partitions/DragonFlyBSD.cs +++ b/DiscImageChef.Partitions/DragonFlyBSD.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/GPT.cs b/DiscImageChef.Partitions/GPT.cs index 5f5cd5750..d0801515b 100644 --- a/DiscImageChef.Partitions/GPT.cs +++ b/DiscImageChef.Partitions/GPT.cs @@ -35,8 +35,9 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/Human68k.cs b/DiscImageChef.Partitions/Human68k.cs index c5c08ca0a..f0c27dc5f 100644 --- a/DiscImageChef.Partitions/Human68k.cs +++ b/DiscImageChef.Partitions/Human68k.cs @@ -35,8 +35,8 @@ using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/MBR.cs b/DiscImageChef.Partitions/MBR.cs index 26a8b1b1f..a8eb146f6 100644 --- a/DiscImageChef.Partitions/MBR.cs +++ b/DiscImageChef.Partitions/MBR.cs @@ -34,8 +34,9 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using DiscImageChef.Helpers; namespace DiscImageChef.Partitions diff --git a/DiscImageChef.Partitions/NeXT.cs b/DiscImageChef.Partitions/NeXT.cs index 75a24da93..c32662b44 100644 --- a/DiscImageChef.Partitions/NeXT.cs +++ b/DiscImageChef.Partitions/NeXT.cs @@ -36,8 +36,8 @@ using System.Linq; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; // Information learnt from XNU source and testing against real disks namespace DiscImageChef.Partitions diff --git a/DiscImageChef.Partitions/PC98.cs b/DiscImageChef.Partitions/PC98.cs index d45f490eb..6d7e0e8f8 100644 --- a/DiscImageChef.Partitions/PC98.cs +++ b/DiscImageChef.Partitions/PC98.cs @@ -35,8 +35,8 @@ using System.Collections.Generic; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; using DiscImageChef.Helpers; namespace DiscImageChef.Partitions diff --git a/DiscImageChef.Partitions/Plan9.cs b/DiscImageChef.Partitions/Plan9.cs index 2c582c2e4..a9d997ed6 100644 --- a/DiscImageChef.Partitions/Plan9.cs +++ b/DiscImageChef.Partitions/Plan9.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Linq; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/RDB.cs b/DiscImageChef.Partitions/RDB.cs index 6ccaec52a..a14396102 100644 --- a/DiscImageChef.Partitions/RDB.cs +++ b/DiscImageChef.Partitions/RDB.cs @@ -36,8 +36,8 @@ using System.Linq; using System.Text; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/RioKarma.cs b/DiscImageChef.Partitions/RioKarma.cs index 23582abca..6f106f74a 100644 --- a/DiscImageChef.Partitions/RioKarma.cs +++ b/DiscImageChef.Partitions/RioKarma.cs @@ -35,7 +35,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/SGI.cs b/DiscImageChef.Partitions/SGI.cs index a2fd555d6..b54a6a9a8 100644 --- a/DiscImageChef.Partitions/SGI.cs +++ b/DiscImageChef.Partitions/SGI.cs @@ -35,8 +35,8 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; #pragma warning disable 169 #pragma warning disable 649 diff --git a/DiscImageChef.Partitions/Sun.cs b/DiscImageChef.Partitions/Sun.cs index ee0345a83..59ebc5a34 100644 --- a/DiscImageChef.Partitions/Sun.cs +++ b/DiscImageChef.Partitions/Sun.cs @@ -36,8 +36,8 @@ using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/UNIX.cs b/DiscImageChef.Partitions/UNIX.cs index 16e96aad6..eef250cad 100644 --- a/DiscImageChef.Partitions/UNIX.cs +++ b/DiscImageChef.Partitions/UNIX.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Linq; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/VTOC.cs b/DiscImageChef.Partitions/VTOC.cs index 78c4d10eb..d57c0bc20 100644 --- a/DiscImageChef.Partitions/VTOC.cs +++ b/DiscImageChef.Partitions/VTOC.cs @@ -35,8 +35,8 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/XENIX.cs b/DiscImageChef.Partitions/XENIX.cs index a564ebcd3..36166c809 100644 --- a/DiscImageChef.Partitions/XENIX.cs +++ b/DiscImageChef.Partitions/XENIX.cs @@ -33,8 +33,8 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; -using DiscImageChef.DiscImages; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Partitions/Xbox.cs b/DiscImageChef.Partitions/Xbox.cs index 4eb4a4001..d99855a16 100644 --- a/DiscImageChef.Partitions/Xbox.cs +++ b/DiscImageChef.Partitions/Xbox.cs @@ -34,7 +34,7 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; namespace DiscImageChef.Partitions { diff --git a/DiscImageChef.Server/App_Start/Ata.cs b/DiscImageChef.Server/App_Start/Ata.cs index caa3d4f1a..d105b1f26 100644 --- a/DiscImageChef.Server/App_Start/Ata.cs +++ b/DiscImageChef.Server/App_Start/Ata.cs @@ -31,8 +31,8 @@ // ****************************************************************************/ using System.Collections.Generic; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Metadata; using static DiscImageChef.Decoders.ATA.Identify; namespace DiscImageChef.Server.App_Start diff --git a/DiscImageChef.Server/App_Start/ScsiEvpd.cs b/DiscImageChef.Server/App_Start/ScsiEvpd.cs index 8654a7b79..3b255bbf9 100644 --- a/DiscImageChef.Server/App_Start/ScsiEvpd.cs +++ b/DiscImageChef.Server/App_Start/ScsiEvpd.cs @@ -31,8 +31,8 @@ // ****************************************************************************/ using System.Collections.Generic; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Metadata; namespace DiscImageChef.Server.App_Start { diff --git a/DiscImageChef.Server/App_Start/ScsiInquiry.cs b/DiscImageChef.Server/App_Start/ScsiInquiry.cs index 3ab4d2a71..21152619d 100644 --- a/DiscImageChef.Server/App_Start/ScsiInquiry.cs +++ b/DiscImageChef.Server/App_Start/ScsiInquiry.cs @@ -31,8 +31,8 @@ // ****************************************************************************/ using System.Collections.Generic; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Metadata; namespace DiscImageChef.Server.App_Start { diff --git a/DiscImageChef.Server/App_Start/ScsiMmcFeatures.cs b/DiscImageChef.Server/App_Start/ScsiMmcFeatures.cs index 0aa35c78c..2a158c077 100644 --- a/DiscImageChef.Server/App_Start/ScsiMmcFeatures.cs +++ b/DiscImageChef.Server/App_Start/ScsiMmcFeatures.cs @@ -31,8 +31,8 @@ // ****************************************************************************/ using System.Collections.Generic; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Decoders.SCSI.MMC; -using DiscImageChef.Metadata; namespace DiscImageChef.Server.App_Start { diff --git a/DiscImageChef.Server/App_Start/ScsiMmcMode.cs b/DiscImageChef.Server/App_Start/ScsiMmcMode.cs index 1b21d2c89..c3be8d0b4 100644 --- a/DiscImageChef.Server/App_Start/ScsiMmcMode.cs +++ b/DiscImageChef.Server/App_Start/ScsiMmcMode.cs @@ -32,8 +32,8 @@ using System.Collections.Generic; using System.Linq; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Metadata; namespace DiscImageChef.Server.App_Start { diff --git a/DiscImageChef.Server/App_Start/ScsiModeSense.cs b/DiscImageChef.Server/App_Start/ScsiModeSense.cs index 030fe9b82..e9002495d 100644 --- a/DiscImageChef.Server/App_Start/ScsiModeSense.cs +++ b/DiscImageChef.Server/App_Start/ScsiModeSense.cs @@ -31,8 +31,8 @@ // ****************************************************************************/ using System.Collections.Generic; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Metadata; namespace DiscImageChef.Server.App_Start { diff --git a/DiscImageChef.Server/App_Start/SscTestedMedia.cs b/DiscImageChef.Server/App_Start/SscTestedMedia.cs index fa84640ad..bc649c2f1 100644 --- a/DiscImageChef.Server/App_Start/SscTestedMedia.cs +++ b/DiscImageChef.Server/App_Start/SscTestedMedia.cs @@ -31,7 +31,7 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.Metadata; +using DiscImageChef.CommonTypes.Metadata; namespace DiscImageChef.Server.App_Start { diff --git a/DiscImageChef.Server/App_Start/TestedMedia.cs b/DiscImageChef.Server/App_Start/TestedMedia.cs index 8a8daae93..03dfd41ab 100644 --- a/DiscImageChef.Server/App_Start/TestedMedia.cs +++ b/DiscImageChef.Server/App_Start/TestedMedia.cs @@ -31,7 +31,7 @@ // ****************************************************************************/ using System.Collections.Generic; -using DiscImageChef.Metadata; +using DiscImageChef.CommonTypes.Metadata; namespace DiscImageChef.Server.App_Start { diff --git a/DiscImageChef.Server/Controllers/UploadReportController.cs b/DiscImageChef.Server/Controllers/UploadReportController.cs index 2e86db3d4..7d95e1537 100644 --- a/DiscImageChef.Server/Controllers/UploadReportController.cs +++ b/DiscImageChef.Server/Controllers/UploadReportController.cs @@ -39,7 +39,7 @@ using System.Web; using System.Web.Hosting; using System.Web.Http; using System.Xml.Serialization; -using DiscImageChef.Metadata; +using DiscImageChef.CommonTypes.Metadata; namespace DiscImageChef.Server.Controllers { diff --git a/DiscImageChef.Server/Controllers/UploadStatsController.cs b/DiscImageChef.Server/Controllers/UploadStatsController.cs index 39ac51fdb..ba05149e3 100644 --- a/DiscImageChef.Server/Controllers/UploadStatsController.cs +++ b/DiscImageChef.Server/Controllers/UploadStatsController.cs @@ -42,7 +42,7 @@ using System.Web; using System.Web.Hosting; using System.Web.Http; using System.Xml.Serialization; -using DiscImageChef.Metadata; +using DiscImageChef.CommonTypes.Metadata; namespace DiscImageChef.Server.Controllers { diff --git a/DiscImageChef.Server/DiscImageChef.Server.csproj b/DiscImageChef.Server/DiscImageChef.Server.csproj index 61f5f77df..24b3e1364 100644 --- a/DiscImageChef.Server/DiscImageChef.Server.csproj +++ b/DiscImageChef.Server/DiscImageChef.Server.csproj @@ -113,18 +113,10 @@ - - {9F213318-5CB8-4066-A757-074489C9F818} - DiscImageChef.Metadata - {F2B84194-26EB-4227-B1C5-6602517E85AE} DiscImageChef.CommonTypes - - {9183F2E0-A879-4F23-9EE3-C6908F1332B2} - DiscImageChef.Interop - {0BEB3088-B634-4289-AE17-CDF2D25D00D5} DiscImageChef.Decoders diff --git a/DiscImageChef.Server/Statistics.aspx.cs b/DiscImageChef.Server/Statistics.aspx.cs index c79664431..831561890 100644 --- a/DiscImageChef.Server/Statistics.aspx.cs +++ b/DiscImageChef.Server/Statistics.aspx.cs @@ -40,9 +40,9 @@ using System.Web; using System.Web.Hosting; using System.Web.UI; using System.Xml.Serialization; -using DiscImageChef.Interop; -using DiscImageChef.Metadata; -using PlatformID = DiscImageChef.Interop.PlatformID; +using DiscImageChef.CommonTypes.Interop; +using DiscImageChef.CommonTypes.Metadata; +using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; namespace DiscImageChef.Server { diff --git a/DiscImageChef.Server/ViewReport.aspx.cs b/DiscImageChef.Server/ViewReport.aspx.cs index c0855c28e..727d7c55b 100644 --- a/DiscImageChef.Server/ViewReport.aspx.cs +++ b/DiscImageChef.Server/ViewReport.aspx.cs @@ -38,9 +38,9 @@ using System.Web; using System.Web.Hosting; using System.Web.UI; using System.Xml.Serialization; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Decoders.PCMCIA; using DiscImageChef.Decoders.SCSI; -using DiscImageChef.Metadata; using DiscImageChef.Server.App_Start; using Tuple = DiscImageChef.Decoders.PCMCIA.Tuple; diff --git a/DiscImageChef.Settings/DiscImageChef.Settings.csproj b/DiscImageChef.Settings/DiscImageChef.Settings.csproj index ea141cf63..5648046b3 100644 --- a/DiscImageChef.Settings/DiscImageChef.Settings.csproj +++ b/DiscImageChef.Settings/DiscImageChef.Settings.csproj @@ -51,18 +51,13 @@ - - - {9183F2E0-A879-4F23-9EE3-C6908F1332B2} - DiscImageChef.Interop - - LICENSE.LGPL + diff --git a/DiscImageChef.Settings/Settings.cs b/DiscImageChef.Settings/Settings.cs index ec8e8d6f0..ad1b55822 100644 --- a/DiscImageChef.Settings/Settings.cs +++ b/DiscImageChef.Settings/Settings.cs @@ -34,9 +34,9 @@ using System; using System.IO; using System.Xml.Serialization; using Claunia.PropertyList; -using DiscImageChef.Interop; +using DiscImageChef.CommonTypes.Interop; using Microsoft.Win32; -using PlatformID = DiscImageChef.Interop.PlatformID; +using PlatformID = DiscImageChef.CommonTypes.Interop.PlatformID; namespace DiscImageChef.Settings { diff --git a/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj b/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj index 19597ec55..70ce8294a 100644 --- a/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj +++ b/DiscImageChef.Tests.Devices/DiscImageChef.Tests.Devices.csproj @@ -90,10 +90,6 @@ {57BB2341-AB62-48FD-91B8-46F5A2F9ED51} DiscImageChef.Devices - - {9183F2E0-A879-4F23-9EE3-C6908F1332B2} - DiscImageChef.Interop - {0BEB3088-B634-4289-AE17-CDF2D25D00D5} DiscImageChef.Decoders diff --git a/DiscImageChef.Tests/Checksums/Adler32.cs b/DiscImageChef.Tests/Checksums/Adler32.cs index c094425ad..bb7ac6b1d 100644 --- a/DiscImageChef.Tests/Checksums/Adler32.cs +++ b/DiscImageChef.Tests/Checksums/Adler32.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Checksums diff --git a/DiscImageChef.Tests/Checksums/CRC16.cs b/DiscImageChef.Tests/Checksums/CRC16.cs index 70db5eab5..39b723218 100644 --- a/DiscImageChef.Tests/Checksums/CRC16.cs +++ b/DiscImageChef.Tests/Checksums/CRC16.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Checksums diff --git a/DiscImageChef.Tests/Checksums/CRC32.cs b/DiscImageChef.Tests/Checksums/CRC32.cs index c44b8334b..74ebba4b7 100644 --- a/DiscImageChef.Tests/Checksums/CRC32.cs +++ b/DiscImageChef.Tests/Checksums/CRC32.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Checksums diff --git a/DiscImageChef.Tests/Checksums/CRC64.cs b/DiscImageChef.Tests/Checksums/CRC64.cs index b725990a3..e86359ab7 100644 --- a/DiscImageChef.Tests/Checksums/CRC64.cs +++ b/DiscImageChef.Tests/Checksums/CRC64.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Checksums diff --git a/DiscImageChef.Tests/Checksums/MD5.cs b/DiscImageChef.Tests/Checksums/MD5.cs index c37bea87b..73cf0b57f 100644 --- a/DiscImageChef.Tests/Checksums/MD5.cs +++ b/DiscImageChef.Tests/Checksums/MD5.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Checksums diff --git a/DiscImageChef.Tests/Checksums/RIPEMD160.cs b/DiscImageChef.Tests/Checksums/RIPEMD160.cs index 6a27c462f..d7373a5f8 100644 --- a/DiscImageChef.Tests/Checksums/RIPEMD160.cs +++ b/DiscImageChef.Tests/Checksums/RIPEMD160.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Checksums diff --git a/DiscImageChef.Tests/Checksums/SHA1.cs b/DiscImageChef.Tests/Checksums/SHA1.cs index 4e1a9519e..dd7436244 100644 --- a/DiscImageChef.Tests/Checksums/SHA1.cs +++ b/DiscImageChef.Tests/Checksums/SHA1.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Checksums diff --git a/DiscImageChef.Tests/Checksums/SHA256.cs b/DiscImageChef.Tests/Checksums/SHA256.cs index be5deb733..8e880d3e3 100644 --- a/DiscImageChef.Tests/Checksums/SHA256.cs +++ b/DiscImageChef.Tests/Checksums/SHA256.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Checksums diff --git a/DiscImageChef.Tests/Checksums/SHA384.cs b/DiscImageChef.Tests/Checksums/SHA384.cs index b1b0535ee..97567f4ec 100644 --- a/DiscImageChef.Tests/Checksums/SHA384.cs +++ b/DiscImageChef.Tests/Checksums/SHA384.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Checksums diff --git a/DiscImageChef.Tests/Checksums/SHA512.cs b/DiscImageChef.Tests/Checksums/SHA512.cs index 91b138fa1..6a51b492b 100644 --- a/DiscImageChef.Tests/Checksums/SHA512.cs +++ b/DiscImageChef.Tests/Checksums/SHA512.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Checksums diff --git a/DiscImageChef.Tests/Checksums/SpamSum.cs b/DiscImageChef.Tests/Checksums/SpamSum.cs index 828e7646c..2268ffc95 100644 --- a/DiscImageChef.Tests/Checksums/SpamSum.cs +++ b/DiscImageChef.Tests/Checksums/SpamSum.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Checksums diff --git a/DiscImageChef.Tests/Devices/IomegaJaz.cs b/DiscImageChef.Tests/Devices/IomegaJaz.cs index 5d3afab69..1c5ed99c8 100644 --- a/DiscImageChef.Tests/Devices/IomegaJaz.cs +++ b/DiscImageChef.Tests/Devices/IomegaJaz.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Devices/LS120.cs b/DiscImageChef.Tests/Devices/LS120.cs index 9754a12f2..b267c3d56 100644 --- a/DiscImageChef.Tests/Devices/LS120.cs +++ b/DiscImageChef.Tests/Devices/LS120.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Devices/PocketZip.cs b/DiscImageChef.Tests/Devices/PocketZip.cs index c025c13ed..b4c3db5b9 100644 --- a/DiscImageChef.Tests/Devices/PocketZip.cs +++ b/DiscImageChef.Tests/Devices/PocketZip.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/DiscImageChef.Tests.csproj b/DiscImageChef.Tests/DiscImageChef.Tests.csproj index dc8152d5c..5bed04c65 100644 --- a/DiscImageChef.Tests/DiscImageChef.Tests.csproj +++ b/DiscImageChef.Tests/DiscImageChef.Tests.csproj @@ -168,10 +168,6 @@ {F2B84194-26EB-4227-B1C5-6602517E85AE} DiscImageChef.CommonTypes - - {9F213318-5CB8-4066-A757-074489C9F818} - DiscImageChef.Metadata - {DA7AB65D-B5BA-4003-8893-A51BB071BA2F} DiscImageChef.Partitions diff --git a/DiscImageChef.Tests/Filesystems/ADFS.cs b/DiscImageChef.Tests/Filesystems/ADFS.cs index 9d66d948f..9256172ad 100644 --- a/DiscImageChef.Tests/Filesystems/ADFS.cs +++ b/DiscImageChef.Tests/Filesystems/ADFS.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/AFFS.cs b/DiscImageChef.Tests/Filesystems/AFFS.cs index 15253562c..7114ba4dd 100644 --- a/DiscImageChef.Tests/Filesystems/AFFS.cs +++ b/DiscImageChef.Tests/Filesystems/AFFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/AFFS2.cs b/DiscImageChef.Tests/Filesystems/AFFS2.cs index d94c3f422..48cb8bb05 100644 --- a/DiscImageChef.Tests/Filesystems/AFFS2.cs +++ b/DiscImageChef.Tests/Filesystems/AFFS2.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/AFS.cs b/DiscImageChef.Tests/Filesystems/AFS.cs index dd7a1cb95..5d4704eae 100644 --- a/DiscImageChef.Tests/Filesystems/AFS.cs +++ b/DiscImageChef.Tests/Filesystems/AFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/AOFS.cs b/DiscImageChef.Tests/Filesystems/AOFS.cs index 3c2417913..471dd1040 100644 --- a/DiscImageChef.Tests/Filesystems/AOFS.cs +++ b/DiscImageChef.Tests/Filesystems/AOFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/Atheos.cs b/DiscImageChef.Tests/Filesystems/Atheos.cs index 1231979d1..00a81cf6d 100644 --- a/DiscImageChef.Tests/Filesystems/Atheos.cs +++ b/DiscImageChef.Tests/Filesystems/Atheos.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/BeFS.cs b/DiscImageChef.Tests/Filesystems/BeFS.cs index 115c38b46..049853d87 100644 --- a/DiscImageChef.Tests/Filesystems/BeFS.cs +++ b/DiscImageChef.Tests/Filesystems/BeFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/COHERENT.cs b/DiscImageChef.Tests/Filesystems/COHERENT.cs index f4d722a4f..fcdde3eca 100644 --- a/DiscImageChef.Tests/Filesystems/COHERENT.cs +++ b/DiscImageChef.Tests/Filesystems/COHERENT.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/DTFS.cs b/DiscImageChef.Tests/Filesystems/DTFS.cs index be225c29b..1d326a2fd 100644 --- a/DiscImageChef.Tests/Filesystems/DTFS.cs +++ b/DiscImageChef.Tests/Filesystems/DTFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/EAFS.cs b/DiscImageChef.Tests/Filesystems/EAFS.cs index 316660e93..ceb5a4953 100644 --- a/DiscImageChef.Tests/Filesystems/EAFS.cs +++ b/DiscImageChef.Tests/Filesystems/EAFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/F2FS.cs b/DiscImageChef.Tests/Filesystems/F2FS.cs index 699336bc0..0b68967cb 100644 --- a/DiscImageChef.Tests/Filesystems/F2FS.cs +++ b/DiscImageChef.Tests/Filesystems/F2FS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/FAT12.cs b/DiscImageChef.Tests/Filesystems/FAT12.cs index f48467dae..18730ada4 100644 --- a/DiscImageChef.Tests/Filesystems/FAT12.cs +++ b/DiscImageChef.Tests/Filesystems/FAT12.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/FAT16.cs b/DiscImageChef.Tests/Filesystems/FAT16.cs index 42d204717..3e2c3de2b 100644 --- a/DiscImageChef.Tests/Filesystems/FAT16.cs +++ b/DiscImageChef.Tests/Filesystems/FAT16.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/FAT32.cs b/DiscImageChef.Tests/Filesystems/FAT32.cs index 55af60b04..b1447c03c 100644 --- a/DiscImageChef.Tests/Filesystems/FAT32.cs +++ b/DiscImageChef.Tests/Filesystems/FAT32.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/HAMMER.cs b/DiscImageChef.Tests/Filesystems/HAMMER.cs index f2f8c6bd2..9608aeb2e 100644 --- a/DiscImageChef.Tests/Filesystems/HAMMER.cs +++ b/DiscImageChef.Tests/Filesystems/HAMMER.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/HFS.cs b/DiscImageChef.Tests/Filesystems/HFS.cs index d49698588..556f1334d 100644 --- a/DiscImageChef.Tests/Filesystems/HFS.cs +++ b/DiscImageChef.Tests/Filesystems/HFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/HFSPlus.cs b/DiscImageChef.Tests/Filesystems/HFSPlus.cs index a54302e24..fd907b5b6 100644 --- a/DiscImageChef.Tests/Filesystems/HFSPlus.cs +++ b/DiscImageChef.Tests/Filesystems/HFSPlus.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/HFSX.cs b/DiscImageChef.Tests/Filesystems/HFSX.cs index fab973a90..ff5158c6b 100644 --- a/DiscImageChef.Tests/Filesystems/HFSX.cs +++ b/DiscImageChef.Tests/Filesystems/HFSX.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/HPFS.cs b/DiscImageChef.Tests/Filesystems/HPFS.cs index dbeaaabb0..23c857160 100644 --- a/DiscImageChef.Tests/Filesystems/HPFS.cs +++ b/DiscImageChef.Tests/Filesystems/HPFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/HPOFS.cs b/DiscImageChef.Tests/Filesystems/HPOFS.cs index baad70939..80972826c 100644 --- a/DiscImageChef.Tests/Filesystems/HPOFS.cs +++ b/DiscImageChef.Tests/Filesystems/HPOFS.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/HTFS.cs b/DiscImageChef.Tests/Filesystems/HTFS.cs index 975af48ab..b908e85bd 100644 --- a/DiscImageChef.Tests/Filesystems/HTFS.cs +++ b/DiscImageChef.Tests/Filesystems/HTFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/ISO9660.cs b/DiscImageChef.Tests/Filesystems/ISO9660.cs index 6e49f63b9..38206c681 100644 --- a/DiscImageChef.Tests/Filesystems/ISO9660.cs +++ b/DiscImageChef.Tests/Filesystems/ISO9660.cs @@ -28,8 +28,8 @@ using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; using DiscImageChef.Filesystems.ISO9660; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filesystems/JFS2.cs b/DiscImageChef.Tests/Filesystems/JFS2.cs index 21610720b..4bd0a898f 100644 --- a/DiscImageChef.Tests/Filesystems/JFS2.cs +++ b/DiscImageChef.Tests/Filesystems/JFS2.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/LisaFS.cs b/DiscImageChef.Tests/Filesystems/LisaFS.cs index aac62ad2f..d01e19e11 100644 --- a/DiscImageChef.Tests/Filesystems/LisaFS.cs +++ b/DiscImageChef.Tests/Filesystems/LisaFS.cs @@ -28,8 +28,8 @@ using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; using DiscImageChef.Filesystems.LisaFS; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filesystems/Locus.cs b/DiscImageChef.Tests/Filesystems/Locus.cs index 040389e13..16e68fe24 100644 --- a/DiscImageChef.Tests/Filesystems/Locus.cs +++ b/DiscImageChef.Tests/Filesystems/Locus.cs @@ -28,8 +28,8 @@ using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filesystems/MFS.cs b/DiscImageChef.Tests/Filesystems/MFS.cs index 51ed0797a..b231b7f3f 100644 --- a/DiscImageChef.Tests/Filesystems/MFS.cs +++ b/DiscImageChef.Tests/Filesystems/MFS.cs @@ -28,8 +28,8 @@ using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; using DiscImageChef.Filesystems.AppleMFS; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filesystems/MINIX.cs b/DiscImageChef.Tests/Filesystems/MINIX.cs index 8077b4585..1858704f5 100644 --- a/DiscImageChef.Tests/Filesystems/MINIX.cs +++ b/DiscImageChef.Tests/Filesystems/MINIX.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/NILFS2.cs b/DiscImageChef.Tests/Filesystems/NILFS2.cs index cf2507718..7bfc73bfc 100644 --- a/DiscImageChef.Tests/Filesystems/NILFS2.cs +++ b/DiscImageChef.Tests/Filesystems/NILFS2.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/NTFS.cs b/DiscImageChef.Tests/Filesystems/NTFS.cs index 80c85c718..3e40c69f6 100644 --- a/DiscImageChef.Tests/Filesystems/NTFS.cs +++ b/DiscImageChef.Tests/Filesystems/NTFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/PFS3.cs b/DiscImageChef.Tests/Filesystems/PFS3.cs index 354b7042a..0d6eb3be7 100644 --- a/DiscImageChef.Tests/Filesystems/PFS3.cs +++ b/DiscImageChef.Tests/Filesystems/PFS3.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/ProDOS.cs b/DiscImageChef.Tests/Filesystems/ProDOS.cs index fddc8a7a4..5a823fa16 100644 --- a/DiscImageChef.Tests/Filesystems/ProDOS.cs +++ b/DiscImageChef.Tests/Filesystems/ProDOS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/QNX4.cs b/DiscImageChef.Tests/Filesystems/QNX4.cs index 15b6806ab..54b50b9a6 100644 --- a/DiscImageChef.Tests/Filesystems/QNX4.cs +++ b/DiscImageChef.Tests/Filesystems/QNX4.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/ReFS.cs b/DiscImageChef.Tests/Filesystems/ReFS.cs index b09eeabb7..23229e803 100644 --- a/DiscImageChef.Tests/Filesystems/ReFS.cs +++ b/DiscImageChef.Tests/Filesystems/ReFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/Reiser3.cs b/DiscImageChef.Tests/Filesystems/Reiser3.cs index a077463ac..a67280a5d 100644 --- a/DiscImageChef.Tests/Filesystems/Reiser3.cs +++ b/DiscImageChef.Tests/Filesystems/Reiser3.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/Reiser4.cs b/DiscImageChef.Tests/Filesystems/Reiser4.cs index d6780fb24..08a0bf372 100644 --- a/DiscImageChef.Tests/Filesystems/Reiser4.cs +++ b/DiscImageChef.Tests/Filesystems/Reiser4.cs @@ -29,8 +29,8 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filesystems/SFS.cs b/DiscImageChef.Tests/Filesystems/SFS.cs index 10e07634a..51989e255 100644 --- a/DiscImageChef.Tests/Filesystems/SFS.cs +++ b/DiscImageChef.Tests/Filesystems/SFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/SysV.cs b/DiscImageChef.Tests/Filesystems/SysV.cs index a87cd2ac1..2e3a074f2 100644 --- a/DiscImageChef.Tests/Filesystems/SysV.cs +++ b/DiscImageChef.Tests/Filesystems/SysV.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/UDF.cs b/DiscImageChef.Tests/Filesystems/UDF.cs index a1b70535e..29d5d3bc6 100644 --- a/DiscImageChef.Tests/Filesystems/UDF.cs +++ b/DiscImageChef.Tests/Filesystems/UDF.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/UFS.cs b/DiscImageChef.Tests/Filesystems/UFS.cs index 6661995be..71e2c2622 100644 --- a/DiscImageChef.Tests/Filesystems/UFS.cs +++ b/DiscImageChef.Tests/Filesystems/UFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/UNIXBFS.cs b/DiscImageChef.Tests/Filesystems/UNIXBFS.cs index 9ff37103b..7ed07b090 100644 --- a/DiscImageChef.Tests/Filesystems/UNIXBFS.cs +++ b/DiscImageChef.Tests/Filesystems/UNIXBFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/XENIX.cs b/DiscImageChef.Tests/Filesystems/XENIX.cs index eff068d00..e52c4f0fd 100644 --- a/DiscImageChef.Tests/Filesystems/XENIX.cs +++ b/DiscImageChef.Tests/Filesystems/XENIX.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/XFS.cs b/DiscImageChef.Tests/Filesystems/XFS.cs index e44c96af1..30d682878 100644 --- a/DiscImageChef.Tests/Filesystems/XFS.cs +++ b/DiscImageChef.Tests/Filesystems/XFS.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/Xia.cs b/DiscImageChef.Tests/Filesystems/Xia.cs index a4c04380d..982d33eb0 100644 --- a/DiscImageChef.Tests/Filesystems/Xia.cs +++ b/DiscImageChef.Tests/Filesystems/Xia.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/ZFS.cs b/DiscImageChef.Tests/Filesystems/ZFS.cs index 2474895b1..6957ebcbc 100644 --- a/DiscImageChef.Tests/Filesystems/ZFS.cs +++ b/DiscImageChef.Tests/Filesystems/ZFS.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/btrfs.cs b/DiscImageChef.Tests/Filesystems/btrfs.cs index e3ee3cff0..dd99e4dda 100644 --- a/DiscImageChef.Tests/Filesystems/btrfs.cs +++ b/DiscImageChef.Tests/Filesystems/btrfs.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/exFAT.cs b/DiscImageChef.Tests/Filesystems/exFAT.cs index 073a22b1a..eed26c66d 100644 --- a/DiscImageChef.Tests/Filesystems/exFAT.cs +++ b/DiscImageChef.Tests/Filesystems/exFAT.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filesystems/ext2.cs b/DiscImageChef.Tests/Filesystems/ext2.cs index 8a5856276..aa306147e 100644 --- a/DiscImageChef.Tests/Filesystems/ext2.cs +++ b/DiscImageChef.Tests/Filesystems/ext2.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filesystems; using DiscImageChef.Filters; diff --git a/DiscImageChef.Tests/Filters/AppleDoubleDave.cs b/DiscImageChef.Tests/Filters/AppleDoubleDave.cs index dcbb8305e..45d3f5a3a 100644 --- a/DiscImageChef.Tests/Filters/AppleDoubleDave.cs +++ b/DiscImageChef.Tests/Filters/AppleDoubleDave.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filters/AppleDoubleDos.cs b/DiscImageChef.Tests/Filters/AppleDoubleDos.cs index 37b9ffc63..07f6e3b38 100644 --- a/DiscImageChef.Tests/Filters/AppleDoubleDos.cs +++ b/DiscImageChef.Tests/Filters/AppleDoubleDos.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filters/AppleDoubleNetatalk.cs b/DiscImageChef.Tests/Filters/AppleDoubleNetatalk.cs index 8c6d97698..39150a5e8 100644 --- a/DiscImageChef.Tests/Filters/AppleDoubleNetatalk.cs +++ b/DiscImageChef.Tests/Filters/AppleDoubleNetatalk.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filters/AppleDoubleOsX.cs b/DiscImageChef.Tests/Filters/AppleDoubleOsX.cs index 1dadb56a6..410d34b89 100644 --- a/DiscImageChef.Tests/Filters/AppleDoubleOsX.cs +++ b/DiscImageChef.Tests/Filters/AppleDoubleOsX.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filters/AppleDoubleProDos.cs b/DiscImageChef.Tests/Filters/AppleDoubleProDos.cs index e608c94a3..26055a99d 100644 --- a/DiscImageChef.Tests/Filters/AppleDoubleProDos.cs +++ b/DiscImageChef.Tests/Filters/AppleDoubleProDos.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filters/AppleDoubleUnAr.cs b/DiscImageChef.Tests/Filters/AppleDoubleUnAr.cs index 9cc51c69c..88bc9ab74 100644 --- a/DiscImageChef.Tests/Filters/AppleDoubleUnAr.cs +++ b/DiscImageChef.Tests/Filters/AppleDoubleUnAr.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filters/AppleDoubleUnix.cs b/DiscImageChef.Tests/Filters/AppleDoubleUnix.cs index 134be9894..05c9a55e3 100644 --- a/DiscImageChef.Tests/Filters/AppleDoubleUnix.cs +++ b/DiscImageChef.Tests/Filters/AppleDoubleUnix.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filters/AppleSingle.cs b/DiscImageChef.Tests/Filters/AppleSingle.cs index 9e6e78bcb..174237bad 100644 --- a/DiscImageChef.Tests/Filters/AppleSingle.cs +++ b/DiscImageChef.Tests/Filters/AppleSingle.cs @@ -28,7 +28,7 @@ using System.IO; using DiscImageChef.Checksums; -using DiscImageChef.Filters; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Filters diff --git a/DiscImageChef.Tests/Filters/BZip2.cs b/DiscImageChef.Tests/Filters/BZip2.cs index c3f872e5b..06ab45807 100644 --- a/DiscImageChef.Tests/Filters/BZip2.cs +++ b/DiscImageChef.Tests/Filters/BZip2.cs @@ -28,7 +28,7 @@ using System.IO; using DiscImageChef.Checksums; -using DiscImageChef.Filters; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Filters diff --git a/DiscImageChef.Tests/Filters/GZip.cs b/DiscImageChef.Tests/Filters/GZip.cs index aa2ea5db0..2f4035e8a 100644 --- a/DiscImageChef.Tests/Filters/GZip.cs +++ b/DiscImageChef.Tests/Filters/GZip.cs @@ -28,7 +28,7 @@ using System.IO; using DiscImageChef.Checksums; -using DiscImageChef.Filters; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Filters diff --git a/DiscImageChef.Tests/Filters/LZip.cs b/DiscImageChef.Tests/Filters/LZip.cs index 5e61ddc8c..5c9a47c8b 100644 --- a/DiscImageChef.Tests/Filters/LZip.cs +++ b/DiscImageChef.Tests/Filters/LZip.cs @@ -28,7 +28,7 @@ using System.IO; using DiscImageChef.Checksums; -using DiscImageChef.Filters; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Filters diff --git a/DiscImageChef.Tests/Filters/MacBinary1.cs b/DiscImageChef.Tests/Filters/MacBinary1.cs index 6328361b3..90046befc 100644 --- a/DiscImageChef.Tests/Filters/MacBinary1.cs +++ b/DiscImageChef.Tests/Filters/MacBinary1.cs @@ -28,7 +28,7 @@ using System.IO; using DiscImageChef.Checksums; -using DiscImageChef.Filters; +using DiscImageChef.CommonTypes.Interfaces; using NUnit.Framework; namespace DiscImageChef.Tests.Filters diff --git a/DiscImageChef.Tests/Filters/MacBinary2.cs b/DiscImageChef.Tests/Filters/MacBinary2.cs index bf1e95578..5a3db6c62 100644 --- a/DiscImageChef.Tests/Filters/MacBinary2.cs +++ b/DiscImageChef.Tests/Filters/MacBinary2.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filters/MacBinary3.cs b/DiscImageChef.Tests/Filters/MacBinary3.cs index 710b15d05..45ee88f9d 100644 --- a/DiscImageChef.Tests/Filters/MacBinary3.cs +++ b/DiscImageChef.Tests/Filters/MacBinary3.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filters/PCExchange.cs b/DiscImageChef.Tests/Filters/PCExchange.cs index c0dcabe36..cad650507 100644 --- a/DiscImageChef.Tests/Filters/PCExchange.cs +++ b/DiscImageChef.Tests/Filters/PCExchange.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Filters/XZ.cs b/DiscImageChef.Tests/Filters/XZ.cs index a97961a8d..7d86f37c1 100644 --- a/DiscImageChef.Tests/Filters/XZ.cs +++ b/DiscImageChef.Tests/Filters/XZ.cs @@ -28,6 +28,7 @@ using System.IO; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Images/2MG.cs b/DiscImageChef.Tests/Images/2MG.cs index 66857c8c0..726e54af1 100644 --- a/DiscImageChef.Tests/Images/2MG.cs +++ b/DiscImageChef.Tests/Images/2MG.cs @@ -29,7 +29,7 @@ using System.IO; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Images/Anex86.cs b/DiscImageChef.Tests/Images/Anex86.cs index c48391c03..a612fe0a9 100644 --- a/DiscImageChef.Tests/Images/Anex86.cs +++ b/DiscImageChef.Tests/Images/Anex86.cs @@ -29,7 +29,7 @@ using System.IO; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Images/CisCopy.cs b/DiscImageChef.Tests/Images/CisCopy.cs index a070198d7..2ac39901b 100644 --- a/DiscImageChef.Tests/Images/CisCopy.cs +++ b/DiscImageChef.Tests/Images/CisCopy.cs @@ -29,7 +29,7 @@ using System.IO; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Images/CopyQM.cs b/DiscImageChef.Tests/Images/CopyQM.cs index df7e5724b..73be5d4f9 100644 --- a/DiscImageChef.Tests/Images/CopyQM.cs +++ b/DiscImageChef.Tests/Images/CopyQM.cs @@ -29,7 +29,7 @@ using System.IO; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Images/D88.cs b/DiscImageChef.Tests/Images/D88.cs index 60e0c63bf..003998313 100644 --- a/DiscImageChef.Tests/Images/D88.cs +++ b/DiscImageChef.Tests/Images/D88.cs @@ -29,7 +29,7 @@ using System.IO; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Images/DART.cs b/DiscImageChef.Tests/Images/DART.cs index 06ce1c1ca..669e33419 100644 --- a/DiscImageChef.Tests/Images/DART.cs +++ b/DiscImageChef.Tests/Images/DART.cs @@ -29,7 +29,7 @@ using System.IO; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Images/DiskCopy42.cs b/DiscImageChef.Tests/Images/DiskCopy42.cs index 02a9d6649..4b4641865 100644 --- a/DiscImageChef.Tests/Images/DiskCopy42.cs +++ b/DiscImageChef.Tests/Images/DiskCopy42.cs @@ -29,7 +29,7 @@ using System.IO; using DiscImageChef.Checksums; using DiscImageChef.CommonTypes; -using DiscImageChef.DiscImages; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/Acorn.cs b/DiscImageChef.Tests/Partitions/Acorn.cs index a55bb02d6..92e9c6160 100644 --- a/DiscImageChef.Tests/Partitions/Acorn.cs +++ b/DiscImageChef.Tests/Partitions/Acorn.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/AppleMap.cs b/DiscImageChef.Tests/Partitions/AppleMap.cs index 1507b85b1..4e454fd8f 100644 --- a/DiscImageChef.Tests/Partitions/AppleMap.cs +++ b/DiscImageChef.Tests/Partitions/AppleMap.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/Atari.cs b/DiscImageChef.Tests/Partitions/Atari.cs index c1745f70e..85b9919bf 100644 --- a/DiscImageChef.Tests/Partitions/Atari.cs +++ b/DiscImageChef.Tests/Partitions/Atari.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/BSD.cs b/DiscImageChef.Tests/Partitions/BSD.cs index b3203fc4d..6ab0aeef9 100644 --- a/DiscImageChef.Tests/Partitions/BSD.cs +++ b/DiscImageChef.Tests/Partitions/BSD.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/GPT.cs b/DiscImageChef.Tests/Partitions/GPT.cs index 20c7ead1f..cfa29c06f 100644 --- a/DiscImageChef.Tests/Partitions/GPT.cs +++ b/DiscImageChef.Tests/Partitions/GPT.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/MBR.cs b/DiscImageChef.Tests/Partitions/MBR.cs index 1174b37ef..6837fce13 100644 --- a/DiscImageChef.Tests/Partitions/MBR.cs +++ b/DiscImageChef.Tests/Partitions/MBR.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/MINIX.cs b/DiscImageChef.Tests/Partitions/MINIX.cs index 0f29220b0..33ad21531 100644 --- a/DiscImageChef.Tests/Partitions/MINIX.cs +++ b/DiscImageChef.Tests/Partitions/MINIX.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/PC98.cs b/DiscImageChef.Tests/Partitions/PC98.cs index da74492a4..f4cc27a84 100644 --- a/DiscImageChef.Tests/Partitions/PC98.cs +++ b/DiscImageChef.Tests/Partitions/PC98.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/RDB.cs b/DiscImageChef.Tests/Partitions/RDB.cs index 442686fc6..49d7a3b6e 100644 --- a/DiscImageChef.Tests/Partitions/RDB.cs +++ b/DiscImageChef.Tests/Partitions/RDB.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/SGI.cs b/DiscImageChef.Tests/Partitions/SGI.cs index 5b9863162..ec47546c2 100644 --- a/DiscImageChef.Tests/Partitions/SGI.cs +++ b/DiscImageChef.Tests/Partitions/SGI.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/Sun.cs b/DiscImageChef.Tests/Partitions/Sun.cs index 68ee7e35f..35c73a0ac 100644 --- a/DiscImageChef.Tests/Partitions/Sun.cs +++ b/DiscImageChef.Tests/Partitions/Sun.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.Tests/Partitions/VTOC.cs b/DiscImageChef.Tests/Partitions/VTOC.cs index cbeabda08..2ad2689ae 100644 --- a/DiscImageChef.Tests/Partitions/VTOC.cs +++ b/DiscImageChef.Tests/Partitions/VTOC.cs @@ -29,6 +29,7 @@ using System.Collections.Generic; using System.IO; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.DiscImages; using DiscImageChef.Filters; using NUnit.Framework; diff --git a/DiscImageChef.sln b/DiscImageChef.sln index abd01fc7e..459bb7e35 100644 --- a/DiscImageChef.sln +++ b/DiscImageChef.sln @@ -21,12 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Decoders", "D EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Devices", "DiscImageChef.Devices\DiscImageChef.Devices.csproj", "{57BB2341-AB62-48FD-91B8-46F5A2F9ED51}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Interop", "DiscImageChef.Interop\DiscImageChef.Interop.csproj", "{9183F2E0-A879-4F23-9EE3-C6908F1332B2}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Console", "DiscImageChef.Console\DiscImageChef.Console.csproj", "{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Metadata", "DiscImageChef.Metadata\DiscImageChef.Metadata.csproj", "{9F213318-5CB8-4066-A757-074489C9F818}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Settings", "DiscImageChef.Settings\DiscImageChef.Settings.csproj", "{5C4C7BAA-CF60-4233-84ED-39CB2312AF38}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscImageChef.Filters", "DiscImageChef.Filters\DiscImageChef.Filters.csproj", "{D571B8EF-903D-4353-BDD5-B834F9F029EF}" @@ -83,18 +79,10 @@ Global {57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Debug|x86.Build.0 = Debug|Any CPU {57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Release|x86.ActiveCfg = Release|Any CPU {57BB2341-AB62-48FD-91B8-46F5A2F9ED51}.Release|x86.Build.0 = Release|Any CPU - {9183F2E0-A879-4F23-9EE3-C6908F1332B2}.Debug|x86.ActiveCfg = Debug|Any CPU - {9183F2E0-A879-4F23-9EE3-C6908F1332B2}.Debug|x86.Build.0 = Debug|Any CPU - {9183F2E0-A879-4F23-9EE3-C6908F1332B2}.Release|x86.ActiveCfg = Release|Any CPU - {9183F2E0-A879-4F23-9EE3-C6908F1332B2}.Release|x86.Build.0 = Release|Any CPU {CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|x86.ActiveCfg = Debug|Any CPU {CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Debug|x86.Build.0 = Debug|Any CPU {CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|x86.ActiveCfg = Release|Any CPU {CCAA7AFE-C094-4D82-A66D-630DE8A3F545}.Release|x86.Build.0 = Release|Any CPU - {9F213318-5CB8-4066-A757-074489C9F818}.Debug|x86.ActiveCfg = Debug|Any CPU - {9F213318-5CB8-4066-A757-074489C9F818}.Debug|x86.Build.0 = Debug|Any CPU - {9F213318-5CB8-4066-A757-074489C9F818}.Release|x86.ActiveCfg = Release|Any CPU - {9F213318-5CB8-4066-A757-074489C9F818}.Release|x86.Build.0 = Release|Any CPU {5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Debug|x86.ActiveCfg = Debug|Any CPU {5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Debug|x86.Build.0 = Debug|Any CPU {5C4C7BAA-CF60-4233-84ED-39CB2312AF38}.Release|x86.ActiveCfg = Release|Any CPU diff --git a/DiscImageChef/Commands/Analyze.cs b/DiscImageChef/Commands/Analyze.cs index eb186ffdd..79addcaf1 100644 --- a/DiscImageChef/Commands/Analyze.cs +++ b/DiscImageChef/Commands/Analyze.cs @@ -34,10 +34,9 @@ using System; using System.Collections.Generic; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; using DiscImageChef.Filters; namespace DiscImageChef.Commands diff --git a/DiscImageChef/Commands/Checksum.cs b/DiscImageChef/Commands/Checksum.cs index 98af02af5..dc0b2ad0e 100644 --- a/DiscImageChef/Commands/Checksum.cs +++ b/DiscImageChef/Commands/Checksum.cs @@ -32,9 +32,11 @@ using System; using System.Collections.Generic; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; using Schemas; diff --git a/DiscImageChef/Commands/Compare.cs b/DiscImageChef/Commands/Compare.cs index 8e7f30008..5687a536f 100644 --- a/DiscImageChef/Commands/Compare.cs +++ b/DiscImageChef/Commands/Compare.cs @@ -33,9 +33,12 @@ using System; using System.Collections.Generic; using System.Text; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; namespace DiscImageChef.Commands @@ -118,8 +121,8 @@ namespace DiscImageChef.Commands bool imagesDiffer = false; - DiscImages.ImageInfo image1Info = new DiscImages.ImageInfo(); - DiscImages.ImageInfo image2Info = new DiscImages.ImageInfo(); + CommonTypes.Structs.ImageInfo image1Info = new CommonTypes.Structs.ImageInfo(); + CommonTypes.Structs.ImageInfo image2Info = new CommonTypes.Structs.ImageInfo(); List image1Sessions = new List(); List image2Sessions = new List(); Dictionary image1DiskTags = new Dictionary(); diff --git a/DiscImageChef/Commands/ConvertImage.cs b/DiscImageChef/Commands/ConvertImage.cs index 172ca3ce9..955a6a813 100644 --- a/DiscImageChef/Commands/ConvertImage.cs +++ b/DiscImageChef/Commands/ConvertImage.cs @@ -35,13 +35,16 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml.Serialization; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; -using DiscImageChef.Metadata; using Schemas; -using Version = DiscImageChef.Interop.Version; +using Version = DiscImageChef.CommonTypes.Interop.Version; namespace DiscImageChef.Commands { @@ -261,7 +264,7 @@ namespace DiscImageChef.Commands return; } - DiscImages.ImageInfo metadata = new DiscImages.ImageInfo + CommonTypes.Structs.ImageInfo metadata = new CommonTypes.Structs.ImageInfo { Application = "DiscImageChef", ApplicationVersion = Version.GetVersion(), diff --git a/DiscImageChef/Commands/CreateSidecar.cs b/DiscImageChef/Commands/CreateSidecar.cs index d1bd24594..223303938 100644 --- a/DiscImageChef/Commands/CreateSidecar.cs +++ b/DiscImageChef/Commands/CreateSidecar.cs @@ -36,9 +36,10 @@ using System.IO; using System.Linq; using System.Text; using System.Xml.Serialization; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; using Schemas; diff --git a/DiscImageChef/Commands/Decode.cs b/DiscImageChef/Commands/Decode.cs index ed1f6b3da..fbdf22058 100644 --- a/DiscImageChef/Commands/Decode.cs +++ b/DiscImageChef/Commands/Decode.cs @@ -30,14 +30,15 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Enums; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; using DiscImageChef.Core; using DiscImageChef.Decoders.ATA; using DiscImageChef.Decoders.CD; using DiscImageChef.Decoders.SCSI; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; -using Session = DiscImageChef.Decoders.CD.Session; namespace DiscImageChef.Commands { diff --git a/DiscImageChef/Commands/DeviceReport.cs b/DiscImageChef/Commands/DeviceReport.cs index 523939c0d..1c9ceb0f1 100644 --- a/DiscImageChef/Commands/DeviceReport.cs +++ b/DiscImageChef/Commands/DeviceReport.cs @@ -63,9 +63,9 @@ namespace DiscImageChef.Commands Core.Statistics.AddDevice(dev); - Metadata.DeviceReport report = new Metadata.DeviceReport(); - bool removable = false; - string xmlFile; + CommonTypes.Metadata.DeviceReport report = new CommonTypes.Metadata.DeviceReport(); + bool removable = false; + string xmlFile; if(!string.IsNullOrWhiteSpace(dev.Manufacturer) && !string.IsNullOrWhiteSpace(dev.Revision)) xmlFile = dev.Manufacturer + "_" + dev.Model + "_" + dev.Revision + ".xml"; @@ -100,7 +100,7 @@ namespace DiscImageChef.Commands FileStream xmlFs = new FileStream(xmlFile, FileMode.Create); - XmlSerializer xmlSer = new XmlSerializer(typeof(Metadata.DeviceReport)); + XmlSerializer xmlSer = new XmlSerializer(typeof(CommonTypes.Metadata.DeviceReport)); xmlSer.Serialize(xmlFs, report); xmlFs.Close(); Core.Statistics.AddCommand("device-report"); diff --git a/DiscImageChef/Commands/DumpMedia.cs b/DiscImageChef/Commands/DumpMedia.cs index 647d183b5..b1ade643a 100644 --- a/DiscImageChef/Commands/DumpMedia.cs +++ b/DiscImageChef/Commands/DumpMedia.cs @@ -36,13 +36,14 @@ using System.IO; using System.Linq; using System.Text; using System.Xml.Serialization; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; using DiscImageChef.Core; using DiscImageChef.Core.Devices.Dumping; using DiscImageChef.Core.Logging; using DiscImageChef.Devices; -using DiscImageChef.DiscImages; -using DiscImageChef.Metadata; using Schemas; namespace DiscImageChef.Commands diff --git a/DiscImageChef/Commands/Entropy.cs b/DiscImageChef/Commands/Entropy.cs index 0de3307d5..f4f4bc090 100644 --- a/DiscImageChef/Commands/Entropy.cs +++ b/DiscImageChef/Commands/Entropy.cs @@ -34,9 +34,11 @@ using System; using System.Collections.Generic; using System.Linq; using DiscImageChef.Checksums; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; namespace DiscImageChef.Commands diff --git a/DiscImageChef/Commands/ExtractFiles.cs b/DiscImageChef/Commands/ExtractFiles.cs index bbd533230..09385deef 100644 --- a/DiscImageChef/Commands/ExtractFiles.cs +++ b/DiscImageChef/Commands/ExtractFiles.cs @@ -35,10 +35,10 @@ using System.Collections.Generic; using System.IO; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; using DiscImageChef.Filters; namespace DiscImageChef.Commands diff --git a/DiscImageChef/Commands/Formats.cs b/DiscImageChef/Commands/Formats.cs index daded400a..0067b366c 100644 --- a/DiscImageChef/Commands/Formats.cs +++ b/DiscImageChef/Commands/Formats.cs @@ -32,10 +32,10 @@ using System.Collections.Generic; using System.Linq; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; using DiscImageChef.Filters; using DiscImageChef.Partitions; diff --git a/DiscImageChef/Commands/ImageInfo.cs b/DiscImageChef/Commands/ImageInfo.cs index ea6f021ef..f176d4c59 100644 --- a/DiscImageChef/Commands/ImageInfo.cs +++ b/DiscImageChef/Commands/ImageInfo.cs @@ -31,9 +31,10 @@ // ****************************************************************************/ using System; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; namespace DiscImageChef.Commands diff --git a/DiscImageChef/Commands/ListOptions.cs b/DiscImageChef/Commands/ListOptions.cs index fb2e7ad38..74c735a5b 100644 --- a/DiscImageChef/Commands/ListOptions.cs +++ b/DiscImageChef/Commands/ListOptions.cs @@ -33,10 +33,10 @@ using System; using System.Collections.Generic; using System.Linq; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; namespace DiscImageChef.Commands { diff --git a/DiscImageChef/Commands/Ls.cs b/DiscImageChef/Commands/Ls.cs index 4b96111b4..624a69d72 100644 --- a/DiscImageChef/Commands/Ls.cs +++ b/DiscImageChef/Commands/Ls.cs @@ -34,10 +34,10 @@ using System; using System.Collections.Generic; using System.Text; using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; -using DiscImageChef.Filesystems; using DiscImageChef.Filters; namespace DiscImageChef.Commands diff --git a/DiscImageChef/Commands/PrintHex.cs b/DiscImageChef/Commands/PrintHex.cs index 946ca2320..69fe80926 100644 --- a/DiscImageChef/Commands/PrintHex.cs +++ b/DiscImageChef/Commands/PrintHex.cs @@ -30,9 +30,10 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; namespace DiscImageChef.Commands diff --git a/DiscImageChef/Commands/Statistics.cs b/DiscImageChef/Commands/Statistics.cs index 5f02b35b1..c8ba75143 100644 --- a/DiscImageChef/Commands/Statistics.cs +++ b/DiscImageChef/Commands/Statistics.cs @@ -30,8 +30,8 @@ // Copyright © 2011-2018 Natalia Portillo // ****************************************************************************/ +using DiscImageChef.CommonTypes.Metadata; using DiscImageChef.Console; -using DiscImageChef.Metadata; namespace DiscImageChef.Commands { diff --git a/DiscImageChef/Commands/Verify.cs b/DiscImageChef/Commands/Verify.cs index d82465d21..58ab4728d 100644 --- a/DiscImageChef/Commands/Verify.cs +++ b/DiscImageChef/Commands/Verify.cs @@ -32,9 +32,11 @@ using System; using System.Collections.Generic; +using DiscImageChef.CommonTypes; +using DiscImageChef.CommonTypes.Interfaces; +using DiscImageChef.CommonTypes.Structs; using DiscImageChef.Console; using DiscImageChef.Core; -using DiscImageChef.DiscImages; using DiscImageChef.Filters; namespace DiscImageChef.Commands diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj index 12555aedb..f9ef5d7fe 100644 --- a/DiscImageChef/DiscImageChef.csproj +++ b/DiscImageChef/DiscImageChef.csproj @@ -221,18 +221,10 @@ {57BB2341-AB62-48FD-91B8-46F5A2F9ED51} DiscImageChef.Devices - - {9183F2E0-A879-4F23-9EE3-C6908F1332B2} - DiscImageChef.Interop - {CCAA7AFE-C094-4D82-A66D-630DE8A3F545} DiscImageChef.Console - - {9F213318-5CB8-4066-A757-074489C9F818} - DiscImageChef.Metadata - {5C4C7BAA-CF60-4233-84ED-39CB2312AF38} DiscImageChef.Settings From 247275f14a5eaeb3d4d28b35714cfe4e34bf9232 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 25 Jun 2018 19:22:42 +0100 Subject: [PATCH 6/7] Relicense DiscImageChef.CommonTypes to MIT. --- .../DiscImageChef.CommonTypes.csproj | 5 --- DiscImageChef.CommonTypes/Enums/Images.cs | 26 +++++++----- .../Exceptions/Images.cs | 26 +++++++----- .../Extents/ExtentsByte.cs | 26 +++++++----- .../Extents/ExtentsConverter.cs | 26 +++++++----- .../Extents/ExtentsInt.cs | 26 +++++++----- .../Extents/ExtentsLong.cs | 26 +++++++----- .../Extents/ExtentsSByte.cs | 26 +++++++----- .../Extents/ExtentsShort.cs | 26 +++++++----- .../Extents/ExtentsUInt.cs | 26 +++++++----- .../Extents/ExtentsULong.cs | 26 +++++++----- .../Extents/ExtentsUShort.cs | 26 +++++++----- DiscImageChef.CommonTypes/Filters.cs | 26 +++++++----- DiscImageChef.CommonTypes/Geometry.cs | 40 ++++++++++++++++++- .../Interfaces/IChecksum.cs | 26 +++++++----- .../Interfaces/IFilesystem.cs | 26 +++++++----- .../Interfaces/IFilter.cs | 26 +++++++----- .../Interfaces/IFloppyImage.cs | 26 +++++++----- .../Interfaces/IMediaImage.cs | 26 +++++++----- .../Interfaces/IPartition.cs | 26 +++++++----- .../Interfaces/IReadOnlyFilesystem.cs | 26 +++++++----- .../Interfaces/IWritableFloppyImage.cs | 26 +++++++----- .../Interfaces/IWritableImage.cs | 26 +++++++----- DiscImageChef.CommonTypes/MediaType.cs | 26 +++++++----- .../MediaTypeFromSCSI.cs | 26 +++++++----- .../Metadata/DeviceReport.cs | 26 +++++++----- .../Metadata/Dimensions.cs | 26 +++++++----- .../Metadata/MediaType.cs | 26 +++++++----- DiscImageChef.CommonTypes/Metadata/Resume.cs | 26 +++++++----- .../Metadata/Statistics.cs | 26 +++++++----- DiscImageChef.CommonTypes/Metadata/Version.cs | 26 +++++++----- DiscImageChef.CommonTypes/Partition.cs | 26 +++++++----- DiscImageChef.CommonTypes/PluginBase.cs | 26 +++++++----- .../Structs/Filesystems.cs | 26 +++++++----- DiscImageChef.CommonTypes/Structs/Images.cs | 26 +++++++----- 35 files changed, 567 insertions(+), 336 deletions(-) diff --git a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj index f396d6964..3619ceefa 100644 --- a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj +++ b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj @@ -87,11 +87,6 @@ - - - LICENSE.LGPL - - diff --git a/DiscImageChef.CommonTypes/Enums/Images.cs b/DiscImageChef.CommonTypes/Enums/Images.cs index 372ca5942..403ff08c9 100644 --- a/DiscImageChef.CommonTypes/Enums/Images.cs +++ b/DiscImageChef.CommonTypes/Enums/Images.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Exceptions/Images.cs b/DiscImageChef.CommonTypes/Exceptions/Images.cs index e724f90b4..39de0c2f5 100644 --- a/DiscImageChef.CommonTypes/Exceptions/Images.cs +++ b/DiscImageChef.CommonTypes/Exceptions/Images.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Extents/ExtentsByte.cs b/DiscImageChef.CommonTypes/Extents/ExtentsByte.cs index e51e21546..21249ae01 100644 --- a/DiscImageChef.CommonTypes/Extents/ExtentsByte.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsByte.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Extents/ExtentsConverter.cs b/DiscImageChef.CommonTypes/Extents/ExtentsConverter.cs index 1739b4497..75a9b8131 100644 --- a/DiscImageChef.CommonTypes/Extents/ExtentsConverter.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsConverter.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Extents/ExtentsInt.cs b/DiscImageChef.CommonTypes/Extents/ExtentsInt.cs index 7f7e7d310..9326dc216 100644 --- a/DiscImageChef.CommonTypes/Extents/ExtentsInt.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsInt.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License aint with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Extents/ExtentsLong.cs b/DiscImageChef.CommonTypes/Extents/ExtentsLong.cs index fa401deaa..71cbfd6c8 100644 --- a/DiscImageChef.CommonTypes/Extents/ExtentsLong.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsLong.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Extents/ExtentsSByte.cs b/DiscImageChef.CommonTypes/Extents/ExtentsSByte.cs index e740dbe01..9ec2b1286 100644 --- a/DiscImageChef.CommonTypes/Extents/ExtentsSByte.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsSByte.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Extents/ExtentsShort.cs b/DiscImageChef.CommonTypes/Extents/ExtentsShort.cs index bc677e27d..e67348913 100644 --- a/DiscImageChef.CommonTypes/Extents/ExtentsShort.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsShort.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License ashort with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Extents/ExtentsUInt.cs b/DiscImageChef.CommonTypes/Extents/ExtentsUInt.cs index 7f092cb58..c46a4d908 100644 --- a/DiscImageChef.CommonTypes/Extents/ExtentsUInt.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsUInt.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License auint with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Extents/ExtentsULong.cs b/DiscImageChef.CommonTypes/Extents/ExtentsULong.cs index c999dbae9..735b6998b 100644 --- a/DiscImageChef.CommonTypes/Extents/ExtentsULong.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsULong.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License aulong with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Extents/ExtentsUShort.cs b/DiscImageChef.CommonTypes/Extents/ExtentsUShort.cs index 6ee689418..eddcac3a4 100644 --- a/DiscImageChef.CommonTypes/Extents/ExtentsUShort.cs +++ b/DiscImageChef.CommonTypes/Extents/ExtentsUShort.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License aushort with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Filters.cs b/DiscImageChef.CommonTypes/Filters.cs index 67a530ddd..5332d8629 100644 --- a/DiscImageChef.CommonTypes/Filters.cs +++ b/DiscImageChef.CommonTypes/Filters.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Geometry.cs b/DiscImageChef.CommonTypes/Geometry.cs index 3c4119ae8..cb6954cca 100644 --- a/DiscImageChef.CommonTypes/Geometry.cs +++ b/DiscImageChef.CommonTypes/Geometry.cs @@ -1,4 +1,42 @@ -using System.Linq; +// /*************************************************************************** +// The Disc Image Chef +// ---------------------------------------------------------------------------- +// +// Filename : Geometry.cs +// Author(s) : Natalia Portillo +// +// Component : CommonTypes. +// +// --[ Description ] ---------------------------------------------------------- +// +// Includes geometry for several medias. +// +// --[ License ] -------------------------------------------------------------- +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +// ---------------------------------------------------------------------------- +// Copyright © 2011-2018 Natalia Portillo +// ****************************************************************************/ + +using System.Linq; namespace DiscImageChef.CommonTypes { diff --git a/DiscImageChef.CommonTypes/Interfaces/IChecksum.cs b/DiscImageChef.CommonTypes/Interfaces/IChecksum.cs index ac5650612..b63da1b55 100644 --- a/DiscImageChef.CommonTypes/Interfaces/IChecksum.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IChecksum.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Interfaces/IFilesystem.cs b/DiscImageChef.CommonTypes/Interfaces/IFilesystem.cs index 132d3358c..470129ed7 100644 --- a/DiscImageChef.CommonTypes/Interfaces/IFilesystem.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IFilesystem.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Interfaces/IFilter.cs b/DiscImageChef.CommonTypes/Interfaces/IFilter.cs index 9af7c2ae5..81779d7df 100644 --- a/DiscImageChef.CommonTypes/Interfaces/IFilter.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IFilter.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Interfaces/IFloppyImage.cs b/DiscImageChef.CommonTypes/Interfaces/IFloppyImage.cs index b392df398..edc688106 100644 --- a/DiscImageChef.CommonTypes/Interfaces/IFloppyImage.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IFloppyImage.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Interfaces/IMediaImage.cs b/DiscImageChef.CommonTypes/Interfaces/IMediaImage.cs index 20ffa4e20..7cce3f48a 100644 --- a/DiscImageChef.CommonTypes/Interfaces/IMediaImage.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IMediaImage.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Interfaces/IPartition.cs b/DiscImageChef.CommonTypes/Interfaces/IPartition.cs index a19216bed..759bb17b2 100644 --- a/DiscImageChef.CommonTypes/Interfaces/IPartition.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IPartition.cs @@ -14,18 +14,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Interfaces/IReadOnlyFilesystem.cs b/DiscImageChef.CommonTypes/Interfaces/IReadOnlyFilesystem.cs index deeb4c138..f8dec71ea 100644 --- a/DiscImageChef.CommonTypes/Interfaces/IReadOnlyFilesystem.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IReadOnlyFilesystem.cs @@ -14,18 +14,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Interfaces/IWritableFloppyImage.cs b/DiscImageChef.CommonTypes/Interfaces/IWritableFloppyImage.cs index 1dec8d552..99174b948 100644 --- a/DiscImageChef.CommonTypes/Interfaces/IWritableFloppyImage.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IWritableFloppyImage.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Interfaces/IWritableImage.cs b/DiscImageChef.CommonTypes/Interfaces/IWritableImage.cs index 8dadc92b8..9ab7e898f 100644 --- a/DiscImageChef.CommonTypes/Interfaces/IWritableImage.cs +++ b/DiscImageChef.CommonTypes/Interfaces/IWritableImage.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/MediaType.cs b/DiscImageChef.CommonTypes/MediaType.cs index 36afd3bcf..e97866614 100644 --- a/DiscImageChef.CommonTypes/MediaType.cs +++ b/DiscImageChef.CommonTypes/MediaType.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/MediaTypeFromSCSI.cs b/DiscImageChef.CommonTypes/MediaTypeFromSCSI.cs index 3d729a5e3..95366622f 100644 --- a/DiscImageChef.CommonTypes/MediaTypeFromSCSI.cs +++ b/DiscImageChef.CommonTypes/MediaTypeFromSCSI.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Metadata/DeviceReport.cs b/DiscImageChef.CommonTypes/Metadata/DeviceReport.cs index a10410688..7ad5e7df5 100644 --- a/DiscImageChef.CommonTypes/Metadata/DeviceReport.cs +++ b/DiscImageChef.CommonTypes/Metadata/DeviceReport.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Metadata/Dimensions.cs b/DiscImageChef.CommonTypes/Metadata/Dimensions.cs index 2598876a5..354231e7f 100644 --- a/DiscImageChef.CommonTypes/Metadata/Dimensions.cs +++ b/DiscImageChef.CommonTypes/Metadata/Dimensions.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Metadata/MediaType.cs b/DiscImageChef.CommonTypes/Metadata/MediaType.cs index 2cf3051b2..8cbc01cfa 100644 --- a/DiscImageChef.CommonTypes/Metadata/MediaType.cs +++ b/DiscImageChef.CommonTypes/Metadata/MediaType.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Metadata/Resume.cs b/DiscImageChef.CommonTypes/Metadata/Resume.cs index 5338358a2..cae1cb768 100644 --- a/DiscImageChef.CommonTypes/Metadata/Resume.cs +++ b/DiscImageChef.CommonTypes/Metadata/Resume.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Metadata/Statistics.cs b/DiscImageChef.CommonTypes/Metadata/Statistics.cs index 593a3b2f7..3b7ef36ce 100644 --- a/DiscImageChef.CommonTypes/Metadata/Statistics.cs +++ b/DiscImageChef.CommonTypes/Metadata/Statistics.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Metadata/Version.cs b/DiscImageChef.CommonTypes/Metadata/Version.cs index 82c487e35..66c0828d7 100644 --- a/DiscImageChef.CommonTypes/Metadata/Version.cs +++ b/DiscImageChef.CommonTypes/Metadata/Version.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Partition.cs b/DiscImageChef.CommonTypes/Partition.cs index e876ba1ee..cd7813925 100644 --- a/DiscImageChef.CommonTypes/Partition.cs +++ b/DiscImageChef.CommonTypes/Partition.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/PluginBase.cs b/DiscImageChef.CommonTypes/PluginBase.cs index 499d71ad1..673eb9d80 100644 --- a/DiscImageChef.CommonTypes/PluginBase.cs +++ b/DiscImageChef.CommonTypes/PluginBase.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Structs/Filesystems.cs b/DiscImageChef.CommonTypes/Structs/Filesystems.cs index 060430a79..fdf602250 100644 --- a/DiscImageChef.CommonTypes/Structs/Filesystems.cs +++ b/DiscImageChef.CommonTypes/Structs/Filesystems.cs @@ -14,18 +14,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo diff --git a/DiscImageChef.CommonTypes/Structs/Images.cs b/DiscImageChef.CommonTypes/Structs/Images.cs index 8a22ffd43..4c0cdc64d 100644 --- a/DiscImageChef.CommonTypes/Structs/Images.cs +++ b/DiscImageChef.CommonTypes/Structs/Images.cs @@ -13,18 +13,24 @@ // // --[ License ] -------------------------------------------------------------- // -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: // -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // // ---------------------------------------------------------------------------- // Copyright © 2011-2018 Natalia Portillo From 68309fc408141745e265304558e484d29de55363 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 1 Jul 2018 22:51:06 +0100 Subject: [PATCH 7/7] Removed spurious debug lines. --- DiscImageChef.Devices/Windows/UsbFunctions.cs | 2 +- DiscImageChef.DiscImages/Alcohol120.cs | 3 --- DiscImageChef.DiscImages/CHD.cs | 10 +++++----- DiscImageChef.DiscImages/Partimage.cs | 6 +----- DiscImageChef.Filters/PCExchange.cs | 1 - 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/DiscImageChef.Devices/Windows/UsbFunctions.cs b/DiscImageChef.Devices/Windows/UsbFunctions.cs index 60a691772..d77952201 100644 --- a/DiscImageChef.Devices/Windows/UsbFunctions.cs +++ b/DiscImageChef.Devices/Windows/UsbFunctions.cs @@ -253,7 +253,7 @@ namespace DiscImageChef.Devices.Windows instanceId = Marshal.PtrToStringAuto(ptrInstanceBuf); Marshal.FreeHGlobal(ptrInstanceBuf); - System.Console.WriteLine("InstanceId: {0}", instanceId); + //System.Console.WriteLine("InstanceId: {0}", instanceId); //break; } } diff --git a/DiscImageChef.DiscImages/Alcohol120.cs b/DiscImageChef.DiscImages/Alcohol120.cs index 69794f1ff..5b832f096 100644 --- a/DiscImageChef.DiscImages/Alcohol120.cs +++ b/DiscImageChef.DiscImages/Alcohol120.cs @@ -1979,9 +1979,6 @@ namespace DiscImageChef.DiscImages if(trackControl == 0 && track.TrackType != TrackType.Audio) trackControl = (byte)CdFlags.DataTrack; - System.Console.WriteLine("ttyp {0} alctype {1}", track.TrackType, - TrackTypeToAlcohol(track.TrackType)); - thisSessionTracks.Add((int)track.TrackSequence, new AlcoholTrack { mode = TrackTypeToAlcohol(track.TrackType), diff --git a/DiscImageChef.DiscImages/CHD.cs b/DiscImageChef.DiscImages/CHD.cs index b1087b59c..46612fce9 100644 --- a/DiscImageChef.DiscImages/CHD.cs +++ b/DiscImageChef.DiscImages/CHD.cs @@ -290,7 +290,7 @@ namespace DiscImageChef.DiscImages } DateTime end = DateTime.UtcNow; - System.Console.WriteLine("Took {0} seconds", (end - start).TotalSeconds); + DicConsole.DebugWriteLine("CHD plugin","Took {0} seconds", (end - start).TotalSeconds); imageInfo.MediaType = MediaType.GENERIC_HDD; imageInfo.Sectors = hdrV1.hunksize * hdrV1.totalhunks; @@ -363,7 +363,7 @@ namespace DiscImageChef.DiscImages } DateTime end = DateTime.UtcNow; - System.Console.WriteLine("Took {0} seconds", (end - start).TotalSeconds); + DicConsole.DebugWriteLine("CHD plugin","Took {0} seconds", (end - start).TotalSeconds); imageInfo.MediaType = MediaType.GENERIC_HDD; imageInfo.Sectors = hdrV2.hunksize * hdrV2.totalhunks; @@ -419,7 +419,7 @@ namespace DiscImageChef.DiscImages stream.Read(hunkMap, 0, hunkMap.Length); DateTime end = DateTime.UtcNow; - System.Console.WriteLine("Took {0} seconds", (end - start).TotalSeconds); + DicConsole.DebugWriteLine("CHD plugin","Took {0} seconds", (end - start).TotalSeconds); nextMetaOff = hdrV3.metaoffset; @@ -464,7 +464,7 @@ namespace DiscImageChef.DiscImages stream.Read(hunkMap, 0, hunkMap.Length); DateTime end = DateTime.UtcNow; - System.Console.WriteLine("Took {0} seconds", (end - start).TotalSeconds); + DicConsole.DebugWriteLine("CHD plugin","Took {0} seconds", (end - start).TotalSeconds); nextMetaOff = hdrV4.metaoffset; @@ -546,7 +546,7 @@ namespace DiscImageChef.DiscImages } DateTime end = DateTime.UtcNow; - System.Console.WriteLine("Took {0} seconds", (end - start).TotalSeconds); + DicConsole.DebugWriteLine("CHD plugin","Took {0} seconds", (end - start).TotalSeconds); } else throw new ImageNotSupportedException("Cannot read compressed CHD version 5"); diff --git a/DiscImageChef.DiscImages/Partimage.cs b/DiscImageChef.DiscImages/Partimage.cs index 8dc9fb988..417cd3511 100644 --- a/DiscImageChef.DiscImages/Partimage.cs +++ b/DiscImageChef.DiscImages/Partimage.cs @@ -436,11 +436,7 @@ namespace DiscImageChef.DiscImages imageStream.Seek(imageOff, SeekOrigin.Begin); imageStream.Read(sector, 0, (int)imageInfo.SectorSize); - if(sectorCache.Count > MAX_CACHED_SECTORS) - { - System.Console.WriteLine("Cache cleared"); - sectorCache.Clear(); - } + if(sectorCache.Count > MAX_CACHED_SECTORS) sectorCache.Clear(); sectorCache.Add(sectorAddress, sector); diff --git a/DiscImageChef.Filters/PCExchange.cs b/DiscImageChef.Filters/PCExchange.cs index e0cf8ac5f..7a9f9462d 100644 --- a/DiscImageChef.Filters/PCExchange.cs +++ b/DiscImageChef.Filters/PCExchange.cs @@ -133,7 +133,6 @@ namespace DiscImageChef.Filters public bool Identify(Stream stream) { - System.Console.WriteLine("parentFolder"); return false; }