Changeset 5942 in vbox
- Timestamp:
- Dec 3, 2007 12:49:37 PM (17 years ago)
- svn:sync-xref-src-repo-rev:
- 26488
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Storage/DevATA.cpp
r5645 r5942 5928 5928 if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0IRQDelay\0R0Enabled\0PIIX4\0")) 5929 5929 return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES, 5930 N_("PIIX3 configuration error: unknown option specified ."));5930 N_("PIIX3 configuration error: unknown option specified")); 5931 5931 5932 5932 rc = CFGMR3QueryBool(pCfgHandle, "GCEnabled", &fGCEnabled); … … 5935 5935 else if (VBOX_FAILURE(rc)) 5936 5936 return PDMDEV_SET_ERROR(pDevIns, rc, 5937 N_("PIIX3 configuration error: failed to read GCEnabled as boolean ."));5937 N_("PIIX3 configuration error: failed to read GCEnabled as boolean")); 5938 5938 Log(("%s: fGCEnabled=%d\n", __FUNCTION__, fGCEnabled)); 5939 5939 … … 5943 5943 else if (VBOX_FAILURE(rc)) 5944 5944 return PDMDEV_SET_ERROR(pDevIns, rc, 5945 N_("PIIX3 configuration error: failed to read R0Enabled as boolean ."));5945 N_("PIIX3 configuration error: failed to read R0Enabled as boolean")); 5946 5946 Log(("%s: fR0Enabled=%d\n", __FUNCTION__, fR0Enabled)); 5947 5947 … … 5951 5951 else if (VBOX_FAILURE(rc)) 5952 5952 return PDMDEV_SET_ERROR(pDevIns, rc, 5953 N_("PIIX3 configuration error: failed to read IRQDelay as integer ."));5953 N_("PIIX3 configuration error: failed to read IRQDelay as integer")); 5954 5954 Log(("%s: DelayIRQMillies=%d\n", __FUNCTION__, DelayIRQMillies)); 5955 5955 Assert(DelayIRQMillies < 50); … … 5960 5960 else if (VBOX_FAILURE(rc)) 5961 5961 return PDMDEV_SET_ERROR(pDevIns, rc, 5962 N_("PIIX3 configuration error: failed to read PIIX4 as boolean ."));5962 N_("PIIX3 configuration error: failed to read PIIX4 as boolean")); 5963 5963 Log(("%s: fPIIX4=%d\n", __FUNCTION__, pData->fPIIX4)); 5964 5964 … … 6031 6031 if (VBOX_FAILURE(rc)) 6032 6032 return PDMDEV_SET_ERROR(pDevIns, rc, 6033 N_("PIIX3 cannot register PCI device ."));6033 N_("PIIX3 cannot register PCI device")); 6034 6034 AssertMsg(pData->dev.devfn == 9 || iInstance != 0, ("pData->dev.devfn=%d\n", pData->dev.devfn)); 6035 6035 rc = PDMDevHlpPCIIORegionRegister(pDevIns, 4, 0x10, PCI_ADDRESS_SPACE_IO, ataBMDMAIORangeMap); 6036 6036 if (VBOX_FAILURE(rc)) 6037 6037 return PDMDEV_SET_ERROR(pDevIns, rc, 6038 N_("PIIX3 cannot register PCI I/O region for BMDMA ."));6038 N_("PIIX3 cannot register PCI I/O region for BMDMA")); 6039 6039 6040 6040 /* … … 6047 6047 ataIOPortWrite1, ataIOPortRead1, ataIOPortWriteStr1, ataIOPortReadStr1, "ATA I/O Base 1"); 6048 6048 if (VBOX_FAILURE(rc)) 6049 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register I/O handlers ."));6049 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register I/O handlers")); 6050 6050 6051 6051 if (fGCEnabled) … … 6054 6054 "ataIOPortWrite1", "ataIOPortRead1", "ataIOPortWriteStr1", "ataIOPortReadStr1", "ATA I/O Base 1"); 6055 6055 if (VBOX_FAILURE(rc)) 6056 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register I/O handlers (GC) ."));6056 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register I/O handlers (GC)")); 6057 6057 } 6058 6058 … … 6073 6073 ataIOPortWrite2, ataIOPortRead2, NULL, NULL, "ATA I/O Base 2"); 6074 6074 if (VBOX_FAILURE(rc)) 6075 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register base2 I/O handlers ."));6075 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register base2 I/O handlers")); 6076 6076 6077 6077 if (fGCEnabled) … … 6080 6080 "ataIOPortWrite2", "ataIOPortRead2", NULL, NULL, "ATA I/O Base 2"); 6081 6081 if (VBOX_FAILURE(rc)) 6082 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register base2 I/O handlers (GC) ."));6082 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register base2 I/O handlers (GC)")); 6083 6083 } 6084 6084 if (fR0Enabled) … … 6087 6087 "ataIOPortWrite2", "ataIOPortRead2", NULL, NULL, "ATA I/O Base 2"); 6088 6088 if (VBOX_FAILURE(rc)) 6089 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register base2 I/O handlers (R0) ."));6089 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register base2 I/O handlers (R0)")); 6090 6090 } 6091 6091 … … 6120 6120 rc = PDMDevHlpCritSectInit(pDevIns, &pData->aCts[i].lock, szName); 6121 6121 if (VBOX_FAILURE(rc)) 6122 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot initialize critical section ."));6122 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot initialize critical section")); 6123 6123 } 6124 6124 … … 6132 6132 { 6133 6133 AssertMsgFailed(("Failed to attach to status driver. rc=%Vrc\n", rc)); 6134 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot attach to status driver ."));6134 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot attach to status driver")); 6135 6135 } 6136 6136 … … 6194 6194 return rc; 6195 6195 default: 6196 return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS, N_( 6197 "PIIX3 cannot attach drive to the %s"), s_apszDescs[i][j]); 6196 return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS, 6197 N_("PIIX3 cannot attach drive to the %s"), 6198 s_apszDescs[i][j]); 6198 6199 } 6199 6200 } … … 6207 6208 ataSaveLoadPrep, ataLoadExec, NULL); 6208 6209 if (VBOX_FAILURE(rc)) 6209 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register save state handlers ."));6210 return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot register save state handlers")); 6210 6211 6211 6212 /*
Note:
See TracChangeset
for help on using the changeset viewer.