Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

simple renames to not use reserved names

Browse source
This commit is contained in:
daniel-k 2017-12-05 17:50:02 +01:00
parent 4adb889527
commit f0c089f719
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fpga/include/villas/fpga/ip.h
View file

@ -51,7 +51,7 @@ enum fpga_ip_types {
FPGA_IP_TYPE_MATH, /**< A math IP performs some kind of mathematical operation on the streaming data */
FPGA_IP_TYPE_MISC, /**< Other IP components like timer, counters, interrupt conctrollers or routing. */
FPGA_IP_TYPE_INTERFACE /**< A interface IP connects the FPGA to another system or controller. */
} type;
};
struct fpga_ip_type {
struct fpga_vlnv vlnv;

2
fpga/include/villas/kernel/kernel.h
View file

@ -85,6 +85,6 @@ int kernel_get_page_size();
int kernel_get_hugepage_size();
/** Set SMP affinity of IRQ */
int kernel_irq_setaffinity(unsigned irq, uintmax_t new, uintmax_t *old);
int kernel_irq_setaffinity(unsigned irq, uintmax_t affinity, uintmax_t *old);
/** @} */

2
fpga/include/villas/kernel/pci.h
View file

@ -18,7 +18,7 @@ struct pci_device {
struct {
int vendor;
int device;
int class;
int class_code;
} id;
struct {

4
fpga/include/villas/log.h
View file

@ -106,8 +106,8 @@ struct log {
};
/** The global log instance. */
struct log *global_log;
struct log default_log;
extern struct log *global_log;
extern struct log default_log;
/** Initialize log object */
int log_init(struct log *l, int level, long faciltities);

2
fpga/lib/card.c
View file

@ -241,7 +241,7 @@ void fpga_card_dump(struct fpga_card *c)
info("Slot: %04x:%02x:%02x.%d", c->vfio_device.pci_device->slot.domain, c->vfio_device.pci_device->slot.bus, c->vfio_device.pci_device->slot.device, c->vfio_device.pci_device->slot.function);
info("Vendor ID: %04x", c->vfio_device.pci_device->id.vendor);
info("Device ID: %04x", c->vfio_device.pci_device->id.device);
info("Class ID: %04x", c->vfio_device.pci_device->id.class);
info("Class ID: %04x", c->vfio_device.pci_device->id.class_code);
info("BAR0 mapped at %p", c->map);

4
fpga/lib/kernel/kernel.c
View file

@ -258,7 +258,7 @@ int kernel_has_cap(cap_value_t cap)
}
#endif
int kernel_irq_setaffinity(unsigned irq, uintmax_t new, uintmax_t *old)
int kernel_irq_setaffinity(unsigned irq, uintmax_t affinity, uintmax_t *old)
{
char fn[64];
FILE *f;
@ -273,7 +273,7 @@ int kernel_irq_setaffinity(unsigned irq, uintmax_t new, uintmax_t *old)
if (old)
ret = fscanf(f, "%jx", old);
fprintf(f, "%jx", new);
fprintf(f, "%jx", affinity);
fclose(f);
return ret;

4
fpga/lib/kernel/pci.c
View file

@ -221,7 +221,7 @@ int pci_device_parse_id(struct pci_device *f, const char *str, const char **erro
goto fail;
}
f->id.class = x;
f->id.class_code = x;
}
return 0;
@ -242,7 +242,7 @@ int pci_device_compare(const struct pci_device *d, const struct pci_device *f)
(f->id.vendor != 0 && f->id.vendor != d->id.vendor))
return 1;
if ((f->id.class != 0) || (f->id.class != d->id.class))
if ((f->id.class_code != 0) || (f->id.class_code != d->id.class_code))
return 1;
// found