KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: s/int/bool/ for predicate result 

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Eric Engestrom 2019-10-02 20:09:50 +01:00
parent 26149d119b
commit 5be6c8959c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/loader/pci_id_driver_map.c
View File

@ -21,7 +21,9 @@
* SOFTWARE. * SOFTWARE.
*/ */
int is_nouveau_vieux(int fd); #include <stdbool.h>
bool is_nouveau_vieux(int fd);
#ifdef HAVE_LIBDRM #ifdef HAVE_LIBDRM
@ -42,7 +44,7 @@ nouveau_chipset(int fd)
return gp.value; return gp.value;
} }
int bool
is_nouveau_vieux(int fd) is_nouveau_vieux(int fd)
{ {
int chipset = nouveau_chipset(fd); int chipset = nouveau_chipset(fd);
@ -52,6 +54,6 @@ is_nouveau_vieux(int fd)
#else #else
int is_nouveau_vieux(int fd) { return 0; } bool is_nouveau_vieux(int fd) { return false; }
#endif #endif

5
src/loader/pci_id_driver_map.h
View File

@ -1,6 +1,7 @@
#ifndef _PCI_ID_DRIVER_MAP_H_ #ifndef _PCI_ID_DRIVER_MAP_H_
#define _PCI_ID_DRIVER_MAP_H_ #define _PCI_ID_DRIVER_MAP_H_
#include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#ifndef ARRAY_SIZE #ifndef ARRAY_SIZE
@ -83,14 +84,14 @@ static const int vmwgfx_chip_ids[] = {
#undef CHIPSET #undef CHIPSET
}; };
int is_nouveau_vieux(int fd); bool is_nouveau_vieux(int fd);
static const struct { static const struct {
int vendor_id; int vendor_id;
const char *driver; const char *driver;
const int *chip_ids; const int *chip_ids;
int num_chips_ids; int num_chips_ids;
int (*predicate)(int fd); bool (*predicate)(int fd);
} driver_map[] = { } driver_map[] = {
{ 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) }, { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) },
{ 0x8086, "iris", iris_chip_ids_1, ARRAY_SIZE(iris_chip_ids_1) }, { 0x8086, "iris", iris_chip_ids_1, ARRAY_SIZE(iris_chip_ids_1) },