From 769b3dbcea116b83f913a6aae00b4e43633be82c Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Fri, 30 Mar 2018 11:39:33 -0400
Subject: [PATCH] new initrd format, 2nd layer for keypad

---
 Makefile            |   5 +-
 include/initrd.h    |  32 ++++---------
 initrd.c            |  42 -----------------
 boot => initrd/boot |   0
 libinterp.a         | Bin 65730 -> 65754 bytes
 src/initrd.c        | 112 +++++++++++---------------------------------
 src/keypad.c        |  41 ++++++++++++----
 src/main.c          |   4 +-
 src/script.c        |   2 +-
 src/stdlib.c        |   4 +-
 rba => tools/rba    | Bin
 11 files changed, 77 insertions(+), 165 deletions(-)
 delete mode 100644 initrd.c
 rename boot => initrd/boot (100%)
 rename rba => tools/rba (100%)

diff --git a/Makefile b/Makefile
index b3acc2a..d672a52 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@
 CROSS = arm-none-eabi-
 CC = gcc
 AS = as
-AR = ar
+AR = tools/rba
 OBJCOPY = objcopy
 STRIP = strip
 
@@ -46,11 +46,10 @@ INITRD = initrd.img
 
 all: $(OUT)
 
-#@$(CROSS)$(STRIP) --only-keep-debug $(OUT)
 $(OUT): $(OFILES) initrd/init libinterp.a
 	@echo "  INITRD " $(INITRD)
 	@rm -f $(INITRD)
-	@$(CROSS)$(AR) r $(INITRD) initrd/*
+	@$(AR) $(INITRD) initrd/*
 	@$(CROSS)$(OBJCOPY) -B arm -I binary -O elf32-littlearm $(INITRD) out/initrd.img.o
 	@echo "  LINK   " $(OUT)
 	@$(CROSS)$(CC) $(CFLAGS) $(LFLAGS) out/*.o -o $(OUT) -L. -linterp -lm
diff --git a/include/initrd.h b/include/initrd.h
index 1f7c0b6..3957066 100644
--- a/include/initrd.h
+++ b/include/initrd.h
@@ -26,45 +26,31 @@
 
 #include <stdint.h>
 
-/**
- * Structure for the archive's header.
- */
-typedef struct
-{
-	char signature[8]; /**< The archive's signature */
-} __attribute__ ((packed)) initrd_header;
-
-/**
- * Structure for a file entry in the archive.
- */
-typedef struct 
-{
-	char name[16];      /**< The name of the file */
-	uint8_t unused[32]; /**< Unused information */
-	char size[10];      /**< The file's size in bytes (as string) */
-	char sig[2];        /**< A signature to start file data */
-} __attribute__ ((packed)) initrd_file;
-
 /**
  * Confirms the initrd image is loaded and valid.
  * @return non-zero if valid image found
  */
 uint8_t initrd_validate(void);
 
+/**
+ * Gets the file name of the index'th file in the archive.
+ * @param index the index of the file
+ * @return the file's name, or zero if not found
+ */
+char *initrd_getfile(uint32_t index);
+
 /**
  * Gets contents of the given file.
  * @param name the file's name
  * @return pointer to file data, null if not found
  */
-char *initrd_getfile(const char *name);
+char *initrd_readfile(const char *name);
 
 /**
  * Gets the size of the given file.
  * @param name the file's name
  * @return the file's size, in bytes
  */
-uint32_t initrd_getfilesize(const char *name);
-
-char *initrd_getnfile(unsigned int index);
+uint32_t initrd_filesize(const char *name);
 
 #endif // INITRD_H_
diff --git a/initrd.c b/initrd.c
deleted file mode 100644
index 3f36cd9..0000000
--- a/initrd.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <stdint.h>
-#include <string.h>
-
-extern uint8_t *initrd_start;
-extern uint32_t initrd_size;
-
-char *getfile(uint32_t offset)
-{
-	char *ptr = initrd_start;
-	for (uint32_t i = 0; i < offset; i++) {
-		uint32_t len = *((uint32_t *)ptr);
-		uint32_t datalen = *((uint32_t *)(ptr + 4 + len));
-		ptr += len + datalen + 8;
-		if (ptr >= (char *)(initrd_start + initrd_size))
-			return 0;
-	}
-
-	return ptr;
-}
-
-char *readfile(const char *name)
-{
-	char *ptr;
-	for (uint32_t i = 0; ptr = getfile(i), ptr != 0; i++) {
-		uint32_t len = *((uint32_t *)ptr);
-		if (!strncmp(name, ptr + 4, len))
-			return ptr + len + 8;
-	}
-	return 0;
-}
-
-uint32_t filesize(const char *name)
-{
-	char *ptr;
-	for (uint32_t i = 0; ptr = getfile(i), ptr != 0; i++) {
-		uint32_t len = *((uint32_t *)ptr);
-		if (!strncmp(name, ptr + 4, len))
-			return *((uint32_t *)ptr + len + 4);
-	}
-	return 0;
-}
-
diff --git a/boot b/initrd/boot
similarity index 100%
rename from boot
rename to initrd/boot
diff --git a/libinterp.a b/libinterp.a
index 7c9e7a9a51dede0cc646cc5be8663838b5e2fc2f..04391e1deab3ed92d758cec68b99c0349ca1cd77 100644
GIT binary patch
delta 10195
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
MSa1H(AjrS}2IyK}-2eap

