Tidy up SuperH port a bit ready for release.

This commit is contained in:
Richard Barry 2010-02-18 13:21:33 +00:00
parent 9b27b75715
commit e35180acd9
11 changed files with 171 additions and 172 deletions

View file

@ -212,9 +212,9 @@ long x;
}
/* Setup both descriptors to transmit the frame. */
xTxDescriptors[ 0 ].buf_p = uip_buf;
xTxDescriptors[ 0 ].buf_p = ( char * ) uip_buf;
xTxDescriptors[ 0 ].bufsize = uip_len;
xTxDescriptors[ 1 ].buf_p = uip_buf;
xTxDescriptors[ 1 ].buf_p = ( char * ) uip_buf;
xTxDescriptors[ 1 ].bufsize = uip_len;
/* uip_buf is being sent by the Tx descriptor. Allocate a new buffer
@ -316,7 +316,7 @@ long x;
/* Initialise the Rx descriptors. */
for( x = 0; x < emacNUM_RX_DESCRIPTORS; x++ )
{
pxDescriptor = &xRxDescriptors[ x ];
pxDescriptor = &( xRxDescriptors[ x ] );
pxDescriptor->buf_p = &( xEthernetBuffers[ x ][ 0 ] );
pxDescriptor->bufsize = UIP_BUFSIZE;

View file

@ -12,7 +12,7 @@
<p>
Use the check box to turn on or off the LED, enter text to display on the OLED display, then click "Update IO".
Use the check box to turn on or off LED 4, then click "Update IO".
<p>

View file

@ -1,4 +1,4 @@
static const unsigned char data_404_html[] = {
static const char data_404_html[] = {
/* /404.html */
0x2f, 0x34, 0x30, 0x34, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00,
0x3c, 0x68, 0x74, 0x6d, 0x6c, 0x3e, 0x0d, 0x0a, 0x20, 0x20,
@ -19,7 +19,7 @@ static const unsigned char data_404_html[] = {
0x20, 0x3c, 0x2f, 0x62, 0x6f, 0x64, 0x79, 0x3e, 0x0d, 0x0a,
0x3c, 0x2f, 0x68, 0x74, 0x6d, 0x6c, 0x3e, };
static const unsigned char data_index_html[] = {
static const char data_index_html[] = {
/* /index.html */
0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00,
0x3c, 0x21, 0x44, 0x4f, 0x43, 0x54, 0x59, 0x50, 0x45, 0x20,
@ -66,7 +66,7 @@ static const unsigned char data_index_html[] = {
0x2f, 0x68, 0x74, 0x6d, 0x6c, 0x3e, 0x0d, 0x0a, 0x0d, 0x0a,
};
static const unsigned char data_index_shtml[] = {
static const char data_index_shtml[] = {
/* /index.shtml */
0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x73, 0x68, 0x74, 0x6d, 0x6c, 0x00,
0x3c, 0x21, 0x44, 0x4f, 0x43, 0x54, 0x59, 0x50, 0x45, 0x20,
@ -159,7 +159,7 @@ static const unsigned char data_index_shtml[] = {
0x3c, 0x2f, 0x68, 0x74, 0x6d, 0x6c, 0x3e, 0x0d, 0x0a, 0x0d,
0x0a, };
static const unsigned char data_io_shtml[] = {
static const char data_io_shtml[] = {
/* /io.shtml */
0x2f, 0x69, 0x6f, 0x2e, 0x73, 0x68, 0x74, 0x6d, 0x6c, 0x00,
0x3c, 0x21, 0x44, 0x4f, 0x43, 0x54, 0x59, 0x50, 0x45, 0x20,
@ -224,33 +224,29 @@ static const unsigned char data_io_shtml[] = {
0x73, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x68, 0x65,
0x63, 0x6b, 0x20, 0x62, 0x6f, 0x78, 0x20, 0x74, 0x6f, 0x20,
0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x6e, 0x20, 0x6f, 0x72,
0x20, 0x6f, 0x66, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x4c,
0x45, 0x44, 0x2c, 0x20, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x20,
0x74, 0x65, 0x78, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x64, 0x69,
0x73, 0x70, 0x6c, 0x61, 0x79, 0x20, 0x6f, 0x6e, 0x20, 0x74,
0x68, 0x65, 0x20, 0x4f, 0x4c, 0x45, 0x44, 0x20, 0x64, 0x69,
0x73, 0x70, 0x6c, 0x61, 0x79, 0x2c, 0x20, 0x74, 0x68, 0x65,
0x6e, 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x20, 0x22, 0x55,
0x70, 0x64, 0x61, 0x74, 0x65, 0x20, 0x49, 0x4f, 0x22, 0x2e,
0x0d, 0x0a, 0x0d, 0x0a, 0x0d, 0x0a, 0x3c, 0x70, 0x3e, 0x0d,
0x0a, 0x3c, 0x66, 0x6f, 0x72, 0x6d, 0x20, 0x6e, 0x61, 0x6d,
0x65, 0x3d, 0x22, 0x61, 0x46, 0x6f, 0x72, 0x6d, 0x22, 0x20,
0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x2f, 0x69,
0x6f, 0x2e, 0x73, 0x68, 0x74, 0x6d, 0x6c, 0x22, 0x20, 0x6d,
0x65, 0x74, 0x68, 0x6f, 0x64, 0x3d, 0x22, 0x67, 0x65, 0x74,
0x22, 0x3e, 0x0d, 0x0a, 0x25, 0x21, 0x20, 0x6c, 0x65, 0x64,
0x2d, 0x69, 0x6f, 0x0d, 0x0a, 0x3c, 0x70, 0x3e, 0x0d, 0x0a,
0x3c, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x20, 0x74, 0x79, 0x70,
0x65, 0x3d, 0x22, 0x73, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x22,
0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x55, 0x70,
0x64, 0x61, 0x74, 0x65, 0x20, 0x49, 0x4f, 0x22, 0x3e, 0x0d,
0x0a, 0x3c, 0x2f, 0x66, 0x6f, 0x72, 0x6d, 0x3e, 0x0d, 0x0a,
0x3c, 0x62, 0x72, 0x3e, 0x3c, 0x70, 0x3e, 0x0d, 0x0a, 0x3c,
0x2f, 0x66, 0x6f, 0x6e, 0x74, 0x3e, 0x0d, 0x0a, 0x3c, 0x2f,
0x62, 0x6f, 0x64, 0x79, 0x3e, 0x0d, 0x0a, 0x3c, 0x2f, 0x68,
0x74, 0x6d, 0x6c, 0x3e, 0x0d, 0x0a, 0x0d, 0x0a, };
0x20, 0x6f, 0x66, 0x66, 0x20, 0x4c, 0x45, 0x44, 0x20, 0x34,
0x2c, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20, 0x63, 0x6c, 0x69,
0x63, 0x6b, 0x20, 0x22, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
0x20, 0x49, 0x4f, 0x22, 0x2e, 0x0d, 0x0a, 0x0d, 0x0a, 0x0d,
0x0a, 0x3c, 0x70, 0x3e, 0x0d, 0x0a, 0x3c, 0x66, 0x6f, 0x72,
0x6d, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x46,
0x6f, 0x72, 0x6d, 0x22, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f,
0x6e, 0x3d, 0x22, 0x2f, 0x69, 0x6f, 0x2e, 0x73, 0x68, 0x74,
0x6d, 0x6c, 0x22, 0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
0x3d, 0x22, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x0d, 0x0a, 0x25,
0x21, 0x20, 0x6c, 0x65, 0x64, 0x2d, 0x69, 0x6f, 0x0d, 0x0a,
0x3c, 0x70, 0x3e, 0x0d, 0x0a, 0x3c, 0x69, 0x6e, 0x70, 0x75,
0x74, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 0x75,
0x62, 0x6d, 0x69, 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x3d, 0x22, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x20,
0x49, 0x4f, 0x22, 0x3e, 0x0d, 0x0a, 0x3c, 0x2f, 0x66, 0x6f,
0x72, 0x6d, 0x3e, 0x0d, 0x0a, 0x3c, 0x62, 0x72, 0x3e, 0x3c,
0x70, 0x3e, 0x0d, 0x0a, 0x3c, 0x2f, 0x66, 0x6f, 0x6e, 0x74,
0x3e, 0x0d, 0x0a, 0x3c, 0x2f, 0x62, 0x6f, 0x64, 0x79, 0x3e,
0x0d, 0x0a, 0x3c, 0x2f, 0x68, 0x74, 0x6d, 0x6c, 0x3e, 0x0d,
0x0a, 0x0d, 0x0a, };
static const unsigned char data_logo_jpg[] = {
static const char data_logo_jpg[] = {
/* /logo.jpg */
0x2f, 0x6c, 0x6f, 0x67, 0x6f, 0x2e, 0x6a, 0x70, 0x67, 0x00,
0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46,
@ -4017,7 +4013,7 @@ static const unsigned char data_logo_jpg[] = {
0x05, 0x14, 0x51, 0x40, 0x05, 0x14, 0x51, 0x40, 0x1f, 0xff,
0xd9, };
static const unsigned char data_runtime_shtml[] = {
static const char data_runtime_shtml[] = {
/* /runtime.shtml */
0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x73, 0x68, 0x74, 0x6d, 0x6c, 0x00,
0x3c, 0x21, 0x44, 0x4f, 0x43, 0x54, 0x59, 0x50, 0x45, 0x20,
@ -4109,7 +4105,7 @@ static const unsigned char data_runtime_shtml[] = {
0x79, 0x3e, 0x0d, 0x0a, 0x3c, 0x2f, 0x68, 0x74, 0x6d, 0x6c,
0x3e, 0x0d, 0x0a, 0x0d, 0x0a, };
static const unsigned char data_stats_shtml[] = {
static const char data_stats_shtml[] = {
/* /stats.shtml */
0x2f, 0x73, 0x74, 0x61, 0x74, 0x73, 0x2e, 0x73, 0x68, 0x74, 0x6d, 0x6c, 0x00,
0x3c, 0x21, 0x44, 0x4f, 0x43, 0x54, 0x59, 0x50, 0x45, 0x20,
@ -4275,7 +4271,7 @@ static const unsigned char data_stats_shtml[] = {
0x3c, 0x2f, 0x62, 0x6f, 0x64, 0x79, 0x3e, 0x0d, 0x0a, 0x3c,
0x2f, 0x68, 0x74, 0x6d, 0x6c, 0x3e, 0x0d, 0x0a, };
static const unsigned char data_tcp_shtml[] = {
static const char data_tcp_shtml[] = {
/* /tcp.shtml */
0x2f, 0x74, 0x63, 0x70, 0x2e, 0x73, 0x68, 0x74, 0x6d, 0x6c, 0x00,
0x3c, 0x21, 0x44, 0x4f, 0x43, 0x54, 0x59, 0x50, 0x45, 0x20,
@ -4359,21 +4355,21 @@ static const unsigned char data_tcp_shtml[] = {
const struct httpd_fsdata_file file_404_html[] = {NULL, data_404_html, data_404_html + 10, sizeof(data_404_html) - 10};
const struct httpd_fsdata_file file_404_html[] = {NULL, data_404_html, data_404_html + 10, sizeof(data_404_html) - 10, 0};
const struct httpd_fsdata_file file_index_html[] = {file_404_html, data_index_html, data_index_html + 12, sizeof(data_index_html) - 12};
const struct httpd_fsdata_file file_index_html[] = {file_404_html, data_index_html, data_index_html + 12, sizeof(data_index_html) - 12, 0};
const struct httpd_fsdata_file file_index_shtml[] = {file_index_html, data_index_shtml, data_index_shtml + 13, sizeof(data_index_shtml) - 13};
const struct httpd_fsdata_file file_index_shtml[] = {file_index_html, data_index_shtml, data_index_shtml + 13, sizeof(data_index_shtml) - 13, 0};
const struct httpd_fsdata_file file_io_shtml[] = {file_index_shtml, data_io_shtml, data_io_shtml + 10, sizeof(data_io_shtml) - 10};
const struct httpd_fsdata_file file_io_shtml[] = {file_index_shtml, data_io_shtml, data_io_shtml + 10, sizeof(data_io_shtml) - 10, 0};
const struct httpd_fsdata_file file_logo_jpg[] = {file_io_shtml, data_logo_jpg, data_logo_jpg + 10, sizeof(data_logo_jpg) - 10};
const struct httpd_fsdata_file file_logo_jpg[] = {file_io_shtml, data_logo_jpg, data_logo_jpg + 10, sizeof(data_logo_jpg) - 10, 0};
const struct httpd_fsdata_file file_runtime_shtml[] = {file_logo_jpg, data_runtime_shtml, data_runtime_shtml + 15, sizeof(data_runtime_shtml) - 15};
const struct httpd_fsdata_file file_runtime_shtml[] = {file_logo_jpg, data_runtime_shtml, data_runtime_shtml + 15, sizeof(data_runtime_shtml) - 15, 0};
const struct httpd_fsdata_file file_stats_shtml[] = {file_runtime_shtml, data_stats_shtml, data_stats_shtml + 13, sizeof(data_stats_shtml) - 13};
const struct httpd_fsdata_file file_stats_shtml[] = {file_runtime_shtml, data_stats_shtml, data_stats_shtml + 13, sizeof(data_stats_shtml) - 13, 0};
const struct httpd_fsdata_file file_tcp_shtml[] = {file_stats_shtml, data_tcp_shtml, data_tcp_shtml + 11, sizeof(data_tcp_shtml) - 11};
const struct httpd_fsdata_file file_tcp_shtml[] = {file_stats_shtml, data_tcp_shtml, data_tcp_shtml + 11, sizeof(data_tcp_shtml) - 11, 0};
#define HTTPD_FS_ROOT file_tcp_shtml

View file

@ -56,6 +56,7 @@
#define __UIP_CONF_H__
#define UIP_CONF_EXTERNAL_BUFFER
#define UIP_CONF_PROCESS_HTTPD_FORMS 1
/**
* 8 bit datatype