Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10595)

Unified Diff: chromeos/drivers/ath6kl/include/common/regdump.h

Issue 3579004: ath6kl: Bringing in the upstream version (Closed) Base URL: http://git.chromium.org/git/kernel.git
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/drivers/ath6kl/include/common/regdump.h
diff --git a/chromeos/drivers/ath6kl/include/regdump.h b/chromeos/drivers/ath6kl/include/common/regdump.h
similarity index 56%
rename from chromeos/drivers/ath6kl/include/regdump.h
rename to chromeos/drivers/ath6kl/include/common/regdump.h
index 09755cd2874d01b0798486db6ac1de4efa6065ea..ff79b4846e696e750af580fda4b82e67b0e25c9d 100644
--- a/chromeos/drivers/ath6kl/include/regdump.h
+++ b/chromeos/drivers/ath6kl/include/common/regdump.h
@@ -1,15 +1,19 @@
//------------------------------------------------------------------------------
// <copyright file="regdump.h" company="Atheros">
-// Copyright (c) 2004-2007 Atheros Corporation. All rights reserved.
+// Copyright (c) 2004-2010 Atheros Corporation. All rights reserved.
//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation;
//
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
//
//
//------------------------------------------------------------------------------
@@ -19,6 +23,11 @@
#ifndef __REGDUMP_H__
#define __REGDUMP_H__
+
+#ifndef ATH_TARGET
+#include "athstartpack.h"
+#endif
+
#if defined(AR6001)
#include "AR6001/AR6001_regdump.h"
#endif
@@ -32,7 +41,7 @@
* in a register dump, which the Host can fetch through
* the diagnostic window.
*/
-struct register_dump_s {
+PREPACK struct register_dump_s {
A_UINT32 target_id; /* Target ID */
A_UINT32 assline; /* Line number (if assertion failure) */
A_UINT32 pc; /* Program Counter at time of exception */
@@ -40,6 +49,11 @@ struct register_dump_s {
CPU_exception_frame_t exc_frame; /* CPU-specific exception info */
/* Could copy top of stack here, too.... */
-};
+} POSTPACK;
#endif /* __ASSEMBLER__ */
+
+#ifndef ATH_TARGET
+#include "athendpack.h"
+#endif
+
#endif /* __REGDUMP_H__ */
« no previous file with comments | « chromeos/drivers/ath6kl/include/common/regDb.h ('k') | chromeos/drivers/ath6kl/include/common/regulatory/reg_dbschema.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698