delta 10166
zcmb_id3Y36wy%4;DqU1nLI^RPnC>DmNhcv20YbtWmIMMcB(i9PVAu^VY(a2jw8IQI
zps2));CmARhh-G?p%X_PP<9m5QPIIQXaq*k(Q$B@aa{2IewDbq?|tw4{Nwfa^{sQx
zJ?D4MUHaZr_x4*W^n)w(b-|cErTzMplr&#5Il4pB3h^Cq%m43p(WjdBbH2U*FQt9&
zYufkUlW%F-k6+c6UfNnOc8ShbsQCR!Msaa*?_R3Nmo2p%Rk!%!*2TUtzG#B3Y0g4J
z(_Yj%K8e1LrxY=1LeqSMz{*f5OJP2YN-2$F-ow9Kg42zwsdfT|9CjtubblQyOe29Z
z)4vizT{q^<U&6W`sPi3#Ltk<}3eESX8sg8EH~ZAd_KQnrP&aJ_O5xMBE)E>&=^l$X
ztwh-BSsSUN`KACv5B~{_{YUkrKRud3Q0HNaHGi6swiE8H&tYPulhmwTz%VX(1hj4y
z#(>T^3fi>prB3Ers5sU}(pfJ;9&h~~-i<KjiLs04EYXZ?;v`$oQzvHy<U#8c>0HvP
z)(l9Wp%$4J%PvCQZf1|n1c2`j6n=jrG<?fIn)wlupCcA?G0ARw0nufSxDm9Wn>!|f
zO?VQ8d4Dd+eD#$XigqW8X>MH$k#(HL+X<;z!_Z!HX9>jUlfTiygV%uZy^m1MT_(tj
zbYBCMtR#+3(!abW6i8@Vg%lT&)MD$e(X3vC)U62=d$eh_Lmf1F3!T%dTDlZOF9v3&
zRnklZjn$<cktEWrtOKHq^8TbvYaooR0i+$Pf<^;L$6Fr)#~MUB(Rz}$gGnb_uTp0S
z>7ex$<>jQ)w7@8Un!>cIj#J~Ps<8soMpGfO4N#g$zL8$5$>>7s{yRM1gJ$Av5IwZO
zIMC~aHMIw)lGpS)lA5)Sf@yT3TQ3u$K8qb}jZ%lL+}M*aGp)uMRO+q1vRv^`m15_|
zHd6D6A+U0+`D%ilQ9Ol`19Tg-;!s+LK0?#etSt=pNRpr3c8V}Z2Y}A864eg7XhuG*
zj!%JPsP#Ep^UBqrN5s}&J5#ex41#`zbq{skV1yAXNVGS*1HZ<a%JAEE!D^CqgdW>D
ze`~D^)H%huQfIxQ`Z*;dK88+?Zk0)f6#9ly43GrWLcbz-xjX=`dMHAa4#o_9@?(t?
zx=sC;lM=my5mtDXy+U^rrc%bkvTx{G`W)rel!dmlX0+VfMbid_9wBB#a-Izhc@uA(
zr&bZ##`wp3HC3UN1gMsWVG{}QS71%>)M`TaF^-AyaiNXYCWZD;Z>d}Xy;_%pYTYO~
zkX6FHgI3EWM?E6k(~LDLPe8Fvx-$u~Qr?1K+od~P-5J}`_YAE=;wo78I0$XWN*8;e
z5b~x+hDU3mB}B~>-UJD)QuT4+)aTj0A>te8YM~tZDfgI|&@8njE*#xL(G`-vX)V;3
z%oK)?4&F+zsWKKpnIVHejXIf(Ffv2mF~DhFldD30I=E6^3;UW-D%I-cv+!0Ms%Om8
zB?q@5l*XDF9<wln4MnqNlF8F<2)#_Nvt$U4nnEU-*|Gr4>d<)V&G8&<3GG%3yQbtk
zK;I1>&SRmute@vGPlft0-m5+4aA?1JwCl*Y!Hl3$&H$Je`nNLT`-zX$p!m5d=NR<2
zlJhZhIXzyGf5anxvf2}$DJoQZ{5tWLTGTD8>ty&7ip!~NUJ~xBws#xbjmxe04VPQl
zyin7!-%=tWtDC2}s6)C$%MKZ;G$GUVq%(f7M=yw(-&<xst$vXZ7QNIKlxtd_O?XGo
zC~8=6-JGIX*ZyMuoT8e=3$9u`<GSnS&A+M$o6?-c3$eJ*S=_oU&|7c4klNA}k^VNX
zT0EuxmbY2Fpl-`wCbxyvxw5e8S&$<i3#%=AlhpYB@y31KHLX%b3o_*UDe4~(Zt5Q|
zlGXDC*~U|0EH>)x{u%Px)Vl_R#r<kTVYXPUu0a`5sxa>-TeIxlU!}d%Q}k8-qWi|q
zMh7_UD7xayPo(3a$*({N4xUVA>21xL?=wo#brAb3im~{amw_;Z`m88-;_D#0=*=i~
z5%YIEtXo+*7KKQ;j-+R752ql!5@kNVY2;d*K791xgy4r2q9yiR>w;btqTB!K&DNvE
zj~imTik4Q38`Mjso5eb{plq3_QfJGmWv#!n-x8%QR8zqv@{sR`PWxQ#>YokM*ZXJ7
zh_0re%vRY0vPF)nM%kp64ftt)8O42zdzUel5&K*JHegzpXa**pGYd2INiR-JKeL07
zl@NM;W_0w~H1L}5Bxa@XZRPay{R7SS`s^VP=pq5B!FEgUhoVd41S_QfVVEM1iLm}G
zO^5vkTDtDPA)hs-!I98SZ>x{#$ahd#hC1VU`12*#q272$eO8ezZc?e0J##V$oW2uc
z!3Go%CTl-YG-E1E^zbP#@~FD5GQEdO4BsOZYq5GJ0*GU=0N<`!e42W=GBk}p^KQ36
z5<ef%F?rk&byM#H#<(4Y-`@g2V<|{8|9X=DhGTOv$%MbdJ@SyPp#8{0zJP7_bC8+$
zKSy$(${rc2>j~2?$U_*b^BRq}6H;@=z_q#aH9FLcZ|LAb2Rg==keIu;zFefo>Ws~p
z2URPHotM-FD#=#C14JuTTSg|O><6aRi<qYKDYQFi$9Y`6G_oMd)d;yq8StGCp<|VH
zc#kDy8EM_=L96~92xV9qtO2AQCjujDAnAC=B0Y$7qO*s#gGnbl?@~U5bkI3Zc{%Ac
zEx8b&rYNwgZlLQ|>0&fV&B0f*#*l7G@iM2#SOkgRR-L+kRH*l4R50s!hIXZdtRty8
z_pzbV2(LSD6R-XS$W5nE{cBWi+y|tsMiWX-icp1BA?erExT?HZE`8P$R}sRwRjsPZ
zC>}(~ff4W;bdcR6?@(xVn&Sh8b>s=qna){yJNh>09LH8~Ru#?YPOIZzLo(F)8{>M#
z#{M!Q(2;kXhHZs&4RzjNj1gx&={FxkS>p_b#A>??R+F4B=&_yCyw>STFQ+&+>YT6D
zywN2i&Opb@I~bBH=x2Z=pytjdV7Z(LuezJWnhwTv1tB{a$8AyXjZTR+v%bQ!?B(vD
zn@YI~0DWCA=^N$Ml(~<yX0)uw)-=d%Crm_gat(Elks0TyRk-;G26+c-s@z|*o2um;
z*hJigRGZ+b)wpXJ;Y6+>$UEHK)LSYqfnIG74lD8w4rP_-v7c7U<!W#d(Zk!~qjD(}
z+hmUlf~=I;XlA?Yk*f}l+0ge3T8Bg&qD?!3mND<BgM#Z#kPMI3+!mr{3U7+I8`Rpd
z;nbJez9HgX=xQ!sc#wCHiE(GEKaUMZw^DS4-0F4kU@}v@B~W)?CD>H?UsxDT_Z!yK
z$$gMzy4_ea&1-U%n@k5+%DVwj<0i11>SY5Q)ViA)^K{9<ZE#)I%<!0nZX1-5cc2D&
zhx;nAXUV;A)a3G&19``bU{<?}STo0Sw8h=4?v146Jj~8%@Ngb;tEfEBW1ey&jOuES
zIqbfm-ieItTFwX>r9{7KZlX{18CN3CsCnb&rhLq(zm=SjSvS+m1zCqj{4{lLTqZJs
z*ztqKNHrE^u3Ce#T|JBP8D&%t7E9C!lp(bOWwF{<Jy^yHb)ou3?EJr|87x}V6DR}f
z3zX|rpGyaeRcg_tf6AGM_{8KZ5kEhx@f9tX#%WqEGjK7Pb5k~7n|oF3gbC>}KPUfC
z$uIU++iIIy^RHOr^Vc^nnZ4lpC9Q3B2??T2eKNmVY*Xb6HjBs9y9<_yzo^R>R?9QR
z-j=#|VWJrBr6GMXe%MiGs~(H8V?HXz3=^uY|0VL9Eao9)YU848<S6@4I_m7A|GBUB
zFYDjW+gGbvr!M|?x9CaqtCNFn=MeMra<`5rP6zs+g+68xKb#IMf;LVE*5l!O7u_%O
zYFI7(FQZF*eoPrzK9dsN_%)5cVIK`!;z|6sLkDLDS(KUnyCBr{qVEq4CK6yj0K7v3
z&Bu3mUuGqgeDmln|8kNWlw6gK5$?IFXU+-)t*7&-fLp6o1pqzk5K%Q>4S@9UU%}W-
z>X)n1CrBbY+bQ-=4!Db1%(IPjlK7#cHO3`vpmi$`zXl`YbI_*sDPWCECLNCT5$UY2
zAdk0ZsZUk~CYKT+hcN^#zNZ+uq(fSqo(-)y{ghXpLy7L>GSHQDoK8F}4Zw@j>E9Pb
zVf36qa-^Di%Ruq8+IUM}F;Km5OKOyRtv`?5=W}6bzOfFaH1+?0+}9tC@8VwriBD%g
z<j*AeIDA=)NnVr=Epv{bjiFmR{9uz3P+0f30WoPh3hMz%weF=T0-ypcd>BPP*So0S
zw6=P`Oz+ijJAG+ZG5XTl$?O6B?Jdd=y0nTV-mX0;lXc&fP_mOa{wXdccEKN^V+ANK
zBI%t<*u4m;Tf-^#Xw&jTy@Ph7^`JWYn}X<gh%)Vx3bry1J!O}6MDiNiYL|6DjHSFk
zY10~qVYCO3cDxe@dm!m}iwnCwh;*X$2we^)oosCauswuy&^k|fIq5X*V!rhwGq9^x
z()9;)F`6U}NAR)7kZwxtPm{>yY?Me<YX9m`?=~>&ggx~Y+IfwxBZ*a-Ax|T`Zt=Lr
zu73k^)0(2XuF1{6pS0cRowii6b_q$%>W;#`-m}8I;b5g4P_x(M$8s05I}a*0t9#dE
z6gN<EfGrJL!`YRGHlsJvtcifOj~oJ>X>DT=N6&)Jv21mIO;Kz)t&aP#ln=E|tAbkt
zvA?I}4Z4h2&Fa!y11ZJqz4kFEYpr8MJH@F{XAMy+ZY_znp%Zd+yG+uZyO$mYNSbTz
zZwXZ{=L21LZ(vLvjOix*$T%)nczc*<6Yutgp*>vIpraGrTiC%BUQI7|I@K!WJuvO-
z@+IFMg_@|QmAO3Yv`5QpU^K{O8fZr(=h{$r8JTe&LWTPWVvqM~s@x*Bq*^Y5O~hTr
zcqVviHSR%%JyG(PJjsnxZK*7TT5S)Gu6?8Ah$2BaO{4H~$+Zy~!Yd3mDt`q{WC#lh
zvQqXz+mRtmR&U+5p)b!W?U1+_(WdQ&wqvJ@1}M1RM9J`I&E*DeX9{o7-5RxRZ8&u`
z+c!i!0A0=PMnB~q6XRZ?{<=0Cy@#SJB!BRl8zM8s3txA?B-m8By9?%*`weUA<nw4n
zrW<C>G_T23E?Z<@DSrifWC$2YyIwAVw_5iTHhH?_h&Q+)*39sjg|5aH&LmTb4B;rT
zXUXT_sL6ef@y?cSfm!X&Wz8JV(H56Uu|3yA*yjEj?(C~P<{|ev_0sJraaS>_t3A<S
z_cry<+egMd&IlT19Qsvr=czGw^uyk{;*PnoJL%<HITQF<jq39|!hugAapu1O&4gzF
z6kE?R3~yJ(cUBgDh&s_IxDLzahFl&(iY4M<kDZ;{6CmPx!Q@dkPw%-|ZM(Bl>{cJ%
z*)N^Hb#c3A=xc6?=1w7hM<-BiuHjR|)(uKeMwH^7PObIP-0sx+Pr(J>*Ss#8dtPl?
zS1BG<XV&F+dz89Q2?pnDULDQNQ0dKi#h&z7r?e@W>mfeZiTKUU9f&V<B7S)@5N~SU
zBR)|5?<x`J)q=Z*BB6QYt{m|P_2yln_}>9sqzmSOvbiGnAr+$<#P8Gs<;s9icdF}P
z^R3E529>)$EXJyu_2pe>Gp;=hSvJq^)1)@7pP0c@P4Vy}s3}8NiI(&6npQM#31r2d
z-nG4UtHisj&{xy$4&#Ji<=yFdyHO)H^M{I_?&U?Yxg(I-#Y;7DANM~T5ov|Cu3o-7
z6SiO6ohegwmAau=j8Wq@q{p9U_)Q&ywNNWrtZv>A7A0!?hC<|Xf7wtiwyVsI6OipK
z+ZYyqYTdN)OY>*tV|Q=a-Fo?b!*u`51#{;%&RNpBZ+mt?)Ty&iJ&XKn*VD_8I%e-(
zCRVD=d-KHQ>iNAH;&t`O-fUs2z`ks;R+aC|mcJ}z+V!Nmb6<9hIY`qc2(_^A5>&ps
z?<cuevaeTJnwNRq(>ig#E$nLaqO%_@yG>K`4rD}+fy5ERGw4{n(62^+;i%#-<b-*K
zoHVc}^O%Bf-8iO5p@HuI*t7H3LDTmNYJC1Ik_V`i-$1e_W}m*8q)`p2oFlk*#OV5t
zV|e;UQ}h0qO{8B_-42F&M<KCHeJc-2Y`&oC+li^!@uYX|1c^<bS)=}7I~d=u)%1gj
zmkvj59N*1-%Rm`P3sBXSFO|tg!5TtcMsX2IEgrWKMlYi3_GbX<piTQGRCdsgy;mJM
zSP<O<Nv2VfjF{}Fp>LFS#4?ItWgQ3~QQn`lY4Zik7(m*we+wgHAnADfdeVbPC)$T-
zJD7B`%^kuRLON()puC)Pn%3=WJh1H>Rkd`@CEOTIQnT^Zj4`B}5}2JDkv!CDA|Y38
zIuz>7>xp&3n7V^@UYqMkYW82~Y8v5n`v&6GKLojHf2}?~l$+0cIn!ulN@c%K4@*cQ
ze<FRoXN6;-iQu~SQNs`C$6i8+C#FE)*x#w;hck-1P;wxEGH5?Y`cR{Rw%GFlWE{B{
zbf(SsKjY{D&^dOpdg*XcaXTFxe-DzO_CHwr3J*p`#PgiMIB^KJ6*jMXj5o5N8L>yJ
zq9cKn>BMYzAg{FtvSFt<UFz()s{Tkx^lM0RbfZi%fWSba4v;k00>y+XmsMC~^}xv=
z88g5<rnANgyhO}lo=topk0B11J+TWV1~wC|!mH^Oc#~?CawFXI4Lr`6Mxlm@K!7JK
z#%Ngyqd|dTtcplZzM+9f>1dpXP!Z@2Q)9eWQx!N$wQ4yQHj%(zsW!n=s|gGvGg0za
zH!0w~7A%z})M}GC-o}lRV_YSYdHrc15oo|OB9h-{uu)kD%{H0bjUX#!EZW{KlmDrn
ze5R#@3AzyyJe*7UGqfEeT`(06cvC0CqqTrR*i6AL)B~wLwdUEZR7vb1;@42t0ySjH
zJtiiwSRH#d9DS6cD<psITA+^16fb@~(3faa<$A2=W}pi@piXW^Y?*-;MmWuDb5)>%
zp<OAL!oDWZgKG71JiOHg4zgyt<d8Q6GFdajV-^N>LD`r|2AM#hjb3NTZE(~S$f4KS
z@-Z;01I(q2Ii8~}ftmC=*F)GA_$3jp@|cGLm#WsIVev2Z*3pr1>uKL8&%s^`ys8S1
z^^4^^Gp?09dkX$jEjl(O(<Sb=vL7DqTGAIJuh@F<rxsJs;Y+(reR6D~=-oQvxz~I@
zXQOCMe(`s{)>FqLUGQFA^!8?)cfa)ZGMxC2YOBV=zp*V(3{$(l%aHdbcyH$y+TwAx
z(DfuvuT|;EY+2QvJH$%$8%VIPp!|n={p3$Jha{t{th8Up_OP~f>^o;g^bcs5GZP*A
zC>qNTZ?gHpn<TFZd_1cE;l-RUpLj8!=RN$B(Nw&GGoAPCLh-}3eLq&12A4~`f;Zyv
z<F!4H<b3?Ket&I$lXq?J^4dN(=Ll+la!>zvp#E@AkB#a3d-@rw@V)fttLSf^b2-KE
zqn{vhAqUEH>EqjFOvfep7HGzJm*lY<pymJml00U|YIulS2U*Ph(@4gVe1KA|D<?EB
zOygO2@2M})*o@iA{nUzHPt?xa^Yf&4&Vw9V)@}6sASb$ynlZZuq3ot7=<nc(j%7~X
zowP3=!JFQFdg5{L$!0+nTv+cw!7L)FU4$LX?7UCEg5u8m^xXpcLkHtn(^T!Lf+&v?
zGR>0LiEtXGX6JqSL7H{mr}M8AX6JqS2|Dk*Pd^VMv-3Xv52QQq(>Ktz^FF;1%`!Xh
z(_3iUd7qw?PEb)`R<X-1=3eG#k{xfZ<`~jV0q=$&@*!$95tyoqPlx(^1yAdQIdu;0
zyhhiN#92MvcHX4(a?Y&3267Xpn`*`BoVc6Fn2o&XvmBwGI2{rj)QQviv6HCV`HEVl
z;?86g7g2J6*<a8)NBU52{D{-62ieFYb)Yl7dwcU}6X+c4aW(TyQEUt~k8gowsI@_D
zIujUtH6@)l=gUdI$$t^lSQYH(wl5IxB=7$pX8ZGy*IJtx;wcV)owZecdZr|LC%P<0
zH_Idg2zqbdoj2#fSp+PXeylipFwDq07&Cb6#~LS?$6guc-M7XE)9HA)`~WL{Vz7+E
z(RrI5ETLMZybNyo1|7!1+jQ<#!D?2GmO5UN1_f8sQABc@4Gk_L(|Mg9<dv^E-m9q!
zW)h)VTCj-(3#rz5ogU;r7tD$B4Ll|Vr&4XHe3pAvhy!chC^?u_BGf=Gd%4U88xf&Z
zM32f;0JdRiA;?Pk0-|k~p`cKa_kY`WCBZ`CVLaUHpzfIILZEko-XzKJXe~INxSjXu
z!7P<}Hk`^l$s8hvbL|d#ryb=U6BD#m-Pv%|yItzMPY<4<@)R$AJ;*;HnN#IN#BT<F
z&k*b6m5^ly-(-ZH_vt~-IkWRVJ@_=$>SZjv)dq*MX1e5%Hv|u|W`@Ts44&Xn%_M_!
z?cj1&&62a=s42*EZF9D41hYDr%$m;o^x%4xe=a45=bL7Ohx1sln#%J$=BeOCjQ47f
zIUJm>t~)m}j(>zP8|Ci-rUjo;2hQ~qcd9SX&5f-h%D0lUG$Tu0^FcVm{~dIh&#Q_|
z?~fGq9K`T@01!hyg!FwtoWfVMkjs7=>S73Ilx(ic`8RaMP_FBEqsm#JPJS=|$H~bb
z7K>Zd7?hQ*zx?n&f7V?&&Z@6(z4en@ed<DLQR_9I?XqxroqAz2UTgMTSSHuHs;Vul
zrhJzpTU>QdTi6(gSHX9^P4MERA2z{=`ue+UV;fE_hpK@mGvr4}*a%~D0-Cl3ktQI{
ecvW4PY8*}0w5!#E!i?lI(A@#~_aCTvpZ^B^B16sq

diff --git a/src/initrd.c b/src/initrd.c
index b8e8d09..1534210 100644
--- a/src/initrd.c
+++ b/src/initrd.c
@@ -1,9 +1,6 @@
 /**
  * @file initrd.c
  * Initrd image support
- * An archive file (made with ar) can be linked into the final executable to
- * allow files to be loaded in memory on boot. See mkinitrd.sh or the Makefile
- * for more info.
  *
  * Copyright (C) 2018 Clyne Sullivan
  *
@@ -21,110 +18,57 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/**
+ * The format of the initrd file is custom; made with the 'rba' utility.
+ */
+
 #include <initrd.h>
+#include <string.h>
 
 extern uint8_t _binary_initrd_img_start[];
 extern uint8_t _binary_initrd_img_size[];
 
-static const void *initrd_start = (void *)_binary_initrd_img_start;
+static const uint8_t *initrd_start = (uint8_t *)_binary_initrd_img_start;
 static const uint32_t initrd_size = (uint32_t)_binary_initrd_img_size;
 
-static const char *initrd_sig = "!<arch>\n";
-
 uint8_t initrd_validate(void)
 {
-	initrd_header *header = (initrd_header *)initrd_start;
-	for (uint8_t i = 0; i < 8; i++) {
-		if (header->signature[i] != initrd_sig[i])
-			return 0;
-	}
-
-	return 1;
+	return 1; // TODO maybe add header/signature to archiver?
 }
 
-uint8_t initrd_nametest(char *file, const char *want)
+char *initrd_getfile(uint32_t offset)
 {
-	for (uint8_t i = 0; i < 16; i++) {
-		if (want[i] == '\0')
-			return (file[i] == '/');
-		else if (want[i] != file[i])
+	char *ptr = initrd_start;
+	for (uint32_t i = 0; i < offset; i++) {
+		uint32_t len = *((uint32_t *)ptr);
+		uint32_t datalen = *((uint32_t *)(ptr + 4 + len));
+		ptr += len + datalen + 8;
+		if (ptr >= (char *)(initrd_start + initrd_size))
 			return 0;
 	}
 
-	return 0;
-}
-
-uint32_t ipow10(uint8_t n)
-{
-	uint32_t i = 1;
-	while (n--)
-		i *= 10;
-	return i;
-}
-
-uint32_t initrd_getsize(initrd_file *file)
-{
-	uint32_t size = 0;
-	char *p = file->size + 10;
-	while (*--p == ' ');
-
-	for (int8_t i = p - file->size, j = 0; i >= 0; i--, j++)
-		size += (*p-- - '0') * ipow10(j);
-
-	return size;
+	return ptr;
 }
 
-initrd_file *initrd_getfileptr(const char *name)
+char *initrd_readfile(const char *name)
 {
-	initrd_file *file = (initrd_file *)((uint8_t *)initrd_start + sizeof(initrd_header));
-	uint32_t offset = sizeof(initrd_header);
-
-	while (offset < initrd_size) {
-		if (initrd_nametest(file->name, name))
-			return file;
-		uint32_t size = initrd_getsize(file) + sizeof(initrd_file);
-		offset += size;
-		file = (initrd_file *)((uint8_t *)file + size + 1);
+	char *ptr;
+	for (uint32_t i = 0; ptr = initrd_getfile(i), ptr != 0; i++) {
+		uint32_t len = *((uint32_t *)ptr);
+		if (!strncmp(name, ptr + 4, len))
+			return ptr + len + 8;
 	}
-
 	return 0;
 }
 
-char *initrd_getnfile(unsigned int index)
+uint32_t initrd_filesize(const char *name)
 {
-	initrd_file *file = (initrd_file *)((uint8_t *)initrd_start + sizeof(initrd_header));
-	uint32_t offset = sizeof(initrd_header);
-
-	for (unsigned int i = 0; i < index; i++) {
-		uint32_t size = initrd_getsize(file) + sizeof(initrd_file);
-		offset += size;
-		file = (initrd_file *)((uint8_t *)file + size);
-		if (file->name[0] == '\n')
-			file = (initrd_file *)((uint32_t)file + 1);
+	char *ptr;
+	for (uint32_t i = 0; ptr = initrd_getfile(i), ptr != 0; i++) {
+		uint32_t len = *((uint32_t *)ptr);
+		if (!strncmp(name, ptr + 4, len))
+			return *((uint32_t *)(ptr + len + 4));
 	}
-	if ((uint32_t)file >= (uint32_t)initrd_start + initrd_size)
-		return 0;
-	return file->name;
-}
-
-char *initrd_getfile(const char *name)
-{
-	initrd_file *file = initrd_getfileptr(name);
-	if (file == 0)
-		return 0;
-
-
-	char *ptr = (char *)file + sizeof(initrd_file);
-	ptr[initrd_getsize(file) - 1] = 0;
-	return ptr;
-}
-
-uint32_t initrd_getfilesize(const char *name)
-{
-	initrd_file *file = initrd_getfileptr(name);
-	if (file == 0)
-		return 0;
-
-	return initrd_getsize(file);
+	return 0;
 }
 
diff --git a/src/keypad.c b/src/keypad.c
index 5b04eec..22fc967 100644
--- a/src/keypad.c
+++ b/src/keypad.c
@@ -53,16 +53,29 @@ static const port_t keypad_cols[COLS] = {
 	{ COL_3 }, { COL_4 }
 };
 
+#define K_2ND  0x000000FF
+#define K_HOLD 0x000001FF
+
 static const char keypad_map[ROWS * COLS * 4] = {
-	"&\0\0\0" "|\0\0\0" "pi\0\0"  "==\0\0"   "!=\0\0"
-	"x\0\0\0" "y\0\0\0" "z\0\0\0"  "=\0\0\0"  "sin\0"
-	"7\0\0\0" "8\0\0\0" "9\0\0\0"  "(\0\0\0"  ")\0\0\0"
-	"4\0\0\0" "5\0\0\0" "6\0\0\0"  "/\0\0\0"  "%\0\0\0"
-	"1\0\0\0" "2\0\0\0" "3\0\0\0"  "*\0\0\0"  "-\0\0\0"
-	".\0\0\0" "0\0\0\0" "\b\0\0\0" "\n\0\0\0" "+\0\0\0"
+	"\xFF\0\0\0" ">\0\0\0" ">=\0\0"   "==\0\0"   "=\0\0\0"
+	"x\0\0\0"    "<\0\0\0" "<=\0\0"   "!=\0\0"   "%\0\0\0"
+	"7\0\0\0"    "8\0\0\0" "9\0\0\0"  "(\0\0\0"  ")\0\0\0"
+	"4\0\0\0"    "5\0\0\0" "6\0\0\0"  "/\0\0\0"  "*\0\0\0"
+	"1\0\0\0"    "2\0\0\0" "3\0\0\0"  "-\0\0\0"  "+\0\0\0"
+	".\0\0\0"    "0\0\0\0" "\0\0\0\0" "\b\0\0\0" "\n\0\0\0"
+};
+
+static const char keypad_map_2nd[ROWS * COLS * 4] = {
+	"a\0\0\0" "b\0\0\0"  "c\0\0\0"  "d\0\0\0"  "e\0\0\0"
+	"f\0\0\0" "g\0\0\0"  "h\0\0\0"  "i\0\0\0"  "j\0\0\0"
+	"k\0\0\0" "l\0\0\0"  "m\0\0\0"  "n\0\0\0"  "o\0\0\0"
+	"p\0\0\0" "q\0\0\0"  "r\0\0\0"  "s\0\0\0"  "t\0\0\0"
+	"u\0\0\0" "v\0\0\0"  "w\0\0\0"  "x\0\0\0"  "y\0\0\0"
+	"z\0\0\0" "\0\0\0\0" "\0\0\0\0" "\0\0\0\0" "\xFF\x01\0\0"
 };
 
-#define KEY(r, c, i) keypad_map[r * COLS * 4 + c * 4 + i]
+#define KEY(r, c, i) map[r * COLS * 4 + c * 4 + i]
+#define KEYCODE(r, c) *((uint32_t *)(map + (r * COLS * 4 + c * 4)))
 
 #define BUFFER_SIZE 8
 static char keypad_buffer[BUFFER_SIZE];
@@ -71,12 +84,24 @@ static int keypad_buffer_pos = -1;
 void keypad_task(void)
 {
 	unsigned int col = 0;
+	unsigned char use2nd = 0;
+	unsigned char hold = 0;
 	while (1) {
 		gpio_dout(keypad_cols[col].port, keypad_cols[col].pin, 1);
 		delay(10);
 		for (unsigned int row = 0; row < ROWS; row++) {
 			if (gpio_din(keypad_rows[row].port, keypad_rows[row].pin)) {
-				if (keypad_buffer_pos < BUFFER_SIZE) {
+				char *map = (use2nd == 0) ? keypad_map : keypad_map_2nd;
+				if (KEYCODE(row, col) == K_2ND) {
+					use2nd = 1;
+				} else if (KEYCODE(row, col) == K_HOLD) {
+					if (use2nd != 0) {
+						if ((hold ^= 1) == 0)
+							use2nd = 0;
+					}
+				} else if (keypad_buffer_pos < BUFFER_SIZE) {
+					if (use2nd != 0 && hold == 0)
+						use2nd = 0;
 					for (unsigned int i = 0; KEY(row, col, i) != '\0'; i++)
 						keypad_buffer[++keypad_buffer_pos] = KEY(row, col, i);
 				}
diff --git a/src/main.c b/src/main.c
index d21407a..b39053a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -90,7 +90,7 @@ void task_interpreter(void)
 	instance *it = inewinstance();
 	script_loadlib(it);
 
-	char *s = initrd_getfile("init");
+	char *s = initrd_readfile("init");
 	if (s == 0) {
 		dsp_puts("can't find init");
 		goto end;
@@ -98,7 +98,7 @@ void task_interpreter(void)
 
 	char *linebuf = (char *)malloc(120);
 	uint32_t i = 0, prev = 0, lc;
-	uint32_t size = initrd_getfilesize("init");
+	uint32_t size = initrd_filesize("init");
 	int ret = 0;
 	while (i < size) {
 		for (; s[i] != '\n' && s[i] != '\0'; i++);
diff --git a/src/script.c b/src/script.c
index 733bc4a..95d62c0 100644
--- a/src/script.c
+++ b/src/script.c
@@ -107,7 +107,7 @@ int script_filemenu(instance *it)
 	char *fname;
 	strncpy(listbuf, " : \0", 4);
 	dsp_puts("Choose a file: \n");
-	for (unsigned int i = 0; (fname = initrd_getnfile(i)) != 0; i++) {
+	for (unsigned int i = 0; (fname = initrd_getfile(i)) != 0; i++) {
 		listbuf[0] = i + '0';
 		dsp_puts(listbuf);
 		dsp_puts(strncpy(buf, fname, 16));
diff --git a/src/stdlib.c b/src/stdlib.c
index 950f356..b7b11dc 100644
--- a/src/stdlib.c
+++ b/src/stdlib.c
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 
 #include <ctype.h>
+#include <heap.h>
 #include <stdarg.h>
-#include <stdint.h>
 #include <string.h>
 
 extern char *itoa(int, char *, int);
@@ -61,7 +61,7 @@ char *snprintf(char *buf, unsigned int max, const char *format, ...)
 				itoa(va_arg(args, unsigned int), nbuf, 16);
 				break;
 			case 'f':
-				itoa((int)va_arg(args, double), nbuf, 10);
+				itoa(va_arg(args, double), nbuf, 10);
 				break;
 			default:
 				buf[off++] = format[i];
diff --git a/rba b/tools/rba
similarity index 100%
rename from rba
rename to tools/rba