X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=picinit.c;h=624ec1795154b7e512c271e7b7da92d73cc32b1e;hb=HEAD;hp=40843b203b5f752faedb9b1a5dcfd4655036bcac;hpb=5c74e1a22c444b8769e0ce82975414f1c72b7b0e;p=rgblamp.git

diff --git a/picinit.c b/picinit.c
index 40843b2..624ec17 100644
--- a/picinit.c
+++ b/picinit.c
@@ -1,3 +1,32 @@
+/*
+ * Copyright © 2011, 2012, Titanium Mirror, Inc..
+ * All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - Neither the name of Titanium Mirror, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 /*
  * File:   picinit.c
  *
@@ -7,23 +36,13 @@
 
 #include <htc.h>
 
-#define RUNAT32MHZ /* else 16 MHz */
-
-#if defined(RUNAT32MHZ)
 __CONFIG(WDTE_OFF & FOSC_INTOSC);
-__CONFIG(LVP_OFF & PLLEN_ON);
-#else
-__CONFIG(WDTE_OFF);
 __CONFIG(LVP_OFF);
-#endif
 
 void pic_init()
 {
-#if defined(RUNAT32MHZ)
-    OSCCON = 0b11110000;
-#else /* 16 MHz */
-    OSCCON = 0b01111010;
-#endif
+    /* Setting below must match _XTAL_FREQ in picinit.h */
+    OSCCON = 0b01101000;
 
     /* OSCSTAT.HFIOFL is set when oscillator is locked (accurate within 2%) */
     while (!HFIOFL);