diff --git a/Zenith-latest-2020-05-01-15_31_17.iso b/Zenith-latest-2020-05-01-18_41_01.iso old mode 100644 new mode 100755 similarity index 99% rename from Zenith-latest-2020-05-01-15_31_17.iso rename to Zenith-latest-2020-05-01-18_41_01.iso index 2bb5a6aa..d8f1700f Binary files a/Zenith-latest-2020-05-01-15_31_17.iso and b/Zenith-latest-2020-05-01-18_41_01.iso differ diff --git a/src/Home/ahci.CC b/src/Home/ahci.CC old mode 100644 new mode 100755 index 3cf0817b..9d22eb4b --- a/src/Home/ahci.CC +++ b/src/Home/ahci.CC @@ -103,7 +103,10 @@ U0 AHCIPortIdentify(CBlkDev *bd) cmd_fis = &cmd_table->command_fis; MemSet(cmd_fis, 0, sizeof(CFisH2D)); cmd_fis->type = FISt_H2D; - cmd_fis->command = ATA_IDENTIFY; + if (Bt(&port->command, AHCI_PxCMDf_ATAPI)) + cmd_fis->command = ATA_IDENTIFY_PACKET; + else + cmd_fis->command = ATA_IDENTIFY; cmd_fis->device = 0; //No bits need to be set in the device register. Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set cmd_fis->c to 1 (Command bit). diff --git a/src/Kernel/KernelA.HH b/src/Kernel/KernelA.HH index 478c18b4..5d07f2a7 100755 --- a/src/Kernel/KernelA.HH +++ b/src/Kernel/KernelA.HH @@ -2896,6 +2896,7 @@ class CHBACmdTable #define ATA_WRITE_MULTI_EXT 0x39 #define ATA_WRITE_DMA_EXT 0x35 #define ATA_IDENTIFY 0xEC +#define ATA_IDENTIFY_PACKET 0xA1 // IDENTIFY PACKET DEVICE, mirror of ATA_PACKET for ATAPI #define ATAS_ERR 0x01 #define ATAS_DRQ 0x08 diff --git a/src/Kernel/SerialDev/Keyboard.CC b/src/Kernel/SerialDev/Keyboard.CC index 6ae3b870..efa11466 100755 --- a/src/Kernel/SerialDev/Keyboard.CC +++ b/src/Kernel/SerialDev/Keyboard.CC @@ -180,7 +180,7 @@ U8 num_lock_map[0x100]={ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,SC_SHIFT,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,8,9,10,0,5,6,7,0,2, 3,4,11,0x34,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,