|
@@ -134,16 +134,15 @@ int efidev_child_add ( struct efi_device *efidev, EFI_HANDLE device ) {
|
134
|
134
|
) ) != 0 ) {
|
135
|
135
|
rc = -EEFI ( efirc );
|
136
|
136
|
DBGC ( efidev->device, "EFIDRV %p %s could not add child",
|
137
|
|
- efidev->device, efi_devpath_text ( efidev->path ) );
|
|
137
|
+ efidev->device, efi_handle_name ( efidev->device ) );
|
138
|
138
|
DBGC ( efidev->device, " %p %s: %s\n", device,
|
139
|
|
- efi_handle_devpath_text ( device ), strerror ( rc ) );
|
|
139
|
+ efi_handle_name ( device ), strerror ( rc ) );
|
140
|
140
|
return rc;
|
141
|
141
|
}
|
142
|
142
|
|
143
|
143
|
DBGC2 ( efidev->device, "EFIDRV %p %s added child",
|
144
|
|
- efidev->device, efi_devpath_text ( efidev->path ) );
|
145
|
|
- DBGC2 ( efidev->device, " %p %s\n",
|
146
|
|
- device, efi_handle_devpath_text ( device ) );
|
|
144
|
+ efidev->device, efi_handle_name ( efidev->device ) );
|
|
145
|
+ DBGC2 ( efidev->device, " %p %s\n", device, efi_handle_name ( device ));
|
147
|
146
|
return 0;
|
148
|
147
|
}
|
149
|
148
|
|
|
@@ -161,9 +160,9 @@ void efidev_child_del ( struct efi_device *efidev, EFI_HANDLE device ) {
|
161
|
160
|
&efi_device_path_protocol_guid,
|
162
|
161
|
efi_image_handle, device );
|
163
|
162
|
DBGC2 ( efidev->device, "EFIDRV %p %s removed child",
|
164
|
|
- efidev->device, efi_devpath_text ( efidev->path ) );
|
|
163
|
+ efidev->device, efi_handle_name ( efidev->device ) );
|
165
|
164
|
DBGC2 ( efidev->device, " %p %s\n",
|
166
|
|
- device, efi_handle_devpath_text ( device ) );
|
|
165
|
+ device, efi_handle_name ( device ) );
|
167
|
166
|
}
|
168
|
167
|
|
169
|
168
|
/**
|
|
@@ -181,7 +180,7 @@ efi_driver_supported ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
|
181
|
180
|
int rc;
|
182
|
181
|
|
183
|
182
|
DBGCP ( device, "EFIDRV %p %s DRIVER_SUPPORTED",
|
184
|
|
- device, efi_handle_devpath_text ( device ) );
|
|
183
|
+ device, efi_handle_name ( device ) );
|
185
|
184
|
if ( child )
|
186
|
185
|
DBGCP ( device, " (child %s)", efi_devpath_text ( child ) );
|
187
|
186
|
DBGCP ( device, "\n" );
|
|
@@ -189,7 +188,7 @@ efi_driver_supported ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
|
189
|
188
|
/* Do nothing if we are already driving this device */
|
190
|
189
|
if ( efidev_find ( device ) != NULL ) {
|
191
|
190
|
DBGCP ( device, "EFIDRV %p %s is already started\n",
|
192
|
|
- device, efi_handle_devpath_text ( device ) );
|
|
191
|
+ device, efi_handle_name ( device ) );
|
193
|
192
|
return EFI_ALREADY_STARTED;
|
194
|
193
|
}
|
195
|
194
|
|
|
@@ -197,13 +196,13 @@ efi_driver_supported ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
|
197
|
196
|
for_each_table_entry ( efidrv, EFI_DRIVERS ) {
|
198
|
197
|
if ( ( rc = efidrv->supported ( device ) ) == 0 ) {
|
199
|
198
|
DBGC ( device, "EFIDRV %p %s has driver \"%s\"\n",
|
200
|
|
- device, efi_handle_devpath_text ( device ),
|
|
199
|
+ device, efi_handle_name ( device ),
|
201
|
200
|
efidrv->name );
|
202
|
201
|
return 0;
|
203
|
202
|
}
|
204
|
203
|
}
|
205
|
204
|
DBGCP ( device, "EFIDRV %p %s has no driver\n",
|
206
|
|
- device, efi_handle_devpath_text ( device ) );
|
|
205
|
+ device, efi_handle_name ( device ) );
|
207
|
206
|
|
208
|
207
|
return EFI_UNSUPPORTED;
|
209
|
208
|
}
|
|
@@ -230,7 +229,7 @@ efi_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
|
230
|
229
|
int rc;
|
231
|
230
|
|
232
|
231
|
DBGC ( device, "EFIDRV %p %s DRIVER_START",
|
233
|
|
- device, efi_handle_devpath_text ( device ) );
|
|
232
|
+ device, efi_handle_name ( device ) );
|
234
|
233
|
if ( child )
|
235
|
234
|
DBGC ( device, " (child %s)", efi_devpath_text ( child ) );
|
236
|
235
|
DBGC ( device, "\n" );
|
|
@@ -239,7 +238,7 @@ efi_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
|
239
|
238
|
efidev = efidev_find ( device );
|
240
|
239
|
if ( efidev ) {
|
241
|
240
|
DBGCP ( device, "EFIDRV %p %s is already started\n",
|
242
|
|
- device, efi_devpath_text ( efidev->path ) );
|
|
241
|
+ device, efi_handle_name ( device ) );
|
243
|
242
|
efirc = EFI_ALREADY_STARTED;
|
244
|
243
|
goto err_already_started;
|
245
|
244
|
}
|
|
@@ -263,7 +262,7 @@ efi_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
|
263
|
262
|
EFI_OPEN_PROTOCOL_BY_DRIVER ) ) != 0){
|
264
|
263
|
rc = -EEFI ( efirc );
|
265
|
264
|
DBGC ( device, "EFIDRV %p %s could not open device path: %s\n",
|
266
|
|
- device, efi_handle_devpath_text ( device ),
|
|
265
|
+ device, efi_handle_name ( device ),
|
267
|
266
|
strerror ( rc ) );
|
268
|
267
|
goto err_no_device_path;
|
269
|
268
|
}
|
|
@@ -273,20 +272,20 @@ efi_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
|
273
|
272
|
for_each_table_entry ( efidrv, EFI_DRIVERS ) {
|
274
|
273
|
if ( ( rc = efidrv->supported ( device ) ) != 0 ) {
|
275
|
274
|
DBGC ( device, "EFIDEV %p %s is not supported by "
|
276
|
|
- "driver \"%s\": %s\n",
|
277
|
|
- device, efi_devpath_text ( efidev->path ),
|
278
|
|
- efidrv->name, strerror ( rc ) );
|
|
275
|
+ "driver \"%s\": %s\n", device,
|
|
276
|
+ efi_handle_name ( device ), efidrv->name,
|
|
277
|
+ strerror ( rc ) );
|
279
|
278
|
continue;
|
280
|
279
|
}
|
281
|
280
|
if ( ( rc = efidrv->start ( efidev ) ) == 0 ) {
|
282
|
281
|
efidev->driver = efidrv;
|
283
|
282
|
DBGC ( device, "EFIDRV %p %s using driver \"%s\"\n",
|
284
|
|
- device, efi_devpath_text ( efidev->path ),
|
|
283
|
+ device, efi_handle_name ( device ),
|
285
|
284
|
efidev->driver->name );
|
286
|
285
|
return 0;
|
287
|
286
|
}
|
288
|
287
|
DBGC ( device, "EFIDRV %p %s could not start driver \"%s\": "
|
289
|
|
- "%s\n", device, efi_devpath_text ( efidev->path ),
|
|
288
|
+ "%s\n", device, efi_handle_name ( device ),
|
290
|
289
|
efidrv->name, strerror ( rc ) );
|
291
|
290
|
}
|
292
|
291
|
efirc = EFI_UNSUPPORTED;
|
|
@@ -321,10 +320,10 @@ efi_driver_stop ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
|
321
|
320
|
UINTN i;
|
322
|
321
|
|
323
|
322
|
DBGC ( device, "EFIDRV %p %s DRIVER_STOP",
|
324
|
|
- device, efi_handle_devpath_text ( device ) );
|
|
323
|
+ device, efi_handle_name ( device ) );
|
325
|
324
|
for ( i = 0 ; i < num_children ; i++ ) {
|
326
|
325
|
DBGC ( device, "%s%p %s", ( i ? ", " : " child " ),
|
327
|
|
- children[i], efi_handle_devpath_text ( children[i] ) );
|
|
326
|
+ children[i], efi_handle_name ( children[i] ) );
|
328
|
327
|
}
|
329
|
328
|
DBGC ( device, "\n" );
|
330
|
329
|
|
|
@@ -332,7 +331,7 @@ efi_driver_stop ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
|
332
|
331
|
efidev = efidev_find ( device );
|
333
|
332
|
if ( ! efidev ) {
|
334
|
333
|
DBGCP ( device, "EFIDRV %p %s is not started\n",
|
335
|
|
- device, efi_devpath_text ( efidev->path ) );
|
|
334
|
+ device, efi_handle_name ( device ) );
|
336
|
335
|
return 0;
|
337
|
336
|
}
|
338
|
337
|
|
|
@@ -488,17 +487,17 @@ static int efi_driver_connect ( EFI_HANDLE device ) {
|
488
|
487
|
|
489
|
488
|
/* Disconnect any existing drivers */
|
490
|
489
|
DBGC ( device, "EFIDRV %p %s disconnecting existing drivers\n",
|
491
|
|
- device, efi_handle_devpath_text ( device ) );
|
|
490
|
+ device, efi_handle_name ( device ) );
|
492
|
491
|
bs->DisconnectController ( device, NULL, NULL );
|
493
|
492
|
|
494
|
493
|
/* Connect our driver */
|
495
|
494
|
DBGC ( device, "EFIDRV %p %s connecting new drivers\n",
|
496
|
|
- device, efi_handle_devpath_text ( device ) );
|
|
495
|
+ device, efi_handle_name ( device ) );
|
497
|
496
|
if ( ( efirc = bs->ConnectController ( device, drivers, NULL,
|
498
|
497
|
FALSE ) ) != 0 ) {
|
499
|
498
|
rc = -EEFI ( efirc );
|
500
|
499
|
DBGC ( device, "EFIDRV %p %s could not connect new drivers: "
|
501
|
|
- "%s\n", device, efi_handle_devpath_text ( device ),
|
|
500
|
+ "%s\n", device, efi_handle_name ( device ),
|
502
|
501
|
strerror ( rc ) );
|
503
|
502
|
return rc;
|
504
|
503
|
}
|