aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-08-06 00:11:50 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-08-06 00:11:50 +0200
commitc04a76e6f038ea560f39214f9737974d91742fa8 (patch)
tree4013eaf9517e10ee2039c9898ba9e315b76756c5
parentd56019c0eed08632c2b1f828ca9e0b22d6151414 (diff)
downloadu-boot-linaro-stable-c04a76e6f038ea560f39214f9737974d91742fa8.tar.gz
Fix compiler warnings in cpu/ppc4xx/usbdev.c
Patch by Steven Blakeslee, 04 Aug 2005
-rw-r--r--CHANGELOG3
-rw-r--r--cpu/ppc4xx/usbdev.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6c2cdcfd5..b49b1af14 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.3:
======================================================================
+* Fix compiler warnings in cpu/ppc4xx/usbdev.c
+ Patch by Steven Blakeslee, 04 Aug 2005
+
* Add support for AMCC Bamboo PPC440EP eval board
Patch by Stefan Roese, 04 Aug 2005
diff --git a/cpu/ppc4xx/usbdev.c b/cpu/ppc4xx/usbdev.c
index f0901ac51..4741f7319 100644
--- a/cpu/ppc4xx/usbdev.c
+++ b/cpu/ppc4xx/usbdev.c
@@ -15,7 +15,7 @@
#define USB_DT_INTERFACE 0x04
#define USB_DT_ENDPOINT 0x05
-unsigned char set_value = -1;
+int set_value = -1;
void process_endpoints(unsigned short usb2d0_intrin)
{
@@ -25,7 +25,7 @@ void process_endpoints(unsigned short usb2d0_intrin)
struct usb_string_descriptor usb_string_packet;
struct devrequest setup_packet;
unsigned int *setup_packet_pt;
- unsigned char *packet_pt;
+ unsigned char *packet_pt = NULL;
int temp, temp1;
int i;
@@ -35,7 +35,7 @@ void process_endpoints(unsigned short usb2d0_intrin)
/*set usb address, seems to not work unless it is done in the next
interrupt, so that is why it is done this way */
if (set_value != -1)
- *(unsigned char *)USB2D0_FADDR_8 = set_value;
+ *(unsigned char *)USB2D0_FADDR_8 = (unsigned char)set_value;
/*endpoint 1 */
if (usb2d0_intrin & 0x01) {