aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board-qemu/veth/veth.c34
-rw-r--r--clients/net-snk/app/netapps/args.c2
-rw-r--r--clients/net-snk/app/netlib/dhcp.h2
-rw-r--r--clients/net-snk/app/netlib/dns.h2
-rw-r--r--clients/net-snk/app/netlib/ethernet.h2
-rw-r--r--clients/net-snk/app/netlib/ipv4.h2
-rw-r--r--clients/net-snk/app/netlib/tcp.h2
-rw-r--r--clients/net-snk/app/netlib/tftp.h2
-rw-r--r--clients/net-snk/app/netlib/udp.h2
-rw-r--r--clients/net-snk/include/types.h26
-rw-r--r--clients/net-snk/kernel/timer.c3
-rw-r--r--clients/net-snk/oflib/of.c2
-rw-r--r--clients/net-snk/oflib/rtas.c2
-rw-r--r--include/types.h28
14 files changed, 29 insertions, 82 deletions
diff --git a/board-qemu/veth/veth.c b/board-qemu/veth/veth.c
index dbfcad5..f4cbb5c 100644
--- a/board-qemu/veth/veth.c
+++ b/board-qemu/veth/veth.c
@@ -10,7 +10,7 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-#include "types.h"
+#include <stdint.h>
#include "netdriver_int.h"
#include "libhvcall.h"
@@ -30,25 +30,25 @@ static unsigned int g_reg;
* we -do- rely on the forth code to have enabled TCE bypass
* on our device !
*/
-#define vaddr_to_dma(vaddr) ((u64)vaddr)
+#define vaddr_to_dma(vaddr) ((uint64_t)vaddr)
struct ibmveth_buf_desc_fields {
- u32 flags_len;
+ uint32_t flags_len;
#define IBMVETH_BUF_VALID 0x80000000
#define IBMVETH_BUF_TOGGLE 0x40000000
#define IBMVETH_BUF_NO_CSUM 0x02000000
#define IBMVETH_BUF_CSUM_GOOD 0x01000000
#define IBMVETH_BUF_LEN_MASK 0x00FFFFFF
- u32 address;
+ uint32_t address;
};
union ibmveth_buf_desc {
- u64 desc;
+ uint64_t desc;
struct ibmveth_buf_desc_fields fields;
};
struct ibmveth_rx_q_entry {
- u32 flags_off;
+ uint32_t flags_off;
#define IBMVETH_RXQ_TOGGLE 0x80000000
#define IBMVETH_RXQ_TOGGLE_SHIFT 31
#define IBMVETH_RXQ_VALID 0x40000000
@@ -56,16 +56,16 @@ struct ibmveth_rx_q_entry {
#define IBMVETH_RXQ_CSUM_GOOD 0x01000000
#define IBMVETH_RXQ_OFF_MASK 0x0000FFFF
- u32 length;
- u64 correlator;
+ uint32_t length;
+ uint64_t correlator;
};
static void *buffer_list;
static void *filter_list;
-static u64 *rx_bufs;
-static u64 *rx_bufs_aligned;
-static u32 cur_rx_toggle;
-static u32 cur_rx_index;
+static uint64_t *rx_bufs;
+static uint64_t *rx_bufs_aligned;
+static uint32_t cur_rx_toggle;
+static uint32_t cur_rx_index;
#define RX_QUEUE_SIZE 16
#define RX_BUF_SIZE 2048
@@ -83,7 +83,7 @@ static char * memcpy( char *dest, const char *src, size_t n )
return( ret );
}
-static inline u64 *veth_get_rx_buf(unsigned int i)
+static inline uint64_t *veth_get_rx_buf(unsigned int i)
{
return &rx_bufs_aligned[i * RX_BUF_MULT];
}
@@ -114,7 +114,7 @@ static int veth_init(void)
printk("veth: Failed to allocate memory !\n");
goto fail;
}
- rx_bufs_aligned = (u64 *)(((u64)rx_bufs | 3) + 1);
+ rx_bufs_aligned = (uint64_t *)(((uint64_t)rx_bufs | 3) + 1);
rxq_desc.fields.address = vaddr_to_dma(rx_queue);
rxq_desc.fields.flags_len = IBMVETH_BUF_VALID | rx_queue_len;
@@ -122,15 +122,15 @@ static int veth_init(void)
vaddr_to_dma(buffer_list),
rxq_desc.desc,
vaddr_to_dma(filter_list),
- (*(u64 *)mac_addr) >> 16);
+ (*(uint64_t *)mac_addr) >> 16);
if (rc != H_SUCCESS) {
printk("veth: Error %ld registering interface !\n", rc);
goto fail;
}
for (i = 0; i < RX_QUEUE_SIZE; i++) {
- u64 *buf = veth_get_rx_buf(i);
+ uint64_t *buf = veth_get_rx_buf(i);
union ibmveth_buf_desc desc;
- *buf = (u64)buf;
+ *buf = (uint64_t)buf;
desc.fields.address = vaddr_to_dma(buf);
desc.fields.flags_len = IBMVETH_BUF_VALID | RX_BUF_SIZE;
h_add_logical_lan_buffer(g_reg, desc.desc);
diff --git a/clients/net-snk/app/netapps/args.c b/clients/net-snk/app/netapps/args.c
index 2f4a615..90d6326 100644
--- a/clients/net-snk/app/netapps/args.c
+++ b/clients/net-snk/app/netapps/args.c
@@ -10,7 +10,7 @@
* IBM Corporation - initial implementation
*****************************************************************************/
-#include <types.h>
+#include <stdint.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
diff --git a/clients/net-snk/app/netlib/dhcp.h b/clients/net-snk/app/netlib/dhcp.h
index 853200c..73e0d01 100644
--- a/clients/net-snk/app/netlib/dhcp.h
+++ b/clients/net-snk/app/netlib/dhcp.h
@@ -13,7 +13,7 @@
#ifndef _DHCP_H_
#define _DHCP_H_
-#include <types.h>
+#include <stdint.h>
#ifdef USE_MTFTP
#include <netlib/mtftp.h>
diff --git a/clients/net-snk/app/netlib/dns.h b/clients/net-snk/app/netlib/dns.h
index ef9f48e..dcfebb8 100644
--- a/clients/net-snk/app/netlib/dns.h
+++ b/clients/net-snk/app/netlib/dns.h
@@ -14,7 +14,7 @@
#ifndef _DNS_H_
#define _DNS_H_
-#include <types.h>
+#include <stdint.h>
/* Initialize the environment for DNS client. */
extern int8_t dns_init(uint32_t dns_server_ip);
diff --git a/clients/net-snk/app/netlib/ethernet.h b/clients/net-snk/app/netlib/ethernet.h
index e305a66..ce44906 100644
--- a/clients/net-snk/app/netlib/ethernet.h
+++ b/clients/net-snk/app/netlib/ethernet.h
@@ -13,7 +13,7 @@
#ifndef _ETHERNET_H
#define _ETHERNET_H
-#include <types.h>
+#include <stdint.h>
#define ETH_MTU_SIZE 1518 /**< Maximum Transfer Unit */
#define ETH_ALEN 6 /**< HW address length */
diff --git a/clients/net-snk/app/netlib/ipv4.h b/clients/net-snk/app/netlib/ipv4.h
index 0e5a408..fd104cf 100644
--- a/clients/net-snk/app/netlib/ipv4.h
+++ b/clients/net-snk/app/netlib/ipv4.h
@@ -14,7 +14,7 @@
#ifndef _IPV4_H_
#define _IPV4_H_
-#include <types.h>
+#include <stdint.h>
#define IPTYPE_ICMP 1
diff --git a/clients/net-snk/app/netlib/tcp.h b/clients/net-snk/app/netlib/tcp.h
index 7d0c906..375afd7 100644
--- a/clients/net-snk/app/netlib/tcp.h
+++ b/clients/net-snk/app/netlib/tcp.h
@@ -13,7 +13,7 @@
#ifndef _TCP_H
#define _TCP_H
-#include <types.h>
+#include <stdint.h>
#define IPTYPE_TCP 6
diff --git a/clients/net-snk/app/netlib/tftp.h b/clients/net-snk/app/netlib/tftp.h
index 3f573b1..ebcabdf 100644
--- a/clients/net-snk/app/netlib/tftp.h
+++ b/clients/net-snk/app/netlib/tftp.h
@@ -14,7 +14,7 @@
#ifndef _TFTP_H_
#define _TFTP_H_
-#include <types.h>
+#include <stdint.h>
//#include <netlib/ipv6.h>
struct tftphdr {
diff --git a/clients/net-snk/app/netlib/udp.h b/clients/net-snk/app/netlib/udp.h
index 0432f52..8acc0bc 100644
--- a/clients/net-snk/app/netlib/udp.h
+++ b/clients/net-snk/app/netlib/udp.h
@@ -13,7 +13,7 @@
#ifndef _UDP_H
#define _UDP_H
-#include <types.h>
+#include <stdint.h>
#define IPTYPE_UDP 17
diff --git a/clients/net-snk/include/types.h b/clients/net-snk/include/types.h
deleted file mode 100644
index b5e5db3..0000000
--- a/clients/net-snk/include/types.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation
- * All rights reserved.
- * This program and the accompanying materials
- * are made available under the terms of the BSD License
- * which accompanies this distribution, and is available at
- * http://www.opensource.org/licenses/bsd-license.php
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *****************************************************************************/
-
-
-#ifndef _TYPES_H
-#define _TYPES_H
-
-#include <stdint.h>
-
-#ifndef u32
-typedef unsigned int u32;
-#endif
-#ifndef u64
-typedef unsigned long long u64;
-#endif
-
-#endif
diff --git a/clients/net-snk/kernel/timer.c b/clients/net-snk/kernel/timer.c
index 630a9b4..0b505a4 100644
--- a/clients/net-snk/kernel/timer.c
+++ b/clients/net-snk/kernel/timer.c
@@ -9,7 +9,8 @@
* Contributors:
* IBM Corporation - initial implementation
*****************************************************************************/
-#include <types.h>
+
+#include <stdint.h>
//*******************************************************************
// variable "tb_freq" contains the frequency in Hz
diff --git a/clients/net-snk/oflib/of.c b/clients/net-snk/oflib/of.c
index 5974520..0685127 100644
--- a/clients/net-snk/oflib/of.c
+++ b/clients/net-snk/oflib/of.c
@@ -16,7 +16,7 @@
#include <string.h>
#include <netdriver_int.h>
#include <fileio.h>
-#include <types.h>
+#include <stdint.h>
extern void call_client_interface(of_arg_t *);
diff --git a/clients/net-snk/oflib/rtas.c b/clients/net-snk/oflib/rtas.c
index 5d0560a..df27a7d 100644
--- a/clients/net-snk/oflib/rtas.c
+++ b/clients/net-snk/oflib/rtas.c
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <rtas.h>
#include <of.h>
-#include <types.h>
+#include <stdint.h>
#include <netdriver_int.h>
#include "kernel.h"
diff --git a/include/types.h b/include/types.h
deleted file mode 100644
index cbadd7c..0000000
--- a/include/types.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation
- * All rights reserved.
- * This program and the accompanying materials
- * are made available under the terms of the BSD License
- * which accompanies this distribution, and is available at
- * http://www.opensource.org/licenses/bsd-license.php
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *****************************************************************************/
-
-#ifndef _TYPES_H
-#define _TYPES_H
-
-#warning "This file is obsolete. Please use #include <stdint.h> instead."
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef signed long long int64_t;
-
-#endif
generated by cgit v1.1 at 2024-09-18 08:33:55 +0000