diff options
| author | Ilias Apalodimas <ilias.apalodimas@linaro.org> | 2017-10-13 00:46:31 +0300 |
|---|---|---|
| committer | Ilias Apalodimas <ilias.apalodimas@linaro.org> | 2017-10-13 00:46:31 +0300 |
| commit | 2c031a69ab37a828b8a0270e8a4bd2bdc9e68f97 (patch) | |
| tree | a332f21bfaa73e0d337b09972acdc0bd83655d1e | |
| parent | ad8743e38181bfba9c0eb6dc46e5b330ab9ff5e2 (diff) | |
Get rid of some CamelCase
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
| -rw-r--r-- | drivers/r8169.c | 10 | ||||
| -rw-r--r-- | include/drivers/driver_ops.h | 3 | ||||
| -rw-r--r-- | src/userspace_io.c | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/drivers/r8169.c b/drivers/r8169.c index 5d58251..2c9be30 100644 --- a/drivers/r8169.c +++ b/drivers/r8169.c @@ -44,21 +44,21 @@ static inline void rtl8169_mark_as_last_descriptor(struct RxDesc *desc) desc->opts1 |= cpu_to_le32(RingEnd); } -static int rtl8169_rx_fill(int device, void *rx_data, struct iomem *data, char *rxBuffers[]) +static int rtl8169_rx_fill(int device, void *rx_data, struct iomem data, char *rx_buff[]) { int i; struct RxDesc *rxRing = (struct RxDesc *) rx_data; for (i = 0; i < NUM_RX_DESC; i++) { - rtl8169_map_to_asic(&rxRing[i], data->iova + i * 2048, 2048); - rxBuffers[i] = (char *)(data->vaddr + i * 2048); + rtl8169_map_to_asic(&rxRing[i], data.iova + i * 2048, 2048); + rx_buff[i] = (char *)(data.vaddr + i * 2048); } rtl8169_mark_as_last_descriptor(&rxRing[NUM_RX_DESC - 1]); return 0; } -void r8169_recv(void *rxring, char *rxBuffers[]) +void r8169_recv(void *rxring, char *rx_buff[]) { int i = 0; struct RxDesc *rxRing = (struct RxDesc *)rxring; @@ -145,7 +145,7 @@ process_pkt: __u64_stats_update_end(&tp->rx_stats.syncp); */ printf("desc[%03d]: size= %5d ", i, pkt_size); - print_packet((unsigned char *)rxBuffers[i]); + print_packet((unsigned char *)rx_buff[i]); printf("\n"); } /* release_descriptor: */ diff --git a/include/drivers/driver_ops.h b/include/drivers/driver_ops.h index 2c3c016..24ea68f 100644 --- a/include/drivers/driver_ops.h +++ b/include/drivers/driver_ops.h @@ -8,7 +8,8 @@ struct driver_ops { /* VFIO/PCI quirks */ int (*vfio_quirks)(void); /* prepare Tx descriptors */ - int (*rx_fill)(int device, void *rxring, struct iomem *data, char *rx_buf[]); + int (*rx_fill)(int device, void *rxring, struct iomem data, + char *rx_buf[]); /* prepare Tx descriptors */ int (*tx_fill)(int device, void *txring, struct iomem *data); /* receive */ diff --git a/src/userspace_io.c b/src/userspace_io.c index fbf81d2..4c34708 100644 --- a/src/userspace_io.c +++ b/src/userspace_io.c @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) struct iomem rx_data; int ret, c; struct driver_ops exec_ops = r8169_ops; - char *rxBuffers[256]; + char *rx_buff[256]; while ((c = getopt(argc, argv, "d:i:f:")) != -1) { switch (c) { @@ -97,13 +97,13 @@ int main(int argc, char *argv[]) goto out; printf("iobase: %p iocur : %p\n", iobase, iocur); - if (exec_ops.rx_fill(device, rxRing, &rx_data, rxBuffers) != 0) { + if (exec_ops.rx_fill(device, rxRing, rx_data, rx_buff) != 0) { printf("Could not fill ring\n"); goto out; } ioctl(device, 500, NULL); - exec_ops.recv(rxRing, rxBuffers); + exec_ops.recv(rxRing, rx_buff); out: if (rxRing) |