projects
/
pub
/
USBasp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7aaced1
)
Fix Webserver project code not compiling due to the changes to the USB mode selection...
author
Dean Camera
<dean@fourwalledcubicle.com>
Tue, 12 Oct 2010 12:25:05 +0000
(12:25 +0000)
committer
Dean Camera
<dean@fourwalledcubicle.com>
Tue, 12 Oct 2010 12:25:05 +0000
(12:25 +0000)
Projects/Webserver/Lib/uIPManagement.c
patch
|
blob
|
blame
|
history
Projects/Webserver/USBDeviceMode.c
patch
|
blob
|
blame
|
history
Projects/Webserver/USBHostMode.c
patch
|
blob
|
blame
|
history
Projects/Webserver/Webserver.c
patch
|
blob
|
blame
|
history
diff --git
a/Projects/Webserver/Lib/uIPManagement.c
b/Projects/Webserver/Lib/uIPManagement.c
index
2d1a931
..
1270e18
100644
(file)
--- a/
Projects/Webserver/Lib/uIPManagement.c
+++ b/
Projects/Webserver/Lib/uIPManagement.c
@@
-90,7
+90,7
@@
void uIPManagement_Init(void)
*/
void uIPManagement_ManageNetwork(void)
{
*/
void uIPManagement_ManageNetwork(void)
{
- if ((USB_CurrentMode == USB_MODE_H
OST
) && (USB_HostState == HOST_STATE_Configured))
+ if ((USB_CurrentMode == USB_MODE_H
ost
) && (USB_HostState == HOST_STATE_Configured))
{
uIPManagement_ProcessIncomingPacket();
uIPManagement_ManageConnections();
{
uIPManagement_ProcessIncomingPacket();
uIPManagement_ManageConnections();
diff --git
a/Projects/Webserver/USBDeviceMode.c
b/Projects/Webserver/USBDeviceMode.c
index
58f7edc
..
43b5b5d
100644
(file)
--- a/
Projects/Webserver/USBDeviceMode.c
+++ b/
Projects/Webserver/USBDeviceMode.c
@@
-64,7
+64,7
@@
USB_ClassInfo_MS_Device_t Disk_MS_Interface =
*/
void USBDeviceMode_USBTask(void)
{
*/
void USBDeviceMode_USBTask(void)
{
- if (USB_CurrentMode != USB_MODE_D
EVICE
)
+ if (USB_CurrentMode != USB_MODE_D
evice
)
return;
MS_Device_USBTask(&Disk_MS_Interface);
return;
MS_Device_USBTask(&Disk_MS_Interface);
diff --git
a/Projects/Webserver/USBHostMode.c
b/Projects/Webserver/USBHostMode.c
index
0eb5c6f
..
d3caa40
100644
(file)
--- a/
Projects/Webserver/USBHostMode.c
+++ b/
Projects/Webserver/USBHostMode.c
@@
-63,7
+63,7
@@
USB_ClassInfo_RNDIS_Host_t Ethernet_RNDIS_Interface =
*/
void USBHostMode_USBTask(void)
{
*/
void USBHostMode_USBTask(void)
{
- if (USB_CurrentMode != USB_MODE_H
OST
)
+ if (USB_CurrentMode != USB_MODE_H
ost
)
return;
switch (USB_HostState)
return;
switch (USB_HostState)
diff --git
a/Projects/Webserver/Webserver.c
b/Projects/Webserver/Webserver.c
index
9354ee3
..
b76d687
100644
(file)
--- a/
Projects/Webserver/Webserver.c
+++ b/
Projects/Webserver/Webserver.c
@@
-48,7
+48,7
@@
int main(void)
for (;;)
{
for (;;)
{
- if (USB_CurrentMode == USB_MODE_H
OST
)
+ if (USB_CurrentMode == USB_MODE_H
ost
)
USBHostMode_USBTask();
else
USBDeviceMode_USBTask();
USBHostMode_USBTask();
else
USBDeviceMode_USBTask();