Date:2012-05-14 06:36:46 (7 years 2 months ago)
Author:Xiangfu
Commit:b6b61b1702e17a966138dfaaa075b3a97fb12aae
Message:m1/patches/rtems: refresh

Files: m1/patches/rtems/bootp-dhcp-cleanup.patch (11 diffs)
m1/patches/rtems/export-shell-fns.patch (5 diffs)
m1/patches/rtems/fix-dns-in-dhcp.patch (4 diffs)
m1/patches/rtems/milkymist-audio-add-support-mic-boost.patch (4 diffs)

Change Details

m1/patches/rtems/bootp-dhcp-cleanup.patch
44
55    BOOTP/DHCP header cleanup
66
7diff --git a/cpukit/libnetworking/nfs/bootp_subr.c b/cpukit/libnetworking/nfs/bootp_subr.c
8index 4021bc6..df8b0c5 100644
9+++ b/cpukit/libnetworking/nfs/bootp_subr.c
10@@ -71,9 +71,12 @@
7Index: rtems/cpukit/libnetworking/nfs/bootp_subr.c
8===================================================================
9--- rtems.orig/cpukit/libnetworking/nfs/bootp_subr.c 2012-05-14 12:34:47.187532000 +0800
10@@ -69,9 +69,12 @@
1111 #include <fcntl.h>
1212 #include <rtems/mkrootfs.h>
1313 #include <rtems/rtems_bsdnet.h>
...... 
2121 #define BOOTP_MIN_LEN 300 /* Minimum size of bootp udp packet */
2222
2323 /*
24@@ -138,20 +141,6 @@ void bootpboot_p_rtlist(void);
24@@ -136,20 +139,6 @@
2525 void bootpboot_p_iflist(void);
2626 #endif
2727
...... 
4242 #ifdef BOOTP_DEBUG
4343 void
4444 bootpboot_p_sa(struct sockaddr *sa, struct sockaddr *ma)
45@@ -271,7 +260,7 @@ bootpboot_p_iflist(void)
45@@ -269,7 +258,7 @@
4646  * - allocate or reallocate dst, so that string fits in
4747  * - copy string from src to dest
4848  */
...... 
5151 {
5252   size_t len;
5353
54diff --git a/cpukit/libnetworking/rtems/bootp.h b/cpukit/libnetworking/rtems/bootp.h
55new file mode 100644
56index 0000000..21bdb79
57+++ b/cpukit/libnetworking/rtems/bootp.h
54Index: rtems/cpukit/libnetworking/rtems/bootp.h
55===================================================================
56--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5857@@ -0,0 +1,39 @@
5958+/* Subroutines from c/src/libnetworking/nfs/bootp_subr.c */
6059+
...... 
9695+#endif
9796+
9897+#endif
99diff --git a/cpukit/libnetworking/rtems/rtems_bootp.c b/cpukit/libnetworking/rtems/rtems_bootp.c
100index caf2faa..6a644a4 100644
101+++ b/cpukit/libnetworking/rtems/rtems_bootp.c
102@@ -12,6 +12,8 @@
98Index: rtems/cpukit/libnetworking/rtems/rtems_bootp.c
99===================================================================
100--- rtems.orig/cpukit/libnetworking/rtems/rtems_bootp.c 2012-05-14 12:34:47.195528000 +0800
101@@ -8,6 +8,8 @@
103102 #include <rtems/rtems_bsdnet.h>
104103 #include <rtems/rtems_bsdnet_internal.h>
105104
...... 
109108 /*
110109  * Perform a BOOTP request
111110  */
112diff --git a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
113index c8bdfd4..9721e1c 100644
114+++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
115@@ -179,7 +179,6 @@ void domaininit (void *);
111Index: rtems/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
112===================================================================
113--- rtems.orig/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h 2012-05-14 12:34:47.223514000 +0800
114@@ -178,7 +178,6 @@
116115 void ifinit (void *);
117116 void ipintr (void);
118117 void arpintr (void);
...... 
121120 int socket (int, int, int);
122121 int ioctl (int, ioctl_command_t, ...);
123122
124diff --git a/cpukit/libnetworking/rtems/rtems_dhcp.c b/cpukit/libnetworking/rtems/rtems_dhcp.c
125index e01846e..285ce1e 100644
126+++ b/cpukit/libnetworking/rtems/rtems_dhcp.c
123Index: rtems/cpukit/libnetworking/rtems/rtems_dhcp.c
124===================================================================
125--- rtems.orig/cpukit/libnetworking/rtems/rtems_dhcp.c 2012-05-14 12:35:04.922660000 +0800
127126@@ -99,6 +99,7 @@
128127 #include <rtems/mkrootfs.h>
129128
...... 
133132
134133 #ifndef EALEN
135134 #define EALEN 6
136@@ -167,25 +168,6 @@ struct dhcp_packet
135@@ -167,25 +168,6 @@
137136 };
138137
139138 /*
...... 
159158  * Variables
160159  */
161160 static int dhcp_option_overload = 0;
162@@ -724,7 +706,7 @@ dhcp_task (rtems_task_argument _sdl)
161@@ -755,7 +737,7 @@
163162       /*
164163        * Send the Request.
165164        */
...... 
168167       if (error) {
169168         rtems_bsdnet_semaphore_release ();
170169         printf ("DHCP call failed -- error %d", error);
171@@ -918,7 +900,7 @@ dhcp_init (int update_files)
170@@ -960,7 +942,7 @@
172171   /*
173172    * Send the Discover.
174173    */
...... 
177176   if (error) {
178177     printf ("BOOTP call failed -- %s\n", strerror(error));
179178     soclose (so);
180@@ -947,7 +929,7 @@ dhcp_init (int update_files)
179@@ -989,7 +971,7 @@
181180    */
182181   dhcp_request_req (&call, &reply, sdl, true);
183182
m1/patches/rtems/export-shell-fns.patch
44
55    Export rtems_shell_init_env, rtems_shell_env_free, rtems_shell_main_mv, rtems_shell_main_cp and rtems_shell_main_rm
66
7diff --git a/cpukit/libmisc/shell/main_mv.c b/cpukit/libmisc/shell/main_mv.c
8index 7e3db0f..5cfddc9 100644
9+++ b/cpukit/libmisc/shell/main_mv.c
10@@ -116,7 +116,7 @@ rtems_shell_mv_exit (rtems_shell_mv_globals* globals, int code)
7Index: rtems/cpukit/libmisc/shell/main_mv.c
8===================================================================
9--- rtems.orig/cpukit/libmisc/shell/main_mv.c 2012-05-14 12:34:47.271490000 +0800
10@@ -116,7 +116,7 @@
1111 const char *user_from_uid(uid_t uid, int nouser);
1212 char *group_from_gid(gid_t gid, int nogroup);
1313
...... 
1717 rtems_shell_main_mv(int argc, char *argv[])
1818 {
1919   rtems_shell_mv_globals mv_globals;
20diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c
21index 14b609b..9c4b1d5 100644
22+++ b/cpukit/libmisc/shell/shell.c
23@@ -61,7 +61,7 @@ rtems_shell_env_t *rtems_current_shell_env = &rtems_global_shell_env;
20Index: rtems/cpukit/libmisc/shell/shell.c
21===================================================================
22--- rtems.orig/cpukit/libmisc/shell/shell.c 2012-05-14 12:34:47.287482000 +0800
23@@ -59,7 +59,7 @@
2424 /*
2525  * Initialize the shell user/process environment information
2626  */
...... 
3030   rtems_shell_env_t *shell_env_p
3131 )
3232 {
33@@ -83,7 +83,7 @@ static rtems_shell_env_t *rtems_shell_init_env(
33@@ -81,7 +81,7 @@
3434 /*
3535  * Completely free a shell_env_t and all associated memory
3636  */
...... 
3939   void *ptr
4040 )
4141 {
42diff --git a/cpukit/libmisc/shell/shell.h b/cpukit/libmisc/shell/shell.h
43index f71cadd..a3abd3e 100644
44+++ b/cpukit/libmisc/shell/shell.h
45@@ -207,6 +207,13 @@ bool rtems_shell_main_loop(
42Index: rtems/cpukit/libmisc/shell/shell.h
43===================================================================
44--- rtems.orig/cpukit/libmisc/shell/shell.h 2012-05-14 12:34:47.259496001 +0800
45@@ -205,6 +205,13 @@
4646   rtems_shell_env_t *rtems_shell_env
4747 );
4848
...... 
5757 extern rtems_shell_env_t rtems_global_shell_env;
5858 extern rtems_shell_env_t *rtems_current_shell_env;
5959
60@@ -307,6 +314,13 @@ extern rtems_status_code rtems_shell_wait_for_input(
60@@ -305,6 +312,13 @@
6161
6262 extern int rtems_shell_main_monitor(int argc, char **argv);
6363
m1/patches/rtems/fix-dns-in-dhcp.patch
44
55    Fix incorrect processing of DNS info from DHCP (revised patch)
66
7diff --git a/cpukit/libnetworking/rtems/rtems_dhcp.c b/cpukit/libnetworking/rtems/rtems_dhcp.c
8index 285ce1e..4039a48 100644
9+++ b/cpukit/libnetworking/rtems/rtems_dhcp.c
10@@ -187,6 +187,35 @@ static const char dhcp_request_parameters[5] = { DHCP_SUBNET,
7Index: rtems/cpukit/libnetworking/rtems/rtems_dhcp.c
8===================================================================
9--- rtems.orig/cpukit/libnetworking/rtems/rtems_dhcp.c 2012-05-14 12:34:47.363444000 +0800
10@@ -205,6 +205,35 @@
1111                                                          DHCP_DNS,
1212                                                          DHCP_HOST,
1313                                                          DHCP_DOMAIN_NAME };
...... 
4444
4545 /*
4646  * Format an IP address in dotted decimal.
47@@ -345,10 +374,12 @@ process_options (unsigned char *optbuf, int optbufSize)
47@@ -363,10 +392,12 @@
4848         {
4949           int dlen = 0;
5050           while ((dlen < len) &&
...... 
6060             memcpy (&rtems_bsdnet_nameserver
6161                     [rtems_bsdnet_nameserver_count], p + dlen, 4);
6262             rtems_bsdnet_nameserver_count++;
63@@ -725,6 +756,15 @@ dhcp_task (rtems_task_argument _sdl)
63@@ -743,6 +774,15 @@
6464         continue;
6565       }
6666
...... 
7676       process_options (&dhcp_req.vend[4], sizeof (dhcp_req.vend) - 4);
7777
7878       if (dhcp_message_type != DHCP_ACK)
79@@ -839,6 +879,8 @@ dhcp_init (int update_files)
79@@ -857,6 +897,8 @@
8080   struct sockaddr_dl *sdl = NULL;
8181   struct proc *procp = NULL;
8282
m1/patches/rtems/milkymist-audio-add-support-mic-boost.patch
11Index: rtems/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c
22===================================================================
3+++ rtems/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c 2012-03-29 15:58:14.440242001 +0800
4@@ -316,6 +316,7 @@
3--- rtems.orig/c/src/lib/libbsp/lm32/shared/milkymist_ac97/ac97.c 2012-05-14 12:34:47.143554000 +0800
4@@ -314,6 +314,7 @@
55   unsigned int chan, int mono)
66 {
77   unsigned int *val = (unsigned int *)buf;
...... 
1010   int codec;
1111   int left, right;
1212
13@@ -328,12 +329,14 @@
13@@ -326,12 +327,14 @@
1414     return RTEMS_SUCCESSFUL;
1515   }
1616   if (mono) {
...... 
2727   return RTEMS_SUCCESSFUL;
2828 }
2929
30@@ -341,21 +344,23 @@
30@@ -339,21 +342,23 @@
3131   unsigned int chan, int mono)
3232 {
3333   unsigned int *val = (unsigned int *)buf;
...... 
5555       right = 0;
5656   }
5757
58@@ -365,6 +370,13 @@
58@@ -363,6 +368,13 @@
5959   else
6060     codec = (31-left) | ((31-right) << 8);
6161

Archive Download the corresponding diff file

Branches:
master



interactive