From b6b61b1702e17a966138dfaaa075b3a97fb12aae Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Mon, 14 May 2012 12:36:46 +0800 Subject: [PATCH] m1/patches/rtems: refresh --- m1/patches/rtems/bootp-dhcp-cleanup.patch | 59 +++++++++---------- m1/patches/rtems/export-shell-fns.patch | 34 +++++------ m1/patches/rtems/fix-dns-in-dhcp.patch | 16 ++--- ...ilkymist-audio-add-support-mic-boost.patch | 12 ++-- 4 files changed, 60 insertions(+), 61 deletions(-) diff --git a/m1/patches/rtems/bootp-dhcp-cleanup.patch b/m1/patches/rtems/bootp-dhcp-cleanup.patch index 3dbd7e0..5fba885 100644 --- a/m1/patches/rtems/bootp-dhcp-cleanup.patch +++ b/m1/patches/rtems/bootp-dhcp-cleanup.patch @@ -4,11 +4,11 @@ Date: Fri Feb 24 21:57:21 2012 +0100 BOOTP/DHCP header cleanup -diff --git a/cpukit/libnetworking/nfs/bootp_subr.c b/cpukit/libnetworking/nfs/bootp_subr.c -index 4021bc6..df8b0c5 100644 ---- a/cpukit/libnetworking/nfs/bootp_subr.c -+++ b/cpukit/libnetworking/nfs/bootp_subr.c -@@ -71,9 +71,12 @@ +Index: rtems/cpukit/libnetworking/nfs/bootp_subr.c +=================================================================== +--- rtems.orig/cpukit/libnetworking/nfs/bootp_subr.c 2012-05-14 12:34:47.187532000 +0800 ++++ rtems/cpukit/libnetworking/nfs/bootp_subr.c 2012-05-14 12:35:20.155040001 +0800 +@@ -69,9 +69,12 @@ #include #include #include @@ -21,7 +21,7 @@ index 4021bc6..df8b0c5 100644 #define BOOTP_MIN_LEN 300 /* Minimum size of bootp udp packet */ /* -@@ -138,20 +141,6 @@ void bootpboot_p_rtlist(void); +@@ -136,20 +139,6 @@ void bootpboot_p_iflist(void); #endif @@ -42,7 +42,7 @@ index 4021bc6..df8b0c5 100644 #ifdef BOOTP_DEBUG void bootpboot_p_sa(struct sockaddr *sa, struct sockaddr *ma) -@@ -271,7 +260,7 @@ bootpboot_p_iflist(void) +@@ -269,7 +258,7 @@ * - allocate or reallocate dst, so that string fits in * - copy string from src to dest */ @@ -51,11 +51,10 @@ index 4021bc6..df8b0c5 100644 { size_t len; -diff --git a/cpukit/libnetworking/rtems/bootp.h b/cpukit/libnetworking/rtems/bootp.h -new file mode 100644 -index 0000000..21bdb79 ---- /dev/null -+++ b/cpukit/libnetworking/rtems/bootp.h +Index: rtems/cpukit/libnetworking/rtems/bootp.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ rtems/cpukit/libnetworking/rtems/bootp.h 2012-05-14 12:35:20.155040001 +0800 @@ -0,0 +1,39 @@ +/* Subroutines from c/src/libnetworking/nfs/bootp_subr.c */ + @@ -96,11 +95,11 @@ index 0000000..21bdb79 +#endif + +#endif -diff --git a/cpukit/libnetworking/rtems/rtems_bootp.c b/cpukit/libnetworking/rtems/rtems_bootp.c -index caf2faa..6a644a4 100644 ---- a/cpukit/libnetworking/rtems/rtems_bootp.c -+++ b/cpukit/libnetworking/rtems/rtems_bootp.c -@@ -12,6 +12,8 @@ +Index: rtems/cpukit/libnetworking/rtems/rtems_bootp.c +=================================================================== +--- rtems.orig/cpukit/libnetworking/rtems/rtems_bootp.c 2012-05-14 12:34:47.195528000 +0800 ++++ rtems/cpukit/libnetworking/rtems/rtems_bootp.c 2012-05-14 12:35:20.155040001 +0800 +@@ -8,6 +8,8 @@ #include #include @@ -109,11 +108,11 @@ index caf2faa..6a644a4 100644 /* * Perform a BOOTP request */ -diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h -index c8bdfd4..9721e1c 100644 ---- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h -+++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h -@@ -179,7 +179,6 @@ void domaininit (void *); +Index: rtems/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h +=================================================================== +--- rtems.orig/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h 2012-05-14 12:34:47.223514000 +0800 ++++ rtems/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h 2012-05-14 12:35:20.155040001 +0800 +@@ -178,7 +178,6 @@ void ifinit (void *); void ipintr (void); void arpintr (void); @@ -121,10 +120,10 @@ index c8bdfd4..9721e1c 100644 int socket (int, int, int); int ioctl (int, ioctl_command_t, ...); -diff --git a/cpukit/libnetworking/rtems/rtems_dhcp.c b/cpukit/libnetworking/rtems/rtems_dhcp.c -index e01846e..285ce1e 100644 ---- a/cpukit/libnetworking/rtems/rtems_dhcp.c -+++ b/cpukit/libnetworking/rtems/rtems_dhcp.c +Index: rtems/cpukit/libnetworking/rtems/rtems_dhcp.c +=================================================================== +--- rtems.orig/cpukit/libnetworking/rtems/rtems_dhcp.c 2012-05-14 12:35:04.922660000 +0800 ++++ rtems/cpukit/libnetworking/rtems/rtems_dhcp.c 2012-05-14 12:35:20.155040001 +0800 @@ -99,6 +99,7 @@ #include @@ -133,7 +132,7 @@ index e01846e..285ce1e 100644 #ifndef EALEN #define EALEN 6 -@@ -167,25 +168,6 @@ struct dhcp_packet +@@ -167,25 +168,6 @@ }; /* @@ -159,7 +158,7 @@ index e01846e..285ce1e 100644 * Variables */ static int dhcp_option_overload = 0; -@@ -724,7 +706,7 @@ dhcp_task (rtems_task_argument _sdl) +@@ -755,7 +737,7 @@ /* * Send the Request. */ @@ -168,7 +167,7 @@ index e01846e..285ce1e 100644 if (error) { rtems_bsdnet_semaphore_release (); printf ("DHCP call failed -- error %d", error); -@@ -918,7 +900,7 @@ dhcp_init (int update_files) +@@ -960,7 +942,7 @@ /* * Send the Discover. */ @@ -177,7 +176,7 @@ index e01846e..285ce1e 100644 if (error) { printf ("BOOTP call failed -- %s\n", strerror(error)); soclose (so); -@@ -947,7 +929,7 @@ dhcp_init (int update_files) +@@ -989,7 +971,7 @@ */ dhcp_request_req (&call, &reply, sdl, true); diff --git a/m1/patches/rtems/export-shell-fns.patch b/m1/patches/rtems/export-shell-fns.patch index 33f2ccd..5bb21ab 100644 --- a/m1/patches/rtems/export-shell-fns.patch +++ b/m1/patches/rtems/export-shell-fns.patch @@ -4,11 +4,11 @@ Date: Fri Feb 24 21:58:20 2012 +0100 Export rtems_shell_init_env, rtems_shell_env_free, rtems_shell_main_mv, rtems_shell_main_cp and rtems_shell_main_rm -diff --git a/cpukit/libmisc/shell/main_mv.c b/cpukit/libmisc/shell/main_mv.c -index 7e3db0f..5cfddc9 100644 ---- a/cpukit/libmisc/shell/main_mv.c -+++ b/cpukit/libmisc/shell/main_mv.c -@@ -116,7 +116,7 @@ rtems_shell_mv_exit (rtems_shell_mv_globals* globals, int code) +Index: rtems/cpukit/libmisc/shell/main_mv.c +=================================================================== +--- rtems.orig/cpukit/libmisc/shell/main_mv.c 2012-05-14 12:34:47.271490000 +0800 ++++ rtems/cpukit/libmisc/shell/main_mv.c 2012-05-14 12:35:14.309964001 +0800 +@@ -116,7 +116,7 @@ const char *user_from_uid(uid_t uid, int nouser); char *group_from_gid(gid_t gid, int nogroup); @@ -17,11 +17,11 @@ index 7e3db0f..5cfddc9 100644 rtems_shell_main_mv(int argc, char *argv[]) { rtems_shell_mv_globals mv_globals; -diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c -index 14b609b..9c4b1d5 100644 ---- a/cpukit/libmisc/shell/shell.c -+++ b/cpukit/libmisc/shell/shell.c -@@ -61,7 +61,7 @@ rtems_shell_env_t *rtems_current_shell_env = &rtems_global_shell_env; +Index: rtems/cpukit/libmisc/shell/shell.c +=================================================================== +--- rtems.orig/cpukit/libmisc/shell/shell.c 2012-05-14 12:34:47.287482000 +0800 ++++ rtems/cpukit/libmisc/shell/shell.c 2012-05-14 12:35:14.313962001 +0800 +@@ -59,7 +59,7 @@ /* * Initialize the shell user/process environment information */ @@ -30,7 +30,7 @@ index 14b609b..9c4b1d5 100644 rtems_shell_env_t *shell_env_p ) { -@@ -83,7 +83,7 @@ static rtems_shell_env_t *rtems_shell_init_env( +@@ -81,7 +81,7 @@ /* * Completely free a shell_env_t and all associated memory */ @@ -39,11 +39,11 @@ index 14b609b..9c4b1d5 100644 void *ptr ) { -diff --git a/cpukit/libmisc/shell/shell.h b/cpukit/libmisc/shell/shell.h -index f71cadd..a3abd3e 100644 ---- a/cpukit/libmisc/shell/shell.h -+++ b/cpukit/libmisc/shell/shell.h -@@ -207,6 +207,13 @@ bool rtems_shell_main_loop( +Index: rtems/cpukit/libmisc/shell/shell.h +=================================================================== +--- rtems.orig/cpukit/libmisc/shell/shell.h 2012-05-14 12:34:47.259496001 +0800 ++++ rtems/cpukit/libmisc/shell/shell.h 2012-05-14 12:35:14.317960001 +0800 +@@ -205,6 +205,13 @@ rtems_shell_env_t *rtems_shell_env ); @@ -57,7 +57,7 @@ index f71cadd..a3abd3e 100644 extern rtems_shell_env_t rtems_global_shell_env; extern rtems_shell_env_t *rtems_current_shell_env; -@@ -307,6 +314,13 @@ extern rtems_status_code rtems_shell_wait_for_input( +@@ -305,6 +312,13 @@ extern int rtems_shell_main_monitor(int argc, char **argv); diff --git a/m1/patches/rtems/fix-dns-in-dhcp.patch b/m1/patches/rtems/fix-dns-in-dhcp.patch index aabf999..4d91b03 100644 --- a/m1/patches/rtems/fix-dns-in-dhcp.patch +++ b/m1/patches/rtems/fix-dns-in-dhcp.patch @@ -4,11 +4,11 @@ Date: Fri Feb 24 23:04:56 2012 +0100 Fix incorrect processing of DNS info from DHCP (revised patch) -diff --git a/cpukit/libnetworking/rtems/rtems_dhcp.c b/cpukit/libnetworking/rtems/rtems_dhcp.c -index 285ce1e..4039a48 100644 ---- a/cpukit/libnetworking/rtems/rtems_dhcp.c -+++ b/cpukit/libnetworking/rtems/rtems_dhcp.c -@@ -187,6 +187,35 @@ static const char dhcp_request_parameters[5] = { DHCP_SUBNET, +Index: rtems/cpukit/libnetworking/rtems/rtems_dhcp.c +=================================================================== +--- rtems.orig/cpukit/libnetworking/rtems/rtems_dhcp.c 2012-05-14 12:34:47.363444000 +0800 ++++ rtems/cpukit/libnetworking/rtems/rtems_dhcp.c 2012-05-14 12:35:04.922660000 +0800 +@@ -205,6 +205,35 @@ DHCP_DNS, DHCP_HOST, DHCP_DOMAIN_NAME }; @@ -44,7 +44,7 @@ index 285ce1e..4039a48 100644 /* * Format an IP address in dotted decimal. -@@ -345,10 +374,12 @@ process_options (unsigned char *optbuf, int optbufSize) +@@ -363,10 +392,12 @@ { int dlen = 0; while ((dlen < len) && @@ -60,7 +60,7 @@ index 285ce1e..4039a48 100644 memcpy (&rtems_bsdnet_nameserver [rtems_bsdnet_nameserver_count], p + dlen, 4); rtems_bsdnet_nameserver_count++; -@@ -725,6 +756,15 @@ dhcp_task (rtems_task_argument _sdl) +@@ -743,6 +774,15 @@ continue; } @@ -76,7 +76,7 @@ index 285ce1e..4039a48 100644 process_options (&dhcp_req.vend[4], sizeof (dhcp_req.vend) - 4); if (dhcp_message_type != DHCP_ACK) -@@ -839,6 +879,8 @@ dhcp_init (int update_files) +@@ -857,6 +897,8 @@ struct sockaddr_dl *sdl = NULL; struct proc *procp = NULL; diff --git a/m1/patches/rtems/milkymist-audio-add-support-mic-boost.patch b/m1/patches/rtems/milkymist-audio-add-support-mic-boost.patch index 9ff10fe..c73d801 100644 --- a/m1/patches/rtems/milkymist-audio-add-support-mic-boost.patch +++ b/m1/patches/rtems/milkymist-audio-add-support-mic-boost.patch @@ -1,8 +1,8 @@ Index: rtems/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c =================================================================== ---- rtems.orig/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c 2012-03-27 14:03:04.065264002 +0800 -+++ rtems/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c 2012-03-29 15:58:14.440242001 +0800 -@@ -316,6 +316,7 @@ +--- rtems.orig/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c 2012-05-14 12:34:47.143554000 +0800 ++++ rtems/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c 2012-05-14 12:35:23.753240001 +0800 +@@ -314,6 +314,7 @@ unsigned int chan, int mono) { unsigned int *val = (unsigned int *)buf; @@ -10,7 +10,7 @@ Index: rtems/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c int codec; int left, right; -@@ -328,12 +329,14 @@ +@@ -326,12 +327,14 @@ return RTEMS_SUCCESSFUL; } if (mono) { @@ -27,7 +27,7 @@ Index: rtems/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c return RTEMS_SUCCESSFUL; } -@@ -341,21 +344,23 @@ +@@ -339,21 +342,23 @@ unsigned int chan, int mono) { unsigned int *val = (unsigned int *)buf; @@ -55,7 +55,7 @@ Index: rtems/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c right = 0; } -@@ -365,6 +370,13 @@ +@@ -363,6 +368,13 @@ else codec = (31-left) | ((31-right) << 8);