Added remaining subroutines. Further Debugging required

sshflash-win.bat

@@ -7,16 +7,29 @@ rem Fix the permissions on the "private key" , so ssh does not complain.
 rem Not required on Windows so is commented out here.
 rem chmod 700 keys\id_rsa
 
+call :show_warning
+SET prefix=%~1
+call :show_machinelist
+echo "Enter choice (1 - 4)"
+SET /P REPLY=
+if /I "%REPLY%" == "1" (SET prefix="lf1000_didj_")
+if /I "%REPLY%" == "2" (SET prefix="lf1000_")
+if /I "%REPLY%" == "3" (SET prefix="lf2000_")
+if /I "%REPLY%" == "4" (SET prefix="lf3000_")
+timeout /t 2
+
+if /I "%prefix%" == "lf3000_" (call :flash_mmc "%prefix%") else (call :flash_nand "%prefix%")
 EXIT /B %ERRORLEVEL%
 
+
 :show_warning
 echo "Leapster flash utility - installs a custom OS on your leapster!"
-echo -n
+echo(
 echo "WARNING! This utility will ERASE the stock leapster OS and any other"
 echo "data on the device. The device can be restored to stock settings using"
 echo "the LeapFrog Connect app. Note that flashing your device will likely"
 echo "VOID YOUR WARRANTY! Proceed at your own risk."
-echo -n
+echo(
 echo "Please power off your leapster, hold the L + R shoulder buttons (LeapsterGS), "
 echo "or right arrow + home buttons (LeapPad2), and then press power."
 echo "You should see a screen with a green background."
@@ -39,9 +52,9 @@ SET memloc=%~2
 echo "Booting the Surgeon environment..."
 make_cbf.exe %memloc% %surgeon_path% surgeon_tmp.cbf
 boot_surgeon.exe surgeon_tmp.cbf
-echo -n "Done! Waiting for Surgeon to come up..."
-DEL  surgeon_tmp.cbf
-sleep 15
+echo "Done! Waiting for Surgeon to come up..."
+DEL surgeon_tmp.cbf
+timeout /t 15
 echo Done!
 EXIT /B 0
 
@@ -54,3 +67,102 @@ SET RP=awk -e "\$4 ~ /"RFS"/ {print "\dev\" substr(\$1, 1, length(\$1)-1)}" \pro
 FOR \f %%i in %SSH% %RP% do set RFS_PARTITION=%%i
 echo "Detected Kernel partition=%KERNEL_PARTITION% RFS Partition=%RFS_PARTITION%"
 EXIT /B 0
+
+:nand_flash_kernel
+SET kernel_path=%~1
+echo -n "Flashing the kernel..."
+%SSH% "\usr\sbin\flash_erase %KERNEL_PARTITION% 0 0"
+type %kernel_path% | %SSH% "/usr/sbin/nandwrite -p" %KERNEL_PARTITION% "-"
+echo "Done flashing the kernel!"
+EXIT /B 0
+
+:nand_flash_rfs
+SET rfs_path=%~1
+echo "Flashing the root filesystem..."
+%SSH% "\usr\sbin\ubiformat -y %RFS_PARTITION%"
+%SSH% "\usr\sbin\ubiattach -p %RFS_PARTITION%"
+timeout /t 1
+%SSH% "\usr\sbin\ubimkvol \dev\ubi0 -N RFS -m"
+timeout /t 1
+%SSH% "mount -t ubifs \dev\ubi0_0 \mnt\root"
+echo "Writing rootfs image..."
+rem Note: We used to use a ubifs image here, but now use a .tar.gz.
+rem This removes the need to care about PEB/LEB sizes at build time,
+rem which is important as some LF2000 models Ultra XDi have differing sizes.
+echo "Writing rootfs image..." 
+type $rfs_path | %SSH% "gunzip -c | tar x -f '-' -C /mnt/root"
+%SSH% "umount \mnt\root"
+%SSH% "\usr\sbin\ubidetach -d 0"
+timeout /t 3
+echo "Done flashing the root filesystem!"
+EXIT /B 0
+
+:nand_maybe_wipe_roms
+  echo "Do you want to format the roms partition? (You should do this on the first flash of retroleap) (y/n)" 
+  SET /P REPLY=
+  if /I "%REPLY%" == "y" (
+    %SSH% "/usr/sbin/ubiformat /dev/mtd3"
+    %SSH% "/usr/sbin/ubiattach -p /dev/mtd3"
+    %SSH% "/usr/sbin/ubimkvol /dev/ubi0 -m -N roms")
+EXIT /B 0
+
+:flash_nand
+  SET prefix=%~1
+  if /I "%prefix%" == "lf1000_*" (
+	  memloc="high"
+	  kernel="zImage_tmp.cbf"
+	  make_cbf.exe %memloc% %prefix%zImage %kernel%)
+  else (
+	  memloc="superhigh"
+	  kernel=%prefix%uImage
+  )
+  call :boot_surgeon %prefix%surgeon_zImage %memloc%
+  rem For the first ssh command, skip hostkey checking to avoid prompting the user.
+  %SSH% -o "StrictHostKeyChecking no" 'test'
+  call :nand_part_detect
+  call :nand_flash_kernel %kernel%
+  call :nand_flash_rfs %prefix%rootfs.tar.gz
+  call :nand_maybe_wipe_roms 
+  echo "Done! Rebooting the host."
+  %SSH% '/sbin/reboot'
+EXIT /B 0
+
+:mmc_flash_kernel
+  SET kernel_path=%~1
+  echo "Flashing the kernel..."
+  rem TODO: This directory structure should be included in surgeon images.
+  %SSH% "mkdir /mnt/boot"
+  rem TODO: This assumes a specific partition layout - not sure if this is the case for all devices?
+  %SSH% "mount /dev/mmcblk0p2 /mnt/boot"
+  type %kernel_path% | %SSH% "cat - > /mnt/boot/uImage"
+  %SSH% "umount /dev/mmcblk0p2"
+  echo "Done flashing the kernel!"
+EXIT /B 0
+
+:mmc_flash_rfs
+  SET rfs_path=%~1
+  rem Size of the rootfs to be flashed, in bytes.
+  echo "Flashing the root filesystem..."
+  %SSH% "/sbin/mkfs.ext4 -F -L RFS -O ^metadata_csum /dev/mmcblk0p3"
+  rem TODO: This directory structure should be included in surgeon images.
+  %SSH% "mkdir /mnt/root"
+  %SSH% "mount -t ext4 /dev/mmcblk0p3 /mnt/root"
+  echo "Writing rootfs image..."  
+  type %rfs_path% | %SSH% "gunzip -c | tar x -f '-' -C /mnt/root"
+  %SSH% "umount /mnt/root"
+  echo "Done flashing the root filesystem!"
+EXIT /B 0
+
+:flash_mmc
+  SET prefix=%~1
+  call : boot_surgeon %prefix%surgeon_zImage superhigh
+  rem For the first ssh command, skip hostkey checking to avoid prompting the user.
+  %SSH% -o "StrictHostKeyChecking no" 'test'
+  call :mmc_flash_kernel %prefix%uImage
+  call :mmc_flash_rfs %prefix%rootfs.tar.gz
+  echo "Done! Rebooting the host."
+  timeout /t 3
+  %SSH% '/sbin/reboot'
+EXIT /B 0
+
+