Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Change resource parser from reference to pointer #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2021
Merged

Change resource parser from reference to pointer #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions VoodooI2C/VoodooI2C/VoodooI2CDevice/VoodooI2CDeviceNub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ IOReturn VoodooI2CDeviceNub::getDeviceResourcesDSM(UInt32 index, OSObject **resu
return evaluateDSM(I2C_DSM_TP7G, index, result);
}

IOReturn VoodooI2CDeviceNub::parseResourcesCRS(VoodooI2CACPIResourcesParser& res_parser) {
IOReturn VoodooI2CDeviceNub::parseResourcesCRS(VoodooI2CACPIResourcesParser* res_parser) {
OSObject *result = nullptr;
OSData *data = nullptr;
if (acpi_device->evaluateObject("_CRS", &result) != kIOReturnSuccess ||
Expand All @@ -144,7 +144,7 @@ IOReturn VoodooI2CDeviceNub::parseResourcesCRS(VoodooI2CACPIResourcesParser& res
}

uint8_t const* crs = reinterpret_cast<uint8_t const*>(data->getBytesNoCopy());
res_parser.parseACPIResources(crs, 0, data->getLength());
res_parser->parseACPIResources(crs, 0, data->getLength());

OSSafeReleaseNULL(data);

Expand All @@ -153,7 +153,7 @@ IOReturn VoodooI2CDeviceNub::parseResourcesCRS(VoodooI2CACPIResourcesParser& res
return kIOReturnSuccess;
}

IOReturn VoodooI2CDeviceNub::parseResourcesDSM(VoodooI2CACPIResourcesParser& res_parser) {
IOReturn VoodooI2CDeviceNub::parseResourcesDSM(VoodooI2CACPIResourcesParser* res_parser) {
OSObject *result = nullptr;
OSData *data = nullptr;
if (getDeviceResourcesDSM(TP7G_RESOURCES_INDEX, &result) != kIOReturnSuccess ||
Expand All @@ -164,7 +164,7 @@ IOReturn VoodooI2CDeviceNub::parseResourcesDSM(VoodooI2CACPIResourcesParser& res
}

uint8_t const* crs = reinterpret_cast<uint8_t const*>(data->getBytesNoCopy());
res_parser.parseACPIResources(crs, 0, data->getLength());
res_parser->parseACPIResources(crs, 0, data->getLength());

OSSafeReleaseNULL(data);

Expand Down Expand Up @@ -192,8 +192,8 @@ IOReturn VoodooI2CDeviceNub::validateAPICInterrupt() {
IOReturn VoodooI2CDeviceNub::getDeviceResources() {
VoodooI2CACPIResourcesParser crs_parser, dsm_parser, resource_parser;

parseResourcesCRS(crs_parser);
parseResourcesDSM(dsm_parser);
parseResourcesCRS(&crs_parser);
parseResourcesDSM(&dsm_parser);

if (!crs_parser.found_i2c && !dsm_parser.found_i2c) {
IOLog("%s::%s Could not find an I2C Serial Bus declaration\n", getName(), acpi_device->getName());
Expand Down
4 changes: 2 additions & 2 deletions VoodooI2C/VoodooI2C/VoodooI2CDevice/VoodooI2CDeviceNub.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,15 @@ class EXPORT VoodooI2CDeviceNub : public IOService {
* @return *kIOReturnSuccess* upon a successfull *_CRS* parse, *kIOReturnNotFound* if no I2C Serial Bus declaration was found.
*/

IOReturn parseResourcesCRS(VoodooI2CACPIResourcesParser& res_parser);
IOReturn parseResourcesCRS(VoodooI2CACPIResourcesParser* res_parser);

/* Uses a <VoodooI2CACPIResourcesParser> object to retrieve resources from _DSM.
* @res_parser The parser for default _DSM
*
* @return *kIOReturnSuccess* upon a successfull *_DSM*(*XDSM*) parse, *kIOReturnNotFound* if no I2C Serial Bus declaration was found.
*/

IOReturn parseResourcesDSM(VoodooI2CACPIResourcesParser& res_parser);
IOReturn parseResourcesDSM(VoodooI2CACPIResourcesParser* res_parser);

/* Searches the IOService plane to find a <VoodooGPIO> controller object.
*/
Expand Down